summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Piasek <dagger@gentoo.org>2009-06-11 12:00:32 +0000
committerRobert Piasek <dagger@gentoo.org>2009-06-11 12:00:32 +0000
commitac99f7d2830710927e404cfd3b22ace5d6fdbd8b (patch)
treeb4fe1bb003befc87781cdcb2ab8477ae638cfc73 /gnome-extra
parentFixed bluetooth dependency for bug #272735. (diff)
downloadhistorical-ac99f7d2830710927e404cfd3b22ace5d6fdbd8b.tar.gz
historical-ac99f7d2830710927e404cfd3b22ace5d6fdbd8b.tar.bz2
historical-ac99f7d2830710927e404cfd3b22ace5d6fdbd8b.zip
Added some patches to make sure nm-applet will work fine with recent
NM changes. Package-Manager: portage-2.1.6.13/cvs/Linux x86_64
Diffstat (limited to 'gnome-extra')
-rw-r--r--gnome-extra/nm-applet/ChangeLog9
-rw-r--r--gnome-extra/nm-applet/Manifest16
-rw-r--r--gnome-extra/nm-applet/nm-applet-0.7.1-r2.ebuild (renamed from gnome-extra/nm-applet/nm-applet-0.7.1-r1.ebuild)23
-rw-r--r--gnome-extra/nm-applet/nm-applet-0.7.1.ebuild60
4 files changed, 22 insertions, 86 deletions
diff --git a/gnome-extra/nm-applet/ChangeLog b/gnome-extra/nm-applet/ChangeLog
index 06f6c81dd509..04703cadfca1 100644
--- a/gnome-extra/nm-applet/ChangeLog
+++ b/gnome-extra/nm-applet/ChangeLog
@@ -1,6 +1,13 @@
# ChangeLog for gnome-extra/nm-applet
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.26 2009/05/02 18:57:48 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/ChangeLog,v 1.27 2009/06/11 12:00:32 dagger Exp $
+
+*nm-applet-0.7.1-r2 (11 Jun 2009)
+
+ 11 Jun 2009; Robert Piasek <dagger@gentoo.org> -nm-applet-0.7.1.ebuild,
+ -nm-applet-0.7.1-r1.ebuild, +nm-applet-0.7.1-r2.ebuild:
+ Added some patches to make sure nm-applet will work fine with recent
+ NM changes.
*nm-applet-0.7.1-r1 (02 May 2009)
diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index bbc0506e3357..80984522d15d 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX nm-applet-0.6.5-confchanges.patch 978 RMD160 4e506d4653affb6d01902c40100ebb2cffd122b8 SHA1 e9088c5767d5e9598b99dae84ad88023f1746262 SHA256 716d2c6abbc010d0fe42916a279b18262d97cc37e955f04c47b7ca27c8786fec
AUX nm-applet-0.7.0-confchanges.patch 488 RMD160 14e971a69a04f246f718960e10d2565a06b80b19 SHA1 0dc8bf207536603c9852838abf87bb53eb609c31 SHA256 f38ea0296927388ee66f671b4cac06d1c17f70b0822b3374008fca33c3d9cdfa
AUX nm-applet-0.7.1-confchanges.patch 2548 RMD160 14febfc0445f224e8b408ad00fd7e8ce94828b98 SHA1 119945d9d13311705dbcde2e761f2cb4af3cd9a0 SHA256 2f256622b43072c936b785bc1ed79150342f671b9ff433673f4df8b79836750d
@@ -8,17 +5,10 @@ DIST network-manager-applet-0.6.5.tar.gz 715346 RMD160 e4a578d4707476258a539a8b0
DIST network-manager-applet-0.7.0.tar.bz2 767130 RMD160 33ab901a8377369e3cf8ffcecc9cbe70d800b3c5 SHA1 bef045db0032f6cfcb28d738c5a652f3619bf2a3 SHA256 7c9fcb0b18c72071ad42316ff5e0369a418f92d05ef419874a67826fd9d8406a
DIST network-manager-applet-0.7.1.tar.bz2 834191 RMD160 4430d1c5eaae97ab5a78d8c326a56fa8f42afbca SHA1 b54a068b79272adf11c2cfcbcff19ffb4819d65a SHA256 b22a90e6252d798b3889843910a016d185f9e87dd23e203003b1072013f670a6
DIST nm-applet-0.6.6.tar.gz 781511 RMD160 4a6e1a2051cd2e77b4077b6218570760e04cd383 SHA1 da572c48ae9ecb5c9ba61c0ed8fd06567dcbc4e3 SHA256 8eb264d5838d1f9e2e507a570cb23dc54e11505023b71b6868cee31da2dff38d
+DIST nm-applet-0.7.1-gentoo-patches-1.tar.bz2 11911 RMD160 0a37bf10cca7d13c844af9b2528db7bc64bd4215 SHA1 f5b9ce8b4e9a41fde95ca4b702cf00e97ed4de12 SHA256 e33cdfcd6f05a49afd7df04cee12d33f8a7a05009677601b9d6533d6ea59bf11
EBUILD nm-applet-0.6.5.ebuild 1739 RMD160 40dfd4edbdb8f8df4d1b5e6f03c03bb8488301fc SHA1 61b568f792813bf49035327fa2b5c33eb8886c18 SHA256 5bcf3038228a334f7f70d44ca75f92c0d3f6425f1a448463078a65f95c3b8272
EBUILD nm-applet-0.6.6.ebuild 1914 RMD160 30ba35112d44ee683c9f9220f685024f453795ed SHA1 7589d0e347ef4e027e38a9644c629142fd17f1e6 SHA256 9428975b11f294d0ac4ac9fdfdcc7b345f16e1563533cfe34f24754ee78c65c3
EBUILD nm-applet-0.7.0.ebuild 1780 RMD160 bbcd098ec91adc1d472dc3e6bc0fd3ec92ae4965 SHA1 3a5fe7a957ca9786aa0c027077fc2ffb787a8426 SHA256 5ad0a59a4669c0d80864cb470d81de3a80ed7032adab88b4c2103599e16409bb
-EBUILD nm-applet-0.7.1-r1.ebuild 1758 RMD160 1df079faaa0eb6f223b1b545400d4bb75244718b SHA1 84c2caf95d9dea8744064fd975997dc6957b5d8a SHA256 fe6ef89641e6546d28150d4e24e2e17afef55724468981ebcb46971130f1cde1
-EBUILD nm-applet-0.7.1.ebuild 1754 RMD160 1bff08a8f1c86d578f2d86789c08bdf609c59322 SHA1 1d55c6eabf5fa31af2976a4c788d6e46c47692f4 SHA256 e5ecc67de2737d435f995ba3ddcd145c730f26166b632148e44b9b226841783f
-MISC ChangeLog 5052 RMD160 de1936a058e1c482f0fea0e2373708090aafcd15 SHA1 c716f6beba8b2e871621fd278115de5b978a0744 SHA256 8d8398f16d2f4aea754bf78259152cf3b74b212423f316972afe38b163b1661a
+EBUILD nm-applet-0.7.1-r2.ebuild 1597 RMD160 6c279944b1adf79168e4a1ffb8e312387baf823c SHA1 0b51312ced704eb0009df2c32d0ac047a0750da9 SHA256 0ca2ecc28f0b3a176b8763ee8c208c4c29498e28471db5c8b801397fca135123
+MISC ChangeLog 5307 RMD160 d4212d370de240b5acd1c278f4960c59fcce4ae5 SHA1 0dca32e3ca675f67e88ad255d81af8df01dab273 SHA256 0bdbc57ba6c6406d18105cb72b27d0169ca3b1b4d07b207f0a275a5b805f54ef
MISC metadata.xml 540 RMD160 54e168815d43da9fb872f7a41e74303c38ff2cc6 SHA1 720055a34d446c126fc1828fec89bc7bcd656567 SHA256 160041d8bbfc8a0d56d100fe1668ebabe4e3d9c4efc37d1b4488e1578db83859
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iD8DBQFJ/JfGomPajV0RnrERAtpFAJ40f54+xBd3V24tV0ftxaxMlq2YOwCdFUjQ
-ShOMVTI0CVvtC+TqJT0VlmA=
-=WMJb
------END PGP SIGNATURE-----
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.1-r1.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.1-r2.ebuild
index 0f7b4efb37b4..0e5213e3de68 100644
--- a/gnome-extra/nm-applet/nm-applet-0.7.1-r1.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.7.1-r2.ebuild
@@ -1,16 +1,21 @@
# Copyright 1999-2009 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.7.1-r1.ebuild,v 1.1 2009/05/02 18:57:48 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nm-applet/nm-applet-0.7.1-r2.ebuild,v 1.1 2009/06/11 12:00:32 dagger Exp $
EAPI=2
-inherit gnome2 eutils versionator
+inherit gnome2 eutils versionator autotools
+
+PATCH_VERSION="1"
MY_P="${P/nm-applet/network-manager-applet}"
MYPV_MINOR=$(get_version_component_range 1-2)
+PATCHNAME="${P}-gentoo-patches-${PATCH_VERSION}"
DESCRIPTION="Gnome applet for NetworkManager."
HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-SRC_URI="mirror://gnome/sources/network-manager-applet/0.7/${MY_P}.tar.bz2"
+SRC_URI="mirror://gnome/sources/network-manager-applet/0.7/${MY_P}.tar.bz2
+ http://dev.gentoo.org/~dagger/files/${PATCHNAME}.tar.bz2"
+
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
@@ -47,14 +52,8 @@ pkg_setup () {
}
src_prepare() {
- epatch "${FILESDIR}/${P}-confchanges.patch"
-}
-pkg_postinst() {
- gnome2_pkg_postinst
- elog "Your user needs to be in the plugdev group in order to use this"
- elog "package. If it doesn't start in Gnome for you automatically after"
- elog 'you log back in, simply run "nm-applet --sm-disable"'
- elog "You also need the notification area applet on your panel for"
- elog "this to show up."
+ EPATCH_SOURCE="${WORKDIR}/${PATCHNAME}"
+ EPATCH_SUFFIX="patch"
+ epatch && eautoreconf
}
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.1.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.1.ebuild
deleted file mode 100644
index 9806f0c19880..000000000000
--- a/gnome-extra/nm-applet/nm-applet-0.7.1.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2009 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.7.1.ebuild,v 1.1 2009/04/22 14:22:08 rbu Exp $
-
-EAPI=2
-inherit gnome2 eutils versionator
-
-MY_P="${P/nm-applet/network-manager-applet}"
-MYPV_MINOR=$(get_version_component_range 1-2)
-
-DESCRIPTION="Gnome applet for NetworkManager."
-HOMEPAGE="http://projects.gnome.org/NetworkManager/"
-SRC_URI="mirror://gnome/sources/network-manager-applet/0.7/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/dbus-1.2
- >=sys-apps/hal-0.5.9
- >=dev-libs/libnl-1.1
- =net-misc/networkmanager-${MYPV_MINOR}*
- >=net-wireless/wireless-tools-28_pre9
- >=net-wireless/wpa_supplicant-0.5.7
- >=dev-libs/glib-2.16
- >=x11-libs/libnotify-0.4.3
- >=x11-libs/gtk+-2.10
- >=gnome-base/libglade-2
- >=gnome-base/gnome-keyring-2.20
- || ( >=gnome-base/gnome-panel-2 xfce-base/xfce4-panel x11-misc/trayer )
- >=gnome-base/gconf-2.20
- >=gnome-extra/policykit-gnome-0.8"
-DEPEND="${RDEPEND}
- dev-util/pkgconfig
- >=dev-util/intltool-0.35"
-
-DOCS="AUTHORS COPYING ChangeLog INSTALL NEWS README"
-# USE_DESTDIR="1"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup () {
- G2CONF="${G2CONF} \
- --disable-more-warnings \
- --localstatedir=/var \
- --with-dbus-sys=/etc/dbus-1/system.d"
-}
-
-src_prepare() {
- epatch "${FILESDIR}/${P}-confchanges.patch"
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- elog "Your user needs to be in the plugdev group in order to use this"
- elog "package. If it doesn't start in Gnome for you automatically after"
- elog 'you log back in, simply run "nm-applet --sm-disable"'
- elog "You also need the notification area applet on your panel for"
- elog "this to show up."
-}