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

(Portage version: 2.1.7.17/cvs/Linux i686)

5 files changed, 46 insertions, 121 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/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