Fix javadoc install location wrt bug #160835 by Alistair Bush <alistair.bush@gmail...

Package-Manager: portage-2.1.2_rc4-r7

diff --git a/dev-java/batik/ChangeLog b/dev-java/batik/ChangeLog
index 98179e2b75226841bf7ae6cf2b08817f24af577d..fe1f2abda8645e9da31fb964a97b2dc2047e1197 100644 (file)
--- a/dev-java/batik/ChangeLog
+++ b/dev-java/batik/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-java/batik
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.42 2006/11/29 00:00:42 nichoj Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/ChangeLog,v 1.43 2007/01/08 10:59:40 caster Exp $
+
+*batik-1.6-r3 (08 Jan 2007)
+
+  08 Jan 2007; Vlastimil Babka <caster@gentoo.org>
+  +files/batik-1.6-dont-copy-deps.patch, batik-1.5.1-r5.ebuild,
+  +batik-1.6-r3.ebuild:
+  Fix javadoc install location wrt bug #160835 by Alistair Bush
+  <alistair.bush@gmail.com>. Don't install xdocs, we will need stylebook to
+  transform them to html first. Prevents copying jython.jar into own lib dir.
 
   29 Nov 2006; Joshua Nichols <nichoj@gentoo.org> batik-1.5-r1.ebuild:
   Added ~ia64.

diff --git a/dev-java/batik/Manifest b/dev-java/batik/Manifest
index 013ea929c5360a37ba3958e8213f6501ca2da79f..7f56ac7771417d4bc00f7b319c2f1ddafe6444db 100644 (file)
--- a/dev-java/batik/Manifest
+++ b/dev-java/batik/Manifest
@@ -1,3 +1,7 @@
+AUX batik-1.6-dont-copy-deps.patch 425 RMD160 9d3b0eeacd146c7211404a264d89f78aa8fc5231 SHA1 fc5737e3b1c05ebdfda5e7e646bc3645ccd036b5 SHA256 47a51f54506512eeddd9efda60981205fcb10c207ecfbcd2cd8335db71099dc1
+MD5 30b134a8c59785d39db060b46f4dd256 files/batik-1.6-dont-copy-deps.patch 425
+RMD160 9d3b0eeacd146c7211404a264d89f78aa8fc5231 files/batik-1.6-dont-copy-deps.patch 425
+SHA256 47a51f54506512eeddd9efda60981205fcb10c207ecfbcd2cd8335db71099dc1 files/batik-1.6-dont-copy-deps.patch 425
 AUX batik-1.6-jikes.patch 1738 RMD160 dad6e19c6be0ab4acddbe591212c1d3bdbbb7ea8 SHA1 306999c975f50b90a0c94a2a5b08599ee825ed05 SHA256 6aeb43feae39c7805abbc439e64f1db3d7696727e9d97cb443baa980b9f83355
 MD5 88405976cca078c6468469f91d2ff161 files/batik-1.6-jikes.patch 1738
 RMD160 dad6e19c6be0ab4acddbe591212c1d3bdbbb7ea8 files/batik-1.6-jikes.patch 1738
@@ -9,10 +13,10 @@ EBUILD batik-1.5-r1.ebuild 1693 RMD160 845c7c38d97974b9cad886d5985f38556447720a
 MD5 144d0ab7d2e2c08f300fc381b94f1ba9 batik-1.5-r1.ebuild 1693
 RMD160 845c7c38d97974b9cad886d5985f38556447720a batik-1.5-r1.ebuild 1693
 SHA256 2ff3d695df0edb771591db1c2b32c2b232c1cfe0efe807901ea6e70f0ee7c7f0 batik-1.5-r1.ebuild 1693
-EBUILD batik-1.5.1-r5.ebuild 1614 RMD160 c82641a327edd149a7199f7b4f49ac791ffb0f34 SHA1 0d53876260c92c6dbd66550527845350bf002760 SHA256 bd692ccba47dc2f128b160b42baf4012008c718873bd8fc0b196b90e82635694
-MD5 b28b725279cea602833bbf86576ac1ee batik-1.5.1-r5.ebuild 1614
-RMD160 c82641a327edd149a7199f7b4f49ac791ffb0f34 batik-1.5.1-r5.ebuild 1614
-SHA256 bd692ccba47dc2f128b160b42baf4012008c718873bd8fc0b196b90e82635694 batik-1.5.1-r5.ebuild 1614
+EBUILD batik-1.5.1-r5.ebuild 1647 RMD160 4fe9133a29ef012d1194dc58f7f0c9b76283b8fc SHA1 37ae1fa546cabe31ceb7b9615efe002b333fb057 SHA256 0eb1abee513d84d1e3af95505fd29b3bcbb9eafd1190801ae2284e309944a6c6
+MD5 4f07d9ba798e48dcc876211ffb18baf8 batik-1.5.1-r5.ebuild 1647
+RMD160 4fe9133a29ef012d1194dc58f7f0c9b76283b8fc batik-1.5.1-r5.ebuild 1647
+SHA256 0eb1abee513d84d1e3af95505fd29b3bcbb9eafd1190801ae2284e309944a6c6 batik-1.5.1-r5.ebuild 1647
 EBUILD batik-1.6-r1.ebuild 1748 RMD160 b20a6df86b00a79a3d3474eb65ae992613cac82a SHA1 1fc9a728d781dc72f8e510fce0a70c436fffff24 SHA256 a8e8d60da0f1c8b1781e41fb24072107eb5c5b9078c224831033b76a671a59d7
 MD5 ac00b4cb8beff1792ab6d3761114f79a batik-1.6-r1.ebuild 1748
 RMD160 b20a6df86b00a79a3d3474eb65ae992613cac82a batik-1.6-r1.ebuild 1748
