Require >=jdk-1.5 for javacc-5.0. #315557

Don't build test classes in src_compile, tests are already restricted and now fail to build with -source 1.5.

Package-Manager: portage-2.1.11.13/cvs/Linux x86_64

4 files changed, 253 insertions, 2 deletions

diff --git a/dev-java/jython/ChangeLog b/dev-java/jython/ChangeLog
index 2a68a28bf96a..b7195d9d41c5 100644
--- a/dev-java/jython/ChangeLog
+++ b/dev-java/jython/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/jython
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.80 2012/08/26 16:16:22 thev00d00 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/ChangeLog,v 1.81 2012/09/27 14:47:27 sera Exp $
+
+*jython-2.2.1-r2 (27 Sep 2012)
+
+  27 Sep 2012; Ralph Sennhauser <sera@gentoo.org> +jython-2.2.1-r2.ebuild,
+  +files/jython-2.2.1-build.xml.patch:
+  Require >=jdk-1.5 for javacc-5.0. #315557
+  Don't build test classes in src_compile, tests are already restricted and now
+  fail to build with -source 1.5.
 
 *jython-2.5.2-r2 (26 Aug 2012)
 
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 3cf2696d05e8..489fc4cc9145 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -1,6 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.1-assert-SimpleCompiler.py.patch 504 SHA256 bc7c86f2e0355c33cf3dee92be54b8174c3c69a468c59766d6706980ba9ad00f SHA512 340c91c27b148c9f9d005f944ecfbb07293d7ccc80398e803d910ce6dfa5aa044db54ca72ae2ed5f3714a6208de65d5209746bdc5caf0e534461a3d6b314df5d WHIRLPOOL eb638436908a84aa062c06eca96aeb46921fc43fbdaf14ecbac9f732252f15e275201a856908d1d130d6599cc55cac3631402e302a12ebcf14a9cd95a5393dee
 AUX 2.1-assert.patch 2052 SHA256 b7f491be967853107f47a7b7da489a66ae7c8acedc9d51261b3999ba4f877567 SHA512 56c1bb7cc6785a51951eb34923670a59d621998605fddcdd42f136055b094c5c42d9287370eccc2c39dfa3b3414d7f345b47daefa533a017cdb01d7d1364a47d WHIRLPOOL ac2bcb5057e53d9ee38bd371cb937fddb15753549a6572ad080d914c08158332d0063e86711f61ceb60e4bdc984866f1d7d49f57ac6969a684de681b657c0955
 AUX jython-2.2.1-build.patch 3285 SHA256 3078b381ac9a4ef0edf03b6c3253cbe436497b9f843aa45e43194e8b36f2d7e4 SHA512 e0936cd6fdca71f4df7c77959c343bcf74af496b048bbd2d285eb961700d0dd875c386d4efd85a61f89dcb67e55bfcff5f9e480e1e85bdfcbcd26aebefcb0397 WHIRLPOOL 2b3997555b38d3f5b8c7f75955a25eba66ef5a1a870a10e86ac6426e38bb9d28b0b3129437a13325290ea6bd943dc16cbd624b5cb6e4849ec8e756e58a8cc299
+AUX jython-2.2.1-build.xml.patch 3746 SHA256 547b74711c87fabef33f352e6f61b8fbc4cce9f19fc15c65790cca2302757a73 SHA512 4bcf88c19ba2fbffa221f6d4e6ecc043e75dfb6a6da30ab01a719d5abdff77f2ce5e38140560a23289f0325cf14153f514c7f642efcaca02832a5dd8566fd6fb WHIRLPOOL 685d9b8735ee29bcaa21eb8d554636022a9b443a94161ae352c32366cff362ebdab04ce91dab3e375a500623c6cca6511f6a53a99a4e74f19f9bd5cede47993b
 AUX jython-2.5.1-build.patch 1821 SHA256 284fa97ba5e44a0a0d9945dfc52a5b897d7e58ac010870b83a86fde46f2dca95 SHA512 9d7ecbd1753ce76e3229d2a254b38d5662702667247b54d16f905a65db43353cedaeb3ee393061bd1cb34f5ee3d133ee25420e582f4fc66a78eac9905af8f4f6 WHIRLPOOL 8d04756e7a64909b68e2472a94fb1cacb3df6989d434988348364c1145978fd565c0e4c8cafcfd95ac99a1b6a5363bcb652a9808ba392abc528f24d01cf56304
 AUX jython-2.5.1-distutils_byte_compilation.patch 1746 SHA256 e478fdb1d62e5c656399e3b4b1dc2d9dfe3f4f5dc8efca8634770f7e5fb68a5c SHA512 832aed8bb5e56bf4953b9d46337896e9f183692b12ba94cbe36b6a1bb960eb46aea5fdc7737ea42f0f617e032d4ea87c4a08c77a5b79dcd8fd560c3173de878d WHIRLPOOL f181635632e1bae07f811e3b4ce126afb35dc81aba7d0cd99c9961e338012bfad964e87a18db1240e097fcd7870f5622c46d8e043f5c73f0795c8b6b4358ee1d
 AUX jython-2.5.1-distutils_scripts_location.patch 346 SHA256 240cc2c51aa23738f559a874cc65d9c7de4a4c1d786edece3e865d7922fd6f90 SHA512 e3c96d614f16ab4d0fd3b8c6ce7f1ec7478fc36069f4b4d78f5bc4fe586e6dfd41c2afaf1092abd74bf0a61c352ce6e5328dee1c308493bd8d38fa6452705808 WHIRLPOOL 0c6cdf265094ce4a13d59edd5b5e2d74c91d08cc69514fcf7915b6e11ca8c85188c1d29440a3103348303dce9afb55d9531544b546554666b0e7725d2b25613a
