diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2011-11-11 12:41:20 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2011-11-11 12:41:20 +0000 |
| commit | 78ff9e303b6cc637b152e6b0ab8f826d94fe8c8f (patch) | |
| tree | e553c8b6fbeb244b15a849b5f4bbad8c6c4b53d5 /dev-java/icedtea | |
| parent | fix build with ffmpeg-0.8, bug #382593, and make it multilib-strict compliant (diff) | |
| download | historical-78ff9e303b6cc637b152e6b0ab8f826d94fe8c8f.tar.gz historical-78ff9e303b6cc637b152e6b0ab8f826d94fe8c8f.tar.bz2 historical-78ff9e303b6cc637b152e6b0ab8f826d94fe8c8f.zip | |
Support building using icedtea-bin-7.
Package-Manager: portage-2.2.0_alpha68/cvs/Linux x86_64
Diffstat (limited to 'dev-java/icedtea')
| -rw-r--r-- | dev-java/icedtea/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-java/icedtea/Manifest | 4 | ||||
| -rw-r--r-- | dev-java/icedtea/icedtea-7.2.0-r1.ebuild | 9 |
3 files changed, 12 insertions, 6 deletions
diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index c84ff0b46f9b..727c1615f19d 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-java/icedtea # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.44 2011/11/10 21:42:12 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.45 2011/11/11 12:41:20 caster Exp $ + + 11 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild: + Support building using icedtea-bin-7. 10 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild, icedtea-7.2.0-r1.ebuild: diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index f2ff3dcfca0b..3ef9f98d3820 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -18,6 +18,6 @@ DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b EBUILD icedtea-6.1.10.4-r1.ebuild 11119 RMD160 10bdec87cab8a8bc8ca1db3c41c41b22388bb81e SHA1 5fbd929337fb3b2f0107989022714ebcdb5cf760 SHA256 b32935f23be058836d42ced5d7dad3d42189fe3959394b8c43b94395c431c257 -EBUILD icedtea-7.2.0-r1.ebuild 11138 RMD160 9a243d91a52b671d4f42f9d656454b0b4a1fe7b1 SHA1 3207b94ebf21def929aa731e49a9815ad21538e4 SHA256 2d3011ab3d0ac1edc1a2a14d6b347bb7abf49c030c4d70121faf4568e6abae6c -MISC ChangeLog 8522 RMD160 6e554c00cde824618c21b5832aafbcac5dec9c52 SHA1 42be2a0a151d1f28d3050da992125aeb438f23d0 SHA256 d193cc3088d0dd391f2834b3b6dd3cdff5555c4524a369750dc919bc43bf57ee +EBUILD icedtea-7.2.0-r1.ebuild 11280 RMD160 531247d104f80ed98a7ae10837291a2634c98c78 SHA1 61f63f654e4016e078d5ace6f002b11a5ac73fd2 SHA256 aa94e7e31083b29b9a12c790a6c042a3eacfdac05ec85a485e0b334c4f390991 +MISC ChangeLog 8641 RMD160 5668eb9cb8264e2f78720347da360c65972fe5f5 SHA1 729cdb245cd7bde181dd26ab3c23591d8d4dcf6e SHA256 c05747f0b2dc60b0b22e8d5f05f58344d9c4cff2436e1293357918b0274112f7 MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4 diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild index 6889796a7b3d..a4ab9699a5e3 100644 --- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild +++ b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.8 2011/11/10 21:42:12 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.9 2011/11/11 12:41:20 caster Exp $ # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) # ********************************************************* @@ -82,8 +82,9 @@ DEPEND="${RDEPEND} || ( >=dev-java/gcj-jdk-4.3 >=dev-java/cacao-0.99.2 - dev-java/icedtea:7 + dev-java/icedtea-bin:7 dev-java/icedtea-bin:6 + dev-java/icedtea:7 dev-java/icedtea:6 ) app-arch/zip @@ -138,6 +139,8 @@ pkg_setup() { JAVA_PKG_FORCE_VM="icedtea7" elif has_version ">dev-java/icedtea-7.2.0:7"; then JAVA_PKG_FORCE_VM="icedtea-7" + elif has_version "dev-java/icedtea-bin:7"; then + JAVA_PKG_FORCE_VM="icedtea-bin-7" elif has_version "<=dev-java/icedtea-6.1.10.4:6"; then JAVA_PKG_FORCE_VM="icedtea6" elif has_version ">dev-java/icedtea-6.1.10.4:6"; then @@ -177,7 +180,7 @@ src_configure() { if [[ "${vm}" == "icedtea6" || "${vm}" == "icedtea-6" || "${vm}" == "icedtea6-bin" || "${vm}" == "icedtea-bin-6" ]] ; then # We can't currently bootstrap with a IcedTea6 JVM :( config="${config} --disable-bootstrap" - elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" && "${vm}" != "icedtea7" && "${vm}" != "icedtea-7" ]] ; then + elif [[ "${vm}" != "gcj-jdk" && "${vm}" != "cacao" && "${vm}" != "icedtea7" && "${vm}" != "icedtea-7" && "${vm}" != "icedtea-bin-7" ]] ; then eerror "IcedTea must be built with either a JDK based on GNU Classpath or an existing build of IcedTea." die "Install a GNU Classpath JDK (gcj-jdk, cacao)" fi |