Register runtime dev-java/xp dep with the new eclass function and add it to RDEPEND.

Package-Manager: portage-2.1.2.4

diff --git a/dev-java/xt/ChangeLog b/dev-java/xt/ChangeLog
index 108e171f60aede70dd971709f9e64e5cea2052ad..557160fd231c233f65c0527e1762f057b521ec3c 100644 (file)
--- a/dev-java/xt/ChangeLog
+++ b/dev-java/xt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/xt
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/ChangeLog,v 1.13 2007/01/21 22:44:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/ChangeLog,v 1.14 2007/04/24 14:06:10 caster Exp $
+
+  24 Apr 2007; Vlastimil Babka <caster@gentoo.org> xt-20051206.ebuild:
+  Register runtime dev-java/xp dep with the new eclass function and add it to
+  RDEPEND.
 
 *xt-20051206 (21 Jan 2007)
 

diff --git a/dev-java/xt/Manifest b/dev-java/xt/Manifest
index fe6499bb3dd406b3e4ee8c2e24cc1761b61aca13..35df41db2a9469c5b0537c2974f5213a6dcd1305 100644 (file)
--- a/dev-java/xt/Manifest
+++ b/dev-java/xt/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 20051206-java5.patch 423 RMD160 e7020a47e06fd6e66af1855a2ec9c99842b09cd1 SHA1 89ea0a25d8626e6f3eb2faa747e3664a0df3314f SHA256 6697d7f84e7de456d703713d71a898ff479b690792a391a3330e8afcc3d38567
 MD5 68f01e5a55d7ee111cf3fea42e2d883b files/20051206-java5.patch 423
 RMD160 e7020a47e06fd6e66af1855a2ec9c99842b09cd1 files/20051206-java5.patch 423
@@ -11,14 +8,14 @@ EBUILD xt-20020426a-r1.ebuild 1038 RMD160 3ccf9e0a1568d56b2837740080120d1770017c
 MD5 57e96c3a0295580f5f1c8bdef774fa83 xt-20020426a-r1.ebuild 1038
 RMD160 3ccf9e0a1568d56b2837740080120d1770017c47 xt-20020426a-r1.ebuild 1038
 SHA256 13af19efdaf02d41f60b333aee2f02f18a622dc85811ab20ed8a6292b54c2f80 xt-20020426a-r1.ebuild 1038
-EBUILD xt-20051206.ebuild 1313 RMD160 caf370d75e5a2f208eb659ae8d61a4a97159d18d SHA1 ed8c8f400359022b433932040a492a34c3ba2562 SHA256 ed13ddd5de527ed64056ae5bcfa3144d173b5d28dc0e0f64bf5b4c96504935cf
-MD5 60e80c255735552c29d5cc59e371df39 xt-20051206.ebuild 1313
-RMD160 caf370d75e5a2f208eb659ae8d61a4a97159d18d xt-20051206.ebuild 1313
-SHA256 ed13ddd5de527ed64056ae5bcfa3144d173b5d28dc0e0f64bf5b4c96504935cf xt-20051206.ebuild 1313
-MISC ChangeLog 1155 RMD160 6a13aea2b5bd092b86532ae32b515af48b13c53d SHA1 9e3890dbab6ebf009cef86d51c9ddec6d5343110 SHA256 c1b633b857ff35c1103c9a41dbf20de5e094bcd6b7706f3a884f325662ea4da9
-MD5 dff49e9408b14bf7fb1300c418946c50 ChangeLog 1155
-RMD160 6a13aea2b5bd092b86532ae32b515af48b13c53d ChangeLog 1155
-SHA256 c1b633b857ff35c1103c9a41dbf20de5e094bcd6b7706f3a884f325662ea4da9 ChangeLog 1155
+EBUILD xt-20051206.ebuild 1325 RMD160 37f72f21af8ad5036ce6a4aaf7c23e5cc35eff61 SHA1 eb9a31ed53e9987b3e1d96e1b059c9ee9254e807 SHA256 2ddd1f6db27323b153fe2cac074f81711b9a2ff0bcc3b627064956dfba6d09e7
+MD5 fef41e4e9bd7c9e280258d12bfedaa57 xt-20051206.ebuild 1325
+RMD160 37f72f21af8ad5036ce6a4aaf7c23e5cc35eff61 xt-20051206.ebuild 1325
+SHA256 2ddd1f6db27323b153fe2cac074f81711b9a2ff0bcc3b627064956dfba6d09e7 xt-20051206.ebuild 1325
+MISC ChangeLog 1312 RMD160 6046217798170c5236edb050ec0253d1a2cf1685 SHA1 6a5543b70bc71e9b4b39ca9d8c4ad75cfa28458c SHA256 fd375e8711e9f17692432587aa17a7bafbab7bc8277af91e206a0b7d88f92641
+MD5 79e88835167a93dcd60f794cb79c5793 ChangeLog 1312
+RMD160 6046217798170c5236edb050ec0253d1a2cf1685 ChangeLog 1312
+SHA256 fd375e8711e9f17692432587aa17a7bafbab7bc8277af91e206a0b7d88f92641 ChangeLog 1312
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -29,10 +26,3 @@ SHA256 612ab5f43755468b6c30bc7218cc04c158838f4c882a642bf603ae3050c536ad files/di
 MD5 86e6d217ca0c1d8e056c0c615873c10d files/digest-xt-20051206 241
 RMD160 6db1aae834072bf92742ea964b1031efc5b1676d files/digest-xt-20051206 241
 SHA256 cd52262aa1f0a86d54f116d688c16c36d145fbefc3ef64d4704095a588ffad6c files/digest-xt-20051206 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
