USE=rule-generator by default, else warn about predictable netiface names.

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

3 files changed, 60 insertions, 52 deletions

diff --git a/sys-fs/eudev/ChangeLog b/sys-fs/eudev/ChangeLog
index 0534e85fb2b4..b8e7fa165a1f 100644
--- a/sys-fs/eudev/ChangeLog
+++ b/sys-fs/eudev/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-fs/eudev
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.35 2013/04/08 01:35:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/ChangeLog,v 1.36 2013/04/10 01:05:58 blueness Exp $
+
+  10 Apr 2013; Anthony G. Basile <blueness@gentoo.org> eudev-9999.ebuild:
+  USE=rule-generator by default, else warn about predictable netiface names.
 
   08 Apr 2013; Anthony G. Basile <blueness@gentoo.org> eudev-1_beta3.ebuild,
   eudev-9999.ebuild:
diff --git a/sys-fs/eudev/Manifest b/sys-fs/eudev/Manifest
index dfdeef4aeba0..2d6c742af132 100644
--- a/sys-fs/eudev/Manifest
+++ b/sys-fs/eudev/Manifest
@@ -10,23 +10,23 @@ DIST eudev-1_beta2.tar.gz 1671231 SHA256 359ed1a6d8e48599c1337f54a5c796fe3195f21
 DIST eudev-1_beta3.tar.gz 1748050 SHA256 c20f38930315c33aec6a4d075c876b45f3c2874cee49249265a70e011bb80f1a SHA512 8965913c4303800b56116ef9e8c390d5b3f94b5cdb49d3f7ac48f60112dc9de8ab3364b1f929b7cde10180014ead9045a022c819ddb558185ef4191534966c9f WHIRLPOOL 1ef73986a89c21bb4944b3a03cdd1ca576f7be6bdc564cf779d96993c8d849c6e5caff6bc25bd58cc4489cf64f7c6f3e44299ba28601a4067b5c2a98500db872
 EBUILD eudev-1_beta2-r2.ebuild 6278 SHA256 234f41e47d70b0704c83b8ec75bcd43ed6f4134d210f5b4527a83f6d91fd5c87 SHA512 25591cc1a930d05fc4d9aafa47a3f8da54d2d8ca426af67fa18c7d3a472d9bef8c3338fbd7bed0663e05a27c50fb9fd5ca65eea77a8ceab1f756ab8cfc86036e WHIRLPOOL fb4e9aa8594add38620ca1448943b2172486ee320fa1979ef605cc9c3d67ae7ae378a1878e5a415b754279502d964c4ca672d14bec37c406e6eb52d3eb94b793
 EBUILD eudev-1_beta3.ebuild 7994 SHA256 a136cea30bde5bc79b8abe0275c3f7fedc6824e6de53708b042c744b6d00edb1 SHA512 b2eaa846e08ece50dcc2beaeec9f8237ee1c558fdc372d38394a2f1d827f348aaa1812de1ecd8de11b7732068a560200b6b391e2de3e37e29a293da5547e1005 WHIRLPOOL 242c75b8b23590e33297dbfe910d8b807f62e2207a1566524a8c329bbbac8f845f884eda89ea2b2c79653aa65c7bb5776be4cbfdda13cd98137af6b301dae9d8
