dev-libs/folks: 0.6.7 → 0.6.8

5 files changed, 12 insertions, 197 deletions

diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index 955d006d..901cbe92 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -1,5 +1,3 @@
-AUX folks-0.6.7-tracker-1.patch 5522 RMD160 b91669fbc9c4cd648c40155ffe2cb2b26b7fd791 SHA1 2b8a048160d945e921d60896ee6152853cadba01 SHA256 c3074a2642aeaa83f5137588f83e284560c7af91c8fc7813fd7b077a1df8a057
-AUX folks-0.6.7-tracker-2.patch 744 RMD160 46e6b0b3acd52fc5e907880c1c7ee91a6d6e0425 SHA1 5c16ace747399544a95ecc07fe97363d1abdb231 SHA256 0317695b980759e3051e5f4aea6ca5c650cd689bf7cd572a1bdd5d711061f210
-DIST folks-0.6.7.tar.xz 1403828 RMD160 76e4828a344b13490a40151b33789244b093bc82 SHA1 55e93915f7db9e8006d04414c59578331f31130d SHA256 d9ce3fd1f0ea3e0cb3780521cfda161062cf7ed1a016261e8d244fe41cbae8f3
-EBUILD folks-0.6.7.ebuild 2458 RMD160 e94526aebc185cb8ffba7f4c12d788d0e520c99b SHA1 19783edf788174b314a00c1bc87ff47ccd85c973 SHA256 e7b7cee44d7f22128905f95b7ed551f2b4a0505c3f83ae66a836d06ad2674a62
-EBUILD folks-9999.ebuild 2297 RMD160 91ca2d1ebbcd7e9185fbdec94097aefd71d1b094 SHA1 1eaad95884461ce1a427e0f7d36d64a1fad8f561 SHA256 54aad7be2f90e73abc4fc02645ff93b5ed691b12ed1e07c467d74834db59460e
+DIST folks-0.6.8.tar.xz 1420560 RMD160 68c716619a0583401b473cdfa5ad7509256b6608 SHA1 cea806b0eca176f497097bc725c90e95ed45cd47 SHA256 4ee18ce808315f27ab6bf9f7d2b438dd4c1042a8ab6836bb5058b6dce167e0b1
+EBUILD folks-0.6.8.ebuild 2339 RMD160 72895c8fbd1b52494ac4a189283cd4021dd1cd8a SHA1 7bd1b0ad331ea796e09b403298813103989eec21 SHA256 f2e5ed276eef175e0ca5eff3182930e9a00688d374770cc5277683ff00574e70
+EBUILD folks-9999.ebuild 2339 RMD160 72895c8fbd1b52494ac4a189283cd4021dd1cd8a SHA1 7bd1b0ad331ea796e09b403298813103989eec21 SHA256 f2e5ed276eef175e0ca5eff3182930e9a00688d374770cc5277683ff00574e70
diff --git a/dev-libs/folks/files/folks-0.6.7-tracker-1.patch b/dev-libs/folks/files/folks-0.6.7-tracker-1.patch
deleted file mode 100644
index 53c4bcc3..00000000
--- a/dev-libs/folks/files/folks-0.6.7-tracker-1.patch
+++ /dev/null
@@ -1,151 +0,0 @@
-From 5f26596731a40c8103fe403d5aaa7049e3eae496 Mon Sep 17 00:00:00 2001
-From: Travis Reitter <travis.reitter@collabora.co.uk>
-Date: Mon, 5 Mar 2012 15:30:10 -0800
-Subject: [PATCH] Factor out the tracker-sparql major number.
-
-This changes fairly often, so this will make it easier to adjust it all
-in one place.
----
- backends/tracker/Makefile.am                       |    2 +-
- backends/tracker/lib/Makefile.am                   |    4 ++--
- .../tracker/lib/folks-tracker-uninstalled.pc.in    |    2 +-
- backends/tracker/lib/folks-tracker.deps            |    4 ----
- backends/tracker/lib/folks-tracker.deps.in         |    4 ++++
- backends/tracker/lib/folks-tracker.pc.in           |    2 +-
- configure.ac                                       |    3 +++
- tests/lib/tracker/Makefile.am                      |    2 +-
- tests/tracker/Makefile.am                          |    2 +-
- 9 files changed, 14 insertions(+), 11 deletions(-)
- delete mode 100644 backends/tracker/lib/folks-tracker.deps
- create mode 100644 backends/tracker/lib/folks-tracker.deps.in
-
-diff --git a/backends/tracker/Makefile.am b/backends/tracker/Makefile.am
-index 8cf3484..88aa79a 100644
---- a/backends/tracker/Makefile.am
-+++ b/backends/tracker/Makefile.am
-@@ -26,7 +26,7 @@ tracker_deps = \
- 	gee-1.0 \
- 	gio-2.0 \
- 	gobject-2.0 \
--	tracker-sparql-0.12 \
-+	tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
- 	$(NULL)
- 
- tracker_la_CPPFLAGS = \
-diff --git a/backends/tracker/lib/Makefile.am b/backends/tracker/lib/Makefile.am
-index a4495fd..fab3218 100644
---- a/backends/tracker/lib/Makefile.am
-+++ b/backends/tracker/lib/Makefile.am
-@@ -28,7 +28,7 @@ libfolks_tracker_la_VALAFLAGS = \
- 	--pkg gobject-2.0 \
- 	--pkg gio-2.0 \
- 	--pkg gee-1.0 \
--	--pkg tracker-sparql-0.12 \
-+	--pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
- 	--includedir folks \
- 	--vapi folks-tracker.vapi \
- 	-H folks/folks-tracker.h \
-@@ -39,7 +39,7 @@ folks_backend_tracker_deps = \
- 	gee-1.0 \
- 	gio-2.0 \
- 	gobject-2.0 \
--	tracker-sparql-0.12 \
-+	tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
- 	$(NULL)
- 
- libfolks_tracker_la_CPPFLAGS = \
-diff --git a/backends/tracker/lib/folks-tracker-uninstalled.pc.in b/backends/tracker/lib/folks-tracker-uninstalled.pc.in
-index 6294609..fcffc8c 100644
---- a/backends/tracker/lib/folks-tracker-uninstalled.pc.in
-+++ b/backends/tracker/lib/folks-tracker-uninstalled.pc.in
-@@ -7,6 +7,6 @@ vapidir=@abs_top_srcdir@/folks
- Name: Folks Tracker support library (uninstalled copy)
- Description: Tracker support library for the Folks meta-contacts library
- Version: @VERSION@
--Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-0.12
-+Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-@TRACKER_SPARQL_MAJOR@
- Libs: ${abs_top_builddir}/backends/telepathy/libfolks-tracker.la
- Cflags: -I${abs_top_srcdir} -I${abs_top_srcdir}/backends/tracker -I${abs_top_builddir}
-diff --git a/backends/tracker/lib/folks-tracker.deps b/backends/tracker/lib/folks-tracker.deps
-deleted file mode 100644
-index 3374635..0000000
---- a/backends/tracker/lib/folks-tracker.deps
-+++ /dev/null
-@@ -1,4 +0,0 @@
--glib-2.0
--gobject-2.0
--folks
--tracker-sparql-0.12
-\ No newline at end of file
-diff --git a/backends/tracker/lib/folks-tracker.deps.in b/backends/tracker/lib/folks-tracker.deps.in
-new file mode 100644
-index 0000000..02948c3
---- /dev/null
-+++ b/backends/tracker/lib/folks-tracker.deps.in
-@@ -0,0 +1,4 @@
-+glib-2.0
-+gobject-2.0
-+folks
-+tracker-sparql-@TRACKER_SPARQL_MAJOR@
-diff --git a/backends/tracker/lib/folks-tracker.pc.in b/backends/tracker/lib/folks-tracker.pc.in
-index 28becfb..7898842 100644
---- a/backends/tracker/lib/folks-tracker.pc.in
-+++ b/backends/tracker/lib/folks-tracker.pc.in
-@@ -10,6 +10,6 @@ vapidir=@datadir@/vala/vapi
- Name: Folks tracker support library
- Description: Tracker support library for the Folks meta-contacts library
- Version: @VERSION@
--Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-0.12
-+Requires: folks glib-2.0 gobject-2.0 gee-1.0 tracker-sparql-@TRACKER_SPARQL_MAJOR@
- Libs: -L${libdir} -lfolks-tracker
- Cflags: -I${includedir}
-diff --git a/configure.ac b/configure.ac
-index a05103e..06cc381 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -154,6 +154,8 @@ GCONF2_REQUIRED=2.31
- EBOOK_REQUIRED=3.1.5
- EDATASERVER_REQUIRED=3.1.5
- 
-+AC_SUBST([TRACKER_SPARQL_MAJOR])
-+
- PKG_CHECK_MODULES([GLIB],
-                   [glib-2.0 >= $GLIB_REQUIRED
-                    gobject-2.0 >= $GLIB_REQUIRED])
-@@ -504,6 +506,7 @@ AC_SUBST([ERROR_VALAFLAGS])
- AC_CONFIG_FILES([
-     backends/telepathy/lib/folks-telepathy.pc
-     backends/telepathy/lib/folks-telepathy-uninstalled.pc
-+    backends/tracker/lib/folks-tracker.deps
-     backends/tracker/lib/folks-tracker.pc
-     backends/tracker/lib/folks-tracker-uninstalled.pc
-     backends/eds/lib/folks-eds.pc
-diff --git a/tests/lib/tracker/Makefile.am b/tests/lib/tracker/Makefile.am
-index 9f75fea..bd0776b 100644
---- a/tests/lib/tracker/Makefile.am
-+++ b/tests/lib/tracker/Makefile.am
-@@ -9,7 +9,7 @@ VALAFLAGS += \
- 	--pkg gio-2.0 \
- 	--pkg gee-1.0 \
- 	--pkg folks \
--	--pkg tracker-sparql-0.12 \
-+	--pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
- 	--pkg folks-tracker \
- 	-g \
- 	$(NULL)
-diff --git a/tests/tracker/Makefile.am b/tests/tracker/Makefile.am
-index 54ce842..83d4032 100644
---- a/tests/tracker/Makefile.am
-+++ b/tests/tracker/Makefile.am
-@@ -36,7 +36,7 @@ AM_VALAFLAGS = \
- 	--pkg folks \
- 	--pkg folks-test \
- 	--pkg folks-tracker \
--	--pkg tracker-sparql-0.12 \
-+	--pkg tracker-sparql-$(TRACKER_SPARQL_MAJOR) \
- 	--pkg tracker-test \
- 	-g \
- 	$(NULL)
--- 
-1.7.8.5
-
diff --git a/dev-libs/folks/files/folks-0.6.7-tracker-2.patch b/dev-libs/folks/files/folks-0.6.7-tracker-2.patch
deleted file mode 100644
index 7079c6b1..00000000
--- a/dev-libs/folks/files/folks-0.6.7-tracker-2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From f19d5ad0ab162b41747c0cd10a9c5ed30b23e187 Mon Sep 17 00:00:00 2001
-From: Travis Reitter <travis.reitter@collabora.co.uk>
-Date: Mon, 5 Mar 2012 14:22:13 -0800
-Subject: [PATCH] Bump Tracker version requirements to match current Tracker
-
----
- configure.ac |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 06cc381..7cd28e5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -148,8 +148,8 @@ GLIB_REQUIRED=2.24.0
- TP_GLIB_REQUIRED=0.13.1
- VALA_REQUIRED=0.15.1
- VALADOC_REQUIRED=0.3.1
--TRACKER_SPARQL_MAJOR=0.12
--TRACKER_SPARQL_REQUIRED=0.12.0
-+TRACKER_SPARQL_MAJOR=0.14
-+TRACKER_SPARQL_REQUIRED=0.13.1
- GCONF2_REQUIRED=2.31
- EBOOK_REQUIRED=3.1.5
- EDATASERVER_REQUIRED=3.1.5
--- 
-1.7.8.5
-
diff --git a/dev-libs/folks/folks-0.6.7.ebuild b/dev-libs/folks/folks-0.6.8.ebuild
index c4e26286..7027a22c 100644
--- a/dev-libs/folks/folks-0.6.7.ebuild
+++ b/dev-libs/folks/folks-0.6.8.ebuild
@@ -33,8 +33,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.24:2
 	sys-libs/readline
 
 	eds? ( >=gnome-extra/evolution-data-server-3.1.5 )
-	socialweb? ( >=net-libs/libsocialweb-0.25.15 )
-	tracker? ( >=app-misc/tracker-0.13.1 )"
+	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
+	tracker? ( >=app-misc/tracker-0.14 )"
 
 # telepathy-mission-control needed at runtime; it is used by the telepathy
 # backend via telepathy-glib's AccountManager binding.
@@ -52,7 +52,7 @@ DEPEND="${COMMON_DEPEND}
 	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
 	test? ( sys-apps/dbus )
 	vala? (
-		>=dev-lang/vala-0.15.1:0.16[vapigen]
+		>=dev-lang/vala-0.15.2:0.16[vapigen]
 		>=net-libs/telepathy-glib-0.13.1[vala]
 		eds? ( >=gnome-extra/evolution-data-server-3.0.1[vala] ) )"
 
@@ -70,6 +70,7 @@ pkg_setup() {
 		$(use_enable vala)
 		--enable-import-tool
 		--disable-docs
+		--disable-fatal-warnings
 		--disable-Werror"
 	if use vala; then
 		G2CONF="${G2CONF}
@@ -78,13 +79,6 @@ pkg_setup() {
 	fi
 }
 
-src_prepare() {
-	# Fix tracker-0.14 support, in next release
-	epatch "${FILESDIR}/${P}-tracker"-{1,2}.patch
-	eautoreconf
-	gnome2_src_prepare
-}
-
 src_test() {
 	# FIXME: eds tests often fails for no good reason
 	sed -e 's/check: .*/check: /' \
diff --git a/dev-libs/folks/folks-9999.ebuild b/dev-libs/folks/folks-9999.ebuild
index 940c2523..7027a22c 100644
--- a/dev-libs/folks/folks-9999.ebuild
+++ b/dev-libs/folks/folks-9999.ebuild
@@ -6,7 +6,7 @@ EAPI="4"
 GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 if [[ ${PV} = 9999 ]]; then
 	inherit gnome2-live
 fi
@@ -33,8 +33,8 @@ COMMON_DEPEND=">=dev-libs/glib-2.24:2
 	sys-libs/readline
 
 	eds? ( >=gnome-extra/evolution-data-server-3.1.5 )
-	socialweb? ( >=net-libs/libsocialweb-0.25.15 )
-	tracker? ( >=app-misc/tracker-0.13.1 )"
+	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
+	tracker? ( >=app-misc/tracker-0.14 )"
 
 # telepathy-mission-control needed at runtime; it is used by the telepathy
 # backend via telepathy-glib's AccountManager binding.
@@ -52,7 +52,7 @@ DEPEND="${COMMON_DEPEND}
 	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
 	test? ( sys-apps/dbus )
 	vala? (
-		>=dev-lang/vala-0.15.1:0.16[vapigen]
+		>=dev-lang/vala-0.15.2:0.16[vapigen]
 		>=net-libs/telepathy-glib-0.13.1[vala]
 		eds? ( >=gnome-extra/evolution-data-server-3.0.1[vala] ) )"
 
@@ -70,6 +70,7 @@ pkg_setup() {
 		$(use_enable vala)
 		--enable-import-tool
 		--disable-docs
+		--disable-fatal-warnings
 		--disable-Werror"
 	if use vala; then
 		G2CONF="${G2CONF}