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

5 files changed, 2 insertions, 108 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 2a3e28d7c775..8887d7024b5f 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/cvs/Manifest b/dev-vcs/cvs/Manifest
index 52fc4a2d61ac..345e8f50d7ac 100644
--- a/dev-vcs/cvs/Manifest
+++ b/dev-vcs/cvs/Manifest
@@ -25,6 +25,5 @@ DIST cederqvist-1.12.12.html.tar.bz2 137581 BLAKE2B c3e7a7a3783fc122bffbf100abb8
 DIST cederqvist-1.12.12.pdf 1252423 BLAKE2B b7649c1165695776e914a3b287fd8883c512e9ab2efb1db995f2128d29b48674460bce0902067fabb5b81beaafae70c36e6c0a717d71f7c5b625b408327c4a54 SHA512 aa90b76664ca103cf41831a5595d5e99df9fd87633aa5a500569f43854ca6e409a26b655f02ed59cde1c37ce88c40e06f3b3376ad71fdc9487032c3f0898706a
 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 3170 BLAKE2B a6df2f0df01c5723f8589ccb5d6dd41852b58b2981c216d1d1cb47196b8d6ddd07e937bd6a9d09f1e118128f5836788f0714816413e10c600780262fcd924a61 SHA512 0f3aec793c41508bdecac43aca8200d644651f31ed70342298b6cc2166d187f6b677bd477dfb6f825a718f3f16c2653a0fce1596f9ba50bf80e0f9faffd1daaa
 MISC metadata.xml 313 BLAKE2B 146e5250368e0afe0a23c68dff542e20941a1b66cc0379d504cbceb707a3caaf2404181546ec8fa114ac815fc5cdca8cbe20b8e5e4ebbc79f4398112ff3f7389 SHA512 84c13776b7edc8c0a0ec81f093d272b6f28c09682f3a076d23e40c61bf9e1512401fff51a7e12b7103dd6128d0b6e158dbb71fd0fe68f624bc86f5ec86638675
diff --git a/dev-vcs/cvs/cvs-1.12.12-r14.ebuild b/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
deleted file mode 100644
index 77076cadd35e..000000000000
--- a/dev-vcs/cvs/cvs-1.12.12-r14.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam toolchain-funcs
-
-DESCRIPTION="Concurrent Versions System - source code revision control tools"
-HOMEPAGE="https://cvs.nongnu.org/"
-
-SRC_URI="mirror://gnu/non-gnu/cvs/source/feature/${PV}/${P}.tar.bz2
-	doc? ( mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.html.tar.bz2
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.pdf
-		mirror://gnu/non-gnu/cvs/source/feature/${PV}/cederqvist-${PV}.ps )"
-
-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"
-
-IUSE="crypt doc kerberos nls pam selinux server"
-RESTRICT="test"
-
-DEPEND="
-	>=sys-libs/zlib-1.1.4
-	kerberos? ( virtual/krb5 )
-	pam? ( sys-libs/pam )
-	server? ( virtual/libcrypt:= )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-cvs )
-"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack cederqvist-${PV}.html.tar.bz2
-}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-cvsbug-tmpfix.patch
-	"${FILESDIR}"/${P}-openat.patch
-	"${FILESDIR}"/${P}-block-requests.patch
-	"${FILESDIR}"/${P}-cvs-gnulib-vasnprintf.patch
-	"${FILESDIR}"/${P}-install-sh.patch
-	"${FILESDIR}"/${P}-hash-nameclash.patch # for AIX
-	"${FILESDIR}"/${P}-getdelim.patch # 314791
-	"${FILESDIR}"/${PN}-1.12.12-rcs2log-coreutils.patch # 144114
-	"${FILESDIR}"/${P}-mktime-x32.patch # 395641
-	"${FILESDIR}"/${P}-fix-massive-leak.patch
-	"${FILESDIR}"/${P}-mktime-configure.patch #220040 #570208
-	"${FILESDIR}"/${P}-CVE-2012-0804.patch
-	"${FILESDIR}"/${P}-format-security.patch
-	"${FILESDIR}"/${P}-musl.patch
-	"${FILESDIR}"/${P}-CVE-2017-12836-commandinjection.patch
-	)
-DOCS=( BUGS ChangeLog{,.zoo} DEVEL-CVS FAQ HACKING MINOR-BUGS NEWS \
-	PROJECTS README TESTS TODO )
-
-src_prepare() {
-	export CONFIG_SHELL=${BASH}  # configure fails without
-	default
-	sed -i "/^AR/s:ar:$(tc-getAR):" diff/Makefile.in lib/Makefile.in || die
-}
-
-src_configure() {
-	if tc-is-cross-compiler ; then
-		# Sane defaults when cross-compiling (as these tests want to
-		# try and execute code).
-		export cvs_cv_func_printf_ptr="yes"
-	fi
-	econf \
-		--with-external-zlib \
-		--with-tmpdir="${EPREFIX}"/tmp \
-		$(use_enable crypt encryption) \
-		$(use_with kerberos gssapi) \
-		$(use_enable nls) \
-		$(use_enable pam) \
-		$(use_enable server)
-}
-
-src_install() {
-	# Not installed into emacs site-lisp because it clobbers the normal C
-	# indentations.
-	DOCS+=( cvs-format.el )
-
-	if use doc; then
-		DOCS+=( "${DISTDIR}"/cederqvist-${PV}.{pdf,ps} )
-		HTML_DOCS=( ../cederqvist-${PV}.html/. )
-	fi
-
-	default
-
-	use doc && dosym cvs.html /usr/share/doc/${PF}/html/index.html
-
-	if use server; then
-		newdoc "${FILESDIR}"/cvs-1.12.12-cvs-custom.c cvs-custom.c
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/cvspserver.xinetd.d cvspserver
-		newenvd "${FILESDIR}"/01-cvs-env.d 01cvs
-	fi
-
-	if use pam; then
-		newpamd "${FILESDIR}"/cvs.pam-include-1.12.12 cvs
-	fi
-}
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index d66fa1711477..949be708db10 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -21,7 +21,7 @@ DIST git-manpages-2.45.2.tar.xz 576428 BLAKE2B c89ebd25c0caf391fcd29cc8609252daf
 DIST git-manpages-2.46.2.tar.xz 584812 BLAKE2B dd5592a1fd61b6eda0afa4f9292ce86dd14bca6a88016f96c53617f6505f27cc9a2ba9437c6330bb8003b3f57cd1e75bf441bf2a2168554bbda9c26db37db4cb SHA512 ce7a2a1fbb9376182b8ce3ed772fbeeef2cf338bc06bf9bcf3c07a65419e41b3754d6851a44886d0b07dfd82f8eefe7b8b1d9f5c28ed6b6a0ea4168ed457e121
 DIST git-manpages-2.47.0.tar.xz 586352 BLAKE2B 87a1de077672e3246df26d2603221bcd06ed1844bf43a092afb630335a7da62866f497144b97106aec8565fd847010aa20e64ee24a87fc05d3e24884047e9a89 SHA512 898bf91b88910a8046fc4eefc1bfb98910d38db28846e4e04c44664f34723e406566622fd443ff332556545ca90c6519557389b75f159bbaf07044ab0cc83ac5
 EBUILD git-2.44.2.ebuild 16300 BLAKE2B 39fc9cdc25a8e9ff53081c6992c53889d9023ba83759c4765547ef3e60302eedc4737b72850fc671a1de10275a6863ec695c194710c5306623d1cc19018e8f92 SHA512 7d1bcbe7f005296e8ef09ba34e8ada5aa6e1c1b6857ddcb75905a17514e43d9110f44569f06be38fae129e2c6dccbdcf7a2c715a14be2f7066be03ddf504e426
