summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVlastimil Babka <caster@gentoo.org>2013-03-24 13:28:33 +0000
committerVlastimil Babka <caster@gentoo.org>2013-03-24 13:28:33 +0000
commit093c476756865b5cab4d854fa1c691247712416e (patch)
tree8df15c4583cb2494acd2293bdba169e24ce04c6d /dev-java
parentVersion bump, security bug #461714. (diff)
downloadgentoo-2-093c476756865b5cab4d854fa1c691247712416e.tar.gz
gentoo-2-093c476756865b5cab4d854fa1c691247712416e.tar.bz2
gentoo-2-093c476756865b5cab4d854fa1c691247712416e.zip
Remove old.
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4E61DE84)
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/icedtea-bin/ChangeLog8
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-6.1.11.5-r1.ebuild152
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild152
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.3.3-r1.ebuild142
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild142
-rw-r--r--dev-java/icedtea-bin/icedtea-bin-7.2.3.4.ebuild142
6 files changed, 7 insertions, 731 deletions
diff --git a/dev-java/icedtea-bin/ChangeLog b/dev-java/icedtea-bin/ChangeLog
index 24d3539db2b9..ca81783424c0 100644
--- a/dev-java/icedtea-bin/ChangeLog
+++ b/dev-java/icedtea-bin/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-java/icedtea-bin
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.39 2013/03/24 13:27:12 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/ChangeLog,v 1.40 2013/03/24 13:28:32 caster Exp $
+
+ 24 Mar 2013; Vlastimil Babka <caster@gentoo.org>
+ -icedtea-bin-6.1.11.5.ebuild, -icedtea-bin-6.1.11.5-r1.ebuild,
+ -icedtea-bin-7.2.3.3.ebuild, -icedtea-bin-7.2.3.3-r1.ebuild,
+ -icedtea-bin-7.2.3.4.ebuild:
+ Remove old.
*icedtea-bin-7.2.3.8 (24 Mar 2013)
*icedtea-bin-6.1.12.4 (24 Mar 2013)
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.11.5-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.11.5-r1.ebuild
deleted file mode 100644
index b68dc0fcd832..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.11.5-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.5-r1.ebuild,v 1.3 2012/12/03 20:48:55 ago Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-PLUGIN_VERSION="${PVR}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-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-${PLUGIN_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
- )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="-* amd64 x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin source"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0.20"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.4"
-X_COMMON_DEP="
- dev-libs/glib
- >=media-libs/freetype-2.3.9:2
- >=x11-libs/gtk+-2.20.1:2
- >=x11-libs/libX11-1.3
- >=x11-libs/libXext-1.1
- >=x11-libs/libXi-1.3
- >=x11-libs/libXtst-1.1"
-
-COMMON_DEP="
- >=media-libs/giflib-4.1.6-r1
- >=media-libs/libpng-1.5
- >=sys-devel/gcc-4.3
- >=sys-libs/glibc-2.11.2
- >=sys-libs/zlib-1.2.3-r1
- virtual/jpeg
- nsplugin? (
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.20.5:2
- >=dev-libs/nspr-4.8
- >=x11-libs/cairo-1.8.8
- >=x11-libs/pango-1.24.5
-
- )"
-
-RDEPEND="${COMMON_DEP}
- X? (
- ${X_COMMON_DEP}
- media-fonts/dejavu
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- )
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}/${dest}"
- dodir "${dest}"
-
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
- fi
-
- # doins can't handle symlinks.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- # Remove on next bump as the needed marks are already set by icedtea ebuild.
- java-vm_set-pax-markings "${ddest}"
-
- dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
-
- if use doc; then
- dohtml -r ../doc/html/*
- 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
- cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
- install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
- docinto icedtea-web
- dodoc ../doc/icedtea-web/*
- fi
-
- # Remove after next bump, handled by icedtea ebuild. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env
- java-vm_revdep-mask "${dest}"
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
- elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
- elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-
- if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The icedtea-bin-${SLOT} 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 recent Chromium versions."
- fi
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild b/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild
deleted file mode 100644
index fe5c71e3acd7..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.11.5.ebuild,v 1.3 2012/10/31 14:24:22 nativemad Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-PLUGIN_VERSION="${PVR}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-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-${PLUGIN_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
- )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="6"
-KEYWORDS="-* amd64 x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin source"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0.20"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.4"
-X_COMMON_DEP="
- dev-libs/glib
- >=media-libs/freetype-2.3.9:2
- >=x11-libs/gtk+-2.20.1:2
- >=x11-libs/libX11-1.3
- >=x11-libs/libXext-1.1
- >=x11-libs/libXi-1.3
- >=x11-libs/libXtst-1.1"
-
-COMMON_DEP="
- >=media-libs/giflib-4.1.6-r1
- >=media-libs/libpng-1.5
- >=sys-devel/gcc-4.3
- >=sys-libs/glibc-2.11.2
- >=sys-libs/zlib-1.2.3-r1
- virtual/jpeg
- nsplugin? (
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.20.5:2
- >=dev-libs/nspr-4.8
- >=x11-libs/cairo-1.8.8
- >=x11-libs/pango-1.24.5
-
- )"
-
-RDEPEND="${COMMON_DEP}
- X? (
- ${X_COMMON_DEP}
- media-fonts/dejavu
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- )
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}/${dest}"
- dodir "${dest}"
-
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
- fi
-
- # doins can't handle symlinks.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- # Remove on next bump as the needed marks are already set by icedtea ebuild.
- java-vm_set-pax-markings "${ddest}"
-
- dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
-
- if use doc; then
- dohtml -r ../doc/html/*
- 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
- cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
- install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
- docinto icedtea-web
- dodoc ../doc/icedtea-web/*
- fi
-
- # Remove after next bump, handled by icedtea ebuild. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env
- java-vm_revdep-mask "${dest}"
-}
-
-pkg_preinst() {
- if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
- # portage would preserve the symlink otherwise, related to bug #384397
- rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
- elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
- elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
- elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
- elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
- elog "and the same holds for any user VM settings. Sorry for the inconvenience."
- fi
-}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-
- if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The icedtea-bin-${SLOT} 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 recent Chromium versions."
- fi
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.3-r1.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.3-r1.ebuild
deleted file mode 100644
index 490d18a4c129..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.3-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.3-r1.ebuild,v 1.1 2012/11/14 22:54:43 caster Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-PLUGIN_VERSION="${PVR}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-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-${PLUGIN_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
- )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin source"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0.20"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.4"
-X_COMMON_DEP="
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.20.5:2
- >=media-libs/fontconfig-2.6.0-r2:1.0
- >=media-libs/freetype-2.3.9:2
- >=x11-libs/cairo-1.8.8
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.20.1:2
- >=x11-libs/libX11-1.3
- >=x11-libs/libXext-1.1
- >=x11-libs/libXi-1.3
- x11-libs/libXrender
- >=x11-libs/libXtst-1.1
- >=x11-libs/pango-1.24.5"
-
-COMMON_DEP="
- >=media-libs/giflib-4.1.6-r1
- media-libs/lcms:2
- >=media-libs/libpng-1.5
- >=sys-devel/gcc-4.3
- >=sys-libs/glibc-2.11.2
- >=sys-libs/zlib-1.2.3-r1
- virtual/jpeg"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
- X? (
- ${CUPS_COMMON_DEP}
- ${X_COMMON_DEP}
- media-fonts/dejavu
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- )
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}/${dest}"
- dodir "${dest}"
-
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
- fi
-
- # doins can't handle symlinks.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- # Remove on next bump as the needed marks are already set by icedtea ebuild.
- java-vm_set-pax-markings "${ddest}"
-
- dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
-
- if use doc; then
- dohtml -r ../doc/html/*
- 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
- cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
- install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
- docinto icedtea-web
- dodoc ../doc/icedtea-web/*
- fi
-
- # Remove after next bump, handled by icedtea ebuild. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env
- java-vm_revdep-mask "${dest}"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-
- if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The icedtea-bin-${SLOT} 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 recent Chromium versions."
- fi
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild
deleted file mode 100644
index 3ad0f7431c80..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.3.ebuild,v 1.1 2012/10/20 21:47:49 caster Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-PLUGIN_VERSION="${PVR}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-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-${PLUGIN_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
- )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin source"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0.20"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.4"
-X_COMMON_DEP="
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.20.5:2
- >=media-libs/fontconfig-2.6.0-r2:1.0
- >=media-libs/freetype-2.3.9:2
- >=x11-libs/cairo-1.8.8
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.20.1:2
- >=x11-libs/libX11-1.3
- >=x11-libs/libXext-1.1
- >=x11-libs/libXi-1.3
- x11-libs/libXrender
- >=x11-libs/libXtst-1.1
- >=x11-libs/pango-1.24.5"
-
-COMMON_DEP="
- >=media-libs/giflib-4.1.6-r1
- media-libs/lcms:2
- >=media-libs/libpng-1.5
- >=sys-devel/gcc-4.3
- >=sys-libs/glibc-2.11.2
- >=sys-libs/zlib-1.2.3-r1
- virtual/jpeg"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
- X? (
- ${CUPS_COMMON_DEP}
- ${X_COMMON_DEP}
- media-fonts/dejavu
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- )
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}/${dest}"
- dodir "${dest}"
-
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
- fi
-
- # doins can't handle symlinks.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- # Remove on next bump as the needed marks are already set by icedtea ebuild.
- java-vm_set-pax-markings "${ddest}"
-
- dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
-
- if use doc; then
- dohtml -r ../doc/html/*
- 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
- cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
- install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
- docinto icedtea-web
- dodoc ../doc/icedtea-web/*
- fi
-
- # Remove after next bump, handled by icedtea ebuild. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env
- java-vm_revdep-mask "${dest}"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-
- if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The icedtea-bin-${SLOT} 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 recent Chromium versions."
- fi
-}
diff --git a/dev-java/icedtea-bin/icedtea-bin-7.2.3.4.ebuild b/dev-java/icedtea-bin/icedtea-bin-7.2.3.4.ebuild
deleted file mode 100644
index a4c0a6232898..000000000000
--- a/dev-java/icedtea-bin/icedtea-bin-7.2.3.4.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-7.2.3.4.ebuild,v 1.1 2013/01/22 22:17:08 caster Exp $
-
-EAPI="4"
-
-inherit java-vm-2 multilib prefix
-
-dist="http://dev.gentoo.org/~caster/distfiles/"
-TARBALL_VERSION="${PV}"
-PLUGIN_VERSION="${PVR}"
-
-DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
-HOMEPAGE="http://icedtea.classpath.org"
-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-${PLUGIN_VERSION}-amd64.tar.bz2 )
- x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
- )
- source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
-
-LICENSE="GPL-2-with-linking-exception"
-SLOT="7"
-KEYWORDS="-* ~amd64 ~x86"
-
-IUSE="+X +alsa cjk +cups doc examples nsplugin source"
-REQUIRED_USE="nsplugin? ( X )"
-RESTRICT="strip"
-
-# 423161
-QA_PREBUILT="opt/.*"
-
-ALSA_COMMON_DEP="
- >=media-libs/alsa-lib-1.0.20"
-CUPS_COMMON_DEP="
- >=net-print/cups-1.4"
-X_COMMON_DEP="
- >=dev-libs/atk-1.30.0
- >=dev-libs/glib-2.20.5:2
- >=media-libs/fontconfig-2.6.0-r2:1.0
- >=media-libs/freetype-2.3.9:2
- >=x11-libs/cairo-1.8.8
- x11-libs/gdk-pixbuf:2
- >=x11-libs/gtk+-2.20.1:2
- >=x11-libs/libX11-1.3
- >=x11-libs/libXext-1.1
- >=x11-libs/libXi-1.3
- x11-libs/libXrender
- >=x11-libs/libXtst-1.1
- >=x11-libs/pango-1.24.5"
-
-COMMON_DEP="
- >=media-libs/giflib-4.1.6-r1
- media-libs/lcms:2
- >=media-libs/libpng-1.5
- >=sys-devel/gcc-4.3
- >=sys-libs/glibc-2.11.2
- >=sys-libs/zlib-1.2.3-r1
- virtual/jpeg"
-
-# cups is needed for X. #390945 #390975
-RDEPEND="${COMMON_DEP}
- X? (
- ${CUPS_COMMON_DEP}
- ${X_COMMON_DEP}
- media-fonts/dejavu
- cjk? (
- media-fonts/arphicfonts
- media-fonts/baekmuk-fonts
- media-fonts/lklug
- media-fonts/lohit-fonts
- media-fonts/sazanami
- )
- )
- alsa? ( ${ALSA_COMMON_DEP} )
- cups? ( ${CUPS_COMMON_DEP} )"
-
-src_install() {
- local dest="/opt/${P}"
- local ddest="${ED}/${dest}"
- dodir "${dest}"
-
- # Ensures HeadlessGraphicsEnvironment is used.
- if ! use X; then
- rm -r jre/lib/$(get_system_arch)/xawt || die
- fi
-
- # doins can't handle symlinks.
- cp -pRP bin include jre lib man "${ddest}" || die
-
- # Remove on next bump as the needed marks are already set by icedtea ebuild.
- java-vm_set-pax-markings "${ddest}"
-
- dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
-
- if use doc; then
- dohtml -r ../doc/html/*
- 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
- cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
- install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
- docinto icedtea-web
- dodoc ../doc/icedtea-web/*
- fi
-
- # Remove after next bump, handled by icedtea ebuild. Bug 390663
- cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
- eprefixify "${T}"/fontconfig.Gentoo.properties
- insinto "${dest}"/jre/lib
- doins "${T}"/fontconfig.Gentoo.properties
-
- set_java_env
- java-vm_revdep-mask "${dest}"
- java-vm_sandbox-predict /proc/self/coredump_filter
-}
-
-pkg_postinst() {
- # Set as default VM if none exists
- java-vm-2_pkg_postinst
-
- if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "The icedtea-bin-${SLOT} 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 recent Chromium versions."
- fi
-}