Update 9999 version for eudev 3.0 branch.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

3 files changed, 50 insertions, 51 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 018a0f3313d9..7f9ec388355b 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/eudev
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.154 2014/11/29 12:33:24 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.155 2015/02/12 00:57:47 blueness Exp $
+
+  12 Feb 2015; Anthony G. Basile <blueness@gentoo.org> eudev-9999.ebuild:
+  Update 9999 version for eudev 3.0 branch.
 
   29 Nov 2014; Anthony G. Basile <blueness@gentoo.org> ChangeLog:
   Fix gpg signature
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index 343f07512418..269dceaf0e3d 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 40-gentoo.rules 365 SHA256 e11d66732dc0d629fdb8c06357db8be5339f2ecf28c2572c5af8637449f549ec SHA512 7554879eaeb12869a78835e4ac814b63c41ddd8715ff9b8d1b75e5b13edf697906371eb10d6c4f0a4c6cb9a44b21a4839985811a3357e18d3b8a842181666e0b WHIRLPOOL 54d962fa515255df5f37bc5c71a3774a909a809809138dba12ed22c6fda78ef336f4e98014f37dbc44289de1ba08f5f2ea31311e14b29a0bbe2cc3d6587d7425
 AUX eudev-exclude-MD.patch 2887 SHA256 3e9889862756ad7b683593e5a63316b4531a1836bec324c0dec647339f53cf53 SHA512 955013bcb849f156b8c3b17d99c52699ac371b05c0fa866a473b7db049c77cd86ef41192301bf78af97ea944e8e6d09e60288348198b73f340517fd2be19004b WHIRLPOOL 745b16d56a6000d88a2b711a21bbbfe1d96a9d33d8eb6d9e51491a26266924b5092cf8b8a4ffa5f0247887a3ef0a83b2ea4c8ee8ad620c601b9f7ae8e530c57a
 AUX eudev-fix-selinux-headers.patch 788 SHA256 5845b7b5e337e7202fe9dede75d9f4c6b70ce5cb25252397bd16419e634981d5 SHA512 ee11d435bb40e64fa3f88799be3e803e30d779009389b5faecd6416fa8eebee36e55ec7e2d59c4894268881f838ea94ba56240a425694fdbfd9dc5fe297c1bcb WHIRLPOOL 14c086d5bc37933b7ac2e0b3b54d65cbe2c8a8afefe798c1ead516bb36196b783c4cbb13abf298be8918915bde3c4475a74545a793fed4393a93d67c719c773a
@@ -14,6 +17,23 @@ EBUILD eudev-1.3.ebuild 7871 SHA256 9747f4fce99ec962f0eacade26606350c8508e4a0274
 EBUILD eudev-1.5.3-r1.ebuild 8093 SHA256 90def0b2c5a877861b64778cfe57ca2fb21a8d22f95696d78011ea3e72360e40 SHA512 39c921fa2810f0cb074de9238dbd5d2a346b5cf3cb68d9f31390c3019db88d2c66efd2dfc7b52ee1ccfcbd97aaac6366307b25981c095a3df4c55ea9961f602c WHIRLPOOL 901466cbea0f9177e6f2deae598f312f685166d96fb343f85513eeef6f19e6277a3a209f875f6ea90453067179ae1f6e0a55abbd593b249d2ae90e495fbe7a56
 EBUILD eudev-1.9-r2.ebuild 9332 SHA256 af35f58240456fd1cdc3fec7f1b9ab9ff33bf1e90a129c82a05cc64627092859 SHA512 668f679d03fb23008786b8d231c60eb3ced97ce600ded0cc4f4a766ad0421ab115c7831275b04ff1d90979df35b4780992b2dddb2b505be66d8fd5b6d87a50b3 WHIRLPOOL 427cc4b4217135ce8ce9bd3b957679e9910718ad052c4912d5a10fbe0882bc66c5b9580291e2352cb3aea08779c32ad68c0eef3e9dbd5dcd871505bb45be7140
 EBUILD eudev-2.1.1.ebuild 9095 SHA256 157d03449446958be8a4b069c3fbd0deb2537231957731710ff3e5597c187011 SHA512 a12478f39b4efb116077d5fbb312bfcc9be89db3bdad57b22d489d63674b83a8dc4ccbb638ca054146b549971ecb971da26a6a6b87ce8648e8b59dffd4e85c33 WHIRLPOOL 0e427ffcf05cf713049089e7c655b2f5e28bbaf7e88efaa21def339dfb893750366656854d4a3df189ef6b7983b561a97e4ec09dab2c915b7246549567f9444f
