Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/g15daemon/
Date: Sat, 25 Jun 2016 07:27:13
Message-Id: 1466839618.451cbc767eab1cd57bc32c875170f8703fd584db.mgorny@gentoo
1 commit: 451cbc767eab1cd57bc32c875170f8703fd584db
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jun 25 07:19:51 2016 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jun 25 07:26:58 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=451cbc76
7
8 app-misc/g15daemon: Convert to python-r1
9
10 ...on-9999.ebuild => g15daemon-1.9.5.3-r13.ebuild} | 60 ++++++----------------
11 ...on-9999.ebuild => g15daemon-1.9.5.3-r21.ebuild} | 56 +++++---------------
12 app-misc/g15daemon/g15daemon-9999.ebuild | 32 +++---------
13 3 files changed, 37 insertions(+), 111 deletions(-)
14
15 diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
16 similarity index 76%
17 copy from app-misc/g15daemon/g15daemon-9999.ebuild
18 copy to app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
19 index e881884..ff12695 100644
20 --- a/app-misc/g15daemon/g15daemon-9999.ebuild
21 +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
22 @@ -1,41 +1,39 @@
23 -# Copyright 1999-2014 Gentoo Foundation
24 +# Copyright 1999-2016 Gentoo Foundation
25 # Distributed under the terms of the GNU General Public License v2
26 # $Id$
27
28 EAPI=5
29 +
30 +PYTHON_COMPAT=( python2_7 )
31 GENTOO_DEPEND_ON_PERL="no"
32 -PYTHON_DEPEND="python? *"
33 -SUPPORT_PYTHON_ABIS="1"
34 -ESVN_PROJECT=${PN}/trunk
35 -ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${ESVN_PROJECT}/${PN}-wip"
36
37 -inherit eutils linux-info perl-module python base subversion autotools
38 +inherit eutils linux-info perl-module python-r1 base
39
40 DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
41 HOMEPAGE="http://g15daemon.sourceforge.net/"
42 -[[ ${PV} = *9999* ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
43 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
44
45 LICENSE="GPL-2"
46 SLOT="0"
47 -KEYWORDS=""
48 +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
49 IUSE="perl python static-libs"
50
51 DEPEND="virtual/libusb:0
52 - >=dev-libs/libg15-9999
53 - >=dev-libs/libg15render-9999
54 + >=dev-libs/libg15-1.2.4
55 + >=dev-libs/libg15render-1.2
56 perl? (
57 dev-lang/perl
58 dev-perl/GDGraph
59 >=dev-perl/Inline-0.4
60 - )"
61 + )
62 + python? ( ${PYTHON_DEPS} )"
63 RDEPEND="${DEPEND}"
64 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
65
66 PATCHES=(
67 - "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
68 + "${FILESDIR}/${P}-forgotten-open-mode.patch"
69 + "${FILESDIR}/${P}-overflow-fix.patch"
70 )
71 -# "${FILESDIR}/${PN}-1.9.5.3-forgotten-open-mode.patch"
72 -# "${FILESDIR}/${PN}-1.9.5.3-overflow-fix.patch"
73 -
74 uinput_check() {
75 ebegin "Checking for uinput support"
76 local rc=1
77 @@ -56,17 +54,10 @@ uinput_check() {
78 pkg_setup() {
79 linux-info_pkg_setup
80 uinput_check
81 - if use python; then
82 - python_pkg_setup
83 - fi
84 }
85
86 src_unpack() {
87 - if [[ ${PV} = *9999* ]]; then
88 - subversion_src_unpack
89 - else
90 - unpack ${A}
91 - fi
92 + unpack ${A}
93 if use perl; then
94 unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
95 fi
96 @@ -76,9 +67,6 @@ src_unpack() {
97 }
98
99 src_prepare() {
100 - if [[ ${PV} = *9999* ]]; then
101 - subversion_wc_info
102 - fi
103 if use perl; then
104 perl-module_src_prepare
105 sed -i \
106 @@ -88,9 +76,6 @@ src_prepare() {
107 # perl-module_src_prepare always calls base_src_prepare
108 base_src_prepare
109 fi
110 - if [[ ${PV} = *9999* ]]; then
111 - eautoreconf
112 - fi
113 }
114
115 src_configure() {
116 @@ -152,11 +137,7 @@ src_install() {
117 ebegin "Installing Python Bindings (g15daemon.py)"
118 cd "${WORKDIR}/pyg15daemon"
119
120 - installation() {
121 - insinto $(python_get_sitedir)
122 - doins g15daemon.py
123 - }
124 - python_execute_function installation
125 + python_foreach_impl python_domodule g15daemon.py
126
127 docinto python
128 dodoc AUTHORS
129 @@ -164,11 +145,6 @@ src_install() {
130 }
131
132 pkg_postinst() {
133 - if use python; then
134 - python_mod_optimize g15daemon.py
135 - echo ""
136 - fi
137 -
138 elog "To use g15daemon, you need to add g15daemon to the default runlevel."
139 elog "This can be done with:"
140 elog "# /sbin/rc-update add g15daemon default"
141 @@ -183,9 +159,3 @@ pkg_postinst() {
142 elog "Adding keycodes to an existing xmodmap:"
143 elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
144 }
145 -
146 -pkg_postrm() {
147 - if use python; then
148 - python_mod_cleanup g15daemon.py
149 - fi
150 -}
151
152 diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
153 similarity index 76%
154 copy from app-misc/g15daemon/g15daemon-9999.ebuild
155 copy to app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
156 index e881884..9149ee0 100644
157 --- a/app-misc/g15daemon/g15daemon-9999.ebuild
158 +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
159 @@ -1,19 +1,17 @@
160 -# Copyright 1999-2014 Gentoo Foundation
161 +# Copyright 1999-2016 Gentoo Foundation
162 # Distributed under the terms of the GNU General Public License v2
163 # $Id$
164
165 EAPI=5
166 +
167 +PYTHON_COMPAT=( python2_7 )
168 GENTOO_DEPEND_ON_PERL="no"
169 -PYTHON_DEPEND="python? *"
170 -SUPPORT_PYTHON_ABIS="1"
171 -ESVN_PROJECT=${PN}/trunk
172 -ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${ESVN_PROJECT}/${PN}-wip"
173
174 -inherit eutils linux-info perl-module python base subversion autotools
175 +inherit eutils linux-info perl-module python-r1 base
176
177 DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
178 HOMEPAGE="http://g15daemon.sourceforge.net/"
179 -[[ ${PV} = *9999* ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
180 +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
181
182 LICENSE="GPL-2"
183 SLOT="0"
184 @@ -22,19 +20,21 @@ IUSE="perl python static-libs"
185
186 DEPEND="virtual/libusb:0
187 >=dev-libs/libg15-9999
188 - >=dev-libs/libg15render-9999
189 + >=dev-libs/libg15render-1.2
190 perl? (
191 dev-lang/perl
192 dev-perl/GDGraph
193 >=dev-perl/Inline-0.4
194 - )"
195 + )
196 + python? ( ${PYTHON_DEPS} )"
197 RDEPEND="${DEPEND}"
198 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
199
200 PATCHES=(
201 - "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
202 + "${FILESDIR}/${P}-forgotten-open-mode.patch"
203 + "${FILESDIR}/${P}-overflow-fix.patch"
204 + "${FILESDIR}/${P}-g510-keys.patch"
205 )
206 -# "${FILESDIR}/${PN}-1.9.5.3-forgotten-open-mode.patch"
207 -# "${FILESDIR}/${PN}-1.9.5.3-overflow-fix.patch"
208
209 uinput_check() {
210 ebegin "Checking for uinput support"
211 @@ -56,17 +56,10 @@ uinput_check() {
212 pkg_setup() {
213 linux-info_pkg_setup
214 uinput_check
215 - if use python; then
216 - python_pkg_setup
217 - fi
218 }
219
220 src_unpack() {
221 - if [[ ${PV} = *9999* ]]; then
222 - subversion_src_unpack
223 - else
224 - unpack ${A}
225 - fi
226 + unpack ${A}
227 if use perl; then
228 unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
229 fi
230 @@ -76,9 +69,6 @@ src_unpack() {
231 }
232
233 src_prepare() {
234 - if [[ ${PV} = *9999* ]]; then
235 - subversion_wc_info
236 - fi
237 if use perl; then
238 perl-module_src_prepare
239 sed -i \
240 @@ -88,9 +78,6 @@ src_prepare() {
241 # perl-module_src_prepare always calls base_src_prepare
242 base_src_prepare
243 fi
244 - if [[ ${PV} = *9999* ]]; then
245 - eautoreconf
246 - fi
247 }
248
249 src_configure() {
250 @@ -152,11 +139,7 @@ src_install() {
251 ebegin "Installing Python Bindings (g15daemon.py)"
252 cd "${WORKDIR}/pyg15daemon"
253
254 - installation() {
255 - insinto $(python_get_sitedir)
256 - doins g15daemon.py
257 - }
258 - python_execute_function installation
259 + python_foreach_impl python_domodule g15daemon.py
260
261 docinto python
262 dodoc AUTHORS
263 @@ -164,11 +147,6 @@ src_install() {
264 }
265
266 pkg_postinst() {
267 - if use python; then
268 - python_mod_optimize g15daemon.py
269 - echo ""
270 - fi
271 -
272 elog "To use g15daemon, you need to add g15daemon to the default runlevel."
273 elog "This can be done with:"
274 elog "# /sbin/rc-update add g15daemon default"
275 @@ -183,9 +161,3 @@ pkg_postinst() {
276 elog "Adding keycodes to an existing xmodmap:"
277 elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
278 }
279 -
280 -pkg_postrm() {
281 - if use python; then
282 - python_mod_cleanup g15daemon.py
283 - fi
284 -}
285
286 diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild
287 index e881884..48d76e3 100644
288 --- a/app-misc/g15daemon/g15daemon-9999.ebuild
289 +++ b/app-misc/g15daemon/g15daemon-9999.ebuild
290 @@ -1,15 +1,15 @@
291 -# Copyright 1999-2014 Gentoo Foundation
292 +# Copyright 1999-2016 Gentoo Foundation
293 # Distributed under the terms of the GNU General Public License v2
294 # $Id$
295
296 EAPI=5
297 +
298 +PYTHON_COMPAT=( python2_7 )
299 GENTOO_DEPEND_ON_PERL="no"
300 -PYTHON_DEPEND="python? *"
301 -SUPPORT_PYTHON_ABIS="1"
302 ESVN_PROJECT=${PN}/trunk
303 ESVN_REPO_URI="https://${PN}.svn.sourceforge.net/svnroot/${ESVN_PROJECT}/${PN}-wip"
304
305 -inherit eutils linux-info perl-module python base subversion autotools
306 +inherit eutils linux-info perl-module python-r1 base subversion autotools
307
308 DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
309 HOMEPAGE="http://g15daemon.sourceforge.net/"
310 @@ -27,8 +27,10 @@ DEPEND="virtual/libusb:0
311 dev-lang/perl
312 dev-perl/GDGraph
313 >=dev-perl/Inline-0.4
314 - )"
315 + )
316 + python? ( ${PYTHON_DEPS} )"
317 RDEPEND="${DEPEND}"
318 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
319
320 PATCHES=(
321 "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
322 @@ -56,9 +58,6 @@ uinput_check() {
323 pkg_setup() {
324 linux-info_pkg_setup
325 uinput_check
326 - if use python; then
327 - python_pkg_setup
328 - fi
329 }
330
331 src_unpack() {
332 @@ -152,11 +151,7 @@ src_install() {
333 ebegin "Installing Python Bindings (g15daemon.py)"
334 cd "${WORKDIR}/pyg15daemon"
335
336 - installation() {
337 - insinto $(python_get_sitedir)
338 - doins g15daemon.py
339 - }
340 - python_execute_function installation
341 + python_foreach_impl python_domodule g15daemon.py
342
343 docinto python
344 dodoc AUTHORS
345 @@ -164,11 +159,6 @@ src_install() {
346 }
347
348 pkg_postinst() {
349 - if use python; then
350 - python_mod_optimize g15daemon.py
351 - echo ""
352 - fi
353 -
354 elog "To use g15daemon, you need to add g15daemon to the default runlevel."
355 elog "This can be done with:"
356 elog "# /sbin/rc-update add g15daemon default"
357 @@ -183,9 +173,3 @@ pkg_postinst() {
358 elog "Adding keycodes to an existing xmodmap:"
359 elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
360 }
361 -
362 -pkg_postrm() {
363 - if use python; then
364 - python_mod_cleanup g15daemon.py
365 - fi
366 -}
Report Message
Find on MARC Find on Google Groups