version bump for running the udev executable only; not the symbolic link. This is the same fix as 19-r1.

Package-Manager: portage-2.2.0_alpha155/cvs/Linux i686
Manifest-Sign-Key: 0x30C46538

4 files changed, 106 insertions, 11 deletions

diff --git a/sys-fs/udev-init-scripts/ChangeLog b/sys-fs/udev-init-scripts/ChangeLog
index 74e7d64147dd..84dd57e3c157 100644
--- a/sys-fs/udev-init-scripts/ChangeLog
+++ b/sys-fs/udev-init-scripts/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/udev-init-scripts
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.29 2013/01/21 13:50:47 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/ChangeLog,v 1.30 2013/01/21 17:53:11 williamh Exp $
+
+*udev-init-scripts-20 (21 Jan 2013)
+
+  21 Jan 2013; William Hubbs <williamh@gentoo.org>
+  +udev-init-scripts-20.ebuild, udev-init-scripts-9999.ebuild:
+  version bump for running the udev executable only; not the symbolic link.
+  This is the same fix as 19-r1.
 
   21 Jan 2013; Samuli Suominen <ssuominen@gentoo.org>
   -udev-init-scripts-10.ebuild, -udev-init-scripts-12.ebuild,
diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index 012fa06c0b99..0a20c81e0a90 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -3,18 +3,16 @@ Hash: SHA256
 
 AUX udev-init-scripts-19-start-only-regular-file.patch 249 SHA256 367a3fd5282bca9846b515165d40ea072ea0390248f080832b650d6439d68f5e SHA512 aa10ba463e3aee6eb878eb13de5ea35b34f98996d35437999b333a8e717dc9e03b6fedeadd2a84815e64f5ffbeded53a849b838e8a700a14b86f7ef8b9e2bb32 WHIRLPOOL f1246fbee309968d6a25f5f11b3aad33120c369ef4c0367c47fd0c596b7b72e0340848c087616bab3a9d826f0ee88799269c510cb075f823b7a5404094970cda
 DIST udev-init-scripts-19.tar.bz2 4792 SHA256 6917206ed2804c044352061c6acb1ca9a86df4a963735660df8e2dce86037916 SHA512 79a3e94b3bf4fc3af4e3bad48fdf6a0124c94efb4ddc346eae360cef8b73040d433d27f55c0d480b6e7ded661b7d899e443213a7083ff6e4758e0125186876dc WHIRLPOOL 48bec0466226e3455213e5f70f0a48ae18ab3ace6606050ccfa0c30ceb422361334fc6056278454c9908e99839f99e8dcce75b2c7ba414616758760f98aa577b
+DIST udev-init-scripts-20.tar.bz2 4816 SHA256 d1f3f2fe6594523f6323416c6a14bc1045b44e38dcb6ab59025f1067fb350235 SHA512 a994a08dc7cecbed559a5a5a868717000f5772cae8cd2438e834b4ccc021ecd783e8a04cd51d4f4708c2ecc57407d1a4bdf4bb83072fee45fca4daa031d05f1c WHIRLPOOL 63cf459a055db3a0b0edce753c61ab9c0d1320a243449e42d11412c9ebc1dd8690c109be8c809b9dcf3446929ed41d08cf3a52d9dcd3f7cf868420c126ce8207
 EBUILD udev-init-scripts-19-r1.ebuild 2236 SHA256 2394ae9861904f63bdef1bdb8bcb09f25cb23d9c66d3815ac0165b8b6948f061 SHA512 6db68a20d9065412f9094b87a42c0649f83a9fd88fa14dd8ff1d9af572df497494a716e3ce4c3e09bf8055a761a49f7df5c44c0bd05070d36f1957c813f44ff9 WHIRLPOOL a2fae70e75e6348c90c966bd221b1891ca91be4a114555e3fe3b5fd44338791a87c7ef74af31edfc9d136a671ef7fe828a8d0c13a14b40f6fe47e46d9a065e78