-EBUILD eudev-9999.ebuild 9135 SHA256 e580d2c807b955a847eef94fbbbce282b80efb9bfc88fba1b0a10adcc2326bb1 SHA512 4fdc387f3bdeca0e65bb96ae756b6094d723f7c601666969ce4d54f5c5a351f545992ba336d74c3e025cf4014bf320f920bd626d4f6a74695a928581521ffc5b WHIRLPOOL ee195d0d0dcdd6362af3f20e62dcf07c1e5cbec3c226f7773f46a7f07d5ed9cf4d4c780d66411deaf1e89dd923dee32473e781de7dd5cd1df5bbb85d4975e98f
-MISC ChangeLog 22171 SHA256 9579e9027f7098463a5d15eccbeddcbd2742c920de52c5fe2d4e3173efbe68ed SHA512 692318c9d90b18e7ea00d73d494f5f323c6e5f96a29789e14b94fb59413b2cc3e5db4ca959a73f8d5ddb8747283cc96c6b844ad8e7f39571ebdda21c052a2bf5 WHIRLPOOL ebef2157a083a3d3718cc84092b267d769bf62f815faa349c913f22c3e81855e752f397e612de8161e0cbbc9497ca2a0fd6f759a765dd389807d4cc3d43616f9
+EBUILD eudev-9999.ebuild 8235 SHA256 0e8258b544d73005b117ef3d0523a4febb6c51b31cf894cc9242b7d39b93bed4 SHA512 125c6baf0e69ab83c54ce33c11368ab0389d45b3841c8361b0eb7d0a35e84324431b460b87d4db99d5810d4c06c872861b05afa6b729ab2a60cf62c74989f8e9 WHIRLPOOL 6db97bcfc79997297220d433c610c72d1576bcc6ce5770fdf832dc90b08722157b80bae5b0479ca676224c367b3a7f4c3441352a88723ee24f9e82cf20de8e86
+MISC ChangeLog 22290 SHA256 97f5f06840747174ff0fc2edff2549efff70ab3093020b2e90ed6633b8a413d7 SHA512 a00831e80459511bab981a040532f3c3b22a2a2cb715e02df8867a851f5a94c0de032652a03d54a25e7b6ac5bb762d5186b6ba08c69784748b6cabf1a51283b5 WHIRLPOOL 1790d70f6a85c674174d2fe88c26025ff62518d766e509413e136bf5c4f21dfbd2e71131d829a796012683aeb99c10c417d244f53f285550f1ccd21aa630935e
 MISC metadata.xml 978 SHA256 273446e57cfba7f612e72c3dcc2e1b93ac0003f878c504aa72daa762f2cdbba5 SHA512 244dc230cf7123afef2c4c0f0caa418bbc621f3da0e6303f7cecfb4f3cc53290fcf0adddf2d176ff208991a5bb27801c5c9f6ad5ea3bada513f7ebb22d02d06a WHIRLPOOL e39a5caec32bcd404eb2fdb54e3abff5631f7115786d039a6f2f04a8503e445f971a993dedd0564022e148133e2f15c4579b3cc664ffd393003a858ac77166c5
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJU2/teAAoJEJOE+m71LUu6s8sP/3/OzTx67OQILKj8OGUDOzXM
+3hFjohroPQpY9wclx7dI5H1r+tGwsc3Yo6D+/cp1nYhrnsAQ3GltRb+Yk1IcuZ9Q
+hGh+WMV5fCV54XKsdwG+cDTbeHM4TMitx1nMRppyqXf8uCqmCYTBmegIYnY37QEU
+NMlde/aJ7TL7yUAsrOBQUyg63ubbTNe0dpbh8n4QTJTzm1opeK2N1rg6QY9ayyru
+jyNwXbsyAJnJaak1+Ux2Pn9mur2j+kY/2/hsXMl7bpvId90VV3OUJYl87/Ppradm
+Kn8uyQSVyU53QMt1899+a2pwtw/Y5TnDyau+Y+8SsZFu4x33hlM/UUvbEuGBjyGH
+8y5gw/c6wMOIvr4D6rsbg/MuI9rUxRg4mFl3FPk08O+LZv6uWPqCkrSGuGRKjne5
+XTJslL53xjRx0Fs0CdvUCZ4ZTum70vCRyL+Bdxa9THFnfWd9opMPs3c934WMG4eJ
+SIzMm+wE94yBYI9uep+Xx5bjt8o8kxHCs+VsMPV8DZXOMMq1+i3HBMA/kL0GnBso
++hATtH0WDVEiEcDLaBIcrYS7mV2d5ruNZo3ROzij+WxQhMljniTg1NrpOEtfRzIT
+Sw8JopHxldBtPpbCLmOJcAhAsBOwc7Kx43jF2h4h1bCM4nFL46huartlv2ZMJJuO
+/N0FjRPNxlEH/8DAOr/J
+=Pgra
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index a30d41e706c5..b658420d3992 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.64 2014/11/29 12:32:23 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.65 2015/02/12 00:57:47 blueness Exp $
 
 EAPI="5"
 
