Updated how we link in external libs.

diff --git a/dev-java/axion/Manifest b/dev-java/axion/Manifest
index 141c491c466bd1ed24db43ea9ab2e2e90323cb65..1860829e0fbbf8b8d37eb2e25a0b1a2360dea11e 100644 (file)
--- a/dev-java/axion/Manifest
+++ b/dev-java/axion/Manifest
@@ -1,4 +1,4 @@
-MD5 846bf47ee6562f6ca2af7a2b141791b8 axion-1.0_rc2.ebuild 1916
+MD5 dfda9bbb67ba7c21dfde4dcecefebf33 axion-1.0_rc2.ebuild 1566
 MD5 b4bdcaa70f12182da867a5325fdda970 ChangeLog 334
 MD5 1efa58c8ec21eb8f929a4abccb0a543e metadata.xml 515
 MD5 40a767f2792e03e5e7b536b901a4417d files/digest-axion-1.0_rc2 68

diff --git a/dev-java/axion/axion-1.0_rc2.ebuild b/dev-java/axion/axion-1.0_rc2.ebuild
index 47dc8036854a8211eaffb493f22e213c2ca2a080..436da1deaa1f7a32e13dfca253ad671650cc8cdf 100644 (file)
--- a/dev-java/axion/axion-1.0_rc2.ebuild
+++ b/dev-java/axion/axion-1.0_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/axion-1.0_rc2.ebuild,v 1.1 2004/03/30 23:59:47 karltk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/axion/axion-1.0_rc2.ebuild,v 1.2 2004/03/31 00:20:49 karltk Exp $
 
 inherit java-pkg
 
@@ -27,28 +27,21 @@ S=${WORKDIR}/${PN}-1.0-M2
 src_unpack() {
        unpack ${A}
        cd ${S}
-       # It's pure luck that this works. Only the first element of
-       # each classpath will be picked. We need to symlink all
-       # jarfiles into lib/ at some point.
-       ( echo junit.jar=$(java-config -p junit)
-         echo collections.jar=$(java-config -p commons-collections)
-         echo primitives.jar=$(java-config -p commons-primitives)
-         echo logging.jar=$(java-config -p commons-logging)
-         echo codec.jar=$(java-config -p commons-codec)
-         echo logging-impl.jar=$(java-config -p log4j)
-         echo regexp.jar=$(java-config -p regexp)
-         echo javacc.home=/usr/share/javacc/lib
-       ) > build.properties
 
-       mkdir lib test
-       # Given the state of brokenness in this build system, we will
-       # need to do this for all the jars it depends on.
+       mkdir lib test  
        (
                cd lib
-               for x in $(java-config -p commons-primitives | tr -d :) ; do
-                       ln -s ${x} .
-               done
+               java-pkg_jar-from junit || die junit
+               java-pkg_jar-from commons-collections || die commons-collections
+               java-pkg_jar-from commons-primitives || die commons-primitives
+               java-pkg_jar-from commons-logging || die commons-logging
+               java-pkg_jar-from commons-codec || die commons-codec
+               java-pkg_jar-from log4j || die log4j
+               java-pkg_jar-from regexp || die regexp
        )
+
+       echo javacc.home=/usr/share/javacc/lib \
+               > build.properties
 }
 
 src_compile() {