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

Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/proj/prefix:master commit in: dev-java/libreadline-java/, dev-java/libreadline-java/files/
Date: Sat, 10 Apr 2021 07:20:21
Message-Id: 1618039118.5e04f8ab93cf6e4f543431ec16ed29bfad58b76a.sam@gentoo
1 commit: 5e04f8ab93cf6e4f543431ec16ed29bfad58b76a
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 10 07:18:38 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 10 07:18:38 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/proj/prefix.git/commit/?id=5e04f8ab
7
8 dev-java/libreadline-java: drop old EAPI 2 package
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 dev-java/libreadline-java/Manifest | 1 -
13 .../files/libreadline-java-0.8.0-darwin.patch | 42 ----------------
14 .../files/libreadline-java-0.8.0-gmake.patch | 21 --------
15 .../files/libreadline-java-0.8.0-ldflags.patch | 12 -----
16 .../libreadline-java-0.8.0-respect-flags.patch | 27 -----------
17 .../files/termcap-to-ncurses.patch | 13 -----
18 .../libreadline-java-0.8.0-r2.ebuild | 54 ---------------------
19 .../libreadline-java-0.8.0-r3.ebuild | 56 ----------------------
20 dev-java/libreadline-java/metadata.xml | 11 -----
21 9 files changed, 237 deletions(-)
22
23 diff --git a/dev-java/libreadline-java/Manifest b/dev-java/libreadline-java/Manifest
24 deleted file mode 100644
25 index d425c5b2ea..0000000000
26 --- a/dev-java/libreadline-java/Manifest
27 +++ /dev/null
28 @@ -1 +0,0 @@
29 -DIST libreadline-java-0.8.0-src.tar.gz 77122 BLAKE2B cd25c3aea6189d0d48a10c26ad2f359e7f22533fd4a22d22b8491fd19c2d12c0fda6c8f1b8908bd66be8094efb374a51c6877eb89835360c4a2be8d9107d1336 SHA512 16bbb01a4852244387d63d8d5a7203e2862f235d8a68b436f33b586c7a6ea5297d1fabfa910c54bc33cfdc43b5dfe80e9eb4828b80196a974410c90387c3d1f2
30
31 diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-darwin.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-darwin.patch
32 deleted file mode 100644
33 index 95f16badff..0000000000
34 --- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-darwin.patch
35 +++ /dev/null
36 @@ -1,42 +0,0 @@
37 ---- src/native/Makefile
38 -+++ src/native/Makefile
39 -@@ -54,7 +54,11 @@
40 - CC = gcc
41 - OBJ_EXT := o
42 - LIB_PRE := lib
43 -+ifeq ($(shell uname -s), Darwin)
44 -+LIB_EXT := dylib
45 -+else
46 - LIB_EXT := so
47 -+endif
48 - CFLAGS=-fPIC -DPOSIX
49 - endif
50 -
51 -@@ -97,9 +97,13 @@
52 - $(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
53 - $(OBJECTS) -W1,-e,_readline_init@12
54 - else
55 -+ifeq ($(shell uname -s), Darwin)
56 -+ $(CC) -bundle $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
57 -+else
58 - $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
59 - endif
60 - endif
61 -+endif
62 -
63 - getline.$(OBJ_EXT): getline.c
64 - $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) -D$(TG) -c getline.c
65 ---- Makefile
66 -+++ Makefile
67 -@@ -140,7 +140,11 @@
68 - rpm --define _topdir$(RPM_BASE) -ba $(RPM_BASE)/SPECS/libreadline-java.spec
69 -
70 - test: $(JAR) build-native
71 -+ifeq ($(shell uname -s), Darwin)
72 -+ DYLD_LIBRARY_PATH=. java -jar $(JAR) src/test/tinputrc $(ARGS)
73 -+else
74 - LD_LIBRARY_PATH=. java -jar $(JAR) src/test/tinputrc $(ARGS)
75 -+endif
76 -
77 - clean:
78 - $(MAKE) -C src/native clean
79
80 diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
81 deleted file mode 100644
82 index 6de5cde18e..0000000000
83 --- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-gmake.patch
84 +++ /dev/null
85 @@ -1,21 +0,0 @@
86 -Index: libreadline-java-0.8.0/src/native/Makefile
87 -===================================================================
88 ---- libreadline-java-0.8.0.orig/src/native/Makefile
89 -+++ libreadline-java-0.8.0/src/native/Makefile
90 -@@ -69,13 +69,13 @@ all: $(T_LIBS)
91 - lib: $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT)
92 -
93 - JavaReadline:
94 -- make TG=$@ lib
95 -+ $(MAKE) TG=$@ lib
96 -
97 - JavaEditline:
98 -- make TG=$@ lib
99 -+ $(MAKE) TG=$@ lib
100 -
101 - JavaGetline:
102 -- make TG=$@ lib
103 -+ $(MAKE) TG=$@ lib
104 -
105 - $(ROOTDIR)/$(LIB_PRE)$(TG).$(LIB_EXT): $(OBJECTS)
106 - ifeq (MSC,$(WIN32))
107
108 diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-ldflags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-ldflags.patch
109 deleted file mode 100644
110 index e0783bdab5..0000000000
111 --- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-ldflags.patch
112 +++ /dev/null
113 @@ -1,12 +0,0 @@
114 -diff -Nur libreadline-java-0.8.0/src/native/Makefile libreadline-java-0.8.0_patched/src/native/Makefile
115 ---- libreadline-java-0.8.0/src/native/Makefile 2003-01-07 12:14:35.000000000 +0200
116 -+++ libreadline-java-0.8.0_patched/src/native/Makefile 2010-09-13 20:31:56.000000000 +0300
117 -@@ -97,7 +97,7 @@
118 - $(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
119 - $(OBJECTS) -W1,-e,_readline_init@12
120 - else
121 -- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
122 -+ $(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
123 - endif
124 - endif
125 -
126
127 diff --git a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch b/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
128 deleted file mode 100644
129 index 9af21ba83d..0000000000
130 --- a/dev-java/libreadline-java/files/libreadline-java-0.8.0-respect-flags.patch
131 +++ /dev/null
132 @@ -1,27 +0,0 @@
133 -diff --git a/src/native/Makefile b/src/native/Makefile
134 -index 679adb7..a1f2a6a 100644
135 ---- a/src/native/Makefile
136 -+++ b/src/native/Makefile
137 -@@ -51,11 +51,11 @@ JavaEditline_LIBS = -ledit -ltermcap
138 - ifeq (cygwin,$(WIN32))
139 - JavaGetline_LIBS = -lcygwin
140 - endif
141 --CC = gcc
142 -+CC ?= gcc
143 - OBJ_EXT := o
144 - LIB_PRE := lib
145 - LIB_EXT := so
146 --CFLAGS=-fPIC -DPOSIX
147 -+CFLAGS += -fPIC -DPOSIX
148 - endif
149 -
150 -
151 -@@ -97,7 +97,7 @@ ifeq (CYGWIN,$(WIN32))
152 - $(CC) -W1,$(ROOTDIR)/lib$(TG).exp -o $@ \
153 - $(OBJECTS) -W1,-e,_readline_init@12
154 - else
155 -- $(CC) -shared $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
156 -+ $(CC) -shared $(LDFLAGS) $(OBJECTS) $(LIBPATH) $($(TG)_LIBS) -o $@
157 - endif
158 - endif
159 -
160
161 diff --git a/dev-java/libreadline-java/files/termcap-to-ncurses.patch b/dev-java/libreadline-java/files/termcap-to-ncurses.patch
162 deleted file mode 100644
163 index 22921c80ba..0000000000
164 --- a/dev-java/libreadline-java/files/termcap-to-ncurses.patch
165 +++ /dev/null
166 @@ -1,13 +0,0 @@
167 ---- src/native/Makefile.org 2004-09-07 16:43:16.703100016 +0200
168 -+++ src/native/Makefile 2004-09-07 16:43:28.804919625 +0200
169 -@@ -45,8 +45,8 @@
170 - CFLAGS=-DWIN32=$(WIN32) -D__IBMC__
171 - else
172 - INCLUDES = -I $(JAVAINCLUDE) -I $(JAVANATINC)
173 --LIBPATH = -L/usr/lib/termcap
174 --JavaReadline_LIBS = -lreadline -ltermcap -lhistory
175 -+LIBPATH =
176 -+JavaReadline_LIBS = -lreadline -lncurses -lhistory
177 - JavaEditline_LIBS = -ledit -ltermcap
178 - ifeq (cygwin,$(WIN32))
179 - JavaGetline_LIBS = -lcygwin
180
181 diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild
182 deleted file mode 100644
183 index 9bed7c0c1b..0000000000
184 --- a/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild
185 +++ /dev/null
186 @@ -1,54 +0,0 @@
187 -# Copyright 1999-2021 Gentoo Authors
188 -# Distributed under the terms of the GNU General Public License v2
189 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r2.ebuild,v 1.12 2012/01/01 13:31:35 sera Exp $
190 -
191 -JAVA_PKG_IUSE="doc source"
192 -
193 -inherit java-pkg-2 eutils
194 -
195 -DESCRIPTION="A JNI-wrapper to GNU Readline."
196 -HOMEPAGE="http://java-readline.sourceforge.net/"
197 -SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz"
198 -
199 -LICENSE="LGPL-2.1"
200 -SLOT="0"
201 -KEYWORDS="~amd64-linux ~x86-linux"
202 -IUSE="elibc_FreeBSD"
203 -
204 -COMMON_DEP="sys-libs/ncurses"
205 -RDEPEND=">=virtual/jre-1.4
206 - ${COMMON_DEP}"
207 -DEPEND=">=virtual/jdk-1.4
208 - ${COMMON_DEP}"
209 -RESTRICT="test"
210 -
211 -src_unpack() {
212 - unpack ${A}
213 - cd "${S}"
214 - epatch "${FILESDIR}/termcap-to-ncurses.patch"
215 - # bug #157387, reported upstream
216 - epatch "${FILESDIR}/${P}-gmake.patch"
217 -
218 - epatch "${FILESDIR}/${P}-darwin.patch"
219 -
220 - # bug #157390
221 - sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
222 - if use elibc_FreeBSD; then
223 - sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
224 - fi
225 -}
226 -
227 -src_compile() {
228 - emake -j1 || die "failed to compile"
229 - if use doc; then
230 - emake -j1 apidoc || die "failed to generate docs"
231 - fi
232 -}
233 -
234 -src_install() {
235 - java-pkg_doso *$(get_libname)
236 - java-pkg_dojar *.jar
237 - use source && java-pkg_dosrc src/*
238 - use doc && java-pkg_dojavadoc api
239 - dodoc ChangeLog NEWS README README.1st TODO || die
240 -}
241
242 diff --git a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild b/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
243 deleted file mode 100644
244 index ef13cde7f0..0000000000
245 --- a/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild
246 +++ /dev/null
247 @@ -1,56 +0,0 @@
248 -# Copyright 1999-2021 Gentoo Authors
249 -# Distributed under the terms of the GNU General Public License v2
250 -# $Header: /var/cvsroot/gentoo-x86/dev-java/libreadline-java/libreadline-java-0.8.0-r3.ebuild,v 1.8 2012/05/04 18:49:51 sera Exp $
251 -
252 -EAPI=2
253 -JAVA_PKG_IUSE="doc source"
254 -
255 -inherit java-pkg-2 eutils
256 -
257 -DESCRIPTION="A JNI-wrapper to GNU Readline."
258 -HOMEPAGE="http://java-readline.sourceforge.net/"
259 -SRC_URI="mirror://sourceforge/java-readline/${P}-src.tar.gz"
260 -
261 -LICENSE="LGPL-2.1"
262 -SLOT="0"
263 -KEYWORDS="~amd64-linux ~x86-linux"
264 -IUSE="elibc_FreeBSD"
265 -
266 -COMMON_DEP="sys-libs/ncurses"
267 -RDEPEND=">=virtual/jre-1.4
268 - ${COMMON_DEP}"
269 -DEPEND=">=virtual/jdk-1.4
270 - ${COMMON_DEP}"
271 -RESTRICT="test"
272 -
273 -java_prepare() {
274 - epatch "${FILESDIR}/termcap-to-ncurses.patch"
275 - # bug #157387, reported upstream
276 - epatch "${FILESDIR}/${P}-gmake.patch"
277 -
278 - epatch "${FILESDIR}/${P}-darwin.patch"
279 -
280 - # bug #157390
281 - sed -i "s/^\(JC_FLAGS =\)/\1 $(java-pkg_javac-args)/" Makefile || die
282 - if use elibc_FreeBSD; then
283 - sed -i -e '/JAVANATINC/s:linux:freebsd:' Makefile || die "sed JAVANATINC failed"
284 - fi
285 -
286 - #Respect CC CFLAGS LDFLAGS #336302 #296741
287 - epatch "${FILESDIR}"/${P}-respect-flags.patch
288 -}
289 -
290 -src_compile() {
291 - emake -j1 || die "failed to compile"
292 - if use doc; then
293 - emake -j1 apidoc || die "failed to generate docs"
294 - fi
295 -}
296 -
297 -src_install() {
298 - java-pkg_doso *$(get_libname)
299 - java-pkg_dojar *.jar
300 - use source && java-pkg_dosrc src/*
301 - use doc && java-pkg_dojavadoc api
302 - dodoc ChangeLog NEWS README README.1st TODO || die
303 -}
304
305 diff --git a/dev-java/libreadline-java/metadata.xml b/dev-java/libreadline-java/metadata.xml
306 deleted file mode 100644
307 index ee80557bb2..0000000000
308 --- a/dev-java/libreadline-java/metadata.xml
309 +++ /dev/null
310 @@ -1,11 +0,0 @@
311 -<?xml version="1.0" encoding="UTF-8"?>
312 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
313 -<pkgmetadata>
314 - <maintainer type="project">
315 - <email>java@g.o</email>
316 - <name>Java</name>
317 - </maintainer>
318 - <upstream>
319 - <remote-id type="sourceforge">java-readline</remote-id>
320 - </upstream>
321 -</pkgmetadata>
Report Message
Find on MARC Find on Google Groups