Will not install picocontainer-1.0.jar instead of the oddly named picocontainer-1.0-SNAPSHOT.jar.

2 files changed, 18 insertions, 8 deletions

diff --git a/dev-java/picocontainer/ChangeLog b/dev-java/picocontainer/ChangeLog
index 0a623315013f..d4f805f9aa31 100644
--- a/dev-java/picocontainer/ChangeLog
+++ b/dev-java/picocontainer/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/picocontainer
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.1 2004/01/11 04:46:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/ChangeLog,v 1.2 2004/01/11 18:09:24 karltk Exp $
+
+  11 Jan 2004; Karl Trygve Kalleberg <karltk@gentoo.org>
+  picocontainer-1.0_beta3.ebuild: 
+  Now installs picocontainer-1.0.jar instead of
+  picocontainer-1.0-SNAPSHOT.jar.
 
 *picocontainer-1.0_beta3 (11 Jan 2004)
 
diff --git a/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild b/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
index d4ae02865a98..5557f2e5a29d 100644
--- a/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
+++ b/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild,v 1.1 2004/01/11 04:46:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/picocontainer/picocontainer-1.0_beta3.ebuild,v 1.2 2004/01/11 18:09:24 karltk Exp $
+
+inherit java-pkg
 
 DESCRIPTION="This is a sample skeleton ebuild file"
 HOMEPAGE="http://www.picocontainer.org"
@@ -17,23 +19,26 @@ src_unpack() {
 	unpack ${A}
 	# FIXME: patch
 	cp ${FILESDIR}/build-${PV}.xml ${S}/build.xml
-	# FIXME: java-pkg function
 	mkdir -p ${S}/target/lib
 	(
 		cd ${S}/target/lib
-		ln -sf /usr/share/ant/lib/ant.jar ant-1.5.jar
-		ln -sf /usr/share/ant/lib/ant-optional.jar ant-optional-1.5.jar
-		ln -sf /usr/share/ant/lib/junit.jar junit-3.8.1.jar
+		java-pkg_jar-from ant ant.jar ant-1.5.jar
+		java-pkg_jar-from ant ant-optional.jar ant-optional-1.5.jar
+		java-pkg_jar-from junit junit.jar junit-3.8.1.jar
 	)
 }
 
 src_compile() {
 	ant jar || die
-	use doc && ant javadoc || die
+	if (use doc) ; then
+		ant javadoc || die
+	fi
+	cp target/picocontainer-1.0-SNAPSHOT.jar \
+		target/picocontainer-1.0.jar
 }
 
 src_install() {
 	dodoc LICENSE.txt
 	use doc && ( dohtml -r dist/docs/api )
-	dojar target/picocontainer-1.0-SNAPSHOT.jar
+	dojar target/picocontainer-1.0.jar
 }