Version bump, drop old

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 24 insertions, 104 deletions

diff --git a/dev-libs/folks/ChangeLog b/dev-libs/folks/ChangeLog
index 73d1e2d5b027..fd057ce3fbd1 100644
--- a/dev-libs/folks/ChangeLog
+++ b/dev-libs/folks/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/folks
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.44 2014/07/23 15:14:07 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/ChangeLog,v 1.45 2014/09/02 10:38:39 pacho Exp $
+
+*folks-0.9.8 (02 Sep 2014)
+
+  02 Sep 2014; Pacho Ramos <pacho@gentoo.org> +folks-0.9.8.ebuild,
+  -folks-0.9.6-r1.ebuild, -folks-0.9.6.ebuild:
+  Version bump, drop old
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> folks-0.9.7.1.ebuild:
   Stable for x86, wrt bug #512012
diff --git a/dev-libs/folks/Manifest b/dev-libs/folks/Manifest
index c058f7a2bc4a..7b73b7f1cf1a 100644
--- a/dev-libs/folks/Manifest
+++ b/dev-libs/folks/Manifest
@@ -2,28 +2,17 @@
 Hash: SHA256
 
 DIST folks-0.4.3.tar.bz2 635168 SHA256 e5a5bbe1524130ff5b6400726db3e12299b12ffefa108bc89169509f343d925e SHA512 dfd7cb055aba691e7b8e7daa3e887e20f021d230617641c0dcf91787b53b576601fabeeba654e98009b47ecff39969ea1b560822d4452ee497c7eeedc16c423b WHIRLPOOL 49cee01e55e9223b6566d76c21f8de68a15c6a2534ce4b4d6ed752e9cf8dadd256b5343a46c26e0236155901864e34b6677764aa70c43c8e18df692c40d8c85d
-DIST folks-0.9.6.tar.xz 1694012 SHA256 a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f SHA512 613d4cfb84f4ce9656994950f66d974c99c074317c5f1c92f4501760261021e8e86d85e56c7720fa0f6a20db818a1e813d6cd40e67d4157fd3005a3770a86127 WHIRLPOOL ae564d02ec3bea7efca04bd9a0f77732fdc03217538d1cb410bf7c467cca606adcf8bc395d7f8f4ed386eb07e687203889b75c930a8103dc104ce2ce1afb0d94
 DIST folks-0.9.7.1.tar.xz 1860208 SHA256 8d53cf9f6ccb7d9499a352c7367170b103b14a7d59da0bd06dda8c57b689276a SHA512 26926d7eb284322618ac6fd654bc5e0f600b7e6ee5feaf9e7f5216f33eac9dd0a58549a0fd9715a273c5feafd6f5f83e21aa4a60595a252aa6a872a07e38e9cd WHIRLPOOL 216ab08a4053eee22cd52612d4c37751f1bfc533940ae86fb354c4ca08e42dea3ec200871d1cae7d26fb153999f90afba7c80820a4c811b13db94b3b26e8ca28
+DIST folks-0.9.8.tar.xz 1862184 SHA256 d2d1da6ba107aa077efdcb05df6250ddc225f1ac7275f47888976b06e3d08b25 SHA512 2783a48ad57cf9bbad6079f533d553296a27c21ecada89d39c56c78a27d26ca148e26d7b8df3373b1d4579ee0a926d4c6ab55baac95d2459103a7aa6f05b4d9d WHIRLPOOL 4b152e77124592841b6bfde316e6d1811fe245c38f2cd2614dbbc3ce62e9a9b93812ead0a67837770e8400eb4509fdf957ed05a96a671593619eb424642c81b7
 EBUILD folks-0.4.3.ebuild 1262 SHA256 e685df940a335fa5620fde997158a10ab4b33163d85b84c29d8f1aabb9d5004b SHA512 f3306604f1e852af4739ddaa8cfe3b0f30c7920ca018aa7c9e334f608a5a4d7c4a32e589e4082a0fbf8f6275b26e2351bc62555960e507dfd00f0e97f60ee5c2 WHIRLPOOL 13ed9ea89d2be87005884ecad979d4e0a242b9cf8619bfb1638d4b5f25b7bfc3246d8d08ba48bbd3add6c07e11dd31ce2d08be6cd6945f9695507ef5d6ce413e
