Make branch for GNOME 3.12 so trunk can hit devel again.

Revert libgdata back to 0.14 because 0.16 needs newer libsoup for soup support.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/branches/GNOME_3_12@19925 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 11 insertions, 39 deletions

diff --git a/devel/libgdata/Makefile b/devel/libgdata/Makefile
index d38db08c2..aab32cff6 100644
--- a/devel/libgdata/Makefile
+++ b/devel/libgdata/Makefile
@@ -3,7 +3,8 @@
 #    $MCom$
 
 PORTNAME=	libgdata
-PORTVERSION=	0.16.0
+PORTVERSION=	0.14.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
 
@@ -14,11 +15,12 @@ BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
 		vapigen:${PORTSDIR}/lang/vala-vapigen
 LIB_DEPENDS=	libsoup-gnome-2.4.so:${PORTSDIR}/devel/libsoup-gnome \
 		libgoa-1.0.so:${PORTSDIR}/net/gnome-online-accounts \
-		libuhttpmock-0.0.so:${PORTSDIR}/net/uhttpmock \
 		libgcr-3.so:${PORTSDIR}/security/gcr \
 		liboauth.so:${PORTSDIR}/net/liboauth
 RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss
 
+CONFLICTS=	libgdata-0.6.*
+
 USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 gnomehier gnomeprefix intltool \
 			introspection:build
diff --git a/devel/libgdata/distinfo b/devel/libgdata/distinfo
index bc236a21e..79914b494 100644
--- a/devel/libgdata/distinfo
+++ b/devel/libgdata/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libgdata-0.16.0.tar.xz) = 66bc279ff8fbebb8eb2602d33e37e3140747ba1e4dc1f1b944c0f312f00ab479
-SIZE (libgdata-0.16.0.tar.xz) = 1552500
+SHA256 (libgdata-0.14.3.tar.xz) = c044f2af34c1e5eba7b74d5809f6f0bc4acc7007f23c4cb7ebccf94d5058ad8a
+SIZE (libgdata-0.14.3.tar.xz) = 1476520
diff --git a/devel/libgdata/pkg-plist b/devel/libgdata/pkg-plist
index 9cdd27676..57098ba19 100644
--- a/devel/libgdata/pkg-plist
+++ b/devel/libgdata/pkg-plist
@@ -10,6 +10,7 @@ include/libgdata/gdata/gcontact/gdata-gcontact-jot.h
 include/libgdata/gdata/gcontact/gdata-gcontact-language.h
 include/libgdata/gdata/gcontact/gdata-gcontact-relation.h
 include/libgdata/gdata/gcontact/gdata-gcontact-website.h
+include/libgdata/gdata/gdata-goa-authorizer.h
 include/libgdata/gdata/gd/gdata-gd-email-address.h
 include/libgdata/gdata/gd/gdata-gd-im-address.h
 include/libgdata/gdata/gd/gdata-gd-name.h
@@ -34,7 +35,6 @@ include/libgdata/gdata/gdata-download-stream.h
 include/libgdata/gdata/gdata-entry.h
 include/libgdata/gdata/gdata-enums.h
 include/libgdata/gdata/gdata-feed.h
-include/libgdata/gdata/gdata-goa-authorizer.h
 include/libgdata/gdata/gdata-oauth1-authorizer.h
 include/libgdata/gdata/gdata-parsable.h
 include/libgdata/gdata/gdata-query.h
@@ -70,14 +70,6 @@ include/libgdata/gdata/services/documents/gdata-documents-service.h
 include/libgdata/gdata/services/documents/gdata-documents-spreadsheet.h
 include/libgdata/gdata/services/documents/gdata-documents-text.h
 include/libgdata/gdata/services/documents/gdata-documents-upload-query.h
-include/libgdata/gdata/services/freebase/gdata-freebase-enums.h
-include/libgdata/gdata/services/freebase/gdata-freebase-query.h
-include/libgdata/gdata/services/freebase/gdata-freebase-result.h
-include/libgdata/gdata/services/freebase/gdata-freebase-search-query.h
-include/libgdata/gdata/services/freebase/gdata-freebase-search-result.h
-include/libgdata/gdata/services/freebase/gdata-freebase-service.h
-include/libgdata/gdata/services/freebase/gdata-freebase-topic-query.h
-include/libgdata/gdata/services/freebase/gdata-freebase-topic-result.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-album.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-comment.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-enums.h
@@ -86,13 +78,9 @@ include/libgdata/gdata/services/picasaweb/gdata-picasaweb-file.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-query.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-service.h
 include/libgdata/gdata/services/picasaweb/gdata-picasaweb-user.h
