Removed _rc1 versions

nm-applet_rc2 requires nm_rc2
removed gnome flag from NM, as NM is a daemon
removed post dependencies




svn path=/overlay/; revision=70

6 files changed, 4 insertions, 207 deletions

diff --git a/gnome-extra/nm-applet/Manifest b/gnome-extra/nm-applet/Manifest
index 9ceb05b..960022f 100644
--- a/gnome-extra/nm-applet/Manifest
+++ b/gnome-extra/nm-applet/Manifest
@@ -1,7 +1,5 @@
 AUX nm-applet-0.7.0-confchanges.patch 488 RMD160 14e971a69a04f246f718960e10d2565a06b80b19 SHA1 0dc8bf207536603c9852838abf87bb53eb609c31 SHA256 f38ea0296927388ee66f671b4cac06d1c17f70b0822b3374008fca33c3d9cdfa
 AUX nm-applet-9999-confchanges.patch 906 RMD160 5de99593d5613cebfcfb052e707e12a6a1370632 SHA1 61363aa751e9572ea5ffdce279e0438b1f8f2f8a SHA256 438f068119859e0cba08a8213b197f6ec73f92d64c8bddc46bdadc9bc7485fa0
-DIST network-manager-applet-0.7.0-rc1.tar.gz 1091062 RMD160 4dcae8bccd9cf124316468f36f69a5df79c0d624 SHA1 e7c5eee5cdd7989e3486eb7970da4aae828a374e SHA256 37085b2bd3733ebb9735418b8151cb109fd45653402dddeb71c61130bd07a8fe
 DIST network-manager-applet-0.7.0-rc2.tar.gz 1095114 RMD160 7e3c1b8f2ea53b4cdc3bfa80bd9840f6e540dcf0 SHA1 c56c7d48f66bf54e2ad349d70865610536afa46e SHA256 15663efa838a6aa520a65804360daa1eefbe007a4f29a4582d7107e337c45547
-EBUILD nm-applet-0.7.0_rc1.ebuild 1746 RMD160 fcbf8aeeaaf67b59b6b0102cb4634fa5cf88da01 SHA1 2bfcffd02d3decd1941804c4544b577849ad850a SHA256 28306a66f66936b65f922f1ceca3ef8ba862bf9894914d39e152e67e2e5c6da5
-EBUILD nm-applet-0.7.0_rc2.ebuild 1746 RMD160 99b85b8442d3201cfbee61076539c93e89382aec SHA1 46121ec3716fc3ffa838b21418eda13e4509b089 SHA256 1914e20aba40a16fb2f09fd69f28b71bbb4e5123b111b0b234529fdc25b340c1
+EBUILD nm-applet-0.7.0_rc2.ebuild 1738 RMD160 8462d87d993e3bf589913326d43238a6363b9b2d SHA1 6d8d78687fc11f27ce8b8d88a84d96c41d34cdf4 SHA256 c010639eeb11310d30ee5ea3a32ff91359fa9cae4b2f275abee94ea0e7948538
 EBUILD nm-applet-9999.ebuild 1628 RMD160 1a0a2d2194fd8a2d51543706202407dc1a45f052 SHA1 0c90cc116d592f9d6568b85ae57235360036d4e1 SHA256 4083828de65f713e2f4696349eeaf5bddf4ee004f61e2f9a8c30f8f0455a3405
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.0_rc1.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.0_rc1.ebuild
deleted file mode 100644
index ae7501c..0000000
--- a/gnome-extra/nm-applet/nm-applet-0.7.0_rc1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2008 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.6.6.ebuild,v 1.3 2008/07/28 18:47:49 ken69267 Exp $
-
-inherit gnome2 eutils
-
-MY_PN="${PN/nm-applet/network-manager-applet}"
-MY_P="${MY_PN}-${PV/_/-}"
-
-DESCRIPTION="Gnome applet for NetworkManager."
-HOMEPAGE="http://people.redhat.com/dcbw/NetworkManager/"
-SRC_URI="http://ftp.gnome.org/pub/gnome/sources/${MY_PN}/0.7/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=sys-apps/dbus-1.2
-	>=sys-apps/hal-0.5.9
-	>=dev-libs/libnl-1.1
-	>=net-misc/networkmanager-0.7.0_pre20080817
-	>=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.20
-	>=gnome-base/gconf-2.20
-	>=gnome-base/libgnomeui-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}/${P/_rc1/}
-
-pkg_setup () {
-	G2CONF="${G2CONF} \
-		--disable-more-warnings \
-		--localstatedir=/var \
-		--with-dbus-sys=/etc/dbus-1/system.d"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.7.0-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."
-}
diff --git a/gnome-extra/nm-applet/nm-applet-0.7.0_rc2.ebuild b/gnome-extra/nm-applet/nm-applet-0.7.0_rc2.ebuild
index b506440..aac4b98 100644
--- a/gnome-extra/nm-applet/nm-applet-0.7.0_rc2.ebuild
+++ b/gnome-extra/nm-applet/nm-applet-0.7.0_rc2.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 RDEPEND=">=sys-apps/dbus-1.2
 	>=sys-apps/hal-0.5.9
 	>=dev-libs/libnl-1.1
