fix udev rules path properly now, bug #253788

Package-Manager: portage-2.1.6.11/cvs/Linux x86_64

5 files changed, 14 insertions, 294 deletions

diff --git a/net-misc/networkmanager/ChangeLog b/net-misc/networkmanager/ChangeLog
index 37578e3aed94..cc050913b76e 100644
--- a/net-misc/networkmanager/ChangeLog
+++ b/net-misc/networkmanager/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/networkmanager
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.43 2009/05/02 19:03:47 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/ChangeLog,v 1.44 2009/05/12 22:20:21 rbu Exp $
+
+*networkmanager-0.7.1-r3 (12 May 2009)
+
+  12 May 2009; Robert Buchholz <rbu@gentoo.org>
+  -networkmanager-0.7.0.ebuild, -networkmanager-0.7.1-r1.ebuild,
+  -networkmanager-0.7.1-r2.ebuild, +networkmanager-0.7.1-r3.ebuild:
+  fix udev rules path properly now, bug #253788
 
 *networkmanager-0.7.1-r2 (02 May 2009)
 
diff --git a/net-misc/networkmanager/Manifest b/net-misc/networkmanager/Manifest
index 3d9256bfae3d..5f4586fa3d27 100644
--- a/net-misc/networkmanager/Manifest
+++ b/net-misc/networkmanager/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX NetworkManagerDispatcher 1198 RMD160 4345870ab40607b9aed80c8da383b604f032b98e SHA1 1dd2250c746b25566fceaab551f4ef8335fe4f55 SHA256 f8cb5d0470619cf1f0812fffcf1bf2091e3c44a757899c07164f80ddd6a2641e
 AUX networkmanager-0.6.5-confchanges.patch 1053 RMD160 ae76d5c029090848a9264e7559aaab90e7f3c084 SHA1 4847532aa15316a1a45e8667cd7947b514a1833f SHA256 bf3418ccbf8643d14b0413cf7a9d25290003d4443a7a051bb54f953aebede84f
 AUX networkmanager-0.7.0-confchanges.patch 594 RMD160 c70c7d32722aa8f1ebf62b0382fad56c7d8e21d4 SHA1 35706e9807e923732e3ac1db9c1e7d7a9f0bcc8f SHA256 ffd4fdf452a5791d938406d33b432aff591ab7e475583a66343a5c98ee6091af
@@ -13,20 +10,10 @@ AUX networkmanager-use-kernel-headers.patch 466 RMD160 cd16279966d4e3594a20aa0b8
 AUX nm-system-settings.conf 23 RMD160 6d66c702b345bde668a420a15716feea6005fbd1 SHA1 49ba558d20f5ca5a201e027e13b878dd5ac3569c SHA256 44b048804c7c0b8b3b0c29b8632b6ad613c397d0a1635ec918e10c0fbcdadf21
 DIST NetworkManager-0.6.5_p20070823.tar.gz 956975 RMD160 9d8556e3b5fc3155632bafdb726a5861412ae94b SHA1 c1d795cf114d2f5951a746eb4aa770e54eece9b6 SHA256 e6181ac9aadf1c36a20b979d313cfd0ae947bcf93f61c1c028cc1642c216454c
 DIST NetworkManager-0.6.6.tar.gz 984114 RMD160 f0672ee31001f83b06f6b93c30a01f37ee12ed6e SHA1 c5d0bcf7d262e1b600df6dad9f6f4baada293634 SHA256 36d48a11957e1c4f53a685b0fcc7d060e8972b435501c92b10737bb844dd95e2
