| 1 |
thev00d00 12/08/26 16:16:22 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: jython-2.5.2-r2.ebuild |
| 5 |
Removed: jython-2.5.2-r1.ebuild |
| 6 |
Log: |
| 7 |
Add patch to fix SAXParser ClassNotFoundException #431754 |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.80 dev-java/jython/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/ChangeLog?rev=1.80&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/ChangeLog?rev=1.80&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/ChangeLog?r1=1.79&r2=1.80 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v |
| 21 |
retrieving revision 1.79 |
| 22 |
retrieving revision 1.80 |
| 23 |
diff -u -r1.79 -r1.80 |
| 24 |
--- ChangeLog 26 Aug 2012 13:43:40 -0000 1.79 |
| 25 |
+++ ChangeLog 26 Aug 2012 16:16:22 -0000 1.80 |
| 26 |
@@ -1,6 +1,13 @@ |
| 27 |
# ChangeLog for dev-java/jython |
| 28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.79 2012/08/26 13:43:40 thev00d00 Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.80 2012/08/26 16:16:22 thev00d00 Exp $ |
| 31 |
+ |
| 32 |
+*jython-2.5.2-r2 (26 Aug 2012) |
| 33 |
+ |
| 34 |
+ 26 Aug 2012; Ian Whyman <thev00d00@g.o> -jython-2.5.2-r1.ebuild, |
| 35 |
+ +jython-2.5.2-r2.ebuild, |
| 36 |
+ +files/jython-2.5.2-sax-parser-class-not-found.patch: |
| 37 |
+ Add patch to fix SAXParser ClassNotFoundException #431754 |
| 38 |
|
| 39 |
*jython-2.5.3-r1 (26 Aug 2012) |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
1.1 dev-java/jython/jython-2.5.2-r2.ebuild |
| 45 |
|
| 46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.5.2-r2.ebuild?rev=1.1&view=markup |
| 47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jython/jython-2.5.2-r2.ebuild?rev=1.1&content-type=text/plain |
| 48 |
|
| 49 |
Index: jython-2.5.2-r2.ebuild |
| 50 |
=================================================================== |
| 51 |
# Copyright 1999-2012 Gentoo Foundation |
| 52 |
# Distributed under the terms of the GNU General Public License v2 |
| 53 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.5.2-r2.ebuild,v 1.1 2012/08/26 16:16:22 thev00d00 Exp $ |
| 54 |
|
| 55 |
EAPI="4" |
| 56 |
|
| 57 |
JAVA_PKG_IUSE="doc examples source" |
| 58 |
|
| 59 |
inherit eutils java-pkg-2 java-ant-2 python |
| 60 |
|
| 61 |
PYTHON_ABI="${SLOT}-jython" |
| 62 |
|
| 63 |
DESCRIPTION="An implementation of Python written in Java" |
| 64 |
HOMEPAGE="http://www.jython.org" |
| 65 |
SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${PN}_installer-${PV}.jar" |
| 66 |
|
| 67 |
LICENSE="PSF-2" |
| 68 |
SLOT="2.5" |
| 69 |
KEYWORDS="~amd64 ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos" |
| 70 |
IUSE="readline" |
| 71 |
|
| 72 |
# Missing in installer jar. |
| 73 |
RESTRICT="test" |
| 74 |
|
| 75 |
COMMON_DEP=" |
| 76 |
!<=dev-java/freemarker-2.3.10 |
| 77 |
dev-java/antlr:3 |
| 78 |
dev-java/asm:3 |
| 79 |
dev-java/guava:0 |
| 80 |
>=dev-java/java-config-2.1.11-r3 |
| 81 |
dev-java/jffi:1.0 |
| 82 |
dev-java/jline:0 |
| 83 |
dev-java/jnr-constants:0 |
| 84 |
dev-java/jnr-posix:1.1 |
| 85 |
java-virtuals/script-api:0 |
| 86 |
java-virtuals/servlet-api:2.5 |
| 87 |
readline? ( >=dev-java/libreadline-java-0.8.0:0 )" |
| 88 |
RDEPEND="${COMMON_DEP} |
| 89 |
>=virtual/jre-1.5" |
| 90 |
DEPEND="${COMMON_DEP} |
| 91 |
>=virtual/jdk-1.5 |
| 92 |
app-arch/unzip" |
| 93 |
|
| 94 |
S="${WORKDIR}" |
| 95 |
|
| 96 |
pkg_setup() { |
| 97 |
java-pkg-2_pkg_setup |
| 98 |
python_pkg_setup |
| 99 |
} |
| 100 |
|
| 101 |
java_prepare() { |
| 102 |
# src/META-INF/services missing - taking from prebuilt jar |
| 103 |
pushd src > /dev/null || die |
| 104 |
jar -xf ../${PN}.jar META-INF/services || die |
| 105 |
popd > /dev/null |
| 106 |
|
| 107 |
find \( -name '*.jar' -o -name '*.class' -o -name '*.pyc' -o -name '*.exe' \) -exec rm -v {} + || die |
| 108 |
|
| 109 |
epatch "${FILESDIR}/${P}-build.xml.patch" |
| 110 |
|
| 111 |
epatch "${FILESDIR}/${P}-sax-parser-fix.patch" |
| 112 |
|
| 113 |
# 431754 |
| 114 |
epatch "${FILESDIR}/${P}-sax-parser-class-not-found.patch" |
| 115 |
|
| 116 |
epatch "${FILESDIR}/${P}-distutils_byte_compilation.patch" |
| 117 |
epatch "${FILESDIR}/${P}-distutils_scripts_location.patch" |
| 118 |
epatch "${FILESDIR}/${P}-respect_PYTHONPATH.patch" |
| 119 |
|
| 120 |
use readline || rm -v src/org/python/util/ReadlineConsole.java || die |
| 121 |
} |
| 122 |
|
| 123 |
JAVA_ANT_REWRITE_CLASSPATH="yes" |
| 124 |
JAVA_ANT_CLASSPATH_TAGS+=" java" |
| 125 |
|
| 126 |
EANT_BUILD_TARGET="developer-build" |
| 127 |
EANT_GENTOO_CLASSPATH="asm-3,guava,jffi-1.0,jline,jnr-constants,script-api,servlet-api-2.5" |
| 128 |
|
| 129 |
# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed. |
| 130 |
# Uncomment and add to COMMON_DEP if you want either of them |
| 131 |
#EANT_GENTOO_CLASSPATH+=",jdbc-informix" EANT_EXTRA_ARGS+=" -Dinformix.present" |
| 132 |
#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present" |
| 133 |
|
| 134 |
src_compile() { |
| 135 |
use readline && EANT_GENTOO_CLASSPATH+=",libreadline-java" |
| 136 |
|
| 137 |
EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-1.1)" |
| 138 |
EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)" |
| 139 |
|
| 140 |
sed -i -e "1 a\ |
| 141 |
CLASSPATH=\"$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}\"" \ |
| 142 |
bin/jython || die |
| 143 |
|
| 144 |
java-pkg-2_src_compile |
| 145 |
} |
| 146 |
|
| 147 |
EANT_TEST_EXTRA_ARGS="-Dpython.home=dist" |
| 148 |
|
| 149 |
src_test() { |
| 150 |
java-pkg-2_src_test |
| 151 |
} |
| 152 |
|
| 153 |
src_install() { |
| 154 |
java-pkg_newjar dist/${PN}-dev.jar |
| 155 |
|
| 156 |
java-pkg_register-optional-dependency jdbc-mysql |
| 157 |
java-pkg_register-optional-dependency jdbc-postgresql |
| 158 |
|
| 159 |
insinto /usr/share/${PN}-${SLOT} |
| 160 |
doins -r dist/{Lib,registry} |
| 161 |
python_clean_installation_image -q |
| 162 |
|
| 163 |
dodoc ACKNOWLEDGMENTS NEWS README.txt |
| 164 |
|
| 165 |
use doc && java-pkg_dojavadoc dist/Doc/javadoc |
| 166 |
use source && java-pkg_dosrc src/* |
| 167 |
use examples && java-pkg_doexamples Demo/* |
| 168 |
|
| 169 |
local java_args=( |
| 170 |
-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT} |
| 171 |
-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT} |
| 172 |
-Dpython.cachedir="\${HOME}/.jythoncachedir" |
| 173 |
) |
| 174 |
java-pkg_dolauncher jython${SLOT} \ |
| 175 |
--main org.python.util.jython \ |
| 176 |
--java_args "${java_args[*]}" |
| 177 |
|
| 178 |
if use readline; then |
| 179 |
sed -i -e "/#python.console.readlinelib=JavaReadline/a \ |
| 180 |
python.console=org.python.util.ReadlineConsole\npython.console.readlinelib=GnuReadline" \ |
| 181 |
"${ED}"/usr/share/${PN}-${SLOT}/registry || die |
| 182 |
fi |
| 183 |
|
| 184 |
# the jvm opens classfiles rw ... |
| 185 |
dodir /etc/sandbox.d |
| 186 |
echo "SANDBOX_PREDICT=/usr/share/${PN}-${SLOT}" > "${ED}/etc/sandbox.d/20${P}-${SLOT}" |
| 187 |
|
| 188 |
# compile aot |
| 189 |
java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \ |
| 190 |
-Dpython.home="${ED}"/usr/share/${PN}-${SLOT} \ |
| 191 |
-Dpython.cachedir="${T}/.jythoncachedir" \ |
| 192 |
org.python.util.jython -m compileall -f -q -x "/test/" "${ED}" || die |
| 193 |
} |
Archives