gentoo auto-resync : 11:06:2023 - 14:17:09

10 files changed, 6 insertions, 519 deletions

diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 8f9b8a7988bb..9044fc010556 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/go/Manifest b/dev-lang/go/Manifest
index 772843e835ce..52b5220e098d 100644
--- a/dev-lang/go/Manifest
+++ b/dev-lang/go/Manifest
@@ -1,11 +1,7 @@
 AUX go-sets.conf 313 BLAKE2B 03e94776e317d34b72bfb8385b8b0dfa6a599a6086e4d0c9214e7b49293768947c21d9afb323ffcc7fd85ba0af72d9cb243dbb571eee9eb81de9400fd5f5e79c SHA512 7d01b98bc8d1b609183682dd942bd4c9fa757a98243c7de3cf6c497c7bc20b8cdbe59dd669ce4bb11f914a0e9b6d100e65cea2dffd99f38be50b18e0ecf66315
 DIST go1.19.10.src.tar.gz 26563069 BLAKE2B 2aec01a67ba3e61f83b635bdf830bf6407342bd877b84367f268560cbb691291825622c4035db99f86ca7ae2153fd11f3f800ab7a90089da7624a531e189f374 SHA512 e8e7d1118d0c409d692ebb406f0e6807781dfd8f7dbe8b03be145e3fc287cde967fde387a216eb9996366508f4e61954cd131cd33f85b652bfd223e37bf41a67
-DIST go1.19.8.src.tar.gz 26553006 BLAKE2B db085e575f1bc978502cc5d9e45206542cdf9c6edd6769b1918f07a6be7afb4a387cb18ffb7cb37f5de936bb970c703504cbb6bf88c597dc30aab4d80eeb8820 SHA512 d7ecbae3034211d7c64df4c0fce6894bae3e7e8de20bd2aa9f24b39cc040fa64d8a3bea311582cf4455a981dc3c8f319141f7f357db4eebd27d4451fee05727a
-DIST go1.20.3.src.tar.gz 26184364 BLAKE2B faa9cf8c141d013955d3582d5cf1a43ac0d89c2a7ceb7ab00e10aeacedc3bf1c324d62cd17dc6299057cc9acd347ec7672c7f9acafc1b926855d953ef2bac8d6 SHA512 47ebb3925956a3facef9e5e6f4efec3058e55632020ea247844c55b160d23e2be3880ea24dec2f73382a7c7858259896cbb7de1bb764c481c176bed479676029
 DIST go1.20.5.src.tar.gz 26192951 BLAKE2B 13ab06a45a7b13eb5cf8886594343bc169df3c4ff0062ac89c0997283686563edccb7d39423457947f945782bef418ab1a1f3b8712aa8817a8f4c61b54e8574c SHA512 94cecb366cd9d9722b53e52ea3b0a5715a9e9dc21da0273dd3db9354557f71b9501b018125ef073dacc2e59125335f436cea1151cd8df0d60e2ad513f841905c
-EBUILD go-1.19.10.ebuild 5234 BLAKE2B d017f18d2b8f2b3f95f5a8a84a294dc6d8779cf701a14e95d010f43027030de9290cbc05f7c92c95dffa938aa06477c92289ef2f76baeabc77dec91a7b5fd795 SHA512 129733230a68c6a019937dcc4601a1c6d1f23c22e2fda8b3ff55e366307e94703c532c0031f87f0585588177af15ad1425777d7e7fbe035414f11d94abec13eb
-EBUILD go-1.19.8.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
-EBUILD go-1.20.3.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
-EBUILD go-1.20.5.ebuild 5234 BLAKE2B d017f18d2b8f2b3f95f5a8a84a294dc6d8779cf701a14e95d010f43027030de9290cbc05f7c92c95dffa938aa06477c92289ef2f76baeabc77dec91a7b5fd795 SHA512 129733230a68c6a019937dcc4601a1c6d1f23c22e2fda8b3ff55e366307e94703c532c0031f87f0585588177af15ad1425777d7e7fbe035414f11d94abec13eb
+EBUILD go-1.19.10.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
+EBUILD go-1.20.5.ebuild 5233 BLAKE2B 86b49ba0ccc71624134e67f3e97db2b58460835459080228ccaa6a6b043123bc4592cf8ac180d8e67eebfe0b6aaef0bd48c5e9358246099c20668181301b7842 SHA512 10577e3953f04e5998acce259355643455dab7e67bd42efa5fbc4d2aeb91d0807acdb3c59813f2d69acb853e7f6d6d2fcb3cb72e2ec9834dec5ccc6f6a50a7ba
 EBUILD go-9999.ebuild 4798 BLAKE2B 50daca174e8bc89f747432e96bc7d66e6c7dd50320d0b4c97754bb90267d62b700d34c250a892fdf60c907fa5eb881dd7adb3e64eba7ceb240740bd90c399f83 SHA512 051671c9a99efe554f9ed66423a20d053546ba68fdbf8a900e4ef0a365622bf8fcc976c678e393ade4a5475e01ccc53668d61d98e1b976e69de030662498273a
 MISC metadata.xml 590 BLAKE2B 56da63bdc350df5c6ef3b511a386627f4020f655027ca88da6a83ecb09581d3c3055c836eb8fe98a383412b3d431a77a9935ad753fe2d8392afa37cd613c15b0 SHA512 5d78adbae30c3a805194567bbb1af2ad59b78487819e7841a040d2a4d5db02f5b5d1d58f7cfc7a37f39e5e9bcf332dda4d336456e33e36c33caef792ac45d48b