@@ -21,7 +21,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="doc gudev +hwdb +kmod introspection +keymap +modutils +rule-generator selinux static-libs test"
+IUSE="doc gudev +hwdb +kmod introspection selinux static-libs test"
 
 COMMON_DEPEND=">=sys-apps/util-linux-2.20
 	gudev? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
@@ -36,16 +36,17 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.20
 		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
 	)"
 DEPEND="${COMMON_DEPEND}
-	keymap? ( dev-util/gperf )
+	dev-util/gperf
 	virtual/os-headers
 	virtual/pkgconfig
 	>=sys-devel/make-3.82-r4
 	>=sys-kernel/linux-headers-${KV_min}
-	doc? ( >=dev-util/gtk-doc-1.18 )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
+	doc? ( >=dev-util/gtk-doc-1.18
+		app-text/docbook-xml-dtd:4.2
+		app-text/docbook-xml-dtd:4.5
+		app-text/docbook-xsl-stylesheets
+		dev-libs/libxslt
+	)
 	>=dev-util/intltool-0.50
 	test? ( app-text/tree dev-lang/perl )"
 
@@ -56,10 +57,7 @@ RDEPEND="${COMMON_DEPEND}
 	!sys-apps/systemd"
 
 PDEPEND=">=sys-fs/udev-init-scripts-26
-	hwdb? ( >=sys-apps/hwids-20140304[udev] )
-	keymap? ( >=sys-apps/hwids-20140304[udev] )"
-
-REQUIRED_USE="keymap? ( hwdb )"
+	hwdb? ( >=sys-apps/hwids-20140304[udev] )"
 
 # The multilib-build.eclass doesn't handle situation where the installed headers
 # are different in ABIs. In this case, we install libgudev headers in native
@@ -67,21 +65,16 @@ REQUIRED_USE="keymap? ( hwdb )"
 multilib_check_headers() { :; }
 
 pkg_pretend() {
-	if ! use rule-generator; then
-		ewarn
-		ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
-		ewarn "as described in the URL below:"
-		ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
-		ewarn
-		ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
-		ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
-		ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn "exists:"
-		ewarn "\ttouch /etc/udev/rules.d/80-net-name-slot.rules"
-		ewarn
-		ewarn "We are working on a better solution for the next beta release."
-		ewarn
-	fi
+	ewarn
+	ewarn "As of 2013-01-29, ${P} provides the new interface renaming functionality,"
+	ewarn "as described in the URL below:"
+	ewarn "http://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames"
+	ewarn
+	ewarn "This functionality is enabled BY DEFAULT because eudev has no means of synchronizing"
+	ewarn "between the default or user-modified choice of sys-fs/udev.  If you wish to disable"
+	ewarn "this new iface naming, please be sure that /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn "exists: touch /etc/udev/rules.d/80-net-name-slot.rules"
+	ewarn
 }
 
 pkg_setup() {
@@ -146,23 +139,17 @@ multilib_src_configure() {
 			--with-rootlibdir=/$(get_libdir)
 			$(use_enable doc gtk-doc)
 			$(use_enable introspection)
-			$(use_enable keymap)
-			$(use_enable kmod libkmod)
-			$(usex kmod --enable-modules $(use_enable modutils modules))
+			$(use_enable kmod)
 			$(use_enable static-libs static)
 			$(use_enable selinux)
-			$(use_enable rule-generator)
 		)
 	else
 		econf_args+=(
 			--disable-static
 			--disable-gtk-doc
 			--disable-introspection
-			--disable-keymap
-			--disable-libkmod
-			--disable-modules
+			--disable-kmod
 			--disable-selinux
-			--disable-rule-generator
 		)
 	fi
 	ECONF_SOURCE="${S}" econf "${econf_args[@]}"
@@ -205,8 +192,6 @@ multilib_src_install_all() {
 	prune_libtool_files --all
 	rm -rf "${ED}"/usr/share/doc/${PF}/LICENSE.*
 
-	use rule-generator && doinitd "${FILESDIR}"/udev-postmount
-
 	# drop distributed hwdb files, they override sys-apps/hwids
 	rm -f "${ED}"/etc/udev/hwdb.d/*.hwdb
 
@@ -263,15 +248,6 @@ pkg_postinst() {
 	ewarn "upgrade go into effect:"
 	ewarn "\t/etc/init.d/udev --nodeps restart"
 
-	if use rule-generator && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qsv 'boot\|default\|sysinit'; then
-		ewarn
-		ewarn "Please add the udev-postmount init script to your default runlevel"
-		ewarn "to ensure the legacy rule-generator functionality works as reliably"
-		ewarn "as possible."
-		ewarn "\trc-update add udev-postmount default"
-	fi
-
 	elog
 	elog "For more information on eudev on Gentoo, writing udev rules, and"
 	elog "fixing known issues visit:"