Version bump. Fixes bug #229715.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25-gentoo-r5 i686

3 files changed, 108 insertions, 2 deletions

diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog
index fcc0653d5e3f..bbd9d5d2ba62 100644
--- a/dev-java/xalan/ChangeLog
+++ b/dev-java/xalan/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/xalan
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.84 2008/03/13 23:07:16 ken69267 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.85 2008/06/29 21:28:27 betelgeuse Exp $
+
+*xalan-2.7.1 (29 Jun 2008)
+
+  29 Jun 2008; Petteri Räty <betelgeuse@gentoo.org> +xalan-2.7.1.ebuild:
+  Version bump. Fixes bug #229715.
 
   13 Mar 2008; Kenneth Prugh <ken69267@gentoo.org> xalan-2.7.0-r5.ebuild:
   amd64 stable, bug #209551
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index f582203fc3b0..78194dbd49b3 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -1,6 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST xalan-j_2_7_0-bin.tar.gz 13516702 RMD160 54257bca9b2b2cfb86fd6974f0e8f6ec20f7d47f SHA1 cf88e553e8fa5b69df93bae06edb29952dac596a SHA256 878c8eb6eee1551ae430c2dba05426329856ffc0413b2017dd2d4ee648c5c5f7
 DIST xalan-j_2_7_0-src.tar.gz 6264659 RMD160 50d612f8750b6a2173883401b8566f700dcfb9f8 SHA1 d77adca82934b188c625b1f72aee715ab2b4348f SHA256 210843fb672b0c44138797d9d11b61c2f538b89400ce8be1f230cd666f70bb02
+DIST xalan-j_2_7_1-bin.zip 17336979 RMD160 d7174fcc9dd8b3876b5a9c8cde021953475b57f8 SHA1 681f04e180de88264bd3df68946001efb0bc2ff1 SHA256 725620850d990f23009619471341c2beb2c97065b46321a3b08c0cebb8dffcb1
+DIST xalan-j_2_7_1-src.tar.gz 6284437 RMD160 021c239122b6b3d0bc9781abd9675c7cb5951b13 SHA1 dfaac3bd3e18a8961c27b3d07b7405bd8a15d64a SHA256 fa52aa629bb882335d45d67401d270c3f21b5131aaea005ac0d4590f2ce8b043
 EBUILD xalan-2.7.0-r4.ebuild 2680 RMD160 01346bbe719357e291581b25da1edd96ab1bae2c SHA1 f6b608b3aa722615b8cea2e69ecbc1565c5745d7 SHA256 d06faf4c9c17a36581a10b951362405a3987f868933d1f5f13efdba1136caa00
 EBUILD xalan-2.7.0-r5.ebuild 2586 RMD160 96d4c12d85f3ff231e676020427f4f1dc4663309 SHA1 5ea24584852c5b3eeafae83eb12f991a4f129c81 SHA256 a1f2e22c8fed4db9ba16fb108eb17bf07b8f9612f3c9d997b50c4fc67b6409bb
-MISC ChangeLog 12031 RMD160 f45a58efa4131caaec9a08e82d3184d5a4e8ea6e SHA1 03d5d9c3d82b3c8c3d582ad80f07e882d8ea2788 SHA256 099f0b3ae2210a21cd75178366017c5262129e1f6a1b59016325bab46844b840
+EBUILD xalan-2.7.1.ebuild 2602 RMD160 162b74299f66b9b06f982d76e5f03aee14b55610 SHA1 b9cea2286fdff7d4f0bcb4ced970444a7ab338ff SHA256 071da20e2745e87343006ec9d691846994fc8fda5c0437159369bea6c78c038f
+MISC ChangeLog 12171 RMD160 6cd42df201ae744040a68c69f48e778ed07cf9e2 SHA1 77b24e70438b97e4e0c5a34f85fe3d49520ddc0f SHA256 64013db08164f7b82ba3c785d03188b4fefe04bea292d47bbe468230998b8224
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhn/owACgkQcxLzpIGCsLSEggCeO2Bz7cWVY0LkhmmhAcnwKcMn
+tO4An18hfKkoGIOQAYT2CqdEptU2QllC
+=T4Jr
+-----END PGP SIGNATURE-----
diff --git a/dev-java/xalan/xalan-2.7.1.ebuild b/dev-java/xalan/xalan-2.7.1.ebuild
new file mode 100644
index 000000000000..8293aaa1be75
--- /dev/null
+++ b/dev-java/xalan/xalan-2.7.1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.1.ebuild,v 1.1 2008/06/29 21:28:27 betelgeuse Exp $
+
+EAPI=1
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-ant-2 eutils versionator
+
+MY_PN="${PN}-j"
+MY_PV="$(replace_all_version_separators _)"
+MY_P="${MY_PN}_${MY_PV}"
+SRC_DIST="${MY_P}-src.tar.gz"
+BIN_DIST="${MY_P}-bin.zip"
+DESCRIPTION="Apache's XSLT processor for transforming XML documents into HTML, text, or other XML document types."
+HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
+SRC_URI="mirror://apache/xml/${MY_PN}/source/${SRC_DIST}
+	doc? ( mirror://apache/xml/${MY_PN}/binaries/${BIN_DIST} )"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc source"
+COMMON_DEP="
+	dev-java/javacup:0
+	dev-java/bcel:0
+	dev-java/xerces:2
+	dev-java/xml-commons-external:1.3
+	~dev-java/xalan-serializer-${PV}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	doc? ( app-arch/unzip )
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack "${SRC_DIST}"
+	if use doc; then
+		mkdir bin || die
+		cd bin
+		unpack ${BIN_DIST} || die
+		cd ..
+	fi
+	cd "${S}"
+
+	# disable building of serializer.jar
+	sed -i -e 's/depends="prepare,serializer.jar"/depends="prepare"/' \
+		build.xml || die "sed build.xml failed"
+
+	# remove bundled jars
+	rm -v lib/*.jar tools/*.jar || die
+	cd lib
+	java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar
+	java-pkg_jar-from xerces-2 xercesImpl.jar
+	java-pkg_jar-from javacup javacup.jar java_cup.jar
+	java-pkg_jar-from javacup javacup.jar runtime.jar
+	java-pkg_jar-from bcel bcel.jar BCEL.jar
+
+	cd "${S}"
+	mkdir build && cd build
+	java-pkg_jar-from xalan-serializer serializer.jar
+}
+
+# When version bumping Xalan make sure that the installed jar
+# does not bundle .class files from dependencies
+src_compile() {
+	eant jar \
+		-Dxsltc.bcel_jar.not_needed=true \
+		-Dxsltc.runtime_jar.not_needed=true \
+		-Dxsltc.regexp_jar.not_needed=true
+}
+
+src_install() {
+	java-pkg_dojar build/${PN}.jar
+	# installs symlinks to the file in /usr/share/xalan-serializer
+	java-pkg_dojar build/serializer.jar
+	# and records it to package.env as if it belongs to this one's
+	# classpath, for maximum possible backward compatibility
+	java-pkg_regjar $(java-pkg_getjar xalan-serializer serializer.jar)
+
+	java-pkg_dolauncher ${PN} --main org.apache.xalan.xslt.Process
+	dohtml readme.html || die
+	if use doc; then
+		java-pkg_dohtml -r "${WORKDIR}"/bin/${MY_P}/docs/* || die
+	fi
+	use source && java-pkg_dosrc src/org
+}