1 |
commit: 29a0776d522dae4c492a8eca94c7a4864bb10c98 |
2 |
Author: Florian Schmaus <flow <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Aug 26 12:56:28 2022 +0000 |
4 |
Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Aug 26 12:58:15 2022 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29a0776d |
7 |
|
8 |
Revert "dev-java/jython: dependency switch dev-java/jffi slot 1.3" |
9 |
|
10 |
This reverts commit 9e60213f5c0880c167d9d035248365b30d6bad30 due to |
11 |
|
12 |
NonsolvableDepsInStable nonsolvable depset(depend) keyword(~arm) stable profile (default/linux/arm/17.0) (3 total): solutions: [ dev-java/jffi:1.3 ] |
13 |
NonsolvableDepsInStable nonsolvable depset(rdepend) keyword(~arm) stable profile (default/linux/arm/17.0) (3 total): solutions: [ dev-java/jffi:1.3 ] |
14 |
|
15 |
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> |
16 |
|
17 |
dev-java/jython/jython-2.7.0-r7.ebuild | 156 --------------------------------- |
18 |
1 file changed, 156 deletions(-) |
19 |
|
20 |
diff --git a/dev-java/jython/jython-2.7.0-r7.ebuild b/dev-java/jython/jython-2.7.0-r7.ebuild |
21 |
deleted file mode 100644 |
22 |
index b05f5ed59d82..000000000000 |
23 |
--- a/dev-java/jython/jython-2.7.0-r7.ebuild |
24 |
+++ /dev/null |
25 |
@@ -1,156 +0,0 @@ |
26 |
-# Copyright 1999-2022 Gentoo Authors |
27 |
-# Distributed under the terms of the GNU General Public License v2 |
28 |
- |
29 |
-EAPI=8 |
30 |
- |
31 |
-JAVA_PKG_IUSE="doc source" |
32 |
-MAVEN_ID="org.python:jython:2.7.0" |
33 |
- |
34 |
-inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic |
35 |
- |
36 |
-MY_PV=${PV/_beta/-b} |
37 |
-MY_P=${PN}-${MY_PV} |
38 |
- |
39 |
-DESCRIPTION="An implementation of Python written in Java" |
40 |
-HOMEPAGE="https://www.jython.org" |
41 |
-SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar" |
42 |
- |
43 |
-LICENSE="PSF-2" |
44 |
-SLOT="2.7" |
45 |
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux" |
46 |
-IUSE="examples test" |
47 |
- |
48 |
-CP_DEPEND="dev-java/antlr:3 |
49 |
- dev-java/netty:0 |
50 |
- dev-java/asm:9 |
51 |
- dev-java/commons-compress:0 |
52 |
- dev-java/guava:0 |
53 |
- dev-java/jffi:1.3 |
54 |
- dev-java/jline:2 |
55 |
- dev-java/icu4j:70 |
56 |
- dev-java/jnr-constants:0 |
57 |
- dev-java/jnr-posix:3.0 |
58 |
- dev-java/jnr-netdb:1.0 |
59 |
- dev-java/stringtemplate:0 |
60 |
- dev-java/xerces:2 |
61 |
- java-virtuals/servlet-api:3.0" |
62 |
-RDEPEND="${CP_DEPEND} |
63 |
- >=virtual/jre-1.8:*" |
64 |
-DEPEND="${CP_DEPEND} |
65 |
- >=virtual/jdk-1.8:* |
66 |
- dev-java/ant-core:0 |
67 |
- test? ( |
68 |
- dev-java/junit:4 |
69 |
- dev-java/ant-junit:0 |
70 |
- )" |
71 |
-BDEPEND="app-arch/unzip" |
72 |
- |
73 |
-S=${WORKDIR} |
74 |
- |
75 |
-RESTRICT="test" |
76 |
- |
77 |
-JAVA_ANT_REWRITE_CLASSPATH="yes" |
78 |
-JAVA_ANT_CLASSPATH_TAGS+=" java" |
79 |
- |
80 |
-EANT_BUILD_TARGET="developer-build" |
81 |
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist" |
82 |
- |
83 |
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed. |
84 |
-# Uncomment and add to CDEPEND if you want either of them |
85 |
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix" EANT_EXTRA_ARGS+=" -Dinformix.present" |
86 |
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present" |
87 |
- |
88 |
-PATCHES=( |
89 |
- "${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch |
90 |
- "${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch |
91 |
- "${FILESDIR}"/${PN}-2.7_beta1-ant.patch |
92 |
- "${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch |
93 |
- "${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch |
94 |
- "${FILESDIR}"/${PN}-2.7.0-build.xml.patch |
95 |
- "${FILESDIR}"/CVE-2016-4000.patch |
96 |
-) |
97 |
- |
98 |
-src_prepare() { |
99 |
- default |
100 |
- |
101 |
- find \( -name '*.jar' -o -name '*.class' \ |
102 |
- -o -name '*.pyc' -o -name '*.exe' \) -delete |
103 |
- |
104 |
- # needed for launchertest |
105 |
- chmod +x tests/shell/test-jython.sh || die |
106 |
- |
107 |
- # https://bugs.gentoo.org/show_bug.cgi?id=833785 |
108 |
- sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \ |
109 |
- -i src/org/python/core/Py{,BaseCode,Unicode}.java || die |
110 |
- |
111 |
- java-pkg-2_src_prepare |
112 |
-} |
113 |
- |
114 |
-src_configure() { |
115 |
- # apparently this can cause problems |
116 |
- append-flags -fno-stack-protector |
117 |
- |
118 |
- EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)" |
119 |
- EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)" |
120 |
-} |
121 |
- |
122 |
-src_test() { |
123 |
- java-pkg-2_src_test |
124 |
-} |
125 |
- |
126 |
-src_install() { |
127 |
- local instdir=/usr/share/${PN}-${SLOT} |
128 |
- |
129 |
- java-pkg_newjar dist/${PN}-dev.jar |
130 |
- |
131 |
- java-pkg_register-optional-dependency jdbc-mysql |
132 |
- java-pkg_register-optional-dependency jdbc-postgresql |
133 |
- |
134 |
- insinto ${instdir} |
135 |
- doins -r dist/{Lib,registry} |
136 |
- |
137 |
- dodoc ACKNOWLEDGMENTS NEWS README.txt |
138 |
- |
139 |
- use doc && java-pkg_dohtml -r dist/Doc/javadoc |
140 |
- use source && java-pkg_dosrc src/* |
141 |
- use examples && java-pkg_doexamples Demo/* |
142 |
- |
143 |
- local java_args=( |
144 |
- -Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT} |
145 |
- -Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT} |
146 |
- -Dpython.cachedir="\${HOME}/.jythoncachedir" |
147 |
- ) |
148 |
- |
149 |
- java-pkg_dolauncher jython${SLOT} \ |
150 |
- --main org.python.util.jython \ |
151 |
- --java_args "${java_args[*]}" |
152 |
- |
153 |
- # we need a wrapper to help python_optimize |
154 |
- cat <<-EOF > "${T}"/jython |
155 |
- exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \ |
156 |
- -Dpython.home="${ED}${instdir}" \ |
157 |
- -Dpython.cachedir="${T}/.jythoncachedir" \ |
158 |
- -Duser.home="${T}" \ |
159 |
- org.python.util.jython "\${@}" |
160 |
- EOF |
161 |
- chmod +x "${T}"/jython || die |
162 |
- |
163 |
- local -x PYTHON="${T}"/jython |
164 |
- # we can't get the path from the interpreter since it does some |
165 |
- # magic that fails on non-installed copy... |
166 |
- _python_export jython${SLOT} EPYTHON |
167 |
- |
168 |
- # compile tests (everything else is compiled already) |
169 |
- # we're keeping it quiet since jython reports errors verbosely |
170 |
- # and some of the tests are supposed to trigger compile errors |
171 |
- python_optimize "${ED}${instdir}"/Lib/test &>/dev/null |
172 |
- |
173 |
- # for python-exec |
174 |
- echo "EPYTHON='${EPYTHON}'" > epython.py || die |
175 |
- python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages" |
176 |
- python_domodule epython.py |
177 |
- |
178 |
- # some of the class files end up with newer timestamps than the files they |
179 |
- # were generated from, make sure this doesn't happen |
180 |
- find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch |
181 |
-} |