gentoo resync : 16.09.2020

4 files changed, 4 insertions, 183 deletions

diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index 0a67e81971f9..4a20ce4f40d2 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -12,10 +12,8 @@ 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.5.0.tar.gz 10071281 BLAKE2B 917f5855248c333e5ec35bf992973d8b5fb84581b9c3bc8d42c328e5f878ce24c5596c5a1e3fbca786a71be04984068efbb817f7336135056d1feae38895758f SHA512 6d1ad77e795df786680b5e68e2bfefee27bd0207eab507295d7af7053135de9c9ebb517d2c0235bc3a7d50945e18044515f0d76c0899b6b74aa839f1f3e5b131
 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.5.0.ebuild 4310 BLAKE2B 3a610d8f8a7630b88d005efa0064d47f012fdc9d9e8c6e9eb53dfd8fef464d08a7412cdc012128cc37d0f73ac68cba216c507e0ad47176f2a65ef679c2de74de SHA512 bf8ef7ff7b910d12935399eb1d58c939351d02461e25d1f262d7b6c4fc3ad247e16e5af6099d008e76e0f450d7bb71e32ad981461bf5ca03d3f538d19556b3bd
-EBUILD heimdal-7.6.0.ebuild 4516 BLAKE2B e35d12fd84b8096b5e9a0a04cba7a4744b4163107f79995950fbbea7f4468d7007eb7be4a467ec2f43a3ddcbb46e6a2a66cb57625b429c523e7697cce5e6331b SHA512 d902eda25291890b164dc3b011c227cb6443054886093c98b36aa57914ac196bfb8403ed43ab4c9d353527c35727d7dec1d0ff1fa57e9d8564a75fc988c80130
+EBUILD heimdal-7.6.0.ebuild 4515 BLAKE2B 2e703f6d2c54621ac5f630759ed7d58a2f37f2a27a0398bbdde4b18004c9036ff439a0c590324269577f0b62f171b5a11d4ccdab28990b8cabb39a178960725a SHA512 762ae8f768791a57a4896d60ab568a89ca27d7ea48e78ad8a2ff04f289cb1c9f283e735ca4c975db64037bc481e2aebbe8093a24fe000b3f8388ded882017b2c
 EBUILD heimdal-7.7.0-r1.ebuild 4514 BLAKE2B d68abb7b643f9fd4542b64f926d9ead25c451acd26787ae14aa3045226fec8995417bb9bd1a1a27e4da5e047e86c613b5673856e9110c545384612d48c8e794d SHA512 9ecb0137d1ac9e33448719f48a630c6b48499a02c5de1f8014d8e31ae7540f46ff3c15579b0126ae4583364a7caa2a2bd853ffc2c77e4b407aa2d04d12adc055
-MISC metadata.xml 722 BLAKE2B 9ec2bb074bf4932b0bb2f949eb3c33c8ed8b82305d6641a6954084120c658005cecc2cac57ad85a1df520f5bfd115deef57f80d874ba850d857a813b5a87c139 SHA512 5f3c28c222eb668e3c1d3b7fe24ae3622c82f94b6008a4c3458aa76afac9508d6e7f150de0f06e4845a5b0653ea04112fe0c2b421f199b5feb9ef771ab0b0b28
+MISC metadata.xml 570 BLAKE2B 827b4e549ff73259b932cc8587625fd9dcd73553d7bee3726baae0d1de8d8e8f8d67fdd649d605099301f426b88fc654341005976a3373d61482c81dec67db5b SHA512 069fa36a8f551ae0fdfd3a6f3dfd6cbfb3bf56c2ceba6ecd5184c4686d885ce5aa83622090f7fa1df44924a7ac3bf63fed4b9b19e70254d2a6d883d483500ad8
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
deleted file mode 100644
index 0710a88ee3d1..000000000000
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_6 )
-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 hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-libs test X"
-RESTRICT="!test? ( test )"
-
-CDEPEND="
-	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl:=[${MULTILIB_USEDEP}] )
-	)
-	berkdb? ( >=sys-libs/db-4.8.30-r1:*[${MULTILIB_USEDEP}] )
-	!berkdb? ( >=sys-libs/gdbm-1.10-r1:=[${MULTILIB_USEDEP}] )
-	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}
-	virtual/pkgconfig
-	>=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
-)
-
-src_prepare() {
-	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
-	eapply "${FILESDIR}/heimdal_tinfo.patch"
-	eapply_user
-	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
-		$(use_enable afs afs-support)
-		$(use_enable otp)
-		$(use_enable pkinit kx509)
-		$(use_enable pkinit pk-init)
-		$(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 -j1
-	else
-		emake -C include -j1
-		emake -C lib -j1
-		emake -C kdc -j1
-		emake -C tools -j1
-		emake -C tests/plugin -j1
-	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
-
-	find "${ED}" -name "*.la" -delete || die
-
-	# default database dir
-	keepdir /var/heimdal
-}
diff --git a/app-crypt/heimdal/heimdal-7.6.0.ebuild b/app-crypt/heimdal/heimdal-7.6.0.ebuild
index 36aee840b6d5..c29a63646f0a 100644
--- a/app-crypt/heimdal/heimdal-7.6.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.6.0.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 s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
 IUSE="afs +berkdb caps gdbm hdb-ldap ipv6 libressl +lmdb otp selinux ssl static-libs test X"
 RESTRICT="!test? ( test )"
 
diff --git a/app-crypt/heimdal/metadata.xml b/app-crypt/heimdal/metadata.xml
index c31b6673e508..bcfc3db66147 100644
--- a/app-crypt/heimdal/metadata.xml
+++ b/app-crypt/heimdal/metadata.xml
@@ -1,18 +1,14 @@
-<?xml version='1.0' encoding='UTF-8'?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="project">
 		<email>kerberos@gentoo.org</email>
 		<name>Kerberos</name>
 	</maintainer>
-	<longdescription>Kerberos 5 implementation from KTH</longdescription>
 	<use>
 		<flag name="otp">
 		Adds support for one-time passwords
 	</flag>
-		<flag name="pkinit">
-		Adds support for PKINIT for the initial ticket
-	</flag>
 		<flag name="hdb-ldap">
 		Adds support for LDAP as a database backend
 	</flag>