From: Vlastimil Babka Date: Mon, 12 Feb 2007 00:51:34 +0000 (+0000) Subject: Migrate to split-ant wrt xjavac, and cleanup. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=099067f4dea98644e409bf3654d14580673faf70;p=gentoo.git Migrate to split-ant wrt xjavac, and cleanup. Package-Manager: portage-2.1.2-r9 --- diff --git a/dev-java/xerces/ChangeLog b/dev-java/xerces/ChangeLog index 21717c2994d6..de81e51199df 100644 --- a/dev-java/xerces/ChangeLog +++ b/dev-java/xerces/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-java/xerces # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.73 2007/01/09 13:24:38 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/ChangeLog,v 1.74 2007/02/12 00:51:34 caster Exp $ + +*xerces-2.7.1-r3 (12 Feb 2007) +*xerces-2.3.0-r3 (12 Feb 2007) + + 12 Feb 2007; Vlastimil Babka +xerces-2.3.0-r3.ebuild, + xerces-2.6.2-r4.ebuild, -xerces-2.7.1.ebuild, +xerces-2.7.1-r3.ebuild, + xerces-2.8.1.ebuild: + Migrate to split-ant wrt xjavac, and cleanup. 09 Jan 2007; Steve Dibb xerces-2.7.1-r2.ebuild: amd64 stable, bug 157023 diff --git a/dev-java/xerces/Manifest b/dev-java/xerces/Manifest index ba009d7aa965..d70fc6be97db 100644 --- a/dev-java/xerces/Manifest +++ b/dev-java/xerces/Manifest @@ -51,30 +51,34 @@ EBUILD xerces-2.3.0-r2.ebuild 1489 RMD160 38ade48249242c95a75d7b849867cff8a11a1a MD5 b772ec0046e1f435bf482f28c9adaa68 xerces-2.3.0-r2.ebuild 1489 RMD160 38ade48249242c95a75d7b849867cff8a11a1aa4 xerces-2.3.0-r2.ebuild 1489 SHA256 bc29964d6d150956d44e9b95b7315616c9331987532c13e8499e86feb56fe737 xerces-2.3.0-r2.ebuild 1489 +EBUILD xerces-2.3.0-r3.ebuild 1338 RMD160 a99f6fde3c3cc2129734fe70a7724104b3a85da4 SHA1 ab7c9044ee76f1a1abc2a6fd54b456e16ae228c5 SHA256 4b28b3df917f35afb120ac5fad02dc124e298539ec218755a926cdb7f8851ffc +MD5 3c99599475f973ea4795e4f44cec3383 xerces-2.3.0-r3.ebuild 1338 +RMD160 a99f6fde3c3cc2129734fe70a7724104b3a85da4 xerces-2.3.0-r3.ebuild 1338 +SHA256 4b28b3df917f35afb120ac5fad02dc124e298539ec218755a926cdb7f8851ffc xerces-2.3.0-r3.ebuild 1338 EBUILD xerces-2.6.2-r3.ebuild 1769 RMD160 f6b84d591d43d2d0535c633fd2cddd6215f648a5 SHA1 9123824a45eef720671472ee71ba7e764aa298c9 SHA256 5518ca53eb67d548fa24aa31d108d4667ca0d9012012f51e1ea413b79b12d4a0 MD5 ebdb8369844b49964c1ffbd6fc1b55f4 xerces-2.6.2-r3.ebuild 1769 RMD160 f6b84d591d43d2d0535c633fd2cddd6215f648a5 xerces-2.6.2-r3.ebuild 1769 SHA256 5518ca53eb67d548fa24aa31d108d4667ca0d9012012f51e1ea413b79b12d4a0 xerces-2.6.2-r3.ebuild 1769 -EBUILD xerces-2.6.2-r4.ebuild 1594 RMD160 054391c9f83395e430c8feb5308a8ef334ae36b5 SHA1 eb5dd4da650f58ca57394351d520e4a54894c17a SHA256 4ab2a730c58d89b731e74ef8dcb15eb49200989d3f2818521e1aba7300560a2d -MD5 6e1b7439ceb6b052deed7d2795214125 xerces-2.6.2-r4.ebuild 1594 -RMD160 054391c9f83395e430c8feb5308a8ef334ae36b5 xerces-2.6.2-r4.ebuild 1594 -SHA256 4ab2a730c58d89b731e74ef8dcb15eb49200989d3f2818521e1aba7300560a2d xerces-2.6.2-r4.ebuild 1594 +EBUILD xerces-2.6.2-r4.ebuild 1550 RMD160 640a98c188cf20a845e31f5dea49fd2e85f923f1 SHA1 3943d57f409892bf1d67b6746a3be54dfac577c9 SHA256 09fa904ee96aaadde7c2d561aeb5c92a0c794f559b5e783cf386a6fc6cd8dcd4 +MD5 d7cd15ff1b59a59c332cbbac51593676 xerces-2.6.2-r4.ebuild 1550 +RMD160 640a98c188cf20a845e31f5dea49fd2e85f923f1 xerces-2.6.2-r4.ebuild 1550 +SHA256 09fa904ee96aaadde7c2d561aeb5c92a0c794f559b5e783cf386a6fc6cd8dcd4 xerces-2.6.2-r4.ebuild 1550 EBUILD xerces-2.7.1-r2.ebuild 1634 RMD160 2399960f5c4aa9ad4705c58aa67db1b5e0373be4 SHA1 ce6f6afe655a6a1828a5178b4ab69ad659b966bf SHA256 50d665132380be84b1e2104f6567ec61a5da39dc578f9d6205e7a166f82020bc MD5 890426ff7f4b75148c923a854a2dfe13 xerces-2.7.1-r2.ebuild 1634 RMD160 2399960f5c4aa9ad4705c58aa67db1b5e0373be4 xerces-2.7.1-r2.ebuild 1634 SHA256 50d665132380be84b1e2104f6567ec61a5da39dc578f9d6205e7a166f82020bc xerces-2.7.1-r2.ebuild 1634 -EBUILD xerces-2.7.1.ebuild 1640 RMD160 6396e4a0719c92ed562f566b292c205de39f3c19 SHA1 1b42d29d1d508efffbd1c3c59415543fcf6bb218 SHA256 403f4a6cef2a6e177a7a4adfa530b52f1f476f3189319d13d942620356a83b60 -MD5 1d7632129343e36e1e37703b544074d0 xerces-2.7.1.ebuild 1640 -RMD160 6396e4a0719c92ed562f566b292c205de39f3c19 xerces-2.7.1.ebuild 1640 -SHA256 403f4a6cef2a6e177a7a4adfa530b52f1f476f3189319d13d942620356a83b60 xerces-2.7.1.ebuild 1640 -EBUILD xerces-2.8.1.ebuild 1944 RMD160 c0271202a9e516b500a3c3b98e832d75b50b08a1 SHA1 5e1b5ce1330fadc5bf424cd1fd82fbc76dedfc10 SHA256 ce0ad72e0e379f1309a42d4db9bc215136287848b05b3fb3532bcdf34e9c914a -MD5 6fa3d0f4c469d9f4d66996a570366db8 xerces-2.8.1.ebuild 1944 -RMD160 c0271202a9e516b500a3c3b98e832d75b50b08a1 xerces-2.8.1.ebuild 1944 -SHA256 ce0ad72e0e379f1309a42d4db9bc215136287848b05b3fb3532bcdf34e9c914a xerces-2.8.1.ebuild 1944 -MISC ChangeLog 11393 RMD160 1ea02a775fc6efcfb56a41836ebc1db59dc0df47 SHA1 30230fd95ce7bce895344092b94f8454f88af2c5 SHA256 5e3df6c2c4a524fc89211c42b5fa4b425618f4f40d5e9b9f8bd717e49adcbf1c -MD5 4373f3766c66970549129d504487b8f1 ChangeLog 11393 -RMD160 1ea02a775fc6efcfb56a41836ebc1db59dc0df47 ChangeLog 11393 -SHA256 5e3df6c2c4a524fc89211c42b5fa4b425618f4f40d5e9b9f8bd717e49adcbf1c ChangeLog 11393 +EBUILD xerces-2.7.1-r3.ebuild 1599 RMD160 9df25d518b2beadbfc00c5421c46589af51d1803 SHA1 517cc18a13751925ecd824387f6c1227c1f3806c SHA256 c0a98f463d4676147512dbcc75e0345830c30471954d48f738a8561e611189a1 +MD5 5b01d27f6c0a3f6cc436be368de526ea xerces-2.7.1-r3.ebuild 1599 +RMD160 9df25d518b2beadbfc00c5421c46589af51d1803 xerces-2.7.1-r3.ebuild 1599 +SHA256 c0a98f463d4676147512dbcc75e0345830c30471954d48f738a8561e611189a1 xerces-2.7.1-r3.ebuild 1599 +EBUILD xerces-2.8.1.ebuild 1884 RMD160 e448ac798221575f9389fd71c2c942aaca94d1b5 SHA1 12dd50265c47f92f8fe5e01bbd27450b8822210e SHA256 fc9a9f82dc5942dfbc155ef3ed44eeba2ef73ff528039e9e09cab7d6e451b129 +MD5 ad18a80ee2b90409b88becc2642c1018 xerces-2.8.1.ebuild 1884 +RMD160 e448ac798221575f9389fd71c2c942aaca94d1b5 xerces-2.8.1.ebuild 1884 +SHA256 fc9a9f82dc5942dfbc155ef3ed44eeba2ef73ff528039e9e09cab7d6e451b129 xerces-2.8.1.ebuild 1884 +MISC ChangeLog 11676 RMD160 d7dd1e2683997304f852c82663783577e9759b27 SHA1 54a64ddb8511de40d019eb28173de94a5985d416 SHA256 80c4da9a292c7e6368c65f905f64aad77957d1d8a08e5c624d1741fa5a40e7fa +MD5 c35f40a6c0cce754d2bda0c907ef7cd9 ChangeLog 11676 +RMD160 d7dd1e2683997304f852c82663783577e9759b27 ChangeLog 11676 +SHA256 80c4da9a292c7e6368c65f905f64aad77957d1d8a08e5c624d1741fa5a40e7fa ChangeLog 11676 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157 @@ -91,18 +95,21 @@ SHA256 4e472a21ded1f02fc0d0724ec9e951824278d8a5c1d8816079f76a464ff05206 files/di MD5 5960db59d47c31deea3c4a33c31a5941 files/digest-xerces-2.3.0-r2 259 RMD160 3537fd09130fff8b9afb70d7bdc592888195c254 files/digest-xerces-2.3.0-r2 259 SHA256 4e472a21ded1f02fc0d0724ec9e951824278d8a5c1d8816079f76a464ff05206 files/digest-xerces-2.3.0-r2 259 +MD5 5960db59d47c31deea3c4a33c31a5941 files/digest-xerces-2.3.0-r3 259 +RMD160 3537fd09130fff8b9afb70d7bdc592888195c254 files/digest-xerces-2.3.0-r3 259 +SHA256 4e472a21ded1f02fc0d0724ec9e951824278d8a5c1d8816079f76a464ff05206 files/digest-xerces-2.3.0-r3 259 MD5 b6444943de6c0f764410ff84da0284a8 files/digest-xerces-2.6.2-r3 259 RMD160 184f4090abaf2a0e6b4399865dfa50bbd2b96b3f files/digest-xerces-2.6.2-r3 259 SHA256 e76769e658262c8b45d4bc91feab072ff6570843ab66516cab7ca75d62431206 files/digest-xerces-2.6.2-r3 259 MD5 b6444943de6c0f764410ff84da0284a8 files/digest-xerces-2.6.2-r4 259 RMD160 184f4090abaf2a0e6b4399865dfa50bbd2b96b3f files/digest-xerces-2.6.2-r4 259 SHA256 e76769e658262c8b45d4bc91feab072ff6570843ab66516cab7ca75d62431206 files/digest-xerces-2.6.2-r4 259 -MD5 17e91ebc28cecbbb4ab465fe811f2295 files/digest-xerces-2.7.1 259 -RMD160 6b6e7d8cf58c970f869e3bc2c08aa600f52b77ef files/digest-xerces-2.7.1 259 -SHA256 405aa354c2ad33e5069a2643eb176f6286f970bea15f4466109112c447faa377 files/digest-xerces-2.7.1 259 MD5 17e91ebc28cecbbb4ab465fe811f2295 files/digest-xerces-2.7.1-r2 259 RMD160 6b6e7d8cf58c970f869e3bc2c08aa600f52b77ef files/digest-xerces-2.7.1-r2 259 SHA256 405aa354c2ad33e5069a2643eb176f6286f970bea15f4466109112c447faa377 files/digest-xerces-2.7.1-r2 259 +MD5 17e91ebc28cecbbb4ab465fe811f2295 files/digest-xerces-2.7.1-r3 259 +RMD160 6b6e7d8cf58c970f869e3bc2c08aa600f52b77ef files/digest-xerces-2.7.1-r3 259 +SHA256 405aa354c2ad33e5069a2643eb176f6286f970bea15f4466109112c447faa377 files/digest-xerces-2.7.1-r3 259 MD5 4314ac356413293ff84decf6ae37947e files/digest-xerces-2.8.1 259 RMD160 d3a1b41db1bc2892464bbef941e7ea458fac0cef files/digest-xerces-2.8.1 259 SHA256 98fd7d713b06c5a3405d27b58595c40afdd17e609f7cb8b89d4d39a0646201f4 files/digest-xerces-2.8.1 259 diff --git a/dev-java/xerces/files/digest-xerces-2.3.0-r3 b/dev-java/xerces/files/digest-xerces-2.3.0-r3 new file mode 100644 index 000000000000..5984e52fb0a3 --- /dev/null +++ b/dev-java/xerces/files/digest-xerces-2.3.0-r3 @@ -0,0 +1,3 @@ +MD5 fd7e2b41e6f7a4571215a48d2abe9041 Xerces-J-src.2.3.0.tar.gz 1556920 +RMD160 2340aa6f27c9f0616951d8ef0c2d96e168a359b7 Xerces-J-src.2.3.0.tar.gz 1556920 +SHA256 a3b9a6939c0959ea29fe2df13dbb9dcdf679ae1125d2f8488bd4bd6fff6737fe Xerces-J-src.2.3.0.tar.gz 1556920 diff --git a/dev-java/xerces/files/digest-xerces-2.7.1 b/dev-java/xerces/files/digest-xerces-2.7.1-r3 similarity index 100% rename from dev-java/xerces/files/digest-xerces-2.7.1 rename to dev-java/xerces/files/digest-xerces-2.7.1-r3 diff --git a/dev-java/xerces/xerces-2.3.0-r3.ebuild b/dev-java/xerces/xerces-2.3.0-r3.ebuild new file mode 100644 index 000000000000..9676e62f71c6 --- /dev/null +++ b/dev-java/xerces/xerces-2.3.0-r3.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2007 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.3.0-r3.ebuild,v 1.1 2007/02/12 00:51:34 caster Exp $ + +WANT_SPLIT_ANT=true +JAVA_PKG_IUSE="doc examples source" +inherit java-pkg-2 java-ant-2 eutils + +DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family" +HOMEPAGE="http://xml.apache.org/xerces2-j/index.html" +SRC_URI="http://xml.apache.org/dist/xerces-j/Xerces-J-src.${PV}.tar.gz" + +LICENSE="Apache-1.1" +SLOT="2.3" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="" + +RDEPEND=">=virtual/jre-1.3 + >=dev-java/xml-commons-1.0_beta2" +DEPEND=">=virtual/jdk-1.3 + >=dev-java/xjavac-20041208-r1 + ${RDEPEND}" + +S=${WORKDIR}/xerces-${PV//./_} + +src_unpack() { + unpack ${A} + + cd ${S} + epatch ${FILESDIR}/${P}-gentoo.patch + + mkdir ${S}/tools && cd ${S}/tools + java-pkg_jar-from xml-commons xml-apis.jar +} + +src_compile() { + ANT_TASKS="xjavac-1" eant ${antflags} jar $(use_doc javadocs) +} + +src_install() { + java-pkg_dojar build/xercesImpl.jar + + dodoc TODO STATUS README ISSUES + dohtml Readme.html + + use doc && java-pkg_dojavadoc build/docs/javadocs + if use examples; then + dodir /usr/share/doc/${PF}/examples + cp -a samples/* ${D}/usr/share/doc/${PF} + fi + use source && java-pkg_dosrc ${S}/src/* +} diff --git a/dev-java/xerces/xerces-2.6.2-r4.ebuild b/dev-java/xerces/xerces-2.6.2-r4.ebuild index b852b7fa0dd6..d35466330b5e 100644 --- a/dev-java/xerces/xerces-2.6.2-r4.ebuild +++ b/dev-java/xerces/xerces-2.6.2-r4.ebuild @@ -1,7 +1,9 @@ -# 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/xerces/xerces-2.6.2-r4.ebuild,v 1.1 2006/12/03 03:04:24 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.6.2-r4.ebuild,v 1.2 2007/02/12 00:51:34 caster Exp $ +WANT_SPLIT_ANT=true +JAVA_PKG_IUSE="doc examples source" inherit java-pkg-2 java-ant-2 eutils DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family" @@ -11,16 +13,14 @@ SRC_URI="http://archive.apache.org/dist/xml/xerces-j/Xerces-J-src.${PV}.tar.gz" LICENSE="Apache-1.1" SLOT="2.6" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" -IUSE="doc examples source" +IUSE="" CDEPEND=">=dev-java/xml-commons-1.0_beta2 >=dev-java/xml-commons-resolver-1.1" RDEPEND=">=virtual/jre-1.4 ${CDEPEND}" DEPEND=">=virtual/jdk-1.4 - >=dev-java/ant-core-1.5.2 >=dev-java/xjavac-20041208 - source? ( app-arch/zip ) ${CDEPEND}" S="${WORKDIR}/xerces-${PV//./_}" @@ -39,7 +39,7 @@ src_unpack() { } src_compile() { - eant -lib "$(java-pkg_getjars --build-only xjavac-1)" jar $(use_doc javadocs) + ANT_TASKS="xjavac-1" eant jar $(use_doc javadocs) } src_install() { diff --git a/dev-java/xerces/xerces-2.7.1.ebuild b/dev-java/xerces/xerces-2.7.1-r3.ebuild similarity index 50% rename from dev-java/xerces/xerces-2.7.1.ebuild rename to dev-java/xerces/xerces-2.7.1-r3.ebuild index c1c2d22e1617..7f03630ec34f 100644 --- a/dev-java/xerces/xerces-2.7.1.ebuild +++ b/dev-java/xerces/xerces-2.7.1-r3.ebuild @@ -1,63 +1,58 @@ -# 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/xerces/xerces-2.7.1.ebuild,v 1.6 2006/09/28 02:47:57 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.7.1-r3.ebuild,v 1.1 2007/02/12 00:51:34 caster Exp $ -inherit java-pkg eutils +WANT_SPLIT_ANT=true +JAVA_PKG_IUSE="doc examples source" +inherit eutils versionator java-pkg-2 java-ant-2 -MY_PN="Xerces-J" +DIST_PN="Xerces-J" +SRC_PV="$(replace_all_version_separators _ )" DESCRIPTION="The next generation of high performance, fully compliant XML parsers in the Apache Xerces family" HOMEPAGE="http://xml.apache.org/xerces2-j/index.html" -SRC_URI="mirror://apache/xml/${PN}-j/${MY_PN}-src.${PV}.tar.gz" +SRC_URI="mirror://apache/xml/${PN}-j/${DIST_PN}-src.${PV}.tar.gz" LICENSE="Apache-1.1" SLOT="2" -KEYWORDS="amd64 ppc x86" +KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86" IUSE="doc examples source" RDEPEND=">=virtual/jre-1.4 - >=dev-java/ant-core-1.5.2 =dev-java/xml-commons-external-1.3* - >=dev-java/xml-commons-resolver-1.1 - >=dev-java/xjavac-20041208" + >=dev-java/xml-commons-resolver-1.1" DEPEND=">=virtual/jdk-1.4 - source? ( app-arch/zip ) + >=dev-java/xjavac-20041208 ${RDEPEND}" -S="${WORKDIR}/${PN}-${PV//./_}" +S="${WORKDIR}/${PN}-${SRC_PV}" src_unpack() { unpack ${A} - cd ${S} - epatch ${FILESDIR}/${PF}-gentoo.patch + cd "${S}" + epatch ${FILESDIR}/${P}-gentoo.patch epatch ${FILESDIR}/${P}-no_dom3.patch mkdir tools && cd tools - rm -f *.jar java-pkg_jar-from xml-commons-external-1.3 xml-apis.jar java-pkg_jar-from xml-commons-resolver xml-commons-resolver.jar resolver.jar - - mkdir ${S}/tools/bin - cd ${S}/tools/bin - java-pkg_jar-from xjavac-1 } src_compile() { - local antflags="jars" - use doc && antflags="${antflags} javadocs" - ant ${antflags} || die "Compile failed." + ANT_TASKS="xjavac-1" eant jar $(use_doc javadocs) } src_install() { - java-pkg_dojar build/x*.jar + java-pkg_dojar build/xercesImpl.jar dodoc TODO STATUS README ISSUES - java-pkg_dohtml Readme.html + dohtml Readme.html - use doc && java-pkg_dohtml -r build/docs/javadocs + use doc && java-pkg_dojavadoc build/docs/javadocs if use examples; then dodir /usr/share/doc/${PF}/examples cp -r samples/* ${D}/usr/share/doc/${PF}/examples fi - use source && java-pkg_dosrc ${S}/src/* + + use source && java-pkg_dosrc ${S}/src/org } diff --git a/dev-java/xerces/xerces-2.8.1.ebuild b/dev-java/xerces/xerces-2.8.1.ebuild index 758f47422946..92de0dd588c4 100644 --- a/dev-java/xerces/xerces-2.8.1.ebuild +++ b/dev-java/xerces/xerces-2.8.1.ebuild @@ -1,7 +1,9 @@ -# 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/xerces/xerces-2.8.1.ebuild,v 1.2 2006/12/07 22:48:22 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/xerces/xerces-2.8.1.ebuild,v 1.3 2007/02/12 00:51:34 caster Exp $ +WANT_SPLIT_ANT=true +JAVA_PKG_IUSE="doc examples source" inherit eutils versionator java-pkg-2 java-ant-2 DIST_PN="Xerces-J" @@ -13,15 +15,13 @@ SRC_URI="mirror://apache/xml/${PN}-j/${DIST_PN}-src.${PV}.tar.gz" LICENSE="Apache-2.0" SLOT="2" KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd" -IUSE="doc examples source" +IUSE="" RDEPEND=">=virtual/jre-1.4 =dev-java/xml-commons-external-1.3* >=dev-java/xml-commons-resolver-1.1" DEPEND=">=virtual/jdk-1.4 - >=dev-java/ant-core-1.6.5-r14 >=dev-java/xjavac-20041208-r4 - source? ( app-arch/zip ) ${RDEPEND}" S="${WORKDIR}/${PN}-${SRC_PV}" @@ -42,16 +42,16 @@ 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 - eant -lib "$(java-pkg_getjars --build-only xjavac-1)" jar $(use_doc javadocs) + ANT_TASKS="xjavac-1" eant jar $(use_doc javadocs) } src_install() { java-pkg_dojar build/xercesImpl.jar dodoc TODO STATUS README ISSUES - java-pkg_dohtml Readme.html + dohtml Readme.html - use doc && java-pkg_dohtml -r build/docs/javadocs + use doc && java-pkg_dojavadoc build/docs/javadocs if use examples; then dodir "/usr/share/doc/${PF}/examples" cp -r samples/* "${D}/usr/share/doc/${PF}/examples" diff --git a/dev-java/xjavac/Manifest b/dev-java/xjavac/Manifest index 4ae7ebd79731..eb7f2551d98d 100644 --- a/dev-java/xjavac/Manifest +++ b/dev-java/xjavac/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX xjavac-20041208-build.xml 1088 RMD160 40b56a0816001a3b80816c785620ac30dda5f053 SHA1 110534c27b7801bd1946d04a035700ec6702cb38 SHA256 efed4720ae40840e8c8715c6925dc9fe54100202e7a710fd3998062d81e4e81b MD5 6fe9f96a234f0ef0c00816978f225959 files/xjavac-20041208-build.xml 1088 RMD160 40b56a0816001a3b80816c785620ac30dda5f053 files/xjavac-20041208-build.xml 1088 @@ -14,14 +11,18 @@ MD5 6c42db1b4f823b17898f2af913789684 files/xjavac-more-vendors.patch 1554 RMD160 83f976aa040f07ac38f44e499bc6509545c57800 files/xjavac-more-vendors.patch 1554 SHA256 c0e5cd4b1213b75ffc6e11ec05ce9f5e6bea562ada305d1557f6b0db01c141d9 files/xjavac-more-vendors.patch 1554 DIST xjavac-20041208.tar.gz 1971 RMD160 bdee4c165275dedcfaf42fd38962a85b668d259e SHA1 be52abeadcaff8ac44c87b2b6b13cad49f583b4a SHA256 ae54e392bfe3ff5d33bc58a7e122bdae863531e235c2a553dee024e045694781 -EBUILD xjavac-20041208-r4.ebuild 1019 RMD160 762b386eee1291f3b76313cdc15f13beff4c5316 SHA1 bffc2589df4ad9a9b0c23979050bb831917eb16f SHA256 440e2a0498d18388e96c6244860018924062b8a5523ff0f92e95a71b4922d068 -MD5 2cb4e64c454ab925aa0c2fe55f347a0c xjavac-20041208-r4.ebuild 1019 -RMD160 762b386eee1291f3b76313cdc15f13beff4c5316 xjavac-20041208-r4.ebuild 1019 -SHA256 440e2a0498d18388e96c6244860018924062b8a5523ff0f92e95a71b4922d068 xjavac-20041208-r4.ebuild 1019 -MISC ChangeLog 2954 RMD160 2040718ecb8febc0aed91bd70903d90938fd91bf SHA1 27ea31adb915277955ac8529b877962cfe124771 SHA256 d364783d296959704e29d775993d38950289b63b968949a3edced0f83638ae8b -MD5 e4d9fb20cfb5716e6ae7f9a18f2a1d9e ChangeLog 2954 -RMD160 2040718ecb8febc0aed91bd70903d90938fd91bf ChangeLog 2954 -SHA256 d364783d296959704e29d775993d38950289b63b968949a3edced0f83638ae8b ChangeLog 2954 +EBUILD xjavac-20041208-r4.ebuild 1029 RMD160 9220b119b75090ac06346195d978fa3d0260e5fa SHA1 dd5264c4c66c4b4a8b0ef8c74d621ab3425ffa69 SHA256 36b251c4bd215eb1e97605ffcfdf4ac6074b503d7d1fe262e81e46ad2876ced4 +MD5 8fec31156ac38f0ec825c9bde03e8976 xjavac-20041208-r4.ebuild 1029 +RMD160 9220b119b75090ac06346195d978fa3d0260e5fa xjavac-20041208-r4.ebuild 1029 +SHA256 36b251c4bd215eb1e97605ffcfdf4ac6074b503d7d1fe262e81e46ad2876ced4 xjavac-20041208-r4.ebuild 1029 +EBUILD xjavac-20041208-r5.ebuild 955 RMD160 13c659f5f99c7f23faa4f51e8a91b942b986e61a SHA1 3a00d3a3a42fe8237a29b8050ecf6a89f76c5990 SHA256 32b4f68c8b3a07a5d9c46dfe76b877c8776e79d9042cbcb77b5d4260830eba5e +MD5 288917ce48583a78f0c0092f7ec47463 xjavac-20041208-r5.ebuild 955 +RMD160 13c659f5f99c7f23faa4f51e8a91b942b986e61a xjavac-20041208-r5.ebuild 955 +SHA256 32b4f68c8b3a07a5d9c46dfe76b877c8776e79d9042cbcb77b5d4260830eba5e xjavac-20041208-r5.ebuild 955 +MISC ChangeLog 3196 RMD160 6c79352a6b111e992274ae588a866b16e8dc1a4a SHA1 22146f1bba23998d231a34dd2f455b854d9c4ba5 SHA256 b2792df7ecd6456170ef32808e97d0b40ebc01e3aad9a9dfa72b64176c818d61 +MD5 bf924b3078ba96cb64536464588a7741 ChangeLog 3196 +RMD160 6c79352a6b111e992274ae588a866b16e8dc1a4a ChangeLog 3196 +SHA256 b2792df7ecd6456170ef32808e97d0b40ebc01e3aad9a9dfa72b64176c818d61 ChangeLog 3196 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158 @@ -29,10 +30,6 @@ SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb metadata MD5 a4c406ae3dc57df84886caef0f37219d files/digest-xjavac-20041208-r4 241 RMD160 fcd61d3c2a2a5b09b70e89a9bb5a1f9cef8c90fa files/digest-xjavac-20041208-r4 241 SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/digest-xjavac-20041208-r4 241 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.1 (GNU/Linux) - -iD8DBQFFu9FEcxLzpIGCsLQRAuJCAJ4naZ3TrqDJvz4DOYElRyFRgz/r8ACfaI0s -mdEgo55ipdR7WK3YS1ZbB2Q= -=yTRj ------END PGP SIGNATURE----- +MD5 a4c406ae3dc57df84886caef0f37219d files/digest-xjavac-20041208-r5 241 +RMD160 fcd61d3c2a2a5b09b70e89a9bb5a1f9cef8c90fa files/digest-xjavac-20041208-r5 241 +SHA256 2a2976df0ab2c5e333c761622251fc56aa6411ee60db5088a76546657142b156 files/digest-xjavac-20041208-r5 241