Use EANT_ variables, slot deps and restrict tests so that the upcoming generic src_te...

Package-Manager: portage-2.1.4.4

diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog
index a020e4b17fcc4f82613652025c849c8fe531d39b..78814fff624dc2a66fc4f6490cda32423c5a041d 100644 (file)
--- a/dev-java/xerces/ChangeLog
+++ b/dev-java/xerces/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xerces
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.103 2008/01/17 14:39:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.104 2008/03/05 20:57:43 betelgeuse Exp $
+
+  05 Mar 2008; Petteri Räty <betelgeuse@gentoo.org> xerces-2.9.1.ebuild:
+  Use EANT_ variables, slot deps and restrict tests so that the upcoming
+  generic src_test works.
 
   17 Jan 2008; Vlastimil Babka <caster@gentoo.org>
   -files/xerces-2.8.1-gentoo.patch, -files/xerces-2.8.1-no_dom3.patch,

diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest
index e63e2115dec33efd814bb1e1c362bbce98ad96c7..ae79e5060120a6d0a7f606c4c1160bd40201b564 100644 (file)
--- a/dev-java/xerces/Manifest
+++ b/dev-java/xerces/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xerces-1.3.1-build.xml 1680 RMD160 6249a86790607a2ad86f30f5d2ab56135d64b5df SHA1 ece88a158dce9c0d3ae5402c6eb3cb85dc0e20c0 SHA256 1b4fbf0fc170e94edd8cae86df89f5945192e0733a833c954b9681c9eada5f2d
 AUX xerces-2.3.0-gentoo.patch 2684 RMD160 b74e5d28ecd76f6163728314dac2904cef007372 SHA1 f4de84fc0976db34471fc88eda2db71a0d658a8e SHA256 9aa646b5a07656af7a6d32d1549152cca4d9917c9ecc68f66c811568bcea2e28
 AUX xerces-2.9.0-gentoo.patch 750 RMD160 350cdf7d88a9469b1311e1d270d799468b49cdea SHA1 0ae6dea1303e5815afc4f0c8d85cacfbe39a5201 SHA256 5807691bcc000360b6219c9797bffea824b3f056112dc81b2b0b08eb1e7e7dd7
@@ -11,6 +14,13 @@ DIST Xerces-J-src.2.9.1.tar.gz 1711507 RMD160 20bc600ce07fdcf82483e1992dada5ba40
 EBUILD xerces-1.3.1-r2.ebuild 1018 RMD160 8ca2903bf48df515556c2b27a628e42df1042f03 SHA1 3e1269976eb3b2e2401040cf41df474c091efdfc SHA256 de3518276619772aff1ee2474968d7d96e37314c4226189d3dc58643e150610e
 EBUILD xerces-2.3.0-r3.ebuild 1257 RMD160 58297b2403906a6e9cc82389af234d8283ee1be9 SHA1 94f998b14598ccf677a4a3aa91a50a9ade752086 SHA256 e9660fee119fedcda295dfaa85f62bcab901c3f6759fe71ba007d955ea53330f
 EBUILD xerces-2.9.0.ebuild 1904 RMD160 2f669f666a9c833b3ecd5fa611b1f4a785fb0126 SHA1 e848770b963f3e4911663517b45ed774dac850f0 SHA256 395867370e497946304ade362212d349abcd77f97e625709d170619f6abb8a96
-EBUILD xerces-2.9.1.ebuild 1904 RMD160 d2c9d077f8f1d06194571e4eefa0f6b29d0959df SHA1 f864dc47f99c9502d7c62c79084e3a90959acfb7 SHA256 b2528e0b165a48bb1845f27ce65ca94ac96801af4bf354dc5ebe1ddb677b04e0
-MISC ChangeLog 16208 RMD160 4392ab9ff13fbb5bf172a775c98f2773dda4f19f SHA1 deff6994cc61aff54e5d96269739d6b091dcead6 SHA256 345adaa3def0b099e792c2f25cd621bf4e912d00aebb434317b7ff78c099a135
+EBUILD xerces-2.9.1.ebuild 1875 RMD160 74f5a3ca6cd348482822b22c6c11f413f9217a44 SHA1 a6e039062adbe10758572f7d7eb4062b4395ad4a SHA256 a18e2e5d4c3dcdf2017fb5547800b9924d640d66df09c96468fee3c85676613a
+MISC ChangeLog 16386 RMD160 e7dc6bdd9eded4d8ba40ca5462e9d86d44c9a109 SHA1 a376f2249a6b2f9a95be1d1d231d0660846dd762 SHA256 4773382b0f27961cbde1ffa9025b2cedbe285085c13e46ce7cc8336bfd37daea
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHzwlFcxLzpIGCsLQRAjyTAJ4/J4AJXOnlaZkVfaa02uBDSLLlXQCfU6+4
+N/IdNqQrxJhv6QFeaxrFqB8=
+=F7wE
+-----END PGP SIGNATURE-----

diff --git a/dev-java/xerces/xerces-2.9.1.ebuild b/dev-java/xerces/xerces-2.9.1.ebuild
index f6f6dc6452048967dec663f8673cbd49fac62b77..0cbbf1f226c2345e0acb54a1d1d508c5b285de74 100644 (file)
--- a/dev-java/xerces/xerces-2.9.1.ebuild
+++ b/dev-java/xerces/xerces-2.9.1.ebuild
@@ -1,7 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.9.1.ebuild,v 1.2 2008/01/17 14:39:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.9.1.ebuild,v 1.3 2008/03/05 20:57:43 betelgeuse Exp $
 
+EAPI=1
 JAVA_PKG_IUSE="doc examples source"
 
 inherit eutils versionator java-pkg-2 java-ant-2
@@ -17,8 +18,7 @@ SLOT="2"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
-# ships with external-1.3.04, need slot dep with lower limit
-COMMON_DEP="=dev-java/xml-commons-external-1.3*
+COMMON_DEP="dev-java/xml-commons-external:1.3
        >=dev-java/xml-commons-resolver-1.2
        dev-java/xalan-serializer"
 RDEPEND=">=virtual/jre-1.4
@@ -29,6 +29,9 @@ DEPEND=">=virtual/jdk-1.4
 
 S="${WORKDIR}/${PN}-${SRC_PV}"
 
+# they are missing from the upstream tarball"
+RESTRICT="test"
+
 src_unpack() {
        unpack ${A}
        cd "${S}"
@@ -38,13 +41,12 @@ src_unpack() {
        java-ant_rewrite-classpath
 }
 
-src_compile() {
-       # known small bug - javadocs use custom taglets, which come as bundled jar in xerces-J-tools.2.8.0.tar.gz
-       # ommiting them causes non-fatal errors in javadocs generation
-       # need to either find the taglets source, use the bundled jars as it's only compile-time or remove the taglet defs from build.xml
-       ANT_TASKS="xjavac-1" eant -Dgentoo.classpath="$(java-pkg_getjars xml-commons-resolver,xml-commons-external-1.3,xalan-serializer)" \
-               jar $(use_doc javadocs)
-}
+# known small bug - javadocs use custom taglets, which come as bundled jar in xerces-J-tools.2.8.0.tar.gz
+# ommiting them causes non-fatal errors in javadocs generation
+# need to either find the taglets source, use the bundled jars as it's only compile-time or remove the taglet defs from build.xml
+EANT_ANT_TASKS="xjavac-1"
+EANT_GENTOO_CLASSPATH="xml-commons-resolver,xml-commons-external-1.3,xalan-serializer"
+EANT_DOC_TARGET="javadocs"
 
 src_install() {
        java-pkg_dojar build/xercesImpl.jar