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: profiles/base/, profiles/, app-misc/g15daemon/
Date: Wed, 09 Sep 2020 10:07:35
Message-Id: 1599646042.d37355b6dc1369dc86009ffc448344293a997925.mgorny@gentoo
1 commit: d37355b6dc1369dc86009ffc448344293a997925
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 9 10:06:29 2020 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 9 10:07:22 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d37355b6
7
8 package.mask: Last rite app-misc/g15daemon & co.
9
10 Bug: https://bugs.gentoo.org/741382
11 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
12
13 app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild | 24 ++++--------------------
14 app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild | 24 ++++--------------------
15 app-misc/g15daemon/g15daemon-9999.ebuild | 24 ++++--------------------
16 profiles/base/package.use.mask | 6 ++++++
17 profiles/package.mask | 13 +++++++++++++
18 5 files changed, 31 insertions(+), 60 deletions(-)
19
20 diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
21 index 9dd8a9dafdb..9351249d7a8 100644
22 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
23 +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r13.ebuild
24 @@ -1,12 +1,11 @@
25 -# Copyright 1999-2017 Gentoo Foundation
26 +# Copyright 1999-2020 Gentoo Authors
27 # Distributed under the terms of the GNU General Public License v2
28
29 EAPI=5
30
31 -PYTHON_COMPAT=( python2_7 )
32 GENTOO_DEPEND_ON_PERL="no"
33
34 -inherit eutils linux-info perl-module python-r1 base
35 +inherit eutils linux-info perl-module base
36
37 DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
38 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
39 @@ -15,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
40 LICENSE="GPL-2"
41 SLOT="0"
42 KEYWORDS="amd64 ppc ppc64 x86"
43 -IUSE="perl python static-libs"
44 +IUSE="perl static-libs"
45
46 DEPEND="virtual/libusb:0
47 >=dev-libs/libg15-1.2.4
48 @@ -24,10 +23,8 @@ DEPEND="virtual/libusb:0
49 dev-lang/perl
50 dev-perl/GDGraph
51 >=dev-perl/Inline-0.4
52 - )
53 - python? ( ${PYTHON_DEPS} )"
54 + )"
55 RDEPEND="${DEPEND}"
56 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
57
58 PATCHES=(
59 "${FILESDIR}/${P}-forgotten-open-mode.patch"
60 @@ -60,9 +57,6 @@ src_unpack() {
61 if use perl; then
62 unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
63 fi
64 - if use python; then
65 - unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
66 - fi
67 }
68
69 src_prepare() {
70 @@ -131,16 +125,6 @@ src_install() {
71 docinto perl
72 perl-module_src_install
73 fi
74 -
75 - if use python; then
76 - ebegin "Installing Python Bindings (g15daemon.py)"
77 - cd "${WORKDIR}/pyg15daemon"
78 -
79 - python_foreach_impl python_domodule g15daemon.py
80 -
81 - docinto python
82 - dodoc AUTHORS
83 - fi
84 }
85
86 pkg_postinst() {
87
88 diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
89 index 0d6bc4d9092..df58caed05f 100644
90 --- a/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
91 +++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r21.ebuild
92 @@ -1,12 +1,11 @@
93 -# Copyright 1999-2017 Gentoo Foundation
94 +# Copyright 1999-2020 Gentoo Authors
95 # Distributed under the terms of the GNU General Public License v2
96
97 EAPI=5
98
99 -PYTHON_COMPAT=( python2_7 )
100 GENTOO_DEPEND_ON_PERL="no"
101
102 -inherit eutils linux-info perl-module python-r1 base
103 +inherit eutils linux-info perl-module base
104
105 DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
106 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
107 @@ -15,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
108 LICENSE="GPL-2"
109 SLOT="0"
110 KEYWORDS=""
111 -IUSE="perl python static-libs"
112 +IUSE="perl static-libs"
113
114 DEPEND="virtual/libusb:0
115 >=dev-libs/libg15-9999
116 @@ -24,10 +23,8 @@ DEPEND="virtual/libusb:0
117 dev-lang/perl
118 dev-perl/GDGraph
119 >=dev-perl/Inline-0.4
120 - )
121 - python? ( ${PYTHON_DEPS} )"
122 + )"
123 RDEPEND="${DEPEND}"
124 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
125
126 PATCHES=(
127 "${FILESDIR}/${P}-forgotten-open-mode.patch"
128 @@ -62,9 +59,6 @@ src_unpack() {
129 if use perl; then
130 unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
131 fi
132 - if use python; then
133 - unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
134 - fi
135 }
136
137 src_prepare() {
138 @@ -133,16 +127,6 @@ src_install() {
139 docinto perl
140 perl-module_src_install
141 fi
142 -
143 - if use python; then
144 - ebegin "Installing Python Bindings (g15daemon.py)"
145 - cd "${WORKDIR}/pyg15daemon"
146 -
147 - python_foreach_impl python_domodule g15daemon.py
148 -
149 - docinto python
150 - dodoc AUTHORS
151 - fi
152 }
153
154 pkg_postinst() {
155
156 diff --git a/app-misc/g15daemon/g15daemon-9999.ebuild b/app-misc/g15daemon/g15daemon-9999.ebuild
157 index 5e6baded32a..c7300da76d0 100644
158 --- a/app-misc/g15daemon/g15daemon-9999.ebuild
159 +++ b/app-misc/g15daemon/g15daemon-9999.ebuild
160 @@ -1,14 +1,13 @@
161 -# Copyright 1999-2017 Gentoo Foundation
162 +# Copyright 1999-2020 Gentoo Authors
163 # Distributed under the terms of the GNU General Public License v2
164
165 EAPI=5
166
167 -PYTHON_COMPAT=( python2_7 )
168 GENTOO_DEPEND_ON_PERL="no"
169 ESVN_PROJECT=${PN}/trunk
170 ESVN_REPO_URI="https://svn.code.sf.net/p/${PN}/code/trunk/${PN}-wip"
171
172 -inherit eutils linux-info perl-module python-r1 base subversion autotools
173 +inherit eutils linux-info perl-module base subversion autotools
174
175 DESCRIPTION="Takes control of the G15 keyboard, through the linux kernel uinput device driver"
176 HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
177 @@ -17,7 +16,7 @@ HOMEPAGE="https://sourceforge.net/projects/g15daemon/"
178 LICENSE="GPL-2"
179 SLOT="0"
180 KEYWORDS=""
181 -IUSE="perl python static-libs"
182 +IUSE="perl static-libs"
183
184 DEPEND="virtual/libusb:0
185 >=dev-libs/libg15-9999
186 @@ -26,10 +25,8 @@ DEPEND="virtual/libusb:0
187 dev-lang/perl
188 dev-perl/GDGraph
189 >=dev-perl/Inline-0.4
190 - )
191 - python? ( ${PYTHON_DEPS} )"
192 + )"
193 RDEPEND="${DEPEND}"
194 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
195
196 PATCHES=(
197 "${FILESDIR}/${PN}-1.9.5.3-g510-keys.patch"
198 @@ -68,9 +65,6 @@ src_unpack() {
199 if use perl; then
200 unpack "./${P}/lang-bindings/perl-G15Daemon-0.2.tar.gz"
201 fi
202 - if use python; then
203 - unpack "./${P}/lang-bindings/pyg15daemon-0.0.tar.bz2"
204 - fi
205 }
206
207 src_prepare() {
208 @@ -145,16 +139,6 @@ src_install() {
209 docinto perl
210 perl-module_src_install
211 fi
212 -
213 - if use python; then
214 - ebegin "Installing Python Bindings (g15daemon.py)"
215 - cd "${WORKDIR}/pyg15daemon"
216 -
217 - python_foreach_impl python_domodule g15daemon.py
218 -
219 - docinto python
220 - dodoc AUTHORS
221 - fi
222 }
223
224 pkg_postinst() {
225
226 diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
227 index 6fb0c6487de..9d76d50d39b 100644
228 --- a/profiles/base/package.use.mask
229 +++ b/profiles/base/package.use.mask
230 @@ -6,6 +6,12 @@
231 # This file is only for generic masks. For arch-specific masks (i.e.
232 # mask everywhere, unmask on arch/*) use arch/base.
233
234 +# Michał Górny <mgorny@g.o> (2020-09-09)
235 +# app-misc/g15daemon is masked for removal.
236 +app-misc/lcdproc lcd_devices_g15
237 +media-sound/mangler g15
238 +media-sound/mumble g15
239 +
240 # Stephan Hartmann <sultan@g.o> (2020-09-06)
241 # Causes seccomp sandbox violation or chromium might hang on startup.
242 >=www-client/chromium-87 wayland
243
244 diff --git a/profiles/package.mask b/profiles/package.mask
245 index db2c0208ed2..3b595893f26 100644
246 --- a/profiles/package.mask
247 +++ b/profiles/package.mask
248 @@ -32,6 +32,19 @@
249
250 #--- END OF EXAMPLES ---
251
252 +# Michał Górny <mgorny@g.o> (2020-09-09)
253 +# Last release in 2008. Fails to build with gcc-10 (bug #706712).
254 +# Not ported to Python 3 (bug #735226). The current revision
255 +# is misconfigured by default (bug #481454), and the newer revision
256 +# is masked for since 2012 (bug #587008).
257 +# Removal in 30 days. Bug #741382.
258 +app-misc/g15daemon
259 +app-misc/g15composer
260 +app-misc/g15macro
261 +app-misc/g15message
262 +app-misc/g15mpd
263 +app-misc/g15stats
264 +
265 # Joonas Niilola <juippis@g.o> (2020-09-07)
266 # Nothing in the tree uses this lib anymore. Removing as redundant.
267 # Removal in ~30 days. Bug #740868.