Restructured ebuild, fixes #95730.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 27 insertions, 22 deletions

diff --git a/dev-java/commons-betwixt/ChangeLog b/dev-java/commons-betwixt/ChangeLog
index 2525ff0224d4..0ad9e6888515 100644
--- a/dev-java/commons-betwixt/ChangeLog
+++ b/dev-java/commons-betwixt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/commons-betwixt
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.3 2005/05/14 16:10:36 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/ChangeLog,v 1.4 2005/06/12 19:24:39 luckyduck Exp $
+
+  12 Jun 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  commons-betwixt-0.6-r1.ebuild:
+  Restructured ebuild, fixes #95730.
 
 *commons-betwixt-0.6-r1 (14 May 2005)
 
diff --git a/dev-java/commons-betwixt/Manifest b/dev-java/commons-betwixt/Manifest
index 82f0036cf1f8..9f432df977fc 100644
--- a/dev-java/commons-betwixt/Manifest
+++ b/dev-java/commons-betwixt/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 352119c0bcda2832787d1391dafea6fb commons-betwixt-0.6-r1.ebuild 1536
-MD5 68755a32fad9bb2df28baa76072704f0 ChangeLog 858
+MD5 11a51408cb55be1db55c1ff194e8b210 commons-betwixt-0.6-r1.ebuild 1462
+MD5 8cb658f6607db38744a63b8b626f96dd ChangeLog 981
 MD5 1eb638c237e8835b9fe6b49a60e42d9d metadata.xml 739
 MD5 c4db26920b75dccce46c479139741605 files/digest-commons-betwixt-0.6-r1 75
 MD5 3b892742ca91101232da276492fa254c files/commons-betwixt-0.6-noget.patch 980
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFChiMQ06ebR+OMO78RAt4CAJ9hKQL414o0VlOVO/9nEUWSp41vOQCgh8+1
-SrLV9OvEoZPo8A3pfZbL8vw=
-=hprl
+iD8DBQFCrIwS06ebR+OMO78RAianAJ9DxeJZu/n5YOooPgrzqkWa3JDvfQCeJZ5t
+Vr0ncXOGx6ZsjKSoLLOFAIQ=
+=UcUA
 -----END PGP SIGNATURE-----
diff --git a/dev-java/commons-betwixt/commons-betwixt-0.6-r1.ebuild b/dev-java/commons-betwixt/commons-betwixt-0.6-r1.ebuild
index 8e0cd4773b26..e8bebbb30dcc 100644
--- a/dev-java/commons-betwixt/commons-betwixt-0.6-r1.ebuild
+++ b/dev-java/commons-betwixt/commons-betwixt-0.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.6-r1.ebuild,v 1.1 2005/05/14 16:10:36 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-betwixt/commons-betwixt-0.6-r1.ebuild,v 1.2 2005/06/12 19:24:39 luckyduck Exp $
 
 inherit java-pkg eutils
 
@@ -13,40 +13,41 @@ SLOT="0"
 KEYWORDS="amd64 x86 ~ppc"
 IUSE="doc jikes source"
 
-DEPEND=">=dev-java/commons-logging-1.0.2
-	=dev-java/commons-beanutils-1.7*
-	>=dev-java/commons-digester-1.6
-	>=dev-java/ant-core-1.4
+DEPEND=">=virtual/jdk-1.3
+	dev-java/ant-core
 	jikes? ( >=dev-java/jikes-1.21 )
 	source? ( app-arch/zip )"
-RDEPEND=">=virtual/jdk-1.3"
+RDEPEND=">=virtual/jre-1.3
+	>=dev-java/commons-logging-1.0.2
+	=dev-java/commons-beanutils-1.7*
+	>=dev-java/commons-digester-1.6"
 
 S="${WORKDIR}/${P}-src/"
 
 src_unpack() {
-	unpack ${A} && cd $S
-	echo "commons-logging.jar=`java-config -p commons-logging`" \
-		> build.properties
-	echo "commons-beanutils.jar=`java-config -p commons-beanutils-1.7`" \
-		>> build.properties
-	echo "commons-digester.jar=`java-config -p commons-digester`" \
-		>> build.properties
+	unpack ${A}
 
+	cd ${S}
 	epatch ${FILESDIR}/${P}-noget.patch
+
+	mkdir -p ${S}/target/lib && cd ${S}/target/lib
+	java-pkg_jar-from commons-beanutils-1.7
+	java-pkg_jar-from commons-digester
+	java-pkg_jar-from commons-logging
 }
 
 src_compile() {
-	local antflags="jar"
+	local antflags="init jar"
 	use doc && antflags="${antflags} javadoc"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	ant ${antflags} || die "compile failed"
 }
 
 src_install() {
-	java-pkg_dojar target/${PN}.jar
+	java-pkg_newjar target/${PN}*.jar ${PN}.jar
 
+	dodoc RELEASE-NOTES.txt
 	if use doc; then
-		dodoc RELEASE-NOTES.txt
 		java-pkg_dohtml PROPOSAL.html STATUS.html userguide.html
 		java-pkg_dohtml -r dist/docs/
 	fi