-EBUILD eudev-9999.ebuild 7297 SHA256 f8937f46e8c7095aa0547352515275a1572edf1a033ce737597c613bead7a96d SHA512 f0412f2cf95dbb0ea55d691cdf0265fe01c770595a76d0690ac3ead7357fa335bb26baf2f44cba904759db08f48cf8d1d196bc78d480b525d7f772d186bc94c4 WHIRLPOOL c1e9d40becc74fb4547a92c8e2ec172adeb2198b27c8b776cc37e79c87aae423851b4572bfc42cad491c037e9f8f04ed58f88e8a4b4d01b21ffe105c3603bfe3
-MISC ChangeLog 6036 SHA256 3695d2912039388caf191acd4490257a8a0bdedfab3da145445094841526f965 SHA512 e5d86f5fe5180d1241e9bed6f623691d3213bd02817c3667ed800ae94f3121b0dd049be4f1868406b044383ac487fb207252a2d9562763d9a735657530733df9 WHIRLPOOL 5a96e5b3e7aeba67c9f4ffa1a14e0c78f3da44a539e6ef7e5f37ac1d889859a24d4c267aa03793148952de087aaef829c2ea6c2bf2f97566105e8b78eabf142d
+EBUILD eudev-9999.ebuild 7404 SHA256 2bca4fc850440896600bb9483ab4bd42a169b3fb43daf5754f18d859ee0f0c59 SHA512 dd72088c32d1d6aeffd581eaab59051174f7af5fb7234fe6f6aa0defb21d2a89bf8fb65a44e418332a51419fb58bc37afcf78483f20cd2b4b6acc0621ba12136 WHIRLPOOL cb287912512864b3b5a8b301160b36365ad6e9f905dc660ca717f6b8302f7649a2d6e9ca6aa2f76f84e94175850e55867c2c1f83124e6ad1eacd3da485654bba
+MISC ChangeLog 6188 SHA256 74b5c86efa838bebca17ee7ebc8bcafe19f060312cc436000e96441adf04185b SHA512 601e2c85cc812224d1f8fa17d07b703a196d489747ad31c2f2d70b009893f4abd8efc4c1a01492bb190d45dde7ef8bc4fbec6ab70e57db90d9112a5489df42d6 WHIRLPOOL ff4f5fba8c3b1a7264788d2a4678ad48540e6e8af7df3e81562bbf1db51a1c8974cec6d843e581854dbdc4e48f5031de9b1aa55e5ae64f745b67c1bdc98ab6a4
 MISC metadata.xml 1060 SHA256 7bb47974b960522b6d6ca66bb95b839e39e094b46ef9ecfcb0892e85ac29eadf SHA512 212b2ca66460121e885c3e77193707370df7ab48bba40a7e8efe22743dc7e6beca0001c455eb8c1951a1eaeb94c5869ecf3955061de9b6118498475201e84659 WHIRLPOOL 23cea982b20968ba862db60a96ad5cf1e20cc33ffe2efd4739f431dd5b9ec991a3b1f2322d5499b5fee2dfd8f93e5cc56d4bd4da0f602fb699fd7f1b97253165
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRYh8PAAoJEJOE+m71LUu6/qEP/2WWa+A4OeiGiFRGtgfYJBXU
-+xjLjYSjXbOGEiHJ/GPvrXZONXutxVXdpKIeOZm5nUzb8YGl0QKQLUudhukIVEv/
-4iJha8PgaemmpgWmfU+0bBOqlnqqlDa+Emh44kke6GS6BfFqabaNwTE+FQA+8suk
-Xa/InLp+qlpU1eRCY2iLdBaCz0Ovp0Fae4F8WthJO7KMw7SLbXohoFygQ/t+WtjU
-tsvJZlg5ngsJlGp1v6cb2ifjdIn/b+i4eF7d5X/1bQKkE3J3g4Lqw8/Xgzp87AK1
-fQGgoyPMvTdXncNxTvVIgkhNmGLM2s/06MbHhNYayJDFV4GoekDz7onAkK4S4G7K
-4ye5wLyjvGewn0svF2+bbo2fwGOqA03fUeJNmpwYNTbXttYUe+6AJnhM7s/xY0U6
-3rN9bzkbtDG84SC9FQ76BOfmdTjPCuo6narENC3NQWEnQwG9T+b1RoqnFco9JSc6
-n3bztx3Ly8gg8zXKxBASyMG3P4CHxtvMnrpGU2w+zlzrvC+t8scfoAILdiisZ/kh
-sJlumy84bOiuPUte+CTMXbCwj4pnU1EGdB+2g50HB74PZ48ced4dT6wMaUEDjuII
-bbGRBgAdF1SPxshcI/xvWpQ6KqBSKAoWRZyWHvnvt0GcOVTbDpyElKxf2BBVwdNp
-bf3moN9ct9GMh2YDpuJ3
-=z/lO
+iQIcBAEBCAAGBQJRZLr5AAoJEJOE+m71LUu60ggP/2sie6jtvb0Rkb71DtOK15Z/
+XGcsI3N4hJVwzO7a7zeSik3Ehisyl17HGeJF802LznP7unULlPVjL9ccjdPo+JbE
+X8Ggjy7VW9Bnvt7eKkeaZDCuwNBFfgctr6iF5NUWKq0e7KtNLP4L8xOtWVX9m9yv
+4Ap0Zj/mwylanrF/NFD3/Kbbgw13QCHRBy6g7QYjGV9yv3EHl99hbmUkfVov+BVj
+ZkDbNyR9+dv1zuFetWg8Zt2fHoKToi9m4UznxdgO11rP34Rl+hWQeAWhDZsX6psO
+eSQ3q1emmhwlpnLkf9IXKgrEY1gFskLemhrB3lqrn0HH6rT19mc7dN22N/E5KI+t
+YHD2JnSwj87s7zz/zXe3gpvVkSgB6deBysz7psJNolxFRrxXVBUkwNj6RWiFO6QT
+xDIeKPpCgfVc/WaUIXItCc2yFMsBnJTisH/Bd79GjFmyYspZXLHwurRfJ8xOF0/p
+pzwxMjzBJH7CusdDK9DDEWkImOaJeAbwqwTYcxHzDRbmvjuQUzJ6iYLKf9PgWS9a
+ieXzVjPplH3gN7KRXlcl+s430Rw+Wwhg3O4mDFIL2aGvT4eB1v235pX95qmMHdPU
+9kOHcpsfCVJYSht0EZpVrJu6fd2fuwfkTETzNByCE9fke91W7wzoULtvcwjnLt7d
+cXycW7tZbuQTheSK7c1z
+=Znfj
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/eudev/eudev-9999.ebuild b/sys-fs/eudev/eudev-9999.ebuild
index 81ca5bebd8bd..c2ed383539e8 100644
--- a/sys-fs/eudev/eudev-9999.ebuild
+++ b/sys-fs/eudev/eudev-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.25 2013/04/08 01:35:57 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/eudev/eudev-9999.ebuild,v 1.26 2013/04/10 01:05:58 blueness Exp $
 
 EAPI=5
 
