dev-java/jakarta-regexp is an indirect dependency via bcel so do not pull it in directly here

Package-Manager: portage-2.1.4_rc9

4 files changed, 115 insertions, 9 deletions

diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog
index 8ddbc1ecc4a1..1d5ec9edcbc9 100644
--- a/dev-java/xalan/ChangeLog
+++ b/dev-java/xalan/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xalan
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.77 2007/11/25 14:45:14 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.78 2007/12/10 20:52:18 betelgeuse Exp $
+
+*xalan-2.7.0-r5 (10 Dec 2007)
+
+  10 Dec 2007; Petteri Räty <betelgeuse@gentoo.org> xalan-2.7.0-r4.ebuild,
+  +xalan-2.7.0-r5.ebuild:
+  dev-java/jakarta-regexp is an indirect dependency via bcel so do not pull it
+  in directly here
 
   25 Nov 2007; Christian Faulhammer <opfer@gentoo.org>
   xalan-2.7.0-r4.ebuild:
diff --git a/dev-java/xalan/Manifest b/dev-java/xalan/Manifest
index 3281a35e5d77..f41b4d134bc4 100644
--- a/dev-java/xalan/Manifest
+++ b/dev-java/xalan/Manifest
@@ -11,10 +11,14 @@ EBUILD xalan-2.7.0-r4.ebuild 2673 RMD160 07c908b842cefdc16e67f6feab796978de5d96b
 MD5 3beeb0a88c5e35f9c1a7e56c728ec503 xalan-2.7.0-r4.ebuild 2673
 RMD160 07c908b842cefdc16e67f6feab796978de5d96bd xalan-2.7.0-r4.ebuild 2673
 SHA256 5b8de06571380d10e98f73a0dcf75628fe0b250f2ebce7f6c33f2a57dc80d60e xalan-2.7.0-r4.ebuild 2673
-MISC ChangeLog 11186 RMD160 1e9cfa5130fe8c2845957ec3b6555058ec43634d SHA1 f3f1b30a7811bc9e9e36d8019a3566d286c1ad04 SHA256 81802ea741a1583f3580192fbf3f2ab9104c8c4ca177b8deef5e04963afa604d
-MD5 3e2ec8d9467ac7a3d92fe31bda1f5eba ChangeLog 11186
-RMD160 1e9cfa5130fe8c2845957ec3b6555058ec43634d ChangeLog 11186
-SHA256 81802ea741a1583f3580192fbf3f2ab9104c8c4ca177b8deef5e04963afa604d ChangeLog 11186
+EBUILD xalan-2.7.0-r5.ebuild 2592 RMD160 16df58bca222bbe66a8e49dbd5d6caec0eae3765 SHA1 7d123db859d2383adc8aaae44f31db5603a6ea42 SHA256 a1e031690d29bb9daff9a3d52963b64e27d75a3c3ab3b53b4b6edef1c14ef0f4
+MD5 c9ed7d54a253a3b0ba45464656422e25 xalan-2.7.0-r5.ebuild 2592
+RMD160 16df58bca222bbe66a8e49dbd5d6caec0eae3765 xalan-2.7.0-r5.ebuild 2592
+SHA256 a1e031690d29bb9daff9a3d52963b64e27d75a3c3ab3b53b4b6edef1c14ef0f4 xalan-2.7.0-r5.ebuild 2592
+MISC ChangeLog 11423 RMD160 85bd070a4f3842060aeb9eae65b90f28aa6ea0c0 SHA1 e8373ba1852320fdc4fbc924c0673a04c8e9c803 SHA256 5aad0e6e3e71756931206eca863cae290d690663cb985d29946622dd87654284
+MD5 0d1201e02ec5d3ff5881c299e7f90f71 ChangeLog 11423
+RMD160 85bd070a4f3842060aeb9eae65b90f28aa6ea0c0 ChangeLog 11423
+SHA256 5aad0e6e3e71756931206eca863cae290d690663cb985d29946622dd87654284 ChangeLog 11423
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -25,10 +29,13 @@ SHA256 3943b42e6cc9e9628b9b73eba240913afb4d499eb35b2654e8b6514b808f72d5 files/di
 MD5 f2814f7b8f25e3693492221e8b9e38dd files/digest-xalan-2.7.0-r4 515
 RMD160 1eb8f6e1667c93b97aecac9e236709c8d5d13efa files/digest-xalan-2.7.0-r4 515
 SHA256 8dc552116e1d2eb21e5873c1393e632b3dc8d86e20eb39ee087e5d0b8814f05e files/digest-xalan-2.7.0-r4 515
+MD5 f2814f7b8f25e3693492221e8b9e38dd files/digest-xalan-2.7.0-r5 515
+RMD160 1eb8f6e1667c93b97aecac9e236709c8d5d13efa files/digest-xalan-2.7.0-r5 515
+SHA256 8dc552116e1d2eb21e5873c1393e632b3dc8d86e20eb39ee087e5d0b8814f05e files/digest-xalan-2.7.0-r5 515
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHSYrQNQqtfCuFneMRAnXbAJ4jRZtqlzqhUFTLCDj7knzkb4ED5wCfdwZS
-hk331kBkTfmEqSYXmL4wp08=
-=s3VH
+iD8DBQFHXaaQcxLzpIGCsLQRAgwUAJ4yRgxHY7UUq46Fa1iJA4OpkFmnQgCeIYdH
+Qv30/+YutMTaQ9EGP9OmgQI=
+=PrD2
 -----END PGP SIGNATURE-----
diff --git a/dev-java/xalan/files/digest-xalan-2.7.0-r5 b/dev-java/xalan/files/digest-xalan-2.7.0-r5
new file mode 100644
index 000000000000..b3c07b1e227a
--- /dev/null
+++ b/dev-java/xalan/files/digest-xalan-2.7.0-r5
@@ -0,0 +1,6 @@
+MD5 d526d0848c88607ce4e3a0a4edb75d50 xalan-j_2_7_0-bin.tar.gz 13516702
+RMD160 54257bca9b2b2cfb86fd6974f0e8f6ec20f7d47f xalan-j_2_7_0-bin.tar.gz 13516702
+SHA256 878c8eb6eee1551ae430c2dba05426329856ffc0413b2017dd2d4ee648c5c5f7 xalan-j_2_7_0-bin.tar.gz 13516702
+MD5 7859a78a5564cae42c933adcbbecdd01 xalan-j_2_7_0-src.tar.gz 6264659
+RMD160 50d612f8750b6a2173883401b8566f700dcfb9f8 xalan-j_2_7_0-src.tar.gz 6264659
+SHA256 210843fb672b0c44138797d9d11b61c2f538b89400ce8be1f230cd666f70bb02 xalan-j_2_7_0-src.tar.gz 6264659
diff --git a/dev-java/xalan/xalan-2.7.0-r5.ebuild b/dev-java/xalan/xalan-2.7.0-r5.ebuild
new file mode 100644
index 000000000000..545a7252b205
--- /dev/null
+++ b/dev-java/xalan/xalan-2.7.0-r5.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/xalan-2.7.0-r5.ebuild,v 1.1 2007/12/10 20:52:18 betelgeuse Exp $
+
+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.tar.gz"
+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
+	dev-java/bcel
+	>=dev-java/xerces-2.7.1
+	=dev-java/xml-commons-external-1.3*
+	~dev-java/xalan-serializer-${PV}"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	${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
+	newdoc ${PN}.README.txt README || die
+	if use doc; then
+		java-pkg_dohtml -r "${WORKDIR}"/bin/${MY_P}/docs/* || die
+	fi
+	use source && java-pkg_dosrc src/org
+}