Readd ~ppc which was dropped due to >=hal-0.5.10 dependency, and remove old

  version. Block latest version of libnl (bug #223381).
(Portage version: 2.1.4.4)

4 files changed, 11 insertions, 99 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index a1fb6de5309a..e4b2c2277c27 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.30 2008/03/07 09:27:02 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.31 2008/06/26 14:10:20 rbu Exp $
+
+  26 Jun 2008; Robert Buchholz <rbu@gentoo.org>
+  networkmanager-0.6.5_p20070823.ebuild,
+  -networkmanager-0.6.5_p20080205.ebuild, networkmanager-0.6.6.ebuild:
+  Readd ~ppc which was dropped due to >=hal-0.5.10 dependency, and remove old
+  version. Block latest version of libnl (bug #223381).
 
   07 Mar 2008; Steev Klimaszewski <steev@gentoo.org>
   -files/NM-po-linguas.patch, -networkmanager-0.6.5.98.ebuild,
diff --git a/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
index 31f5a9faeff1..f6b7f4e41f97 100644
--- a/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild,v 1.8 2008/02/14 05:35:28 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20070823.ebuild,v 1.9 2008/06/26 14:10:20 rbu Exp $
 
 inherit gnome2 eutils
 
@@ -22,6 +22,7 @@ RDEPEND=">=sys-apps/dbus-0.60
 	>=sys-apps/hal-0.5
 	sys-apps/iproute2
 	=dev-libs/libnl-1.0_pre6*
+	!>=dev-libs/libnl-1.1
 	>=net-misc/dhcdbd-1.4
 	>=net-wireless/wireless-tools-28_pre9
 	>=net-wireless/wpa_supplicant-0.4.8
diff --git a/net-misc/networkmanager/networkmanager-0.6.5_p20080205.ebuild b/net-misc/networkmanager/networkmanager-0.6.5_p20080205.ebuild
deleted file mode 100644
index c26bdd17c458..000000000000
--- a/net-misc/networkmanager/networkmanager-0.6.5_p20080205.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.5_p20080205.ebuild,v 1.2 2008/02/14 05:35:28 steev Exp $
-
-inherit gnome2 eutils
-
-# NetworkManager likes itself with capital letters
-MY_P=${P/networkmanager/NetworkManager}
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-# Snapshot from SVN, hosted by steev
-SRC_URI="http://steev.net/files/distfiles/${MY_P}.tar.gz
-	mirror://gentoo/${PN}-0.6.5_p20070823-updatedbackend.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="crypt doc gnome"
-
-# Yes, I know that configure will accept libnl 1.0-pre8, however we only have
-# 1.1 in the tree, therefore dep on it.
-RDEPEND=">=sys-apps/dbus-0.60
-	>=sys-apps/hal-0.5.10
-	sys-apps/iproute2
-	>=dev-libs/libnl-1.1
-	>=net-misc/dhcdbd-1.4
-	>=net-wireless/wireless-tools-28_pre9
-	>=net-wireless/wpa_supplicant-0.4.8
-	>=dev-libs/glib-2.8
-	gnome? ( >=x11-libs/gtk+-2.8
-		>=gnome-base/libglade-2
-		>=gnome-base/gnome-keyring-0.4
-		>=gnome-base/gnome-panel-2
-		>=gnome-base/gconf-2
-		>=gnome-base/libgnomeui-2 )
-	crypt? ( dev-libs/libgcrypt )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool"
-PDEPEND="gnome? ( >=gnome-extra/nm-applet-0.6.5 )"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-USE_DESTDIR="1"
-
-G2CONF="${G2CONF} \
-	`use_with crypt gcrypt` \
-	`use_with gnome` \
-	--disable-more-warnings \
-	--localstatedir=/var \
-	--with-distro=gentoo \
-	--with-dbus-sys=/etc/dbus-1/system.d"
-
-S=${WORKDIR}/NetworkManager-0.6.5
-
-pkg_setup() {
-	if built_with_use sys-apps/iproute2 minimal ; then
-		eerror "Please rebuild sys-apps/iproute2 without the minimal useflag."
-		die "Fix iproute2 first."
-	fi
-}
-
-src_unpack () {
-	unpack ${A}
-	cd "${S}"
-
-	# Update to use our backend
-	epatch "${WORKDIR}/${PN}-0.6.5_p20070823-updatedbackend.patch"
-	# Use the kernel headers
-	epatch "${FILESDIR}/${PN}-use-kernel-headers.patch"
-	# Fix the resolv.conf permissions
-	epatch "${FILESDIR}/${PN}-resolvconf-perms.patch"
-	# Fix up the dbus conf file to use plugdev group
-	epatch "${FILESDIR}/${PN}-0.6.5-confchanges.patch"
-}
-
-src_install() {
-	gnome2_src_install
-	# Need to keep the /var/run/NetworkManager directory
-	keepdir /var/run/NetworkManager
-	newinitd "${FILESDIR}/NetworkManagerDispatcher" NetworkManagerDispatcher
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	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 "You will need to restart DBUS if this is your first time"
-	elog "installing NetworkManager."
-}
diff --git a/net-misc/networkmanager/networkmanager-0.6.6.ebuild b/net-misc/networkmanager/networkmanager-0.6.6.ebuild
index 5c47ccfc1962..46424f356c64 100644
--- a/net-misc/networkmanager/networkmanager-0.6.6.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.6.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.6.ebuild,v 1.1 2008/03/07 09:27:02 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.6.6.ebuild,v 1.2 2008/06/26 14:10:20 rbu Exp $
 
 inherit autotools gnome2 eutils
 
@@ -14,7 +14,7 @@ SRC_URI="http://people.redhat.com/dcbw/NetworkManager/0.6.6/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="crypt doc gnome"
 
 # Yes, I know that configure will accept libnl 1.0-pre8, however we only have