Remove old.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

4 files changed, 6 insertions, 352 deletions

diff --git a/dev-java/icedtea6-bin/ChangeLog b/dev-java/icedtea6-bin/ChangeLog
index 7c8391237e5a..101356578854 100644
--- a/dev-java/icedtea6-bin/ChangeLog
+++ b/dev-java/icedtea6-bin/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/icedtea6-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.27 2010/04/15 21:00:43 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea6-bin/ChangeLog,v 1.28 2010/04/15 21:50:18 caster Exp $
+
+  15 Apr 2010; Vlastimil Babka <caster@gentoo.org>
+  -icedtea6-bin-1.6.2-r2.ebuild, -icedtea6-bin-1.7-r1.ebuild,
+  -icedtea6-bin-1.7.1.ebuild:
+  Remove old.
 
   15 Apr 2010; Markus Meier <maekke@gentoo.org> icedtea6-bin-1.7.2.ebuild:
   amd64 stable, bug #312297
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild
deleted file mode 100644
index f90f9d1ec5a1..000000000000
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.6.2-r2.ebuild
+++ /dev/null
@@ -1,107 +0,0 @@
-# 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.4 2010/03/11 13:40:02 ssuominen 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*
-	>=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
-}
diff --git a/dev-java/icedtea6-bin/icedtea6-bin-1.7-r1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.7-r1.ebuild
deleted file mode 100644
index dac04b037bfd..000000000000
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.7-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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.7-r1.ebuild,v 1.2 2010/03/11 13:40:02 ssuominen Exp $
-
-EAPI="1"
-
-inherit java-vm-2
-
-dist="mirror://gentoo/"
-DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
-TARBALL_VERSION="${PV}"
-SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2
-		${dist}/${PN}-jpeg8-${TARBALL_VERSION}-amd64.tar.bz2 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
-		${dist}/${PN}-jpeg8-${TARBALL_VERSION}-x86.tar.bz2 )
-	doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}-r1.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-7
-	=media-libs/libpng-1.2*
-	>=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_unpack() {
-	unpack ${A}
-
-	if has_version '>=media-libs/jpeg-8'; then
-		einfo "Installing jpeg-8 ABI version"
-		local arch=${ARCH}
-		use x86 && arch=i386
-		mv -v ${PN}-jpeg8/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
-	else
-		elog "Installing jpeg-7 ABI version"
-		elog "You will have to remerge icedtea6-bin after upgrading to jpeg-8"
-		elog "Note that revdep-rebuild will not do it automatically due to the mask file."
-	fi
-}
-
-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}/IcedTeaNPPlugin.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 "We now install the new IcedTeaNPPlugin, note that it's alpha quality."
-		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/icedtea6-bin/icedtea6-bin-1.7.1.ebuild b/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild
deleted file mode 100644
index fc7a167f465a..000000000000
--- a/dev-java/icedtea6-bin/icedtea6-bin-1.7.1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# 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.7.1.ebuild,v 1.6 2010/03/29 17:29:30 phajdan.jr Exp $
-
-EAPI="1"
-
-inherit java-vm-2
-
-dist="mirror://gentoo/"
-DESCRIPTION="A Gentoo-made binary build of the icedtea6 JDK"
-TARBALL_VERSION="${PV}"
-SRC_URI="amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2
-			${dist}/${PN}-libpng14-${TARBALL_VERSION}-amd64.tar.bz2 )
-	x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2
-		${dist}/${PN}-libpng14-${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
-	>=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=""
-
-src_unpack() {
-	unpack ${A}
-
-	if has_version '>=media-libs/libpng-1.4.0'; then
-		einfo "Installing libpng-1.4 ABI version"
-		local arch=${ARCH}
-		use x86 && arch=i386
-		mv -v ${P}-libpng14/jre/lib/${arch}/*.so ${P}/jre/lib/${arch} || die
-	else
-		elog "Installing libpng-1.2 ABI version"
-		elog "You will have to remerge icedtea6-bin after upgrading to libpng-1.4"
-		elog "Note that revdep-rebuild will not do it automatically due to the mask file."
-	fi
-}
-
-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}/IcedTeaNPPlugin.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 "We now install the new IcedTeaNPPlugin, note that it's alpha quality."
-		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
-}