@@ -21,10 +25,14 @@ EBUILD batik-1.6-r2.ebuild 2117 RMD160 e87bee84134271f7f0862d990f9b6370a910eba2
 MD5 9c07b4ad619d8d4c7b0eca6252a47b11 batik-1.6-r2.ebuild 2117
 RMD160 e87bee84134271f7f0862d990f9b6370a910eba2 batik-1.6-r2.ebuild 2117
 SHA256 661c6d663278a2c80e77f90e797b3167c01cf9754f9a70a5e33e0de47d1d45cf batik-1.6-r2.ebuild 2117
-MISC ChangeLog 5570 RMD160 9f0dc97dfa9450a3c8f3d8e08986bf6cb90bb5fe SHA1 93d6cfaa93bbc9c78560a3cac4ec751c0a04f0f3 SHA256 4fcc8c9104bfcb2a0adab385bfa2cada95cf9d932f32bbec75724d7b607d3375
-MD5 392d060352be999f9127ee2cc01d8b47 ChangeLog 5570
-RMD160 9f0dc97dfa9450a3c8f3d8e08986bf6cb90bb5fe ChangeLog 5570
-SHA256 4fcc8c9104bfcb2a0adab385bfa2cada95cf9d932f32bbec75724d7b607d3375 ChangeLog 5570
+EBUILD batik-1.6-r3.ebuild 2124 RMD160 87c58817b0a2c0ffc35f7fb949833fac6be1061e SHA1 517465844d5f36a8a8c5e76dce07ac8dcf1ac2e7 SHA256 ec2225d18da83bdfb6389d5b8a4f1e664f910346bd11f6a6d9505ebe694075bc
+MD5 5117b854575f9f63ab3ec8e7c525b3fc batik-1.6-r3.ebuild 2124
+RMD160 87c58817b0a2c0ffc35f7fb949833fac6be1061e batik-1.6-r3.ebuild 2124
+SHA256 ec2225d18da83bdfb6389d5b8a4f1e664f910346bd11f6a6d9505ebe694075bc batik-1.6-r3.ebuild 2124
+MISC ChangeLog 5957 RMD160 d475f6f762a80a03f490feb8489133d6f94bfa71 SHA1 b6dc784b57959144ce1dfe19ad8f24cc0a88c003 SHA256 a123bb4d0443af8ea869b8ee4d54533237eedd4dbc574034b71683add983f33b
+MD5 eb6e5b3740219450ba4f35b334a0efd9 ChangeLog 5957
+RMD160 d475f6f762a80a03f490feb8489133d6f94bfa71 ChangeLog 5957
+SHA256 a123bb4d0443af8ea869b8ee4d54533237eedd4dbc574034b71683add983f33b ChangeLog 5957
 MISC metadata.xml 374 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 SHA1 5626acb9b3091acbf59b8d69c0ba46f525ee0ce5 SHA256 f71a7581f22225196ad493f9f6c85e5379e3a62f482059827ae35ab66b834437
 MD5 370ede5daee1ae9d1bb9251a8f581a13 metadata.xml 374
 RMD160 6d3a700a3b332f27c8e9057336d0cf3a28f59cf1 metadata.xml 374
@@ -41,3 +49,6 @@ SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/di
 MD5 a45d68c5a0fb6b3d0d8fe09004e11f54 files/digest-batik-1.6-r2 238
 RMD160 a8b135fbba15d2a4e26ab586e896f20323a16255 files/digest-batik-1.6-r2 238
 SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/digest-batik-1.6-r2 238
+MD5 a45d68c5a0fb6b3d0d8fe09004e11f54 files/digest-batik-1.6-r3 238
+RMD160 a8b135fbba15d2a4e26ab586e896f20323a16255 files/digest-batik-1.6-r3 238
+SHA256 0155a5119496483490605907b767ee25bda39b1208db1fad5735aee4ef12b970 files/digest-batik-1.6-r3 238

diff --git a/dev-java/batik/batik-1.5.1-r5.ebuild b/dev-java/batik/batik-1.5.1-r5.ebuild
index 04ff9d10f8069d38de30d43e09b915d380c875ea..dac717136fdbf5a9b39bc3bf471e99c39f1bd676 100644 (file)
--- a/dev-java/batik/batik-1.5.1-r5.ebuild
+++ b/dev-java/batik/batik-1.5.1-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r5.ebuild,v 1.5 2006/11/23 18:49:51 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.5.1-r5.ebuild,v 1.6 2007/01/08 10:59:40 caster Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -36,6 +36,7 @@ src_unpack() {
 }
 
 src_compile() {
+       java-pkg_filter-compiler jikes
        ANT_OPTS=-Xmx256m eant jars all-jar
 }
 

