Fix dependencies and add src_test.

Package-Manager: portage-2.1.2-r9

diff --git a/dev-java/exolabcore/ChangeLog b/dev-java/exolabcore/ChangeLog
index 4ad018a0b9bba5e5badfee7571578d67be52c65e..390a43961529bd43a816187045d21cc9e85b9177 100644 (file)
--- a/dev-java/exolabcore/ChangeLog
+++ b/dev-java/exolabcore/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/exolabcore
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/exolabcore/ChangeLog,v 1.9 2006/12/21 19:15:38 betelgeuse Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/exolabcore/ChangeLog,v 1.10 2007/02/14 19:51:35 betelgeuse Exp $
+
+  14 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/0.3.7_p20050205-r1-tests-junit.patch,
+  exolabcore-0.3.7_p20050205-r1.ebuild:
+  Fix dependencies and add src_test.
 
 *exolabcore-0.3.7_p20050205-r1 (21 Dec 2006)
 

diff --git a/dev-java/exolabcore/Manifest b/dev-java/exolabcore/Manifest
index 6738be08264580ed87bb0d98cacd372cc300a1e8..1fc3c7d5b51b08bad45131af27ae304710b5b1d4 100644 (file)
--- a/dev-java/exolabcore/Manifest
+++ b/dev-java/exolabcore/Manifest
@@ -1,23 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX 0.3.7_p20050205-r1-tests-junit.patch 641 RMD160 cea438b41cdd1b3bee18829633bd300123f94a79 SHA1 16012e82fd0d08880933703effbacef3f7f78a6d SHA256 c582e5805e4a4160401c0b9e3655a21ab4aee4af3aac11caf9e84af31b9db192
+MD5 b9d690bdc024955c457a637fc845033f files/0.3.7_p20050205-r1-tests-junit.patch 641
+RMD160 cea438b41cdd1b3bee18829633bd300123f94a79 files/0.3.7_p20050205-r1-tests-junit.patch 641
+SHA256 c582e5805e4a4160401c0b9e3655a21ab4aee4af3aac11caf9e84af31b9db192 files/0.3.7_p20050205-r1-tests-junit.patch 641
 AUX exolabcore-0.3.7_p20050205-buildfile.patch 1714 RMD160 778bbd0866a9259f28a2dfade2ff19db71a15235 SHA1 45a949262678ec27a4c297e9f65c4728ae3a21aa SHA256 198ca924ad5082c751346b98c1992c15317de8627418cebf17cbd8d2927bb56a
 MD5 30283d4392dfcac346e8235a6d414a01 files/exolabcore-0.3.7_p20050205-buildfile.patch 1714
 RMD160 778bbd0866a9259f28a2dfade2ff19db71a15235 files/exolabcore-0.3.7_p20050205-buildfile.patch 1714
 SHA256 198ca924ad5082c751346b98c1992c15317de8627418cebf17cbd8d2927bb56a files/exolabcore-0.3.7_p20050205-buildfile.patch 1714
 DIST exolabcore-20050205.tar.bz2 118062 RMD160 0a6817c3eb54b38b77bee91e5c638854f4a776e5 SHA1 16c5bf4a2531ea667e983ffb320614bc71191731 SHA256 43b7b62a7c1534fcc3a50ad7f1e745036989762435f307fcbca29940148f25ab
