1 |
commit: 5a72fa99c24aac8a895e809e6e24c758a18e6277 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Feb 26 18:42:02 2018 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Feb 26 18:42:02 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a72fa99 |
7 |
|
8 |
x11-misc/xbatt: EAPI=6 (bug #648876). |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch | 4 +-- |
13 |
x11-misc/xbatt/xbatt-1.3_rc1.ebuild | 40 +++++++++++++----------- |
14 |
2 files changed, 23 insertions(+), 21 deletions(-) |
15 |
|
16 |
diff --git a/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch |
17 |
index d86e42ef3fc..5e135d5c313 100644 |
18 |
--- a/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch |
19 |
+++ b/x11-misc/xbatt/files/xbatt-1.2.1-implicits.patch |
20 |
@@ -1,7 +1,7 @@ |
21 |
Fix implicit functions declarations |
22 |
|
23 |
---- xbatt.c |
24 |
-+++ xbatt.c |
25 |
+--- a/xbatt.c |
26 |
++++ b/xbatt.c |
27 |
@@ -47,6 +47,9 @@ |
28 |
#include <time.h> |
29 |
#include <sys/file.h> |
30 |
|
31 |
diff --git a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild |
32 |
index a3d3a1f562f..f291714e25c 100644 |
33 |
--- a/x11-misc/xbatt/xbatt-1.3_rc1.ebuild |
34 |
+++ b/x11-misc/xbatt/xbatt-1.3_rc1.ebuild |
35 |
@@ -1,9 +1,8 @@ |
36 |
-# Copyright 1999-2015 Gentoo Foundation |
37 |
+# Copyright 1999-2018 Gentoo Foundation |
38 |
# Distributed under the terms of the GNU General Public License v2 |
39 |
|
40 |
-EAPI=2 |
41 |
- |
42 |
-inherit versionator eutils toolchain-funcs |
43 |
+EAPI=6 |
44 |
+inherit toolchain-funcs versionator |
45 |
|
46 |
MY_PV=${PV/_rc/pr} |
47 |
DESCRIPTION="Notebook battery indicator for X" |
48 |
@@ -13,32 +12,35 @@ SRC_URI="http://www.clave.gr.jp/~eto/xbatt/${PN}-${MY_PV}.tar.gz" |
49 |
LICENSE="xbatt" |
50 |
SLOT="0" |
51 |
KEYWORDS="~amd64 ~ppc ~x86" |
52 |
-IUSE="" |
53 |
- |
54 |
-RDEPEND="x11-libs/libX11 |
55 |
+RDEPEND=" |
56 |
+ x11-libs/libX11 |
57 |
x11-libs/libXmu |
58 |
x11-libs/libXt |
59 |
x11-libs/libXaw |
60 |
x11-libs/libXext |
61 |
x11-libs/libxkbfile |
62 |
- x11-libs/libXpm" |
63 |
-DEPEND="${RDEPEND} |
64 |
+ x11-libs/libXpm |
65 |
+" |
66 |
+DEPEND=" |
67 |
+ ${RDEPEND} |
68 |
x11-proto/xextproto |
69 |
- x11-misc/imake" |
70 |
- |
71 |
+ x11-misc/imake |
72 |
+" |
73 |
+PATCHES=( |
74 |
+ "${FILESDIR}"/${PN}-1.2.1-implicits.patch |
75 |
+) |
76 |
S="${WORKDIR}"/${PN}-$(get_version_component_range 1-2) |
77 |
|
78 |
-src_prepare(){ |
79 |
- epatch "${FILESDIR}"/${PN}-1.2.1-implicits.patch |
80 |
-} |
81 |
- |
82 |
src_compile() { |
83 |
xmkmf || die |
84 |
- emake xbatt CDEBUGFLAGS="${CFLAGS}" CC="$(tc-getCC)" \ |
85 |
- EXTRA_LDOPTIONS="${LDFLAGS}" || die |
86 |
+ emake \ |
87 |
+ CC="$(tc-getCC)" \ |
88 |
+ CDEBUGFLAGS="${CFLAGS}" \ |
89 |
+ EXTRA_LDOPTIONS="${LDFLAGS}" \ |
90 |
+ xbatt |
91 |
} |
92 |
|
93 |
src_install() { |
94 |
- emake DESTDIR="${D}" install || die |
95 |
- dodoc README* || die |
96 |
+ emake DESTDIR="${D}" install |
97 |
+ dodoc README* |
98 |
} |