gentoo auto-resync : 22:05:2023 - 20:57:18

10 files changed, 18 insertions, 141 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 4c2a832df318..b71824ecb21d 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/m4/Manifest b/sys-devel/m4/Manifest
index 658ab7b70354..4b4cab906481 100644
--- a/sys-devel/m4/Manifest
+++ b/sys-devel/m4/Manifest
@@ -5,6 +5,5 @@ AUX ppc-musl.patch 824 BLAKE2B b3476471c27a748a67f237d7f34ede06446417a310737d466
 DIST m4-1.4.19-test-198-sysval-r1.patch.gz 6292 BLAKE2B 62f52c8bb75e7b8f11e487906f1ce47069ea6d3095fd6532aa6b47bcd8109b7cd733fde26915d449a1cfc326f27f5ed83ba29a5a80687b8b9bdb73c8d87e96b8 SHA512 c3e7d4c1631e401c6b5477c22fd5de837188acf9d72551b116c665a927d1799b1fb249e90c9fb4f6f2f328ee84b2e4dd0bf54f684139997c19ee5b69a3e9284d
 DIST m4-1.4.19.tar.xz 1654908 BLAKE2B 08694485a49c542761fa9a7db4d7609f4dfb08a5c6b785b57f2e14cf1f696c2a1c788bb5eb934e8159a632b63ff071dfe42511d0109d7b1828f46d33c8bf416a SHA512 47f595845c89709727bda0b3fc78e3188ef78ec818965b395532e7041cabe9e49677ee4aca3d042930095a7f8df81de3da1026b23b6897be471f6cf13ddd512b
 DIST m4-1.4.19.tar.xz.sig 488 BLAKE2B 99e89b1ed0bf158d29a652392fb122e23227e895c75a8c63057ebe33f11b433ab205ae99a991578a89df8c3e723fc00669d8cdb290fbc86eaa6c704b112e4370 SHA512 d6ac9c6a54c57e9b53fb3e34a60d49df2f46a6e494da0a0c9ae8246b984e68a853b5d8c42677c1a0485c3f36b0bce10a481d3775c0edc1dbdfb27b43545bc31e
-EBUILD m4-1.4.19-r1.ebuild 2751 BLAKE2B a8dc892323599940e4f7c91a1bd5fe481aece43ba05e1de6c0188f23264b4183085aab3fa7ef19dceb20423fcce61155d645d1907f87ada308af0ae69be02cfe SHA512 04502ca8b1ebc227e8b0d3ab854e902eee9d061e34479d0628f4ed2ef10d8229e626c35c2730224a9347fec0c55e7e323622c1efd6c995172e387af431803b3c
-EBUILD m4-1.4.19.ebuild 2702 BLAKE2B cd5c043fc061c27f9c7aeb33804f53675823ddcfd59e4bb9c99f5ae5a3cf047d14c64320affa59f1ca7d246c185da979abd9f9d14cad016002665bcc345c9ed3 SHA512 7945c7dc4a66b4b5b24fce265fda45e2bc1a3d97b3a480162938a8ac2e78e260408b2f8ed25d5023dacf485249997df8f22e299db4afa243355c69cec00bd494
+EBUILD m4-1.4.19-r2.ebuild 2685 BLAKE2B d0a830922f675ade614293444cb87fee203113472ab9f194c4e8916b88e4bfe61683cbb23ac263f24fce3dea6e403671d81c69256d136fa977c27a73dff30e15 SHA512 a3b08f539e9bc80c8249543f45551497418bcb4e2286773120aa8061ccb0742e4bf73de2473fb0b351111f338f4115bdca92399871b6e3edf871eb3266265c6e
 MISC metadata.xml 337 BLAKE2B dfc1567438a22dc64fbcd7c88e0840408e11b95e718134a839e1a9b526d6b618a40887c55097c8a36fd1757f9affe6acf07bd761efd59e372b95dd52110146b9 SHA512 066643eb5bc9f637200a19197c3c4825f3e032c568c0bb440b21c0b337a3ef30f69a1a1a4b38929b19ef22f9fd25d0f86079a11b33f7d1832165d216d269538d
