gentoo auto-resync : 08:12:2022 - 03:14:47

5 files changed, 20 insertions, 24 deletions

diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 42368f65c207..d20a07ca11c7 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -9,8 +9,8 @@ AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab2821
 DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
 DIST systemd-stable-251.8.tar.gz 11457551 BLAKE2B d4ca799a5b22164362fa8948bbec95215d6ebc04380f13f755916c4bfd4e1cc43a82177c21d2c56aa9d8440b44872b773f21682fc127c7f6d2b3542661c27d80 SHA512 c337fad3cf2beef11401850ddd6418efef035d4ec6405049084302738042f77ac1f8bfd7eb3611668a13038878389c9617e63278ec0b37782b3e0242e69c4843
 DIST systemd-stable-252.2.tar.gz 11745627 BLAKE2B a0a8d8c3fdfef22163cf628e022d55a0091a6c9b7e3971889dd88ff332b6280d45a4fad367aac6e1ebb61346c5c90a1140243d2a1787019497ae0aaf7f3950e9 SHA512 4a4f7382a6a2d7aea3a2866034a4562d1b45a4e18f733a371bb83d67bf4ef5d31d480e703fd353ee847fadc76005f9191a9a44d95c57f6849fdd451cc1b9e21d
-EBUILD systemd-251.7.ebuild 15476 BLAKE2B d89e62fdae66779b32ed82c12cbca2a87d6229480b55c2f3aacedc4b258ff06b408fdefd4829ffa1aba57d29b8b323f27ed13e0ac3d4ce84c8335aff441f1476 SHA512 9519386efab40010b71258ece4b24ad23cd3b7d08f70a19515c491b48310e3e16d72a6eb05adc179880a34858bd7fc5aa94e34c675dd865814346af51fee856c
-EBUILD systemd-251.8.ebuild 15223 BLAKE2B 609246533297d06930db29fd38f89021abb620e2ceb4a7018ae17b984a4417a250589017d8db20e59e0096834ca5e5e4f1f2b90a88eccdbd3555b24209ce2c12 SHA512 6b82953fb5cc6c0b88ddd69551c321a76e4351b3d6bc12aa1b8ee31e88d9381fa757adc66ad1efaa929005b7c6ebdc726d3ca509ed9264450023136fdf3d3142
-EBUILD systemd-252.2.ebuild 15174 BLAKE2B 7cb55e607670018dac63114b989b1b07e1e912d922b3a6ba65dfe616f3418d61dc0323ba657ab6efb1c337e7f605b367f2e375b6dda607aba63022486669fa49 SHA512 abb0da1914b6ffb3cd166f86086cdbecbc7014cbcd8bab9d27b3e179185189c27e88dde570ed8513c8dd91fd6f0cd6a3677fc84339dd34e62181be072d8e00d9
-EBUILD systemd-9999.ebuild 15174 BLAKE2B 7cb55e607670018dac63114b989b1b07e1e912d922b3a6ba65dfe616f3418d61dc0323ba657ab6efb1c337e7f605b367f2e375b6dda607aba63022486669fa49 SHA512 abb0da1914b6ffb3cd166f86086cdbecbc7014cbcd8bab9d27b3e179185189c27e88dde570ed8513c8dd91fd6f0cd6a3677fc84339dd34e62181be072d8e00d9
+EBUILD systemd-251.7.ebuild 15373 BLAKE2B bf0d5028ce7d06e81b43bb2a5f2101f0964d65e8654c93108d92194d211becaa761c3eca40f7ffcb9e02268198c305bdc55f188a3c41ce1ee974b2ffba0d3b57 SHA512 8985b9bf2d42c126dab19a46ac7a565d1416225d678bb9547f01420739fcaf3439fc5e94074a65588d685074c54b1adab458ca039f10931baee6d294861b00e4
+EBUILD systemd-251.8.ebuild 15120 BLAKE2B a404f680f9b7eff301418a907f68a7f22d0034577bbf05b809253fa61a442ada0fcd448d5ecb94c2da55a7e9d7b18d85919786ef04536ebc028cd9e0eb6b641a SHA512 c68a4dbaa013ff91196115cbb668e9cd4079ed029ee002511f7da04154ea930a56aa7bc280f144b4b601e9f9dd75588b5c9c63cd76d6a875e7ba5debd99aefb6
+EBUILD systemd-252.2.ebuild 15071 BLAKE2B 44c5a6bc034d0ae2c155ebdf2bf0b9d9ebe8f18d9d622a4e674a0b5c0c6151a2652d81b5edc17c00910f1e74dbf598f8691854f617c314311d01f90d46644abb SHA512 a072edd9753935be12099565db628e79fde0ed6a33830ce4e31e4ba7e827f824368e1dc50a90895e9a6d436fa72910a54f3b8787c3bee2d7e8a42092f7132bac
+EBUILD systemd-9999.ebuild 15071 BLAKE2B 44c5a6bc034d0ae2c155ebdf2bf0b9d9ebe8f18d9d622a4e674a0b5c0c6151a2652d81b5edc17c00910f1e74dbf598f8691854f617c314311d01f90d46644abb SHA512 a072edd9753935be12099565db628e79fde0ed6a33830ce4e31e4ba7e827f824368e1dc50a90895e9a6d436fa72910a54f3b8787c3bee2d7e8a42092f7132bac
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/systemd-251.7.ebuild b/sys-apps/systemd/systemd-251.7.ebuild
index 57967cf1b395..84c6c3db0074 100644
--- a/sys-apps/systemd/systemd-251.7.ebuild
+++ b/sys-apps/systemd/systemd-251.7.ebuild
@@ -471,16 +471,15 @@ migrate_locale() {
 pkg_preinst() {
 	if ! use split-usr; then
 		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
+		for dir in bin sbin lib usr/sbin; do
+			if [[ ! -L ${EROOT}/${dir} ]]; then
+				eerror "'${EROOT}/${dir}' is not a symbolic link."
 				FAIL=1
 			fi
 		done
 		if [[ ${FAIL} ]]; then
 			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
 			die "System layout with split directories still used"
 		fi
 	fi
diff --git a/sys-apps/systemd/systemd-251.8.ebuild b/sys-apps/systemd/systemd-251.8.ebuild
index 66941daa38cf..f529ba8b84df 100644
--- a/sys-apps/systemd/systemd-251.8.ebuild
+++ b/sys-apps/systemd/systemd-251.8.ebuild
@@ -466,16 +466,15 @@ migrate_locale() {
 pkg_preinst() {
 	if ! use split-usr; then
 		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
+		for dir in bin sbin lib usr/sbin; do
+			if [[ ! -L ${EROOT}/${dir} ]]; then
+				eerror "'${EROOT}/${dir}' is not a symbolic link."
 				FAIL=1
 			fi
 		done
 		if [[ ${FAIL} ]]; then
 			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
 			die "System layout with split directories still used"
 		fi
 	fi
diff --git a/sys-apps/systemd/systemd-252.2.ebuild b/sys-apps/systemd/systemd-252.2.ebuild
index 03c6870db441..6a423f8c5593 100644
--- a/sys-apps/systemd/systemd-252.2.ebuild
+++ b/sys-apps/systemd/systemd-252.2.ebuild
@@ -465,16 +465,15 @@ migrate_locale() {
 pkg_preinst() {
 	if ! use split-usr; then
 		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
+		for dir in bin sbin lib usr/sbin; do
+			if [[ ! -L ${EROOT}/${dir} ]]; then
+				eerror "'${EROOT}/${dir}' is not a symbolic link."
 				FAIL=1
 			fi
 		done
 		if [[ ${FAIL} ]]; then
 			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
 			die "System layout with split directories still used"
 		fi
 	fi
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index 03c6870db441..6a423f8c5593 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -465,16 +465,15 @@ migrate_locale() {
 pkg_preinst() {
 	if ! use split-usr; then
 		local dir
-		for dir in bin sbin lib; do
-			if [[ ! ${EROOT}/${dir} -ef ${EROOT}/usr/${dir} ]]; then
-				eerror "\"${EROOT}/${dir}\" and \"${EROOT}/usr/${dir}\" are not merged."
-				eerror "One of them should be a symbolic link to the other one."
+		for dir in bin sbin lib usr/sbin; do
+			if [[ ! -L ${EROOT}/${dir} ]]; then
+				eerror "'${EROOT}/${dir}' is not a symbolic link."
 				FAIL=1
 			fi
 		done
 		if [[ ${FAIL} ]]; then
 			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "rebuilding ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
+			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
 			die "System layout with split directories still used"
 		fi
 	fi