gentoo auto-resync : 01:11:2024 - 03:04:33

8 files changed, 4 insertions, 462 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 989884484c3a..2a3e28d7c775 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 1de45577350d..52fc4a2d61ac 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -26,5 +26,5 @@ DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512
 DIST cederqvist-1.12.12.ps 1262208 BLAKE2B 4e26173e7deac7fbcd6ec8d50f6be8432df00ad15ecaadc3a64de15d53c4f1220f0496f270688baa4f6b29cfb1f5a1b548c7330408cc0afd94c3de2070a1eca9 SHA512 9a061ef90c664fbb4f882644f72c4f80ffbe0233b6b364511b1c7f18f0a53383980a6ddda326b6df1f2fe1899aed3225de89b55a65a1d9101ba81d1c10c067e2
 DIST cvs-1.12.12.tar.bz2 3197171 BLAKE2B bb0aeacd4d89d32c7aeb30b2f96ec9c89277f01c54561ce082031433bc9914c40c1c7041df3859868e879ccaacc7a47aa915fb18aef3777463ba11a7077e99b8 SHA512 31c679b77b887e02d9c8c381b0dfb42f1207ef4ca806cd92843638eb2126ed032e99bda70a3e20ea2a029670ff39c40088a43435632e381739e6c2f978e6f4bb
 EBUILD cvs-1.12.12-r14.ebuild 2993 BLAKE2B 73e0b0166b37c8a49fba68b92c48554d0b33d48e02c918489ad845d6ecf250d62f771616d2cad704e6bbebf5d40f8d909a7962eb518ae525e99a42593fce374b SHA512 921689a34c72b49615ef12d8960ed855990551ec2ae7d4d8116adb807ced834a4d95b3342a1aab9d317f1e23d34e0ad5ea0a6f595a5d36cfa45c664fa1a3371b
-EBUILD cvs-1.12.12-r15.ebuild 3171 BLAKE2B af1b356e9ecf9b84d40b8052167cad9475b4cc06d8e8186d5eab07949d3ca7be26e2e7b88338d23e29f31b83a9fb0f7a1ad85770403ecbfa1881474ac535607a SHA512 18e2fc85422b2794e19e5641ac0acc65be19e7a6f00764a9c6faeeaa065f74468ccab122a1fe8b23812e51f1f8e8512ce4972419acd62855b0806ae54a6841d7
+EBUILD cvs-1.12.12-r15.ebuild 3170 BLAKE2B a6df2f0df01c5723f8589ccb5d6dd41852b58b2981c216d1d1cb47196b8d6ddd07e937bd6a9d09f1e118128f5836788f0714816413e10c600780262fcd924a61 SHA512 0f3aec793c41508bdecac43aca8200d644651f31ed70342298b6cc2166d187f6b677bd477dfb6f825a718f3f16c2653a0fce1596f9ba50bf80e0f9faffd1daaa
 MISC metadata.xml 313 BLAKE2B 146e5250368e0afe0a23c68dff542e20941a1b66cc0379d504cbceb707a3caaf2404181546ec8fa114ac815fc5cdca8cbe20b8e5e4ebbc79f4398112ff3f7389 SHA512 84c13776b7edc8c0a0ec81f093d272b6f28c09682f3a076d23e40c61bf9e1512401fff51a7e12b7103dd6128d0b6e158dbb71fd0fe68f624bc86f5ec86638675
diff --git a/dev-vcs/cvs/cvs-1.12.12-r15.ebuild b/dev-vcs/cvs/cvs-1.12.12-r15.ebuild
index d510ade3688f..1e8235508d99 100644
--- a/dev-vcs/cvs/cvs-1.12.12-r15.ebuild
+++ b/dev-vcs/cvs/cvs-1.12.12-r15.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
 
 IUSE="crypt doc kerberos nls pam selinux server"
 RESTRICT="test"
