gentoo resync : 12.05.2022

5 files changed, 8 insertions, 88 deletions

diff --git a/sys-apps/gentoo-systemd-integration/Manifest b/sys-apps/gentoo-systemd-integration/Manifest
index 521e12c91d0a..35c155d0cc56 100644
--- a/sys-apps/gentoo-systemd-integration/Manifest
+++ b/sys-apps/gentoo-systemd-integration/Manifest
@@ -1,8 +1,4 @@
-DIST gentoo-systemd-integration-7.tar.gz 64243 BLAKE2B 389c6627af6eca9b4a0854d35751a8cb45cdb2795c7b621e96e9d5bcc13a80fe1cb109c0cb2bfd9d33f7642fd08198a0afbd5b4e5956ea6ba8dc89cf4635d9c0 SHA512 cd47caa01d73da57998b6b37d89cbeb53fa722c7f4a31bb03d03762350490cde1db3ce06090df6b6ff25c1cafb40f6c2186efbd52156ebc6d078b4a59d6fef52
-DIST gentoo-systemd-integration-8.tar.bz2 53734 BLAKE2B 711f1f6603fa40e81fe32809a32f61486ab068b1f636502ac36d58e4c204b5f0d46f51a6624f134a457f246b520614213cf45cc5397de769b315e01e32720bcf SHA512 373892ca9ae8845673f9ddad74e0be0b71af944e109adf0d2ce8e54a9c24ffff5e90cfa92e74b7abc1e7d7b1598404258b90b549697bde28a1025a2d974e991f
 DIST gentoo-systemd-integration-9.tar.gz 65696 BLAKE2B 7d2105e37ff53d48e312b78a971f16124df1d3a1f99ae37eb757e4be31663eee15ba1a9fb31ef31250c79f902f7a00e1de84030f3fb67e41ab2243d58deabcb6 SHA512 e4810e74c713793f1e5aca7f025780c32e8f0fe404bf74b65263bfaeff1ae1398551fdff7de37a4050f0e48d5e0b90525217f5b3caa18111ab1981f57f41fc18
