Add patch to fix compilation with networkmanager-0.8 (causes dropping of keywords, bug 296548), fixes bug 306977 . Also remove old versions.

Package-Manager: portage-2.1.7.17/cvs/Linux i686

6 files changed, 50 insertions, 127 deletions

diff --git a/net-im/empathy/ChangeLog b/net-im/empathy/ChangeLog
index 68362bea029a..c3454216b298 100644
--- a/net-im/empathy/ChangeLog
+++ b/net-im/empathy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/empathy
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.50 2010/02/19 19:33:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/ChangeLog,v 1.51 2010/02/28 12:44:17 nirbheek Exp $
+
+*empathy-2.28.2-r1 (28 Feb 2010)
+
+  28 Feb 2010; Nirbheek Chauhan <nirbheek@gentoo.org>
+  +files/empathy-2.28-networkmanager-0.8.patch, -empathy-2.28.1.1.ebuild,
+  -empathy-2.28.1.2.ebuild, empathy-2.28.2.ebuild,
+  +empathy-2.28.2-r1.ebuild:
+  Add patch to fix compilation with networkmanager-0.8, fixes bug 306977 .
+  also remove old versions.
 
   19 Feb 2010; Raúl Porcel <armin76@gentoo.org> empathy-2.26.2.ebuild,
   empathy-2.28.1.1.ebuild, empathy-2.28.1.2.ebuild, empathy-2.28.2.ebuild:
diff --git a/net-im/empathy/Manifest b/net-im/empathy/Manifest
index 4d5a305d0b49..ba1299b39c81 100644
--- a/net-im/empathy/Manifest
+++ b/net-im/empathy/Manifest
@@ -1,12 +1,10 @@
+AUX empathy-2.28-networkmanager-0.8.patch 674 RMD160 a507683f229700db3bbc82f4d75d76404655bf28 SHA1 2a4676d8e629297df7d756e8fadc4a443d86d0c5 SHA256 f5d15db62b88e8df457885f2d6d65c482c7537d605c404828f05640964433432
 DIST empathy-2.24.1.tar.bz2 1761446 RMD160 97e58664c1cf3977806884cc401d679ecca91365 SHA1 7c2b6434d5fd855e887e6ef27300601609706ea5 SHA256 24b675e389fb91898bd2924f8b35db7e7aef4c40bbb69412e445048dd9e18123
 DIST empathy-2.26.2.tar.bz2 2021659 RMD160 58d995c9e616aa5d429dde9fad5861d66a33521f SHA1 d2eb4de3d3efd7728dc28eb16dfe60c64141be70 SHA256 2790502f62056926feeab71681033e5787856f7b56ae0beaa49f89b4763f1b9a
-DIST empathy-2.28.1.1.tar.bz2 2368699 RMD160 b159cd7875810e5934d77fac358a94e57a080f3b SHA1 40d4f32efd0fc0875a90789eb7514c1712d3e0c2 SHA256 113409676b2770da2736c17a8ca58eb012816b3741f02415c3f6bdae5e4b0f09
-DIST empathy-2.28.1.2.tar.bz2 2432256 RMD160 d9e9131e7ed21180ac4e5ecf07016f17b4bfc5c9 SHA1 59569ca129191a2b73c3b7337853c31783275abd SHA256 7af58b5d6c315dd08f7ad519d1aeed545a6c2c99ff1275ad3a442bcf513b7a0d
 DIST empathy-2.28.2.tar.bz2 2432940 RMD160 a306be47d681c5192eb30db91792ac823ef27528 SHA1 712752a7675429215dc92e3f35106b91baa9772b SHA256 8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b
 EBUILD empathy-2.24.1.ebuild 1899 RMD160 cec86f7a9e92da7799aac0eb64b24ac01882304b SHA1 c8ca58ddc24a49cb8c59065f1ef1ad609114fce3 SHA256 fee6f5e108894789aa826cc1871940265929fda8ee92d65eec8b3cf3af68bb46
 EBUILD empathy-2.26.2.ebuild 2458 RMD160 22232403dabf5b43f872ab0e4d19f25139a7002e SHA1 d176af1eae77dc6fb5afccfc3fa72dfa30b50e31 SHA256 540af849275cf1107df562e964c3092a279f858217e838cad20847417c9f0e28
