Various ebuild fixes, bug 378849

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

3 files changed, 29 insertions, 23 deletions

diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index b05eb448bff0..a7189e2a9d0b 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,9 @@
 # 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.61 2011/05/18 16:38:29 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.62 2011/08/14 09:04:07 nirbheek Exp $
+
+  14 Aug 2011; Nirbheek Chauhan <nirbheek@gentoo.org> nm-applet-0.8.4.ebuild:
+  Various ebuild fixes, bug 378849
 
   18 May 2011; Samuli Suominen <ssuominen@gentoo.org> nm-applet-0.8.4.ebuild:
   Don't try to apply non-existing patch wrt #367923 by Adrian Frith.
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 41727b7d4933..12268f6430b1 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 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
@@ -10,14 +10,24 @@ DIST network-manager-applet-0.8.4.tar.bz2 1153760 RMD160 eeafc3b5653ddb778317d4b
 DIST network-manager-applet-0.8.tar.bz2 978462 RMD160 764d7ebf7a716a795539fdc34f0545e3134311c0 SHA1 51f684396e034064568d356f0d961aa71af574dd SHA256 6379e0acd3eadeb71e3ba2e3cf05d351caf6b794dff5777a5e86a591df603bd4
 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.4.ebuild 1242 RMD160 bbe3d83310702ce3ffea38bc70e5627798307fe0 SHA1 6ea71259511aca144c984214ecfe01a3c1cec2bc SHA256 6ec5302bae54ab30939c5adeef54e9e5ab4b1f1148ebc989d8618a54273339bb
+EBUILD nm-applet-0.8.4.ebuild 1037 RMD160 0cc26d1132210afd67d6a37002f9ef82264ef3fe SHA1 d1a2b13d85a90b8c67ddad92273d208413198624 SHA256 4cab0d2cc765637336b6b106cbafb3c4da6798e12ee7cd9151f0f5d76a80edc7
 EBUILD nm-applet-0.8.ebuild 1411 RMD160 7b1db9c645ba28921b67da8af3d47fc5a27dbba3 SHA1 69c904b17eaa3996ec87deea958e69a6ae202d37 SHA256 f1e815340e32e5920991bf4dc68c6944edd88103e8e634d129fccf5430403ba7
-MISC ChangeLog 10798 RMD160 a83be5c0069602fcdb25df3b6586d0becd63f874 SHA1 8302cd14bd0fba859d077afee1cfe28ecdd98042 SHA256 53c274f441e876347b152eca54c69d5af7fdea76bc0dc8e36f1d5a3b95f56ab5
+MISC ChangeLog 10911 RMD160 9aa1755c473f8034fc7463b7b86d87bd3c1a5eff SHA1 7d350f87a6fadb335a668c2e4de471858af89267 SHA256 6bcbdf2c4a5385461bcd3aecd19766b1f23c83f96eaccee6051506926f1714b1
 MISC metadata.xml 493 RMD160 c990e66890ff329f3b0601c8ec1f70d7d5de3368 SHA1 f69cf103a6ebc649c9188dd03fe93ca92618b339 SHA256 37f17b0cf82d1699697b8ecb8d304b3d2195da901dad60f759e3d33eda8dda0c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk3T9ccACgkQXkR9YqOcLPHraAD+IrCeQqPmywrTtLGOYQDL2S5f
-VyLLy/pvA/69K5GDtjkA/2uVdNR5QC1AqYFSeqWh3+TX5U6UCYQXlz+ae2yKOChC
-=3w38
+iQIcBAEBAgAGBQJOR4+MAAoJEO/kOhxWD91k52gQALcIlfAVOyDxv/JVyw7N5AfM
+m0V7dMg/G/dnEWL1h0TEbuPD6KmlpmtYndiAcEDOI2r1r/YkGE2BeKNa50viueqo
+YRnLae096ZTPdXgFVEzCRXf+klQKuJhRGfSuASkLadf1KFxjlnj1sdYczBDZtZLN
+tZYJCKtXHXauiE24uFEAOXssR9FbSy+XmddDle9V47yKqRThcrqY+9EMPRR/XrOr
+BeGJqhLJ8zuBYJ/wc7R4Ih0oJxdz2CJ4AuiGZYoMFx3mGmyQSAaoUF5Qi3mbCOMS
+tsknvwVfXU1Wg9eFmMlcxOkDUGBwvcFglM/riR/wrWqCHOMClancBV9MRORTRbG5
+bYjulUyBoKAvh/D/CWer7JHBpQr4ttPsRu5VG4vW3hMHIOQGSj9DVvq+Y53PejCA
+5/cleMrKzNkNlqVOWPggpGYLQST9/O9TZqyWL/iWkBye68evYXSEz8/wma6TAzfH
+jCqLvzNNgdLQBwx5BofK67GvU5ylzEfpdqtqLaV+OBRg+clmL87zcJ7V1+Hb3DWe
+9ubkQE1TmIhxS5ckn4DhpsJKhMcMBp57VikK5rQBk8eNSDRSG142GYI/mEnr5+ST
+44sEMIoTDL/wHg4RvrNv2nV8wS92yV2U1cctdTs2YrHUF8o423vVLLiUdPk2c0DZ
+TQBRNfroCi+EmySfOtFl
+=eS15
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild b/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
index 4a1de34232d9..24c615443af1 100644
--- a/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild
@@ -1,49 +1,42 @@
 # 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.4.ebuild,v 1.2 2011/05/18 16:38:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.8.4.ebuild,v 1.3 2011/08/14 09:04:07 nirbheek Exp $
 
-EAPI=2
-inherit gnome2
+EAPI="3"
+GNOME_ORG_MODULE="network-manager-applet"
 
-MY_PN="${PN/nm-applet/network-manager-applet}"
+inherit gnome2
 
 DESCRIPTION="Gnome applet for NetworkManager."
 HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-SRC_URI="${SRC_URI//${PN}/${MY_PN}}"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="bluetooth"
 
-# FIXME: bluetooth is automagic
 RDEPEND=">=dev-libs/glib-2.16:2
 	>=dev-libs/dbus-glib-0.88
 	>=sys-apps/dbus-1.4.1
 	>=x11-libs/gtk+-2.18:2
 	>=gnome-base/gconf-2.20:2
 	>=x11-libs/libnotify-0.4.3
-	>=gnome-base/libglade-2:2.0
 	>=gnome-base/gnome-keyring-2.20
+	>=sys-auth/polkit-0.96-r1
 
-	>=dev-libs/libnl-1.1
 	>=net-misc/networkmanager-${PV}
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.5.7
 	net-misc/mobile-broadband-provider-info
-	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )
-	>=sys-auth/polkit-0.96-r1"
 
+	bluetooth? ( >=net-wireless/gnome-bluetooth-2.27.6 )"
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	>=dev-util/intltool-0.35"
-
-S=${WORKDIR}/${MY_PN}-${PV}
+	>=dev-util/intltool-0.40"
 
 pkg_setup () {
 	G2CONF="${G2CONF}
 		--disable-more-warnings
-		--localstatedir=/var"
+		--localstatedir=/var
+		$(use_with bluetooth)"
 
 	DOCS="AUTHORS ChangeLog NEWS README"
 }