From ffc819857a5db24d150bf254e03d72f1850809d1 Mon Sep 17 00:00:00 2001 From: Alistair Bush Date: Sun, 22 Apr 2007 01:35:12 +0000 Subject: [PATCH] Fixing javadoc unpack error Package-Manager: portage-2.1.2.4 --- dev-java/ehcache/ChangeLog | 6 +++++- dev-java/ehcache/Manifest | 26 ++++++++---------------- dev-java/ehcache/ehcache-1.2.4-r2.ebuild | 9 ++++++-- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dev-java/ehcache/ChangeLog b/dev-java/ehcache/ChangeLog index c6085b010c9a..5e5b2a40fa81 100644 --- a/dev-java/ehcache/ChangeLog +++ b/dev-java/ehcache/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/ehcache # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.8 2007/04/19 19:10:37 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ChangeLog,v 1.9 2007/04/22 01:35:12 ali_bush Exp $ + + 22 Apr 2007; Alistair John Bush + ehcache-1.2.4-r2.ebuild: + Fixed build error when using doc use flag 19 Apr 2007; Krzysiek Pawlik +files/build.xml-1.2.4-r2, ehcache-1.2.4-r2.ebuild: diff --git a/dev-java/ehcache/Manifest b/dev-java/ehcache/Manifest index 21159f505351..5aa2c96647e3 100644 --- a/dev-java/ehcache/Manifest +++ b/dev-java/ehcache/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX build.xml-1.2.4-r2 605 RMD160 93e9c0e022a252728af6a4a4acd25487348f9632 SHA1 8939824111c0cfd0dcb182815d11bf458bcd79ef SHA256 f0e595f3de8ef425c5b69df443d3fa08a29b09dce90632d17ab31f3d6a78cfc5 MD5 54d6e8a54ab5195176914a350f932fa7 files/build.xml-1.2.4-r2 605 RMD160 93e9c0e022a252728af6a4a4acd25487348f9632 files/build.xml-1.2.4-r2 605 @@ -11,18 +8,18 @@ EBUILD ehcache-1.1-r1.ebuild 1227 RMD160 1ee5a7df9378a9260b65b2fc987ac37d3e38376 MD5 d40f843e835dd4f3d1fcb274aea8c570 ehcache-1.1-r1.ebuild 1227 RMD160 1ee5a7df9378a9260b65b2fc987ac37d3e383761 ehcache-1.1-r1.ebuild 1227 SHA256 e2cd9912635d2cae9f4c06cc763158ebf6a7ab48c6f138ce9a1e33e873c694df ehcache-1.1-r1.ebuild 1227 -EBUILD ehcache-1.2.4-r2.ebuild 1450 RMD160 b1ae00593b6c39acede59211f0cc2fe8f49db4d6 SHA1 5f2ff4955c26cc24a5ac36764942bb523ab6cde6 SHA256 3e6b12624db8556f47b10fc6e179fd327df3b003d9f509d88dd88de1439f442b -MD5 7b23580e22136076c09ceeedbb46f030 ehcache-1.2.4-r2.ebuild 1450 -RMD160 b1ae00593b6c39acede59211f0cc2fe8f49db4d6 ehcache-1.2.4-r2.ebuild 1450 -SHA256 3e6b12624db8556f47b10fc6e179fd327df3b003d9f509d88dd88de1439f442b ehcache-1.2.4-r2.ebuild 1450 +EBUILD ehcache-1.2.4-r2.ebuild 1498 RMD160 dd749adbc699d1983198987d4dcea2731c5967e9 SHA1 b25f47b405455db2fb6ed5eb6e7d543d6cb73abd SHA256 d7c8896c1a264986991ff8d2903bf77aff8badd42049c92f0547883cd56a5102 +MD5 9ff6b8f478171b3cc1027f0d372de16b ehcache-1.2.4-r2.ebuild 1498 +RMD160 dd749adbc699d1983198987d4dcea2731c5967e9 ehcache-1.2.4-r2.ebuild 1498 +SHA256 d7c8896c1a264986991ff8d2903bf77aff8badd42049c92f0547883cd56a5102 ehcache-1.2.4-r2.ebuild 1498 EBUILD ehcache-1.2.4.ebuild 1364 RMD160 191258e11635ad24cac35922711c0f85c1b1ce84 SHA1 8709bfff021c94ca7d0719ed0ec910c95578bf19 SHA256 f3b0ce7443e0eeb058e8a918390e276983c28f67017888a10c958c34fdc55149 MD5 0b79bce769cce96610cefbfe2ba6489c ehcache-1.2.4.ebuild 1364 RMD160 191258e11635ad24cac35922711c0f85c1b1ce84 ehcache-1.2.4.ebuild 1364 SHA256 f3b0ce7443e0eeb058e8a918390e276983c28f67017888a10c958c34fdc55149 ehcache-1.2.4.ebuild 1364 -MISC ChangeLog 1658 RMD160 1ded7f5fc49490bcc23b9cc313a8ce7543810212 SHA1 42ef9409b7005de1126c21c43c2880b0a5f166af SHA256 862c862346c21735c7906603598ec0913d971eec1bf85155fb68e5504206caa3 -MD5 dae2d6050fa13f6bbc8a82ca58a4c599 ChangeLog 1658 -RMD160 1ded7f5fc49490bcc23b9cc313a8ce7543810212 ChangeLog 1658 -SHA256 862c862346c21735c7906603598ec0913d971eec1bf85155fb68e5504206caa3 ChangeLog 1658 +MISC ChangeLog 1786 RMD160 b9c4211315e9081dec8543aae7b254983fc44bb9 SHA1 bbe645855fe0c4f7db6f1af7d4a50fac44e95188 SHA256 01da4a4310c21f8f328decf907f562c0d17f3b6c46457c19a9a501e8dbbe72a4 +MD5 338d9350b8d68cba471e985b1dfe06c1 ChangeLog 1786 +RMD160 b9c4211315e9081dec8543aae7b254983fc44bb9 ChangeLog 1786 +SHA256 01da4a4310c21f8f328decf907f562c0d17f3b6c46457c19a9a501e8dbbe72a4 ChangeLog 1786 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb MD5 9f455923f62e1ecb14ebb7f29636850a metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f metadata.xml 159 @@ -36,10 +33,3 @@ SHA256 16fb9d74efca4bfd54415a8608ed175173f019b7a2e535043367357b4b332a81 files/di MD5 7e0226c19145ca446caa534140694d6b files/digest-ehcache-1.2.4-r2 235 RMD160 c567f65abb9150e4b37b4a96a7d1bb589ffec977 files/digest-ehcache-1.2.4-r2 235 SHA256 16fb9d74efca4bfd54415a8608ed175173f019b7a2e535043367357b4b332a81 files/digest-ehcache-1.2.4-r2 235 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) - -iD8DBQFGJ77Ygo/w9rxVVVERAohfAKCQTE7+wA7qEZRjAn+a7bL2ibn+gQCgmgEV -tVyj+0WspMfmnQK+y/wpOLc= -=8Rzv ------END PGP SIGNATURE----- diff --git a/dev-java/ehcache/ehcache-1.2.4-r2.ebuild b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild index 683a7d9ad929..362f7a645fda 100644 --- a/dev-java/ehcache/ehcache-1.2.4-r2.ebuild +++ b/dev-java/ehcache/ehcache-1.2.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v 1.2 2007/04/19 19:10:37 nelchael Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/ehcache/ehcache-1.2.4-r2.ebuild,v 1.3 2007/04/22 01:35:12 ali_bush Exp $ JAVA_PKG_IUSE="doc source" @@ -23,6 +23,7 @@ RDEPEND=">=virtual/jre-1.5 ${COMMON_DEPEND}" DEPEND=">=virtual/jdk-1.5 ${COMMON_DEPEND} + app-arch/unzip source? ( app-arch/zip ) >=dev-java/ant-core-1.5" @@ -34,7 +35,7 @@ src_unpack() { unpack ${A} cd ${S} - use doc && unpack ${P}-javadoc.zip + use doc && unzip -qq ${P}-javadoc.zip mkdir src && cd src unzip -qq ../${P}-sources.jar @@ -56,6 +57,10 @@ src_unpack() { } +src_compile() { + eant jar +} + src_install() { java-pkg_dojar ${PN}.jar -- 2.26.2