diff --git a/dev-java/batik/batik-1.6-r3.ebuild b/dev-java/batik/batik-1.6-r3.ebuild
new file mode 100644 (file)
index 0000000..1b6ef6f
--- /dev/null
+++ b/dev-java/batik/batik-1.6-r3.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/batik/batik-1.6-r3.ebuild,v 1.1 2007/01/08 10:59:40 caster Exp $
+
+inherit java-pkg-2 java-ant-2 eutils
+
+DESCRIPTION="Java based SVG toolkit"
+HOMEPAGE="http://xml.apache.org/batik/"
+SRC_URI="mirror://apache/xml/batik/${PN}-src-${PV}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="1.6"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc"
+
+# According to
+# http://xmlgraphics.apache.org/batik/install.html#optionalComponents
+# jython is optional so should look into making a use flag
+CDEPEND="=dev-java/rhino-1.5*
+       >=dev-java/xerces-2.7.1
+       =dev-java/xml-commons-external-1.3*
+       dev-java/jython"
+DEPEND="=virtual/jdk-1.4*
+       dev-java/ant-core
+       app-arch/unzip
+       ${CDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+       ${CDEPEND}"
+
+S="${WORKDIR}/xml-${PN}"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+
+       epatch ${FILESDIR}/${P}-jikes.patch
+       epatch ${FILESDIR}/${P}-dont-copy-deps.patch
+
+       cd lib
+       rm -f *.jar build/*.jar
+
+       java-pkg_jar-from xml-commons-external-1.3
+       java-pkg_jar-from xerces-2
+       java-pkg_jar-from rhino-1.5
+       java-pkg_jar-from jython
+}
+
+src_compile() {
+       # Fails to build on amd64 without this
+       if use amd64 ; then
+               export ANT_OPTS="-Xmx1g"
+       else
+               export ANT_OPTS="-Xmx256m"
+       fi
+
+       eant jars all-jar $(use_doc)
+}
+
+src_install() {
+       java-pkg_dojar ${P}/batik*.jar
+
+       cd ${P}/lib
+
+       # needed because batik expects this layout:
+       # batik.jar lib/*.jar
+       # there are hardcoded classpaths in the manifest :(
+       dodir /usr/share/${PN}-${SLOT}/lib/lib/
+       for jar in *.jar
+       do
+               java-pkg_dojar ${jar}
+               dosym ../${jar} /usr/share/${PN}-${SLOT}/lib/lib/${jar}
+       done
+
+       cd "${S}"
+       dodoc README LICENSE || die "dodoc failed"
+       use doc && java-pkg_dojavadoc ${P}/docs/javadoc
+
+       # pwd fixes bug #116976
+       java-pkg_dolauncher batik-${SLOT} --pwd "/usr/share/${PN}-${SLOT}/" \
+               --main org.apache.batik.apps.svgbrowser.Main
+
+       # To find these lsjar batik-${SLOT} | grep Main.class
+       for launcher in ttf2svg slideshow svgpp rasterizer; do
+               java-pkg_dolauncher batik-${launcher}-${SLOT} \
+                       --main org.apache.batik.apps.${launcher}.Main
+       done
+}

diff --git a/dev-java/batik/files/batik-1.6-dont-copy-deps.patch b/dev-java/batik/files/batik-1.6-dont-copy-deps.patch
new file mode 100644 (file)
index 0000000..5397b6e
--- /dev/null
+++ b/dev-java/batik/files/batik-1.6-dont-copy-deps.patch
@@ -0,0 +1,16 @@
+--- build.xml  2007-01-08 11:44:12.000000000 +0100
++++ build.xml  2007-01-08 11:46:19.000000000 +0100
+@@ -457,11 +457,13 @@
+                                rasterizer-jar,
+                                rasterizer-ext-jar,
+                                ttf2svg-jar">
++      <!--
+     <copy todir="${build}/lib">
+       <fileset dir="${lib}">
+         <include name="*.jar"/>
+       </fileset>
+     </copy>
++      -->
+   </target>
+ 
+ 

diff --git a/dev-java/batik/files/digest-batik-1.6-r3 b/dev-java/batik/files/digest-batik-1.6-r3
new file mode 100644 (file)
index 0000000..16f71a4
--- /dev/null
+++ b/dev-java/batik/files/digest-batik-1.6-r3
@@ -0,0 +1,3 @@
+MD5 b65e12f520f8342605f700204c96cd2b batik-src-1.6.zip 10199668
+RMD160 a6d32d881827fa47b294c57442b2e0efd87caf85 batik-src-1.6.zip 10199668
+SHA256 e1c69fb68e4b6710c246f44157bc4f3f021bdb2f2cedb8112bc025e3a4877a2c batik-src-1.6.zip 10199668