-EBUILD git-2.45.2.ebuild 16449 BLAKE2B 7c58e9577bdbaf810ab71ca66780d7986a925861c3ba806ed7ac2b9cefefa0a84824d4ddcf7d416ca488d79de52857f0218d975409fb8c6aa573cc102622d84f SHA512 e61ae24fe564861988fd77680e850e2821148cfaa67d950df231a7e12a92eab3da483360d786bfbe220fb6f69a94c607ac3b18014dfb2a8a69e6826145dd194e
+EBUILD git-2.45.2.ebuild 16448 BLAKE2B eecc66b8793b6a99e40c28fea1ef68bbb25902981bf18a09d7e8f2e6c00a27133b3fc2318f9460acba64d341cf6ad8970d2e855e6c4baffc982ec8830db8d2f8 SHA512 47dd7ec8dbd7256bfcdcb810abd6d47aababde17e68343cf5941dd529232ca0ecd321c2d1aa23f17ce8bd501203d39ddfa1bf3e4bb63c84f9c06e5c76fff5179
 EBUILD git-2.46.2.ebuild 16800 BLAKE2B 6c37df1d123aae231ecbcf4c5bb93364c78f89c1a10d81a5954da536c8148c28696ad1d43d5cce04743eadc9cd1045e3acfccc11bd4f7acb97289395199c9dee SHA512 89d20136a0f0d4d10b5a2a8eef067d631b708a7abdd887992d7553a2a5296abfa666c5be5499d19b02c94412a40aaa671b8c4bfc7b63b178a5e85867867877be
 EBUILD git-2.47.0-r1.ebuild 16875 BLAKE2B 3817b654109151cb5d26cdb32c2aeff737f1228eb1e7ed16fb634c9be7303c63eddb51d289890c1c5d22615de958c5d0587e60f1a7a9ff9fd70f81b20cc97ec0 SHA512 07d09f3ef78c5d9139cf228de08437cb58ab1f61de4906358460baca29bade074ee8f74714ba1b9495e4d8f95aec9a47eefd49498417c667b9430f58a4fb05e1
 EBUILD git-2.47.0.ebuild 16800 BLAKE2B 6c37df1d123aae231ecbcf4c5bb93364c78f89c1a10d81a5954da536c8148c28696ad1d43d5cce04743eadc9cd1045e3acfccc11bd4f7acb97289395199c9dee SHA512 89d20136a0f0d4d10b5a2a8eef067d631b708a7abdd887992d7553a2a5296abfa666c5be5499d19b02c94412a40aaa671b8c4bfc7b63b178a5e85867867877be
diff --git a/dev-vcs/git/git-2.45.2.ebuild b/dev-vcs/git/git-2.45.2.ebuild
index 923073195df5..08be9a550099 100644
--- a/dev-vcs/git/git-2.45.2.ebuild
+++ b/dev-vcs/git/git-2.45.2.ebuild
@@ -50,7 +50,7 @@ if [[ ${PV} != *9999 ]]; then
 	SRC_URI+=" doc? ( ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )"
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
 	fi
 fi