-include/libgdata/gdata/services/tasks/gdata-tasks-query.h
-include/libgdata/gdata/services/tasks/gdata-tasks-service.h
-include/libgdata/gdata/services/tasks/gdata-tasks-task.h
-include/libgdata/gdata/services/tasks/gdata-tasks-tasklist.h
 include/libgdata/gdata/services/youtube/gdata-youtube-category.h
-include/libgdata/gdata/services/youtube/gdata-youtube-comment.h
 include/libgdata/gdata/services/youtube/gdata-youtube-content.h
+include/libgdata/gdata/services/youtube/gdata-youtube-comment.h
 include/libgdata/gdata/services/youtube/gdata-youtube-credit.h
 include/libgdata/gdata/services/youtube/gdata-youtube-enums.h
 include/libgdata/gdata/services/youtube/gdata-youtube-query.h
@@ -102,8 +90,8 @@ include/libgdata/gdata/services/youtube/gdata-youtube-video.h
 lib/girepository-1.0/GData-0.0.typelib
 lib/libgdata.a
 lib/libgdata.so
-lib/libgdata.so.19
-lib/libgdata.so.19.2.0
+lib/libgdata.so.13
+lib/libgdata.so.13.5.4
 libdata/pkgconfig/libgdata.pc
 share/doc/gdata/GDataAPPCategories.html
 share/doc/gdata/GDataAccessHandler.html
@@ -127,8 +115,8 @@ share/doc/gdata/GDataContactsContact.html
 share/doc/gdata/GDataContactsGroup.html
 share/doc/gdata/GDataContactsQuery.html
 share/doc/gdata/GDataContactsService.html
-share/doc/gdata/GDataDocumentsDocument.html
 share/doc/gdata/GDataDocumentsDrawing.html
+share/doc/gdata/GDataDocumentsDocument.html
 share/doc/gdata/GDataDocumentsEntry.html
 share/doc/gdata/GDataDocumentsFeed.html
 share/doc/gdata/GDataDocumentsFolder.html
@@ -142,13 +130,6 @@ share/doc/gdata/GDataDocumentsUploadQuery.html
 share/doc/gdata/GDataDownloadStream.html
 share/doc/gdata/GDataEntry.html
 share/doc/gdata/GDataFeed.html
-share/doc/gdata/GDataFreebaseQuery.html
-share/doc/gdata/GDataFreebaseResult.html
-share/doc/gdata/GDataFreebaseSearchQuery.html
-share/doc/gdata/GDataFreebaseSearchResult.html
-share/doc/gdata/GDataFreebaseService.html
-share/doc/gdata/GDataFreebaseTopicQuery.html
-share/doc/gdata/GDataFreebaseTopicResult.html
 share/doc/gdata/GDataGContactCalendar.html
 share/doc/gdata/GDataGContactEvent.html
 share/doc/gdata/GDataGContactExternalID.html
@@ -184,10 +165,6 @@ share/doc/gdata/GDataPicasaWebService.html
 share/doc/gdata/GDataPicasaWebUser.html
 share/doc/gdata/GDataQuery.html
 share/doc/gdata/GDataService.html
-share/doc/gdata/GDataTasksQuery.html
-share/doc/gdata/GDataTasksService.html
-share/doc/gdata/GDataTasksTask.html
-share/doc/gdata/GDataTasksTasklist.html
 share/doc/gdata/GDataUploadStream.html
 share/doc/gdata/GDataYouTubeCategory.html
 share/doc/gdata/GDataYouTubeComment.html
@@ -218,8 +195,6 @@ share/doc/gdata/ch14.html
 share/doc/gdata/ch15.html
 share/doc/gdata/ch16.html
 share/doc/gdata/ch17.html
-share/doc/gdata/ch18.html
-share/doc/gdata/ch19.html
 share/doc/gdata/data-flow.png
 share/doc/gdata/gdata-GData-Types.html
 share/doc/gdata/gdata-Version-Information.html
@@ -245,9 +220,6 @@ share/doc/gdata/ix15.html
 share/doc/gdata/ix16.html
 share/doc/gdata/ix17.html
 share/doc/gdata/ix18.html
-share/doc/gdata/ix19.html
-share/doc/gdata/ix20.html
-share/doc/gdata/ix21.html
 share/doc/gdata/left-insensitive.png
 share/doc/gdata/left.png
 share/doc/gdata/pt01.html
@@ -337,9 +309,7 @@ share/vala/vapi/libgdata.vapi
 @dirrmtry share/locale/as
 @dirrm share/doc/gdata
 @dirrm include/libgdata/gdata/services/youtube
-@dirrm include/libgdata/gdata/services/tasks
 @dirrm include/libgdata/gdata/services/picasaweb
-@dirrm include/libgdata/gdata/services/freebase
 @dirrm include/libgdata/gdata/services/documents
 @dirrm include/libgdata/gdata/services/contacts
 @dirrm include/libgdata/gdata/services/calendar