gentoo resync : 22.12.2021

3 files changed, 2 insertions, 190 deletions

diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 3417ff968f73..1929711bde4d 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -13,8 +13,6 @@ AUX heimdal_fix-db60.patch 443 BLAKE2B d89892570100dcc4a9b5bacd672cd28ce284ae9ad
 AUX heimdal_hcrypto.patch 1522 BLAKE2B 3a66fe288a7bede24a6aa124fde058d5ea891a4f829566b3bccfb1d0800d7f9f076c2958ec756821f2b5f2d4249a59d4c9bb320ffa07c3a0e14533a013dbebe6 SHA512 6427258ba47c28415cf2b02e483ab2b29670cc803a7581a4d0102be14f5a102fab478b7c2735436603e44fd6e2d34fa2bbcd0dfc7cf15eca575fe424356baf99
 AUX heimdal_tinfo.patch 711 BLAKE2B 730ef4b1ba79d80c7257d1bd04783584cf616b2e51d6028fe3160dfdc113b6243c7af8c116ff969de439ebb79bab9091f8e5d6e9037c2b48541e6cbc83ba1026 SHA512 b4c63c9e945b914009569e62fd53229032ffaecde11dc4d02a89d5ba65f2c28020d43af8f2c26d87e2b383ba6dd3c3f4c4b69529471bc1928b45a9b5c437958d
 AUX krb5.conf 424 BLAKE2B 49b8a0aab6e0dacb70b91e030bb5f2b8bdfe4253026f85e2c9d16bdf6f554c585572ed9d3835bed976c8953fc92d0f42270c6a0767e943ec5efa5b79f6f4cf89 SHA512 4dad6837344e30c6988355551b5b82bce748dad7aa7648204ba7852540ad3a546b5344926789d60e78d57ff20dff87b680b790dc8d86c8dec1008feb0d809e38
-DIST heimdal-7.6.0.tar.gz 10186832 BLAKE2B 456b495a3d0a196cf02d6042c6db72c772327545fbc84f7bb758f55f3fca025432bf319fc33e9e0b5fe5ca78b83aea9dc47d77bf1f5b69ae88f1286a22c41263 SHA512 3f7ce090cf8da91f19675a1d9f6bd65c83b3a847337739481506f09d74001cb44283b103ba684dac8a5f11ec48605b5476240c534f6fc36442fb874b73680200
 DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99
