Drop old and undo accidental broken CVS commit.

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

5 files changed, 15 insertions, 241 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index e1b7f8105a72..ab067771d58b 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.124 2012/01/05 01:56:32 qiaomuf Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.125 2012/02/01 08:00:19 tetromino Exp $
+
+  01 Feb 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -networkmanager-0.9.1.95.ebuild,
+  -files/networkmanager-0.9.1.95-dns-routing-unmanaged-devices.patch,
+  -files/networkmanager-0.9.1.95-glib-2.31.patch,
+  -files/networkmanager-0.9.1.95-keyfile-scheme.patch:
+  Drop old and undo accidental broken CVS commit.
 
 *networkmanager-0.9.2.0-r2 (05 Jan 2012)
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index a92cf11d9737..f587781369d6 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 01-org.freedesktop.NetworkManager.settings.modify.system.pkla 187 RMD160 a6de26825439432c62cfaa7be847fa39181747fa SHA1 cae5a2c5d8ab0af2830f17e7fe375468c8d5b151 SHA256 909356b25e2d887a31c0f9f2a23a466957f27b163bbd5172fa852988a1db1860
 AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
@@ -9,37 +9,29 @@ AUX networkmanager-0.8-read-hostname.patch 2380 RMD160 8b4349293235d2b63546b4e65
 AUX networkmanager-0.8.4.0-fix-tests.patch 2079 RMD160 8e867d51abbd0418e4eeb92d5e9d8315cafe78fe SHA1 31f9ab7e9f35798590e5c35965f9b96874055550 SHA256 33ca19856777794b558b88972a5ba15a13c53d77834eaf2339a64c6b072c31a7
 AUX networkmanager-0.8.4.0-ifnet-smarter-write.patch 5969 RMD160 d401c8eae69ea70f5bf08f2950a6e476a03f460b SHA1 9a1fde1c789b42ce6e3b0766125862bde962b4c8 SHA256 b4fbc482cbc22edfff0f89624d857cd35b6cb3d7fe85604c5453e7685eb4e12a
 AUX networkmanager-0.8.4.0-shared-connection.patch 15067 RMD160 3e878a999e92fdb6baffba6f2a12caa25a2ba2c6 SHA1 e9664c505bc19964082aa319c4d524e6cf6651e2 SHA256 57f56fb45e48f80636a17d64f080aae594d6f19e51ff5467cc27a739b4b380e6
-AUX networkmanager-0.9.1.95-dns-routing-unmanaged-devices.patch 2740 RMD160 014d4d3d887995861cb9c5f930c37e4aabfc519a SHA1 d6a05686ec9c18da9df4606561a08f248961c7b7 SHA256 f5f37f6addba0cd0326cb08d7d1949cc2f074c38967bcaddd805a67f944a3f23
 AUX networkmanager-0.9.1.95-force-libnl1.1.patch 1883 RMD160 fc6760cdcba81710c7232c536ee31276fe676062 SHA1 9bb1257b55f7a15d61f6c30d27ec7ded7c49da7a SHA256 1fb9d5bbda83e056c7ea53bcb5463f2f1b1c09d91b05a0df5fcfd948fb4c0007
-AUX networkmanager-0.9.1.95-glib-2.31.patch 4932 RMD160 6d20b856a4c3ce86cc15f10439ac437c1f70e0aa SHA1 2c773a16109e57eddb7bf8a1932c05eb3c5442a1 SHA256 b5a70e9a29d11a0455493d895abeb673042c7bcbc149c16a12b6f70ca8ab4912
-AUX networkmanager-0.9.1.95-keyfile-scheme.patch 927 RMD160 16ea59d436e300f5e453d1f9b027c67704d9ee6b SHA1 6ccf2538dba3e29c1210c6b843ececfd09542581 SHA256 0c1013afe0343a94f2584779737d6b1714c432564e967ca014ba5da552b3d283
 AUX networkmanager-0.9.2.0-ifnet-ignore-user-connections.patch 3023 RMD160 aaba09baa8db58bd0924e9ebc364fe92b4692622 SHA1 5fb89802986120a1d3905775dd2669897fcc884d SHA256 e5f43915b13f17c0ad1acdd1c44bae377c60b7fe4210e5cc3c5fbac27f6ad9aa
 AUX networkmanager-0.9.2.0-ifnet-openrc-style.patch 18656 RMD160 deb7be203b56ba2029763bf34508db584d35df92 SHA1 bdfb8e2c4fadc129171f48eb99330c75354d65da SHA256 9ec9bd94159979ffd17221901299055ec3329886862cca564c9931a7b65fb616
 AUX networkmanager-0.9.2.0-ifnet-remove-system-prefix.patch 1939 RMD160 c06e5eeb31b537ab1ccd0ce0ee52b1fb2cf16a95 SHA1 d0a7d5bb6c69c7005f7f68b20b9421e433fe9d3d SHA256 7dda93bafcb3736ba4d037897a50116e005df47008389f3fee872c1fbd3eaf9f