-DIST NetworkManager-0.7.0.tar.bz2 1139665 RMD160 d727cf71fec20797fce7d75e75f9fbc7292e990e SHA1 c661e95867c0cb231d3ef3e911b285ebb1e02310 SHA256 281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
 DIST NetworkManager-0.7.1.tar.bz2 1226975 RMD160 117677b5da4e66df0287e5a974c80709e988dcb3 SHA1 3f734b8c606bcc71a43c63ba3993524d8db807ca SHA256 7526a31de615a662cb09e915f26e5b151eda364240d983df6232aac8b9333f3a
 DIST networkmanager-0.6.5_p20070823-updatedbackend.patch.bz2 5006 RMD160 f35c35a3db8dbd3178c8325a4eb8a641653a85f0 SHA1 5f9a3b1d85e4a08fa242ab1ff73c6d08ec2791d8 SHA256 0ee0ee38a3e5ac1f501d83dd424dd95e69871dd9e7d67cf2e09e9a378ae10fa8
 EBUILD networkmanager-0.6.5_p20070823.ebuild 2703 RMD160 f26ac7b1b243c9be2e087042984453230d1b65f4 SHA1 d8d21f867a132d1368429b5f57d93be594a8a919 SHA256 bf05ebe5e345e0016b0391708813f1ae78ea10446dbbfd8c2f9d82a456b158e9
 EBUILD networkmanager-0.6.6.ebuild 2621 RMD160 7516ea6287cfe7c9b98e4f8e5203bf4b1642c8e6 SHA1 6dfc5a1e518e5b4b335a28ceeb248f8e1c639175 SHA256 8dce1c81ef039889d0bdd0ec9c18a3f3da14b42f20ba6ced5639808d6708bbe5