diff --git a/dev-vcs/subversion/Manifest b/dev-vcs/subversion/Manifest
index 5286294f7c88..d26536cc9acb 100644
--- a/dev-vcs/subversion/Manifest
+++ b/dev-vcs/subversion/Manifest
@@ -1,5 +1,4 @@
 AUX 47_mod_dav_svn.conf 422 BLAKE2B 505c5f7f5c2eba9951b1337d452fde8e2b51351d2af0a4e620e86ce95aa2520460b7e353e5465edc15dc284a17b0770806ba97bb91c3d4a8451f3818d49c8469 SHA512 05608aa7abca0ec55015232077db928453c92ccf8b595dd843ba13ed39703e01dcbe298c4ff57c638376679be9fea4b409e98953915b86dc6954e3e0de31b23d
-AUX subversion-1.14.2-python3.11.patch 464 BLAKE2B 69b2a47c7ac660b8bb5cbe45772d87d2ad326cae3c5f2b36d8fb2ab6f7076d1c29ee61d4224c6e22d8985a2668f6e278bf5ce7c16cace6aaf0457c6d66180f5b SHA512 3e9289e9dec0d52a99642ffa89cc38b5d4d125fb2249696b0e9f7a046dc6efb6087ce410484f6b8031c48bae417f8de9b379246a8dc60393e6475fb3d165e920
 AUX subversion-1.14.3-ruby-c99.patch 1023 BLAKE2B ebd735e4ba48f30c34e15e514720dd39da8fe0ceb8fa8b88b5060a7c2ca521926b3f4003601ac7519e99c28bc56a5a5126cb97d5063b3e610792e43618c68529 SHA512 02e7fcb7c7239ba7344d03e86557932f4e03ca7ae71df5c66a72ffc65315d234554bd429edbc1553c1ea847867e6424f1af8e938ae6604338f67416f87717539
 AUX subversion-1.5.6-aix-dso.patch 734 BLAKE2B b628257f7df660247d2ae34d4f10b701cded2e84826195bb2c73623ea863fcecbf85ca8c92304db6b6f9fb9e092b76e980c3bbe0254e0e653b8a0fa13938c50b SHA512 fdc7f58519ae0b68458600472352fde8dd24cc32c3563ecd74da256fc6ad32dedfda78926aa60aa72a12b68a2a9e5dd43241bc501c707bb1f0b40c9e30d1b992
 AUX subversion-1.8.1-revert_bdb6check.patch 3160 BLAKE2B 5ea5fb779fdd064acf527216884bd72a93dde984f7ae0938bfd5111831dda4901264085de400dd5641fb2703b36443b41508a425900fe3e8cb4fedce33b6c90b SHA512 9845582e974bad914608f9fa24fe8bb980ce525e94ddac0a9238953e3902879c492aff9388f11727e400c7ccf6a1aa9f2030d58e7b268e44363b53c312a39ec3
@@ -7,9 +6,6 @@ AUX subversion-1.8.16-javadoc-nolint.patch 688 BLAKE2B 08f59a5f86c3465ab839b2e4d
 AUX svnserve.confd 322 BLAKE2B 53eb3105691af05e4dde3451569f46621ed78a1ea7e7650b0735b973c0b6c5ff3f7ca0086f9bc852e499b1b9af82f4ee305c8553e114df50e468e9d70fd4655f SHA512 c84d96dad0deb40a04963654c5d0874697f2b270751b3ec41bec64847d61d9e88e336e2ee5da438a527b9d8b8b24d7ddbeacdd4bd4ce02db3629fc0972e0c289
 AUX svnserve.initd3 575 BLAKE2B 4bc540dd8693c792fca8fd1061a49608ce7ee9a82d79fc43ab3f2f6eb6d1946dd8efb86e532df3576487ad9f49acdb3b9d95b804019d296fae0f757541957a95 SHA512 3efca4e5065cbe37f5137f3f67a0a654195e50ce0b00468f5edb1e5d476daa82422b1e833281d8edba111360b20d001a5991731e9f32bf3c88ffba75042e2b10
 AUX svnserve.xinetd 332 BLAKE2B 95af871ddd83c405cd4072a8bb6293376383d5437562aa604a5eff8e0f34c8763056bf1ea92b11be4f4d4ac5af3fa191b24d4c2040c3a41458103015e24bf09e SHA512 80b486507d03f430e189ef65901ed185f487651400bada5709f544954eb6175d20a11cf98893f80ec963e434c5db5642bf9d1603d698ad8bbf96b88fa45ddbae