@@ -21,8 +25,20 @@ DIST jython_installer-2.2.1.jar 4663097 SHA256 586858aa16a8b269eaaec59f5b64031ec
 DIST jython_installer-2.5.2.jar 18435770 SHA256 1b7168b961e31ddd89012a36cde611c340dadfd8b60b81c4248b026730ee2f29 SHA512 ea9d1573f1f86aba13554292418be65579e55d695c9ab625402cc9478a1fed56654eb7ef5e750c9ebdcfe388c7f007016d88dedd6e6652d2a61f7681963118c4 WHIRLPOOL 3621162d9cffa2d0312b775af6cd342fdb17a25b965b2b736b1d03fe70512f05a645eb336a5d01135555fb843f6d4498e43530675e306373f98c8184a375e96b
 EBUILD jython-2.1-r11.ebuild 2934 SHA256 9ce1e028309ecc0d8f804fad81ce80f9ed81ef9f089aa01c26c17a47b79baf3f SHA512 73056839842a49593083e5d22babe1fd4aaa2ed64305208129e5b7c981f3f6a5782627ac7ab819fa1305250b3bd23e7da3fb7c3bac262bb3dd8e5692b5c24a62 WHIRLPOOL 11e1f46dbbbb80058ae1a059782c5e0fa9cef25d39b5320742c5eff220e209b11b818d7429a7af8a83f8726e58e83c17cc85518cf9e949b930d09cffbb37e102
 EBUILD jython-2.2.1-r1.ebuild 3769 SHA256 936d381297b273398a608fc879331f147f555ea19174ff12722003c4ec90cd9f SHA512 61d10d83cc2e56818d069ba3d0e0262cb21082b96fdb89e5704912fee4457048c8e390a6eaba55664bf15fe581321da517e7fe70260143cf62e3129a40eacf7f WHIRLPOOL 49705b431243688cac0558fcf87b7b492ceb4d90100d7ff80608b4faeb4d53801a8055bacb6b62f4ddfb5b82279eb9e1973d6ae1d9c21bb716d389add06688bd
+EBUILD jython-2.2.1-r2.ebuild 3756 SHA256 67e1f70b420184374f111ed8ebb10abe212f2afc1781bbbce09d9e3fe95a14ad SHA512 abb7ec89a8314a94db575a04918785d6335678b55cb0aa9b7e50c6cd9d3a5cfaa637671d02fb9e785581cb212f64cd3430738ccdebf102effaf5f28f65eb0573 WHIRLPOOL 8807567dc9e110bbd4fa8b67a1c0f471f18905dee11ab0362d1a69ffd2ed53732ec3a7ccac06c33ffc1185efdf2119c66eded94aa50b94b6fae223bbcf954fb1
 EBUILD jython-2.5.1-r2.ebuild 5606 SHA256 a6c0b84a70d266616ffe73062986615502e60ed39426d517f6089640fdc689ec SHA512 5eaa7bb9c03e947945be8248c1db5e1024654c1d11e61471a1b7686845719da21544369d40cabf31240f6beecab6e9eae169f29c05dcf9846ecec51b8f269356 WHIRLPOOL 55d0bceda9d789ceba4ab54b63bc976e319e8a30307f53e0754b4d6b8bae93845368012bb8b06033ea1ebdfc4ce6831ad0552457c8d6d535ef5e10c7b74823ad
 EBUILD jython-2.5.2-r2.ebuild 4232 SHA256 5e84cee35324d5d1740b2afd5f7d2dfbbe1c77da97373c6eb9a66a89088a419d SHA512 00cd44609a84ee5bcabba6b9d34bb9ce40424ea0874be5a42ac911ecaa0c5786b5807158eded99ad1c9996992429fa04023571b7038135c5de01151a2d643203 WHIRLPOOL 890c00fb89a4e5dca81c06dd2c7d2ff71b428ac74902cbc7e7537126a8a3d23bff96cda151ff7cf7f8ceebe1f7650177e73e96ec50c8335e6d95532caa180fe4
 EBUILD jython-2.5.3-r1.ebuild 4166 SHA256 41495f88447e8b292d51407b2692208330bb3958684538cac3bc501bfc340d9f SHA512 f558c5098cde10e5149e82398949d9e98a183549657d55b6f52ed509b7fa9172cb4621233f515860b08a67bf8ad437ba82b86d4e7a3bcc42c0bf18c1b8012f9f WHIRLPOOL 616e4112494145ab5fafa9418578fef5f45f785c5fd80a6bd0c193e2e8f4bdd1b5245f7345531f6a890b538e15bdcf0f08718b05d855dd368c97f6980148405b
