diff options
-rw-r--r-- | dev-java/commons-collections/Manifest | 12 | ||||
-rw-r--r-- | dev-java/commons-collections/commons-collections-3.1.ebuild | 4 | ||||
-rw-r--r-- | dev-java/icu4j/Manifest | 2 | ||||
-rw-r--r-- | dev-java/icu4j/icu4j-3.0.ebuild | 6 | ||||
-rw-r--r-- | dev-java/jakarta-regexp/Manifest | 14 | ||||
-rw-r--r-- | dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild | 5 | ||||
-rw-r--r-- | dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild | 5 | ||||
-rw-r--r-- | dev-java/jlex/Manifest | 2 | ||||
-rw-r--r-- | dev-java/jlex/jlex-1.2.6.ebuild | 11 | ||||
-rw-r--r-- | dev-java/xml-commons-resolver/Manifest | 12 | ||||
-rw-r--r-- | dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild | 8 | ||||
-rw-r--r-- | dev-java/xml-commons/Manifest | 12 | ||||
-rw-r--r-- | dev-java/xml-commons/xml-commons-1.0_beta2.ebuild | 8 | ||||
-rw-r--r-- | dev-java/xpp2/Manifest | 12 | ||||
-rw-r--r-- | dev-java/xpp2/xpp2-2.1.10.ebuild | 5 |
15 files changed, 32 insertions, 86 deletions
diff --git a/dev-java/commons-collections/Manifest b/dev-java/commons-collections/Manifest index a4cadf70d267..f0db62759b1e 100644 --- a/dev-java/commons-collections/Manifest +++ b/dev-java/commons-collections/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 aef43a69642ce9d2b8556a2bf591e681 commons-collections-3.1.ebuild 1208 +MD5 72ca2e6480803b5f68995efe198f8958 commons-collections-3.1.ebuild 1201 MD5 513255c8822b0e5213120982264d3100 ChangeLog 4053 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 d6999c3ed2ac2f04284b7b49641afcc9 files/digest-commons-collections-3.1 80 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCoweL06ebR+OMO78RArWoAJ4jnuFKdqW72NP7b2awgX8fBNrA4gCfWSTp -XQRsVMZ+pXLMDjxP4g7xYZk= -=Wg02 ------END PGP SIGNATURE----- diff --git a/dev-java/commons-collections/commons-collections-3.1.ebuild b/dev-java/commons-collections/commons-collections-3.1.ebuild index c803e7a298cc..8ccf3e655913 100644 --- a/dev-java/commons-collections/commons-collections-3.1.ebuild +++ b/dev-java/commons-collections/commons-collections-3.1.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-3.1.ebuild,v 1.9 2005/06/05 14:08:50 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-collections/commons-collections-3.1.ebuild,v 1.10 2005/07/09 16:00:48 axxo Exp $ inherit java-pkg eutils DESCRIPTION="Jakarta-Commons Collections Component" HOMEPAGE="http://jakarta.apache.org/commons/collections.html" -SRC_URI="mirror://apache/jakarta/commons/collections/source/${PN}-${PV}-src.tar.gz" +SRC_URI="mirror://apache/jakarta/commons/collections/source/${P}-src.tar.gz" LICENSE="Apache-1.1" SLOT="0" diff --git a/dev-java/icu4j/Manifest b/dev-java/icu4j/Manifest index 171a7e11d9d8..ff07f6667d90 100644 --- a/dev-java/icu4j/Manifest +++ b/dev-java/icu4j/Manifest @@ -1,4 +1,4 @@ +MD5 a12a338e97bdb21c2560e7d261ada4a5 icu4j-3.0.ebuild 1195 MD5 0e507cc558529a38ac17ce12b3985381 ChangeLog 966 -MD5 baa653ddfcb294da2f59fd5e6187a0b5 icu4j-3.0.ebuild 1138 MD5 4dad079a28768d183022cff420f01281 metadata.xml 220 MD5 998429fb6f6a9beb6ff4899735f0e32b files/digest-icu4j-3.0 125 diff --git a/dev-java/icu4j/icu4j-3.0.ebuild b/dev-java/icu4j/icu4j-3.0.ebuild index 30d5b9c7d836..19c2065561ae 100644 --- a/dev-java/icu4j/icu4j-3.0.ebuild +++ b/dev-java/icu4j/icu4j-3.0.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.0.ebuild,v 1.6 2005/06/12 18:10:11 weeve Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icu4j/icu4j-3.0.ebuild,v 1.7 2005/07/09 16:02:29 axxo Exp $ inherit java-pkg @@ -23,10 +23,10 @@ RDEPEND=">=virtual/jre-1.4" S=${WORKDIR} src_unpack() { - jar -xf ${DISTDIR}/${PN}src_${MY_PV}.jar + jar -xf ${DISTDIR}/${PN}src_${MY_PV}.jar || die "failed to unpack" if use doc; then mkdir docs; cd docs - jar -xf ${DISTDIR}/${PN}docs_${MY_PV}.jar + jar -xf ${DISTDIR}/${PN}docs_${MY_PV}.jar || die "failed to unpack docs" fi } diff --git a/dev-java/jakarta-regexp/Manifest b/dev-java/jakarta-regexp/Manifest index 511754740352..4bd1c6e3a65f 100644 --- a/dev-java/jakarta-regexp/Manifest +++ b/dev-java/jakarta-regexp/Manifest @@ -1,16 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 f3d6a995069e9c136afddcb9f471f099 jakarta-regexp-1.3-r2.ebuild 1100 -MD5 bf34785d9346ca25f852db2eb180ba80 jakarta-regexp-1.3-r1.ebuild 1095 +MD5 76a1a8ff9632685797eacf26692067ba jakarta-regexp-1.3-r2.ebuild 1087 +MD5 1d0919d8beaa4b47c6ff704896b4b867 jakarta-regexp-1.3-r1.ebuild 1082 MD5 215846e9017665216b060928d48d5007 ChangeLog 747 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 6eac4bdeb129dbd95c52ac349db33c61 files/digest-jakarta-regexp-1.3-r1 70 MD5 6eac4bdeb129dbd95c52ac349db33c61 files/digest-jakarta-regexp-1.3-r2 70 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCWB3V06ebR+OMO78RAu/rAJ9p47DDIMmxGG8RIM5f0P1jEqgyGgCgmOGn -Edgn2o3Rr5Yb28IvHp6EviU= -=ABZV ------END PGP SIGNATURE----- diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild index 678de9af1c43..6619936b8b0c 100644 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild,v 1.1 2005/04/04 13:36:59 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r1.ebuild,v 1.2 2005/07/09 16:03:30 axxo Exp $ inherit java-pkg @@ -33,8 +33,7 @@ src_compile() { src_install() { cd ${S}/build - mv ${P}.jar ${PN}.jar - java-pkg_dojar ${PN}.jar + java-pkg_newjar ${P}.jar ${PN}.jar use doc && java-pkg_dohtml -r docs/api/* use source && java-pkg_dosrc ${S}/src/java/* diff --git a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild index d1d98d73bb71..3e5f593ebdde 100644 --- a/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild +++ b/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild,v 1.1 2005/04/09 18:24:00 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jakarta-regexp/jakarta-regexp-1.3-r2.ebuild,v 1.2 2005/07/09 16:03:30 axxo Exp $ inherit java-pkg @@ -33,8 +33,7 @@ src_compile() { src_install() { cd ${S}/build - mv ${P}.jar ${PN}.jar - java-pkg_dojar ${PN}.jar + java-pkg_newjar ${P}.jar ${PN}.jar use doc && java-pkg_dohtml -r docs/api/* use source && java-pkg_dosrc ${S}/src/java/* diff --git a/dev-java/jlex/Manifest b/dev-java/jlex/Manifest index 8184da513ea1..90c8d3fdd56a 100644 --- a/dev-java/jlex/Manifest +++ b/dev-java/jlex/Manifest @@ -1,4 +1,4 @@ +MD5 367e9cc38fc6492dd302d11313bdfc4e jlex-1.2.6.ebuild 826 MD5 ccfacdbfa25f770b3a0ce53fa66271a7 ChangeLog 901 -MD5 1ab6130bd82aa3a6ba5e3257cc67e984 jlex-1.2.6.ebuild 835 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 MD5 f3996bcc26d0e320c2b99f0d4fcae2a8 files/digest-jlex-1.2.6 62 diff --git a/dev-java/jlex/jlex-1.2.6.ebuild b/dev-java/jlex/jlex-1.2.6.ebuild index 88a8c11cf084..b3263e39a2cd 100644 --- a/dev-java/jlex/jlex-1.2.6.ebuild +++ b/dev-java/jlex/jlex-1.2.6.ebuild @@ -1,17 +1,16 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jlex/jlex-1.2.6.ebuild,v 1.9 2005/04/22 08:38:26 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jlex/jlex-1.2.6.ebuild,v 1.10 2005/07/09 16:04:58 axxo Exp $ inherit java-pkg DESCRIPTION="JLex: a lexical analyzer generator for Java" -SRC_URI="mirror://gentoo/${PN}-${PV}.tar.bz2" +SRC_URI="mirror://gentoo/${P}.tar.bz2" HOMEPAGE="http://www.cs.princeton.edu/~appel/modern/java/JLex/" KEYWORDS="x86 ppc sparc amd64" LICENSE="jlex" SLOT="0" DEPEND=">=virtual/jdk-1.2 - app-arch/zip jikes? ( dev-java/jikes )" RDEPEND=">=virtual/jre-1.2" IUSE="doc jikes" @@ -21,10 +20,10 @@ src_compile() { } src_install() { - dodoc LICENSE README Bugs + dodoc README Bugs use doc && dohtml manual.html use doc && dodoc sample.lex mkdir JLex && mv *.class JLex/ - zip -rq jlex.jar JLex/ - java-pkg_doclass jlex.jar + jar cf jlex.jar JLex/ || die "failed to jar" + java-pkg_dojar jlex.jar } diff --git a/dev-java/xml-commons-resolver/Manifest b/dev-java/xml-commons-resolver/Manifest index 06e8f5f016f1..1c75da39c1c1 100644 --- a/dev-java/xml-commons-resolver/Manifest +++ b/dev-java/xml-commons-resolver/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - +MD5 c0ad5e4c49eee7db8190b7654fead3e7 xml-commons-resolver-1.1.ebuild 992 MD5 ee557da5643c34d794898454e6a82df6 ChangeLog 1983 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 -MD5 8a72e405972c6d0f90058d318733f210 xml-commons-resolver-1.1.ebuild 999 MD5 c0c9047ccd57e4f7c4abb514e1bf3e14 files/digest-xml-commons-resolver-1.1 76 MD5 5124f36f583226aa536b7293a38f9f17 files/xml-commons-resolver-1.1-build.xml 1649 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux) - -iD8DBQFCm2RGKRy60XGEcJIRAvUaAKCKJ8iADWhzQpLjIkVHZ/UsqqjP5wCfQgrS -wbwed+3/WWKBJIV/6MfbJ8c= -=JZ4/ ------END PGP SIGNATURE----- diff --git a/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild b/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild index 633dec0638af..3640a56d45d8 100644 --- a/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild +++ b/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild,v 1.13 2005/05/30 19:06:25 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons-resolver/xml-commons-resolver-1.1.ebuild,v 1.14 2005/07/09 16:09:47 axxo Exp $ inherit eutils java-pkg @@ -8,7 +8,7 @@ DESCRIPTION="xml-commons is focussed on common code and guidelines for xml proje HOMEPAGE="http://xml.apache.org/commons/" SRC_URI="mirror://apache/xml/commons/${P}.tar.gz" DEPEND=">=virtual/jdk-1.3 - dev-java/ant + dev-java/ant-core source? ( app-arch/zip )" RDEPEND=">=virtual/jre-1.3" LICENSE="Apache-1.1" @@ -35,7 +35,5 @@ src_install() { dodoc KEYS use doc && java-pkg_dohtml -r docs/* - if use source; then - java-pkg_dosrc ${S}/src/* - fi + use source && java-pkg_dosrc ${S}/src/* } diff --git a/dev-java/xml-commons/Manifest b/dev-java/xml-commons/Manifest index 04c83798856e..2093e03ae57f 100644 --- a/dev-java/xml-commons/Manifest +++ b/dev-java/xml-commons/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 d4c12fe352b13c866699b2288ee66ddb xml-commons-1.0_beta2.ebuild 1311 +MD5 9cccd566fc949cde600884b5edda5585 xml-commons-1.0_beta2.ebuild 1336 MD5 fc478bcee2ebc22435fb409109cfd93b ChangeLog 1694 MD5 6c508e5bd6d1f3926eef63565d0f2cef metadata.xml 577 MD5 55bd514ef86d8fcec1e605bb9eddea1f files/1.0_beta2-jdk15.patch 1784 MD5 ff3ac9f3ff42eef7ede2b379c9b25340 files/digest-xml-commons-1.0_beta2 71 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.0 (GNU/Linux) - -iD8DBQFCrINB06ebR+OMO78RAikIAJsF/k2tAuIX35UEWNdxmL/uZSJmaACfS6ls -jz3iyDAIH4olDtV33zp/p4E= -=1vWh ------END PGP SIGNATURE----- diff --git a/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild b/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild index b7efe2605e9c..c164e1098827 100644 --- a/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild +++ b/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild,v 1.12 2005/06/12 18:47:02 luckyduck Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xml-commons/xml-commons-1.0_beta2.ebuild,v 1.13 2005/07/09 16:09:27 axxo Exp $ inherit eutils java-pkg +MY_PV=${PV/_beta/.b} +MY_P=${PN}-${MY_PV} DESCRIPTION="Jakarta project for for XML bindings for java" HOMEPAGE="http://xml.apache.org/commons/" -SRC_URI="mirror://apache/xml/commons/${PN}-1.0.b2.tar.gz" +SRC_URI="mirror://apache/xml/commons/${MY_P}.tar.gz" LICENSE="Apache-1.1" SLOT="0" @@ -19,7 +21,7 @@ DEPEND=">=virtual/jdk-1.4 source? ( app-arch/zip )" RDEPEND=">=virtual/jre-1.4" -S=${WORKDIR}/xml-commons-1.0.b2 +S=${WORKDIR}/${MY_P} src_unpack() { unpack ${A} diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest index abe35471aea8..d4f1280d885c 100644 --- a/dev-java/xpp2/Manifest +++ b/dev-java/xpp2/Manifest @@ -1,14 +1,4 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - MD5 eea2efa418b99b7caee1f9d21c58e7d4 ChangeLog 595 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 -MD5 08536ba4511aaf6902af4b8642e5ab42 xpp2-2.1.10.ebuild 1550 +MD5 7ff7a7c8c0ad4a2b004102f3d96ca8d8 xpp2-2.1.10.ebuild 1551 MD5 1c865c0c21a11a78913d4785ae129577 files/digest-xpp2-2.1.10 66 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.1 (GNU/Linux) - -iD8DBQFCzlkD/rLF9B432nYRAh+6AJoDC5J1YZT42ZU3nSyBYrJtmcoazQCgz1Wd -dy4Bgv+1mwr0Fc/XfzT6dDU= -=xUfY ------END PGP SIGNATURE----- diff --git a/dev-java/xpp2/xpp2-2.1.10.ebuild b/dev-java/xpp2/xpp2-2.1.10.ebuild index 97fd563e123c..48ace946a0c8 100644 --- a/dev-java/xpp2/xpp2-2.1.10.ebuild +++ b/dev-java/xpp2/xpp2-2.1.10.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/xpp2-2.1.10.ebuild,v 1.4 2005/07/08 10:43:54 axxo Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xpp2/xpp2-2.1.10.ebuild,v 1.5 2005/07/09 16:10:44 axxo Exp $ inherit java-pkg @@ -29,10 +29,9 @@ src_unpack() { rm build/*/*.jar } src_compile() { - local antflags="-lib $(java-config -p xerces-2) compile" + local antflags="-lib $(java-pkg_getjars xerces-2) compile" use jikes && antflags="-Dbuild.compiler=jikes ${antflags}" use doc && antflags="${antflags} api" - ant ${antflags} || die "Compilation failed" } |