Apply -0.8.2-libnotify-0.7.patch also to current stable wrt #361093, Comment #2 by Thorsten Vollmer.

Package-Manager: portage-2.2.0_alpha29/cvs/Linux x86_64

4 files changed, 29 insertions, 7 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index bdbdb2d32714..ea8a32702f83 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for gnome-extra/nm-applet
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.58 2011/02/05 12:20:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.59 2011/03/29 14:15:18 ssuominen Exp $
+
+  29 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> nm-applet-0.8.ebuild,
+  nm-applet-0.8.1-r2.ebuild:
+  Apply -0.8.2-libnotify-0.7.patch also to current stable wrt #361093, Comment
+  #2 by Thorsten Vollmer.
 
   05 Feb 2011; Samuli Suominen <ssuominen@gentoo.org> nm-applet-0.8.2.ebuild,
   +files/nm-applet-0.8.2-libnotify-0.7.patch:
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 26792424b505..5b0284cf99dd 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,11 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nm-applet-0.8.1-fix-bluetooth-dep.patch 1221 RMD160 1e12c0f84424aef9772c8cfe93dc07d3cd2984f4 SHA1 9a2d760ac01b9085030718b4f93f8c959db18faa SHA256 e89e20ba56817d8c05668fbac0ff26b21c30fd6b706cf2c2ccbfec9dacdcfe3b
 AUX nm-applet-0.8.1-fix-compilation-with-DGSEAL_ENABLE.patch 3184 RMD160 2b304fe4b24b0366250f20b165a778086376d773 SHA1 9a587ab17865917a3c177c422edf8cb427158946 SHA256 b36be4b5fc0781856af306943253efd2505e034a136a12cd2afbae767ab1d27e
 AUX nm-applet-0.8.2-libnotify-0.7.patch 1111 RMD160 3a63b65cf30848b60e681ee05d63f645d8276e6a SHA1 059346b94cda77bbe2ce97c2ba90a9fe8ba54c1e SHA256 542e0c3a5f851f72e5672f982c7e86c45b79868f3d16500b930d58cf8f039b5d
 DIST network-manager-applet-0.8.1.tar.bz2 1105854 RMD160 8f2aef3edcc68988e199f5032f6582314982308f SHA1 6259f40c849e9a7881f1d7319d1ddd50335db480 SHA256 4a84b9762c6fa13004f66a5e208236d2c4b0a15fcbf47da19b6b44b441aec366
 DIST network-manager-applet-0.8.2.tar.bz2 1129756 RMD160 30a14d27732c53b17c66d034ecefe68eb115fb68 SHA1 1be46b1df52786cd22e1d3d888f828c27d46dd3a SHA256 c6f8723031092bd1c7db452df5578ec9ca8e9f98c2ea493dba7d40dbe0e02391
 DIST network-manager-applet-0.8.tar.bz2 978462 RMD160 764d7ebf7a716a795539fdc34f0545e3134311c0 SHA1 51f684396e034064568d356f0d961aa71af574dd SHA256 6379e0acd3eadeb71e3ba2e3cf05d351caf6b794dff5777a5e86a591df603bd4
-EBUILD nm-applet-0.8.1-r2.ebuild 1544 RMD160 3b111220f626ec19d6b8e571b9be6cbb098026ed SHA1 4a2b3a9aca73359ceca8867a2a1cd85e72618b17 SHA256 91392f693940a3adcdf84437aab8d12f856553021c33cfbb2f5389713e063fcf
+EBUILD nm-applet-0.8.1-r2.ebuild 1600 RMD160 018f277a6feca6acefc5038aa189dea239ace3d0 SHA1 e80960113288a4c42b8635dce59f6a81763cb8a5 SHA256 cad2338f29970b36b2ae32885b4e154bf2f3650eb5af9339c65188f495dc1df2
 EBUILD nm-applet-0.8.2.ebuild 1334 RMD160 aa47fd619282cf45ada22480ea57b6930b2257a4 SHA1 789f2170a348a617736e7192e0870e714329e879 SHA256 db91c207cdd292bfc5dc27fc1ef709eb7ecbc8c0739f9455cbb981660d47ac9b
-EBUILD nm-applet-0.8.ebuild 1317 RMD160 1048be09fb59c9e00b1c66042d94fadb69f8e99e SHA1 bafe9516973d8632624df3a2cf53ba21f7bbf913 SHA256 36011dae52b0683c9239eb4c5e54e7bce6d4eebcb0a480800d3f0e91e3e8635a
-MISC ChangeLog 10217 RMD160 10fd7dcf4d53c44e25e8bb136038a15768a9de44 SHA1 cae090cd31683157994206038653c693aa35a1da SHA256 1c5dd0c1b777e205e23c88b8beb48ae9a4a660763a2a299b14fcb2cccc038c0b
+EBUILD nm-applet-0.8.ebuild 1411 RMD160 7b1db9c645ba28921b67da8af3d47fc5a27dbba3 SHA1 69c904b17eaa3996ec87deea958e69a6ae202d37 SHA256 f1e815340e32e5920991bf4dc68c6944edd88103e8e634d129fccf5430403ba7
+MISC ChangeLog 10428 RMD160 49bbd8a46da2d6b7fcb7d943254acabf39275088 SHA1 94fd05a88097addf0d48f7531af07f13680530a9 SHA256 7573cbcbecbae6cd6452abe0275e71eb77586aa974ecf16c7c98852484e1403e
 MISC metadata.xml 493 RMD160 c990e66890ff329f3b0601c8ec1f70d7d5de3368 SHA1 f69cf103a6ebc649c9188dd03fe93ca92618b339 SHA256 37f17b0cf82d1699697b8ecb8d304b3d2195da901dad60f759e3d33eda8dda0c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2R6ZsACgkQXkR9YqOcLPG4fwD+J27sAhjrCNWxWiaVXpHZcyvu
+8ZfhjG0/iKHqgHM34qYA/RON9lKqV0vQtbDaGshqIg3boWMuxNiJElbU8tPaRR9W
+=9h33
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild
index 2d76b5ff37d8..e380de826c6f 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild,v 1.4 2011/03/06 23:08:10 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.1-r2.ebuild,v 1.5 2011/03/29 14:15:18 ssuominen Exp $
 
 EAPI="2"
 
@@ -48,6 +48,8 @@ src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-compilation-with-DGSEAL_ENABLE.patch"
 	epatch "${FILESDIR}/${P}-fix-bluetooth-dep.patch"
 
+	epatch "${FILESDIR}"/${PN}-0.8.2-libnotify-0.7.patch
+
 	eautoreconf
 }
 
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.ebuild
index f43f5e230742..0c50a7cab397 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.ebuild,v 1.7 2011/03/06 23:08:10 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.ebuild,v 1.8 2011/03/29 14:15:18 ssuominen Exp $
 
 EAPI="2"
 
@@ -50,3 +50,8 @@ pkg_setup () {
 		--disable-more-warnings
 		--localstatedir=/var"
 }
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-0.8.2-libnotify-0.7.patch
+	gnome2_src_prepare
+}