diff --git a/sys-devel/m4/m4-1.4.19-r1.ebuild b/sys-devel/m4/m4-1.4.19-r2.ebuild
index e4e29d315999..8614334fbd84 100644
--- a/sys-devel/m4/m4-1.4.19-r1.ebuild
+++ b/sys-devel/m4/m4-1.4.19-r2.ebuild
@@ -77,8 +77,6 @@ src_configure() {
 		ac_cv_libsigsegv=no
 	)
 
-	[[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g )
-
 	econf "${myeconfargs[@]}"
 }
 
diff --git a/sys-devel/m4/m4-1.4.19.ebuild b/sys-devel/m4/m4-1.4.19.ebuild
deleted file mode 100644
index aac415f79961..000000000000
--- a/sys-devel/m4/m4-1.4.19.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/m4.asc
-inherit verify-sig
-
-DESCRIPTION="GNU macro processor"
-HOMEPAGE="https://www.gnu.org/software/m4/m4.html"
-if [[ ${PV} == *_beta* ]] ; then
-	MY_P="${PN}-1.4.18d"
-	SRC_URI="https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( https://alpha.gnu.org/gnu/${PN}/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}/${MY_P}"
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	SRC_URI+=" https://dev.gentoo.org/~floppym/dist/${P}-test-198-sysval-r1.patch.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="examples nls"
-
-RDEPEND="
-	virtual/libiconv
-	nls? (
-		sys-devel/gettext
-		virtual/libintl
-	)"
-DEPEND="${RDEPEND}"
-# Remember: cannot dep on autoconf since it needs us
-BDEPEND="app-arch/xz-utils
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-m4 )"
-
-PATCHES=(
-	"${FILESDIR}"/ppc-musl.patch
-	"${FILESDIR}"/loong-fix-build.patch
-	"${FILESDIR}"/${PN}-1.4.19-make-4.4-tests.patch
-	"${WORKDIR}"/${P}-test-198-sysval-r1.patch
-)
-
-src_unpack() {
-	if use verify-sig ; then
-		# Needed for downloaded patch (which is unsigned, which is fine)
-		verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig}
-	fi
-
-	default
-}
-
-src_prepare() {
-	default
-
-	# touch generated files after patching m4, to avoid activating maintainer
-	# mode
-	# remove when loong-fix-build.patch is no longer necessary
-	touch ./aclocal.m4 ./lib/config.hin ./configure ./doc/stamp-vti || die
-	find . -name Makefile.in -exec touch {} + || die
-}
-
-src_configure() {
-	local -a myeconfargs=(
-		--enable-changeword
-
-		--with-packager="Gentoo Linux"
-		--with-packager-version="${PVR}"
-		--with-packager-bug-reports="https://bugs.gentoo.org/"
-
-		$(usex nls '' '--disable-nls')
-
-		# Disable automagic dependency over libsigsegv; see bug #278026
-		ac_cv_libsigsegv=no
-	)
-
-	[[ ${USERLAND} != GNU ]] && myeconfargs+=( --program-prefix=g )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_test() {
-	[[ -d /none ]] && die "m4 tests will fail with /none/" #244396
-	emake check
-}
-
-src_install() {
-	default
-
-	# autoconf-2.60 for instance, first checks gm4, then m4.  If we don't have
-	# gm4, it might find gm4 from outside the prefix on for instance Darwin
-	use prefix && dosym m4 /usr/bin/gm4
-
-	if use examples ; then
-		dodoc -r examples
-		rm -f "${ED}"/usr/share/doc/${PF}/examples/Makefile*
-	fi
-}
diff --git a/sys-devel/make/Manifest b/sys-devel/make/Manifest
index e99b33c2ebf0..46f3a42ba51e 100644
--- a/sys-devel/make/Manifest
+++ b/sys-devel/make/Manifest
@@ -5,7 +5,7 @@ DIST make-4.3.tar.gz 2317073 BLAKE2B 5a82ce1f30eb034366ac3b87d2ec6698aae17d7b1a6
 DIST make-4.3.tar.gz.sig 566 BLAKE2B 75bf71602e60f97ec8efa81676329047746d960257ef310b89a059144c00628b6a1ddf7a16a2ac2c3e935b8591475f5043a7c7546668ab39abbc4717c75a6528 SHA512 bf13e2943593b153457c8111179e8ae11cef2d9185a986106a1e70946a260bd930505a5e10002c5a60888e11affc07713c367b8680fd511ad87b2e124d303a99
 DIST make-4.4.1.tar.gz 2348200 BLAKE2B 09a4ad8060259e36854b525ab610fd317a86f4926e44e3ab8adba75dccc8d4b445df9dd25ccfb4c25a54bc0e98238a9127e36401d74cbc3503a329eadcdf4995 SHA512 145260cbd6a8226cef3dfef0c8baba31847beaebc7e6b65d39d02715fd4f4cab9b139b6c3772e550088d4f9ae80c6d3ed20b9a7664c693644dfb96b4cb60e67c
 DIST make-4.4.1.tar.gz.sig 833 BLAKE2B d5f9a33b0262d4a9216f47718f6596884852662a692e708191a7007964007940da1c06549db28ae1d13683c4a949b9ee86da9dedd9a80da8f8b09e71e659e9a1 SHA512 d7a5531c10f216d690ec036f3875c7f314fa53006e138568c60132d506db48d1a59201623e168091dafa4465b005991019e42f81ff1a96a44610b6b18de08b09
-EBUILD make-4.3.ebuild 1944 BLAKE2B 875fb1c002402057904152c634ee5e588b02bee4149ab4a5a19d6fbf0f5bc1faecd19e14209951ff5908cc40f7791030d66cf8c03392c8eab62d748272b5dca3 SHA512 37e56423a20def1b5c4f929ae92fcb84988edb55799dfd17634d76ae57cf454cb26649d2c3a25a80b8c0ff3e3447cac7b01ad20f4bea262e17812b5c2ceca87a
-EBUILD make-4.4.1.ebuild 1911 BLAKE2B 93732d4fa5c6310032e40af0066b19c5b712b185967772c3f0032ee0b1660601c6d594d0a991ceba6be1f2256a4629087045acf49402c8566197b7119e27d66d SHA512 f26e4832bc33fffb4dfc9495568a6b305b40083da2d50ad34feb6a226324abced3e1849fd408fcc028f6e525c436181f1a82e9a0c64196da2daf1f66f2e8e99c
-EBUILD make-9999.ebuild 1919 BLAKE2B 3f9296fbdad81fd3685f3630053f0728ae64325ca4048d5137901ee3ed987ab7c336e921f4a98c36ba49baf3cb965e95f190d111c574ff3ccb997a499dfa76dc SHA512 f3a2527c436de16d70d91d69c5bcc6dfa18c77de20cb16c425325ac30d28ea28c22a8cdff7422f50fd5bb73377b21f904739d2521c3ad8eb646c7aed9383e78f
+EBUILD make-4.3-r1.ebuild 1814 BLAKE2B c991df377c1ccfb3735d658bff80b47f45bc736653f4e83056f468442b4fe36cc582e2af381439741cab6eaf569419cecd7894889767b6e4a1deed7f65d11c1e SHA512 6ff4965c92b8bde34db5bc8a9d5ec41ed655fe36b452789c6c0b99e98f9f9fb9e995ac9493272647dc8fef547560b05054a238862c08d571f1634062588896e0
+EBUILD make-4.4.1-r1.ebuild 1781 BLAKE2B 28d6b971c8b6bf187b33c9bbeab33c73be7a6c0f02ab30e45b7608730ee720f2d6a4c1c338575b69a3735d57975554e94c7e18b7746ea831c74b71e18c82cb32 SHA512 c7d186aa219130fd4d77b171568f5c14c956884e7929dc8c21024f845dcdf9d08a07f8f8e4374dbb0b74c61fbd910949c6200439090a7f2dfc7f73c12b4d956f
+EBUILD make-9999.ebuild 1789 BLAKE2B bcca2e092b71b752684dc9577e47d7e0d62e2c97941d058cf1b4fb518c3969b4375e5ac859ffdcf17a16a6bb1f29504f1f30f05d0fc48898982101e785f6774b SHA512 5bfa36335856e9933aaac299332f0e951a0ccf0cbff4ac2c939d220459d773cd090b0ff9cd637f5f150c261f0979a7c54ea99bb9a952bb43f9b2d76aa8181991
 MISC metadata.xml 381 BLAKE2B 867fd4a045ef622ccb62c72b7198e205293501d075ec0dca7daf702bacbe2df21ea23aadb4150e42fdc0914a95cab0f48d439c1f7073acf2302bdaf48fa18688 SHA512 66494f08f599035728fa7f87b3f7ca093e3c50dbb694aed8214d1dbbb3d1e03441e6e159b1453709fa8c7da8cc8d73ab2c972517a3506b1fb671533d459c4418
diff --git a/sys-devel/make/make-4.3.ebuild b/sys-devel/make/make-4.3-r1.ebuild
index c219f5ff1bee..892d5910d144 100644
--- a/sys-devel/make/make-4.3.ebuild
+++ b/sys-devel/make/make-4.3-r1.ebuild
@@ -67,10 +67,7 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
+
+	dosym gmake /usr/bin/make
+	dosym gmake.1 /usr/share/man/man1/make.1
 }
