Add icedtea6-bin to portage-stable.

Java is needed in the chroot to build pepper flash.

Change-Id: I337ab1f73c06e353856e802843ff65ab251294e0
Reviewed-on: https://gerrit.chromium.org/gerrit/20267
Reviewed-by: Stéphane Marchesin <marcheu@chromium.org>
Tested-by: Stéphane Marchesin <marcheu@chromium.org>
Commit-Ready: Stéphane Marchesin <marcheu@chromium.org>
This commit is contained in:
Ilja H. Friedel 2012-04-13 16:34:54 -07:00 committed by Gerrit
parent a93ce12287
commit 6fe430e5fd
11 changed files with 356 additions and 0 deletions

View File

@ -0,0 +1,18 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/files/icedtea6-bin.env,v 1.1 2008/12/24 22:22:37 caster Exp $
VERSION="IcedTea6-bin @PV@"
JAVA_HOME=/opt/@P@
JDK_HOME=/opt/@P@
JAVAC=${JAVA_HOME}/bin/javac
PATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
ROOTPATH="${JAVA_HOME}/bin:${JAVA_HOME}/jre/bin"
LDPATH="${JAVA_HOME}/jre/lib/@PLATFORM@/:${JAVA_HOME}/jre/lib/@PLATFORM@/native_threads/:${JAVA_HOME}/jre/lib/@PLATFORM@/xawt/:${JAVA_HOME}/jre/lib/@PLATFORM@/server/"
MANPATH="/opt/@P@/man"
PROVIDES_TYPE="JDK JRE"
PROVIDES_VERSION="1.6"
# Taken from sun.boot.class.path property
BOOTCLASSPATH="${JAVA_HOME}/jre/lib/resources.jar:${JAVA_HOME}/jre/lib/rt.jar:${JAVA_HOME}/jre/lib/jsse.jar:${JAVA_HOME}/jre/lib/jce.jar:${JAVA_HOME}/jre/lib/charsets.jar"
GENERATION="2"
ENV_VARS="JAVA_HOME JDK_HOME JAVAC PATH ROOTPATH LDPATH MANPATH"

View File

