commit: daa2d5a00ef05ee38ce089bb56cb658500b250e0 Author: Eray Aslan <eras <AT> gentoo <DOT> org> AuthorDate: Mon Nov 28 11:49:02 2022 +0000 Commit: Eray Aslan <eras <AT> gentoo <DOT> org> CommitDate: Mon Nov 28 11:49:02 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daa2d5a0
app-crypt/heimdal: drop 7.7.0-r5 Bug: https://bugs.gentoo.org/881429 Signed-off-by: Eray Aslan <eras <AT> gentoo.org> app-crypt/heimdal/Manifest | 1 - .../heimdal/files/heimdal_fix-autoconf-2.70.patch | 29 ---- app-crypt/heimdal/heimdal-7.7.0-r5.ebuild | 188 --------------------- 3 files changed, 218 deletions(-) diff --git a/app-crypt/heimdal/Manifest b/app-crypt/heimdal/Manifest index 7394a567ab21..cd10e37e09e4 100644 --- a/app-crypt/heimdal/Manifest +++ b/app-crypt/heimdal/Manifest @@ -1,2 +1 @@ -DIST heimdal-7.7.0.tar.gz 10189293 BLAKE2B db9cdd1861dc9214a7f76b3d8b9656cfc0bad11cb6eadffa4fa29ea7f9aabd4c3d1b628c510644ec9abe1b3bf27a413ccf8cd590d602c4a4ac54ba3deb4cedc4 SHA512 6660939b5a36ce36310721a08a089fb671d1e3d2e8ac74ea4775bfa5f8f772d32de805551456200fe96cc486c092c44beb84f5dd877008bc305490ee971bbf99 DIST heimdal-7.7.1.tar.gz 10009851 BLAKE2B 2d2b6cef4aea1dfab97106cc6be5f3f68736c93f153b650ba349ee32be2a415de8a550c462c6d0978628ac18403838145198e07b4710ebe21570878e2b44f595 SHA512 c77def1d32301caa8675297152a534919459a65bd1c5353cdc8795c07aa7a94fd319b697b98e02233ef25eaeedb36420edd139c1e22d68d54bb991343a11a369 diff --git a/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch b/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch deleted file mode 100644 index 0dcc31026203..000000000000 --- a/app-crypt/heimdal/files/heimdal_fix-autoconf-2.70.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 22352b90e78e2d162b98b5ef6c84672c397be40a Mon Sep 17 00:00:00 2001 -From: Lars Wendler <[email protected]> -Date: Wed, 17 Mar 2021 17:49:18 +0100 -Subject: [PATCH] autoconf-2.70 fix - -autoconf-2.70 and newer are more strict with quoting etc. and thus generate -a broken configure file: - - configure: 20855: Syntax error: ")" unexpected (expecting "fi") - -Gentoo-bug: https://bugs.gentoo.org/776241 -Signed-off-by: Lars Wendler <[email protected]> ---- - cf/check-var.m4 | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cf/check-var.m4 b/cf/check-var.m4 -index 2fd7bca6f0..71d6f70ca8 100644 ---- a/cf/check-var.m4 -+++ b/cf/check-var.m4 -@@ -20,7 +20,7 @@ AC_MSG_RESULT($ac_foo) - if test "$ac_foo" = yes; then - AC_DEFINE_UNQUOTED(AS_TR_CPP(HAVE_[]$1), 1, - [Define if you have the `]$1[' variable.]) -- m4_ifval([$2], AC_CHECK_DECLS([$1],[],[],[$2])) -+ m4_ifval([$2], [AC_CHECK_DECLS([$1],[],[],[$2])]) - fi - ]) - diff --git a/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild b/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild deleted file mode 100644 index 447430e284ee..000000000000 --- a/app-crypt/heimdal/heimdal-7.7.0-r5.ebuild +++ /dev/null @@ -1,188 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{8..10} ) -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="https://www.heimdal.software/"; -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" -IUSE="afs +berkdb caps gdbm hdb-ldap +lmdb otp selinux ssl static-libs test X" -RESTRICT="!test? ( test )" - -CDEPEND=" - virtual/libcrypt:=[${MULTILIB_USEDEP}] - 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-fs/e2fsprogs-1.46.4-r51[${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" - "${FILESDIR}/heimdal_fix-autoconf-2.70.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 - --with-ipv6 - $(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 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 -}