diff --git a/dev-lang/go/go-1.19.10.ebuild b/dev-lang/go/go-1.19.10.ebuild
index 46cdf38c566d..b6862ea87040 100644
--- a/dev-lang/go/go-1.19.10.ebuild
+++ b/dev-lang/go/go-1.19.10.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/go/go-1.19.8.ebuild b/dev-lang/go/go-1.19.8.ebuild
deleted file mode 100644
index b6862ea87040..000000000000
--- a/dev-lang/go/go-1.19.8.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://go.dev"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2"
-
-RDEPEND="
-arm? ( sys-devel/binutils[gold] )
-arm64? ( sys-devel/binutils[gold] )"
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-	CONTRIBUTING.md
-	PATENTS
-	README.md
-	SECURITY.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local tc_arch=$(tc-arch $@)
-	case "${tc_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		loong)	echo loong64;;
-		mips) if use abi_mips_o32; then
-				[[ $(tc-endian $@) = big ]] && echo mips || echo mipsle
-			elif use abi_mips_n64; then
-				[[ $(tc-endian $@) = big ]] && echo mips64 || echo mips64le
-			fi ;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${tc_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-
-	# https://github.com/golang/go/issues/42005
-	rm cmd/link/internal/ld/fallocate_test.go || true
-
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	elog "due to the static linking nature of go."
-	elog "If this is not done, the packages compiled with the older"
-	elog "version of the compiler will not be updated until they are"
-	elog "updated individually, which could mean they will have"
-	elog "vulnerabilities."
-	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	elog "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.20.3.ebuild b/dev-lang/go/go-1.20.3.ebuild
deleted file mode 100644
index b6862ea87040..000000000000
--- a/dev-lang/go/go-1.20.3.ebuild
+++ /dev/null
@@ -1,208 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-export CBUILD=${CBUILD:-${CHOST}}
-export CTARGET=${CTARGET:-${CHOST}}
-
-MY_PV=${PV/_/}
-
-inherit toolchain-funcs
-
-case ${PV}  in
-*9999*)
-	EGIT_REPO_URI="https://github.com/golang/go.git"
-	inherit git-r3
-	;;
-*)
-	SRC_URI="https://storage.googleapis.com/golang/go${MY_PV}.src.tar.gz "
-	S="${WORKDIR}"/go
-	case ${PV} in
-	*_beta*|*_rc*) ;;
-	*)
-		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
-		;;
-	esac
-esac
-
-DESCRIPTION="A concurrent garbage collected and typesafe programming language"
-HOMEPAGE="https://go.dev"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-IUSE="abi_mips_o32 abi_mips_n64 cpu_flags_x86_sse2"
-
-RDEPEND="
-arm? ( sys-devel/binutils[gold] )
-arm64? ( sys-devel/binutils[gold] )"
-BDEPEND="|| (
-		dev-lang/go
-		dev-lang/go-bootstrap )"
-
-# the *.syso files have writable/executable stacks
-QA_EXECSTACK='*.syso'
-
-# Do not complain about CFLAGS, etc, since Go doesn't use them.
-QA_FLAGS_IGNORED='.*'
-
-# The tools in /usr/lib/go should not cause the multilib-strict check to fail.
-QA_MULTILIB_PATHS="usr/lib/go/pkg/tool/.*/.*"
-
-# This package triggers "unrecognized elf file(s)" notices on riscv.
-# https://bugs.gentoo.org/794046
-QA_PREBUILT='.*'
-
-# Do not strip this package. Stripping is unsupported upstream and may
-# fail.
-RESTRICT+=" strip"
-
-DOCS=(
-	CONTRIBUTING.md
-	PATENTS
-	README.md
-	SECURITY.md
-)
-
-go_arch() {
-	# By chance most portage arch names match Go
-	local tc_arch=$(tc-arch $@)
-	case "${tc_arch}" in
-		x86)	echo 386;;
-		x64-*)	echo amd64;;
-		loong)	echo loong64;;
-		mips) if use abi_mips_o32; then
-				[[ $(tc-endian $@) = big ]] && echo mips || echo mipsle
-			elif use abi_mips_n64; then
-				[[ $(tc-endian $@) = big ]] && echo mips64 || echo mips64le
-			fi ;;
-		ppc64) [[ $(tc-endian $@) = big ]] && echo ppc64 || echo ppc64le ;;
-		riscv) echo riscv64 ;;
-		s390) echo s390x ;;
-		*)		echo "${tc_arch}";;
-	esac
-}
-
-go_arm() {
-	case "${1:-${CHOST}}" in
-		armv5*)	echo 5;;
-		armv6*)	echo 6;;
-		armv7*)	echo 7;;
-		*)
-			die "unknown GOARM for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_os() {
-	case "${1:-${CHOST}}" in
-		*-linux*)	echo linux;;
-		*-darwin*)	echo darwin;;
-		*-freebsd*)	echo freebsd;;
-		*-netbsd*)	echo netbsd;;
-		*-openbsd*)	echo openbsd;;
-		*-solaris*)	echo solaris;;
-		*-cygwin*|*-interix*|*-winnt*)
-			echo windows
-			;;
-		*)
-			die "unknown GOOS for ${1:-${CHOST}}"
-			;;
-	esac
-}
-
-go_tuple() {
-	echo "$(go_os $@)_$(go_arch $@)"
-}
-
-go_cross_compile() {
-	[[ $(go_tuple ${CBUILD}) != $(go_tuple) ]]
-}
-
-src_compile() {
-	if has_version -b dev-lang/go; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go"
-	elif has_version -b dev-lang/go-bootstrap; then
-		export GOROOT_BOOTSTRAP="${BROOT}/usr/lib/go-bootstrap"
-	else
-		eerror "Go cannot be built without go or go-bootstrap installed"
-		die "Should not be here, please report a bug"
-	fi
-
-	export GOROOT_FINAL="${EPREFIX}"/usr/lib/go
-	export GOROOT="${PWD}"
-	export GOBIN="${GOROOT}/bin"
-
-	# Go's build script does not use BUILD/HOST/TARGET consistently. :(
-	export GOHOSTARCH=$(go_arch ${CBUILD})
-	export GOHOSTOS=$(go_os ${CBUILD})
-	export CC=$(tc-getBUILD_CC)
-
-	export GOARCH=$(go_arch)
-	export GOOS=$(go_os)
-	export CC_FOR_TARGET=$(tc-getCC)
-	export CXX_FOR_TARGET=$(tc-getCXX)
-	use arm && export GOARM=$(go_arm)
-	use x86 && export GO386=$(usex cpu_flags_x86_sse2 '' 'softfloat')
-
-	cd src
-	bash -x ./make.bash || die "build failed"
-}
-
-src_test() {
-	go_cross_compile && return 0
-
-	cd src
-
-	# https://github.com/golang/go/issues/42005
-	rm cmd/link/internal/ld/fallocate_test.go || true
-
-	PATH="${GOBIN}:${PATH}" \
-	./run.bash -no-rebuild || die "tests failed"
-	cd ..
-	rm -fr pkg/*_race || die
-	rm -fr pkg/obj/go-build || die
-}
-
-src_install() {
-	# There is a known issue which requires the source tree to be installed [1].
-	# Once this is fixed, we can consider using the doc use flag to control
-	# installing the doc and src directories.
-	# The use of cp is deliberate in order to retain permissions
-	# [1] https://golang.org/issue/2775
-	dodir /usr/lib/go
-	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
-	einstalldocs
-
-	# testdata directories are not needed on the installed system
-	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
-
-	local bin_path
-	if go_cross_compile; then
-		bin_path="bin/$(go_tuple)"
-	else
-		bin_path=bin
-	fi
-	local f x
-	for x in ${bin_path}/*; do
-		f=${x##*/}
-		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
-	done
-
-	# install the @golang-rebuild set for Portage
-	insinto /usr/share/portage/config/sets
-	newins "${FILESDIR}"/go-sets.conf go.conf
-}
-
-pkg_postinst() {
-	[[ -z ${REPLACING_VERSIONS} ]] && return
-	elog "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
-	elog "all packages compiled with previous versions of ${CATEGORY}/${PN}"
-	elog "due to the static linking nature of go."
-	elog "If this is not done, the packages compiled with the older"
-	elog "version of the compiler will not be updated until they are"
-	elog "updated individually, which could mean they will have"
-	elog "vulnerabilities."
-	elog "Run 'emerge @golang-rebuild' to rebuild all 'go' packages"
-	elog "See https://bugs.gentoo.org/752153 for more info"
-}
diff --git a/dev-lang/go/go-1.20.5.ebuild b/dev-lang/go/go-1.20.5.ebuild
index 46cdf38c566d..b6862ea87040 100644
--- a/dev-lang/go/go-1.20.5.ebuild
+++ b/dev-lang/go/go-1.20.5.ebuild
@@ -21,7 +21,7 @@ case ${PV}  in
 	case ${PV} in
 	*_beta*|*_rc*) ;;
 	*)
