Version bump. Fixes bug #202776. New slot because API changes prevent dev-java/fop from compiling against this.

Package-Manager: portage-2.1.6.1/cvs/Linux 2.6.27-gentoo-r5 i686

3 files changed, 91 insertions, 2 deletions

diff --git a/dev-java/ibm-jre-bin/Manifest b/dev-java/ibm-jre-bin/Manifest
index 10d3c976d0fe..d6e7a9b7f8bd 100644
--- a/dev-java/ibm-jre-bin/Manifest
+++ b/dev-java/ibm-jre-bin/Manifest
@@ -17,9 +17,14 @@ DIST ibm-java2-jre-5.0-8a.0-linux-i386.tgz 44331243 RMD160 fd4456e4d1705b4076fc4
 DIST ibm-java2-jre-5.0-8a.0-linux-ppc.tgz 50983545 RMD160 42fd29121f9793e4e6fc976c22a7fea3ca3ba925 SHA1 6a58d871fb8b219bdcc644547c77242085ad481b SHA256 1729c985b36e6e85bf3017a0daaf0828fcc086cf75278109015a24b1ffb78955
 DIST ibm-java2-jre-5.0-8a.0-linux-ppc64.tgz 50468144 RMD160 5a956c505eade6d5de5e24c97b067a2e6f908cfe SHA1 8031e4fb8a4bd3754701e5248b879e0783184829 SHA256 ae42a42865664f56c5ffb183c81792e81b4926fb3e5ce1ca0cdf0fddc2ab2f0d
 DIST ibm-java2-jre-5.0-8a.0-linux-x86_64.tgz 46329821 RMD160 baf40b1c6c6e09443ec07050f861986992db2fb9 SHA1 6fdc2558b520ab01a1ccefba95b1f8f2fcebea9b SHA256 13e56728e20c4f157a438d09eacdc2281559506393919b5484bfd5cd469103d1
+DIST ibm-java2-jre-5.0-9.0-linux-i386.tgz 44712410 RMD160 b10a1c2dd52345fa697d9d51884756d6b196bc87 SHA1 a854520ad422216e180b4e1959df20a78ed460f2 SHA256 5420c017cca6ece08853534ff584c3f138046c9cc28826c6eb78dff008deec89
+DIST ibm-java2-jre-5.0-9.0-linux-ppc.tgz 51141953 RMD160 1786ff7ea0db033da3e8aea4d6fbc8b3ab4495ed SHA1 8c1aa5fc9e7f1d7539f2a65ea042c9f66e028591 SHA256 9170fee8327999abc9d76c70a15b60ee71c32894bafc90af421e351bcc35f59b
+DIST ibm-java2-jre-5.0-9.0-linux-ppc64.tgz 50977852 RMD160 7fd7b07203d150590bb24f20bd3c78b960e67059 SHA1 ce9424dc92de11df4340b43168dae460e3403251 SHA256 9fb00dba11ca1f0d567f3c98b8b1ef416629c4477db3b17fa9219b812dd0dd46
+DIST ibm-java2-jre-5.0-9.0-linux-x86_64.tgz 46568070 RMD160 0e57e7db7bdc34b68565bb07c5d137a330c78cd6 SHA1 1b22f2ec659ab270ca4283d2e75da9c20d50fdf6 SHA256 19e97d98cf07ded8b969e97dc56ec42d20fef62f68ea7a3fb1d55d0d8ba988e2
 EBUILD ibm-jre-bin-1.4.2.12.ebuild 3491 RMD160 b5a4b30a0404630d167b4fd09e8c7315a24d61f9 SHA1 5b78d313efb1ddad9ace2a78c6a622b8b16ecbd7 SHA256 fb993dfe231864dee48ccef24b8c5ffbaa9d5e6a8bd510a2e013b5d6aef11860
 EBUILD ibm-jre-bin-1.5.0.8a.ebuild 5989 RMD160 ad96559bc980e233ca786169796ff7add139eda3 SHA1 ddae52c9f4fffab4da46fad4cc06b3315ac8a641 SHA256 cdea4418ae62d70bf38ea2864e800a1d3d602ab87d5d180016c615c8504efe46
