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

Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-misc/g15daemon: g15daemon-1.9.5.3-r7.ebuild ChangeLog g15daemon-9999.ebuild g15daemon-1.9.5.3-r6.ebuild
Date: Fri, 01 Mar 2013 23:16:55
Message-Id: 20130301231650.0F2F82171D@flycatcher.gentoo.org
1 polynomial-c 13/03/01 23:16:49
2
3 Modified: ChangeLog g15daemon-9999.ebuild
4 g15daemon-1.9.5.3-r6.ebuild
5 Added: g15daemon-1.9.5.3-r7.ebuild
6 Log:
7 Added rewritten init script to fix bug #451966
8
9 (Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
10
11 Revision Changes Path
12 1.43 app-misc/g15daemon/ChangeLog
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/ChangeLog?rev=1.43&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/ChangeLog?rev=1.43&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/ChangeLog?r1=1.42&r2=1.43
17
18 Index: ChangeLog
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v
21 retrieving revision 1.42
22 retrieving revision 1.43
23 diff -u -r1.42 -r1.43
24 --- ChangeLog 12 Oct 2012 20:22:20 -0000 1.42
25 +++ ChangeLog 1 Mar 2013 23:16:49 -0000 1.43
26 @@ -1,6 +1,14 @@
27 # ChangeLog for app-misc/g15daemon
28 -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
29 -# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.42 2012/10/12 20:22:20 robbat2 Exp $
30 +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
31 +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.43 2013/03/01 23:16:49 polynomial-c Exp $
32 +
33 +*g15daemon-1.9.5.3-r7 (01 Mar 2013)
34 +
35 + 01 Mar 2013; Lars Wendler <polynomial-c@g.o>
36 + g15daemon-1.9.5.3-r6.ebuild, +g15daemon-1.9.5.3-r7.ebuild,
37 + +files/g15daemon-1.9.5.3.initd, g15daemon-9999.ebuild:
38 + Non-maintainer commit. Added rewritten init script to fix bug #451966. Thanks
39 + to Manuel Rüger for reporting this. Moved ebuild with g510 support to -r7.
40
41 *g15daemon-1.9.5.3-r6 (12 Oct 2012)
42 *g15daemon-9999 (12 Oct 2012)
43
44
45
46 1.2 app-misc/g15daemon/g15daemon-9999.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/g15daemon-9999.ebuild?rev=1.2&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/g15daemon-9999.ebuild?rev=1.2&content-type=text/plain
50 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/g15daemon-9999.ebuild?r1=1.1&r2=1.2
51
52 Index: g15daemon-9999.ebuild
53 ===================================================================
54 RCS file: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-9999.ebuild,v
55 retrieving revision 1.1
56 retrieving revision 1.2
57 diff -u -r1.1 -r1.2
58 --- g15daemon-9999.ebuild 12 Oct 2012 20:22:20 -0000 1.1
59 +++ g15daemon-9999.ebuild 1 Mar 2013 23:16:49 -0000 1.2
60 @@ -1,6 +1,6 @@
61 -# Copyright 1999-2012 Gentoo Foundation
62 +# Copyright 1999-2013 Gentoo Foundation
63 # Distributed under the terms of the GNU General Public License v2
64 -# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-9999.ebuild,v 1.1 2012/10/12 20:22:20 robbat2 Exp $
65 +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-9999.ebuild,v 1.2 2013/03/01 23:16:49 polynomial-c Exp $
66
67 EAPI=4
68 GENTOO_DEPEND_ON_PERL="no"
69 @@ -129,7 +129,7 @@
70 fi
71
72 newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
73 - newinitd "${FILESDIR}/${PN}-1.2.7-r2.initd" ${PN}
74 + newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
75 dobin "${FILESDIR}/g15daemon-hotplug"
76 insinto /lib/udev/rules.d
77 doins "${FILESDIR}/99-g15daemon.rules"
78
79
80
81 1.2 app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild
82
83 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild?rev=1.2&view=markup
84 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild?rev=1.2&content-type=text/plain
85 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild?r1=1.1&r2=1.2
86
87 Index: g15daemon-1.9.5.3-r6.ebuild
88 ===================================================================
89 RCS file: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild,v
90 retrieving revision 1.1
91 retrieving revision 1.2
92 diff -u -r1.1 -r1.2
93 --- g15daemon-1.9.5.3-r6.ebuild 12 Oct 2012 20:22:20 -0000 1.1
94 +++ g15daemon-1.9.5.3-r6.ebuild 1 Mar 2013 23:16:49 -0000 1.2
95 @@ -1,6 +1,6 @@
96 -# Copyright 1999-2012 Gentoo Foundation
97 +# Copyright 1999-2013 Gentoo Foundation
98 # Distributed under the terms of the GNU General Public License v2
99 -# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild,v 1.1 2012/10/12 20:22:20 robbat2 Exp $
100 +# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r6.ebuild,v 1.2 2013/03/01 23:16:49 polynomial-c Exp $
101
102 EAPI=4
103 GENTOO_DEPEND_ON_PERL="no"
104 @@ -15,11 +15,11 @@
105
106 LICENSE="GPL-2"
107 SLOT="0"
108 -KEYWORDS=""
109 +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
110 IUSE="perl python static-libs"
111
112 DEPEND="virtual/libusb:0
113 - >=dev-libs/libg15-9999
114 + >=dev-libs/libg15-1.2.4
115 >=dev-libs/libg15render-1.2
116 perl? (
117 dev-lang/perl
118 @@ -31,9 +31,7 @@
119 PATCHES=(
120 "${FILESDIR}/${P}-forgotten-open-mode.patch"
121 "${FILESDIR}/${P}-overflow-fix.patch"
122 - "${FILESDIR}/${P}-g510-keys.patch"
123 )
124 -
125 uinput_check() {
126 ebegin "Checking for uinput support"
127 local rc=1
128 @@ -117,7 +115,7 @@
129 fi
130
131 newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
132 - newinitd "${FILESDIR}/${PN}-1.2.7-r2.initd" ${PN}
133 + newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
134 dobin "${FILESDIR}/g15daemon-hotplug"
135 insinto /lib/udev/rules.d
136 doins "${FILESDIR}/99-g15daemon.rules"
137
138
139
140 1.1 app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild
141
142 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild?rev=1.1&view=markup
143 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild?rev=1.1&content-type=text/plain
144
145 Index: g15daemon-1.9.5.3-r7.ebuild
146 ===================================================================
147 # Copyright 1999-2013 Gentoo Foundation
148 # Distributed under the terms of the GNU General Public License v2
149 # $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r7.ebuild,v 1.1 2013/03/01 23:16:49 polynomial-c Exp $
150
151 EAPI=4
152 GENTOO_DEPEND_ON_PERL="no"
153 PYTHON_DEPEND="python? *"
154 SUPPORT_PYTHON_ABIS="1"
155
156 inherit eutils linux-info perl-module python base
157
158 DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
159 HOMEPAGE="http://g15daemon.sourceforge.net/"
160 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
161
162 LICENSE="GPL-2"
163 SLOT="0"
164 KEYWORDS=""
165 IUSE="perl python static-libs"
166
167 DEPEND="virtual/libusb:0
168 >=dev-libs/libg15-9999
169 >=dev-libs/libg15render-1.2
170 perl? (
171 dev-lang/perl
172 dev-perl/GDGraph
173 >=dev-perl/Inline-0.4
174 )"
175 RDEPEND="${DEPEND}"
176
177 PATCHES=(
178 "${FILESDIR}/${P}-forgotten-open-mode.patch"
179 "${FILESDIR}/${P}-overflow-fix.patch"
180 "${FILESDIR}/${P}-g510-keys.patch"
181 )
182
183 uinput_check() {
184 ebegin "Checking for uinput support"
185 local rc=1
186 linux_config_exists && linux_chkconfig_present INPUT_UINPUT
187 rc=$?
188
189 if [[ $rc -ne 0 ]] ; then
190 eerror "To use g15daemon, you need to compile your kernel with uinput support."
191 eerror "Please enable uinput support in your kernel config, found at:"
192 eerror
193 eerror "Device Drivers -> Input Device ... -> Miscellaneous devices -> User level driver support."
194 eerror
195 eerror "Once enabled, you should have the /dev/input/uinput device."
196 eerror "g15daemon will not work without the uinput device."
197 fi
198 }
199
200 pkg_setup() {
201 linux-info_pkg_setup
202 uinput_check
203 if use python; then
204 python_pkg_setup
205 fi
206 }
207
208 src_unpack() {
209 unpack ${A}
210 if use perl; then
211 unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
212 fi
213 if use python; then
214 unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
215 fi
216 }
217
218 src_prepare() {
219 if use perl; then
220 perl-module_src_prepare
221 sed -i \
222 -e '1i#!/usr/bin/perl' \
223 "${S}"/contrib/testbindings.pl
224 else
225 # perl-module_src_prepare always calls base_src_prepare
226 base_src_prepare
227 fi
228 }
229
230 src_configure() {
231 econf \
232 --docdir="${EPREFIX}/usr/share/doc/${PF}" \
233 $(use_enable static-libs static)
234
235 if use perl; then
236 cd "${WORKDIR}/G15Daemon-0.2"
237 perl-module_src_configure
238 fi
239 }
240
241 src_compile() {
242 default
243
244 if use perl; then
245 cd "${WORKDIR}/G15Daemon-0.2"
246 perl-module_src_compile
247 fi
248 }
249
250 src_install() {
251 default
252
253 find "${ED}" -name '*.la' -exec rm -f {} +
254
255 # remove odd docs installed my make
256 rm "${ED}/usr/share/doc/${PF}/"{LICENSE,README.usage}
257
258 insinto /usr/share/${PN}/contrib
259 doins contrib/xmodmaprc
260 doins contrib/xmodmap.sh
261 if use perl; then
262 doins contrib/testbindings.pl
263 fi
264
265 newconfd "${FILESDIR}/${PN}-1.2.7.confd" ${PN}
266 newinitd "${FILESDIR}/${PN}-1.9.5.3.initd" ${PN}
267 dobin "${FILESDIR}/g15daemon-hotplug"
268 insinto /lib/udev/rules.d
269 doins "${FILESDIR}/99-g15daemon.rules"
270
271 insinto /etc
272 doins "${FILESDIR}"/g15daemon.conf
273
274 # Gentoo bug #301340, debian bug #611649
275 exeinto /usr/lib/pm-utils/sleep.d
276 doexe "${FILESDIR}"/20g15daemon
277
278 if use perl; then
279 ebegin "Installing Perl Bindings (G15Daemon.pm)"
280 cd "${WORKDIR}/G15Daemon-0.2"
281 docinto perl
282 perl-module_src_install
283 fi
284
285 if use python; then
286 ebegin "Installing Python Bindings (g15daemon.py)"
287 cd "${WORKDIR}/pyg15daemon"
288
289 installation() {
290 insinto $(python_get_sitedir)
291 doins g15daemon.py
292 }
293 python_execute_function installation
294
295 docinto python
296 dodoc AUTHORS
297 fi
298 }
299
300 pkg_postinst() {
301 if use python; then
302 python_mod_optimize g15daemon.py
303 echo ""
304 fi
305
306 elog "To use g15daemon, you need to add g15daemon to the default runlevel."
307 elog "This can be done with:"
308 elog "# /sbin/rc-update add g15daemon default"
309 elog "You can edit some g15daemon options at /etc/conf.d/g15daemon"
310 elog ""
311 elog "To have all new keys working in X11, you'll need create a "
312 elog "specific xmodmap in your home directory or edit the existent one."
313 elog ""
314 elog "Create the xmodmap:"
315 elog "cp /usr/share/g15daemon/contrib/xmodmaprc ~/.Xmodmap"
316 elog ""
317 elog "Adding keycodes to an existing xmodmap:"
318 elog "cat /usr/share/g15daemon/contrib/xmodmaprc >> ~/.Xmodmap"
319 }
320
321 pkg_postrm() {
322 if use python; then
323 python_mod_cleanup g15daemon.py
324 fi
325 }
Report Message
Find on MARC Find on Google Groups