-EBUILD exolabcore-0.3.7_p20050205-r1.ebuild 1427 RMD160 adf2e6872e4b5a009f9f30d8c71f1c9d52978974 SHA1 b8e706e195156831c02158f06a8e7df2537e0b22 SHA256 1428951117faa213797a340d93f9e86e9f5218f364a414c9036765a19403e9e3
-MD5 1ebd6cd6fda7c2c26a798b583ee81451 exolabcore-0.3.7_p20050205-r1.ebuild 1427
-RMD160 adf2e6872e4b5a009f9f30d8c71f1c9d52978974 exolabcore-0.3.7_p20050205-r1.ebuild 1427
-SHA256 1428951117faa213797a340d93f9e86e9f5218f364a414c9036765a19403e9e3 exolabcore-0.3.7_p20050205-r1.ebuild 1427
+EBUILD exolabcore-0.3.7_p20050205-r1.ebuild 1808 RMD160 449b316f5388cce609728a2e2ef3dad0a19de328 SHA1 88d85d32c6d4fd7e96581f39b66e0c0bdc23635d SHA256 6515b6b6df348a2e3c94ca6ba180afa4b2230fede6fdf5bc31ef45893df4b004
+MD5 f1a772b19657a850fccbbd3783b24ec6 exolabcore-0.3.7_p20050205-r1.ebuild 1808
+RMD160 449b316f5388cce609728a2e2ef3dad0a19de328 exolabcore-0.3.7_p20050205-r1.ebuild 1808
+SHA256 6515b6b6df348a2e3c94ca6ba180afa4b2230fede6fdf5bc31ef45893df4b004 exolabcore-0.3.7_p20050205-r1.ebuild 1808
 EBUILD exolabcore-0.3.7_p20050205.ebuild 1541 RMD160 0fa34d146d9f51157118977450685d7f53adff9a SHA1 4f5cd168ab31bd00b796e9bccdeb24e4307c0607 SHA256 da1a2bad6c308af0a64e22121d406edf084aa02fe1a4fed6623e1f122f0fc8ad
 MD5 bd62109948cafe8a8a2eb54ee705ad5e exolabcore-0.3.7_p20050205.ebuild 1541
 RMD160 0fa34d146d9f51157118977450685d7f53adff9a exolabcore-0.3.7_p20050205.ebuild 1541
 SHA256 da1a2bad6c308af0a64e22121d406edf084aa02fe1a4fed6623e1f122f0fc8ad exolabcore-0.3.7_p20050205.ebuild 1541
-MISC ChangeLog 1557 RMD160 122874787dd3e672314e838b05a8afa11b44587d SHA1 5f0d5dfd8a98fcbf9ad72224272437e1cab7ddaa SHA256 3d8a4aee014d9b3e814592a0d83d3eb936fd94085879f0306c0e0b12f4c71fc2
-MD5 8cd7efab3c0ff4658ebb2b801d3a5966 ChangeLog 1557
-RMD160 122874787dd3e672314e838b05a8afa11b44587d ChangeLog 1557
-SHA256 3d8a4aee014d9b3e814592a0d83d3eb936fd94085879f0306c0e0b12f4c71fc2 ChangeLog 1557
+MISC ChangeLog 1736 RMD160 3896da97095f644ab2d21a192bed54b34cd0e2b2 SHA1 01ebcbb465d113bf104d9918cc58c15784e2afc0 SHA256 6c7aac094772b92fba04dfad6071f591131850bf759e08bc7dcf4c880bde89a1
+MD5 3059e17add16e715c9482570463ba409 ChangeLog 1736
+RMD160 3896da97095f644ab2d21a192bed54b34cd0e2b2 ChangeLog 1736
+SHA256 6c7aac094772b92fba04dfad6071f591131850bf759e08bc7dcf4c880bde89a1 ChangeLog 1736
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -29,9 +33,9 @@ MD5 2809c3d87276292bbc5ece7ed15253e7 files/digest-exolabcore-0.3.7_p20050205-r1
 RMD160 c69cbe99a02a7062249fabb99ed7769ca4a76621 files/digest-exolabcore-0.3.7_p20050205-r1 262
 SHA256 219a8d816b8eaeb541fe6566cfef288b389462aeb5e045f6b56303808506bcfa files/digest-exolabcore-0.3.7_p20050205-r1 262
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
+Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFit1mcxLzpIGCsLQRAsdEAKCRUVOYGY+Z0u0+lAZvdRMznD/hrgCfVzDa
-nKOdJ0QidcrwkpelP6ZS50I=
-=AspV
+iD8DBQFF02hQcxLzpIGCsLQRAtjZAJ9b5pjlyZrxUs+yoYWCr2cd1QFVWACeMKyY
+qXvGUj6zFrgLE20YXbiBRPo=
+=BTWY
 -----END PGP SIGNATURE-----

