From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 222E8138334 for ; Mon, 7 Jan 2019 17:00:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8E0DFE0970; Mon, 7 Jan 2019 17:00:28 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4FBD0E0970 for ; Mon, 7 Jan 2019 17:00:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18CE6335CF4 for ; Mon, 7 Jan 2019 17:00:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7AF9550B for ; Mon, 7 Jan 2019 17:00:24 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1546880408.48a35f2796f49c0515c98be58fe1ecfde43f18ac.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/heimdal/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/heimdal/heimdal-7.5.0.ebuild X-VCS-Directories: app-crypt/heimdal/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 48a35f2796f49c0515c98be58fe1ecfde43f18ac X-VCS-Branch: master Date: Mon, 7 Jan 2019 17:00:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3e21f83b-5ff8-4f64-b407-2f9819b4a7dd X-Archives-Hash: 5a65e03d71c7ad87c3ff182812342d79 commit: 48a35f2796f49c0515c98be58fe1ecfde43f18ac Author: Lars Wendler gentoo org> AuthorDate: Mon Jan 7 15:36:35 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Mon Jan 7 17:00:08 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48a35f27 app-crypt/heimdal: Adjusted dependencies Slight ebuild improvements. Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> app-crypt/heimdal/heimdal-7.5.0.ebuild | 67 +++++++++++++++++----------------- 1 file changed, 33 insertions(+), 34 deletions(-) diff --git a/app-crypt/heimdal/heimdal-7.5.0.ebuild b/app-crypt/heimdal/heimdal-7.5.0.ebuild index e8a121962b7..17a6aa13e74 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