-DIST subversion-1.10.0_rc1-patches-1.tar.xz 2984 BLAKE2B 7c9619b95ca6b433a58dc5baf3a1e1b14ef0017f714af81762b975d50a37b743788a4da65cf7f9eb8e633cbc813ad8dd974b530a19ec2d3fc74b75921f8f0c17 SHA512 aa7a25a253ea2da99520399d292d3e1602985392bae6dc5582003fdb9719d654638754b6e370b68b184ee6729ba3833bd511c09b2cb36f8f476b42063f55fbb2
-DIST subversion-1.14.2.tar.bz2 8606570 BLAKE2B cf15c61b932823fb18b52f83d84907386f068d2d40e14dbab94c42ad9d4c0fdf35d82db78036d7c1f2be47c2d51cdd27bfb966eb7607a52a21e072aeff76fb38 SHA512 20ada4688ca07d9fb8da4b7d53b5084568652a3b9418c65e688886bae950a16a3ff37710fcfc9c29ef14a89e75b2ceec4e9cf35d5876a7896ebc2b512cfb9ecc
 DIST subversion-1.14.3.tar.bz2 8569985 BLAKE2B bc366a611f77d7dc3a5dc6015ea50b8daae0cffc20f8830de04a7f310a26ab9e955db343e7902475079d31d7984cb6b03f7810e71feae9a5374e1cb690933b49 SHA512 40b172492005fd3b0cd9e457b4444af8ea5d8ff8fc161a9a0c6dc3a7314c6ad4ff75a4676f68a1919ae6273ae03e34d04eba8c1c37b8c0b4ec70d6731b527b41
-EBUILD subversion-1.14.2-r1.ebuild 12723 BLAKE2B 6a80c10bd649c5cd91fd7c6c708a83ddce823e4a8caa1f08dc816238b388104b1e9b8f7e3aa87c60feec9504508dacbbecf440971c2df1424fb2fa3a4e058ca6 SHA512 a544d2a2e657b118933f01029d58029fe33c47a4a82a64ac21c5ae0964ba8336c28776f17d61074adf56ca487fbe0d702b5c0a05b64d88394bd5db3531111fa0
 EBUILD subversion-1.14.3.ebuild 12723 BLAKE2B 268081fcdaf22e3d3396ee6e0888dddcac5a9a0f014289083af123f59dddba57dde70f454acd6327d7d6177d4b7f6a68313e9d88deb1d3e188f0b28a66cb2591 SHA512 d01afca9083e28210a1300fbbc4b6466c07df24deb05b20a16be67eae7fbe48ee14032464cc79578a23c03971d30b27bbabd3273ad548b860298e3efcf80126b
 MISC metadata.xml 819 BLAKE2B 1c4a8bd42cc1030719952aac2c72c40f175a22bd6eaf7e4d40638833d7a2d4c39f9da8a04bb57e1a6bcf99ade22fe7208e218f8f50d75501d835092d5ef4c105 SHA512 830789bd4225a2c5565466d8857c0cc184071962572e466bd8918ecd12b986d0017c2d6016d7d70d9a6dbbe15abce8497a2a31a5dd5e3feea5695533c417b11e
