| 1 |
commit: 15e6766c1ccbe4e98c944111f03dcdac5da633fc |
| 2 |
Author: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Nov 5 18:12:53 2021 +0000 |
| 4 |
Commit: Jakov Smolić <jsmolic <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 6 20:32:51 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15e6766c |
| 7 |
|
| 8 |
sys-apps/apmd: Port to EAPI 8 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/725534 |
| 11 |
Closes: https://bugs.gentoo.org/819249 |
| 12 |
Signed-off-by: Jakov Smolić <jsmolic <AT> gentoo.org> |
| 13 |
|
| 14 |
....2.2_p14-r1.ebuild => apmd-3.2.2_p14-r2.ebuild} | 39 ++++++++++++++-------- |
| 15 |
1 file changed, 25 insertions(+), 14 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild b/sys-apps/apmd/apmd-3.2.2_p14-r2.ebuild |
| 18 |
similarity index 74% |
| 19 |
rename from sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild |
| 20 |
rename to sys-apps/apmd/apmd-3.2.2_p14-r2.ebuild |
| 21 |
index fefa3c983ce..669ba2f6a4f 100644 |
| 22 |
--- a/sys-apps/apmd/apmd-3.2.2_p14-r1.ebuild |
| 23 |
+++ b/sys-apps/apmd/apmd-3.2.2_p14-r2.ebuild |
| 24 |
@@ -1,40 +1,47 @@ |
| 25 |
# Copyright 1999-2021 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
-EAPI=5 |
| 29 |
-inherit epatch multilib toolchain-funcs |
| 30 |
+EAPI=8 |
| 31 |
|
| 32 |
-MY_PV=${PV%_p*} |
| 33 |
-MY_P=${PN}_${MY_PV} |
| 34 |
-PATCHV=${PV#*_p} |
| 35 |
+inherit toolchain-funcs |
| 36 |
+ |
| 37 |
+MY_PV="${PV%_p*}" |
| 38 |
+MY_P="${PN}_${MY_PV}" |
| 39 |
+PATCHV="${PV#*_p}" |
| 40 |
|
| 41 |
DESCRIPTION="Advanced Power Management Daemon" |
| 42 |
HOMEPAGE="https://packages.qa.debian.org/a/apmd.html" |
| 43 |
SRC_URI="mirror://debian/pool/main/a/apmd/${MY_P}.orig.tar.gz |
| 44 |
mirror://debian/pool/main/a/apmd/${MY_P}-${PATCHV}.diff.gz" |
| 45 |
+S="${WORKDIR}/${PN}-${MY_PV}.orig" |
| 46 |
|
| 47 |
LICENSE="GPL-2" |
| 48 |
SLOT="0" |
| 49 |
KEYWORDS="amd64 arm ppc ppc64 x86" |
| 50 |
IUSE="nls X" |
| 51 |
|
| 52 |
-RDEPEND=">=sys-apps/debianutils-1.16 |
| 53 |
+RDEPEND=" |
| 54 |
+ >=sys-apps/debianutils-1.16 |
| 55 |
>=sys-power/powermgmt-base-1.31 |
| 56 |
- X? ( x11-libs/libX11 |
| 57 |
+ X? ( |
| 58 |
+ x11-libs/libX11 |
| 59 |
x11-libs/libXaw |
| 60 |
x11-libs/libXmu |
| 61 |
x11-libs/libSM |
| 62 |
x11-libs/libICE |
| 63 |
x11-libs/libXt |
| 64 |
- x11-libs/libXext )" |
| 65 |
+ x11-libs/libXext |
| 66 |
+ )" |
| 67 |
DEPEND="${RDEPEND} |
| 68 |
- sys-devel/libtool |
| 69 |
virtual/os-headers" |
| 70 |
+BDEPEND="sys-devel/libtool" |
| 71 |
|
| 72 |
-S=${WORKDIR}/${PN}-${MY_PV}.orig |
| 73 |
+PATCHES=( |
| 74 |
+ "${WORKDIR}"/${MY_P}-${PATCHV}.diff |
| 75 |
+) |
| 76 |
|
| 77 |
src_prepare() { |
| 78 |
- epatch "${WORKDIR}"/${MY_P}-${PATCHV}.diff |
| 79 |
+ default |
| 80 |
|
| 81 |
if ! use X; then |
| 82 |
sed -i \ |
| 83 |
@@ -44,7 +51,7 @@ src_prepare() { |
| 84 |
fi |
| 85 |
|
| 86 |
# use system headers and skip on_ac_power |
| 87 |
- rm -f on_ac_power* |
| 88 |
+ rm on_ac_power* || die |
| 89 |
|
| 90 |
sed -i \ |
| 91 |
-e '/on_ac_power/d' \ |
| 92 |
@@ -54,7 +61,7 @@ src_prepare() { |
| 93 |
} |
| 94 |
|
| 95 |
src_compile() { |
| 96 |
- emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" |
| 97 |
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" |
| 98 |
} |
| 99 |
|
| 100 |
src_install() { |
| 101 |
@@ -74,5 +81,9 @@ src_install() { |
| 102 |
newconfd "${FILESDIR}"/apmd.confd apmd |
| 103 |
newinitd "${FILESDIR}"/apmd.rc6 apmd |
| 104 |
|
| 105 |
- use nls || rm -rf "${D}"/usr/share/man/fr |
| 106 |
+ if ! use nls; then |
| 107 |
+ rm -r "${ED}"/usr/share/man/fr || die |
| 108 |
+ fi |
| 109 |
+ |
| 110 |
+ find "${ED}" -name '*.a' -delete || die |
| 111 |
} |
Archives