Does not use packed jars any more and does not install any classes from dependencies. Resolves bug #98865.

(Portage version: 2.1_pre2)

5 files changed, 104 insertions, 14 deletions

diff --git a/dev-java/xmlc/ChangeLog b/dev-java/xmlc/ChangeLog
index c9adbd783fb0..783fa07dd9cf 100644
--- a/dev-java/xmlc/ChangeLog
+++ b/dev-java/xmlc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-java/xmlc
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.1 2005/04/16 18:44:19 zx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/ChangeLog,v 1.2 2005/12/30 17:56:15 betelgeuse Exp $
+
+*xmlc-2.2.5-r1 (30 Dec 2005)
+
+  30 Dec 2005; Petteri Räty <betelgeuse@gentoo.org> metadata.xml,
+  +xmlc-2.2.5-r1.ebuild:
+  Does not use packed jars any more and does not install any classes from
+  dependencies. Resolves bug #98865.
 
 *xmlc-2.2.5 (16 Apr 2005)
 
diff --git a/dev-java/xmlc/Manifest b/dev-java/xmlc/Manifest
index 0c7aa0944157..1c50131765dc 100644
--- a/dev-java/xmlc/Manifest
+++ b/dev-java/xmlc/Manifest
@@ -1,14 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 914ab6d2c546dbde7c0bbcd4ab261279 xmlc-2.2.5.ebuild 1466
-MD5 5f295e62ee364d06ae7d4d8183cb5b9d ChangeLog 390
-MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
+MD5 e9d14e098c8731eb7213f0c66e29c276 ChangeLog 624
 MD5 eed4979f4b129344eb1689be1c6485b5 files/digest-xmlc-2.2.5 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDKxZN/rLF9B432nYRApsuAJ464iku4BnkB3mRkjddJRWhLTtk5wCgw6UL
-bYOEYtqq1CM48SJJ+cAfJyo=
-=0LFP
------END PGP SIGNATURE-----
+MD5 eed4979f4b129344eb1689be1c6485b5 files/digest-xmlc-2.2.5-r1 64
+MD5 03ff3b030160d541e181a2cc6ebbb36e metadata.xml 426
+MD5 d39c13be534ed2dde0e182ddbd9b9f18 xmlc-2.2.5-r1.ebuild 2423
+MD5 914ab6d2c546dbde7c0bbcd4ab261279 xmlc-2.2.5.ebuild 1466
diff --git a/dev-java/xmlc/files/digest-xmlc-2.2.5-r1 b/dev-java/xmlc/files/digest-xmlc-2.2.5-r1
new file mode 100644
index 000000000000..e6a508e12651
--- /dev/null
+++ b/dev-java/xmlc/files/digest-xmlc-2.2.5-r1
@@ -0,0 +1 @@
+MD5 ab52d7836f8e36c217e4b1b50df3784e xmlc-src-2.2.5.zip 7849442
diff --git a/dev-java/xmlc/metadata.xml b/dev-java/xmlc/metadata.xml
index 838c00a4a448..88da3839a529 100644
--- a/dev-java/xmlc/metadata.xml
+++ b/dev-java/xmlc/metadata.xml
@@ -2,4 +2,9 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>java</herd>
+<longdescription>
+Enhydra XMLC is the presentation technology that supports the needs of 
+designers, developers and architects alike, delivering what JSP cannot - strict 
+separation of markup and logic in a true object view of dynamic presentations.
+</longdescription>
 </pkgmetadata>
diff --git a/dev-java/xmlc/xmlc-2.2.5-r1.ebuild b/dev-java/xmlc/xmlc-2.2.5-r1.ebuild
new file mode 100644
index 000000000000..ddc00fc29f52
--- /dev/null
+++ b/dev-java/xmlc/xmlc-2.2.5-r1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xmlc/xmlc-2.2.5-r1.ebuild,v 1.1 2005/12/30 17:56:15 betelgeuse Exp $
+
+inherit java-pkg
+
+DESCRIPTION="Open Source Java/XML Presentation Compiler"
+HOMEPAGE="http://xmlc.objectweb.org/"
+SRC_URI="http://download.forge.objectweb.org/${PN}/${PN}-src-${PV}.zip
+	http://download.us.forge.objectweb.org/${PN}/${PN}-src-${PV}.zip"
+
+RDEPEND=">=virtual/jre-1.3
+	dev-java/xml-commons
+	dev-java/bcel
+	=dev-java/gnu-regexp-1*
+	=dev-java/servletapi-2.4*
+	dev-java/log4j"
+
+DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
+	app-arch/unzip
+	>=dev-java/ant-core-1.4
+	jikes? ( >=dev-java/jikes-1.21 )"
+RDEPEND=">=virtual/jre-1.3"
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc jikes"
+
+S="${WORKDIR}/${PN}-src-${PV}/"
+
+src_unpack() {
+	unpack "${A}"
+
+	cd "${S}"/release/build-lib/ || die
+	rm *.jar || die
+
+	java-pkg_jar-from xml-commons xml-apis.jar
+	java-pkg_jar-from servletapi-2.4 servlet-api.jar servlet.jar
+	java-pkg_jar-from log4j
+
+	cd "${S}"/release/lib/ || die
+	rm *.jar || die
+}
+
+src_compile() {
+	# doing this in src_compile so that src_compile can be manually
+	# run many times
+	cd "${S}"/release/lib/ || die
+	java-pkg_jar-from bcel
+	java-pkg_jar-from gnu-regexp-1
+
+	cd "${S}"
+
+	# all-libs builds xmlc-all-runtime.jar which includes for
+	# example bcel in it
+	local antflags="lib xmlc.jar split-wireless-jar"
+
+	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
+	use doc && antflags="${antflags} javadoc"
+	ant ${antflags} || die "compile problem"
+
+	rm "${S}"/release/lib/{bcel,gnu-regexp}.jar || die
+}
+
+src_install() {
+	java-pkg_dojar release/lib/*.jar
+	dodoc release/lib/README
+
+	# Move the generated documentation around
+	if use doc; then
+		mv ${PN}/modules/taskdef/doc ${PN}/modules/${PN}/doc/taskdef || die
+		mv ${PN}/modules/wireless/doc ${PN}/modules/${PN}/doc/wireless || die
+		mv ${PN}/modules/xhtml/doc ${PN}/modules/${PN}/doc/xhtml || die
+		dohtml -r ${PN}/modules/xmlc/doc/* || die "Failed to install documentation"
+	fi
+}
+
+pkg_postinst() {
+	einfo "This release does not install dependencies of xmlc as separate jars or"
+	einfo "inside the xmlc-all-runtime.jar. You should make sure to include the"
+	einfo "dependencies by yourself when trying to run something using xmlc."
+	einfo "jtidy.jar is still installed because xmlc needs a modified version of"
+	einfo "it."
+}