-		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+		KEYWORDS="-* amd64 arm arm64 ~loong ~mips ppc64 ~riscv ~s390 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 		;;
 	esac
 esac
diff --git a/dev-lang/swig/Manifest b/dev-lang/swig/Manifest
index cd28fde0c435..e63811b2cd16 100644
--- a/dev-lang/swig/Manifest
+++ b/dev-lang/swig/Manifest
@@ -1,7 +1,4 @@
 AUX swig-4.1.1-ccache-configure-clang16.patch 1162 BLAKE2B 28889128bfd9a6cd883d575f1cae8dd0f3e02b7ebfc8818b761154a60a79757d2f13c26f43119a0288c9731c56c5bbacfb1606222d5697e0fc04e6b3e2ebf265 SHA512 aa7fc3bc4da18dcdfa2c6dec55c6c80174878ee05883ed4eab6bf35c75c88edd165977cc1ea4e1d503f40f99bd7b40688357ec7283c20542e87c961efcd71526
-DIST swig-4.0.2.tar.gz 8097014 BLAKE2B 4c36b7e9b9bf1663779aa31b0eda8a1fe443695d945bcc1642c3404b22e45440def85e58dd65dc18a2ca8c00ffdcfe0f1d75373b7becc0b0e5402fda90b8c29a SHA512 05e7da70ce6d9a733b96c0bcfa3c1b82765bd859f48c74759bbf4bb1467acb1809caa310cba5e2b3280cd704fca249eaa0624821dffae1d2a75097c7f55d14ed
 DIST swig-4.1.1.tar.gz 8600805 BLAKE2B 898d3405f20c3e49626fb808b568e77c69b81ec2401c0a0c406f9e7a3d7d218353dc8b8ae88a3d485ddfc3be659971b961ee2c89d5b0c75aed0688e0952fd208 SHA512 1cea1918455a75ebc9b2653dd1715bd5dcd974554955f324295c6a6f14c0a715651b221b85fad4a8af5197e0c75bfe7b590bc6ba7178c26245fbbd9a7e110100