@ -0,0 +1,107 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild,v 1.3 2010/02/19 19:35:21 maekke Exp $
EAPI="1"
inherit java-vm-2
dist="mirror://gentoo/"
DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
TARBALL_VERSION="${PVR}"
SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
examples? (
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
)
nsplugin? (
amd64? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-nsplugin-${TARBALL_VERSION}-x86.tar.bz2 )
)
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
HOMEPAGE="http://icedtea.classpath.org"
IUSE="X alsa doc examples nsplugin source"
RESTRICT="strip"
LICENSE="GPL-2-with-linking-exception"
SLOT="0"
KEYWORDS="amd64 x86"
S="${WORKDIR}/${PN}-${TARBALL_VERSION}"
RDEPEND=">=sys-devel/gcc-4.3
>=sys-libs/glibc-2.9
>=media-libs/giflib-4.1.6-r1
=media-libs/jpeg-8*
>=media-libs/libpng-1.2.38
>=sys-libs/zlib-1.2.3-r1
alsa? ( >=media-libs/alsa-lib-1.0.20 )
X? (
>=media-libs/freetype-2.3.9:2
>=media-libs/fontconfig-2.6.0-r2:1.0
>=x11-libs/libXext-1.0.5
>=x11-libs/libXi-1.2.1
>=x11-libs/libXtst-1.0.3
>=x11-libs/libX11-1.2.2
x11-libs/libXt
)
nsplugin? (
>=dev-libs/atk-1.26.0
>=dev-libs/glib-2.20.5:2
>=dev-libs/nspr-4.8
>=x11-libs/cairo-1.8.8
>=x11-libs/gtk+-2.16.6:2
>=x11-libs/pango-1.24.5
)"
DEPEND=""
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}"
local ddest="${D}/${dest}"
dodir "${dest}" || die
local arch=${ARCH}
# doins can't handle symlinks.
cp -pRP bin include jre lib man "${ddest}" || die "failed to copy"
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README} || die
if use doc ; then
dohtml -r ../doc/html/* || die "Failed to install documentation"
fi
if use examples; then
cp -pRP share/{demo,sample} "${ddest}" || die
fi
if use source ; then
cp src.zip "${ddest}" || die
fi
if use nsplugin ; then
use x86 && arch=i386
install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so"
fi
set_java_env
java-vm_revdep-mask
}
pkg_postinst() {
# Set as default VM if none exists
java-vm-2_pkg_postinst
if use nsplugin; then
elog "The icedtea6-bin browser plugin can be enabled using eselect java-nsplugin"
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1"
elog "such as Firefox 3.5, and not in other versions! xulrunner-1.9.2 (Firefox 3.6)"
elog "is not supported by upstream yet."
fi
}

View File

@ -0,0 +1,20 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config-wrapper/java-config-wrapper-0.16.ebuild,v 1.6 2009/07/04 14:27:17 ranger Exp $
DESCRIPTION="Wrapper for java-config"
HOMEPAGE="http://www.gentoo.org/proj/en/java"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND="!<dev-java/java-config-1.3"
RDEPEND="app-portage/portage-utils"
src_install() {
dobin src/shell/* || die
dodoc AUTHORS || die
}

View File

@ -0,0 +1,9 @@
--- java-config 13 Jan 2005 22:39:18 -0000 1.37
+++ java-config 18 Jun 2005 13:43:47 -0000
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python -E
# -*- coding: UTF-8 -*-
# Copyright 2001-2005 Gentoo Foundation

View File

@ -0,0 +1,13 @@
Index: java_config_2/EnvironmentManager.py
===================================================================
--- src/java_config_2/EnvironmentManager.py (revision 7809)
+++ src/java_config_2/EnvironmentManager.py (working copy)
@@ -81,7 +81,7 @@
raise UnexistingPackageError(name)
def load_packages(self):
- for package in iter(glob(self.pkg_path) % "*" ):
+ for package in iter(glob(self.pkg_path % "*" )):
name = basename(dirname(package))
if name in self.packages:
continue

View File

@ -0,0 +1,16 @@
Index: trunk/config/jdk-defaults-x86.conf
===================================================================
--- trunk/config/jdk-defaults-x86.conf (revision 7989)
+++ trunk/config/jdk-defaults-x86.conf (revision 7990)
@@ -1,2 +1,2 @@
# This files contain the default support jdk's
-*= sun-jdk blackdown-jdk ibm-jdk-bin jrockit-jdk-bin
+*= icedtea6 icedtea6-bin sun-jdk blackdown-jdk ibm-jdk-bin jrockit-jdk-bin
Index: trunk/config/jdk-defaults-amd64.conf
===================================================================
--- trunk/config/jdk-defaults-amd64.conf (revision 7989)
+++ trunk/config/jdk-defaults-amd64.conf (revision 7990)
@@ -1,2 +1,2 @@
# This files contain the default support jdk's
-*= sun-jdk blackdown-jdk ibm-jdk-bin jrockit-jdk-bin
+*= icedtea6 icedtea6-bin sun-jdk blackdown-jdk ibm-jdk-bin jrockit-jdk-bin

View File

@ -0,0 +1,35 @@
Index: src/depend-java-query
===================================================================
--- src/depend-java-query (revision 7909)
+++ src/depend-java-query (working copy)
@@ -40,7 +40,7 @@
def get_vm(option, opt, value, parser):
try:
- vm = verman.get_vm(value, False)
+ vm = verman.get_vm(value, True)
printer._print(vm)
except Exception, ex:
printer._printError(str(ex))
Index: java-config-2
===================================================================
--- src/java-config-2 (revision 7909)
+++ src/java-config-2 (working copy)
@@ -143,12 +143,15 @@
printer._print('%HThe following VMs are available for generation-2:%$')
for i, vm in vm_list.iteritems():
if vm is active:
- printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$'))
+ if not vm.is_build_only():
+ printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$'))
+ else:
+ printer._print('%G' + '*)\t%s [%s]%s' % (vm.query('VERSION'), vm.name(), '%$') + '%r (Build Only)%$')
else:
if not vm.is_build_only():
printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'), vm.name()))
else:
- printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'), vm.name()) + '%r (Build Only)')
+ printer._print('%i)\t%s [%s]' % (i, vm.query('VERSION'), vm.name()) + '%r (Build Only)%$')
printer._print('')
printer._print('%r' + 'VMs marked as Build Only may contain Security Vulnerabilities and/or be EOL.')

View File

@ -0,0 +1,55 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.1.10.ebuild,v 1.8 2010/02/26 19:26:02 arfrever Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
inherit fdo-mime gnome2-utils distutils eutils
DESCRIPTION="Java environment configuration tool"
HOMEPAGE="http://www.gentoo.org/proj/en/java/"
SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="2"
KEYWORDS="alpha amd64 arm ia64 ppc ppc64 x86 ~x86-fbsd"
IUSE=""
DEPEND=">=dev-lang/python-2.4"
RDEPEND=">=dev-java/java-config-wrapper-0.15"
# Tests fail when java-config isn't already installed.
RESTRICT="test"
RESTRICT_PYTHON_ABIS="3.*"
PYTHON_MODNAME="java_config_2"
src_prepare() {
sed -e "s/if not self.dry_run/& and not os.path.exists(s)/" -i setup.py || die "sed failed"
}
src_test() {
testing() {
PYTHONPATH="build-${PYTHON_ABI}/lib" "$(PYTHON)" src/run-test-suite.py
}
python_execute_function testing
}
src_install() {
distutils_src_install
insinto /usr/share/java-config-2/config/
newins config/jdk-defaults-${ARCH}.conf jdk-defaults.conf || die "arch config not found"
}
pkg_postrm() {
distutils_pkg_postrm
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}
pkg_postinst() {
distutils_pkg_postinst
fdo-mime_desktop_database_update
gnome2_icon_cache_update
}

View File

@ -0,0 +1,18 @@
http://sourceforge.net/tracker/index.php?func=detail&aid=1829712&group_id=102202&atid=631304
--- giflib/util/gif2rle.c
+++ giflib/util/gif2rle.c
@@ -222,11 +222,8 @@
ColorMap = (GifFile->Image.ColorMap ?
GifFile->Image.ColorMap->Colors :
GifFile->SColorMap->Colors);
- if (ColorMap == NULL) {
- fprintf(stderr, "Gif Image does not have a colormap\n");
- exit(EXIT_FAILURE);
- }
- ColorMapSize = 1 << ColorMap->BitsPerPixel;
+ ColorMapSize = 1 << (GifFile->Image.ColorMap ? GifFile->Image.ColorMap->BitsPerPixel :
+ GifFile->SColorMap->BitsPerPixel);
DumpScreen2Rle(ScreenBuffer, GifFile->SWidth, GifFile->SHeight);
if (DGifCloseFile(GifFile) == GIF_ERROR) {

View File

@ -0,0 +1,15 @@
diff -ru giflib-4.1.6/util/giffix.c giflib-4.1.6.new/util/giffix.c
--- giflib-4.1.6/util/giffix.c 2005-10-09 23:22:23.000000000 -0700
+++ giflib-4.1.6.new/util/giffix.c 2008-09-04 14:00:41.000000000 -0700
@@ -181,8 +181,8 @@
/* Skip any extension blocks in file: */
if (DGifGetExtension(GifFileIn, &ExtCode, &Extension) == GIF_ERROR)
QuitGifError(GifFileIn, GifFileOut);
- if (EGifPutExtension(GifFileOut, ExtCode, Extension[0],
- Extension) == GIF_ERROR)
+ if (Extension && EGifPutExtension(GifFileOut, ExtCode,
+ Extension[0], Extension) == GIF_ERROR)
QuitGifError(GifFileIn, GifFileOut);
/* No support to more than one extension blocks, so discard: */

View File

@ -0,0 +1,50 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.6-r1.ebuild,v 1.7 2008/12/07 11:49:54 vapier Exp $
inherit eutils libtool
DESCRIPTION="Library to handle, display and manipulate GIF images"
HOMEPAGE="http://sourceforge.net/projects/giflib/"
SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
IUSE="rle X"
DEPEND="!media-libs/libungif
X? (
x11-libs/libXt
x11-libs/libX11
x11-libs/libICE
x11-libs/libSM
)
rle? ( media-libs/urt )"
src_unpack() {
unpack ${A}
cd "${S}"
epatch "${FILESDIR}"/${P}-gif2rle.patch
epatch "${FILESDIR}"/${P}-giffix-null-Extension-fix.patch
elibtoolize
epunt_cxx
}
src_compile() {
local myconf="--disable-gl $(use_enable X x11)"
# prevent circular depend #111455
if has_version media-libs/urt ; then
myconf="${myconf} $(use_enable rle)"
else
myconf="${myconf} --disable-rle"
fi
econf ${myconf}
emake || die "emake failed"
}
src_install() {
emake DESTDIR="${D}" install || die "make install failed"
dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt
dohtml -r doc
}