+AUX networkmanager-0.9.2.0-ifnet-unquote-hostname.patch 1005 RMD160 c5660af6a897a31a00803c24b6e9b84661b65012 SHA1 77052ac9d3629e81dee3d5bbf8a6dc9bb57deb98 SHA256 008a03e508fc3ccbe5c57f2b9caa9f90a74001961c212144842e46dd0d5b3f84
 AUX networkmanager-0.9_rc3-fix-tests.patch 589 RMD160 a63f0d4f908a32356baf78c7e7c9a68cd9e4d68c SHA1 9f1ed4418b124bae89f9849ce2560dd713565abc SHA256 c03a97751762864dc4dcfa6d9eeee1ea70b986bcd5830a6777cd7514ba647540
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 AUX nm-system-settings.conf-ifnet 70 RMD160 c0d2be147383999b62cead86ab4333169e4ef277 SHA1 679ec8052b610969c148a2d34cd4da7a41484a76 SHA256 34f53d9ac1ad65eda6942dc3059117f60f6321059ca23f4fbfcc2f2edcae151f
 DIST NetworkManager-0.8.4.0.tar.bz2 1672926 RMD160 d2f20c4130b1a0015973358920802ad6796e7400 SHA1 85a75f7ed80cbdd4b35797ae5698cafad10084c8 SHA256 e71f2ed5b28b9d46566fbf573e43ee8553e60aa3f557dc61e07b9e198c657588
 DIST NetworkManager-0.8.tar.bz2 1376044 RMD160 40074f52a79965510de816c0e94d1b9ac582c522 SHA1 fd290057a9246055fa59507b6a3d6b99ceb4c3dc SHA256 4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05
 DIST NetworkManager-0.9.0.tar.xz 1740644 RMD160 340fa7db13ba9163e3092acfdd23b4e9d946a664 SHA1 635cc2b32fd820b3c2c14d27ced208d3adc6a708 SHA256 166db385e5a349dd320f061554a54a9d599eb5bfc8fcbcc836cf5046904c5149
-DIST NetworkManager-0.9.1.95.tar.xz 1761076 RMD160 3882ee276737cbe18c209420b4e75dea924b37d5 SHA1 337b2e2d9bcce32f7adbbb145f04de3ce26d9771 SHA256 4702c25324fc6c0e860a9be9860b898ce444333d084b0d5b86b069bbd5fee468
 DIST NetworkManager-0.9.2.0.tar.xz 1764032 RMD160 f9104c2d2af3df9879551d090944f6df0ef8e172 SHA1 9e174ded9cdd27b4424b5c35cd985e23dd7f8924 SHA256 437af9132a6fe1ff603cd981c0cfaa4557592b34782f9705e708d61365226ddf
 EBUILD networkmanager-0.8-r1.ebuild 3718 RMD160 abf962bc9f2368b13d28432994383e37d82aa76c SHA1 1ff8a79f45d9daab366466d0a9858e4fcfabad83 SHA256 ffd2d70ed1172833aa994d6e62ef5a00503119e5dd1c2c9090ceac348ab78414
 EBUILD networkmanager-0.8.4.0-r2.ebuild 4335 RMD160 7f413e48de262b71f692c0585e2e70b64c467249 SHA1 8cd00862bac4a3218cbb45d011cb394d91563d97 SHA256 654a9a55d1683afa579df435df9df4b6d439c496c80900039773e5588433280d
 EBUILD networkmanager-0.9.0.ebuild 3945 RMD160 cd897dc8dc3fa92d4f4694a5acd703be6f9b5be1 SHA1 ef7eaa7e68bf01c2f4ea280742f30f856ef76ef6 SHA256 ab67f7f112c3b415c70f08b1ea9d6c029b7733203bafb512250e483b91c61bc8