-EBUILD folks-0.9.6-r1.ebuild 2564 SHA256 3661af85a55e0b687f52b4e81f44f8fa39bafda5e5d97d83fc82caefcef1c991 SHA512 913081cd98e4817f5e5c7c073e57a60bf8be1fdc99e3e6caba5a12537b0a33332dd53002a82fe06ad6fe6fc2a8053ff512a4a3cc38b94add1437c13389f38f00 WHIRLPOOL 55839185522ae157ea97677868ade18dccea8fc275086f00b6767a4fb61a534a6f2c83541fc9c0e511a043cf6f3c1129a6ce989e93d0327ae23080467afa42b0
-EBUILD folks-0.9.6.ebuild 2444 SHA256 d43ae337151537b5d7d4d8899e07ed5eeca20e0bb291e54bd0e222484acf33e0 SHA512 b197a384b174755d11d79683fdb431e907575a6e7e7402277be7605d103b778b8bc0277ab233b7f00ecf8e362797e8e5e7bb1ef992d711b781f4a4d0530c7f27 WHIRLPOOL a76914df9a028cc72552905986cfaaac29f5775b7d5a91213f2c8f19eb11b818c10f312b56d01992ec0c86911ffaffe7a15fa5bfcc8c5c65348fdcf13a51e403
 EBUILD folks-0.9.7.1.ebuild 2726 SHA256 2588f8ba6942eb39b5b9d5d15d333510058e932ff228042dd7776aafda5d3922 SHA512 2687afe34920baef9d53ffb0d93cdbf5070e10f55460cb9495b5736890d81b436381fc24e1f14d5e42ee17d2fbee9e1c6fb56af04e509507a3c2747dfff1b666 WHIRLPOOL b87e082c6ff591726095fa80735f493b320a4f8d407e738ac0dd944517684b6784cf9698608927115c758ec2f3759b9928ab6dc3d8dba66cc79bf05420ded728
-MISC ChangeLog 6541 SHA256 38435adf04dfa5a98d488ac1b6db151294236eb379a147d3d60bbb1fd0edc98c SHA512 08db28c715390b459820043ae596787c2605271c4c7842924a62b817ac89418837508e99ee7e488bf3a3627dbfdf8d727790ac1ba28cb21467efe9b58d5a092e WHIRLPOOL a2bfc7d2baa0c305210890737b5e884b12831ce3295eff68e1f4309d94629fe1b1f1816052afda25bbc3edd310b4323fc835c572e062ff9679bbaf5a61433afb
+EBUILD folks-0.9.8.ebuild 2781 SHA256 6d5045a4c197fd6cd476e15502caa14f23bac55f88d63b11d2190d0a8b014551 SHA512 e16034b01b8882f33fcba6a19c8e40cd4c49ce5d0f9aac3eeca8735aeb80765484fd939639d0016c9c5ad2613690dc7fdb57a91be6badcf9a561758a43ddc69a WHIRLPOOL 3d2c1c513b0aeced8019775fd3cd38174fd5ea3f84d6b5d3dfc0b86d775bb0c0e673fef64864981c4ca095fc8a26aacf131757239b61ca56c9a686a66461866e
+MISC ChangeLog 6711 SHA256 4447d461000b3008ada559b409687cd62fcf4c36860a4526fc0162dcca44f627 SHA512 c1c6e0090260f9b1e0201ddcbff59166a62144be52c83939822d56c1a4ae6ecd3ce2c9560d18dd7dd3edc4f304dad1ab0dc7f485a38eb3f08fc0ff8850b53fae WHIRLPOOL 073d08fe7dea98aef2131f989372cdb7ac20e012cf192229c239e928dfa480fe1a8b306d40e73ed3bce056085b94aa53f8166ae33572d91253044e0952029a20
 MISC metadata.xml 561 SHA256 c39078a098dc01eb77baa80485700f14a684a9379f256efa7143f79144b189bc SHA512 a2b01fd5035b0f290b1e066d2b1577ebcd604f1cdb318958c5684ca38ea5ad73b0384141b7ed7ff9ed86779b26a1d9d09365586cc21166a03e5c5406ecdc8d89 WHIRLPOOL 8e1eebfa1ed4e915886bd472203f48ab78f2f7d6eab9ee6ce29cb0f8f600013699beb38970eab2f64b8660b8005c2c48b81d00592c73ab1c81e550c6bf2f899a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9FAAAoJELp701BxlEWfSb8QAIGZMBqwUomMn86WuM9wj1dS
