1 |
commit: 93eb3953f544606e5ff49246533f5d086dd2387b |
2 |
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> |
3 |
AuthorDate: Fri Apr 8 16:01:48 2022 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 9 04:58:34 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93eb3953 |
7 |
|
8 |
dev-java/rhino: drop 1.7.7-r1 |
9 |
|
10 |
Closes: https://bugs.gentoo.org/837302 |
11 |
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/24957 |
13 |
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> |
14 |
|
15 |
dev-java/rhino/Manifest | 1 - |
16 |
.../files/rhino-1.7.7-testsrc-build.xml.patch | 40 --------- |
17 |
dev-java/rhino/rhino-1.7.7-r1.ebuild | 95 ---------------------- |
18 |
3 files changed, 136 deletions(-) |
19 |
|
20 |
diff --git a/dev-java/rhino/Manifest b/dev-java/rhino/Manifest |
21 |
index 569bb6a5f328..df2bb4acf7d4 100644 |
22 |
--- a/dev-java/rhino/Manifest |
23 |
+++ b/dev-java/rhino/Manifest |
24 |
@@ -1,2 +1 @@ |
25 |
-DIST Rhino1_7_7_RELEASE.zip 6059127 BLAKE2B 431885bf287da524cfc82e6594802c93e75d48177b4056e9b893d7c852c3c3b30291d616a140981e520fdebacf5cbc8b802a6137f0e29a369f1d01cc771c6b77 SHA512 ce89b6a153d62dd459a86360c67d6db4b05922d8ab49a8d45ccb0deb0f639cd819f0ad75cb4929eda6b7f0fd6ddb5879a4035de6968283317bfd0e93d2bb744e |
26 |
DIST rhino-1.7.14.tar.gz 4694660 BLAKE2B d6ba958265c4ebf881161d0b61f598ac7e82d7be4e6b0fbd6416e7b0af7835058a2744ab5524b6ff698159898e962cc246ac559e9c5db1b4467b147700e894e0 SHA512 f20e8a8f7c78c88d815c53f89f3f18a53c2e86d92a284cd275aa5556c08962d2905f2d4fc829e5cb61d416cd55b13323d9a110f4f492f588a149b4d2105b21a1 |
27 |
|
28 |
diff --git a/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch b/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch |
29 |
deleted file mode 100644 |
30 |
index 4760e980245d..000000000000 |
31 |
--- a/dev-java/rhino/files/rhino-1.7.7-testsrc-build.xml.patch |
32 |
+++ /dev/null |
33 |
@@ -1,40 +0,0 @@ |
34 |
---- testsrc/build.xml.orig 2015-08-05 23:41:56.815000000 +0000 |
35 |
-+++ testsrc/build.xml 2015-08-05 23:46:10.026000000 +0000 |
36 |
-@@ -46,15 +46,8 @@ |
37 |
- --> |
38 |
- <property name="test.vm.mx" value="256m" /> |
39 |
- |
40 |
-- <target name="get-junit" unless="offline"> |
41 |
-- <mkdir dir="lib"/> |
42 |
-- <get src="${test.junit.url}" dest="lib/junit.jar" usetimestamp="true"/> |
43 |
-- <get src="${test.hamcrest.url}" dest="lib/hamcrest.jar" usetimestamp="true"/> |
44 |
-- </target> |
45 |
-- |
46 |
- <target name="junit-compile"> |
47 |
- <mkdir dir="${test.classes}" /> |
48 |
-- <antcall target="get-junit"/> |
49 |
- <javac |
50 |
- destdir="${test.classes}" debug="true" |
51 |
- encoding="UTF-8" |
52 |
-@@ -75,7 +68,6 @@ |
53 |
- |
54 |
- <target name="compile"> |
55 |
- <mkdir dir="${test.classes}" /> |
56 |
-- <antcall target="get-junit"/> |
57 |
- <javac |
58 |
- srcdir="testsrc" |
59 |
- destdir="${test.classes}" debug="true" |
60 |
-@@ -105,12 +97,7 @@ |
61 |
- <delete dir="${test.classes}" /> |
62 |
- </target> |
63 |
- |
64 |
-- <target name="get-emma" unless="offline"> |
65 |
-- <get src="${test.emma.url}" dest="lib/emma.jar" usetimestamp="true"/> |
66 |
-- <get src="${test.emma_ant.url}" dest="lib/emma_ant.jar" usetimestamp="true"/> |
67 |
-- </target> |
68 |
-- |
69 |
-- <target name="coverage-instrument" depends="get-emma"> |
70 |
-+ <target name="coverage-instrument"> |
71 |
- <property name="coverage.dir" location="${build.dir}/coverage"/> |
72 |
- <property name="coverage.classes.dir" location="${build.dir}/coverage/classes"/> |
73 |
- <mkdir dir="${coverage.classes.dir}"/> |
74 |
|
75 |
diff --git a/dev-java/rhino/rhino-1.7.7-r1.ebuild b/dev-java/rhino/rhino-1.7.7-r1.ebuild |
76 |
deleted file mode 100644 |
77 |
index 656ddd97e01f..000000000000 |
78 |
--- a/dev-java/rhino/rhino-1.7.7-r1.ebuild |
79 |
+++ /dev/null |
80 |
@@ -1,95 +0,0 @@ |
81 |
-# Copyright 1999-2022 Gentoo Authors |
82 |
-# Distributed under the terms of the GNU General Public License v2 |
83 |
- |
84 |
-EAPI="5" |
85 |
-JAVA_PKG_IUSE="doc examples source test" |
86 |
-MAVEN_ID="org.mozilla:rhino:1.7.7" |
87 |
- |
88 |
-inherit java-pkg-2 java-ant-2 versionator |
89 |
- |
90 |
-# rhino -> Rhino |
91 |
-MY_PN="${PN^}" |
92 |
- |
93 |
-# 1.7.7 -> 1_7_7 |
94 |
-MY_PV="$(replace_all_version_separators _ ${PV})" |
95 |
- |
96 |
-# rhino1.7.7 |
97 |
-MY_P="${PN}${PV}" |
98 |
- |
99 |
-# Rhino1_7_7_RELEASE |
100 |
-MY_RELEASE="${MY_PN}${MY_PV}_RELEASE" |
101 |
- |
102 |
-DESCRIPTION="An open-source implementation of JavaScript written in Java" |
103 |
-SRC_URI="https://github.com/mozilla/${PN}/archive/${MY_RELEASE}.zip" |
104 |
-HOMEPAGE="http://www.mozilla.org/rhino/" |
105 |
- |
106 |
-LICENSE="MPL-1.1 GPL-2" |
107 |
-SLOT="1.6" |
108 |
-KEYWORDS="amd64 ~arm arm64 ppc64 x86" |
109 |
-IUSE="" |
110 |
- |
111 |
-# ../rhino-Rhino1_7_7_RELEASE |
112 |
-S="${WORKDIR}/${PN}-${MY_RELEASE}" |
113 |
- |
114 |
-CDEPEND="" |
115 |
-RDEPEND=">=virtual/jre-1.6 |
116 |
- ${CDEPEND}" |
117 |
-DEPEND=">=virtual/jdk-1.6 |
118 |
- test? ( |
119 |
- dev-java/emma:0 |
120 |
- dev-java/junit:4 |
121 |
- dev-java/ant-junit:0 |
122 |
- dev-java/hamcrest-core:1.3 |
123 |
- ) |
124 |
- ${CDEPEND}" |
125 |
- |
126 |
-JAVA_ANT_REWRITE_CLASSPATH="yes" |
127 |
- |
128 |
-PATCHES=( |
129 |
- "${FILESDIR}"/${P}-testsrc-build.xml.patch |
130 |
-) |
131 |
- |
132 |
-EANT_TEST_TARGET="junit" |
133 |
- |
134 |
-# StackOverFlow errors arise on some tests. |
135 |
-# Further, the test suite takes way too much time (> 5 min). |
136 |
-# Maybe reduce the numbers of tests? |
137 |
-RESTRICT="test" |
138 |
- |
139 |
-java_prepare() { |
140 |
- java-pkg_clean |
141 |
- |
142 |
- epatch "${PATCHES[@]}" |
143 |
- |
144 |
- if use test; then |
145 |
- mkdir lib || die |
146 |
- java-pkg_jar-from --build-only emma emma.jar lib/emma.jar |
147 |
- java-pkg_jar-from --build-only emma emma_ant.jar lib/emma_ant.jar |
148 |
- java-pkg_jar-from --build-only hamcrest-core-1.3 hamcrest-core.jar lib/hamcrest.jar |
149 |
- java-pkg_jar-from --build-only junit-4 junit.jar lib/junit.jar |
150 |
- fi |
151 |
-} |
152 |
- |
153 |
-src_compile() { |
154 |
- java-pkg-2_src_compile |
155 |
- |
156 |
- if use source; then |
157 |
- EANT_BUILD_TARGET="source-zip" \ |
158 |
- java-pkg-2_src_compile |
159 |
- fi |
160 |
-} |
161 |
- |
162 |
-src_test() { |
163 |
- java-pkg-2_src_test |
164 |
-} |
165 |
- |
166 |
-src_install() { |
167 |
- java-pkg_dojar build/${MY_P}/js.jar |
168 |
- |
169 |
- java-pkg_dolauncher jsscript-${SLOT} \ |
170 |
- --main org.mozilla.javascript.tools.shell.Main |
171 |
- |
172 |
- use doc && java-pkg_dojavadoc "build/${MY_P}/javadoc" |
173 |
- use examples && java-pkg_doexamples examples |
174 |
- use source && java-pkg_dosrc {src,toolsrc,xmlimplsrc}/org |
175 |
-} |