-EBUILD empathy-2.28.1.1.ebuild 2989 RMD160 6a919cc57973202d085ebb3fe7e56d86f228eac9 SHA1 8ee1a3856e6fd9875e4c74dd626553409a26d69b SHA256 7d74c97c0ef489edf47db93a30f65d1360b4a649ac00980776c67379156c1a4e
-EBUILD empathy-2.28.1.2.ebuild 2989 RMD160 2b62aa307748b177fe615c66ac3ed254afb72b13 SHA1 4d3ffad4267b941872173cbcf858a8baa8a88a08 SHA256 a230e115249b1551c050ea644202e809f0496ba2655f08663d05cdaae2a1e50b
-EBUILD empathy-2.28.2.ebuild 2988 RMD160 6fd9823bd01d301ce61f1ab7b62034d3fd43b5fe SHA1 6196447e25bd6d030a659c7d96944263f0ba0973 SHA256 38c748ae001f33db26be4ac72893a35ae9856c8b47c9026c92f143d49da3bf96
-MISC ChangeLog 9640 RMD160 9bf5acf1109eb7cddadeab454ebfdf71ba65b58d SHA1 5e1b129b3e6ef9aa06e77afc34226f0290dd1f8d SHA256 2a822cf5b37938ff96ebc71fc9a3d010143629698ca93c8b771f1ed496635a19
+EBUILD empathy-2.28.2-r1.ebuild 3058 RMD160 45fc17189884dbddcddc721b1d9c0292d29ce5f5 SHA1 cc614196d41815663e40051ade4ff3180fd6b48c SHA256 76442e8a26f1bbd1595727aa50028a386f71733babae3efaab421b6222e4f345
+EBUILD empathy-2.28.2.ebuild 2989 RMD160 08417a61256b5ec5fbbeb614410778ab37e4e73e SHA1 1e3087742fe0a9fb6943e00e00c9010d76d308a8 SHA256 897fba457a046d5e270aa479a622f57553834529748f8e632b8993961e11755f
+MISC ChangeLog 9987 RMD160 201d3cabdf653367e89a97db4f8ccc2d42e02edf SHA1 72c3285d8cd5d3540878359b0886b20e9b618209 SHA256 1022b9e3f53c87b15832e70a9a3daebabbd860a4948542f2838a1caa9c103cc0
 MISC metadata.xml 875 RMD160 34c44fbdf7f04c70b4ee8d0a85c4ec6c90cc832d SHA1 15265e3df973d8d6232717a2d5967f15e03851f0 SHA256 31b4ba56cbe74d9625fb7d1dcc90bfa79c91699df872d3dffa51197e2fd31ba6
diff --git a/net-im/empathy/empathy-2.28.1.2.ebuild b/net-im/empathy/empathy-2.28.1.2.ebuild
deleted file mode 100644
index 43b7d0c49cca..000000000000
--- a/net-im/empathy/empathy-2.28.1.2.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.1.2.ebuild,v 1.2 2010/02/19 19:33:27 armin76 Exp $
-
-EAPI="2"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Telepathy client and library using GTK+"
-HOMEPAGE="http://live.gnome.org/Empathy"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
-# FIXME: Add location support once geoclue stops being idiotic with automagic deps
-IUSE="applet networkmanager python spell test webkit" # map
-
-# FIXME: libnotify & libcanberra hard deps
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.16.0
-	>=gnome-base/gconf-2
-	>=dev-libs/dbus-glib-0.51
-	>=gnome-extra/evolution-data-server-1.2
-	>=net-libs/telepathy-glib-0.7.35
-	>=media-libs/libcanberra-0.4[gtk]
-	>=x11-libs/libnotify-0.4.4
-	>=gnome-base/gnome-keyring-2.22
-
-	dev-libs/libunique
-	net-libs/farsight2
-	media-libs/gstreamer:0.10
-	media-libs/gst-plugins-base:0.10
-	net-libs/telepathy-farsight
-	dev-libs/libxml2
-	x11-libs/libX11
-	net-voip/telepathy-connection-managers
-
-	applet? ( >=gnome-base/gnome-panel-2.10 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
-	python? (
-		>=dev-lang/python-2.4.4-r5
-		>=dev-python/pygtk-2 )
-	spell? (
-		app-text/enchant
-		app-text/iso-codes )
-	webkit? ( >=net-libs/webkit-gtk-1.1.7 )
-"
-#	map? (
-#		>=media-libs/libchamplain-0.4[gtk]
-#		>=media-libs/clutter-gtk-0.10:1.0 )
-DEPEND="${RDEPEND}
-	app-text/scrollkeeper
-	>=app-text/gnome-doc-utils-0.17.3
-	>=dev-util/intltool-0.35.0
-	>=dev-util/pkgconfig-0.16
-	test? (
-		sys-apps/grep
-		>=dev-libs/check-0.9.4 )
-	dev-libs/libxslt
-	virtual/python
-"
-PDEPEND=">=net-im/telepathy-mission-control-5"
-
-DOCS="CONTRIBUTORS AUTHORS ChangeLog NEWS README"
-
-# FIXME: Highly broken with parallel make, mallard strike 2, see bug #286889
-MAKEOPTS="${MAKEOPTS} -j1"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-maintainer-mode
-		--disable-static
-		--disable-location
-		--disable-gtk-doc
-		$(use_enable applet megaphone)
-		$(use_enable applet nothere)
-		$(use_enable debug)
-		$(use_with networkmanager connectivity nm)
-		$(use_enable map)
-		$(use_enable python)
-		$(use_enable spell)
-		$(use_enable test coding-style-checks)
-		$(use_enable webkit)
-	"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687
-	sed -i "s:-Werror::g" configure || die "sed 1 failed"
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-	emake check || die "emake check failed."
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-	preserve_old_lib /usr/$(get_libdir)/libempathy.so.23
-	preserve_old_lib /usr/$(get_libdir)/libempathy-gtk.so.19
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	echo
-	elog "Empathy needs telepathy's connection managers to use any IM protocol."
-	elog "See the USE flags on net-voip/telepathy-connection-managers"
-	elog "to install them."
-	preserve_old_lib_notify /usr/$(get_libdir)/libempathy.so.23
-	preserve_old_lib_notify /usr/$(get_libdir)/libempathy-gtk.so.19
-}
diff --git a/net-im/empathy/empathy-2.28.1.1.ebuild b/net-im/empathy/empathy-2.28.2-r1.ebuild
index 63d23607b633..dbda5bfef66c 100644
--- a/net-im/empathy/empathy-2.28.1.1.ebuild
+++ b/net-im/empathy/empathy-2.28.2-r1.ebuild
@@ -1,17 +1,17 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.1.1.ebuild,v 1.3 2010/02/19 19:33:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2-r1.ebuild,v 1.1 2010/02/28 12:44:17 nirbheek Exp $
 
 EAPI="2"
 