-MISC ChangeLog 12997 SHA256 6b0d4cd9471ae4c38d8d7b941fae368556322d61c0623af4938e1691fc40a526 SHA512 3bbebae1fe9f46c1cdb5719be7b089764f266e0ac81ce845b3e7e6fef5ce0ead33c4294839937fef6748d9d2f6fdfbd26de822d633aac5bc42fc251348c2e8f7 WHIRLPOOL fe6a6442e355628454c768df2ddb35926834ac7ce702b25f3a1d04350d5c477671dff6adaf4135ff59e2caf17fb314024f80a9beb76bd68b706ee030892065ee
+MISC ChangeLog 13297 SHA256 8a644a3f38f12194c1f2cd13628096fe9bfa92ee0000bf6a6e1dda1be1658551 SHA512 ac039ccce9d7240b689111286b181def8e98227463dbc49bc0023b630f8079a810630c7119f2480f43b68931c8dee096f70e6861cd8b3745ca57980925364da5 WHIRLPOOL 4e57621a474d928cc36239f67a6f58fd09f8c467e8e5f0da7290e506e7a3f0556f1cc9d2dd49c3d861211b6b9a824daf47f3b8e728809f075acbd75f41d9f8cb
 MISC metadata.xml 315 SHA256 03b5b706f53aa9de54b5296c58699a4ad543ee0b7fb5b8fc6cf2ab89ac487198 SHA512 756be0e6a24eea5544801dd33f0a5fdaf7b28c9bbef05baac97ab304e00879066d19ef5f02370640364df05a91e509992155a13e185b2b7e9806e554aac7c92a WHIRLPOOL 9a5ffdfa34b9ebf36b7392b8bb81f607bc482a267be083c0c765ccf7c1af18e2621370bfdb26b200581a5d3cbb28221a8f275a6f3acd2ec683e31ab59e06a951
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQZGcQAAoJEIUJ+svaV163xsEIAI0xteQimybPiNJvut+JUEP0
+guw0IqwaK72CzR0d9xADfRqbcm0Y/xgxqFVCceJlVnEEAsW+P5+a9bePMv7yBEpv
+up1VTzZcSHF8+Z1y0y2l5YfIK+dYK3o8Ccbl4yoyywHPuNEZZTQA3tcBg36ldtzQ
+t36hl0wgLYJ2MSNyTFGekCY2MYcqxb0J8XxMB7tSpVa3w1IW2rNQrQ0mopbzrFaw
+TJNEen89RpUb24InG3xDz1SjhRqowwWTcwNFHGFwrrh/hO78wU95k+2KIpJnqzkB
+q9SHZ5Sq/Emqn2zBrBvi3W/Izgu6QVC5dY/sGiPC1JYbfVo0tCXu4976OdZCwt0=
+=iLyP
+-----END PGP SIGNATURE-----
diff --git a/dev-java/jython/files/jython-2.2.1-build.xml.patch b/dev-java/jython/files/jython-2.2.1-build.xml.patch
new file mode 100644
index 000000000000..8ea197476074
--- /dev/null
+++ b/dev-java/jython/files/jython-2.2.1-build.xml.patch
@@ -0,0 +1,92 @@
+--- build.xml.orig	2012-09-27 16:13:40.750930136 +0200
++++ build.xml	2012-09-27 16:16:31.725093475 +0200
+@@ -373,21 +373,13 @@
+ 
+     <!-- create checkout directory if necessary -->
+     <target name="prepare-checkout" if="do.checkout">
+-        <mkdir dir="${svn.checkout.dir}" />
++	    <echo message="Removed by patch." />
+     </target>
+ 
+ 
+     <!-- checkout if so defined -->
+     <target name="checkout" depends="prepare" if="do.checkout">
+-        <svn javahl="${javahl.dir}" >
+-        	<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/jython" revision="${svn.revision}" destPath="${svn.checkout.dir}/jython" />
+-        	<checkout url="https://jython.svn.sourceforge.net/svnroot/jython/${svn.main.dir}/installer" revision="${svn.revision}" destPath="${svn.checkout.dir}/installer" />
+-        </svn> 
+-
+-        <!-- checkout cpython license from the correct python maintenance branch -->
+-        <svn javahl="${javahl.dir}" >
+-               <checkout url="http://svn.python.org/projects/python/branches/release22-maint/" destPath="${svn.checkout.dir}/python" recurse="false" />
+-        </svn> 
++    	<echo message="removed by patch" />
+     </target>
+ 
+ 	
+@@ -488,6 +480,7 @@
+         />
+ 
+         <!-- java files used by tests -->
++<!--
+         <javac srcdir="${jython.base.dir}/Lib/test/"
+                includes="javatests/**"
+                destdir="${output.dir}/"
+@@ -498,6 +491,7 @@
+                deprecation="${deprecation}"
+                nowarn="${nowarn}"
+         />
++-->
+ 
+         <copy file="${source.dir}/org/python/modules/ucnhash.dat"
+               todir="${output.dir}/org/python/modules"
+@@ -551,28 +545,13 @@
+ 
+ 
+     <!-- build the .html files using the ht2html tool -->
+-    <target name="doc" depends="compile" if="full-build">
+-        <fail unless="ht2html.dir" message="ht2html.dir is not set" />
+-        <copy todir="${dist.dir}/Doc" preservelastmodified="true">
+-            <fileset dir="Doc" includes="*.ht, **/*.gif" />
+-        </copy>
+-        <!-- Create .html files in Doc -->
+-        <apply executable="${python.exe}" dir="Doc">
+-            <env key="PYTHONPATH" path="${jython.base.dir}/Misc/htgen" />
+-            <arg line="${ht2html.dir}/ht2html.py" />
+-            <arg line="-s JyLocalGenerator" />
+-            <fileset dir="${dist.dir}/Doc">
+-                <include name="*.ht" />
+-            </fileset>
+-        </apply>
+-        <delete>
+-            <fileset dir="${dist.dir}/Doc" includes="*.ht" />
+-        </delete>
++    <target name="doc" depends="compile">
++    	<echo message="Functionality removed by gentoo patch" />
+     </target>
+ 
+ 
+     <!-- javadoc -->
+-    <target name="javadoc" depends="compile" if="full-build">
++    <target name="javadoc" depends="compile">
+         <javadoc sourcepath="${source.dir}"
+                  destdir="${apidoc.dir}"
+                  source="${jdk.source.version}"
+@@ -588,7 +567,7 @@
+ 
+ 
+     <!-- copy for full distribution -->
+-    <target name="copy-full" if="full-build">
++    <target name="copy-full">
+         <!-- Misc files -->
+         <echo>copy misc files from ${jython.base.dir}</echo>
+         <copy todir="${dist.dir}" preservelastmodified="true">
+@@ -599,7 +578,7 @@
+ 
+         <!-- copy the CPython license -->
+         <echo>copy CPython LICENSE from ${svn.checkout.dir}/python</echo>
+-        <copy file="${svn.checkout.dir}/python/LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
++	<copy file="${python.lib}/../LICENSE" tofile="${dist.dir}/LICENSE_CPython.txt" preservelastmodified="true" />
+ 
+         <!-- sources: todir has to correspond with installer/**/JarInstaller.java -->
+         <echo>copy sources from ${jython.base.dir}</echo>
diff --git a/dev-java/jython/jython-2.2.1-r2.ebuild b/dev-java/jython/jython-2.2.1-r2.ebuild
new file mode 100644
index 000000000000..c8002d53fe33
--- /dev/null
+++ b/dev-java/jython/jython-2.2.1-r2.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jython/jython-2.2.1-r2.ebuild,v 1.1 2012/09/27 14:47:27 sera Exp $
+
+EAPI=4
+
+JAVA_PKG_IUSE="readline source doc servletapi mysql postgres examples oracle"
+#jdnc
+
+inherit base java-pkg-2 java-ant-2
+
+MY_PV="installer-2.2.1"
+PYVER="2.2.3"
+
+DESCRIPTION="An implementation of Python written in Java"
+HOMEPAGE="http://www.jython.org"
+SRC_URI="http://www.python.org/ftp/python/${PYVER%_*}/Python-${PYVER}.tgz
+mirror://sourceforge/${PN}/${PN}_${MY_PV}.jar"
+
+LICENSE="PSF-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+CDEPEND="
+	dev-java/jakarta-oro:2.0
+	readline? ( >=dev-java/libreadline-java-0.8.0:0 )
+	mysql? ( >=dev-java/jdbc-mysql-3.1:0 )
+	postgres? ( dev-java/jdbc-postgresql:0 )
+	oracle? ( dev-java/jdbc-oracle-bin:10.2 )
+	servletapi? ( java-virtuals/servlet-api:2.5 )
+	!<=dev-java/freemarker-2.3.10"
+RDEPEND="${CDEPEND}
+	>=virtual/jre-1.5"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-1.5
+	dev-java/javacc"
+
+S="${WORKDIR}"
+
+#Tests currently very broken. Need to investigate whether that
+#is jython's or gentoo's doing.
+RESTRICT="test"
+
+java_prepare() {
+	epatch "${FILESDIR}/${P}-build.xml.patch"
+
+	rm -Rfv org || die "Unable to remove class files."
+	find . -iname '*.jar' | xargs rm -fv || die "Unable to remove bundled jars"
+
+	echo javacc.jar="$(java-pkg_getjars --build-only javacc)" > ant.properties
+
+	if use readline; then
+		echo "readline.jar=$(java-pkg_getjars libreadline-java)" >> \
+		ant.properties
+	fi
+	if use servletapi; then
+		echo "servlet.jar=$(java-pkg_getjar --virtual servlet-api-2.5 servlet-api.jar)" \
+		>> ant.properties
+	fi
+	if use mysql; then
+		echo "mysql.jar=$(java-pkg_getjar jdbc-mysql jdbc-mysql.jar)" \
+		>> ant.properties
+	fi
+
+	if use postgres; then
+		echo \
+		"postgresql.jar=$(java-pkg_getjar jdbc-postgresql jdbc-postgresql.jar)"\
+		 >> ant.properties
+	fi
+
+	if use oracle; then
+		echo \
+		"oracle.jar=$(java-pkg-getjar jdbc-oracle-bin-10.2 ojdbc14.jar)" \
+		>> ant.properties
+	fi
+}
+
+src_compile() {
+	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
+	local pylib="Python-${PYVER}/Lib"
+	antflags="${antflags} -Dpython.lib=${pylib} -Dsvn.checkout.dir=."
+	LC_ALL=C eant ${antflags} developer-build $(use_doc javadoc)
+}
+
+src_test() {
+	local antflags="-Dbase.path=src/java -Dsource.dir=src/java/src"
+	antflags="${antflags} -Dpython.home=dist"
+	local pylib="Python-${PYVER}/Lib"
+	antflags="${antflags} -Dpython.lib=${pylib}"
+	eant ${antflags} bugtest
+}
+
+src_install() {
+	java-pkg_dojar "dist/${PN}.jar"
+
+	dodoc README.txt NEWS ACKNOWLEDGMENTS
+	use doc && dohtml -A .css .jpg .gif -r Doc/*
+
+	local java_args="-Dpython.home=/usr/share/jython"
+	java_args="${java_args} -Dpython.cachedir=\${HOME}/.jythoncachedir"
+
+	java-pkg_dolauncher jythonc \
+						--main "org.python.util.jython" \
+						--java_args "${java_args}" \
+						--pkg_args "${java_args} /usr/share/jython/tools/jythonc/jythonc.py"
+
+	java-pkg_dolauncher jython \
+						--main "org.python.util.jython" \
+						--pkg_args "${java_args}"
+
+	insinto /usr/share/${PN}
+	doins -r dist/Lib registry
+
+	insinto /usr/share/${PN}/tools
+	doins -r dist/Tools/*
+
+	use doc && java-pkg_dojavadoc dist/Doc/javadoc
+	use source && java-pkg_dosrc src
+	use examples && java-pkg_doexamples dist/Demo/*
+}
+
+pkg_postinst() {
+	if use readline; then
+		elog "To use readline you need to add the following to your registry"
+		elog
+		elog "python.console=org.python.util.ReadlineConsole"
+		elog "python.console.readlinelib=GnuReadline"
+		elog
+		elog "The global registry can be found in /usr/share/${PN}/registry"
+		elog "User registry in \$HOME/.jython"
+		elog "See http://www.jython.org/docs/registry.html for more information"
+		elog ""
+	fi
+}