-	>=net-misc/networkmanager-0.7.0_pre20080817
+	>=net-misc/networkmanager-0.7.0_rc2
 	>=net-wireless/wireless-tools-28_pre9
 	>=net-wireless/wpa_supplicant-0.5.7
 	>=dev-libs/glib-2.16
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index a2c1940..3dcbf34 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -2,9 +2,7 @@ AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382
 AUX networkmanager-0.7.0-resolvconf-perms.patch 559 RMD160 b54ec431e9050176845dcb705a6a667b034a150f SHA1 a6e2f26d320aff3c284b7e5be1908d8b0b935a45 SHA256 92fd3e269e6e9f4b2060418e0fd898f248c620648e59b3d699f1c4733418a481
 AUX networkmanager-0.7.0_pre20070627-updatedbackend.patch 17941 RMD160 343abd3b8a35b7373a5651e7ec8fb10342eb36d7 SHA1 63c7dccf7ed31fb465d57db84e33e08488031dfe SHA256 89ccb2dfc05cdb2ee9bca558f661f30b6923f81b9bd7e2999c61880461b14826
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
-DIST NetworkManager-0.7.0-rc1.tar.gz 1463205 RMD160 d3bb5d7a97f47b9e73d454c445ec0d42410f43a3 SHA1 6444211b1dd1461f3fc652ea210078ba56d4211a SHA256 5b1d2bebdf3fec65a053752e18b09c128183cfa8d3e9aa54ddcd64310d9d0105
 DIST NetworkManager-0.7.0-rc2.tar.gz 1471314 RMD160 eb026af9f08917b456b36dc4c01b3491ceabd2e2 SHA1 c88754775800a4d3592724d9312d8943e953777a SHA256 2a646189f67fe4930a63c550ac5480d3b8f4b30689ee3c0b797b1b7c79fdbcb0
-EBUILD networkmanager-0.7.0_rc1.ebuild 3747 RMD160 015e53dc3956feb39d0d1d17e3d427c94dec7a12 SHA1 cb9137538577deaca32befa142bd0a116a9935c1 SHA256 77f64d32b4d233484fd69e8cab5297e9966c198f200c38792465aa2173d8dbad
-EBUILD networkmanager-0.7.0_rc2.ebuild 3747 RMD160 b70c6124243e072b00ea8a8c22a3721550f01092 SHA1 519220a4691a764f32882e378f7f29e032d7e980 SHA256 cddc87e470de90b807d8e6c4f279601ffe5c9f431e7151259e845bbe8cc26c1a
+EBUILD networkmanager-0.7.0_rc2.ebuild 3638 RMD160 fa7f245b3cc1717561576860c4c7016af0cfab29 SHA1 b47d966357976b2ede4f274749d58979359bfc05 SHA256 ef19e344e6ef57f5eaf191f084e9e2d50884edec1441513dfbcf8a475ebbeff8
 EBUILD networkmanager-9999.ebuild 3738 RMD160 e572302105ee0468a58a6ebefe7f66a857f583e2 SHA1 d0865a15b6acdafef63852a722fc774b57b08c50 SHA256 8cdc1bbd524e6f0f493d2d0698fee1928ab50536742ba83407cd78ddede61c53
 MISC metadata.xml 881 RMD160 8608a638e5bffd8305d41bf8d09334456cbbe38a SHA1 43e6a124de8058a738d8b2562e9dd8b36983dc13 SHA256 a59e53d5e665e795ce8da297eb0c63ab2a52b88025eb83d968b370b727d83967
