gentoo resync : 06.08.2019

4 files changed, 20 insertions, 56 deletions

diff --git a/sys-fs/udev-init-scripts/Manifest b/sys-fs/udev-init-scripts/Manifest
index df4be83b350e..e3c58376d098 100644
--- a/sys-fs/udev-init-scripts/Manifest
+++ b/sys-fs/udev-init-scripts/Manifest
@@ -1,6 +1,4 @@
-DIST udev-init-scripts-32.tar.gz 3661 BLAKE2B 11736f1e6c44bf032571008e907f97d5c64afafa7fe7fcd4fa5f398fce1fa6698adc66c933a0a451adde31c44fc09339129d6352cc2fd0389fecee8d34c095f6 SHA512 da6291ae5c2aa1e8e41656fbe2ed6700e46360809119c0f8a26bf6c3f23f05c861b2c2943b55e47140462049474725e96105e68b204f3d931050409f34d19699
 DIST udev-init-scripts-33.tar.gz 3698 BLAKE2B fc79b3f6984131180324919f7be4309715976309ee582147662634bb020b8162b293e7fd0e675a9cc7a3b1630ce0fc49b29c899e393c7748d47cf924b1ca2809 SHA512 2119aace937da02f47a5adc9af720587d25c2852cf70a9bcb04138e3ee511308c8f30cf0301fbec58cf0432b7fd6672ae6a02d1740c774703959197b3511fbcc
-EBUILD udev-init-scripts-32.ebuild 1312 BLAKE2B 6ee1cd14dacb4401e13def376869418219823a4302eb5c6c55a5c426626209d708bff30cf7bd5fc816a778dbed836ccbf4faf7430ea83a5d1ca97ca77a043d1d SHA512 e17028b8d8ea22f44e595835bfe882d59a7314098eb33203b23e555bd886f282aa183356cbb6a1aca925cd1b7267f290f15b8a1f98198db0ed29237ef33f745a
-EBUILD udev-init-scripts-33.ebuild 1400 BLAKE2B e9e386e567aa782c97025e3b6a5babe14efdfa58c6c31fce761c504bfb7b114557352cdd459a0620be0abe4a134c60f2c01279ab0f6a559d22ca05a7dfe0fd57 SHA512 d35c600eb8b0f1829f926fc4a9a26e9990c31bdfc20c06be9cbd4b02ba6dabb09801322bcf56daa5bbd97aab8cce2fb75ddd60fbbb08385053f522f5db168a46
-EBUILD udev-init-scripts-9999.ebuild 1410 BLAKE2B d0e3393b484a9bd399709a500310f6f8a0126d24a8b294afde04c7b1886212c48e5c547b67434bb7cddea857ebf5d2863a968f2e331acb54ab7316b531eec76e SHA512 36a24933ff3c43a9061801c2085b3f02997e446910c113b8241c5b6fa9144ff4b98cf75859715a859cfe8e38338a3c9151fc61151bdf8c6e11ffe316274f4ac4
+EBUILD udev-init-scripts-33.ebuild 1478 BLAKE2B ed3c40f6c759369e8af632b330d62e0e562af23f82266430032a92a78b28d9158da9f266ef9d7c95dc471c4f401c943dfa7e44a09fd881644d6281630961e85d SHA512 a706664d4d3d2c8aa6dfa6596a5ed41fc1c06e48ccba7c1d5fbcb9e75af357ac7d1de910f9c9bf097b94ec44b47d1eb5e707e5cb1aedd50b230ea0b5dbfb85f8
+EBUILD udev-init-scripts-9999.ebuild 1488 BLAKE2B a0e3675e423214b4b96f52aea796d215497222367669fcecef0fb5d0d0a13a748485e24abbcba34979026e0814d8005c9a295eafe4ac379cc45ed94713d3378b SHA512 2974bb69e988f43dc66eb83bb2e4148c1df74dee5c1ae4af0bc3224e0120349f70730cdd4b594edafc5cad99b8579ee0577f458129e22de030266368b518166b
 MISC metadata.xml 221 BLAKE2B 9e0d24573ec598eccd3ad7e41a38ead4192d9e757ff4b870b51b02a96f04a13596b15c5c05ee2a4d888c4b9b0b9b30aafe5ba96d39ff9faa157b58e30e91ba55 SHA512 accbe81ec1cf4c8d7c6eb99b7ceb7a8119eb1f2f55dcaf6d368610c255e7a21ff222e7c613ca4be37083ce9527ca325f3ee91515dadad7c5929f60f4fda334df
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
deleted file mode 100644
index 400159dfab88..000000000000
--- a/sys-fs/udev-init-scripts/udev-init-scripts-32.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="git://anongit.gentoo.org/proj/udev-gentoo-scripts.git"
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~williamh/dist/${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86"
-fi
-
-DESCRIPTION="udev startup scripts for openrc"
-HOMEPAGE="https://www.gentoo.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RESTRICT="test"
-
-DEPEND=""
-RDEPEND=">=virtual/udev-217
-	!<sys-apps/openrc-0.14"
-
-pkg_postinst() {
-	# Add udev and udev-trigger to the sysinit runlevel automatically.
-	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
-			ewarn "Adding ${f} to the sysinit runlevel"
-		fi
-	done
-
-	if ! has_version "sys-fs/eudev[rule-generator]" && \
-	[[ -x $(type -P rc-update) ]] && rc-update show | grep udev-postmount | grep -qs 'boot\|default\|sysinit'; then
-		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."
-	fi
-}
diff --git a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
index 2090016f2a50..1646e4a87e88 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-33.ebuild
@@ -25,13 +25,18 @@ RESTRICT="test"
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
+src_install() {
+	local -x SYSCONFDIR="${EPREFIX}/etc"
+	default
+}
+
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
+		if [[ -x "${EROOT}/etc/init.d/${f}" &&
+			-d "${EROOT}/etc/runlevels/sysinit" &&
+			! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}"
 			ewarn "Adding ${f} to the sysinit runlevel"
 		fi
 	done
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 b514fc5923dd..4ce4b403509b 100644
--- a/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
+++ b/sys-fs/udev-init-scripts/udev-init-scripts-9999.ebuild
@@ -25,13 +25,18 @@ RESTRICT="test"
 RDEPEND=">=virtual/udev-217
 	!<sys-apps/openrc-0.14"
 
+src_install() {
+	local -x SYSCONFDIR="${EPREFIX}/etc"
+	default
+}
+
 pkg_postinst() {
 	# Add udev and udev-trigger to the sysinit runlevel automatically.
 	for f in udev udev-trigger; do
-		if [[ -x ${ROOT%/}/etc/init.d/${f} &&
-			-d ${ROOT%/}/etc/runlevels/sysinit &&
-			! -L "${ROOT%/}/etc/runlevels/sysinit/${f}" ]]; then
-			ln -snf /etc/init.d/${f} "${ROOT%/}"/etc/runlevels/sysinit/${f}
+		if [[ -x "${EROOT}/etc/init.d/${f}" &&
+			-d "${EROOT}/etc/runlevels/sysinit" &&
+			! -L "${EROOT}/etc/runlevels/sysinit/${f}" ]]; then
+			ln -snf "${EPREFIX}/etc/init.d/${f}" "${EROOT}/etc/runlevels/sysinit/${f}"
 			ewarn "Adding ${f} to the sysinit runlevel"
 		fi
 	done