-AjV9JO5sgNzBauch4C3XPt+Wst5FFA6gDRIxmofnqQHvS/PJCd6JTZPUnBJ8Obdy
-Dm1WaCck6J33iSL1/g4PoWaJi/JHuYX1QLsRXjuhHb5BdMWOPkjo3Chx5baH/g1I
-xECTXo8nHP+1nnTaNdI7ZzXsnWXsB+wpDg690B66Z0C4vS2y8uwHDjKWiyYJQVCW
-IEWq+XjCXrf9VG56K+6igDvazEz+CAUXvEmmXJFREa9MIdp4XxYxuQSq0JK0kW75
-NfEGEsP1hSlH1EZSXZTMD6qi/l+UvjDwdfNCM+XLJMmG2gPKhhXnvvuGgsOq0l9+
-E4xnjytoxvbo9XymrddRUjr5dBBTJE8W0IoIWbrA/Qi/njXDDDNEtNafr0lLD7Fb
-eEBjP8OSZy7dkZcKR9Mx+Hq+1zroGOJEdz7kYuIrt0nlsnh+BRn0ruK/fzulQjeM
-giisGA8bPX1/CwFLe/LsuN32L+9lqeXQqDE/AnPmX/ueCDR7gQ3YoDXm3iu62gvm
-fLgtfE9qVGWQt7M9JezDHSyogclw2+CjAEqMmndhQ1Y5ucH9V/+635/GI+dnvYF0
-253xcGMoo6pyfZ5cXIeWFs/2K1qTlReRiO9oMQTPvk4Rb+tvxIWOSqkSwZOcab/J
-l6vnp2kNc9zwd0wSBZlU
-=NPGA
+iEYEAREIAAYFAlQFnjAACgkQCaWpQKGI+9Sh3wCePMfonf7U9qhRyczHEUlCfQVk
+hEoAn229TTob2puaVaNOwi3zRT4BZTQH
+=PI8p
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/folks/folks-0.9.6.ebuild b/dev-libs/folks/folks-0.9.6.ebuild
deleted file mode 100644
index 58d56303d60c..000000000000
--- a/dev-libs/folks/folks-0.9.6.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.9.6.ebuild,v 1.3 2014/03/09 11:54:50 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="yes"
-VALA_MIN_API_VERSION="0.22"
-VALA_USE_DEPEND="vapigen"
-
-inherit gnome2 vala virtualx
-
-DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://live.gnome.org/Folks"
-
-LICENSE="LGPL-2.1+"
-SLOT="0/25" # subslot = libfolks soname version
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-linux"
-# TODO: --enable-profiling
-# Vala isn't really optional, https://bugzilla.gnome.org/show_bug.cgi?id=701099
-IUSE="bluetooth eds socialweb +telepathy test tracker utils zeitgeist"
-REQUIRED_USE="bluetooth? ( eds )"
-
-COMMON_DEPEND="
-	$(vala_depend)
-	>=dev-libs/glib-2.38.2:2
-	dev-libs/dbus-glib
-	>=dev-libs/libgee-0.10:0.8[introspection]
-	dev-libs/libxml2
-	sys-libs/ncurses:=
-	sys-libs/readline:=
-
-	bluetooth? ( >=net-wireless/bluez-5 )
-	eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] )
-	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
-	telepathy? ( >=net-libs/telepathy-glib-0.19[vala] )
-	tracker? ( >=app-misc/tracker-0.16:= )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.14 )
-"
-# telepathy-mission-control needed at runtime; it is used by the telepathy
-# backend via telepathy-glib's AccountManager binding.
-RDEPEND="${COMMON_DEPEND}
-	net-im/telepathy-mission-control
-"
-# folks socialweb backend requires that libsocialweb be built with USE=vala,
-# even when building folks with --disable-vala.
-DEPEND="${COMMON_DEPEND}
-	>=dev-libs/gobject-introspection-1.30
-	>=dev-util/intltool-0.50.0
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
-	test? ( sys-apps/dbus )
-	!<dev-lang/vala-0.22.1:0.22
-"
-
-src_prepare() {
-	vala_src_prepare
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Rebuilding docs needs valadoc, which has no release
-	gnome2_src_configure \
-		$(use_enable bluetooth bluez-backend) \
-		$(use_enable eds eds-backend) \
-		$(use_enable eds ofono-backend) \
-		$(use_enable socialweb libsocialweb-backend) \
-		$(use_enable telepathy telepathy-backend) \
-		$(use_enable tracker tracker-backend) \
-		$(use_enable utils inspect-tool) \
-		$(use_enable test tests) \
-		$(use_enable zeitgeist) \
-		--enable-vala \
-		--enable-import-tool \
-		--disable-docs \
-		--disable-fatal-warnings
-}
-
-src_test() {
-	dbus-launch Xemake check
-}
diff --git a/dev-libs/folks/folks-0.9.6-r1.ebuild b/dev-libs/folks/folks-0.9.8.ebuild
index a5175440b7d0..376932189e71 100644
--- a/dev-libs/folks/folks-0.9.6-r1.ebuild
+++ b/dev-libs/folks/folks-0.9.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.9.6-r1.ebuild,v 1.1 2014/04/27 16:02:25 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/folks/folks-0.9.8.ebuild,v 1.1 2014/09/02 10:38:39 pacho Exp $
 
 EAPI="5"
 GCONF_DEBUG="yes"