-EBUILD gentoo-systemd-integration-7.ebuild 794 BLAKE2B 7f33bc671174599f5a855a93522f7888f2a818a2a45f47742ed61f05f05708b976ee566625df20cfd422dd6f9f9ba4ebd21fcefd51e9bbb2059d48b542e795cc SHA512 fdef060281bf6c98ac0236a6e111bf8f36746fe80c335b4b2fec453502f903effd7ff261593a60a836beb1e333812102061165c9e1f86a340c9bf3db3729bf1c
-EBUILD gentoo-systemd-integration-8.ebuild 959 BLAKE2B 7dd60424f23e74b82e59177529ed287033261331717b9ae266636cda173c2335d29ed7c49320427fdad5d0a3a0da3b0bdab32ceea4be40e47af44e0c479fcb24 SHA512 8d266198855d341d64db22ca0c721f48afe66d1a82d1de7bfc3164cfc00beb80a163dcf5c0593a7176fd4614097e96590620297200ce11dbbada4edc64eddf8e
-EBUILD gentoo-systemd-integration-9.ebuild 941 BLAKE2B f34fa7310f47f06ac697dc6189a5cc659bd25cc303cb8e93fcc45767f5ec9d785b0d45fe94962c49538c6d84746c3256567cb7dcabd1a87974121b1180c88738 SHA512 e0cfa25866b549f98d522a4cb31a4a7a2d732ee55b0a92f0fd134a69f28b43abf8074eb4e418ac18ab89c37dc74c20763ddc57551e3e8d39f6edfbcbc1df6334
-EBUILD gentoo-systemd-integration-9999.ebuild 949 BLAKE2B 5b069394c6337d9cdad48839c2c27b1d455bae43f9f64f090a0a3514d240bd2a7e06fc1990e440a5a13fa5c9ed02271e6fa8bd3da866e6c52f2811f5936f8c53 SHA512 f1506897008d24f8c6229480ccfd25947b4db655eab9c5d25aef9ebea380ab1e195163f921aadec366f94a1b36254749642664228591ac1f5179708a85e4c478
+EBUILD gentoo-systemd-integration-9.ebuild 990 BLAKE2B 3167c9350b6d90606516ad2eec7afa2fc2c1c7ec1bbc78d125b4cefdf21750da062980733a5dcdc9db6d48f6ffc1ebfff30c985a707b79202508c977822020e0 SHA512 84063f24f86dfe9a94ebc96d9424cd0199643a4a09c5d9970ee516e74eaa7507879aded7138112a179f42ace7deb7a7b9fa27bb5e757f949fe2ecb6d694c20c1
+EBUILD gentoo-systemd-integration-9999.ebuild 991 BLAKE2B 946da0cf6ff72cdfd50555e56c4b42e8d6ccd577cd6901ebfe07dbbfe39507dfdd8ad83d4e4fed3aa14f34d73c7084257c4b1a36b79a4dc1dc4ea3725a318c66 SHA512 bbea76053dddbb7bbcea129d41cae4d4b48998fe0be995d4d30cd152837bd8c065bee81e70519f4420c485bfee39e4b0f4b03fd11049ccea6c85d582968ed026
 MISC metadata.xml 380 BLAKE2B c85bcefccc2876a63a0b0348c42099812d371f2893971cd3ed76726bb1c305c6d17a30814743b9db8f91f96448ea241be723bd9deb11d627ee0c3b38643f8a42 SHA512 d72a532ad36554a12da2dad9645e939f79fe67ad969850f702bfb2691e80fda2c3c7a99e5f7be992a2b0b78aac4a09aa56d04ee914d1c98f131ef29e10a91dcc
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
deleted file mode 100644
index cf3c9066f0cd..000000000000
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-7.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-inherit systemd
-
-DESCRIPTION="systemd integration files for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/systemd-207
-	!sys-fs/eudev
-	!sys-fs/udev"
-DEPEND=">=sys-apps/systemd-207
-	virtual/pkgconfig"
-
-if [[ ${PV} == 9999 ]]; then
-	DEPEND+=" sys-devel/systemd-m4"
-fi
-
-src_prepare() {
-	default
-	[[ ${PV} != 9999 ]] || eautoreconf
-}
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
deleted file mode 100644
index c5acec8fc6de..000000000000
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-8.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
-	inherit autotools git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-inherit systemd
-
-DESCRIPTION="systemd integration files for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Systemd"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND=">=sys-apps/systemd-207
-	!sys-fs/eudev
-	!sys-fs/udev"
-DEPEND=">=sys-apps/systemd-207"
-BDEPEND="virtual/pkgconfig"
-
-src_prepare() {
-	default
-	[[ ${PV} != 9999 ]] || eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
-		--with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
-	)
-	econf "${myconf[@]}"
-}
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
index c2fc5b4077e5..83f9b27ef1a7 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9.ebuild
@@ -3,14 +3,14 @@
 
 EAPI=7
 
-inherit systemd
+inherit systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
 	inherit autotools git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
 fi
 
 DESCRIPTION="systemd integration files for Gentoo"
@@ -35,6 +35,7 @@ src_configure() {
 	local myconf=(
 		--with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
 		--with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+		udevdir="${EPREFIX}$(get_udevdir)"
 	)
 	econf "${myconf[@]}"
 }
diff --git a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
index 0d5b07883d97..bb66dd8ea452 100644
--- a/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
+++ b/sys-apps/gentoo-systemd-integration/gentoo-systemd-integration-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit systemd
+inherit systemd udev
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-systemd-integration.git"
@@ -35,6 +35,7 @@ src_configure() {
 	local myconf=(
 		--with-systemdsystemgeneratordir="$(systemd_get_systemgeneratordir)"
 		--with-systemdsystempresetdir="$(systemd_get_systempresetdir)"
+		udevdir="${EPREFIX}$(get_udevdir)"
 	)
 	econf "${myconf[@]}"
 }