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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 92744158041 for ; Sun, 3 Mar 2024 04:01:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2F02AE2A03; Sun, 3 Mar 2024 04:01:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0BCF2E2A03 for ; Sun, 3 Mar 2024 04:01:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BE1C734302F for ; Sun, 3 Mar 2024 04:00:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 226E314A2 for ; Sun, 3 Mar 2024 04:00:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1709438412.6b40ef2dd17e0da9dbced4cf29f788fc2537f6dc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/keyutils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/keyutils/keyutils-1.6.3.ebuild X-VCS-Directories: sys-apps/keyutils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 6b40ef2dd17e0da9dbced4cf29f788fc2537f6dc X-VCS-Branch: master Date: Sun, 3 Mar 2024 04:00:58 +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: d5b65b52-efc5-48d9-bee1-d03c0520bf27 X-Archives-Hash: 8e2d6ebb47ad9c4fae18ef8a72aaf26a commit: 6b40ef2dd17e0da9dbced4cf29f788fc2537f6dc Author: Eli Schwartz gmail com> AuthorDate: Sun Mar 3 01:39:36 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Mar 3 04:00:12 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b40ef2d sys-apps/keyutils: drop 1.6.3 Old ebuild uses usr-ldscript Signed-off-by: Eli Schwartz gmail.com> Signed-off-by: Sam James gentoo.org> sys-apps/keyutils/keyutils-1.6.3.ebuild | 116 -------------------------------- 1 file changed, 116 deletions(-) diff --git a/sys-apps/keyutils/keyutils-1.6.3.ebuild b/sys-apps/keyutils/keyutils-1.6.3.ebuild deleted file mode 100644 index 05c7d9bde8b6..000000000000 --- a/sys-apps/keyutils/keyutils-1.6.3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs linux-info multilib-minimal usr-ldscript - -DESCRIPTION="Linux Key Management Utilities" -HOMEPAGE="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git" -SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/keyutils.git/snapshot/${P}.tar.gz" - -LICENSE="GPL-2 LGPL-2.1" -SLOT="0/1.9" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" -IUSE="static static-libs test" -RESTRICT="!test? ( test )" - -RDEPEND="" -DEPEND="!prefix? ( >=sys-kernel/linux-headers-2.6.11 )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.6-makefile-fixup.patch - "${FILESDIR}"/${PN}-1.5.10-disable-tests.patch #519062 #522050 - "${FILESDIR}"/${PN}-1.5.9-header-extern-c.patch - "${FILESDIR}"/${PN}-1.6.3-fix-rpmspec-check.patch -) - -pkg_setup() { - # To prevent a failure in test phase and false positive bug reports - # we are enforcing the following options because testsuite expects - # that these options are available. I.e. testsuite only decides based - # on kernel version which tests will be called, no feature checking. - if use test ; then - CONFIG_CHECK="KEYS" - ERROR_KEYS="You must have CONFIG_KEYS to run the package testsuite!" - - if kernel_is -ge 2 6 10 && kernel_is -lt 4 0 0 ; then - CONFIG_CHECK="${CONFIG_CHECK} KEYS_DEBUG_PROC_KEYS" - ERROR_KEYS_DEBUG_PROC_KEYS="You must have CONFIG_KEYS_DEBUG_PROC_KEYS to run the package testsuite!" - fi - - if kernel_is -ge 4 7 ; then - CONFIG_CHECK="${CONFIG_CHECK} KEY_DH_OPERATIONS" - ERROR_KEY_DH_OPERATIONS="You must have CONFIG_KEY_DH_OPERATIONS to run the package testsuite!" - fi - else - CONFIG_CHECK="~KEYS" - ERROR_KEYS="You will be unable to use this package on this system because CONFIG_KEYS is not set!" - - if kernel_is -ge 4 7 ; then - CONFIG_CHECK="${CONFIG_CHECK} ~KEY_DH_OPERATIONS" - ERROR_KEY_DH_OPERATIONS="You will be unable to use Diffie-Hellman on this system because CONFIG_KEY_DH_OPERATIONS is not set!" - fi - fi - - linux-info_pkg_setup -} - -src_prepare() { - default - - # The lsb check is useless, so avoid spurious command not found messages. - sed -i -e 's,lsb_release,:,' tests/prepare.inc.sh || die - # Some tests call the kernel which calls userspace, but that will - # run the install keyutils rather than the locally compiled one, - # so disable round trip tests. - rm -rf tests/keyctl/requesting/{bad-args,piped,valid} - - multilib_copy_sources -} - -multilib_src_compile() { - tc-export AR CC CXX - sed -i \ - -e "1iRPATH = $(usex static -static '')" \ - -e '/^C.*FLAGS/s|:=|+=|' \ - -e 's:-Werror::' \ - -e '/^BUILDFOR/s:=.*:=:' \ - -e "/^LIBDIR/s:=.*:= /usr/$(get_libdir):" \ - -e '/^USRLIBDIR/s:=.*:=$(LIBDIR):' \ - -e "s: /: ${EPREFIX}/:g" \ - -e '/^NO_ARLIB/d' \ - Makefile || die - - # We need the static lib in order to statically link programs. - if use static ; then - export NO_ARLIB=0 - # Hack the progs to depend on the static lib instead. - sed -i \ - -e '/^.*:.*[$](DEVELLIB)$/s:$(DEVELLIB):$(ARLIB) $(SONAME):' \ - Makefile || die - else - export NO_ARLIB=$(usex static-libs 0 1) - fi - emake -} - -multilib_src_test() { - # Execute the locally compiled code rather than the - # older versions already installed in the system. - LD_LIBRARY_PATH=${BUILD_DIR} \ - PATH="${BUILD_DIR}:${PATH}" \ - emake test -} - -multilib_src_install() { - # Possibly undo the setting for USE=static (see src_compile). - export NO_ARLIB=$(usex static-libs 0 1) - - default - use static || gen_usr_ldscript -a keyutils -} - -multilib_src_install_all() { - dodoc README -}