-EBUILD networkmanager-0.9.1.95.ebuild 4926 RMD160 2a93cf7a8e56c5a5717dfbe44eb782c6a71efa94 SHA1 47cb6a9354dcc37eba1b56b286cbbd6d56fb1e7e SHA256 2beb60a101e6a8ee920b20f7ffa711f4250073cb10369d829e1c3f17b40fa8f1
 EBUILD networkmanager-0.9.2.0-r2.ebuild 4861 RMD160 700e51efe25ed4fe00da6344f212a1ec58754a3e SHA1 4a0ec8619469fec3a2b4e3d6c67eb8b9bed368e3 SHA256 4a81d453993aa6c079550481235e0634dbd78865238dcabe145eca4cd742ebb7
 EBUILD networkmanager-0.9.2.0.ebuild 4603 RMD160 3debbefb4e568c8f9a88afbe99c9b396c23e2c8a SHA1 ac79b40c257c8f35785de76abd642dc57d3a2a42 SHA256 dc3ed6e10b182eaf4630e819a413c07a2193da9d2d575a4dac8ab2a443ead44e
-MISC ChangeLog 27810 RMD160 17eb57cfd74dabe296820e394b8dc1160c9f8557 SHA1 bc31ee55c0552c3b1e18108ddc374a26f8d6ad9c SHA256 1fe6ab3d115a6f73ff2dd459d32bf3787c93fda4a20da7f1f2ccfb01c0cc4d10
+MISC ChangeLog 28132 RMD160 08cf4cb8890abe187cdb2c0004b80d5ab6e94238 SHA1 bb145815d44814b9c6e6a438e99f15a8f783ea9a SHA256 f12a8dfcdb3d28b1182f9d208a3d961e03fb644189a2d86052f0dffc4821a2b4
 MISC metadata.xml 1334 RMD160 f298cbf6adc22935891d30e834f5713d439a010d SHA1 c06b8992e77b4894a13b38890c4dfa62606d1d89 SHA256 59cb4c0eb37a25238b36f0b514ff4bc232e4df3666b5491b31a1d7265c1a0c37
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPBQNcAAoJEDCzDeQXsVfpEzsIAJeb8kzrT5GIoU7+ycP8ig/H
-L1i4j6ICWO6y2tfNKlT6K+p1xIoCKPN7RYPjo148COYIN2MH83zqWc5rVs3l5AxT
-eyJZNSEZlieulTx55h1S+v/R+HtlfS9frZyNdGqRoUL9K0kTp1fTB/h1ZvR8tUVI
-nVay9EBK7yWRRiq0hiby5NC4OZ0OWnhW3dqdGBOpX2YrKFIDHaIix3nAvBC3Kx6z
-PvXxR833x3imIOrnmr7CowGdV3bGe4aezzMjRlLWNmdfLJ4zDj6Mgqd5uP0ZhG7u
-ekMqDxmVTQKzFYxNGO1iPMUSQIDrN3/NvPRY6ZMNaYx6gYe5ROiuPhIBAlBem3M=
-=6ZrJ
+iF4EAREIAAYFAk8o8RgACgkQdjK8w9WeBnDJCAD/fyYGyqsEbQUS+oXJ/8k5R/S3
+C/SuzZVNSbdFkpvAPzkA/A33hwibtQp3QE/kUCVIlP1sFtwZXumdBEK8zNx/l+lF
+=yFnD
 -----END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/files/10-openrc-nm-interfaces b/net-misc/networkmanager/files/10-openrc-nm-interfaces