+EBUILD ibm-jre-bin-1.5.0.9.ebuild 5990 RMD160 b4eee1256118cb082d79fc306f617dfab8748982 SHA1 5fa1e357f432010f0f7a254472709f3bd7e91a8e SHA256 a0004a9fa48284598984c4927955b301d7fb5de4387220c6b50c1ec66546c491
 EBUILD ibm-jre-bin-1.6.0.2.ebuild 5998 RMD160 9ba75b0f22e08c8a2ff478543f909fd103924576 SHA1 207bf3da3ef7b7dd39631b889c2b36ba8e8437b2 SHA256 331a7b9ceff172190f69ee73462f28b8099c6fbd3bc2a7f0f131865db50c3499
 EBUILD ibm-jre-bin-1.6.0.3.ebuild 5998 RMD160 d2abe7fcb6cb986b545d03d6c66f619a32144105 SHA1 3d2e5b2b75420c6a5fa27c4de8c182a81c65eef8 SHA256 ad1e867010a74bda9f76b4ae50f57f3e334e7db3692a55741f60aa680ccb2cc7
-MISC ChangeLog 17009 RMD160 b5de32a48385c9cdde8d323c585298c221cbe9e3 SHA1 fd382262c1590df28cfbfd9b7a09f2acf65b5f5c SHA256 f9b3293ecc929a0a5920488cde3fc86da61ec8f091589ae29276cd3344107c64
+MISC ChangeLog 17144 RMD160 aab98f747b6c082758c063d3048e17d391e33154 SHA1 b4fc0b39296616604bc4d7e6f283b76da7e12013 SHA256 539f5f29fef4adcfab54100d912301167cea3cf9f85cac9c5961f7ff4cbacb31
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
diff --git a/dev-java/xmlgraphics-commons/ChangeLog b/dev-java/xmlgraphics-commons/ChangeLog
index fa3019b5e5d0..17a4640f3ec9 100644
--- a/dev-java/xmlgraphics-commons/ChangeLog
+++ b/dev-java/xmlgraphics-commons/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xmlgraphics-commons
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.13 2008/03/10 13:10:01 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/ChangeLog,v 1.14 2008/12/20 20:20:29 betelgeuse Exp $
+
+*xmlgraphics-commons-1.3.1 (20 Dec 2008)
+
+  20 Dec 2008; Petteri Räty <betelgeuse@gentoo.org>
+  +xmlgraphics-commons-1.3.1.ebuild:
+  Version bump. Fixes bug #202776. New slot because API changes prevent
+  dev-java/fop from compiling against this.
 
   10 Mar 2008; Petteri Räty <betelgeuse@gentoo.org>
   xmlgraphics-commons-1.2.ebuild:
diff --git a/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
new file mode 100644
index 000000000000..ac9a5d3ce5ce
--- /dev/null
+++ b/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild,v 1.1 2008/12/20 20:20:29 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="A library of several reusable components used by Apache Batik and Apache FOP."
+HOMEPAGE="http://xmlgraphics.apache.org/commons/index.html"
+SRC_URI="mirror://apache/xmlgraphics/commons/source/${P}-src.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="1.3"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="jpeg"
+
+# fails connect to X even tho it sets java.awt.headless
+RESTRICT="test"
+CDEPEND="dev-java/commons-io:1
+	 >=dev-java/commons-logging-1:0"
+DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* )
+		test? (
+			dev-java/ant-junit
+		)
+		${CDEPEND}"
+RDEPEND=">=virtual/jre-1.4
+		${CDEPEND}"
+
+# TODO investigate producing .net libraries
+# stratigies for non sun jdk's/jre's
+
+pkg_setup() {
+	java-pkg-2_pkg_setup
+
+	if use jpeg && java-pkg_current-vm-matches kaffe; then
+		eerror "Sun-private JPEG support cannot be built with kaffe."
+		eerror "Please set your build VM to Sun, Blackdown, IBM or JRockit JDK."
+		eerror "See http://www.gentoo.org/doc/en/java.xml for details."
+		eerror "Alternatively, install this package with USE=-jpeg"
+		die "Cannot build with USE=jpeg and kaffe."
+	fi
+}
+
+JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	cd ${S}/lib || die
+	rm -v *.jar || die
+
+	java-pkg_jarfrom commons-io-1
+	java-pkg_jarfrom commons-logging
+}
+
+EANT_EXTRA_ARGS="-Djdk14.present=true"
+EANT_BUILD_TARGET="jar-main"
+EANT_DOC_TARGET="javadocs"
+
+src_compile() {
+	java-pkg-2_src_compile $(use jpeg && echo -Dsun.jpeg.present=true)
+}
+
+src_test() {
+	java-pkg_jarfrom --into lib junit
+	# probably needs ${af} from src_compile, doesn't work anyway
+	ANT_TASKS="ant-junit" eant -Djunit.present=true junit
+}
+
+src_install(){
+	java-pkg_newjar build/${P}.jar
+	use source && java-pkg_dosrc src/java/org src/java-1.4/org
+	use doc && java-pkg_dojavadoc build/javadocs
+}