-inherit eutils gnome2 multilib
+inherit autotools eutils gnome2 multilib
 
 DESCRIPTION="Telepathy client and library using GTK+"
 HOMEPAGE="http://live.gnome.org/Empathy"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 # FIXME: Add location support once geoclue stops being idiotic with automagic deps
 IUSE="applet networkmanager python spell test webkit" # map
 
@@ -36,7 +36,7 @@ RDEPEND=">=dev-libs/glib-2.16.0
 	net-voip/telepathy-connection-managers
 
 	applet? ( >=gnome-base/gnome-panel-2.10 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	networkmanager? ( >=net-misc/networkmanager-0.8 )
 	python? (
 		>=dev-lang/python-2.4.4-r5
 		>=dev-python/pygtk-2 )
@@ -72,11 +72,11 @@ pkg_setup() {
 		--disable-static
 		--disable-location
 		--disable-gtk-doc
+		--disable-map
 		$(use_enable applet megaphone)
 		$(use_enable applet nothere)
 		$(use_enable debug)
 		$(use_with networkmanager connectivity nm)
-		$(use_enable map)
 		$(use_enable python)
 		$(use_enable spell)
 		$(use_enable test coding-style-checks)
@@ -87,6 +87,9 @@ pkg_setup() {
 src_prepare() {
 	gnome2_src_prepare
 
+	epatch "${FILESDIR}/empathy-2.28-networkmanager-0.8.patch"
+	eautoreconf
+
 	# Remove hard enabled -Werror (see AM_MAINTAINER_MODE), bug 218687
 	sed -i "s:-Werror::g" configure || die "sed 1 failed"
 }
diff --git a/net-im/empathy/empathy-2.28.2.ebuild b/net-im/empathy/empathy-2.28.2.ebuild
index 3c3e29a9ee02..3a5678e96a39 100644
--- a/net-im/empathy/empathy-2.28.2.ebuild
+++ b/net-im/empathy/empathy-2.28.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,v 1.3 2010/02/19 19:33:27 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/empathy/empathy-2.28.2.ebuild,v 1.4 2010/02/28 12:44:17 nirbheek Exp $
 
 EAPI="2"
 
@@ -36,7 +36,7 @@ RDEPEND=">=dev-libs/glib-2.16.0
 	net-voip/telepathy-connection-managers
 
 	applet? ( >=gnome-base/gnome-panel-2.10 )
-	networkmanager? ( >=net-misc/networkmanager-0.7 )
+	networkmanager? ( =net-misc/networkmanager-0.7* )
 	python? (
 		>=dev-lang/python-2.4.4-r5
 		>=dev-python/pygtk-2 )
diff --git a/net-im/empathy/files/empathy-2.28-networkmanager-0.8.patch b/net-im/empathy/files/empathy-2.28-networkmanager-0.8.patch
new file mode 100644
index 000000000000..cc2739c14090
--- /dev/null
+++ b/net-im/empathy/files/empathy-2.28-networkmanager-0.8.patch
@@ -0,0 +1,26 @@
+NetworkManager-0.8 renamed libnm_glib to libnm-glib
+
+http://bugs.gentoo.org/show_bug.cgi?id=306977
+
+Patch found by Andrea Pinazzi on the debian bugzilla
+---
+--- configure.ac
++++ configure.ac
+@@ -40,7 +40,7 @@
+ GEOCLUE_REQUIRED=0.11
+ WEBKIT_REQUIRED=1.1.7
+ KEYRING_REQUIRED=2.22
+-NETWORK_MANAGER_REQUIRED=0.7.0
++NETWORK_MANAGER_REQUIRED=0.8
+ 
+ # Use --enable-maintainer-mode to disabled deprecated symbols
+ GNOME_MAINTAINER_MODE_DEFINES
+@@ -184,7 +184,7 @@
+ 
+    PKG_CHECK_MODULES(NETWORK_MANAGER,
+    [
+-      libnm_glib >= $NETWORK_MANAGER_REQUIRED
++      libnm-glib >= $NETWORK_MANAGER_REQUIRED
+    ], have_nm="yes", have_nm="no")
+ 
+    if test "x$have_nm" = "xyes"; then