Fix building with latest libnotify (bug #358043).

Package-Manager: portage-2.1.9.42/cvs/Linux x86_64

4 files changed, 59 insertions, 20 deletions

diff --git a/gnome-base/gnome-applets/ChangeLog b/gnome-base/gnome-applets/ChangeLog
index fe360acdf13f..1c5b80e6413a 100644
--- a/gnome-base/gnome-applets/ChangeLog
+++ b/gnome-base/gnome-applets/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/gnome-applets
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.336 2011/02/24 18:56:15 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/ChangeLog,v 1.337 2011/03/11 08:20:07 pacho Exp $
+
+  11 Mar 2011; Pacho Ramos <pacho@gentoo.org> gnome-applets-2.32.1.1.ebuild,
+  +files/gnome-applets-2.32.1.1-dbus-fix.patch:
+  Fix building with latest libnotify (bug #358043).
 
   24 Feb 2011; Thomas Kahle <tomka@gentoo.org> gnome-applets-2.32.1.1.ebuild:
   x86 stable per bug 353436
diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest
index 55e9bab71408..76a8e2272c8a 100644
--- a/gnome-base/gnome-applets/Manifest
+++ b/gnome-base/gnome-applets/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX gnome-applets-2.32.1.1-dbus-fix.patch 823 RMD160 69013629c626942f870c723793f34582748b3226 SHA1 c58976ec2a4ccddd2f3fd44c35edaf044de74c28 SHA256 6c79b77aa731f82d9b7c9704e5c6d3cb06252eea3c2d21fa35245d2f02ca0346
 AUX gnome-applets-2.32.1.1-libnotify-0.7.patch 1431 RMD160 4c8edc49404fa45ce8e0c079e4f900a3ed7b1c45 SHA1 137d8b6e9c4f279fea6f81bd6d91928d10e1f8cd SHA256 1e0b1f9545029bda0f4aadc28ef6eba34a5dbd1c3d1e5cec45627be7b0c32eda
 DIST gnome-applets-2.30.0.tar.bz2 9919459 RMD160 ad3c2bb2062de7599a8a34403bf517be21f9abae SHA1 b6359ebe1991709c66709b108609fcb8cfae4b57 SHA256 41489fbb1f8352a306cde6676dfaf1e497bfbca960454f7251c4fd92920bba5d
 DIST gnome-applets-2.32.1.1.tar.bz2 10083534 RMD160 50c8e169b02aa002917f4c6ea0f575522e3ae984 SHA1 6edc3aea2bd2198b2bdbdb1fa63b481f724c8fe2 SHA256 2b92fe4b3062dfbe264f45472b4db3a27d1e69e13260d37da9fb36b2cbd40327
 EBUILD gnome-applets-2.30.0-r1.ebuild 3644 RMD160 44f7811921220da5b13fa891a01f74230a593eac SHA1 398af037fc71b6806e20cdcbdb96ae0459bc58a6 SHA256 952b5099b85e048debf5e355a890b0969e09be3daa80b68ff8290a091ea4591a
-EBUILD gnome-applets-2.32.1.1.ebuild 3702 RMD160 59e5657089496fb472bbb2f8273715e63f130a33 SHA1 2c870bbac0ed08820897c1215a2857f79df55533 SHA256 b3366be27096b824f3c60f9f385a37876245ba35357cdd40eca88355f612444a
-MISC ChangeLog 48912 RMD160 3e71ddeccf2fd84d0aca96f757b491c123c7a669 SHA1 92d46c84a30a36d2da42f76c2e31fa400d9aa149 SHA256 2546c849c6b7b2ac47dcf69bcf2a3018ce9601c7ac98f093ffcefabc25c7c589
+EBUILD gnome-applets-2.32.1.1.ebuild 3961 RMD160 585b52ea2048ffc223c306371b8acc25a3fbc0b4 SHA1 b9aed43ebe178b584a05f13b598fbba68fd0332d SHA256 f6eea9640edc8e90d6da92a1d85fd1966d94bb7bf04a23bec9ae3b4bd321b4f1
+MISC ChangeLog 49090 RMD160 0475b15fe16d25e75486a08f291adfcd4ad02b3a SHA1 0eab287a8bdfcc5574fd1e6bd5e360a16f12d4d0 SHA256 de3dfd1217bbc674ac1e368f0b6459e16b30e7fbb2d22aeef4084184a9068a5f
 MISC metadata.xml 313 RMD160 378fcac5ad9324a5f93413ddb9b73ff34ec7dbf3 SHA1 b1f8d11380da2ff0dd9927ac85345026facc1c96 SHA256 d54765f0855da98c60cd16672b306e2f0f8a17c4ee0a765e6d6653c47f75ee60
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1mqjsACgkQnZsgo/h8kNachQCfQaeenzmQFhK5tPKP9rxIzScB
-vTMAoImhljDvJqyuF3CQRVr1MxdN2OsT
-=Vftv
+iEYEARECAAYFAk152zwACgkQCaWpQKGI+9RC+wCeL4aLr2dwp22iYZRYT9S8vQyj
+pS4An1sL2ahSWXcaKVHj8ep1afla/nJi
+=uBc8
 -----END PGP SIGNATURE-----
diff --git a/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch
new file mode 100644
index 000000000000..16c2999a84e8
--- /dev/null
+++ b/gnome-base/gnome-applets/files/gnome-applets-2.32.1.1-dbus-fix.patch
@@ -0,0 +1,28 @@
+From fe72f63c91a1458d97d455ab0078d042464366e7 Mon Sep 17 00:00:00 2001
+From: Enrico Minack <enrico-minack@gmx.de>
+Date: Mon, 03 Jan 2011 19:58:13 +0000
+Subject: gweather: fixes NetworkManager support to compile, see bug 636217
+
+---
+diff --git a/gweather/Makefile.am b/gweather/Makefile.am
+index ea6ac96..165efda 100644
+--- a/gweather/Makefile.am
++++ b/gweather/Makefile.am
+@@ -6,6 +6,7 @@ INCLUDES =					\
+ 	-I$(srcdir)				\
+ 	-I$(top_srcdir)				\
+ 	-DGWEATHER_MENU_UI_DIR=\""$(uidir)"\"	\
++	$(DBUS_CFLAGS)				\
+ 	$(GNOME_APPLETS3_CFLAGS)		\
+ 	$(LIBNOTIFY_CFLAGS)			\
+ 	$(LIBGWEATHER_CFLAGS)			\
+@@ -22,6 +23,7 @@ gweather_applet_2_SOURCES = \
+ 	gweather-applet.c gweather-applet.h
+ 
+ gweather_applet_2_LDADD = 	\
++	$(DBUS_LIBS)		\
+ 	$(LIBNOTIFY_LIBS) 	\
+ 	$(GNOME_APPLETS3_LIBS)	\
+ 	$(GNOME_LIBS2_LIBS)	\
+--
+cgit v0.8.3.4
diff --git a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
index d7a1bad73399..96b3ba54b298 100644
--- a/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
+++ b/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.8 2011/02/24 18:56:15 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-applets/gnome-applets-2.32.1.1.ebuild,v 1.9 2011/03/11 08:20:07 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
 PYTHON_DEPEND="2:2.4"
 
-inherit eutils gnome2 python
+inherit eutils gnome2 python autotools
 
 DESCRIPTION="Applets for the GNOME Desktop and Panel"
 HOMEPAGE="http://www.gnome.org/"
@@ -21,15 +21,15 @@ IUSE="battstat gnome gstreamer hal ipv6 networkmanager policykit"
 HALDEPEND=" hal? ( >=sys-apps/hal-0.5.3 ) "
 RDEPEND=">=x11-libs/gtk+-2.20:2
 	>=dev-libs/glib-2.22:2
-	>=gnome-base/gconf-2.8
+	>=gnome-base/gconf-2.8:2
 	>=gnome-base/gnome-panel-2.31.2[bonobo]
 	>=x11-libs/libxklavier-4.0
-	>=x11-libs/libwnck-2.9.3
+	>=x11-libs/libwnck-2.9.3:1
 	>=gnome-base/gnome-desktop-2.11.1:2
 	>=x11-libs/libnotify-0.3.2
 	>=sys-apps/dbus-1.1.2
 	>=dev-libs/dbus-glib-0.74
-	>=dev-libs/libxml2-2.5.0
+	>=dev-libs/libxml2-2.5.0:2
 	>=x11-themes/gnome-icon-theme-2.15.91
 	>=dev-libs/libgweather-2.22.1:2
 	x11-libs/libX11
@@ -40,18 +40,18 @@ RDEPEND=">=x11-libs/gtk+-2.20:2
 		gnome-base/libgnome
 
 		>=gnome-extra/gucharmap-2.23
-		>=gnome-base/libgtop-2.11.92
+		>=gnome-base/libgtop-2.11.92:2
 
-		>=dev-python/pygobject-2.6
-		>=dev-python/pygtk-2.6
-		>=dev-python/gconf-python-2.10
+		>=dev-python/pygobject-2.6:2
+		>=dev-python/pygtk-2.6:2
+		>=dev-python/gconf-python-2.10:2
 		>=dev-python/gnome-applets-python-2.10 )
 	gstreamer?	(
-		>=media-libs/gstreamer-0.10.2
-		>=media-libs/gst-plugins-base-0.10.14
+		>=media-libs/gstreamer-0.10.2:0.10
+		>=media-libs/gst-plugins-base-0.10.14:0.10
 		|| (
-			>=media-plugins/gst-plugins-alsa-0.10.14
-			>=media-plugins/gst-plugins-oss-0.10.14 ) )
+			>=media-plugins/gst-plugins-alsa-0.10.14:0.10
+			>=media-plugins/gst-plugins-oss-0.10.14:0.10 ) )
 	networkmanager? ( >=net-misc/networkmanager-0.7.0 )
 	policykit? ( >=sys-auth/polkit-0.92 )"
 
@@ -83,9 +83,12 @@ pkg_setup() {
 }
 
 src_prepare() {
+	gnome2_src_prepare
+
 	epatch "${FILESDIR}"/${P}-libnotify-0.7.patch
 
-	gnome2_src_prepare
+	# gweather: fix NetworkManager support to compile, see upstream bug 636217 and bug 358043
+	epatch "${FILESDIR}"/${P}-dbus-fix.patch
 
 	# disable pyc compiling
 	mv py-compile py-compile.orig
@@ -96,6 +99,9 @@ src_prepare() {
 		invest-applet/invest/Makefile.in || die "disabling invest tests failed"
 
 	python_convert_shebangs -r 2 .
+
+	intltoolize --force --copy --automake || die "intltoolize failed"
+	eautoreconf
 }
 
 src_test() {