-EBUILD swig-4.0.2.ebuild 914 BLAKE2B c822443bb545d2505b37f5f4c77c250a4ea76c840e77cdb79311a4482f5c70e1eda4d537d5213632fbf43e8afca812f3ba1b1829dd10a4ef3306e6c63b37995d SHA512 05ebb5cdef3b7d5640dc84d17313bab4e28c1ceaa908375fc65b4d0e3eddf5b22afcf456a63b171ffea098277f4261c9406b27b42cb87a4aa072bc07cd7defb0
-EBUILD swig-4.1.1-r1.ebuild 1275 BLAKE2B 55b4cb8cfd830bac1e96e0daf42402e37225e3a2c693ddf202cf4e4feed638343897361d5ed07b56ece853d5ddf72fce0b576861839cb6a9590e8b89b492f42c SHA512 9f530c703256de4acd65497881aabb9433c913a401c11bff625b11ae427f5a09ddeea0ec05c36ce25c981dd2d462f68ca4a1de45c0b2b50243dc7504e4b84778
-EBUILD swig-4.1.1.ebuild 1064 BLAKE2B f45b633212ed9fc430115347063a7c3d85f13acc0eb90529af67380b0cd64382e71830d5dacbb451c41c8960acdd178a563d848afc6e23aeee44ee77375c1949 SHA512 76223d38645aedc3b401acd783b3b4fc11361b0484e476420ad819dd8e7c21864a30e634f7db953dea8642a1a1bc0ab5014a33c58993f097944fb1dd8f0c9423
+EBUILD swig-4.1.1-r1.ebuild 1272 BLAKE2B ee0e944af53fab072a842c9a98c3ffbeb88b902cb75eb44a2f83a5a43c5d03fc7b8a49417fc9c23ee8a3f9ae14bf45c66e909f96e371d12c6f9e032a6fb3879d SHA512 1e759c28a4a0803dcb3cd74fd905cd6fdf30a847b98d9bb22538e25ef98617d4b95fe547f21f504ceb990c063a5457a443ea21cfd78a6502d092fc6a0e831026
 MISC metadata.xml 1019 BLAKE2B 1f6a79945d3bb92bd9b5c06f7b4e96c8c9f8f6e68d5c13890247d2c08adf46409a194e3198fb3df19f699a176fe92bebc1e7ba6eb0944a0db12c5e3271043552 SHA512 5ba26e3670ba852648a243f14efe096e52781418eb4d07cabc1bcf46efcd098d099ecbb3d504862540db796279fd855a581d60dd3b1de2f60e9d542e3ccb9b00