@@ -14,7 +14,7 @@ then
 	inherit git-2
 else
 	SRC_URI="http://dev.gentoo.org/~axs/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
+	KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)"
@@ -22,7 +22,7 @@ HOMEPAGE="https://github.com/gentoo/eudev"
 
 LICENSE="LGPL-2.1 MIT GPL-2"
 SLOT="0"
-IUSE="doc gudev hwdb kmod introspection legacy-libudev keymap +modutils +openrc rule-generator selinux static-libs"
+IUSE="doc gudev hwdb kmod introspection legacy-libudev keymap +modutils +openrc +rule-generator selinux static-libs"
 
 RESTRICT="test"
 
@@ -66,39 +66,42 @@ udev_check_KV()
 
 pkg_pretend()
 {
-	ewarn "As of 2013-01-29, eudev-9999 provides the new interface renaming"
-	ewarn "functionality, 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
-	if has_version "<sys-fs/udev-180" && ! use legacy-libudev; then
-	ewarn
-	ewarn "This version of eudev does not contain the libudev.so.0 library by "
-	ewarn "default.  This is an issue when migrating from sys-fs/udev-180 or older."
-	ewarn
-	ewarn "Removal of libudev.so.0 will effectively break any active Xorg sessions, and"
-	ewarn "will probably have repercussions with other software as well.  A revdep-rebuild"
-	ewarn "is required to resolve these issues."
-	ewarn
-	ewarn "Add USE=legacy-libudev to tell eudev to install a copy of libudev.so.0, if"
-	ewarn "you wish to continue to use your system while migrating to libudev.so.1"
-	else
-	if use legacy-libudev ; then
-	ewarn
-	ewarn "You are installing eudev with USE=legacy-libudev , this should only be used"
-	ewarn "to support binary-only applications or legacy applications while in the"
-	ewarn "process of doing a full systems upgrade, that require libudev.so.0 -- it is"
-	ewarn "HIGHLY RECOMMENDED to leave this flag disabled unless absolutely necessary."
+	if ! use rule-generator; then
+		ewarn
+		ewarn "As of 2013-01-29, eudev-9999 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
+
+	if has_version "<sys-fs/udev-180" && ! use legacy-libudev; then
+		ewarn
+		ewarn "This version of eudev does not contain the libudev.so.0 library by "
+		ewarn "default.  This is an issue when migrating from sys-fs/udev-180 or older."
+		ewarn
+		ewarn "Removal of libudev.so.0 will effectively break any active Xorg sessions, and"
+		ewarn "will probably have repercussions with other software as well.  A revdep-rebuild"
+		ewarn "is required to resolve these issues."
+		ewarn
+		ewarn "Add USE=legacy-libudev to tell eudev to install a copy of libudev.so.0, if"
+		ewarn "you wish to continue to use your system while migrating to libudev.so.1"
+		ewarn
+	elif use legacy-libudev ; then
+		ewarn
+		ewarn "You are installing eudev with USE=legacy-libudev , this should only be used"
+		ewarn "to support binary-only applications or legacy applications while in the"
+		ewarn "process of doing a full systems upgrade, that require libudev.so.0 -- it is"
+		ewarn "HIGHLY RECOMMENDED to leave this flag disabled unless absolutely necessary."
+		ewarn
 	fi
-	ewarn
 }
 
 pkg_setup()
@@ -109,10 +112,11 @@ pkg_setup()
 
 	linux-info_pkg_setup
 
-	if ! udev_check_KV
-	then
+	if ! udev_check_KV; then
+		eerror
 		eerror "Your kernel version (${KV_FULL}) is too old to run ${P}"
 		eerror "It must be at least ${KV_min}!"
+		eerror
 	fi
 
 	KV_FULL_SRC=${KV_FULL}
@@ -123,6 +127,7 @@ pkg_setup()
 		eerror "Your running kernel version (${KV_FULL}) is too old"
 		eerror "for this version of udev."
 		eerror "You must upgrade your kernel or downgrade udev."
+		eerror
 	fi
 
 	# for USE=legacy-libudev