diff --git a/sys-devel/make/make-4.4.1.ebuild b/sys-devel/make/make-4.4.1-r1.ebuild
index 8d425cc7108a..142bc1e77077 100644
--- a/sys-devel/make/make-4.4.1.ebuild
+++ b/sys-devel/make/make-4.4.1-r1.ebuild
@@ -70,10 +70,7 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
+
+	dosym gmake /usr/bin/make
+	dosym gmake.1 /usr/share/man/man1/make.1
 }
diff --git a/sys-devel/make/make-9999.ebuild b/sys-devel/make/make-9999.ebuild
index de7a808ae4c1..a230283d6685 100644
--- a/sys-devel/make/make-9999.ebuild
+++ b/sys-devel/make/make-9999.ebuild
@@ -70,10 +70,7 @@ src_configure() {
 src_install() {
 	emake DESTDIR="${D}" install
 	dodoc AUTHORS NEWS README*
-	if [[ ${USERLAND} == "GNU" ]] ; then
-		# we install everywhere as 'gmake' but on GNU systems,
-		# symlink 'make' to 'gmake'
-		dosym gmake /usr/bin/make
-		dosym gmake.1 /usr/share/man/man1/make.1
-	fi
+
+	dosym gmake /usr/bin/make
+	dosym gmake.1 /usr/share/man/man1/make.1
 }
diff --git a/sys-devel/pmake/Manifest b/sys-devel/pmake/Manifest
index c9e7079b9426..d143daaeda0e 100644
--- a/sys-devel/pmake/Manifest
+++ b/sys-devel/pmake/Manifest
@@ -2,5 +2,5 @@ AUX pmake-1.111.1-ldflags.patch 484 BLAKE2B d94f955c6ec149b7617c26010e7364fe2ad5
 AUX pmake-1.98-skipdots.patch 513 BLAKE2B 03f63f698b3d147dc0d1df0140f40657cecd445d7c7659f18369e5fa541b0370ced4cddafd27639149aa93053440f7d43b715baf1893cf4613ba15fe6820bdc9 SHA512 ccd751cca406abdb763f251c147f7b7efd7b001e415bc8c98a4fa8069420b64c3a5819b4abd5f174606390f903f8cba5e560e02a14519619713da26ab52c54ad
 DIST pmake_1.111-3.3.debian.tar.gz 31648 BLAKE2B 31aca433bbeac4275d4c2af0cfd33ef81b0086b0dec107edfc1fba55b15480367ebf62abccd6e2e48f0c7ccc25c59f0b07eed7ac950a5037b73c267b066a9638 SHA512 b22a1d9e371712732f196d91ac3eb9239fa98ee8ee05754576e7a5878cab88976cb10bb6be90706df5ac738373f519468403c23f6a3ff3860a2968b3222a66ed
 DIST pmake_1.111.orig.tar.gz 264383 BLAKE2B 54dd510251441b54c9f5d7f6061109b0222191b3acdded1394b51b72b87bbd4255edd80fab46976d92c58929693b6809a9f2c4f001cab8c9cdaabfac9f3adac9 SHA512 ad48708ea014d6a38ad36303504c52992b51a1e815564f1710849d859b1fc3cd58c4a1a71f54ec902c9b69112e9cd1e1a64282ff738439cdb209a4f75c364c22
-EBUILD pmake-1.111.3.3.ebuild 2137 BLAKE2B e17500d1eedf6568eb9fe9c61b55f53697e3130368b0ba48bbedbf182aab31a46baef12876cd4fc9defb31ca9b1aeede3381b61b67a77f793183ecb411310019 SHA512 e8b91a44159b3b34b750f1322449992062060e4da0a44674eed42c253eab5c0c832b588584dd47644d62ab743a7d3b0b190baf07d1d0675f1330c86b1a511b32
+EBUILD pmake-1.111.3.3-r1.ebuild 1865 BLAKE2B e009b6b222e34679db650669bd987321894b3a7ae567e80b88f28abb94ca026d32190c56d53c3de8304677a6e92a0318f0f059c0ace59cc4a726a9f22dfca15c SHA512 213da2ffa18379f8a0224c8fe5d9fb46c7e4a2aad290603a52363efc3996494e0695ec317d12a45fe7744d02bbaf430ab00ac10e59569153f6a32834c2583de7
 MISC metadata.xml 167 BLAKE2B 868e3b584722eaacf68273db062bb773d8c7e5d7ab2b81ca7e8397643bf7cc106c3a1033594401c99c54f667bb45d6b73f9048fc335580bbd44b4589ad26a832 SHA512 30caadd1496c3b9969136038239a1d8e01f236726b4022c2d7e19ca7575f25f735e556835e581afbf44fbd3e4104c40f2b5ef5fa70118d75c881fdf871962d0a
diff --git a/sys-devel/pmake/pmake-1.111.3.3.ebuild b/sys-devel/pmake/pmake-1.111.3.3-r1.ebuild
index 53db11c875df..ff51a3b25bbc 100644
--- a/sys-devel/pmake/pmake-1.111.3.3.ebuild
+++ b/sys-devel/pmake/pmake-1.111.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -44,10 +44,7 @@ src_compile() {
 		-DMACHINE=\\\"gentoo\\\" -DMACHINE_ARCH=\\\"$(tc-arch-kernel)\\\" \
 		-D_PATH_DEFSHELLDIR=\\\"${EPREFIX}/bin\\\" \
 		-D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk\\\" \
-		-DHAVE_VSNPRINTF"
-	if [[ "${USERLAND}" == "GNU" ]]; then
-		CFLAGS="${CFLAGS} -D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk/${PN}\\\""
-	fi
+		-DHAVE_VSNPRINTF -D_PATH_DEFSYSPATH=\\\"${EPREFIX}/usr/share/mk/${PN}\\\""
 
 	emake -f Makefile.boot \
 		CC="$(tc-getCC)" \
@@ -55,11 +52,8 @@ src_compile() {
 }
 
 src_install() {
-	# Don't install these on BSD, else they conflict
-	if [[ ${USERLAND} == GNU ]]; then
-		insinto /usr/share/mk/${PN}
-		doins -r mk/.
-	fi
+	insinto /usr/share/mk/${PN}
+	doins -r mk/.
 
 	newbin bmake pmake
 	dobin mkdep
@@ -68,9 +62,4 @@ src_install() {
 	newman make.1 pmake.1
 
 	dodoc PSD.doc/tutorial.ms
-
-	if [[ ${USERLAND} == BSD ]]; then
-		dosym pmake /usr/bin/make
-		dosym pmake.1.gz /usr/share/man/man1/make.1.gz
-	fi
 }