-EBUILD heimdal-7.6.0.ebuild 4456 BLAKE2B 13fd307b16c87b75fc0644961ca5fad184c986427b722f650493879a4b967f8bb1cb0a8d8cb105b5f2a70211d930dc1673237ca5da62efb800e50f525d42aeb4 SHA512 c4105dff213063a7c56555689f60b6fec0c91c3ad7aade2aa9e7ef56a13a8ae865ac5b8b3b3b0aa987830236bbed82762d33d912311c3f04b6fa4effd22c1431
-EBUILD heimdal-7.7.0-r2.ebuild 4541 BLAKE2B 82417b763b161c5f524ea4b0ee847300113bc385168085c817aefb84e302ead1f0b773e5778c914cc3c42eb88acb4bca10e44f84dd00a4ff4292063484310a7b SHA512 eddc717a91bf2196fadbedfd457906a366b6a8c757211c9113cdc7ca8b12b424ea9c8e9b309443adea56d91f59a43b461927fda96c20a1346b4d4da4c16bac8f
+EBUILD heimdal-7.7.0-r2.ebuild 4539 BLAKE2B 150b86ce036542b3825ec428fa6efd8391aeb1bd014cf6f39ce6d717d76a95ccf3a07ecbe984d6f1a3930509004ed56e820bd2eaeb2af6e2fc7bcfe1f3474f5d SHA512 f0a1d270cd568124676c5656e28bc16a2fb021cba09c99fc138a807b857de302b9a495642ead68d55e4a3cc2b21cc7af85c8bbd56e92344158b6c56f707d298b
 MISC metadata.xml 571 BLAKE2B 3e6c723e5f9823cb72741fb666a67c14c52a6b206624c4d5329b19921c8305c03c8f1e586ee087000ffd189c8d4ca84ab413c79d35d2aa039369e2e2064c2866 SHA512 35020bf848f8caa61ea7bb46bddd9acc28fdcd9a9bab2f0dfdb701a0689d20ad38a09c03c141d106234363ed805fea575b47c1e79fc0dbd950bb75ea4b294026
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
deleted file mode 100644
index 9a250d65624c..000000000000
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ /dev/null
@@ -1,186 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..8} )
-VIRTUALX_REQUIRED="manual"
-
-inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
-
-MY_P="${P}"
-DESCRIPTION="Kerberos 5 implementation from KTH"
-HOMEPAGE="http://www.h5l.org/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 +lmdb otp selinux ssl static-libs test X"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	ssl? (
-		>=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}]
-	)
-	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	gdbm? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	lmdb? ( dev-db/lmdb )
-	caps? ( sys-libs/libcap-ng )
-	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
-	>=sys-libs/e2fsprogs-libs-1.42.9[${MULTILIB_USEDEP}]
-	sys-libs/ncurses:0=
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	afs? ( net-fs/openafs )
-	hdb-ldap? ( >=net-nds/openldap-2.3.0 )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXau
-		x11-libs/libXt
-	)
-	!!app-crypt/mit-krb5
-	!!app-crypt/mit-krb5-appl"
-
-DEPEND="${CDEPEND}
-	${PYTHON_DEPS}
-	dev-perl/JSON
-	virtual/pkgconfig
-	sys-apps/texinfo
-	>=sys-devel/autoconf-2.62
-	test? ( X? ( ${VIRTUALX_DEPEND} ) )"
-
-RDEPEND="${CDEPEND}
-	selinux? ( sec-policy/selinux-kerberos )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/krb5-types.h
-	/usr/include/cms_asn1.h
-	/usr/include/digest_asn1.h
-	/usr/include/hdb_asn1.h
-	/usr/include/krb5_asn1.h
-	/usr/include/pkcs12_asn1.h
-	/usr/include/pkinit_asn1.h
-	/usr/include/rfc2459_asn1.h
-)
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/krb5-config
-)
-
-PATCHES=(
-	"${FILESDIR}/heimdal_disable-check-iprop.patch"
-	"${FILESDIR}/heimdal_tinfo.patch"
-	"${FILESDIR}/heimdal_hcrypto.patch"
-	"${FILESDIR}/heimdal_build-headers-before-use.patch"
-	"${FILESDIR}/heimdal_fix-db60.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# QA
-	append-flags -fno-strict-aliasing
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-kcm
-		--disable-osfc2
-		--enable-shared
-		--with-libintl="${EPREFIX}"/usr
-		--with-readline="${EPREFIX}"/usr
-		--with-sqlite3="${EPREFIX}"/usr
-		--libexecdir="${EPREFIX}"/usr/sbin
-		--enable-pthread-support
-		--enable-kx509
-		--enable-pk-init
-		$(use_enable afs afs-support)
-		$(use_enable gdbm ndbm-db)
-		$(use_enable lmdb mdb-db)
-		$(use_enable otp)
-		$(use_enable static-libs static)
-		$(multilib_native_use_with caps capng)
-		$(multilib_native_use_with hdb-ldap openldap "${EPREFIX}"/usr)
-		$(use_with ipv6)
-		$(use_with ssl openssl "${EPREFIX}"/usr)
-		$(multilib_native_use_with X x)
-	)
-	if use berkdb; then
-		myeconfargs+=(
-			--with-berkeley-db
-			--with-berkeley-db-include="$(db_includedir)"
-		)
-	else
-		myeconfargs+=(
-			--without-berkeley-db
-		)
-	fi
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		emake
-	else
-		emake -C include
-		emake -C lib
-		emake -C kdc
-		emake -C tools
-		emake -C tests/plugin
-	fi
-}
-
-multilib_src_test() {
-	multilib_is_native_abi && emake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		INSTALL_CATPAGES="no" emake DESTDIR="${D}" install
-	else
-		emake -C include DESTDIR="${D}" install
-		emake -C lib DESTDIR="${D}" install
-		emake -C kdc DESTDIR="${D}" install
-		emake -C tools DESTDIR="${D}" install
-		emake -C tests/plugin DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog* README NEWS TODO
-
-	# client rename
-	mv "${ED}"/usr/share/man/man1/{,k}su.1
-	mv "${ED}"/usr/bin/{,k}su
-
-	newinitd "${FILESDIR}"/heimdal-kdc.initd-r2 heimdal-kdc
-	newinitd "${FILESDIR}"/heimdal-kadmind.initd-r2 heimdal-kadmind
-	newinitd "${FILESDIR}"/heimdal-kpasswdd.initd-r2 heimdal-kpasswdd
-	newinitd "${FILESDIR}"/heimdal-kcm.initd-r1 heimdal-kcm
-
-	newconfd "${FILESDIR}"/heimdal-kdc.confd heimdal-kdc
-	newconfd "${FILESDIR}"/heimdal-kadmind.confd heimdal-kadmind
-	newconfd "${FILESDIR}"/heimdal-kpasswdd.confd heimdal-kpasswdd
-	newconfd "${FILESDIR}"/heimdal-kcm.confd heimdal-kcm
-
-	insinto /etc
-	newins "${S}"/krb5.conf krb5.conf.example
-
-	if use hdb-ldap; then
-		insinto /etc/openldap/schema
-		doins "${S}/lib/hdb/hdb.schema"
-	fi
-
-	if ! use static-libs ; then
-		find "${ED}" -name "*.la" -delete || die
-	fi
-
-	# default database dir
-	keepdir /var/heimdal
-}
diff --git a/app-crypt/heimdal/heimdal-7.7.0-r2.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r2.ebuild
index ed69823743dd..aef15e2c2985 100644
--- a/app-crypt/heimdal/heimdal-7.7.0-r2.ebuild
+++ b/app-crypt/heimdal/heimdal-7.7.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"