summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2012-05-10 15:53:30 +0000
committerAlexis Ballier <aballier@gentoo.org>2012-05-10 15:53:30 +0000
commitc1493f903b996a6ce914c84099dac5f0765e08d5 (patch)
tree11f69b16429cd2ccab79e38318b21a1f35522539 /dev-java
parentRemove old (diff)
downloadhistorical-c1493f903b996a6ce914c84099dac5f0765e08d5.tar.gz
historical-c1493f903b996a6ce914c84099dac5f0765e08d5.tar.bz2
historical-c1493f903b996a6ce914c84099dac5f0765e08d5.zip
fix pkg_nofetch
Package-Manager: portage-2.2.0_alpha103/cvs/Linux x86_64
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/diablo-jdk/ChangeLog6
-rw-r--r--dev-java/diablo-jdk/Manifest10
-rw-r--r--dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild6
3 files changed, 15 insertions, 7 deletions
diff --git a/dev-java/diablo-jdk/ChangeLog b/dev-java/diablo-jdk/ChangeLog
index 7f5381c02d3a..ed3fb96f048d 100644
--- a/dev-java/diablo-jdk/ChangeLog
+++ b/dev-java/diablo-jdk/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/diablo-jdk
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.14 2012/05/10 15:45:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.15 2012/05/10 15:53:30 aballier Exp $
+
+ 10 May 2012; Alexis Ballier <aballier@gentoo.org>
+ diablo-jdk-1.6.0.07.02.ebuild:
+ fix pkg_nofetch
10 May 2012; Alexis Ballier <aballier@gentoo.org>
diablo-jdk-1.6.0.07.02.ebuild:
diff --git a/dev-java/diablo-jdk/Manifest b/dev-java/diablo-jdk/Manifest
index 6582ea4f9b64..50a5b89fb4ef 100644
--- a/dev-java/diablo-jdk/Manifest
+++ b/dev-java/diablo-jdk/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
AUX diablo-jdk-1.6.env 936 RMD160 f629a52590863932c59d5f77618c41da4af69cbb SHA1 8344c550f1d704aed539e3a9b0862185d09cdc39 SHA256 fc220b5ee5ed61dc3eefb9c734987fec7ca4f5a41f46699f3a873f6b795d2aef
DIST diablo-caffe-freebsd7-amd64-1.6.0_07-b02.tar.bz2 62778916 RMD160 4846f0cb7c6b78d70c30da78c9645322dc158373 SHA1 35a351c7f679192da88d4f28b0c8fdccff99bd78 SHA256 09f9fb014779f1e02456d51692c61902125800830b82078be9eac95190343109
DIST diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2 64093245 RMD160 6a4b354ba556fe00aa260da7e6f269de6d894010 SHA1 8046dc67cff191a0779b8d9a297bf30b902a89c8 SHA256 971a537f8e852166fa94a9666b14e2f0a8ee51dcf7a470ab7bcb5be0dba05409
-EBUILD diablo-jdk-1.6.0.07.02.ebuild 4561 RMD160 abc3216d52ee20faed21de2383822a64ced51222 SHA1 2d1bd24b9048e5d28d0b1dfb8609ce101f726c8b SHA256 73f9794b3e9af849a492822d0c62c4e49bd1eec91796ff88497e2ee1da9f08ba
-MISC ChangeLog 2359 RMD160 66294365242eccafbe65dd399920c9494c25881d SHA1 9f3c1ea76322186c8df2f7809b442e1a027293db SHA256 05af9ee7ab54a565f9b5d2eaf18863d311d7c9f2f47eeb3f9fa66db679c708f2
+EBUILD diablo-jdk-1.6.0.07.02.ebuild 4649 RMD160 5ac70697a5718b60f5a633c1a3795ba65be94e9b SHA1 bfaf1c4f984b7bd32a4686259621eb953018df10 SHA256 5c617120d2dfb024214260234679e2f720f5370e3d43d836eca59c31bf9a2cb8
+MISC ChangeLog 2463 RMD160 ebcf10845934d377fc2526ad30bb3efccdceca5b SHA1 0bc04935c2b0cc9bffadf88e16d1304894b11f5c SHA256 cb50850f999d82f42abe246f12313900ec1552cc056a574c85a0eac69b223749
MISC metadata.xml 291 RMD160 c570e537e8b928defbd6d022001303ce2ef84a7a SHA1 08a03decf6a506afc76730be9b41a6fbb5a989b6 SHA256 e70edd2620f9a7e711b53d0cbe677a7b78268f2e859d9d2567c9c11c13008ceb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iEYEARECAAYFAk+r4qYACgkQvFcC4BYPU0qZJgCeI4x42vxz6ksmqEnnJn594vXR
-UfIAoIHG7skQcjnR0vHxH38aY4G6Q661
-=d7VT
+iEYEARECAAYFAk+r5IAACgkQvFcC4BYPU0rmlQCgwd2HCtFdh0xF7bzPq6pzARRr
+ZVoAoMd5lXJHkMx1JNi/H5Kqopjck4Ti
+=7xGe
-----END PGP SIGNATURE-----
diff --git a/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild b/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild
index c9ec206a08d4..3fc6eb6b4de5 100644
--- a/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild
+++ b/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.5 2012/05/10 15:45:37 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.6 2012/05/10 15:53:30 aballier Exp $
EAPI="3"
@@ -43,6 +43,10 @@ JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
S="${WORKDIR}/diablo-jdk$(get_version_component_range 1-4 ${MY_PV})"
pkg_nofetch() {
+ case ${CHOST} in
+ x86_64*) javafile=${javafile64};;
+ *) javafile=${javafile32}
+ esac
einfo "Please download ${javafile} from:"
einfo "${HOMEPAGE}"
einfo "and move it to ${DISTDIR}"