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

  version. Block latest version of libnl (bug #223381).
Package-Manager: portage-2.1.4.4

5 files changed, 14 insertions, 104 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/Manifest b/net-misc/networkmanager/Manifest
index acfb72fab4bf..e852ae9c800e 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -4,11 +4,9 @@ AUX networkmanager-resolvconf-perms.patch 532 RMD160 453ce19560e1872d1da1fa48e0c
 AUX networkmanager-updatedbackend.patch 17700 RMD160 685132b4a98843416264f06c480ff205fa87f789 SHA1 a83d2b0ea7e4a563af3d14567ba1da3605fbf654 SHA256 ee4a1583db867fd6a1851a9dd243401166f29ee9d00ad6e03e5b677915e5bf43
 AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b89d08f3baa3c2e58 SHA1 a9e269c9021888ca058b9fb72f9a71dc25a7488b SHA256 952948f41676fafcf76210cbef46728cbb219d6c851d5417d892b984fd725402
 DIST NetworkManager-0.6.5_p20070823.tar.gz 956975 RMD160 9d8556e3b5fc3155632bafdb726a5861412ae94b SHA1 c1d795cf114d2f5951a746eb4aa770e54eece9b6 SHA256 e6181ac9aadf1c36a20b979d313cfd0ae947bcf93f61c1c028cc1642c216454c
-DIST NetworkManager-0.6.5_p20080205.tar.gz 993199 RMD160 fcc8e2310da806e0603340d8acf79d5a7891048b SHA1 502f9fb1d3936a90c4ec01c71ca4b49687bd5e31 SHA256 30f3aec4f21c85190111535f69c35d6b8b0a393c63f767ff1ce869513f725b44
 DIST NetworkManager-0.6.6.tar.gz 984114 RMD160 f0672ee31001f83b06f6b93c30a01f37ee12ed6e SHA1 c5d0bcf7d262e1b600df6dad9f6f4baada293634 SHA256 36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2
 DIST networkmanager-0.6.5_p20070823-updatedbackend.patch.bz2 5006 RMD160 f35c35a3db8dbd3178c8325a4eb8a641653a85f0 SHA1 5f9a3b1d85e4a08fa242ab1ff73c6d08ec2791d8 SHA256 0ee0ee38a3e5ac1f501d83dd424dd95e69871dd9e7d67cf2e09e9a378ae10fa8
-EBUILD networkmanager-0.6.5_p20070823.ebuild 2662 RMD160 1579d42a9ff716253a39438dc3ce1b8e596e3b73 SHA1 af1ab0739b042d562045773da7c1e3df2a6168aa SHA256 6a472351c0a61e6fe8779fbe8ac9bf4cb7b7e63de1e296af8eacbb3334376819
-EBUILD networkmanager-0.6.5_p20080205.ebuild 2861 RMD160 23b6e241563a868a28968da5493f7ed47bb2b8c1 SHA1 4026c993613436ff1af2e8a1dbe84d7ddb293bbb SHA256 1caaddd7dddb23ea4e92341bfc3dc4a07865b61e15061022d50e6d1f8abd0fb3
-EBUILD networkmanager-0.6.6.ebuild 2659 RMD160 7b86e40b1ca88aac2de100cad7378676611f2bfe SHA1 dbacc3a9ccd32e2cfd238d97e2038cd556656fce SHA256 bff2e3c264ba0773b1b8de17aec677fbfe6633ff87e4d2bd8f27d23f3a0d88a4
-MISC ChangeLog 7106 RMD160 8b3a5efb7137e5dd850cfae726176aec3312f81e SHA1 9c105c2923ced26cd1a4620b15eee0757f324bec SHA256 147ce5635f7f66c4f36ce2579d2af49212e5d52511481998336422f9db1bfd1d
+EBUILD networkmanager-0.6.5_p20070823.ebuild 2683 RMD160 16e33285137d3fa50691a39c609fe8e34432fc12 SHA1 9ceb15732edc3dfa7cdc9c0f9e4c8cca6cb36ad1 SHA256 6ed35dafe8b1a7896d1cf4ef08d4d152724181701c61f34bc4980351ecee3615
+EBUILD networkmanager-0.6.6.ebuild 2662 RMD160 6a7245db9c1ebb83fd5ee0a7c73b43a15a327c18 SHA1 bf3f8e4e4584d59bdbd7e0f95feecd66c1aacfb4 SHA256 4b18a5abf03f930c15d888e07e884feb7864139b4f847bd11b9588cecc83eaea
+MISC ChangeLog 7399 RMD160 1e3141ba9b615935020aff055c7e520c41913b52 SHA1 d699b6e73f11f9770a04a1b89ac03c8cf39b0166 SHA256 a7c0c7ad38bf4ec725c96ea7a05ee132aca8c35c765c3a5b81a0dd1933c9f580
 MISC metadata.xml 352 RMD160 dc1d33b6866b7a51fd60cc8508668cb80ccdf797 SHA1 401add51065c746c71da8b5992874c0556cedc04 SHA256 c5b303e6d5dbe90d34284c51a1c7ea8015e87c41d6f63446a1bf7ba5daf0d26d
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