diff --git a/dev-java/exolabcore/exolabcore-0.3.7_p20050205-r1.ebuild b/dev-java/exolabcore/exolabcore-0.3.7_p20050205-r1.ebuild
index 0680e9f527c15dc064dfdee99e303d860599f10a..acf2b4590b9fabbe02082d81f7886b3393f7b33b 100644 (file)
--- a/dev-java/exolabcore/exolabcore-0.3.7_p20050205-r1.ebuild
+++ b/dev-java/exolabcore/exolabcore-0.3.7_p20050205-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/exolabcore/exolabcore-0.3.7_p20050205-r1.ebuild,v 1.1 2006/12/21 19:15:38 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/exolabcore/exolabcore-0.3.7_p20050205-r1.ebuild,v 1.2 2007/02/14 19:51:35 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -15,21 +15,23 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
 LICENSE="Exolab"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="doc source"
+IUSE="doc source test"
 
 COMMON_DEP="
        dev-java/cdegroot-db
-       dev-java/commons-cli
        dev-java/commons-logging
-       dev-java/exolabtools
-       =dev-java/jakarta-oro-2.0*
-       =dev-java/xerces-1.3*"
+       =dev-java/jakarta-oro-2.0*"
 
 RDEPEND=">=virtual/jre-1.4
        ${COMMON_DEP}"
 DEPEND=">=virtual/jdk-1.4
        ${COMMON_DEP}
-       dev-java/ant-core
+       dev-java/exolabtools
+       test? (
+               dev-java/commons-cli
+               dev-java/log4j
+               dev-java/junit
+       )
        source? ( app-arch/zip )"
 
 S="${WORKDIR}/${MY_P}"
@@ -39,15 +41,13 @@ src_unpack() {
 
        cd "${S}/src"
        epatch "${FILESDIR}/${P}-buildfile.patch"
+       epatch "${FILESDIR}/0.3.7_p20050205-r1-tests-junit.patch"
 
        cd "${S}/lib"
-       rm -f *.jar
+       java-pkg_jar-from --build-only exolabtools
        java-pkg_jar-from cdegroot-db-1
-       java-pkg_jar-from commons-cli-1
        java-pkg_jar-from commons-logging
-       java-pkg_jar-from exolabtools
        java-pkg_jar-from jakarta-oro-2.0 jakarta-oro.jar oro.jar
-       java-pkg_jar-from xerces-1.3
 }
 
 src_compile() {
@@ -55,6 +55,21 @@ src_compile() {
        java-pkg-2_src_compile
 }
 
+src_test() {
+       cd "${S}/lib"
+       java-pkg_jar-from junit
+       java-pkg_jar-from commons-cli-1
+       java-pkg_jar-from log4j
+
+       cd "${S}/src"
+       eant tests
+       cd ..
+       local deps
+       deps="junit,commons-cli-1,log4j,cdegroot-db-1,commons-logging,jakarta-oro-2.0"
+       java -cp "build/classes:build/tests:$(java-config -p ${deps})" \
+               org.exolab.core.test.CoreTestSuite -execute || die "Tests failed"
+}
+
 src_install() {
        java-pkg_newjar dist/${PN}-${MY_PV}.jar ${PN}.jar
 

diff --git a/dev-java/exolabcore/files/0.3.7_p20050205-r1-tests-junit.patch b/dev-java/exolabcore/files/0.3.7_p20050205-r1-tests-junit.patch
new file mode 100644 (file)
index 0000000..02d1b56
--- /dev/null
+++ b/dev-java/exolabcore/files/0.3.7_p20050205-r1-tests-junit.patch
@@ -0,0 +1,12 @@
+diff -ur src.old/tests/unit/org/exolab/core/test/CoreTestSuite.java src/tests/unit/org/exolab/core/test/CoreTestSuite.java
+--- src.old/tests/unit/org/exolab/core/test/CoreTestSuite.java 2007-02-14 20:39:01.000000000 +0200
++++ src/tests/unit/org/exolab/core/test/CoreTestSuite.java     2007-02-14 20:39:21.000000000 +0200
+@@ -177,7 +177,7 @@
+     
+                 // execute the test suite and print the results
+                 TestResult results = harness.execute(suite);
+-                harness.getTestRunner().print(results);
++                //harness.getTestRunner().print(results);
+             }
+         } else {
+             usage();