From: Petteri Räty <betelgeuse@gentoo.org>
Date: Tue, 26 Dec 2006 20:15:05 +0000 (+0000)
Subject: Last commit did not update Changelog.
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a8dedd47aa59fd686ceca298725fb51f6bba2969;p=gentoo.git

Last commit did not update Changelog.
Package-Manager: portage-2.1.2_rc4-r1
---

diff --git a/dev-java/xalan/ChangeLog b/dev-java/xalan/ChangeLog
index b90194cf0b5e..db67c49a94c8 100644
--- a/dev-java/xalan/ChangeLog
+++ b/dev-java/xalan/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/xalan
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.57 2006/12/07 22:50:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xalan/ChangeLog,v 1.58 2006/12/26 20:15:05 betelgeuse Exp $
+
+*xalan-2.7.0-r3 (26 Dec 2006)
+
+  26 Dec 2007; Petteri Räty <betelgeuse@gentoo.org> +xalan-2.7.0-r3.ebuild:
+  Does not bundle .class files from dependencies inside installed jars any 
+  more. Fixes bug #113894.
 
   07 Dec 2006; Diego Pettenò <flameeyes@gentoo.org> xalan-2.7.0-r2.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/dev-java/xalan/xalan-2.7.0-r3.ebuild b/dev-java/xalan/xalan-2.7.0-r3.ebuild
new file mode 100644
index 000000000000..d876bad23dbb
--- /dev/null
+++ b/dev-java/xalan/xalan-2.7.0-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2006 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-r3.ebuild,v 1.1 2006/12/26 20:15:05 betelgeuse Exp $
+
+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}"
+DESCRIPTION="XSLT processor"
+HOMEPAGE="http://xml.apache.org/xalan-j/index.html"
+SRC_URI="mirror://apache/xml/${MY_PN}/source/${MY_P}-src.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc source"
+COMMON_DEP="
+	dev-java/javacup
+	dev-java/bcel
+	>=dev-java/jakarta-regexp-1.3-r2
+	=dev-java/bsf-2.3*
+	>=dev-java/xerces-2.7
+	=dev-java/xml-commons-external-1.3*"
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEP}"
+DEPEND=">=virtual/jdk-1.4
+	>=dev-java/ant-core-1.5.2
+	source? ( app-arch/zip )
+	${COMMON_DEP}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+	rm -f *.jar
+	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
+	java-pkg_jar-from jakarta-regexp-1.3 jakarta-regexp.jar regexp.jar
+}
+
+# When version bumping Xalan make sure that the installed jar
+# does not bunled .class files from dependencies
+src_compile() {
+	eant jar $(use_doc javadocs -Dbuild.apidocs=build/docs/api) \
+		-Dxsltc.bcel_jar.not_needed=true \
+		-Dxsltc.runtime_jar.not_needed=true \
+		-Dxsltc.regexp_jar.not_needed=true
+}
+
+src_install() {
+	java-pkg_dojar build/*.jar
+	java-pkg_dolauncher ${PN} --main org.apache.xalan.xslt.Process
+	use doc && java-pkg_dohtml -r build/docs/*
+	use source && java-pkg_dosrc src/*
+}