-
-iD8DBQFFs+zKcxLzpIGCsLQRAojtAJ4qCcA14HbeAZz3VglGg9M4FWA/XACfWgzt
-gILJPTpPQjx4gv3Vo6+VJdM=
-=M8mB
------END PGP SIGNATURE-----

diff --git a/dev-java/xt/xt-20051206.ebuild b/dev-java/xt/xt-20051206.ebuild
index d6865a62b9188acb000e2500baacdcc1ec96aef4..d9e2311ec820c471c6708038124c1c6d97d9a136 100644 (file)
--- a/dev-java/xt/xt-20051206.ebuild
+++ b/dev-java/xt/xt-20051206.ebuild
@@ -1,40 +1,40 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-20051206.ebuild,v 1.1 2007/01/21 22:44:15 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/xt/xt-20051206.ebuild,v 1.2 2007/04/24 14:06:10 caster Exp $
 
+JAVA_PKG_IUSE="doc source"
 inherit java-pkg-2 eutils java-ant-2
 
 DESCRIPTION="Java Implementation of XSL-Transformations"
 SRC_URI="http://www.blnz.com/xt/${P}-src.zip"
 HOMEPAGE="http://www.blnz.com/xt/"
-
 LICENSE="JamesClark"
 SLOT="0"
-
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc source"
+IUSE=""
 
 COMMON_DEP="~dev-java/servletapi-2.4"
 RDEPEND=">=virtual/jre-1.4
+       dev-java/xp
        ${COMMON_DEP}"
 DEPEND="
        !doc? ( >=virtual/jdk-1.4 )
-       doc? ( || ( =virtual/jdk-1.4* =virtual/jdk-1.5* ) )
-       ${COMMON_DEP}
+       doc? ( || ( =virtual/jdk-1.5* =virtual/jdk-1.4* ) )
        app-arch/unzip
-       dev-java/ant-core"
+       ${COMMON_DEP}"
 
 src_unpack() {
        unpack ${A}
        cd "${S}"
-       epatch "${FILESDIR}"/20051206-java5.patch
+       
+       epatch "${FILESDIR}/20051206-java5.patch"
+       
        rm -v lib/*.jar || die
-       rm thirdparty/servlet/*.jar || die
+       rm -v thirdparty/servlet/*.jar || die
        rm -vr ant || die
+       
        cd lib
        java-pkg_jar-from servletapi-2.4 servlet-api.jar servlets.jar
-       #Loads these at runtime only
-       java-pkg_getjars xp >/dev/null
 }
 
 EANT_BUILD_TARGET="compile"
@@ -44,8 +44,12 @@ src_install() {
        java-pkg_newjar lib/${PN}${PV}.jar
        java-pkg_dolauncher ${PN} \
                --main com.jclark.xsl.sax.Driver
+       # loads this only on runtime
+       java-pkg_register-dep xp
+       
        dodoc README.txt || die
        dohtml index.html || die
+       
        use doc && java-pkg_dojavadoc docs/api
        use source && java-pkg_dosrc src/xt/java/com
 }