gentoo auto-resync : 21:11:2024 - 03:03:00

4 files changed, 2 insertions, 157 deletions

diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 1fa4655f6e3b..bc350ae6c9eb 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/mit-krb5/Manifest b/app-crypt/mit-krb5/Manifest
index ae331f962346..4914d68924f5 100644
--- a/app-crypt/mit-krb5/Manifest
+++ b/app-crypt/mit-krb5/Manifest
@@ -14,6 +14,5 @@ AUX mit-krb5kpropd.service 128 BLAKE2B 31d002c16987bd6fc42e22e64dd9bd1f9db36655d
 AUX mit-krb5kpropd.socket 122 BLAKE2B 2ce51e67b909c6955d9796f80f7985c9209af398ad2a60beebe83bd766d42261bd44c712df14608a1e5e922715780a6c4aa8ad294c34ba4e8fc336a24d038fd3 SHA512 4e7ae175425e0787a1d5ff959471a88bf5af4cd6e213dc6d4048902fab7547c1186a082370b523f9549f5096acfab1fb03b4839e42bd80dc539130ae4bb3ea55
 AUX mit-krb5kpropd_at.service 141 BLAKE2B 2f6741a55551e0f8673cd78480b7775f3e9a1fedda7af110d68f7577aa2711addc7ec8cbb20a5bc13c6bab560d6e7e854ce2ef9e81bbee487a700eec6f9be1c9 SHA512 7f21497a6045d2e0ad8f6f14c275bb895ce9317764e71c5290b0846688479ce9ba49e14ef73f6debda5f6ffe730b4da28a380717b09fe0d60d102ba44efcb170
 DIST krb5-1.21.3.tar.gz 9136145 BLAKE2B e909a55eaedab68e5c829bb7bbd26cec5db2d7b8d97f3b034de94d8f957003f16977ac619afee3b862f288e59f05c5e44f41e65b8883961c8b22a26e2f4733bc SHA512 87bc06607f4d95ff604169cea22180703a42d667af05f66f1569b8bd592670c42820b335e5c279e8b4f066d1e7da20f1948a1e4def7c5d295c170cbfc7f49c71
-EBUILD mit-krb5-1.21.3-r1.ebuild 4155 BLAKE2B f8a94b93abe154bbbbc90bd580fe0030ac533c747c722950290b3873a9a97dfd716b9d643a0b5d5d1c56d3d1cc374947f87eba4fe934d2dd52cdfd653202984b SHA512 9d87c36b34c9e4c8e7239d44246b7312a4b4c1cec3c1dac78759d14fa3fa3836fcdfd6910ad51814625b997ad081c918310b973806cdcd261bb3cdb125bcbbde
-EBUILD mit-krb5-1.21.3.ebuild 4096 BLAKE2B 5afca7eb76ae9d78e046205cd41d8aceef85674e6a2b68df9a067dd967c074ceb7c1a2157112efba8f74965719191a80d4db77747b577a5c82337e80c0445f36 SHA512 39b810b41aee11cb7034e5e0ea485c83df2b50a0749aa65881bd8db164b11cf54acd3ba83ca6a012c8f5fd0d632314aa4b00c111a036ad9ede7486b6a32555e9
+EBUILD mit-krb5-1.21.3.ebuild 4127 BLAKE2B 05e5ab1b91e15fee3c1e73b2fa5794f48bf8fad88a9ec2e71909c7fca501028a2ab4a6fa00045cad9c7cdcd4194fac6e148ea9e11f2365bd03da2074f36366c0 SHA512 3da55ef5f598c58b67ed690c5eea143272098926678e227ee18bc31ceac135f4d5573f70b6b97de694c795830e5e99141de37572a2fd5e0c4a38652812e38a1a
 MISC metadata.xml 886 BLAKE2B 4db2f2acb4740d9d8d4dea745ebe583e373ccf6c6e8b33206305ebadc971e3132d4f0811407755ab4d9053bf2993d763a59b9104169d90c776cc7e3fd20ea9b1 SHA512 783772b00fc4d6f1da7b074bab380ed7448af7e5bfb8ff1dcbb098ee8f5fc16ac441da300c455b016e09025c65754bf540dc27bdc13198d93740e0110d1f5dc2
