1 |
commit: 82d9607922cc4d6c00dfa2a83060828a00b99599 |
2 |
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr> |
3 |
AuthorDate: Mon Dec 28 14:47:50 2020 +0000 |
4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Dec 28 14:47:50 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82d96079 |
7 |
|
8 |
app-laptop/pommed: Port to EAPI 7 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/708514 |
11 |
Package-Manager: Portage-3.0.9, Repoman-3.0.1 |
12 |
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr> |
13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
14 |
|
15 |
.../pommed/files/pommed-1.39-fno-common.patch | 22 +++++++++++ |
16 |
app-laptop/pommed/pommed-1.39-r1.ebuild | 44 ++++++++++++---------- |
17 |
2 files changed, 46 insertions(+), 20 deletions(-) |
18 |
|
19 |
diff --git a/app-laptop/pommed/files/pommed-1.39-fno-common.patch b/app-laptop/pommed/files/pommed-1.39-fno-common.patch |
20 |
new file mode 100644 |
21 |
index 00000000000..4cc66bcc60b |
22 |
--- /dev/null |
23 |
+++ b/app-laptop/pommed/files/pommed-1.39-fno-common.patch |
24 |
@@ -0,0 +1,22 @@ |
25 |
+--- a/pommed/mactel/nv8600mgt_backlight.c |
26 |
++++ b/pommed/mactel/nv8600mgt_backlight.c |
27 |
+@@ -48,7 +48,7 @@ |
28 |
+ #include "../dbus.h" |
29 |
+ |
30 |
+ |
31 |
+-struct _lcd_bck_info lcd_bck_info; |
32 |
++extern struct _lcd_bck_info lcd_bck_info; |
33 |
+ |
34 |
+ |
35 |
+ static int nv8600mgt_inited = 0; |
36 |
+--- a/pommed/mactel/x1600_backlight.c |
37 |
++++ b/pommed/mactel/x1600_backlight.c |
38 |
+@@ -45,7 +45,7 @@ |
39 |
+ #include "../dbus.h" |
40 |
+ |
41 |
+ |
42 |
+-struct _lcd_bck_info lcd_bck_info; |
43 |
++extern struct _lcd_bck_info lcd_bck_info; |
44 |
+ |
45 |
+ static int fd = -1; |
46 |
+ static char *memory = NULL; |
47 |
|
48 |
diff --git a/app-laptop/pommed/pommed-1.39-r1.ebuild b/app-laptop/pommed/pommed-1.39-r1.ebuild |
49 |
index f1350763190..21e31ee3052 100644 |
50 |
--- a/app-laptop/pommed/pommed-1.39-r1.ebuild |
51 |
+++ b/app-laptop/pommed/pommed-1.39-r1.ebuild |
52 |
@@ -1,8 +1,9 @@ |
53 |
-# Copyright 1999-2017 Gentoo Foundation |
54 |
+# Copyright 1999-2020 Gentoo Authors |
55 |
# Distributed under the terms of the GNU General Public License v2 |
56 |
|
57 |
-EAPI=5 |
58 |
-inherit eutils toolchain-funcs linux-info systemd |
59 |
+EAPI=7 |
60 |
+ |
61 |
+inherit desktop linux-info systemd |
62 |
|
63 |
DESCRIPTION="Manage screen and keyboard backlight on Apple MacBook Pro/PowerBook" |
64 |
HOMEPAGE="http://technologeek.org/projects/pommed/index.html" |
65 |
@@ -14,23 +15,30 @@ SLOT="0" |
66 |
KEYWORDS="amd64 ppc x86" |
67 |
IUSE="gtk X" |
68 |
|
69 |
-COMMON_DEPEND="media-libs/alsa-lib |
70 |
- x86? ( sys-apps/pciutils ) |
71 |
- amd64? ( sys-apps/pciutils ) |
72 |
+DEPEND=" |
73 |
+ media-libs/alsa-lib |
74 |
+ media-libs/audiofile |
75 |
dev-libs/confuse |
76 |
- >=sys-apps/dbus-1.1 |
77 |
dev-libs/dbus-glib |
78 |
+ sys-apps/dbus |
79 |
sys-libs/zlib |
80 |
- media-libs/audiofile |
81 |
+ amd64? ( sys-apps/pciutils ) |
82 |
+ x86? ( sys-apps/pciutils ) |
83 |
gtk? ( x11-libs/gtk+:2 ) |
84 |
- X? ( x11-libs/libX11 |
85 |
+ X? ( |
86 |
+ x11-libs/libX11 |
87 |
x11-libs/libXext |
88 |
- x11-libs/libXpm )" |
89 |
-DEPEND="${COMMON_DEPEND} |
90 |
- virtual/pkgconfig" |
91 |
-RDEPEND="${COMMON_DEPEND} |
92 |
+ x11-libs/libXpm |
93 |
+ )" |
94 |
+RDEPEND="${DEPEND} |
95 |
media-sound/alsa-utils |
96 |
virtual/eject" |
97 |
+BDEPEND="virtual/pkgconfig" |
98 |
+ |
99 |
+PATCHES=( |
100 |
+ "${FILESDIR}"/${P}.patch |
101 |
+ "${FILESDIR}"/${P}-fno-common.patch |
102 |
+) |
103 |
|
104 |
pkg_setup() { |
105 |
if ! use ppc; then |
106 |
@@ -41,16 +49,12 @@ pkg_setup() { |
107 |
fi |
108 |
} |
109 |
|
110 |
-src_prepare() { |
111 |
- epatch "${FILESDIR}/${P}.patch" |
112 |
-} |
113 |
- |
114 |
src_compile() { |
115 |
- cd "${S}"/pommed |
116 |
+ cd "${S}"/pommed || die |
117 |
emake CC="$(tc-getCC)" OFLIB=1 |
118 |
|
119 |
if use gtk; then |
120 |
- cd "${S}"/gpomme |
121 |
+ cd "${S}"/gpomme || die |
122 |
local POFILES="" |
123 |
for LANG in ${LINGUAS}; do |
124 |
if [ -f po/${LANG}.po ]; then |
125 |
@@ -60,7 +64,7 @@ src_compile() { |
126 |
emake CC="$(tc-getCC)" POFILES="${POFILES}" |
127 |
fi |
128 |
if use X; then |
129 |
- cd "${S}"/wmpomme |
130 |
+ cd "${S}"/wmpomme || die |
131 |
emake CC="$(tc-getCC)" |
132 |
fi |
133 |
} |