gentoo resync : 12.01.2019

2 files changed, 34 insertions, 35 deletions

diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest
index c0e6b1a26a62..a11039787848 100644
--- a/app-crypt/heimdal/Manifest
+++ b/app-crypt/heimdal/Manifest
@@ -10,5 +10,5 @@ AUX heimdal_disable-check-iprop.patch 577 BLAKE2B 1bb2be5bfd172988a00fc71c0429a0
 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
-EBUILD heimdal-7.5.0.ebuild 4261 BLAKE2B b258fa43c7cca2155233ee8d96e218e753a88ae0c6d484a11ea6d4d719de7f401db37d6148d259810193fcf7497415c04b650a80f3d18a2faea259ec9b7c9033 SHA512 e6df1f61693759c8be21bc4e01e231eef04591a2828ec430ba13c7f6951a8136600cfd765ede73f74562a28c8abaf41851d3c3e33d9a6d61bb98f421bc9004c4
+EBUILD heimdal-7.5.0.ebuild 4336 BLAKE2B 1700c9d750256878731b4235bf1c406fbd0d284fb380e86ed4f548de49f51d21a38c780053c66278cf50c8046d5ca0bd7c5266c59218ab2376d9a1bf0a030f4b SHA512 d74f45da083bab07c7b475a1b1fe31b33a9a07886ef86a90e1aab937c8d21006201ff25a5e5414e6c02aba9a94989bc52887979bc477839b94fec3744454cde5
 MISC metadata.xml 638 BLAKE2B f886a9862a4143b2c9f2a2e5af79c6ce72d23e883a2285f16ad22e61c8acc301f8a838b2fea65f42168edfda9a8652a420c01dc34482123d0ec6ccc6ef0a5ce9 SHA512 1fb671028d7d798c9a6e0be09e77b94a2d7f25598f6d9238f1b7897c9fcd68bed1d3fe84e84d98c1f276979cf782fedb13f1ea44ad876c4658ce1f142aecdf5f
diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild
index e8a121962b7d..17a6aa13e74d 100644
--- a/app-crypt/heimdal/heimdal-7.5.0.ebuild
+++ b/app-crypt/heimdal/heimdal-7.5.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
 VIRTUALX_REQUIRED="manual"
 
-inherit autotools db-use eutils multilib multilib-minimal python-any-r1 virtualx flag-o-matic
+inherit autotools db-use multilib multilib-minimal python-any-r1 virtualx flag-o-matic
 
 MY_P="${P}"
 DESCRIPTION="Kerberos 5 implementation from KTH"
@@ -19,11 +19,11 @@ IUSE="afs +berkdb caps hdb-ldap ipv6 libressl otp +pkinit selinux ssl static-lib
 
 CDEPEND="
 	ssl? (
-		!libressl? ( >=dev-libs/openssl-1.0.1h-r2[${MULTILIB_USEDEP}] )
-		libressl? ( dev-libs/libressl[${MULTILIB_USEDEP}] )
+		!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}] )
+	!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}]
@@ -66,8 +66,8 @@ MULTILIB_CHOST_TOOLS=(
 src_prepare() {
 	eapply "${FILESDIR}/heimdal_disable-check-iprop.patch"
 	eapply "${FILESDIR}/heimdal_tinfo.patch"
-	eautoreconf
 	eapply_user
+	eautoreconf
 }
 
 src_configure() {
@@ -78,39 +78,38 @@ src_configure() {
 }
 
 multilib_src_configure() {
-	local myconf=()
+	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
-		myconf+=(
+		myeconfargs+=(
 			--with-berkeley-db
 			--with-berkeley-db-include="$(db_includedir)"
 		)
 	else
-		myconf+=(
+		myeconfargs+=(
 			--without-berkeley-db
 		)
 	fi
 
-	ECONF_SOURCE=${S} \
-	econf \
-		--enable-kcm \
-		--disable-osfc2 \
-		--enable-shared \
-		--with-libintl=/usr \
-		--with-readline=/usr \
-		--with-sqlite3=/usr \
-		--libexecdir=/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 /usr) \
-		$(use_with ipv6) \
-		$(use_with ssl openssl /usr) \
-		$(multilib_native_use_with X x) \
-		"${myconf[@]}"
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
 }
 
 multilib_src_compile() {
@@ -145,8 +144,8 @@ multilib_src_install_all() {
 	dodoc ChangeLog* README NEWS TODO
 
 	# client rename
-	mv "${D}"/usr/share/man/man1/{,k}su.1
-	mv "${D}"/usr/bin/{,k}su
+	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
@@ -166,7 +165,7 @@ multilib_src_install_all() {
 		doins "${S}/lib/hdb/hdb.schema"
 	fi
 
-	prune_libtool_files
+	find "${ED}" -name "*.la" -delete || die
 
 	# default database dir
 	keepdir /var/heimdal