diff --git a/app-crypt/mit-krb5/mit-krb5-1.21.3-r1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.3-r1.ebuild
deleted file mode 100644
index d4a9b8582d06..000000000000
--- a/app-crypt/mit-krb5/mit-krb5-1.21.3-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{11..13} )
-inherit autotools flag-o-matic python-any-r1 systemd toolchain-funcs multilib-minimal
-
-MY_P="${P/mit-}"
-P_DIR=$(ver_cut 1-2)
-DESCRIPTION="MIT Kerberos V"
-HOMEPAGE="https://web.mit.edu/kerberos/www/"
-SRC_URI="https://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}/src
-
-LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="cpu_flags_x86_aes doc +keyutils lmdb nls openldap +pkinit selinux test xinetd"
-
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	!!app-crypt/heimdal
-	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-	|| (
-		>=dev-libs/libverto-0.2.5[libev,${MULTILIB_USEDEP}]
-		>=dev-libs/libverto-0.2.5[libevent,${MULTILIB_USEDEP}]
-	)
-	keyutils? ( >=sys-apps/keyutils-1.5.8:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb:= )
-	nls? ( sys-devel/gettext[${MULTILIB_USEDEP}] )
-	openldap? ( >=net-nds/openldap-2.4.38-r1:=[${MULTILIB_USEDEP}] )
-	pkinit? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-	xinetd? ( sys-apps/xinetd )
-	"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=sys-fs/e2fsprogs-1.46.4-r51[${MULTILIB_USEDEP}]
-	app-alternatives/yacc
-	cpu_flags_x86_aes? (
-		amd64? ( dev-lang/yasm )
-		x86? ( dev-lang/yasm )
-	)
-	doc? ( virtual/latex-base )
-	test? ( dev-util/cmocka )
-	"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.12_warn_cflags.patch"
-	"${FILESDIR}/${PN}_dont_create_rundir.patch"
-	"${FILESDIR}/${PN}-1.18.2-krb5-config.patch"
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-src_prepare() {
-	default
-	# Make sure we always use the system copies.
-	rm -rf util/{et,ss,verto}
-	sed -i 's:^[[:space:]]*util/verto$::' configure.ac || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# lto-type-mismatch (bug #854225)
-	filter-lto
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	AR="$(tc-getAR)" \
-	WARN_CFLAGS="set" \
-	econf \
-		$(use_with openldap ldap) \
-		$(use_enable nls) \
-		$(use_enable pkinit) \
-		$(use_with lmdb) \
-		$(use_with keyutils) \
-		--without-hesiod \
-		--enable-shared \
-		--with-system-et \
-		--with-system-ss \
-		--enable-dns-for-realm \
-		--enable-kdc-lookaside-cache \
-		--with-system-verto \
-		--enable-thread-support \
-		--disable-rpath
-}
-
-multilib_src_compile() {
-	emake -j1
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	emake \
-		DESTDIR="${D}" \
-		EXAMPLEDIR="${EPREFIX}/usr/share/doc/${PF}/examples" \
-		install
-}
-
-multilib_src_install_all() {
-	# default database dir
-	keepdir /var/lib/krb5kdc
-
-	cd ..
-	dodoc README
-
-	newinitd "${FILESDIR}"/mit-krb5kadmind.initd-r2 mit-krb5kadmind
-	newinitd "${FILESDIR}"/mit-krb5kdc.initd-r2 mit-krb5kdc
-	newinitd "${FILESDIR}"/mit-krb5kpropd.initd-r2 mit-krb5kpropd
-	newconfd "${FILESDIR}"/mit-krb5kadmind.confd mit-krb5kadmind
-	newconfd "${FILESDIR}"/mit-krb5kdc.confd mit-krb5kdc
-	newconfd "${FILESDIR}"/mit-krb5kpropd.confd mit-krb5kpropd
-
-	systemd_newunit "${FILESDIR}"/mit-krb5kadmind.service mit-krb5kadmind.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kdc.service mit-krb5kdc.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.service mit-krb5kpropd.service
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd_at.service "mit-krb5kpropd@.service"
-	systemd_newunit "${FILESDIR}"/mit-krb5kpropd.socket mit-krb5kpropd.socket
-
-	insinto /etc
-	newins "${ED}/usr/share/doc/${PF}/examples/krb5.conf" krb5.conf.example
-	insinto /var/lib/krb5kdc
-	newins "${ED}/usr/share/doc/${PF}/examples/kdc.conf" kdc.conf.example
-
-	if use openldap ; then
-		dodoc "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.ldif"
-		dodoc "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.openldap.ldif"
-		insinto /etc/openldap/schema
-		doins "${S}/plugins/kdb/ldap/libkdb_ldap/kerberos.schema"
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}/kpropd.xinetd" kpropd
-	fi
-
-	if use doc; then
-		dodoc -r doc/html
-		docinto pdf
-		dodoc doc/pdf/*.pdf
-	fi
-}
diff --git a/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild b/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
index 7456a0e9e8c8..f78a3e493278 100644
--- a/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
+++ b/app-crypt/mit-krb5/mit-krb5-1.21.3.ebuild
@@ -37,6 +37,7 @@ DEPEND="
 BDEPEND="
 	${PYTHON_DEPS}
 	app-alternatives/yacc
+	>=sys-fs/e2fsprogs-1.46.4-r51
 	cpu_flags_x86_aes? (
 		amd64? ( dev-lang/yasm )
 		x86? ( dev-lang/yasm )