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 A70F4158086 for ; Wed, 29 Dec 2021 07:14:54 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D25172BC003; Wed, 29 Dec 2021 07:14:51 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id F19A42BC003 for ; Wed, 29 Dec 2021 07:14:50 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 02FA2342B98 for ; Wed, 29 Dec 2021 07:14:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BE582132 for ; Wed, 29 Dec 2021 07:14:46 +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: <1640762077.bf5136f6795dec9e3e3066d9497214317730f988.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcmciautils/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild X-VCS-Directories: sys-apps/pcmciautils/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: bf5136f6795dec9e3e3066d9497214317730f988 X-VCS-Branch: master Date: Wed, 29 Dec 2021 07:14:46 +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: b74646bd-2e69-4075-b08c-4655df1620d2 X-Archives-Hash: a1488bda4cee6f9d7d3910d93c501193 commit: bf5136f6795dec9e3e3066d9497214317730f988 Author: Sam James gentoo org> AuthorDate: Wed Dec 29 07:14:37 2021 +0000 Commit: Sam James gentoo org> CommitDate: Wed Dec 29 07:14:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5136f6 sys-apps/pcmciautils: update EAPI 6 -> 7 Signed-off-by: Sam James gentoo.org> sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild | 31 +++++++++++++---------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild index e42d81c1d8d8..9d5b1a167818 100644 --- a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild +++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild @@ -1,7 +1,8 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 + inherit flag-o-matic linux-info toolchain-funcs udev DEB_REV=${PV#*_p} @@ -11,6 +12,7 @@ DESCRIPTION="PCMCIA userspace utilities for Linux" HOMEPAGE="https://packages.qa.debian.org/pcmciautils" SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}-${DEB_REV}.debian.tar.gz" +S="${WORKDIR}"/${PN}-${MY_PV} LICENSE="GPL-2" SLOT="0" @@ -22,8 +24,6 @@ DEPEND="${RDEPEND} virtual/yacc sys-devel/flex" -S=${WORKDIR}/${PN}-${MY_PV} - PATCHES=( "${WORKDIR}"/debian/patches/no-modprobe-rules.patch "${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch @@ -36,6 +36,19 @@ pkg_setup() { linux-info_pkg_setup kernel_is lt 2 6 32 && ewarn "${P} requires at least kernel 2.6.32." +} + +src_prepare() { + default + + sed -i \ + -e '/CFLAGS/s:-fomit-frame-pointer::' \ + -e '/dir/s:sbin:bin:g' \ + Makefile || die +} + +src_configure() { + use debug && append-cppflags -DDEBUG mypcmciaopts=( STARTUP=$(usex staticsocket false true) @@ -51,17 +64,7 @@ pkg_setup() { STRIP=true RANLIB="$(tc-getRANLIB)" OPTIMIZATION="${CFLAGS} ${CPPFLAGS}" - ) - - use debug && append-cppflags -DDEBUG -} - -src_prepare() { - default - sed -i \ - -e '/CFLAGS/s:-fomit-frame-pointer::' \ - -e '/dir/s:sbin:bin:g' \ - Makefile || die + ) } src_compile() {