-EBUILD networkmanager-0.7.0.ebuild 3783 RMD160 81c88e8d04ef13dc350c79ce56efef3b41e7b657 SHA1 87b1c84937850409cb6c9d0e8d91913aab88fbe1 SHA256 c9f4155a47f50128feec7eb52c34741d09089a7d34482aedaf8c541fe44e92bb
-EBUILD networkmanager-0.7.1-r1.ebuild 4142 RMD160 17ff334306ac6ccd330e9039968632febaa32ab9 SHA1 114c1e17e8e19c54b3fdb093e38daae64b6cf98b SHA256 09b0a1eb4ca5c9a7d57619d903a47c2099b16ab33a0233994620c04b26cf47f4
-EBUILD networkmanager-0.7.1-r2.ebuild 4137 RMD160 66bfc89542226825bed385cc06664218ad63e00f SHA1 e3cdea44b391a635ce2eca48f242417fbe730d93 SHA256 07522eec27137705b6f490ad7e3529bc2ca074e0077acfb617681620c4d47011
-MISC ChangeLog 9882 RMD160 ed0f458b38153ff3a3fd288876de7293dba38848 SHA1 be0296fb3a3a117123ea8cd64defbc6d0c78aa2c SHA256 d9ed26e9d398d15c0c327ea1573c9757b5cc7b0dbde236728e3e8f2fde930b7b
+EBUILD networkmanager-0.7.1-r3.ebuild 4258 RMD160 78c3d29e6b25df3da250c467cf45e8603af2e852 SHA1 0e61ce56b40102b41b744e4e4366100ac3fc67f7 SHA256 842e70b0d20cae3f59b3fee137403fb31048288579dc816edeb2c419d8e2d212
+MISC ChangeLog 10151 RMD160 55a24d2c104c786a0cd84e5e6dc2662ce932945f SHA1 ac417e76d6f713779cd4cd70d9ce3e11747a90a9 SHA256 7facd68126121f3ae37b5f5d375fc85af8a16108a44ca14e1a6b2055903f4e4f
 MISC metadata.xml 981 RMD160 3bc47188c37b22140511a58a3dc9ff7b0e7ddcef SHA1 cf4a964ae0b40a0e9440799d41a8296d940bfcfd SHA256 4f0dcfe4b5a1453d76259c25f501505fa52c4b547634ce1768391eabfe13a06d
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iD8DBQFJ/JktomPajV0RnrERAnRgAJ9dM/GIEiaPgcFIZCnuKRc8jaA14QCeIGQv
-H+ZpuVi4NYrHgQHABSO1wKg=
-=P6VK
------END PGP SIGNATURE-----
diff --git a/net-misc/networkmanager/networkmanager-0.7.0.ebuild b/net-misc/networkmanager/networkmanager-0.7.0.ebuild
deleted file mode 100644
index 10aff8e1510f..000000000000
--- a/net-misc/networkmanager/networkmanager-0.7.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.0.ebuild,v 1.4 2009/04/25 14:27:22 rbu Exp $
-
-inherit 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/"
-SRC_URI="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="doc 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 )"
-
-S=${WORKDIR}/${MY_P}
-
-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}/${P}-confchanges.patch"
-	epatch "${FILESDIR}/${P}-gentoo-dhclient.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}
-	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 || die "dodoc failed"
-
-	# Add keyfile plugin support
-	keepdir /etc/NetworkManager/system-connections
-	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
-		|| die "newins failed"
-}
-
-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 --user "USERNAME"'
-}
diff --git a/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild b/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild
deleted file mode 100644
index 97748a4a996d..000000000000
--- a/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r1.ebuild,v 1.2 2009/04/26 13:35:18 mr_bones_ Exp $
-
-EAPI="2"
-inherit eutils
-# autotools
-
-# 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="mirror://gnome/sources/NetworkManager/0.7/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~arm ~amd64 ~ppc ~x86"
-IUSE="avahi doc nss gnutls dhclient dhcpcd resolvconf connection-sharing"
-# modemmanager"
-
-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[dbus]
-	|| ( sys-libs/e2fsprogs-libs <sys-fs/e2fsprogs-1.41.0 )
-	avahi? ( net-dns/avahi[autoipd] )
-	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 )
-	connection-sharing? (
-		net-dns/dnsmasq
-		net-firewall/iptables )"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-util/intltool
-	net-dialup/ppp
-	doc? ( >=dev-util/gtk-doc-1.8 )"
-
-#PDEPEND="modemmanager? ( >=net-misc/modemmanager-0.2 )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-
-	# Fix up the dbus conf file to use plugdev group
-	epatch "${FILESDIR}/${PN}-0.7.0-confchanges.patch"
-
-	# bug #266982
-	epatch "${FILESDIR}/${PN}-0.7.0-gentoo-dhclient.patch"
-
-	# bug #267349
-	epatch "${FILESDIR}/${PN}-0.7.1-bad-link.patch"
-
-#	EPATCH_SOURCE="${WORKDIR}/modem-manager-patchset-0.7.1"
-#	EPATCH_SUFFIX="patch"
-#	use modemmanager && epatch && eautoreconf
-
-}
-
-src_configure() {
-	ECONF="--disable-more-warnings
-		--localstatedir=/var
-		--with-distro=gentoo
-		--with-dbus-sys=/etc/dbus-1/system.d
-		--with-udev-dir=/etc/udev
-		$(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}
-}
-
-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 || die "dodoc failed"
-
-	# Add keyfile plugin support
-	keepdir /etc/NetworkManager/system-connections
-	insinto /etc/NetworkManager
-	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
-		|| die "newins failed"
-}
-
-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 "If you're using dhcpcd please remove"
-	elog "host_name option from /etc/dhcpcd.conf"
-	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 --user "USERNAME"'
-}
diff --git a/net-misc/networkmanager/networkmanager-0.7.1-r2.ebuild b/net-misc/networkmanager/networkmanager-0.7.1-r3.ebuild
index 1105e14e7c41..51ceceb1bb84 100644
--- a/net-misc/networkmanager/networkmanager-0.7.1-r2.ebuild
+++ b/net-misc/networkmanager/networkmanager-0.7.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r2.ebuild,v 1.1 2009/05/02 19:03:47 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/networkmanager/networkmanager-0.7.1-r3.ebuild,v 1.1 2009/05/12 22:20:21 rbu Exp $
 
 EAPI="2"
 inherit eutils
@@ -76,7 +76,6 @@ src_configure() {
 		--localstatedir=/var
 		--with-distro=gentoo
 		--with-dbus-sys=/etc/dbus-1/system.d
-		--with-udev-dir=/etc/udev
 		$(use_enable doc gtk-doc)
 		$(use_with doc docs)
 		$(use_with resolvconf)"
@@ -122,6 +121,9 @@ src_install() {
 	insinto /etc/NetworkManager
 	newins "${FILESDIR}/nm-system-settings.conf" nm-system-settings.conf \
 		|| die "newins failed"
+	insinto /etc/udev/rules.d
+	newins callouts/77-nm-probe-modem-capabilities.rules 77-nm-probe-modem-capabilities.rules
+	rm -rf "${D}"/lib/udev/rules.d
 }
 
 pkg_postinst() {