diff --git a/dev-lang/swig/swig-4.0.2.ebuild b/dev-lang/swig/swig-4.0.2.ebuild
deleted file mode 100644
index 8fb8e539bd23..000000000000
--- a/dev-lang/swig/swig-4.0.2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simplified Wrapper and Interface Generator"
-HOMEPAGE="http://www.swig.org/ https://github.com/swig/swig"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="ccache doc pcre"
-RESTRICT="test"
-
-RDEPEND="
-	pcre? ( dev-libs/libpcre )
-	ccache? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO )
-
-src_configure() {
-	econf \
-		PKGCONFIG="$(tc-getPKG_CONFIG)" \
-		$(use_enable ccache) \
-		$(use_with pcre)
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		docinto html
-		dodoc -r Doc/{Devel,Manual}
-	fi
-}
diff --git a/dev-lang/swig/swig-4.1.1-r1.ebuild b/dev-lang/swig/swig-4.1.1-r1.ebuild
index a9ede19933b9..653722a31acb 100644
--- a/dev-lang/swig/swig-4.1.1-r1.ebuild
+++ b/dev-lang/swig/swig-4.1.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+ BSD BSD-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 IUSE="ccache doc pcre test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lang/swig/swig-4.1.1.ebuild b/dev-lang/swig/swig-4.1.1.ebuild
deleted file mode 100644
index a94affbe213f..000000000000
--- a/dev-lang/swig/swig-4.1.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Simplified Wrapper and Interface Generator"
-HOMEPAGE="http://www.swig.org/ https://github.com/swig/swig"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+ BSD BSD-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="ccache doc pcre test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	pcre? ( dev-libs/libpcre2 )
-	ccache? ( sys-libs/zlib )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-libs/boost )
-"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( ANNOUNCE CHANGES CHANGES.current README TODO )
-
-src_configure() {
-	econf \
-		PKGCONFIG="$(tc-getPKG_CONFIG)" \
-		$(use_enable ccache) \
-		$(use_with pcre)
-}
-
-src_test() {
-	# The tests won't get run w/o an explicit call, broken Makefiles?
-	emake check
-}
-
-src_install() {
-	default
-
-	if use doc; then
-		docinto html
-		dodoc -r Doc/{Devel,Manual}
-	fi
-}