1 |
commit: 72ec14ed1096f92e692662145033c84f05b57523 |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Dec 16 10:56:07 2015 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Dec 16 10:57:21 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ec14ed |
7 |
|
8 |
dev-java/jacl: Clean up old. |
9 |
|
10 |
Package-Manager: portage-2.2.20.1 |
11 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
12 |
|
13 |
dev-java/jacl/Manifest | 1 - |
14 |
dev-java/jacl/files/1.3.3-javacflags.patch | 36 --------------------- |
15 |
dev-java/jacl/files/jacl-1.4.1-build.patch | 39 ----------------------- |
16 |
dev-java/jacl/jacl-1.4.1.ebuild | 51 ------------------------------ |
17 |
4 files changed, 127 deletions(-) |
18 |
|
19 |
diff --git a/dev-java/jacl/Manifest b/dev-java/jacl/Manifest |
20 |
index 9b2b2a4..fa50ef4 100644 |
21 |
--- a/dev-java/jacl/Manifest |
22 |
+++ b/dev-java/jacl/Manifest |
23 |
@@ -1,2 +1 @@ |
24 |
DIST jacl-1.4.1.tar.gz 1921630 SHA256 0edac0a7d2253c29c44ccc92427fa9ad4ee81b6c82142e417f72399a8584b749 SHA512 e4b906efbd3ef4ab9338e8bf2f50c3b820e25b9fbe61f194e90cc0fa128f68d64eb459f7b05171d4b86b4c9635ef483906a02952bdedcee89ccb92256b789247 WHIRLPOOL d40416577c88403a34b3f4c2c7ba45365330690832d4f7c4013a4c17b3ae2e589e99a9d7c8a93d18b4690fdefad1e3298dd28b3b89a467b8dcf2138e3e3b58cf |
25 |
-DIST jacl1.4.1.tar.gz 1921630 SHA256 0edac0a7d2253c29c44ccc92427fa9ad4ee81b6c82142e417f72399a8584b749 SHA512 e4b906efbd3ef4ab9338e8bf2f50c3b820e25b9fbe61f194e90cc0fa128f68d64eb459f7b05171d4b86b4c9635ef483906a02952bdedcee89ccb92256b789247 WHIRLPOOL d40416577c88403a34b3f4c2c7ba45365330690832d4f7c4013a4c17b3ae2e589e99a9d7c8a93d18b4690fdefad1e3298dd28b3b89a467b8dcf2138e3e3b58cf |
26 |
|
27 |
diff --git a/dev-java/jacl/files/1.3.3-javacflags.patch b/dev-java/jacl/files/1.3.3-javacflags.patch |
28 |
deleted file mode 100644 |
29 |
index 600cabc..0000000 |
30 |
--- a/dev-java/jacl/files/1.3.3-javacflags.patch |
31 |
+++ /dev/null |
32 |
@@ -1,36 +0,0 @@ |
33 |
-Index: Makefile.in |
34 |
-=================================================================== |
35 |
-RCS file: /cvsroot/tcljava/tcljava/Makefile.in,v |
36 |
-retrieving revision 1.60 |
37 |
-diff -u -r1.60 Makefile.in |
38 |
---- Makefile.in 5 Aug 2006 01:50:11 -0000 1.60 |
39 |
-+++ Makefile.in 3 Apr 2007 08:51:22 -0000 |
40 |
-@@ -54,7 +54,7 @@ |
41 |
- XTERM = xterm |
42 |
- JAVA_FLAGS = @JAVA_FLAGS@ |
43 |
- JAVA_G_FLAGS = @JAVA_G_FLAGS@ |
44 |
--JAVAC_FLAGS = @JAVAC_FLAGS@ |
45 |
-+JAVAC_FLAGS ?= @JAVAC_FLAGS@ |
46 |
- JAVAC_D_FLAG = @JAVAC_D_FLAG@ |
47 |
- JAR_EXTRACT_FLAGS = @JAR_EXTRACT_FLAGS@ |
48 |
- JAR_COMPRESS_FLAGS = @JAR_COMPRESS_FLAGS@ |
49 |
-Index: tcljava.m4 |
50 |
-=================================================================== |
51 |
-RCS file: /cvsroot/tcljava/tcljava/tcljava.m4,v |
52 |
-retrieving revision 1.35 |
53 |
-diff -u -r1.35 tcljava.m4 |
54 |
---- tcljava.m4 21 Aug 2006 22:26:37 -0000 1.35 |
55 |
-+++ tcljava.m4 3 Apr 2007 08:51:28 -0000 |
56 |
-@@ -226,9 +226,9 @@ |
57 |
- # Look for a setting for the CLASSPATH, we might need one to run JAVAC |
58 |
- AC_JAVA_CLASSPATH |
59 |
- |
60 |
-- # FIXME : add detection of command line arguments for JAVAC |
61 |
-- |
62 |
-- JAVAC_FLAGS=-g |
63 |
-+ if test "x${JAVAC_FLAGS}" = "x"; then |
64 |
-+ JAVAC_FLAGS=-g |
65 |
-+ fi |
66 |
- JAVAC_D_FLAG=-d |
67 |
- |
68 |
- dnl Test out the Java compiler with an empty class |
69 |
|
70 |
diff --git a/dev-java/jacl/files/jacl-1.4.1-build.patch b/dev-java/jacl/files/jacl-1.4.1-build.patch |
71 |
deleted file mode 100644 |
72 |
index 5f2ccf9..0000000 |
73 |
--- a/dev-java/jacl/files/jacl-1.4.1-build.patch |
74 |
+++ /dev/null |
75 |
@@ -1,39 +0,0 @@ |
76 |
-diff -Naur jacl1.4.1.bak/Makefile.in jacl1.4.1/Makefile.in |
77 |
---- jacl1.4.1.bak/Makefile.in 2008-09-14 14:44:18.000000000 +1200 |
78 |
-+++ jacl1.4.1/Makefile.in 2008-09-14 14:46:31.000000000 +1200 |
79 |
-@@ -54,7 +54,7 @@ |
80 |
- XTERM = xterm |
81 |
- JAVA_FLAGS = @JAVA_FLAGS@ |
82 |
- JAVA_G_FLAGS = @JAVA_G_FLAGS@ |
83 |
--JAVAC_FLAGS = @JAVAC_FLAGS@ |
84 |
-+JAVAC_FLAGS ?= @JAVAC_FLAGS@ |
85 |
- JAVAC_D_FLAG = @JAVAC_D_FLAG@ |
86 |
- JAR_EXTRACT_FLAGS = @JAR_EXTRACT_FLAGS@ |
87 |
- JAR_COMPRESS_FLAGS = @JAR_COMPRESS_FLAGS@ |
88 |
-@@ -983,8 +983,8 @@ |
89 |
- $(JAVAC) $(JAVAC_FLAGS) \ |
90 |
- $(JAVAC_D_FLAG) $(TCLJAVA_BUILD_DIR) \ |
91 |
- tcl/lang/*.java |
92 |
-- mkdir $(TCLJAVA_BUILD_DIR)/tcl/lang/library |
93 |
-- mkdir $(TCLJAVA_BUILD_DIR)/tcl/lang/library/java |
94 |
-+ mkdir -p $(TCLJAVA_BUILD_DIR)/tcl/lang/library |
95 |
-+ mkdir -p $(TCLJAVA_BUILD_DIR)/tcl/lang/library/java |
96 |
- cp -fr $(TCLJAVA_SRC_DIR)/tcl/lang/library/java/*.tcl \ |
97 |
- $(TCLJAVA_BUILD_DIR)/tcl/lang/library/java |
98 |
- |
99 |
-diff -Naur jacl1.4.1.bak/tcljava.m4 jacl1.4.1/tcljava.m4 |
100 |
---- jacl1.4.1.bak/tcljava.m4 2008-09-14 14:44:18.000000000 +1200 |
101 |
-+++ jacl1.4.1/tcljava.m4 2008-09-14 14:44:30.000000000 +1200 |
102 |
-@@ -226,9 +226,9 @@ |
103 |
- # Look for a setting for the CLASSPATH, we might need one to run JAVAC |
104 |
- AC_JAVA_CLASSPATH |
105 |
- |
106 |
-- # FIXME : add detection of command line arguments for JAVAC |
107 |
-- |
108 |
-- JAVAC_FLAGS=-g |
109 |
-+ if test "x${JAVAC_FLAGS}" = "x"; then |
110 |
-+ JAVAC_FLAGS=-g |
111 |
-+ fi |
112 |
- JAVAC_D_FLAG=-d |
113 |
- |
114 |
- dnl Test out the Java compiler with an empty class |
115 |
|
116 |
diff --git a/dev-java/jacl/jacl-1.4.1.ebuild b/dev-java/jacl/jacl-1.4.1.ebuild |
117 |
deleted file mode 100644 |
118 |
index 983cee4..0000000 |
119 |
--- a/dev-java/jacl/jacl-1.4.1.ebuild |
120 |
+++ /dev/null |
121 |
@@ -1,51 +0,0 @@ |
122 |
-# Copyright 1999-2014 Gentoo Foundation |
123 |
-# Distributed under the terms of the GNU General Public License v2 |
124 |
-# $Id$ |
125 |
- |
126 |
-inherit base java-pkg-2 |
127 |
- |
128 |
-DESCRIPTION="Jacl is an implementation of Tcl written in Java" |
129 |
-HOMEPAGE="http://tcljava.sourceforge.net" |
130 |
-MY_P="${P//-}" |
131 |
-SRC_URI="mirror://sourceforge/tcljava/${MY_P}.tar.gz" |
132 |
-LICENSE="BSD" |
133 |
-SLOT="0" |
134 |
-KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" |
135 |
-IUSE="doc" |
136 |
- |
137 |
-RDEPEND=">=dev-lang/tcl-8.4.5 |
138 |
- >=virtual/jre-1.4" |
139 |
-DEPEND=">=virtual/jdk-1.4 |
140 |
- ${RDEPEND}" |
141 |
- |
142 |
-S=${WORKDIR}/${MY_P} |
143 |
- |
144 |
-PATCHES=( "${FILESDIR}/${P}-build.patch" ) |
145 |
- |
146 |
-# jikes support disabled for now. |
147 |
-# refer to bug #100020 and bug #89711 |
148 |
- |
149 |
-src_compile() { |
150 |
- local jflags="$(java-pkg_javac-args)" |
151 |
- JAVAC_FLAGS="${jflags}" \ |
152 |
- econf --enable-jacl --without-jikes || die |
153 |
- #ali_bush: Fails intermitently with MAKEOPTS="-j3" |
154 |
- JAVAC_FLAGS="${jflags}" \ |
155 |
- emake -j1 DESTDIR="/usr/share/${PN}" || die "emake failed" |
156 |
-} |
157 |
- |
158 |
-RESTRICT="test" |
159 |
-# Dies with anything else besides 1.4 so more trouble than benefit |
160 |
-src_test() { |
161 |
- emake check || die "Tests failed" |
162 |
- einfo "Some tests are known to fail. We didn't restrict them" |
163 |
- einfo "because the ebuild doesn't die." |
164 |
-} |
165 |
- |
166 |
-src_install() { |
167 |
- #emake DESTDIR="${D}" install || die "emake install failed" |
168 |
- java-pkg_dojar *.jar |
169 |
- java-pkg_dolauncher jaclsh --main tcl.lang.Shell |
170 |
- dodoc README ChangeLog known_issues.txt || die |
171 |
- use doc && java-pkg_dohtml -r docs/* |
172 |
-} |