1 |
commit: bf5136f6795dec9e3e3066d9497214317730f988 |
2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 29 07:14:37 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 29 07:14:37 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bf5136f6 |
7 |
|
8 |
sys-apps/pcmciautils: update EAPI 6 -> 7 |
9 |
|
10 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
11 |
|
12 |
sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild | 31 +++++++++++++---------- |
13 |
1 file changed, 17 insertions(+), 14 deletions(-) |
14 |
|
15 |
diff --git a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild |
16 |
index e42d81c1d8d8..9d5b1a167818 100644 |
17 |
--- a/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild |
18 |
+++ b/sys-apps/pcmciautils/pcmciautils-018_p8-r3.ebuild |
19 |
@@ -1,7 +1,8 @@ |
20 |
# Copyright 1999-2021 Gentoo Authors |
21 |
# Distributed under the terms of the GNU General Public License v2 |
22 |
|
23 |
-EAPI=6 |
24 |
+EAPI=7 |
25 |
+ |
26 |
inherit flag-o-matic linux-info toolchain-funcs udev |
27 |
|
28 |
DEB_REV=${PV#*_p} |
29 |
@@ -11,6 +12,7 @@ DESCRIPTION="PCMCIA userspace utilities for Linux" |
30 |
HOMEPAGE="https://packages.qa.debian.org/pcmciautils" |
31 |
SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}.orig.tar.gz |
32 |
mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${MY_PV}-${DEB_REV}.debian.tar.gz" |
33 |
+S="${WORKDIR}"/${PN}-${MY_PV} |
34 |
|
35 |
LICENSE="GPL-2" |
36 |
SLOT="0" |
37 |
@@ -22,8 +24,6 @@ DEPEND="${RDEPEND} |
38 |
virtual/yacc |
39 |
sys-devel/flex" |
40 |
|
41 |
-S=${WORKDIR}/${PN}-${MY_PV} |
42 |
- |
43 |
PATCHES=( |
44 |
"${WORKDIR}"/debian/patches/no-modprobe-rules.patch |
45 |
"${WORKDIR}"/debian/patches/remove-libsysfs-dep.patch |
46 |
@@ -36,6 +36,19 @@ pkg_setup() { |
47 |
linux-info_pkg_setup |
48 |
|
49 |
kernel_is lt 2 6 32 && ewarn "${P} requires at least kernel 2.6.32." |
50 |
+} |
51 |
+ |
52 |
+src_prepare() { |
53 |
+ default |
54 |
+ |
55 |
+ sed -i \ |
56 |
+ -e '/CFLAGS/s:-fomit-frame-pointer::' \ |
57 |
+ -e '/dir/s:sbin:bin:g' \ |
58 |
+ Makefile || die |
59 |
+} |
60 |
+ |
61 |
+src_configure() { |
62 |
+ use debug && append-cppflags -DDEBUG |
63 |
|
64 |
mypcmciaopts=( |
65 |
STARTUP=$(usex staticsocket false true) |
66 |
@@ -51,17 +64,7 @@ pkg_setup() { |
67 |
STRIP=true |
68 |
RANLIB="$(tc-getRANLIB)" |
69 |
OPTIMIZATION="${CFLAGS} ${CPPFLAGS}" |
70 |
- ) |
71 |
- |
72 |
- use debug && append-cppflags -DDEBUG |
73 |
-} |
74 |
- |
75 |
-src_prepare() { |
76 |
- default |
77 |
- sed -i \ |
78 |
- -e '/CFLAGS/s:-fomit-frame-pointer::' \ |
79 |
- -e '/dir/s:sbin:bin:g' \ |
80 |
- Makefile || die |
81 |
+ ) |
82 |
} |
83 |
|
84 |
src_compile() { |