diff --git a/dev-vcs/subversion/files/subversion-1.14.2-python3.11.patch b/dev-vcs/subversion/files/subversion-1.14.2-python3.11.patch
deleted file mode 100644
index 37a3a87735f3..000000000000
--- a/dev-vcs/subversion/files/subversion-1.14.2-python3.11.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-https://src.fedoraproject.org/rpms/subversion/raw/rawhide/f/subversion-1.14.1-python-3.11-build.patch
-
-Use read_file instead of deprecated readfp  - removed in Python 3.11
-
---- a/build/generator/gen_base.py
-+++ b/build/generator/gen_base.py
-@@ -76,7 +76,7 @@
- 
-     # Now read and parse build.conf
-     parser = configparser.ConfigParser()
--    parser.readfp(open(fname))
-+    parser.read_file(open(fname))
- 
-     self.conf = build_path(os.path.abspath(fname))
- 
-
diff --git a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild b/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
deleted file mode 100644
index a1d70d8cc1ac..000000000000
--- a/dev-vcs/subversion/subversion-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,438 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-PYTHON_COMPAT=( python3_{9..11} )
-# ruby32 needs https://github.com/apache/subversion/commit/36e916ddaec4a5b1e64adee34337582f152805c5
-USE_RUBY="ruby27 ruby30 ruby31"
-
-inherit autotools bash-completion-r1 db-use depend.apache flag-o-matic java-pkg-opt-2 libtool multilib perl-module prefix python-any-r1 ruby-single xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
-	https://dev.gentoo.org/~polynomial-c/${PN}-1.10.0_rc1-patches-1.tar.xz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0 BSD MIT BSD-2 FSFAP unicode"
-SLOT="0"
-if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-fi
-IUSE="apache2 berkdb debug doc extras keyring java kwallet nls perl plaintext-password-storage ruby sasl test"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	app-arch/bzip2
-	app-arch/lz4
-	>=dev-db/sqlite-3.7.12
-	>=dev-libs/apr-1.5:1
-	>=dev-libs/apr-util-1.5:1
-	dev-libs/expat
-	dev-libs/libutf8proc:=
-	>=net-libs/serf-1.3.4
-	sys-apps/file
-	sys-libs/zlib
-	berkdb? ( >=sys-libs/db-4.0.14:= )
-	keyring? (
-		dev-libs/glib:2
-		app-crypt/libsecret
-		sys-apps/dbus
-	)
-	kwallet? (
-		dev-qt/qtcore:5
-		dev-qt/qtdbus:5
-		dev-qt/qtgui:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kwallet:5
-		sys-apps/dbus
-	)
-	perl? ( dev-lang/perl:= )
-	ruby? ( ${RUBY_DEPS} )
-	sasl? ( dev-libs/cyrus-sasl )
-"
-RDEPEND="${COMMON_DEPEND}
-	apache2? (
-		acct-group/apache
-		acct-user/apache
-		www-servers/apache[apache2_modules_dav]
-	)
-	!apache2? (
-		acct-group/svnusers
-		acct-user/svn
-	)
-	java? ( >=virtual/jre-1.8:* )
-	nls? ( virtual/libintl )
-	perl? ( dev-perl/URI )
-"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-text/doxygen )
-	nls? ( sys-devel/gettext )
-	perl? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	test? ( ${PYTHON_DEPS} )
-"
-
-want_apache
-
-pkg_setup() {
-	if use berkdb ; then
-		local apu_bdb_version="$("${EPREFIX}"/usr/bin/apu-1-config --includes \
-			| grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
-			| sed 's:.*b::')"
-		einfo
-		if [[ -z "${SVN_BDB_VERSION}" ]] ; then
-			if [[ -n "${apu_bdb_version}" ]] ; then
-				SVN_BDB_VERSION="${apu_bdb_version}"
-				einfo "Matching db version to apr-util"
-			else
-				SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
-				einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
-			fi
-		fi
-		einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
-		einfo
-
-		if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
-			eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
-			eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
-			eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
-			eerror "Aborting to avoid possible run-time crashes."
-			die "Berkeley DB version mismatch"
-		fi
-	fi
-
-	depend.apache_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-
-	# https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
-	append-cppflags -P
-
-	if use debug ; then
-		append-cppflags -DSVN_DEBUG -DAP_DEBUG
-	fi
-
-	# http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
-	[[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
-	# Allow for custom repository locations.
-	SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
-	if use ruby ; then
-		local rbslot
-		RB_VER=""
-		for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
-			# No break here as we want to pick the best (latest)
-			if has_version "dev-lang/ruby:${rbslot}" && has_version "virtual/rubygems[ruby_targets_ruby${rbslot/.}(-)]" ; then
-				RB_VER="${rbslot/.}"
-			fi
-		done
-		[[ -z "${RB_VER}" ]] && die "No usable ruby version found"
-	fi
-}
-
-src_prepare() {
-	# https://bugs.gentoo.org/721300
-	rm "${WORKDIR}"/patches/subversion-1.10.0_rc1-utf8proc_include.patch || die
-
-	eapply "${WORKDIR}/patches"
-
-	eapply "${FILESDIR}"/subversion-1.14.2-python3.11.patch
-	eapply_user
-
-	chmod +x build/transform_libtool_scripts.sh || die
-
-	sed -i \
-		-e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
-		-e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
-	# this bites us in particular on Solaris
-	sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
-		die "/bin/sh is not POSIX shell!"
-
-	hprefixify build/ac-macros/svn-macros.m4
-
-	eautoconf
-	elibtoolize
-
-	sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
-		-i build-outputs.mk || die "sed failed"
-
-	xdg_environment_reset
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		$(use_with apache2 apache-libexecdir)
-		$(use_with apache2 apxs "${EPREFIX}"/usr/bin/apxs)
-		$(use_with berkdb berkeley-db "db.h:${EPREFIX}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
-		--without-ctypesgen
-		--disable-runtime-module-search
-		$(use_with keyring gnome-keyring)
-		$(use_enable java javahl)
-		$(use_with java jdk "${JAVA_HOME}")
-		$(use_enable nls)
-		$(use_enable plaintext-password-storage)
-		$(use_with sasl)
-		--with-serf
-		--with-apr="${EPREFIX}/usr/bin/apr-1-config"
-		--with-apr-util="${EPREFIX}/usr/bin/apu-1-config"
-		--disable-experimental-libtool
-		--without-jikes
-		--disable-mod-activation
-		--disable-static
-		--enable-svnxx
-	)
-
-	if use kwallet ; then
-		myconf+=( "--with-kwallet=/usr/include/:/usr/$(get_libdir)/" )
-	else
-		myconf+=( --without-kwallet )
-	fi
-
-	if use perl || use ruby; then
-		myconf+=( --with-swig )
-	else
-		myconf+=( --without-swig )
-	fi
-
-	if use java ; then
-		myconf+=( --without-junit )
-	fi
-
-	case ${CHOST} in
-		*-solaris*)
-			# need -lintl to link
-			use nls && append-libs intl
-			# this breaks installation, on x64 echo replacement is 32-bits
-			myconf+=( --disable-local-library-preloading )
-		;;
-		*)
-			# inject LD_PRELOAD entries for easy in-tree development
-			myconf+=( --enable-local-library-preloading )
-		;;
-	esac
-
-	#version 1.7.7 again tries to link against the older installed version and fails, when trying to
-	#compile for x86 on amd64, so workaround this issue again
-	#check newer versions, if this is still/again needed
-	#myconf+=( --disable-disallowing-of-undefined-references )
-
-	# for build-time scripts
-	if use test; then
-		python_setup
-	fi
-
-	# Remove when >=dev-libs/libutf8proc-2.5.0 is stable
-	# https://bugs.gentoo.org/721300
-	append-cppflags -I"${EPREFIX}"/usr/include/libutf8proc
-
-	# allow overriding Python include directory
-	ac_cv_path_RUBY=$(usex ruby "${EPREFIX}/usr/bin/ruby${RB_VER}" "none") \
-	ac_cv_path_RDOC=$(usex ruby "${EPREFIX}/usr/bin/rdoc${RB_VER}" "none") \
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	emake local-all
-
-	if use perl ; then
-		emake swig-pl
-	fi
-
-	if use ruby ; then
-		emake swig-rb
-	fi
-
-	if use java ; then
-		emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
-	fi
-
-	if use extras ; then
-		emake tools
-	fi
-
-	if use doc ; then
-		doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
-		if use java; then
-			emake doc-javahl
-		fi
-	fi
-}
-
-src_test() {
-	#if has_version ~${CATEGORY}/${P} ; then
-		default
-	#else
-	#	ewarn "The test suite shows errors when there is an older version of"
-	#	ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
-	#	ewarn "before running the test suite."
-	#	ewarn "Test suite skipped."
-	#fi
-	if [[ -f "${S}/fails.log" ]] ; then
-		echo "====== contents of fails.log follow ======"
-		cat "${S}/fails.log"
-		echo "====== contents of fails.log end    ======"
-	fi
-}
-
-src_install() {
-	emake -j1 DESTDIR="${D}" local-install
-
-	if use perl ; then
-		emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
-		perl_delete_localpod
-		find "${ED}" \( -name .packlist -o -name "*.bs" \) -delete || die
-	fi
-
-	if use ruby ; then
-		emake DESTDIR="${D}" install-swig-rb
-	fi
-
-	if use java ; then
-		emake DESTDIR="${D}" install-javahl
-		java-pkg_regso "${ED}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
-		java-pkg_dojar "${ED}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
-		rm -fr "${ED}"/usr/$(get_libdir)/svn-javahl/*.jar
-	fi
-
-	# Install Apache module configuration.
-	if use apache2 ; then
-		keepdir "${APACHE_MODULES_CONFDIR}"
-		insinto "${APACHE_MODULES_CONFDIR}"
-		doins "${FILESDIR}/47_mod_dav_svn.conf"
-	fi
-
-	# Install Bash Completion, bug 43179.
-	newbashcomp tools/client-side/bash_completion svn
-	bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
-	rm -f tools/client-side/bash_completion
-
-	# Install hot backup script, bug 54304.
-	newbin tools/backup/hot-backup.py svn-hot-backup
-	rm -fr tools/backup
-
-	# Install svnserve init-script and xinet.d snippet, bug 43245.
-	newinitd "${FILESDIR}"/svnserve.initd3 svnserve
-	newconfd "${FILESDIR}"/svnserve.confd svnserve
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/svnserve.xinetd svnserve
-
-	#adjust default user and group with disabled apache2 USE flag, bug 381385
-	if ! use apache2 ; then
-		sed -e "s\USER:-apache\USER:-svn\g" \
-			-e "s\GROUP:-apache\GROUP:-svnusers\g" \
-			-i "${ED}"/etc/init.d/svnserve || die
-		sed -e "0,/apache/s//svn/" \
-			-e "s:apache:svnusers:" \
-			-i "${ED}"/etc/xinetd.d/svnserve || die
-	fi
-
-	# Install documentation.
-	dodoc CHANGES COMMITTERS README
-	dodoc tools/xslt/svnindex.{css,xsl}
-	rm -fr tools/xslt
-
-	# Install extra files.
-	if use extras ; then
-		cat <<- EOF > 80subversion-extras
-			PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-			ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
-		EOF
-		doenvd 80subversion-extras
-
-		emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
-		find tools \( -name "*.bat" -o -name "*.in" -o -name ".libs" \) -print0 | xargs -0 rm -fr
-		rm -fr tools/client-side/svnmucc
-		rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
-		rm -fr tools/{buildbot,dev,diff,po}
-	fi
-
-	if use doc ; then
-		docinto html
-		dodoc -r doc/doxygen/html/*
-
-		if use java ; then
-			java-pkg_dojavadoc doc/javadoc
-		fi
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-
-	cd "${ED}"/usr/share/locale
-	for i in * ; do
-		if [[ ${i} != *${LINGUAS}* ]] ; then
-			rm -r ${i} || die
-		fi
-	done
-}
-
-pkg_preinst() {
-	# Compare versions of Berkeley DB, bug 122877.
-	if use berkdb && [[ -f "${EROOT}/usr/bin/svn" ]] ; then
-		OLD_BDB_VERSION="$(scanelf -nq "${EROOT}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		NEW_BDB_VERSION="$(scanelf -nq "${ED}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
-		if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
-			CHANGED_BDB_VERSION="1"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
-		ewarn "You upgraded from an older version of Berkeley DB and may experience"
-		ewarn "problems with your repository. Run the following commands as root to fix it:"
-		ewarn "    db4_recover -h ${SVN_REPOS_LOC}/repos"
-		ewarn "    chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
-	fi
-
-	ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
-	:
-}
-
-pkg_config() {
-	# Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
-	# already has EPREFIX in it
-	einfo "Initializing the database in ${SVN_REPOS_LOC}..."
-	if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
-		echo "A Subversion repository already exists and I will not overwrite it."
-		echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
-	else
-		mkdir -p "${SVN_REPOS_LOC}/conf"
-
-		einfo "Populating repository directory..."
-		# Create initial repository.
-		"${EROOT}/usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
-		einfo "Setting repository permissions..."
-		SVNSERVE_USER="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
-		SVNSERVE_GROUP="$(. "${EROOT}/etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
-		if use apache2 ; then
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
-		else
-			[[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
-			[[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
-		fi
-		chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
-		chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
-		chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} "${SVN_REPOS_LOC}/repos"
-	fi
-}
diff --git a/dev-vcs/tig/Manifest b/dev-vcs/tig/Manifest
index 726bcbc8b4a4..10988ebae536 100644
--- a/dev-vcs/tig/Manifest
+++ b/dev-vcs/tig/Manifest
@@ -1,6 +1,6 @@
 DIST tig-2.5.10.tar.gz 1183631 BLAKE2B a2d58e9a79bf7fdabf74704a04f2d0dee30e8fd348319786ab639119c0912c3dc632a143ef586b24f33841a040f1c06101cb52f3a8e8e8a7ee36cc175685fba9 SHA512 6b89a2edebfc58cd2f5e855bbd2137ba4e1be65e793c04a7a9858f3a32b31681f5a80f33e5c1d2d69104e4c37817d806a70ab9a1fc8807d5f49751d4f283d788
 DIST tig-2.5.8.tar.gz 1179844 BLAKE2B eff20358443bd794de2985e1c76db8be25f4461ac82182a72004ab380156c15c5ed27dc1c66fb347b1f3d1ccddcead0a031638762e48f7e88a3b0593a278d3d7 SHA512 f4e7648ae7c58e936251f69071a092617368a04eabb4ae6726b2de1dbd305c559b7235f7aa70868f4ada02611196593a6e1c241062f57cd05a9c98685385053e
-EBUILD tig-2.5.10.ebuild 1377 BLAKE2B 11c3907078b91a94842bd9ccf893e1dc0f84b167d3c4ec3c3b3d2cee22222d9ebdf5871b231b7fae9c4f65357c41f26cc14b72b9c542bbdced8d312f89998e49 SHA512 086dcd236b2df8182620a6b233caab0c5fc2a102f6edc322a53685d1940bc738d74c2f5562fa8502a713165a2885af89e1592f7ed2222b03766480c6d93346c8
+EBUILD tig-2.5.10.ebuild 1376 BLAKE2B a09fab59f03872ea2d2c76eabaeeed4e0f5a8f7ab4e7821e4975ec1d0ff4c75566971c4766178f63e0fd177c05d6d457a0551e869c21e9f0889a770f5db6edf0 SHA512 a5b0e9cf583b6899056f9282c542055f5d233beedb359f4b9a7b961deacf397840f8f9324328fb7875ef13f813e71cde8649a10847ba19fb0af9384174f0a903
 EBUILD tig-2.5.8.ebuild 1376 BLAKE2B bbf55b0a701c91b6f1e192b248df345698b7d259c432704c61b002fd788d0949d1868c2da2c1ceb5cd0f525afea591c3e81ee89298d79766dc61659585ea1cb4 SHA512 32d940fe0c9cb4fd1a7a658cb43a358407698c727efbef24c48c4dc2823051c1d013fcacd516d7ed53b838e6f67d864a775882dca9b671908427256f5df72ba6
 EBUILD tig-9999.ebuild 1381 BLAKE2B 59512a0a4d8c0180c20f357c21468139a7fb537cd5d7faf830dbf67bc1e19ae014c6f9ce34245e1598bf49485e66b7f2d0297ccac574102e309d81c50a90107c SHA512 8ba930f6bdb2c6eb1028bae34ab1d9b3886231c5da2e2029929f0f69bca2b7d3b916a91b167a03a85c0b98d6aa35911c3a16a0eeb0298a7c523c2765ae4d546f
 MISC metadata.xml 605 BLAKE2B 4a086eab67b7047f2bc56536c7bcefef1d7358c458e155d4f9c802ad99d9db2f022d35f56c00e2f11f4cf90477eb4132d5405ba4cc02e727948d71b20647f763 SHA512 e32ac8ae5159259675d4f34d961264a16d43c17bbf50d7800664733f76a6a3db4446e791fd5a02e10dacb58ba49ec2374238f38b9eb2a5d53b97b4664e5951fa
diff --git a/dev-vcs/tig/tig-2.5.10.ebuild b/dev-vcs/tig/tig-2.5.10.ebuild
index 52bd85953ab4..7647faf8c007 100644
--- a/dev-vcs/tig/tig-2.5.10.ebuild
+++ b/dev-vcs/tig/tig-2.5.10.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-r3 autotools
 else
 	SRC_URI="https://github.com/jonas/tig/releases/download/${P}/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 fi
 
 DESCRIPTION="text mode interface for git"