Drop map USE flag for empathy-2 due to pending clutter-gtk-0.10 removal (bug #435164). Update 3.4 to EAPI5.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 52 insertions, 42 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 972a7686cfca..851de44bcd8e 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.111 2012/10/25 20:56:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.112 2012/12/05 22:37:16 tetromino Exp $
+
+  05 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  empathy-2.34.0-r2.ebuild, empathy-3.4.2.3.ebuild:
+  Drop map USE flag for empathy-2 due to pending clutter-gtk-0.10 removal (bug
+  #435164). Update license. Update 3.4 to EAPI5.
 
   25 Oct 2012; Gilles Dartiguelongue <eva@gentoo.org> -empathy-2.32.2.ebuild,
   empathy-2.34.0-r2.ebuild, empathy-3.2.2-r1.ebuild, -empathy-3.4.2.1.ebuild,
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index f8b5ab70388c..5b6d699796f5 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -11,15 +11,19 @@ AUX empathy-3.2.2-telepathy-logger-0.4.patch 2980 SHA256 5b55c7c4b7c8bea11a0e842
 DIST empathy-2.34.0.tar.bz2 3361496 SHA256 6efa0ae3ac3580ac9600f889c92497f36983e22da79d547a65030a14691369d1 SHA512 df1f8bac59ceeeff5cef2730df1720084bb4c4d7008c5b36dec122ef83a6a4852dea84d7cf9b83cdc939f56d2b5f49bfe612d00f1f9332c48ee48bc5b17a8565 WHIRLPOOL 60e818e222519bc1f30efdc92aa1eb471869e11c11d364287d0ee65de01ccb8895d1dc7e739194eed681cb4a6eb2966529e31959696220e98f5238ce504cd337
 DIST empathy-3.2.2.tar.xz 3184408 SHA256 d6a391b801f58024ed6f97d9bf4e774b9ab9e1262d79aefb5c1dd95233fd5aa1 SHA512 40df2b5ad6d20fcc9a3fba5e0ed543e29e28af37f4574c5d0c5229914fee581281efda696461c517d90dd6bbdff7158e9c25a5fa251308b62042884708dac400 WHIRLPOOL 8b1b42a0189231d797d0171d9a4316976f17c59911f92e0fceca3cfd0bae2e63596485a6b59516d3c57a8c9fad041a4203bd116233fca6504e1e58972edd8b04
 DIST empathy-3.4.2.3.tar.xz 3325712 SHA256 ca511c2a6bb2f39fb29127782b4b0ba813839f7ffc06ae8680445ecb5d58c203 SHA512 7850b6d81c6570d5c4279fb121db47b453d4fb5bbde7882f8887cd60d1b5d17317ffb974b0e4703ad105cf0326fc41b34892c9883d6a560cfb03e7f4f68d8ac9 WHIRLPOOL 01125b18c25b89e00aa1084411342a805999efe28ddc7305a1106ad8c703cbcc46188b0e030af9340bc72864cf98051948164fc78426b614b4c38676da42da6d
-EBUILD empathy-2.34.0-r2.ebuild 3293 SHA256 48587fd4838156a25c76f52e2755204e2a4f9230be0dda4e7ccc0a88234ecf50 SHA512 9a3595820e25a1ddfcddebe75af69c4abb1b15dca0f1fc7f6d5158a2bc0563f802d3af28131dd92386e4473146a2976f895b1ce86346c792983506514b351e09 WHIRLPOOL 5ee1c1e78984fe5417ebb8a40b18dd561e3da0b9f493e4335ae3a0dce11314fc05101289a79715eb5149870495a41b6501c830c9a479223299f0e980f23ed92c
+EBUILD empathy-2.34.0-r2.ebuild 3263 SHA256 4a37586f24b19bede46e2983de0a0647c9b9fc42da6e52a0c193b1af41448805 SHA512 a90faa742b02b8de4125f7bc0998e76d90394aea73f99b0b61e261a13d19efc18405f2a6518e43e60b29c24cb3c5721fed44db279a53c2007695d7e94a1f82c6 WHIRLPOOL 9d96b2f8e51d4bcd8e27230d038d3ed2849d7bc305e943e22d6582b5b17b24e6026621eba7a69b69ffc4fac85d714898811037b747c9f67cc7574fcfbb3d23ef
 EBUILD empathy-3.2.2-r1.ebuild 3829 SHA256 d72aaaaccdef12bc0a47d342c85b24a7f110cb330c07f4fed1b8359d4500def0 SHA512 38936d03d98694b8f0b011ab90bdf0c42ca7f9f8ab2a138a055bbc75b8bda3de0c6b05f385b258c6c19b2082d4617096541b15b28117a7cd090268fa36365e80 WHIRLPOOL 54e8fcf88f98c9aa180bfcc2477ed2e555d06bf4b94561fc5a164ec21fb46a1b91d02ac1572343e73c5549b712c0609107beeae0faa4bf1ee456942a40e8c046
-EBUILD empathy-3.4.2.3.ebuild 3800 SHA256 17dc1e213841bc5e7ccae28cdc15c2de45c73c74cf0eb650b5c746f8719d843c SHA512 fa36e5cd05ba04a6804f7cb510c6b5b6e4ed24a35364cdaae9efa2b74f38ece8f60d10ef0ae651749b5c53b5947cbc6417577d708da66133ba02200a22e1b2c2 WHIRLPOOL 7e66bb5a47896dfd4dd6474630297068845d95540b746dda51fa3c5cb61cd042681eec9a3a11cd97b4fc507ac8dc3456642b7f31326b8995131ffed1ac6753d1
-MISC ChangeLog 19832 SHA256 976168b80c7d4f7e96840690085ee39e419a95203c6910cc432530db7eb0c74f SHA512 ccbbe3957bb4ac4dacc5ae36a0047b428e232deac545d38a333bef74c25f1f0405bb6f0fd0a31191a66ce53c031da9fff9f47e7f78d0af3808b7fecd009b28f1 WHIRLPOOL f05d3086cf715ed5ef8fedde1d34b87c7ef134f242f0ad8d59107e041097c4eaa46a7a08ef5d7258a32d61872342b5ae442b977906807359830062ae440ccb4e
+EBUILD empathy-3.4.2.3.ebuild 3941 SHA256 1c0338f1062cedbcd5e851416323e1739d212779aa987d6219c2c94bf7333623 SHA512 b6fafb1434caa4cffd88ccfbc2f8e48511d3746406c634e08ec5d883cbc1ca6f15f9e66f1cced725ea8c7d5d1be1a81ff609bad2f44d0c4abc6903dce94f03c2 WHIRLPOOL 7d8c7d6912ff8595c836566148142dae61fe0f0e45d5401bebb182e3c61d1652618cc2d521b3e1cf88df34999f1648c8f6a10fade9d77ac251c34b9566c03df4
+MISC ChangeLog 20078 SHA256 411e999ad60d997eef72f1585fc6afeeac88a3af84aeed3164635778ff24a739 SHA512 6541dc4f96ba3a344c82c70e6e23ea496b84fd02109ae56c9165db306d9a43963682df28c9a83af359d1c9f206b11be3c830b308c5a861ebb213b45ae24eafb2 WHIRLPOOL db4b6008b47101812ccffa51aee8ddd3c8dbd2ff038786ac30096a38714f676253b181723a215607e5d20adbd22e1bc3895e21a5b2c07b374da3a8dcd05a6657
 MISC metadata.xml 1665 SHA256 d004a67be9d82c28f16d52bb1fc2f50ec5c8bbd92b010b89ac0d652723c45140 SHA512 bb52d7245d6111add9c110a8aa3506d5ad8b7bf7d77385cd9d493133941176ed13081e056d65bb212796a9b0e955b7fe83025eaa165d1a0cae59b65fc3c9af6d WHIRLPOOL 800ffadf5d4f5fcd81f799b09ae9cc1299ebeb7f5bc75cddc17496c3c44c18a3c95752963d855653263228a89b3a704dd06635c3cba82efbb8808ceef80beab4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCJp38ACgkQ1fmVwcYIWAaUCgCg3TzWDndbzXzpXWTCbGlJItg9
-8W8AniDis107liIaGUf5Q3r+0U7Ub1R7
-=3QS3
+iQEcBAEBCAAGBQJQv8yeAAoJEJ0WA1zPCt1hj+QH/RBWYQsYOneVxWE8xdif3WSb
+ecx4lURfKAKqhfzvotZDF80ZENM4Dm0UT/fmQko/Kl2q2IbcGzKAKgAc92dTm+0i
+yU7Vruwt2J+aB70TvsrDFaB02K3YaZq29zwITLnczet4cbXjlj3O3LANrVfKY1kf
+hv3y91M+OR7COSni6XTxnmcXYDEUiaHMeZzCn/2UKJp4ZHAxLAXJJPdKWGmU0HOk
+aYNzuWCo3Iw9GCb0R9S4WheIZmn/hV0bI65CQibWcKwUijgjsMfI1klOvlRAlhis
+uI+xxJWLKMsBxlW1c/iv5Y1nmFaXZEz6RzyXhMLSdhx2P9tflhL66aIcDmb4HuM=
+=Ehn2
 -----END PGP SIGNATURE-----
diff --git a/net-im/empathy/empathy-2.34.0-r2.ebuild b/net-im/empathy/empathy-2.34.0-r2.ebuild
index ac05f57bffc6..ac2cd9dda308 100644
--- a/net-im/empathy/empathy-2.34.0-r2.ebuild
+++ b/net-im/empathy/empathy-2.34.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0-r2.ebuild,v 1.9 2012/10/25 20:56:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.34.0-r2.ebuild,v 1.10 2012/12/05 22:37:16 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -13,11 +13,11 @@ inherit eutils gnome2 multilib python
 DESCRIPTION="Telepathy client and library using GTK+"
 HOMEPAGE="http://live.gnome.org/Empathy"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ~ia64 ppc ~sparc x86 ~x86-linux"
 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="eds map nautilus networkmanager spell test webkit"
+IUSE="eds nautilus networkmanager spell test webkit"
 
 # FIXME: libnotify & libcanberra hard deps
 # gst-plugins-bad is required for the valve plugin. This should move to good
@@ -45,9 +45,6 @@ RDEPEND=">=dev-libs/glib-2.27.2:2
 	>=net-im/telepathy-logger-0.2.0
 
 	eds? ( >=gnome-extra/evolution-data-server-1.2 )
-	map? (
-		>=media-libs/libchamplain-0.7.1:0.8[gtk]
-		>=media-libs/clutter-gtk-0.10:0.10 )
 	nautilus? ( >=gnome-extra/nautilus-sendto-2.31.7 )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	spell? (
@@ -68,9 +65,16 @@ DEPEND="${RDEPEND}
 PDEPEND=">=net-im/telepathy-mission-control-5.7.6"
 
 pkg_setup() {
+	# Build time python tools needs python2
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
 
 	# call support needs unreleased telepathy-farstream
+	# map disabled due to clutter-gtk-0.10 removal, bug #435164
 	G2CONF="${G2CONF}
 		--enable-silent-rules
 		--disable-coding-style-checks
@@ -82,20 +86,12 @@ pkg_setup() {
 		--disable-Werror
 		$(use_enable debug)
 		$(use_with eds)
-		$(use_enable map)
+		--disable-map
 		$(use_enable nautilus nautilus-sendto)
 		$(use_with networkmanager connectivity nm)
 		$(use_enable spell)
 		$(use_enable webkit)"
 
-	# Build time python tools needs python2
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
 	epatch "${FILESDIR}"/${P}-auth-dialog-crash-fix.patch
 
 	# Fix script injection vulnerability (CVE-2011-3635), bug #388051
@@ -105,6 +101,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-missing-include.patch
 
 	python_convert_shebangs -r 2 .
+	gnome2_src_prepare
 }
 
 src_test() {
diff --git a/net-im/empathy/empathy-3.4.2.3.ebuild b/net-im/empathy/empathy-3.4.2.3.ebuild
index f17a572b9101..b2b95ba9b705 100644
--- a/net-im/empathy/empathy-3.4.2.3.ebuild
+++ b/net-im/empathy/empathy-3.4.2.3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.4.2.3.ebuild,v 1.3 2012/10/25 20:56:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-3.4.2.3.ebuild,v 1.4 2012/12/05 22:37:16 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 PYTHON_DEPEND="2:2.5"
@@ -12,7 +12,7 @@ inherit gnome2 python
 DESCRIPTION="Telepathy instant messaging and video/audio call client for GNOME"
 HOMEPAGE="http://live.gnome.org/Empathy"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.3+ CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
 IUSE="debug eds +geocode +geoloc gnome gnome-online-accounts legacy-call +map +networkmanager sendto spell test +v4l"
 KEYWORDS="~amd64 ~x86 ~x86-linux"
@@ -26,38 +26,39 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 	>=x11-libs/gtk+-3.3.6:3
 	x11-libs/pango
 	>=dev-libs/dbus-glib-0.51
-	>=dev-libs/folks-0.6.8
-	dev-libs/libgee:0
+	>=dev-libs/folks-0.6.8:=
+	dev-libs/libgee:0=
 	>=gnome-base/gnome-keyring-2.91.4-r300
 	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/gnutls-2.8.5
-	>=net-libs/webkit-gtk-1.3.13:3
+	>=net-libs/gnutls-2.8.5:=
+	>=net-libs/webkit-gtk-1.3.13:3=
 	>=x11-libs/libnotify-0.7
 
 	>=media-libs/clutter-1.10.0:1.0
 	>=media-libs/clutter-gtk-1.1.2:1.0
 	>=media-libs/clutter-gst-1.5.2:1.0
+	media-libs/cogl:1.0=
 
-	>=net-libs/telepathy-glib-0.18
-	>=net-im/telepathy-logger-0.2.13
-	net-libs/farstream
-	>=net-libs/telepathy-farstream-0.2.1
+	>=net-libs/telepathy-glib-0.18:=
+	>=net-im/telepathy-logger-0.2.13:=
+	net-libs/farstream:=
+	>=net-libs/telepathy-farstream-0.2.1:=
 
 	dev-libs/libxml2:2
 	gnome-base/gsettings-desktop-schemas
 	media-libs/gstreamer:0.10
-	media-sound/pulseaudio[glib]
+	media-sound/pulseaudio:=[glib]
 	net-libs/libsoup:2.4
 	x11-libs/libX11
 
-	eds? ( >=gnome-extra/evolution-data-server-1.2 )
+	eds? ( >=gnome-extra/evolution-data-server-1.2:= )
 	geocode? ( sci-geosciences/geocode-glib )
 	geoloc? ( >=app-misc/geoclue-0.12 )
-	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.3.0 )
+	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.3.0:= )
 	map? (
 		>=media-libs/clutter-1.7.14:1.0
 		>=media-libs/clutter-gtk-0.90.3:1.0
-		>=media-libs/libchamplain-0.12.1:0.12[gtk] )
+		>=media-libs/libchamplain-0.12.1:0.12=[gtk] )
 	networkmanager? ( >=net-misc/networkmanager-0.7 )
 	sendto? ( >=gnome-extra/nautilus-sendto-2.90.0 )
 	spell? (
@@ -65,7 +66,7 @@ COMMON_DEPEND=">=dev-libs/glib-2.30:2
 		>=app-text/iso-codes-0.35 )
 	v4l? (
 		media-plugins/gst-plugins-v4l2:0.10
-		>=media-video/cheese-3.4
+		>=media-video/cheese-3.4:=
 		sys-fs/udev[gudev] )
 "
 # FIXME: gst-plugins-bad is required for the valve plugin. This should move to good
@@ -94,6 +95,12 @@ DEPEND="${COMMON_DEPEND}
 PDEPEND=">=net-im/telepathy-mission-control-5.12"
 
 pkg_setup() {
+	# Build time python tools need python2
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
 	DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
 	G2CONF="${G2CONF}
 		--disable-coding-style-checks
@@ -113,10 +120,7 @@ pkg_setup() {
 		$(use_enable spell)
 		$(use_with v4l cheese)
 		$(use_enable v4l gudev)"
-
-	# Build time python tools need python2
-	python_set_active_version 2
-	python_pkg_setup
+	gnome2_src_prepare
 }
 
 src_test() {