From 09b4e39a33e7428264519eef18cc08458b7ee248 Mon Sep 17 00:00:00 2001 From: geos_one Date: Sun, 17 Oct 2010 20:39:55 +0000 Subject: [PATCH] dev-java/icedtea6-bin: downgrade to the real version git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/genlink@2541 6952d904-891a-0410-993b-d76249ca496b --- dev-java/icedtea6-bin/ChangeLog | 4 ++++ dev-java/icedtea6-bin/Manifest | 20 +++++++------------ ...1.6.2.ebuild => icedtea6-bin-1.4.1.ebuild} | 19 ++++-------------- 3 files changed, 15 insertions(+), 28 deletions(-) rename dev-java/icedtea6-bin/{icedtea6-bin-1.6.2.ebuild => icedtea6-bin-1.4.1.ebuild} (75%) diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog index 92f5e56..2ac44dc 100644 --- a/dev-java/icedtea6-bin/ChangeLog +++ b/dev-java/icedtea6-bin/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.3 2009/04/19 18:15:33 caster Exp $ + 17 Oct 2010; Mario Fetka + +icedtea6-bin-1.4.1.ebuild, -icedtea6-bin-1.6.2.ebuild: + downgrade to the real version + 12 Jan 2010; Mario Fetka Manifest: bump bins diff --git a/dev-java/icedtea6-bin/Manifest b/dev-java/icedtea6-bin/Manifest index 9c72b0f..39adf15 100644 --- a/dev-java/icedtea6-bin/Manifest +++ b/dev-java/icedtea6-bin/Manifest @@ -1,15 +1,9 @@ AUX icedtea6-bin.env 947 RMD160 8f72b884c823f408755a3b06daea5af7705da488 SHA1 7473e4d987d5b0e9f1dbf48fbf4978e37d2f64b9 SHA256 b0f675b427f42d7fd1bbf1314523144a2bfc9f5ad44f89568adce120929f74e3 -DIST icedtea6-bin-core-1.6.2-amd64.tar.bz2 35029460 RMD160 9ba62e6fa84e25c759cf65ad2c51e250ba237381 SHA1 dbca7205d81864e54739e84c559050936b6fa205 SHA256 467d95025194b6f009380b6fd9c5c5c5d4f6262b6a13b33ae0173be5e50379a3 -DIST icedtea6-bin-core-1.6.2-arm.tar.bz2 36105654 RMD160 24a1921a6837ce781fe9509f05650bbbb80633a0 SHA1 fb9c20c5171dcc964945df88235fccc20dbfc076 SHA256 95ceaf37835efa3e2b9961af9da4edba145052ea6b1dfaab17cc08c294e5bf4f -DIST icedtea6-bin-core-1.6.2-x86.tar.bz2 36166740 RMD160 f83f860d204dc543e47c713d72d24f6f37f3edce SHA1 069daba7dc5a5555b19c87ca2c8f35cb50f97970 SHA256 008f0f06e9b0f2932a374b9d2adc4df1557235016e0a440ccbac24b4eb9884ab -DIST icedtea6-bin-doc-1.6.2.tar.bz2 11510649 RMD160 1952385ce072084e2da8edc9c2a126085efb2408 SHA1 b31b5879203ae71b774310d07a1f6383d7b543df SHA256 f55babb856330d4b428f234d9e5e390573b628b3f5addbe6ef255f867cb94230 -DIST icedtea6-bin-examples-1.6.2-amd64.tar.bz2 2175076 RMD160 18942ecba633702ac045261010f41e1907808529 SHA1 93e7f5efa4e06225b1dba40139c9c8c72bfc7471 SHA256 7d31e154f7e919ce9e5422d74906659e9df17153a7531b0faae8d31140423fb5 -DIST icedtea6-bin-examples-1.6.2-arm.tar.bz2 2141520 RMD160 0cceb4507ed26f9a2176a4f052df5e22be4a0944 SHA1 cbf299e3639152e59a9b309ecd13a478b71ca04c SHA256 338eaddc0349e513250efc562f1dc78914d4ef26b22773da4cc37e042909e95f -DIST icedtea6-bin-examples-1.6.2-x86.tar.bz2 2139766 RMD160 046e2f24c8a68e8c1370f0e6a84b6daf1642f381 SHA1 71ce6083172e7c367efc940c76c36b4b42a5541f SHA256 ad7271047d3aa1d149bf32e40e360330433ce5a17cf1ca09262163e1ff9eddfc -DIST icedtea6-bin-nsplugin-1.6.2-amd64.tar.bz2 87978 RMD160 1ec55b39b0772b745d8935e77772dbc3621627ac SHA1 777ee6ab4602985a0a2a4b74a0c1a8a636543d52 SHA256 df7e6278e833576a5ed8d516796742d0265f1b7d04ca8c9b4f9f2404f7553f86 -DIST icedtea6-bin-nsplugin-1.6.2-arm.tar.bz2 80421 RMD160 154f311af1d4008f822288d21182cda950d01a05 SHA1 6b45acae6e93690de3764c303f686562ada5302f SHA256 19d86af5b2c1c8be1fa2f6ad4bf538f842cb5ea56c73e8b2ac431aea47773d8e -DIST icedtea6-bin-nsplugin-1.6.2-x86.tar.bz2 75643 RMD160 d09aefb774640f072ee114febf7ddf2aabe7604c SHA1 a64ef399d7dce2c44438120d075bde383f7a3a86 SHA256 35fe44b3f707d4f9febb7e3f072941bc410edb9ad5ceb65fab18567e5bc7ff21 -DIST icedtea6-bin-src-1.6.2.tar.bz2 26607503 RMD160 1815dfb667c20920922da3a0b51a73ed190339ff SHA1 ed25f999ac75ca804962a58a36203ab8ae64611d SHA256 1fa1ab94c7eccfaee1e6cf3a78da64281beab8634df0f436ee94d5f04d9b3d79 -EBUILD icedtea6-bin-1.6.2.ebuild 2934 RMD160 1713f97e970143e78c17a46b0cfb4500b111c7a5 SHA1 d404179df77de3f84fb747b3fa20f380427fe661 SHA256 6ad7c056700715fb9aa7ebc0d26bcde77907e9ebfe28281f972548f21bcffc67 -MISC ChangeLog 1061 RMD160 8f02c21cb9dca7a588851af9170c06e055f4427e SHA1 342894cb1dffb1024260238a263d8216bb2077d6 SHA256 dcb54adf5461e592e085a57c434969815e46fcc376b027fb3907f8ada26f991d +DIST icedtea6-bin-core-1.4.1-arm.tar.bz2 36040656 RMD160 3c225e9dcecfb20b6b7bda23f8818794f8319a34 SHA1 9017616d566910a7a8298cb64bda2c683e74b278 SHA256 1ac655609ab9c5bed4c35931467d26f59788102683fada77b6d0cc99670ee757 +DIST icedtea6-bin-doc-1.4.1.tar.bz2 11525550 RMD160 ba87437c743c15876be920118fda4c1af65b02ad SHA1 f085d89b8b8183a2416c947343af27d9deb226fe SHA256 cbf216a6eb54be9f6f3755c9669b911d099ffd74e68cdd537ed0717af5cce58c +DIST icedtea6-bin-examples-1.4.1-arm.tar.bz2 2191708 RMD160 d629ecb386efc2219659aaa078a639a748296756 SHA1 e10caed440c37b4344e42e72fe3d2106f0af0a03 SHA256 c12cbbd28de0c0f1e74a3a5b7ffb0c799d1103b78e5dd7610f7080e1891d245f +DIST icedtea6-bin-nsplugin-1.4.1-arm.tar.bz2 80456 RMD160 2c2d626d5b6fc3cbb2c850c5a8e4fc5a7d819ba7 SHA1 fbf50b0edb7360ed999f49e2f095d9518c68715a SHA256 a12fe88f41e3be68e7c84bd1ce5afb7e84f32e309e5be3258ad4e477bb745685 +DIST icedtea6-bin-src-1.4.1.tar.bz2 26813820 RMD160 32c17b4a68ae6c9329784ff67c9bffaac646f737 SHA1 e869d9da7fc0ab8d58ca719a6fbfd7dcc9b0d625 SHA256 d64a6fec04ef8e72de4c73d66c553f5a6fc8d9dfaea8718a5d39eec67128028d +EBUILD icedtea6-bin-1.4.1.ebuild 2403 RMD160 3f285123d3df073550415ec5732da4ba505dd0e5 SHA1 dc0c390090e106fc900b4a6a6025357729c75ae5 SHA256 f80323dee9f403ee75d5b85e65d929a36bb6a5eb47156ca30cd4aab49c6f2425 +MISC ChangeLog 1203 RMD160 b7730f0d7e6308ba2775397a4c706a9eeeb306bc SHA1 7f0a5cd280110a1c90667913960b75623267b04f SHA256 4b2737552d602ceff5e319ac192be17bbcfcb7973071f231d5fbed3bcff21d27 MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.6.2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.4.1.ebuild similarity index 75% rename from dev-java/icedtea6-bin/icedtea6-bin-1.6.2.ebuild rename to dev-java/icedtea6-bin/icedtea6-bin-1.4.1.ebuild index aa57e17..5dd78cd 100644 --- a/dev-java/icedtea6-bin/icedtea6-bin-1.6.2.ebuild +++ b/dev-java/icedtea6-bin/icedtea6-bin-1.4.1.ebuild @@ -6,24 +6,17 @@ EAPI="2" inherit java-vm-2 -dist="mirror://gentoo/" dist_arm="http://ftp.disconnected-by-peer.at/armv5/" DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK" -SRC_URI="amd64? ( ${dist}/${PN}-core-${PVR}-amd64.tar.bz2 ) - x86? ( ${dist}/${PN}-core-${PVR}-x86.tar.bz2 ) - arm? ( ${dist_arm}/${PN}-core-${PVR}-arm.tar.bz2 ) - doc? ( ${dist}/${PN}-doc-${PVR}.tar.bz2 ) +SRC_URI="arm? ( ${dist_arm}/${PN}-core-${PVR}-arm.tar.bz2 ) + doc? ( ${dist_arm}/${PN}-doc-${PVR}.tar.bz2 ) examples? ( - amd64? ( ${dist}/${PN}-examples-${PVR}-amd64.tar.bz2 ) - x86? ( ${dist}/${PN}-examples-${PVR}-x86.tar.bz2 ) arm? ( ${dist_arm}/${PN}-examples-${PVR}-arm.tar.bz2 ) ) nsplugin? ( - amd64? ( ${dist}/${PN}-nsplugin-${PVR}-amd64.tar.bz2 ) - x86? ( ${dist}/${PN}-nsplugin-${PVR}-x86.tar.bz2 ) arm? ( ${dist_arm}/${PN}-nsplugin-${PVR}-arm.tar.bz2 ) ) - source? ( ${dist}/${PN}-src-${PVR}.tar.bz2 )" + source? ( ${dist_arm}/${PN}-src-${PVR}.tar.bz2 )" HOMEPAGE="http://icedtea.classpath.org" IUSE="X alsa doc examples nsplugin source" @@ -31,7 +24,7 @@ RESTRICT="strip" LICENSE="GPL-2-with-linking-exception" SLOT="0" -KEYWORDS="~amd64 ~x86 ~arm" +KEYWORDS="~arm" S="${WORKDIR}/${PF}" @@ -61,9 +54,6 @@ RDEPEND=" DEPEND="" QA_EXECSTACK_arm="opt/${P}/jre/lib/arm/server/libjvm.so" -QA_EXECSTACK_amd64="opt/${P}/jre/lib/amd64/server/libjvm.so" -QA_EXECSTACK_x86="opt/${P}/jre/lib/i386/server/libjvm.so - opt/${P}/jre/lib/i386/client/libjvm.so" src_install() { local dest="/opt/${P}" @@ -89,7 +79,6 @@ src_install() { fi if use nsplugin ; then - use x86 && arch=i386; install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so"; fi