diff --git a/net-misc/networkmanager/networkmanager-0.7.0_rc1.ebuild b/net-misc/networkmanager/networkmanager-0.7.0_rc1.ebuild
deleted file mode 100644
index 297cbc0..0000000
--- a/net-misc/networkmanager/networkmanager-0.7.0_rc1.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-# NetworkManager likes itself with capital letters
-MY_PN=${PN/networkmanager/NetworkManager}
-MY_P=${MY_PN}-${PV/_/-}
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-SRC_URI="http://ftp.gnome.org/pub/gnome/sources/$MY_PN/0.7/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gnome nss gnutls dhclient dhcpcd resolvconf"
-
-RDEPEND=">=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.75
-	>=sys-apps/hal-0.5.10
-	>=net-wireless/wireless-tools-28_pre9
-	>=dev-libs/glib-2.16
-	>=sys-auth/policykit-0.8
-	>=dev-libs/libnl-1.1
-	>=net-wireless/wpa_supplicant-0.5.10
-	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
-
-	gnutls? (
-		nss? ( >=dev-libs/nss-3.11 )
-		!nss? ( dev-libs/libgcrypt
-			net-libs/gnutls ) )
-	!gnutls? ( >=dev-libs/nss-3.11 )
-
-	dhclient? (
-		dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-		!dhcpcd? ( >=net-misc/dhcp-3.0.0 ) )
-	!dhclient? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-
-	resolvconf? ( net-dns/openresolv )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	net-dialup/ppp
-        doc? ( >=dev-util/gtk-doc-1.8 )"
-
-PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 )
-	kde? ( >=kde-misc/knetworkmanager-0.7_pre0 )"
-
-S=${WORKDIR}/${MY_P/-rc1/}
-
-pkg_setup() {
-	if ! built_with_use net-wireless/wpa_supplicant dbus ; then
-		eerror "Please rebuild net-wireless/wpa_supplicant with the dbus useflag."
-		die "Fix wpa_supplicant first."
-	fi
-}
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	# Fix up the dbus conf file to use plugdev group
-	epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
-}
-
-src_compile() {
-	ECONF="--disable-more-warnings \
-		--localstatedir=/var \
-		--with-distro=gentoo \
-		--with-dbus-sys=/etc/dbus-1/system.d
-		$(use_enable doc gtk-doc)
-		$(use_with doc docs)
-		$(use_with resolvconf)"
-
-	# default is dhcpcd (if none or both are specified), ISC dchclient otherwise
-	if use dhclient ; then
-		if use dhcpcd ; then
-			ECONF="${ECONF} --with-dhcp-client=dhcpcd"
-		else
-			ECONF="${ECONF} --with-dhcp-client=dhclient"
-		fi
-	else
-		ECONF="${ECONF} --with-dhcp-client=dhcpcd"
-	fi
-
-	# default is NSS (if none or both are specified), GnuTLS otherwise
-	if use gnutls ; then
-		if use nss ; then
-			ECONF="${ECONF} --with-crypto=nss"
-		else
-			ECONF="${ECONF} --with-crypto=gnutls"
-		fi
-	else
-		ECONF="${ECONF} --with-crypto=nss"
-	fi
-
-	econf ${ECONF} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# Need to keep the /var/run/NetworkManager directory
-	keepdir /var/run/NetworkManager
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	dodoc AUTHORS ChangeLog NEWS README TODO
-
-	# Add keyfile plugin support
-	keepdir /etc/NetworkManager/system-connections
-	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf
-}
-
-pkg_postinst() {
-	elog "You need to be in the plugdev group in order to use NetworkManager"
-	elog "Problems with your hostname getting changed?"
-	elog ""
-	elog "Add the following to /etc/dhcp/dhclient.conf"
-	elog 'send host-name "YOURHOSTNAME";'
-	elog 'supersede host-name "YOURHOSTNAME";'
-	elog ""
-	elog "You will need to restart DBUS if this is your first time"
-	elog "installing NetworkManager."
-	elog ""
-	elog "To save system-wide settings as a user, that user needs to have the"
-	elog "right policykit privileges. You can add them by running:"
-	elog 'polkit-auth --grant org.freedesktop.network-manager-settings.system.modify "USERNAME"'
-}
diff --git a/net-misc/networkmanager/networkmanager-0.7.0_rc2.ebuild b/net-misc/networkmanager/networkmanager-0.7.0_rc2.ebuild
index 92eaa49..253e75b 100644
--- a/net-misc/networkmanager/networkmanager-0.7.0_rc2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.7.0_rc2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.gnome.org/pub/gnome/sources/$MY_PN/0.7/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gnome nss gnutls dhclient dhcpcd resolvconf"
+IUSE="doc nss gnutls dhclient dhcpcd resolvconf"
 
 RDEPEND=">=sys-apps/dbus-1.2
 	>=dev-libs/dbus-glib-0.75
@@ -45,9 +45,6 @@ DEPEND="${RDEPEND}
 	net-dialup/ppp
         doc? ( >=dev-util/gtk-doc-1.8 )"
 
-PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.7.0_pre0 )
-	kde? ( >=kde-misc/knetworkmanager-0.7_pre0 )"
-
 S=${WORKDIR}/${MY_P/-rc2/}
 
 pkg_setup() {