1 |
commit: 88bccc096e61e4829d8d05aed0f5f42681c6e91f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jun 30 07:14:27 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jun 30 09:27:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88bccc09 |
7 |
|
8 |
sci-chemistry/gperiodic: Drop 2.0.10-r2 and 3.0.1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/707580 |
11 |
Package-Manager: Portage-2.3.103, Repoman-2.3.23 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
sci-chemistry/gperiodic/Manifest | 2 - |
15 |
.../files/gperiodic-2.0.10-makefile.patch | 64 --------------------- |
16 |
.../gperiodic/files/gperiodic-2.0.10-nls.patch | 20 ------- |
17 |
.../gperiodic/files/gperiodic-3.0.1-makefile.patch | 66 ---------------------- |
18 |
.../gperiodic/files/gperiodic-3.0.1-nls.patch | 20 ------- |
19 |
sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild | 47 --------------- |
20 |
sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild | 53 ----------------- |
21 |
7 files changed, 272 deletions(-) |
22 |
|
23 |
diff --git a/sci-chemistry/gperiodic/Manifest b/sci-chemistry/gperiodic/Manifest |
24 |
index 41e5410baf6..0f1c1543edc 100644 |
25 |
--- a/sci-chemistry/gperiodic/Manifest |
26 |
+++ b/sci-chemistry/gperiodic/Manifest |
27 |
@@ -1,3 +1 @@ |
28 |
-DIST gperiodic-2.0.10.tar.gz 131213 BLAKE2B bd846dd64afa07e038008e6fe0563f5743767f3a1fba1aad0122ae644c7fb9279657609733bc4e6d4f4dcf988aff6096431ba1b71d02a328e01376ae00ff9bcb SHA512 23d0074ad5b0f9e25e8eee63f8c375e2448b1ee7c00f89e965b7dd8ce3f60f20251d7699a2f7a767228316144b946a5ac204a3e478c395767133f7fc801b51ba |
29 |
-DIST gperiodic-3.0.1.tar.gz 375347 BLAKE2B fb10c7d3484e822e636a8aca245ab2a68a95cfebbb433df03a643a1155f300d2cdca49ddb5713d298c69a25123abbf72e17fdd51f69c9b031d05153937b283fc SHA512 3bf47359dda1a029f3528ea04d28cd75909bceb535f6e1dc6c90f5a17b668e0dd98900ddd83633649383ff4e2fc588265275e0e4a27897ecc4ac6db4e93befc1 |
30 |
DIST gperiodic-3.0.3.tar.gz 451559 BLAKE2B b91995046b9905a534e3b6f530aee0ad2b4e6ac42cd11755ea182fdaaf8970f34b1aea8a33870abb8767837606a42a0cf0d76c9a689236aa39fba686e1521ee8 SHA512 7226063cf7977f4283a199d4a3d1842d6c9be60c53f5a005541eb26f35cd6538b29f086dc13c28225779e1849a12d1c39150897055c03902cb00adc011bc1ce8 |
31 |
|
32 |
diff --git a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-makefile.patch b/sci-chemistry/gperiodic/files/gperiodic-2.0.10-makefile.patch |
33 |
deleted file mode 100644 |
34 |
index abdb5caae4f..00000000000 |
35 |
--- a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-makefile.patch |
36 |
+++ /dev/null |
37 |
@@ -1,64 +0,0 @@ |
38 |
-Respect CC, CFLAGS, LDFLAGS |
39 |
-Fix install paths |
40 |
-Fix parallel build |
41 |
-Drop DEPRECATED flags, bug #391099 |
42 |
- |
43 |
---- Makefile |
44 |
-+++ Makefile |
45 |
-@@ -1,6 +1,5 @@ |
46 |
--CC := gcc |
47 |
--CFLAGS := `pkg-config --cflags gtk+-2.0` -I. -DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED |
48 |
--LIBS :=`pkg-config --libs gtk+-2.0` |
49 |
-+CFLAGS += `pkg-config --cflags gtk+-2.0` -I. |
50 |
-+LIBS +=`pkg-config --libs gtk+-2.0` |
51 |
- bindir ?= /usr/bin |
52 |
- datadir ?= /usr/share |
53 |
- enable_nls ?= 1 |
54 |
-@@ -8,12 +7,11 @@ |
55 |
- .c.o: |
56 |
- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< |
57 |
- |
58 |
--all: |
59 |
-- make gperiodic |
60 |
-- make -C po/ all enable_nls=$(enable_nls) |
61 |
-+all: gperiodic |
62 |
-+ $(MAKE) -C po/ all enable_nls=$(enable_nls) |
63 |
- |
64 |
- gperiodic: gperiodic.o |
65 |
-- $(CC) $(CFLAGS) -o gperiodic gperiodic.o $(LIBS) |
66 |
-+ $(CC) $(LDFLAGS) $(CFLAGS) -o gperiodic gperiodic.o $(LIBS) |
67 |
- ifeq ($(strip),1) |
68 |
- strip gperiodic |
69 |
- endif |
70 |
-@@ -23,24 +21,21 @@ |
71 |
- gperiodic.o: gperiodic.c gperiodic.h table_data.h |
72 |
- |
73 |
- install: |
74 |
-- mkdir -p $(DESTDIR)$(bindir) |
75 |
-- install -m 755 gperiodic $(DESTDIR)$(bindir) |
76 |
-- mkdir -p $(DESTDIR)$(datadir)/applications |
77 |
-- install -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications |
78 |
-- mkdir -p $(DESTDIR)$(datadir)/pixmaps |
79 |
-- install -m 644 gperiodic.png $(DESTDIR)$(datadir)/pixmaps |
80 |
-- install -m 644 gperiodic-crystal.png $(DESTDIR)$(datadir)/pixmaps |
81 |
-- make -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR) |
82 |
-+ install -D -m 755 gperiodic $(DESTDIR)$(bindir)/gperiodic |
83 |
-+ install -D -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications/gperiodic.desktop |
84 |
-+ install -D -m 644 gperiodic.png $(DESTDIR)$(datadir)/pixmaps/gperiodic.png |
85 |
-+ install -m 644 gperiodic-crystal.png $(DESTDIR)$(datadir)/pixmaps/gperiodic-crystal.png |
86 |
-+ $(MAKE) -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR) |
87 |
- |
88 |
- uninstall: |
89 |
- rm -f $(bindir)/gperiodic \ |
90 |
- $(datadir)/applications/gperiodic.desktop |
91 |
- $(datadir)/pixmaps/gperiodic.png \ |
92 |
- $(datadir)/pixmaps/gperiodic-crystal.png |
93 |
-- make -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR) |
94 |
-+ $(MAKE) -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR) |
95 |
- |
96 |
- clean: |
97 |
- rm -f *.o gperiodic |
98 |
-- make -C po/ clean |
99 |
-+ $(MAKE) -C po/ clean |
100 |
- |
101 |
- .PHONY: install uninstall clean |
102 |
|
103 |
diff --git a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch b/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch |
104 |
deleted file mode 100644 |
105 |
index de0bea04dc1..00000000000 |
106 |
--- a/sci-chemistry/gperiodic/files/gperiodic-2.0.10-nls.patch |
107 |
+++ /dev/null |
108 |
@@ -1,20 +0,0 @@ |
109 |
- po/Makefile | 2 ++ |
110 |
- 1 files changed, 2 insertions(+), 0 deletions(-) |
111 |
- |
112 |
-diff --git a/po/Makefile b/po/Makefile |
113 |
-index d7d7d78..179dad6 100644 |
114 |
---- a/po/Makefile |
115 |
-+++ b/po/Makefile |
116 |
-@@ -26,10 +26,12 @@ endif |
117 |
- |
118 |
- install: |
119 |
- $(MAKE) all |
120 |
-+ifeq ($(enable_nls),1) |
121 |
- for f in $(FILES_MO) ; do \ |
122 |
- mkdir -p $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \ |
123 |
- install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \ |
124 |
- done |
125 |
-+endif |
126 |
- |
127 |
- uninstall: |
128 |
- for f in $(FILES_MO) ; do \ |
129 |
|
130 |
diff --git a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-makefile.patch b/sci-chemistry/gperiodic/files/gperiodic-3.0.1-makefile.patch |
131 |
deleted file mode 100644 |
132 |
index a7a402a1a78..00000000000 |
133 |
--- a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-makefile.patch |
134 |
+++ /dev/null |
135 |
@@ -1,66 +0,0 @@ |
136 |
- Makefile | 36 ++++++++++++++---------------------- |
137 |
- 1 file changed, 14 insertions(+), 22 deletions(-) |
138 |
- |
139 |
-diff --git a/Makefile b/Makefile |
140 |
-index 7e86dc4..9bd4fe8 100644 |
141 |
---- a/Makefile |
142 |
-+++ b/Makefile |
143 |
-@@ -14,8 +14,8 @@ enable_nls ?= 1 |
144 |
- $(CC) -c $(CFLAGS) $(CPPFLAGS) $< |
145 |
- |
146 |
- all: |
147 |
-- make gperiodic |
148 |
-- make -C po/ all enable_nls=$(enable_nls) |
149 |
-+ $(MAKE) gperiodic |
150 |
-+ $(MAKE) -C po/ all enable_nls=$(enable_nls) |
151 |
- intltool-merge -d po gperiodic.desktop.in gperiodic.desktop |
152 |
- |
153 |
- gperiodic: gperiodic.o |
154 |
-@@ -29,24 +29,16 @@ gpdata.o: gpdata.c gperiodic.h |
155 |
- gperiodic.o: gperiodic.c gperiodic.h table_data.h |
156 |
- |
157 |
- install: |
158 |
-- mkdir -p $(DESTDIR)$(bindir) |
159 |
-- install -m 755 gperiodic $(DESTDIR)$(bindir) |
160 |
-- mkdir -p $(DESTDIR)$(datadir)/applications |
161 |
-- install -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications |
162 |
-- mkdir -p $(DESTDIR)$(datadir)/pixmaps |
163 |
-- install -m 644 icons/gperiodic.png $(DESTDIR)$(datadir)/pixmaps |
164 |
-- install -m 644 icons/gperiodic.xpm $(DESTDIR)$(datadir)/pixmaps |
165 |
-- mkdir -p $(DESTDIR)$(mandir) |
166 |
-- install -m 644 gperiodic.1 $(DESTDIR)$(mandir) |
167 |
-- mkdir -p $(DESTDIR)$(iconsdir)/hicolor/16x16/apps |
168 |
-- mkdir -p $(DESTDIR)$(iconsdir)/hicolor/32x32/apps |
169 |
-- mkdir -p $(DESTDIR)$(iconsdir)/hicolor/48x48/apps |
170 |
-- mkdir -p $(DESTDIR)$(iconsdir)/hicolor/64x64/apps |
171 |
-- install -m 644 icons/hicolor/16x16/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/16x16/apps |
172 |
-- install -m 644 icons/hicolor/32x32/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/32x32/apps |
173 |
-- install -m 644 icons/hicolor/48x48/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/48x48/apps |
174 |
-- install -m 644 icons/hicolor/64x64/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/64x64/apps |
175 |
-- make -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR) |
176 |
-+ install -D -m 755 gperiodic $(DESTDIR)$(bindir)/gperiodic |
177 |
-+ install -D -m 644 gperiodic.desktop $(DESTDIR)$(datadir)/applications/gperiodic.desktop |
178 |
-+ install -D -m 644 icons/gperiodic.png $(DESTDIR)$(datadir)/pixmaps/gperiodic.png |
179 |
-+ install -D -m 644 icons/gperiodic.xpm $(DESTDIR)$(datadir)/pixmaps/gperiodic.xpm |
180 |
-+ install -D -m 644 gperiodic.1 $(DESTDIR)$(mandir)/gperiodic.1 |
181 |
-+ install -D -m 644 icons/hicolor/16x16/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/16x16/apps/gperiodic.png |
182 |
-+ install -D -m 644 icons/hicolor/32x32/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/32x32/apps/gperiodic.png |
183 |
-+ install -D -m 644 icons/hicolor/48x48/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/48x48/apps/gperiodic.png |
184 |
-+ install -D -m 644 icons/hicolor/64x64/apps/gperiodic.png $(DESTDIR)$(iconsdir)/hicolor/64x64/apps/gperiodic.png |
185 |
-+ $(MAKE) -C po/ install enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR) |
186 |
- |
187 |
- uninstall: |
188 |
- rm -f $(bindir)/gperiodic \ |
189 |
-@@ -58,10 +50,10 @@ uninstall: |
190 |
- $(iconsdir)/hicolor/32x32/apps/gperiodic.png \ |
191 |
- $(iconsdir)/hicolor/48x48/apps/gperiodic.png \ |
192 |
- $(iconsdir)/hicolor/64x64/apps/gperiodic.png |
193 |
-- make -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR) |
194 |
-+ $(MAKE) -C po/ uninstall enable_nls=$(enable_nls) datadir=$(datadir) DESTDIR=$(DESTDIR) |
195 |
- |
196 |
- clean: |
197 |
- rm -f *.o gperiodic gperiodic.desktop |
198 |
-- make -C po/ clean |
199 |
-+ $(MAKE) -C po/ clean |
200 |
- |
201 |
- .PHONY: install uninstall clean |
202 |
|
203 |
diff --git a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-nls.patch b/sci-chemistry/gperiodic/files/gperiodic-3.0.1-nls.patch |
204 |
deleted file mode 100644 |
205 |
index 4420ca68e58..00000000000 |
206 |
--- a/sci-chemistry/gperiodic/files/gperiodic-3.0.1-nls.patch |
207 |
+++ /dev/null |
208 |
@@ -1,20 +0,0 @@ |
209 |
- po/Makefile | 2 ++ |
210 |
- 1 file changed, 2 insertions(+) |
211 |
- |
212 |
-diff --git a/po/Makefile b/po/Makefile |
213 |
-index d7d7d78..c596e5b 100644 |
214 |
---- a/po/Makefile |
215 |
-+++ b/po/Makefile |
216 |
-@@ -26,10 +26,12 @@ endif |
217 |
- |
218 |
- install: |
219 |
- $(MAKE) all |
220 |
-+ifeq ($(enable_nls),1) |
221 |
- for f in $(FILES_MO) ; do \ |
222 |
- mkdir -p $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES ; \ |
223 |
- install -m 644 $$f $(DESTDIR)$(LOCALEDIR)/`basename $$f .mo`/LC_MESSAGES/$(PACKAGE).mo ; \ |
224 |
- done |
225 |
-+endif |
226 |
- |
227 |
- uninstall: |
228 |
- for f in $(FILES_MO) ; do \ |
229 |
|
230 |
diff --git a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild b/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild |
231 |
deleted file mode 100644 |
232 |
index 64e36c7c268..00000000000 |
233 |
--- a/sci-chemistry/gperiodic/gperiodic-2.0.10-r2.ebuild |
234 |
+++ /dev/null |
235 |
@@ -1,47 +0,0 @@ |
236 |
-# Copyright 1999-2020 Gentoo Authors |
237 |
-# Distributed under the terms of the GNU General Public License v2 |
238 |
- |
239 |
-EAPI=4 |
240 |
- |
241 |
-inherit eutils toolchain-funcs |
242 |
- |
243 |
-DESCRIPTION="Periodic table application for Linux" |
244 |
-HOMEPAGE="https://sourceforge.net/projects/gperiodic/" |
245 |
-SRC_URI="http://www.frantz.fi/software/${P}.tar.gz" |
246 |
- |
247 |
-KEYWORDS="amd64 x86" |
248 |
-SLOT="0" |
249 |
-LICENSE="GPL-2" |
250 |
-IUSE="nls" |
251 |
- |
252 |
-RDEPEND=" |
253 |
- sys-libs/ncurses:0 |
254 |
- x11-libs/gtk+:2 |
255 |
- x11-libs/cairo[X] |
256 |
- nls? ( sys-devel/gettext )" |
257 |
- |
258 |
-DEPEND="${RDEPEND} |
259 |
- virtual/pkgconfig" |
260 |
- |
261 |
-src_prepare() { |
262 |
- epatch \ |
263 |
- "${FILESDIR}"/${P}-makefile.patch \ |
264 |
- "${FILESDIR}"/${P}-nls.patch |
265 |
- sed \ |
266 |
- -e '/Encoding/d' \ |
267 |
- -i ${PN}.desktop || die |
268 |
-} |
269 |
- |
270 |
-src_compile() { |
271 |
- local myopts |
272 |
- use nls && myopts="enable_nls=1" || myopts="enable_nls=0" |
273 |
- emake CC=$(tc-getCC) ${myopts} |
274 |
-} |
275 |
- |
276 |
-src_install() { |
277 |
- local myopts |
278 |
- use nls && myopts="enable_nls=1" || myopts="enable_nls=0" |
279 |
- emake DESTDIR="${D}" ${myopts} install |
280 |
- dodoc AUTHORS ChangeLog README NEWS |
281 |
- newdoc po/README README.translation |
282 |
-} |
283 |
|
284 |
diff --git a/sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild b/sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild |
285 |
deleted file mode 100644 |
286 |
index 511cfe2ba42..00000000000 |
287 |
--- a/sci-chemistry/gperiodic/gperiodic-3.0.1.ebuild |
288 |
+++ /dev/null |
289 |
@@ -1,53 +0,0 @@ |
290 |
-# Copyright 1999-2020 Gentoo Authors |
291 |
-# Distributed under the terms of the GNU General Public License v2 |
292 |
- |
293 |
-EAPI=5 |
294 |
- |
295 |
-inherit eutils toolchain-funcs |
296 |
- |
297 |
-DESCRIPTION="Periodic table application for Linux" |
298 |
-HOMEPAGE="https://sourceforge.net/projects/gperiodic/" |
299 |
-SRC_URI="https://downloads.sourceforge.net/project/${PN}/${P}.tar.gz" |
300 |
- |
301 |
-KEYWORDS="~amd64 ~x86" |
302 |
-SLOT="0" |
303 |
-LICENSE="GPL-2" |
304 |
-IUSE="nls" |
305 |
-MY_AVAILABLE_LINGUAS=" be bg cs da de es fi fr gl id is it lt ms nl pl pt_BR pt ru sv tr uk" |
306 |
- |
307 |
-RDEPEND=" |
308 |
- sys-libs/ncurses:0 |
309 |
- x11-libs/gtk+:2 |
310 |
- x11-libs/cairo[X] |
311 |
- nls? ( sys-devel/gettext )" |
312 |
-DEPEND="${RDEPEND} |
313 |
- virtual/pkgconfig" |
314 |
- |
315 |
-src_prepare() { |
316 |
- epatch \ |
317 |
- "${FILESDIR}"/${P}-makefile.patch \ |
318 |
- "${FILESDIR}"/${P}-nls.patch |
319 |
- for lang in ${MY_AVAILABLE_LINGUAS}; do |
320 |
- if ! has ${lang} ${LINGUAS-${lang}}; then |
321 |
- einfo "Cleaning translation for ${lang}" |
322 |
- rm po/${lang}.po || die |
323 |
- fi |
324 |
- done |
325 |
-} |
326 |
- |
327 |
-src_compile() { |
328 |
- local myopts |
329 |
- use nls && myopts="enable_nls=1" || myopts="enable_nls=0" |
330 |
- emake \ |
331 |
- CFLAGS="${CFLAGS}" \ |
332 |
- LDFLAGS="${LDFLAGS}" \ |
333 |
- CC=$(tc-getCC) ${myopts} |
334 |
-} |
335 |
- |
336 |
-src_install() { |
337 |
- local myopts |
338 |
- use nls && myopts="enable_nls=1" || myopts="enable_nls=0" |
339 |
- emake DESTDIR="${D}" ${myopts} install |
340 |
- dodoc AUTHORS ChangeLog README |
341 |
- newdoc po/README README.translation |
342 |
-} |