deleted file mode 100644
index 101ba801c2ca..000000000000
--- a/net-misc/networkmanager/files/10-openrc-nm-interfaces
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/sh
-# Copyright (c) 2012 Alexandre Rostovtsev
-# Released under the 2-clause BSD license.
-
-# Ensures that the nm-interfaces OpenRC service is marked as started if
-# NetworkManager had been started via openrc and brought up some interfaces.
-
-# Exit if no valid interface name given
-if [ -z "$1" -o "x$1" = "xnone" ]; then
-    exit 1
-fi
-
-# Exit if the NetworkManager OpenRC service is not running
-"@EPREFIX@/etc/init.d/NetworkManager" status &> /dev/null || exit 1
-
-case "$2" in
-    up)
-        exec "@EPREFIX@/etc/init.d/nm-interfaces" mark-started
-        ;;
-    down)
-        exec "@EPREFIX/etc/init.d/nm-interfaces" stop
-        ;;
-esac
-
-exit 1
diff --git a/net-misc/networkmanager/files/nm-interfaces b/net-misc/networkmanager/files/nm-interfaces
deleted file mode 100644
index 3f276ee25dbf..000000000000
--- a/net-misc/networkmanager/files/nm-interfaces
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/sbin/runscript
-# Copyright (c) 2012 Alexandre Rostovtsev
-# Released under the 2-clause BSD license.
-
-description="Virtual service for interfaces configured by NetworkManager. \
-Do not start this service manually or add it to any runlevels!"
-
-depend()
-{
-    need NetworkManager
-    provide net
-}
-
-start()
-{
-    eerror "${RC_SVCNAME} should not be started manually or added to any runlevels."
-    return 1
-}
-
-# Separate function to prevent warnings on starting service multiple times
-mark_started()
-{
-    service_started && return 0
-    ebegin "Marking NetworkManager network interfaces as started"
-    mark_service_started
-    eend 0
-}
-
-stop()
-{
-    [ "x$(LC_ALL=C nmcli -t -f state nm 2> /dev/null)" = "xconnected" ] && return 1
-    ebegin "Marking NetworkManager network interfaces as stopped"
-    eend 0
-}
diff --git a/net-misc/networkmanager/networkmanager-0.9.2.0-r3.ebuild b/net-misc/networkmanager/networkmanager-0.9.2.0-r3.ebuild
deleted file mode 100644
index 9367e25b656d..000000000000
--- a/net-misc/networkmanager/networkmanager-0.9.2.0-r3.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.9.2.0-r3.ebuild,v 1.1 2012/02/01 07:46:37 tetromino Exp $
-
-EAPI="4"
-GNOME_ORG_MODULE="NetworkManager"
-
-inherit autotools eutils gnome.org linux-info systemd
-
-DESCRIPTION="Network configuration and management in an easy way. Desktop environment independent."
-HOMEPAGE="http://www.gnome.org/projects/NetworkManager/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="avahi bluetooth doc +nss gnutls dhclient +dhcpcd +introspection
-	kernel_linux +ppp resolvconf connection-sharing wimax"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
-
-REQUIRED_USE="
-	^^ ( nss gnutls )
-	^^ ( dhclient dhcpcd )"
-
-# gobject-introspection-0.10.3 is needed due to gnome bug 642300
-# wpa_supplicant-0.7.3-r3 is needed due to bug 359271
-# libnl:1.1 is needed for linking to net-wireless/wimax libraries
-# XXX: on bump, check that net-wireless/wimax is still using libnl:1.1 !
-# TODO: Qt support?
-COMMON_DEPEND=">=sys-apps/dbus-1.2
-	>=dev-libs/dbus-glib-0.75
-	>=net-wireless/wireless-tools-28_pre9
-	|| ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-147[extras] )
-	>=dev-libs/glib-2.26
-	>=sys-auth/polkit-0.97
-	dev-libs/libnl:1.1
-	>=net-wireless/wpa_supplicant-0.7.3-r3[dbus]
-	bluetooth? ( >=net-wireless/bluez-4.82 )
-	avahi? ( net-dns/avahi[autoipd] )
-	gnutls? (
-		dev-libs/libgcrypt
-		net-libs/gnutls )
-	nss? ( >=dev-libs/nss-3.11 )
-	dhclient? ( net-misc/dhcp )
-	dhcpcd? ( >=net-misc/dhcpcd-4.0.0_rc3 )
-	introspection? ( >=dev-libs/gobject-introspection-0.10.3 )
-	ppp? (
-		>=net-misc/modemmanager-0.4
-		>=net-dialup/ppp-2.4.5 )
-	resolvconf? ( net-dns/openresolv )
-	connection-sharing? (
-		net-dns/dnsmasq
-		net-firewall/iptables )
-	wimax? ( >=net-wireless/wimax-1.5.1 )"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-auth/consolekit"
-
-DEPEND="${COMMON_DEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	doc? ( >=dev-util/gtk-doc-1.8 )"
-
-sysfs_deprecated_check() {
-	ebegin "Checking for SYSFS_DEPRECATED support"
-
-	if { linux_chkconfig_present SYSFS_DEPRECATED_V2; }; then
-		eerror "Please disable SYSFS_DEPRECATED_V2 support in your kernel config and recompile your kernel"
-		eerror "or NetworkManager will not work correctly."
-		eerror "See http://bugs.gentoo.org/333639 for more info."
-		die "CONFIG_SYSFS_DEPRECATED_V2 support detected!"
-	fi
-	eend $?
-}
-
-pkg_pretend() {
-	if use kernel_linux; then
-		get_version
-		if linux_config_exists; then
-			sysfs_deprecated_check
-		else
-			ewarn "Was unable to determine your kernel .config"
-			ewarn "Please note that if CONFIG_SYSFS_DEPRECATED_V2 is set in your kernel .config, NetworkManager will not work correctly."
-			ewarn "See http://bugs.gentoo.org/333639 for more info."
-		fi
-
-	fi
-}
-
-pkg_setup() {
-	enewgroup plugdev
-}
-
-src_prepare() {
-	# Don't build tests
-	epatch "${FILESDIR}/${PN}-0.9_rc3-fix-tests.patch"
-	# Build against libnl:1.1 for net-wireless/wimax-1.5.2 compatibility
-	epatch "${FILESDIR}/${PN}-0.9.1.95-force-libnl1.1.patch"
-	# Migrate to openrc style
-	epatch "${FILESDIR}/${P}-ifnet-openrc-style.patch"
-	# Ignore per-user connections
-	epatch "${FILESDIR}/${P}-ifnet-ignore-user-connections.patch"
-	# Remove system prefix
-	epatch "${FILESDIR}/${P}-ifnet-remove-system-prefix.patch"
-	# Correctly deal with single quotes in /etc/conf.d/hostname
-	epatch "${FILESDIR}/${P}-ifnet-unquote-hostname.patch"
-
-	eautoreconf
-	default
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		--disable-static
-		--localstatedir=/var
-		--with-distro=gentoo
-		--with-dbus-sys-dir=/etc/dbus-1/system.d
-		--with-udev-dir=/lib/udev
-		--with-iptables=/sbin/iptables
-		$(use_enable doc gtk-doc)
-		$(use_enable introspection)
-		$(use_enable ppp)
-		$(use_enable wimax)
-		$(use_with dhclient)
-		$(use_with dhcpcd)
-		$(use_with doc docs)
-		$(use_with resolvconf)
-		$(systemd_with_unitdir)"
-
-		if use nss ; then
-			ECONF="${ECONF} $(use_with nss crypto=nss)"
-		else
-			ECONF="${ECONF} $(use_with gnutls crypto=gnutls)"
-		fi
-
-	econf ${ECONF}
-}
-
-src_install() {
-	default
-
-	# Need to keep the /etc/NetworkManager/dispatched.d for dispatcher scripts
-	keepdir /etc/NetworkManager/dispatcher.d
-
-	# Service that provides openrc net dependency only when nm is connected
-	doinitd "${FILESDIR}/nm-interfaces"
-	insinto /etc/NetworkManager/dispatcher.d
-	doins "${FILESDIR}/10-openrc-nm-interfaces"
-
-	# Add keyfile plugin support
-	keepdir /etc/NetworkManager/system-connections
-	chmod 0600 "${ED}"/etc/NetworkManager/system-connections/.keep* # bug #383765
-	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf-ifnet" nm-system-settings.conf
-
-	# Allow users in plugdev group to modify system connections
-	insinto /etc/polkit-1/localauthority/10-vendor.d
-	doins "${FILESDIR}/01-org.freedesktop.NetworkManager.settings.modify.system.pkla"
-
-	# Remove useless .la files
-	find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
-}
-
-pkg_postinst() {
-	elog "To modify system network connections without needing to enter the"
-	elog "root password, add your user account to the 'plugdev' group."
-}