diff options
Diffstat (limited to 'gnome-extra')
| -rw-r--r-- | gnome-extra/nm-applet/ChangeLog | 9 | ||||
| -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.ebuild | 60 |
3 files changed, 19 insertions, 73 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/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." -} |