@@ -10,7 +10,7 @@ VALA_USE_DEPEND="vapigen"
 inherit gnome2 vala virtualx
 
 DESCRIPTION="Library for aggregating people from multiple sources"
-HOMEPAGE="https://live.gnome.org/Folks"
+HOMEPAGE="https://wiki.gnome.org/Projects/Folks"
 
 LICENSE="LGPL-2.1+"
 SLOT="0/25" # subslot = libfolks soname version
@@ -30,7 +30,7 @@ COMMON_DEPEND="
 	sys-libs/readline:=
 
 	bluetooth? ( >=net-wireless/bluez-5 )
-	eds? ( >=gnome-extra/evolution-data-server-3.9.1:=[vala] )
+	eds? ( >=gnome-extra/evolution-data-server-3.8:=[vala] )
 	socialweb? ( >=net-libs/libsocialweb-0.25.20 )
 	telepathy? ( >=net-libs/telepathy-glib-0.19[vala] )
 	tracker? ( >=app-misc/tracker-1:0= )
@@ -43,6 +43,9 @@ RDEPEND="${COMMON_DEPEND}
 "
 # folks socialweb backend requires that libsocialweb be built with USE=vala,
 # even when building folks with --disable-vala.
+#
+# FIXME:
+# test? ( bluetooth? ( dbusmock is missing in the tree ) )
 DEPEND="${COMMON_DEPEND}
 	>=dev-libs/gobject-introspection-1.30
 	>=dev-util/intltool-0.50.0
@@ -50,12 +53,16 @@ DEPEND="${COMMON_DEPEND}
 	virtual/pkgconfig
 
 	socialweb? ( >=net-libs/libsocialweb-0.25.15[vala] )
-	test? ( sys-apps/dbus )
+	test? ( sys-apps/dbus
+		bluetooth? (
+			>=gnome-extra/evolution-data-server-3.9.1
+			>=dev-libs/glib-2.39.2 ) )
 	!<dev-lang/vala-0.22.1:0.22
 "
 
 src_prepare() {
 	# Allow building against tracker-1.0
+	# https://bugzilla.gnome.org/show_bug.cgi?id=728520
 	sed -e 's/\(TRACKER_SPARQL_MAJOR\)=0.16/\1=1.0/' \
 		-i configure{.ac,} || die