gentoo resync : 28.04.2021

4 files changed, 43 insertions, 40 deletions

diff --git a/sys-libs/libutempter/Manifest b/sys-libs/libutempter/Manifest
index 96b879999dea..1bcc7a3c8ccb 100644
--- a/sys-libs/libutempter/Manifest
+++ b/sys-libs/libutempter/Manifest
@@ -1,7 +1,7 @@
 DIST libutempter-1.1.6.tar.bz2 15705 BLAKE2B 147bf96990913019c35565507eb635ba60ff5ed67134805e9f146f8f70882615ff96d7b2e52b40fb73110905afb87893a72bdec4327d879e5bdc2ec1d39ff9f0 SHA512 6ada410b981d157ae20b578de8ce20997ec0446ec6de6859549b080aa65976fc9900d211600dab09dc3d0d109daabad0994a648b093b8781b442ff26ca17fede
 DIST libutempter-1.2.0.tar.gz 17353 BLAKE2B 35e66a32e70fa59639f9a4fb71ba0e89c88aedac04e389cd29397c935daea66bd9f4f04795c977911f136b121d0445f79c0090a60a0353d04af98fe6b9b9ee09 SHA512 24b9fb59269b48bfee397520907c74746a7a38cf12cc002a8adcdd930460036caea7c72fe47b93badf678dc8306786bf4d87f23ee696a524bfc93722ea1eed23
 DIST libutempter-1.2.1.tar.gz 17429 BLAKE2B 88ae0a03a8a614b960082ce4d4006ec4e3eb8148b319ae964ac3ba3f684f08f5dd670e693f25d52d04a280f7b2aed6d2894cbbc0e2db3f71ab68e6910ffb58d1 SHA512 d3a3bab7d2c2a68534c5ad41dd02bde849eb08df5dbb895a79b50b74d269c48c4cfcd12c4654941ccb7cdd43f486cfdc19148fa470870562f5cd324ce9782429
-EBUILD libutempter-1.1.6-r3.ebuild 1695 BLAKE2B 0d30556535a1c20985166a745205d31527d8974d90a7b38ec5807ac38d8e5d0bc21cd558b6807abbc4a6d053e5ffa402680d66a459365a4c6d425ef5755ba127 SHA512 73a89576e86ced443b827cf84b8ee3ae26ad2c5dff9abff6c48554e0238701e36a2434050fad9beec30d30809a2383f7598d2051fedf23a9be4ffc37d37d9c4f
-EBUILD libutempter-1.2.0.ebuild 1705 BLAKE2B 0421ad465302e3e8ccbd4369b1ae44043653d751e24168189e0a2dfb1912748fb7c29b0123a27db8587f3dd53697b0fdd95063929614e009ac348b95c59ca0d3 SHA512 8687abd08901b2577f0cf47a7c9820e45858a322c5cbb854c0f72dc362c7777c48f2fd5ed208d15dd574b798f7c300ff582afaeaf01e8fdda3ca5b98be1240ed
-EBUILD libutempter-1.2.1.ebuild 1712 BLAKE2B 2d69570c2dbb7737b81d6bbc84627fc2a9d432049b960fa8eb0e9abd5dcbf57456896de97d173d0e31be64526577c31d6d07a6adf6388aa674c535b5caceb982 SHA512 325e01ebe83551be24bc6022e8bde1e932c5a99ed7fb4ae95d226adb813d9da4d9f6c2571063cd38f0d56145202388b0d5cae0962d9d341019a722b227a0a2b9
+EBUILD libutempter-1.1.6-r3.ebuild 1565 BLAKE2B f53748b5ac0a11d8e0bc05f91e584cc98360096b69e7e08db71f0aa7a7af7dbbc26e6c06e589e79d142fcd8b2fdeefa3e94a7dec841271430109b04cd5a0cbde SHA512 03c8046a26ea3a3e269d49dd2ff96e45f50daa704f6a2f4973acd13e4e54287bf81eb02de313e8f6b298022f0b6719767f4b6a99e63600ea20f4ae7f9e1ee40a
+EBUILD libutempter-1.2.0.ebuild 1574 BLAKE2B af93129e8e46d48977500512f314c67a68ee3d38a87e5017a8c20794592d4966f8ed49fc92a2dcc049c489af037643a0886dcf3ca704a2f2edcd59aafc5fbc6d SHA512 f85a9e76740000f204ce2e1af77d8cd7cbcc317c578df84a4590ccabd7f84ec980307b2d17fed1ebcab6921e4ee78f97f3e08e17074980d588e0f7ff48bdb7f2
+EBUILD libutempter-1.2.1.ebuild 1582 BLAKE2B 73554273676e185d25cc6580aee654bba345be8d596777d80bb76e1d8ad06eb94e22d27ac11989634878ddeeb1ec6eb4ec78e55e0c79868e8fe0076def1f14e2 SHA512 a130f633f970daa98657e9ff198d3c5eaa24e9421c6a8a4688b8ca6e2639f11f683a184ae2bb19b592caf8a3207135743faf55c98637466d20953fa9debf80be
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild b/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
index 0633a5a51eab..326b59190559 100644
--- a/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
+++ b/sys-libs/libutempter/libutempter-1.1.6-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter"
@@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.altlinux.org/pub/people/ldv/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static-libs elibc_FreeBSD"
 
 RDEPEND="