-EBUILD udev-init-scripts-9999.ebuild 2145 SHA256 01a975de53da25900392d78140829b69f23eebea2450ba534a00e7494462f78f SHA512 059a6563a460407fe326cfd2f112e30e80388adda9a56795e6db85619ba5b1482a564d73e4bd930dbd7905be9bd451abb50b867bea14b6f52541c511b3b6d4a3 WHIRLPOOL bb04367709920c582ad1a3e66a6a713e7f3b39f34699c6dbbab12d10ad6d700d65eff2dd9e521aa0c9baf77d631f6c9562380dc088fc935320a964291f3c1339
-MISC ChangeLog 5180 SHA256 51076f9aedc9557d40cb406fac27e3a8bc682829042c966492d284f9c777dd89 SHA512 eb206aa87b23041220426890544892c8c5498d2d02787d945c203dc1dec7b266e85f69321a8cf8e81adce03e7a62eb6afece66bc4f653c2adfbf2532d39899ea WHIRLPOOL 7439aa65fe548fe7adc593955cb79f87159d9c92bbbcdd902c5e88bb5853fe83dfd102644c681095b7bd564ffaef7b6fa6654fb4c2e49027264fef1fb51014a7
+EBUILD udev-init-scripts-20.ebuild 2190 SHA256 4ac40e2bb6a11f0634e3a1dc066810e3d6eb78591aa012434a268f5dde44a45e SHA512 0e8479115d8c1efbd16c95ec873e1d84ff5292e3b3a8d531ae87510936229ea11d31a6248d53a5d2a74d411380144565d85ff9ac864b69b54d53ba8b6f54076c WHIRLPOOL 4042389d975d9ca4c8a4236a41ef7273cd9b87ef2e42bfc929f392a942b2011587351f8317fe3129b485862150018b54af01e9e9fd07a0e3c17d85197cecb104
+EBUILD udev-init-scripts-9999.ebuild 2193 SHA256 e450ae44df1241937bd50f2f08b95db70a6da5f57cf890ae5795db8b25aa0a57 SHA512 27925d7915f5d3e1fab46953e329195045bc5f92acbbecc91691e590827f14633ed9a0e89083611a9500e27dbbe3036baa920af643f24570fef724759f96b8ea WHIRLPOOL ca5abca7f4a014e7d3de6d07368bf3097548e989e2bcac5f07c073cb2e0b11c746c095f656848985f3cf4c48d2b862664f1b42b9cc074042c3f83b7d452ed0e1
+MISC ChangeLog 5440 SHA256 bbedd4391692081e51dffc7fab6f6d62bf6a8117462fe57c18a7a59c8e6bc423 SHA512 4e3b8a93a19643e21ca3278b8b6e2ca48c7309d32a7aa9caec2952a2e06cf8de033c7086a6d4e0d02f51d688a32541a303d6293b7e8c44cd2118f0439fb5420a WHIRLPOOL 262c06c7353f3a5ebae92c47ce3610d9bccfc168b5ec46e98128e72c9bcd5afd4154dd0b5ff759798efdb9124ca2f6dd510ac2ddaafb6db05c46ed8ee07bd65d
 MISC metadata.xml 206 SHA256 e8bae0ea2f16b0ad92858b68718c01ab85b5e6995a35b88c74e4ad9772b9f813 SHA512 f6558663be8014488111639a4eeadc9e691f57f2eb4f3c97d6022a50ab2659fac2df458cefed5e29a6661d59221b15332aefa00c027552a8f4bbefc3988e2a90 WHIRLPOOL b515e201c4f614326c4ee0ef0e13fd9d277e913d96265ecce11b41c9628fa38d1e34f90fab1073527e153a9e2e8929c5fee748a8e5eaf98b58fe15928c8ad457
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQ/UdUAAoJEEdUh39IaPFNIEAIAJocQzCcRgi4yrVQF9TS6bCL
-E+biCKC+DNFwxSUt9cJ/kxiEaKz8syucUyQ0OwsNLlsAs5YT26PgPrP/6Rs3wcOu
-B+ai/nfUH0KR8mJiMrI4FumoDeceD7gASg4kz16JZ2bVKFhcf1VeFs7bJNhWuXmO
-Velfp/+8uKnBohdRkMMsG0eLR8PV3vapfWYi4JXpZjODnVy+CtDzZMya6rShwexI
-hkYYA18UnUceyhQmk3x5jEmISuCeQjfydHcBimIUtA6i9CV3qKUbPCFTlFzDZZm1
-mV8TUTmeyTdCsg3poJrTKxQWugNiLv1FHGY/u+t1mjNalWsacWG6Tdu9tp2lVeM=
-=cc2P
+iEYEAREIAAYFAlD9gIgACgkQblQW9DDEZTj40ACgmVgcy23eMYXq0dXv1wtqV60k
+PaYAn1GwtQQw3VW9xulcDmCP8g3EkUcu
+=Ol40
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-20.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-20.ebuild
new file mode 100644
index 000000000000..43080a6993e8
--- /dev/null
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-20.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-20.ebuild,v 1.1 2013/01/21 17:53:11 williamh Exp $
+
+EAPI=4
+
+inherit eutils
+
+if [ "${PV}" = "9999" ]; then
+	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
+	inherit git-2
+fi
+
+DESCRIPTION="udev startup scripts for openrc"
+HOMEPAGE="http://www.gentoo.org"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+if [ "${PV}" != "9999" ]; then
+	SRC_URI="http://dev.gentoo.org/~williamh/dist/${P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+fi
+
+RESTRICT="test"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND=">=virtual/udev-180
+	sys-apps/openrc
+	!<sys-fs/udev-186"
+
+src_prepare()
+{
+	epatch_user
+}
+
+pkg_postinst()
+{
+	# If we are building stages, add udev and udev-mount to the sysinit runlevel
+	# automatically.
+	if use build
+	then
+		if [[ -x "${ROOT}"/etc/init.d/udev \
+			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
+		then
+			ln -s /etc/init.d/udev "${ROOT}"/etc/runlevels/sysinit/udev
+		fi
+		if [[ -x "${ROOT}"/etc/init.d/udev-mount \
+			&& -d "${ROOT}"/etc/runlevels/sysinit ]]
+		then
+			ln -s /etc/init.d/udev-mount \
+				"${ROOT}"/etc/runlevels/sysinit/udev-mount
+		fi
+	fi
+
+	# Warn the user about adding the scripts to their sysinit runlevel
+	if [[ -e "${ROOT}"/etc/runlevels/sysinit ]]
+	then
+		if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev ]]
+		then
+			ewarn
+			ewarn "You need to add udev to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev sysinit"
+		fi
+		if [[ ! -e "${ROOT}"/etc/runlevels/sysinit/udev-mount ]]
+		then
+			ewarn
+			ewarn "You need to add udev-mount to the sysinit runlevel."
+			ewarn "If you do not do this,"
+			ewarn "your system will not be able to boot!"
+			ewarn "Run this command:"
+			ewarn "\trc-update add udev-mount sysinit"
+		fi
+	fi
+
+	ewarn "The udev-postmount service has been removed because the reasons for"
+	ewarn "its existance have been removed upstream."
+	ewarn "Please remove it from your runlevels."
+}
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
index 7f41553c74fa..5ce65ef73bd7 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -1,9 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.13 2013/01/09 07:18:50 williamh Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild,v 1.14 2013/01/21 17:53:11 williamh Exp $
 
 EAPI=4
 
+inherit eutils
+
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="git://git.overlays.gentoo.org/proj/udev-gentoo-scripts.git"
 	inherit git-2
@@ -28,6 +30,11 @@ RDEPEND=">=virtual/udev-180
 	sys-apps/openrc
 	!<sys-fs/udev-186"
 
+src_prepare()
+{
+	epatch_user
+}
+
 pkg_postinst()
 {
 	# If we are building stages, add udev and udev-mount to the sysinit runlevel