summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2007-05-26 17:15:41 +0000
committerVlastimil Babka <caster@gentoo.org>2007-05-26 17:15:41 +0000
commit82739edc8e8bc9c5496ecf38caa33ebbc25386e8 (patch)
tree7d9df4f6d880e5b5180edd362e15bf3279ff6261 /dev-java/jarjar
parentalpha stable wrt #178553 (diff)
downloadhistorical-82739edc8e8bc9c5496ecf38caa33ebbc25386e8.tar.gz
historical-82739edc8e8bc9c5496ecf38caa33ebbc25386e8.tar.bz2
historical-82739edc8e8bc9c5496ecf38caa33ebbc25386e8.zip
Fix jar-from call and DEPEND to actually compile.
Package-Manager: portage-2.1.2.8
Diffstat (limited to 'dev-java/jarjar')
-rw-r--r--dev-java/jarjar/ChangeLog5
-rw-r--r--dev-java/jarjar/Manifest26
-rw-r--r--dev-java/jarjar/jarjar-0.9.ebuild6
3 files changed, 15 insertions, 22 deletions
diff --git a/dev-java/jarjar/ChangeLog b/dev-java/jarjar/ChangeLog
index b9506c336837..a4590b09744a 100644
--- a/dev-java/jarjar/ChangeLog
+++ b/dev-java/jarjar/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jarjar
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.16 2007/05/26 16:46:44 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/ChangeLog,v 1.17 2007/05/26 17:15:41 caster Exp $
+
+ 26 May 2007; Vlastimil Babka <caster@gentoo.org> jarjar-0.9.ebuild:
+ Fix jar-from call and DEPEND to actually compile.
26 May 2007; Krzysiek Pawlik <nelchael@gentoo.org> jarjar-0.9.ebuild:
Fix jar-from call to match *DEPEND.
diff --git a/dev-java/jarjar/Manifest b/dev-java/jarjar/Manifest
index a100827cc98e..421979c8cd25 100644
--- a/dev-java/jarjar/Manifest
+++ b/dev-java/jarjar/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX 0.9-system-jars.patch 790 RMD160 74f7c22791ffaace532a0016af519f1845374580 SHA1 991a2c7caf24f98e4f1b0c6ae69ea5d79762ec20 SHA256 9e1f66b2da6c774b643e45c487815288daafa8d55ab674d5c45727609ba3fc5e
MD5 83ab21b67b5b6f3cd03ee0090a343898 files/0.9-system-jars.patch 790
RMD160 74f7c22791ffaace532a0016af519f1845374580 files/0.9-system-jars.patch 790
@@ -15,14 +12,14 @@ EBUILD jarjar-0.6-r1.ebuild 1175 RMD160 f5541a9fbe11adf35f5bab21c2cf9bc7fbac522a
MD5 f3cc1b855d384b76c3baed8953785ee8 jarjar-0.6-r1.ebuild 1175
RMD160 f5541a9fbe11adf35f5bab21c2cf9bc7fbac522a jarjar-0.6-r1.ebuild 1175
SHA256 2c32ac74f34772b2ffedce1bb73c45cc15cbc7a91206c672f0cdaf40c0f61a66 jarjar-0.6-r1.ebuild 1175
-EBUILD jarjar-0.9.ebuild 1464 RMD160 255d921c7e0e488d1f6c680dfc4b21d0b9d41a10 SHA1 6df0cb1de1ee4ce85f0e7f45039cb9610dbf1093 SHA256 ce7594f420dab2dc3774608ec6b216b34cea9edfed5a2a7fa1044d5c9332dded
-MD5 34028a6baf9c6c93f665000ec7f22e00 jarjar-0.9.ebuild 1464
-RMD160 255d921c7e0e488d1f6c680dfc4b21d0b9d41a10 jarjar-0.9.ebuild 1464
-SHA256 ce7594f420dab2dc3774608ec6b216b34cea9edfed5a2a7fa1044d5c9332dded jarjar-0.9.ebuild 1464
-MISC ChangeLog 2831 RMD160 89fb3c7dbeaf4aeaf19288088447665a1091676b SHA1 ae370a0642a3d15d5d12a04878dd45b88e14f9c1 SHA256 7086b4abd4af5a65547426919b6712a3c0502df5b06d600751344d4914f38026
-MD5 08f9beb70f4173a4ecec25875b4675cd ChangeLog 2831
-RMD160 89fb3c7dbeaf4aeaf19288088447665a1091676b ChangeLog 2831
-SHA256 7086b4abd4af5a65547426919b6712a3c0502df5b06d600751344d4914f38026 ChangeLog 2831
+EBUILD jarjar-0.9.ebuild 1462 RMD160 422fb4d4c2d48a29b0445f02bfc41bd92ac0e776 SHA1 bc8ba5d55afd9a576dd22898005760badc2aef2e SHA256 c11599f21fe177eb8a11adc8c3dfbe6cb635c86072bac6f4469ba81fcd0d306c
+MD5 5aa8c55382e5706a3cdb36e1662b048f jarjar-0.9.ebuild 1462
+RMD160 422fb4d4c2d48a29b0445f02bfc41bd92ac0e776 jarjar-0.9.ebuild 1462
+SHA256 c11599f21fe177eb8a11adc8c3dfbe6cb635c86072bac6f4469ba81fcd0d306c jarjar-0.9.ebuild 1462
+MISC ChangeLog 2952 RMD160 4beb8e4cbc2b04bc6e7ec18e28da3aad8d995e70 SHA1 8df745a392756484196fb1fafaaea51cfca693ee SHA256 bbebf825748ec18bf420213a739c4b4f9b9814d25eedb35e47b7ba2bd20fe474
+MD5 af13a2b15985abf3971a1f7b9cba435c ChangeLog 2952
+RMD160 4beb8e4cbc2b04bc6e7ec18e28da3aad8d995e70 ChangeLog 2952
+SHA256 bbebf825748ec18bf420213a739c4b4f9b9814d25eedb35e47b7ba2bd20fe474 ChangeLog 2952
MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -33,10 +30,3 @@ SHA256 e2b12935670115472cb52fe2f05dde873a9f5c8249b9b61acb0518ba73f6cb49 files/di
MD5 dde27e7519a63ee530e95ede9104822d files/digest-jarjar-0.9 235
RMD160 1d68b496dbab7dd90f9c85daa9d6063d72b8dcf4 files/digest-jarjar-0.9 235
SHA256 166c69ddc69212fc74e5cef6aa062a66950ab79607c5ab1dd40bfc591e004b03 files/digest-jarjar-0.9 235
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGWGTIgo/w9rxVVVERAvy8AKCzKjavzppfKOqFXPSX1B8OYoKbmQCcDbXk
-+c4mt61wksF4op+YMHB0Quo=
-=6+gs
------END PGP SIGNATURE-----
diff --git a/dev-java/jarjar/jarjar-0.9.ebuild b/dev-java/jarjar/jarjar-0.9.ebuild
index fedad6fd2b25..edc22ba0a2ce 100644
--- a/dev-java/jarjar/jarjar-0.9.ebuild
+++ b/dev-java/jarjar/jarjar-0.9.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/jarjar/jarjar-0.9.ebuild,v 1.3 2007/05/26 16:46:44 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jarjar/jarjar-0.9.ebuild,v 1.4 2007/05/26 17:15:41 caster Exp $
JAVA_PKG_IUSE="doc source test"
@@ -14,7 +14,7 @@ SLOT="1"
KEYWORDS="~amd64 ~x86"
IUSE=""
COMMON_DEP="
- =dev-java/asm-3.0*
+ =dev-java/asm-2.0*
=dev-java/gnu-regexp-1*
>=dev-java/ant-core-1.7.0
dev-java/java-getopt"
@@ -33,7 +33,7 @@ src_unpack() {
epatch "${FILESDIR}/0.9-system-jars.patch"
cd "${S}/lib"
rm -v *.jar || die
- java-pkg_jar-from asm-3
+ java-pkg_jar-from asm-2
java-pkg_jar-from gnu-regexp-1
java-pkg_jar-from ant-core ant.jar
java-pkg_jar-from java-getopt-1