@@ -30,10 +30,14 @@ src_prepare() {
 		-e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:"
 		-e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:"
 	)
-	use static-libs || args+=(
+
+	if ! use static-libs ; then
+		args+=(
 			-e '/^STATICLIB/d'
 			-e '/INSTALL.*STATICLIB/d'
 		)
+	fi
+
 	sed -i "${args[@]}" Makefile || die
 }
 
@@ -53,18 +57,15 @@ src_install() {
 		fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter
 		fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter
 	fi
+
 	dodir /usr/sbin
 	dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter
 }
 
 pkg_postinst() {
-	if [[ -f "${EROOT}/var/log/wtmp" ]] ; then
-		chown root:utmp "${EROOT}/var/log/wtmp"
-		chmod 664 "${EROOT}/var/log/wtmp"
-	fi
-
-	if [[ -f "${EROOT}/var/run/utmp" ]] ; then
-		chown root:utmp "${EROOT}/var/run/utmp"
-		chmod 664 "${EROOT}/var/run/utmp"
-	fi
+	local path
+	for path in "${EROOT}"/var/log/{w,u}tmp; do
+		chown root:utmp "${path}"
+		chmod 664 "${path}"
+	done
 }
diff --git a/sys-libs/libutempter/libutempter-1.2.0.ebuild b/sys-libs/libutempter/libutempter-1.2.0.ebuild
index 271a41f8bde7..1df07ce3ed22 100644
--- a/sys-libs/libutempter/libutempter-1.2.0.ebuild
+++ b/sys-libs/libutempter/libutempter-1.2.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter"
@@ -30,10 +30,14 @@ src_prepare() {
 		-e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:"
 		-e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:"
 	)
-	use static-libs || args+=(
+
+	if ! use static-libs ; then
+		args+=(
 			-e '/^STATICLIB/d'
 			-e '/INSTALL.*STATICLIB/d'
 		)
+	fi
+
 	sed -i "${args[@]}" Makefile || die
 }
 
@@ -53,18 +57,15 @@ src_install() {
 		fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter
 		fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter
 	fi
+
 	dodir /usr/sbin
 	dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter
 }
 
 pkg_postinst() {
-	if [[ -f "${EROOT}/var/log/wtmp" ]] ; then
-		chown root:utmp "${EROOT}/var/log/wtmp"
-		chmod 664 "${EROOT}/var/log/wtmp"
-	fi
-
-	if [[ -f "${EROOT}/var/run/utmp" ]] ; then
-		chown root:utmp "${EROOT}/var/run/utmp"
-		chmod 664 "${EROOT}/var/run/utmp"
-	fi
+	local path
+	for path in "${EROOT}"/var/log/{w,u}tmp; do
+		chown root:utmp "${path}"
+		chmod 664 "${path}"
+	done
 }
diff --git a/sys-libs/libutempter/libutempter-1.2.1.ebuild b/sys-libs/libutempter/libutempter-1.2.1.ebuild
index bf423adf43ea..a6b93b7b049f 100644
--- a/sys-libs/libutempter/libutempter-1.2.1.ebuild
+++ b/sys-libs/libutempter/libutempter-1.2.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib flag-o-matic toolchain-funcs
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="Library that allows non-privileged apps to write utmp (login) info"
 HOMEPAGE="https://altlinux.org/index.php?module=sisyphus&package=libutempter"
@@ -30,10 +30,14 @@ src_prepare() {
 		-e "/^includedir /s:/usr/include:${EPREFIX}/usr/include:"
 		-e "/^mandir /s:=.*:= ${EPREFIX}/usr/share/man:"
 	)
-	use static-libs || args+=(
+
+	if ! use static-libs ; then
+		 args+=(
 			-e '/^STATICLIB/d'
 			-e '/INSTALL.*STATICLIB/d'
 		)
+	fi
+
 	sed -i "${args[@]}" Makefile || die
 }
 
@@ -53,18 +57,15 @@ src_install() {
 		fowners root:utmp /usr/$(get_libdir)/misc/utempter/utempter
 		fperms 2755 /usr/$(get_libdir)/misc/utempter/utempter
 	fi
+
 	dodir /usr/sbin
 	dosym ../$(get_libdir)/misc/utempter/utempter /usr/sbin/utempter
 }
 
 pkg_postinst() {
-	if [[ -f "${EROOT}/var/log/wtmp" ]] ; then
-		chown root:utmp "${EROOT}/var/log/wtmp"
-		chmod 664 "${EROOT}/var/log/wtmp"
-	fi
-
-	if [[ -f "${EROOT}/var/run/utmp" ]] ; then
-		chown root:utmp "${EROOT}/var/run/utmp"
-		chmod 664 "${EROOT}/var/run/utmp"
-	fi
+	local path
+	for path in "${EROOT}"/var/log/{w,u}tmp; do
+		chown root:utmp "${path}"
+		chmod 664 "${path}"
+	done
 }