Remove the unpatched revision.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

3 files changed, 5 insertions, 327 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 4c41cc7a22cc..22508cd346e8 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.3 2010/03/31 15:36:08 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.4 2010/03/31 15:39:27 caster Exp $
+
+  31 Mar 2010; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.7.2.ebuild:
+  Remove the unpatched revision.
 
 *icedtea-6.1.7.2-r1 (31 Mar 2010)
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index b16b8da64e36..bfe025a9c3a5 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -8,6 +8,5 @@ DIST icedtea6-1.7.2.tar.gz 6135812 RMD160 8d5b9f79bda2a031e2af35151b56764f6792b5
 DIST openjdk-6-src-b17-14_oct_2009.tar.gz 50029293 RMD160 eae59f50916265a4b8e8179b8a7c5eee8b0402de SHA1 096c843f674d231e9b134057339fd1f2b63f6d9d SHA256 2019a4c3d2d14620caa78d7df49fd987a041066b4631bde4fd8424033f3c1785
 EBUILD icedtea-6.1.7.1.ebuild 10912 RMD160 b3824c13995af3736b727a8603f0bfa5614b9d51 SHA1 1f6570874aa97478ec9e3da0e7243d7f391a7438 SHA256 0ee885e076ec6b47f75c7945b7644ea5b493b1e6496ac4a99b890494658dd4d1
 EBUILD icedtea-6.1.7.2-r1.ebuild 10973 RMD160 65843c2e266a7f8425ee1941a11f8381650df711 SHA1 c252cf1d6bef75f9e3685cb257d85b8fa83a9bd9 SHA256 aa567f9bf8dfa45c04cc718526972118c63a377522da9fa3f4d24993f80ca17b
-EBUILD icedtea-6.1.7.2.ebuild 10912 RMD160 70fbf13491fd5a8cfd3d249b82c36ac00bb3f88f SHA1 15337f583ef7003102b92d1bc6863b15bf14aa5e SHA256 e3f16fa28228d26f5fa44b29d91da0bbe820d31903d3f1d1435324884180b97a
-MISC ChangeLog 804 RMD160 7fe7349394c20f16d69a022e339da15b0c6583bd SHA1 077977ee55758c706f0dd1a9282de74582f00705 SHA256 e4aaf12bc25b2f358990a6de2ee13f836acf71a9a063836ca472f4ac2afee466
+MISC ChangeLog 914 RMD160 2433889a86cda9adef1a229af140e44e8fabeb44 SHA1 2a9cbec89918f46911712b7258cab73b5f533a1c SHA256 3b025bb2877a0ca8a00611aad6cfe2347c54feb5e3886b21719e020dfd9ee8ca
 MISC metadata.xml 1419 RMD160 8b303b797bbb6ee7e2878191201f62bd65ca0357 SHA1 fe602e734121eaf77b96ac722db7fe04bd417d14 SHA256 954037cf8b960faa02fc6b2b7c73e35704a9f15670303d0602d88903759f6d01
diff --git a/dev-java/icedtea/icedtea-6.1.7.2.ebuild b/dev-java/icedtea/icedtea-6.1.7.2.ebuild
deleted file mode 100644
index 846374238202..000000000000
--- a/dev-java/icedtea/icedtea-6.1.7.2.ebuild
+++ /dev/null
@@ -1,324 +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/icedtea/icedtea-6.1.7.2.ebuild,v 1.1 2010/03/31 11:55:46 caster Exp $
-# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
-
-# *********************************************************
-# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL *
-# *********************************************************
-
-EAPI="2"
-
-inherit pax-utils java-pkg-2 java-vm-2
-
-LICENSE="Apache-1.1 Apache-2.0 GPL-1 GPL-2 GPL-2-with-linking-exception LGPL-2 MPL-1.0 MPL-1.1 public-domain W3C"
-SLOT="6"
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="A harness to build the OpenJDK using Free Software build tools and dependencies"
-ICEDTEA_VER="1.7.2"
-ICEDTEA_PKG=icedtea${SLOT}-${ICEDTEA_VER}
-OPENJDK_BUILD="17"
-OPENJDK_DATE="14_oct_2009"
-OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz"
-HOTSPOT_TARBALL="62926c7f67a3.tar.gz"
-CACAO_TARBALL="cacao-0.99.4.tar.gz"
-SRC_URI="http://icedtea.classpath.org/download/source/${ICEDTEA_PKG}.tar.gz
-		 http://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_TARBALL}
-		 http://hg.openjdk.java.net/hsx/hsx16/master/archive/${HOTSPOT_TARBALL}
-		 cacao? ( http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/${CACAO_TARBALL} )"
-HOMEPAGE="http://icedtea.classpath.org"
-S=${WORKDIR}/${ICEDTEA_PKG}
-
-# Missing options:
-# shark - still experimental, requires llvm which is not yet packaged
-# visualvm - requries netbeans which would cause major bootstrap issues
-IUSE="cacao debug doc examples +hs16 javascript nio2 +npplugin nsplugin +nss pulseaudio systemtap +xrender zero"
-
-# JTReg doesn't pass at present
-RESTRICT="test"
-
-RDEPEND=">=net-print/cups-1.2.12
-	 >=x11-libs/libX11-1.1.3
-	 >=media-libs/freetype-2.3.5
-	 >=media-libs/alsa-lib-1.0
-	 >=x11-libs/gtk+-2.8
-	 >=x11-libs/libXinerama-1.0.2
-	 >=x11-libs/libXp-1.0.0
-	 >=x11-libs/libXi-1.1.3
-	 >=x11-libs/libXau-1.0.3
-	 >=x11-libs/libXdmcp-1.0.2
-	 >=x11-libs/libXtst-1.0.3
-	 >=media-libs/jpeg-6b
-	 >=media-libs/libpng-1.2
-	 >=media-libs/giflib-4.1.6
-	 >=sys-libs/zlib-1.2.3
-	 x11-proto/inputproto
-	 x11-proto/xineramaproto
-	 nsplugin? ( >=net-libs/xulrunner-1.9 )
-	 pulseaudio?  ( >=media-sound/pulseaudio-0.9.11 )
-	 javascript? ( dev-java/rhino:1.6 )
-	 zero? ( virtual/libffi )
-	 xrender? ( >=x11-libs/libXrender-0.9.4 )
-	 systemtap? ( >=dev-util/systemtap-1 )
-	 !dev-java/icedtea6
-	 nss? ( >=dev-libs/nss-3.12.5-r1 )"
-
-# Additional dependencies for building:
-#   zip: extract OpenJDK tarball, and needed by configure
-#   xalan/xerces: automatic code generation (also needed for Ant 1.8.0 to work properly)
-#   ant, ecj, jdk: required to build Java code
-# Only ant-core-1.7.1-r2 and later contain a version of Ant that
-# properly respects environment variables, if the build
-# sets some environment variables.
-#   ca-certificates, perl and openssl are used for the cacerts keystore generation
-#   xext headers have two variants depending on version - bug #288855
-DEPEND="${RDEPEND}
-	|| (
-		dev-java/icedtea6-bin
-		dev-java/icedtea:${SLOT}
-	)
-	>=virtual/jdk-1.5
-	app-arch/zip
-	>=dev-java/xalan-2.7.0:0
-	>=dev-java/xerces-2.9.1:2
-	>=dev-java/ant-core-1.7.1-r2
-	app-misc/ca-certificates
-	dev-lang/perl
-	dev-libs/openssl
-	|| (
-		(
-			>=x11-libs/libXext-1.1.1
-			>=x11-proto/xextproto-7.1.1
-			x11-proto/xproto
-		)
-		<x11-libs/libXext-1.1.1
-	)
-	sys-apps/lsb-release"
-
-pkg_setup() {
-# Shark support disabled for now - still experimental and needs sys-devel/llvm
-#	if use shark ; then
-#	  if ( ! use x86 && ! use sparc && ! use ppc ) ; then
-#		eerror "The Shark JIT has known issues on 64-bit platforms.  Please rebuild"
-#		errror "without the shark USE flag turned on."
-#		die "Rebuild without the shark USE flag on."
-#	  fi
-#	  if ( ! use zero ) ; then
-#		eerror "The use of the Shark JIT is only applicable when used with the zero assembler port.";
-#		die "Rebuild without the shark USE flag on or with the zero USE flag turned on."
-#	  fi
-#	fi
-
-	if use nsplugin && ! use npplugin && has_version ">=net-libs/xulrunner-1.9.2"; then
-		eerror "The old plugin will not work with xulrunner >= 1.9.2 / Firefox >= 3.6."
-		die "Rebuild with the npplugin USE flag enabled."
-	fi
-
-	# quite a hack since java-config does not provide a way for a package
-	# to limit supported VM's for building and their preferred order
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Honoring user-set JAVA_PKG_FORCE_VM"
-	elif has_version "dev-java/icedtea:${SLOT}"; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	elif has_version dev-java/icedtea6; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	elif has_version dev-java/icedtea6-bin; then
-		JAVA_PKG_FORCE_VM="icedtea6-bin"
-	elif has_version dev-java/gcj-jdk; then
-		JAVA_PKG_FORCE_VM="gcj-jdk"
-	elif has_version dev-java/cacao; then
-		JAVA_PKG_FORCE_VM="cacao"
-	else
-		JAVA_PKG_FORCE_VM=""
-		# don't die just yet if merging a binpkg - bug #258423
-		DIE_IF_NOT_BINPKG=true
-	fi
-
-	# if the previous failed, don't even run java eclasses pkg_setup
-	# as it might also die when no VM is present
-	if [[ -n "${JAVA_PKG_FORCE_VM}" ]]; then
-		einfo "Forced vm ${JAVA_PKG_FORCE_VM}"
-		java-vm-2_pkg_setup
-		java-pkg-2_pkg_setup
-	fi
-
-	VMHANDLE="icedtea${SLOT}"
-}
-
-src_unpack() {
-	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
-		die "Unable to find a supported VM for building"
-	fi
-	unpack ${ICEDTEA_PKG}.tar.gz
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_configure() {
-	local config procs rhino_jar
-	local vm=$(java-pkg_get-current-vm)
-	local vmhome="/usr/lib/jvm/${vm}"
-
-	# IcedTea6 can't be built using IcedTea7; its class files are too new
-	if [[ "${vm}" == "icedtea6" ]] || [[ "${vm}" == "icedtea6-bin" ]] ; then
-		# If we are upgrading icedtea, then we don't need to bootstrap.
-		config="${config} --with-openjdk=$(java-config -O)"
-	elif [[ "${vm}" == "gcj-jdk" || "${vm}" == "cacao" ]] ; then
-		# For other 1.5 JDKs e.g. GCJ, CACAO.
-		config="${config} --with-ecj-jar=$(java-pkg_getjar --build-only eclipse-ecj:3.3 ecj.jar)" \
-		config="${config} --with-gcj-home=${vmhome}"
-	else
-		eerror "IcedTea${SLOT} must be built with either a JDK based on GNU Classpath or an existing build of IcedTea${SLOT}."
-		die "Install a GNU Classpath JDK (gcj-jdk, cacao)"
-	fi
-
-	# OpenJDK-specific parallelism support.
-	procs=$(echo ${MAKEOPTS} | sed -r 's/.*-j\W*([0-9]+).*/\1/')
-	if [[ -n ${procs} ]] ; then
-		config="${config} --with-parallel-jobs=${procs}";
-		einfo "Configuring using --with-parallel-jobs=${procs}"
-	fi
-
-	if use_zero ; then
-		config="${config} --enable-zero"
-	else
-		config="${config} --disable-zero"
-	fi
-
-	if use javascript ; then
-		rhino_jar=$(java-pkg_getjar rhino:1.6 js.jar);
-	fi
-
-	if use nsplugin && use npplugin ; then
-		config="${config} --enable-npplugin"
-	fi
-
-	if use hs16 ; then
-		config="${config} --with-hotspot-build=hs16"
-	fi
-
-	unset_vars
-
-	econf ${config} \
-		--with-openjdk-src-zip="${DISTDIR}/${OPENJDK_TARBALL}" \
-		--with-hotspot-src-zip="${DISTDIR}/${HOTSPOT_TARBALL}" \
-		--with-cacao-src-zip="${DISTDIR}/${CACAO_TARBALL}" \
-		--with-java="${vmhome}/bin/java" \
-		--with-javac="${vmhome}/bin/javac" \
-		--with-javah="${vmhome}/bin/javah" \
-		--with-abs-install-dir=/usr/$(get_libdir)/icedtea${SLOT} \
-		$(use_enable !debug optimizations) \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		$(use_with javascript rhino ${rhino_jar}) \
-		$(use_enable cacao) \
-		$(use_enable pulseaudio pulse-java) \
-		$(use_enable xrender) \
-		$(use_enable systemtap) \
-		$(use_enable nio2) \
-		$(use_enable nss) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	# Newer versions of Gentoo's ant add
-	# an environment variable so it works properly...
-	export ANT_RESPECT_JAVA_HOME=TRUE
-	# ant -diagnostics in Ant 1.8.0 fails without these
-	# otherwise we try to load the least that's needed to avoid possible classpath collisions
-	export ANT_TASKS="xerces-2 xalan"
-
-	# Paludis does not respect unset from src_configure
-	unset_vars
-	emake -j 1  || die "make failed"
-}
-
-src_install() {
-	local dest="/usr/$(get_libdir)/icedtea${SLOT}"
-	local ddest="${D}/${dest}"
-	dodir "${dest}" || die
-
-	local arch=${ARCH}
-	use x86 && arch=i586
-
-	dodoc README NEWS AUTHORS THANKYOU || die
-
-	cd "${S}/openjdk/build/linux-${arch}/j2sdk-image" || die
-
-	if use doc ; then
-		# java-pkg_dohtml needed for package-list #302654
-		java-pkg_dohtml -r ../docs/* || die "Failed to install documentation"
-	fi
-
-	# doins can't handle symlinks.
-	cp -vRP bin include jre lib man "${ddest}" || die "failed to copy"
-
-	# Set PaX markings on all JDK/JRE executables to allow code-generation on
-	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables "${ddest}"{,/jre}/bin/*)
-
-	dodoc ASSEMBLY_EXCEPTION THIRD_PARTY_README || die
-
-	if use examples; then
-		dodir "${dest}/share";
-		cp -vRP demo sample "${ddest}/share/" || die
-	fi
-
-	cp src.zip "${ddest}" || die
-
-	# Fix the permissions.
-	find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die
-
-	if use nsplugin; then
-		use x86 && arch=i386;
-		if use npplugin; then
-		   install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaNPPlugin.so";
-		else
-		   install_mozilla_plugin "${dest}/jre/lib/${arch}/IcedTeaPlugin.so";
-		fi
-	fi
-
-	# We need to generate keystore - bug #273306
-	einfo "Generating cacerts file from certificates in /usr/share/ca-certificates/"
-	mkdir "${T}/certgen" && cd "${T}/certgen" || die
-	cp "${FILESDIR}/generate-cacerts.pl" . && chmod +x generate-cacerts.pl || die
-	for c in /usr/share/ca-certificates/*/*.crt; do
-		openssl x509 -text -in "${c}" >> all.crt || die
-	done
-	./generate-cacerts.pl "${ddest}/bin/keytool" all.crt || die
-	cp -vRP cacerts "${ddest}/jre/lib/security/" || die
-	chmod 644 "${ddest}/jre/lib/security/cacerts" || die
-
-	sed -e "s/@SLOT@/${SLOT}/g" \
-		-e "s/@PV@/${ICEDTEA_VER}/g" \
-		< "${FILESDIR}/icedtea.env" > "${T}/icedtea.env"
-	set_java_env "${T}/icedtea.env"
-}
-
-use_zero() {
-	use zero || ( ! use amd64 && ! use x86 && ! use sparc )
-}
-
-pkg_postinst() {
-	# Set as default VM if none exists
-	java-vm-2_pkg_postinst
-
-	if use nsplugin; then
-		elog "The icedtea${SLOT} browser plugin can be enabled using eselect java-nsplugin"
-		if use npplugin; then
-			elog "Note that the IcedTeaNPPlugin works only in browsers based on xulrunner-1.9.1 or later"
-			elog "such as Firefox 3.5+, Chromium and perhaps some others too, and it is considered"
-			elog "alpha quality by upstream. The older plugin can be built with USE=\"-nnplugin\""
-			elog "but it does not support xulrunner-1.9.2 (Firefox 3.6) or Chromium."
-		else
-			elog "Note that the IcedTeaPlugin works only in browsers based on xulrunner-1.9.0 or 1.9.1"
-			elog "such as Firefox 3 or 3.5, Epiphany 2.24 and not in older versions!"
-			elog "Also note that you need to recompile icedtea${SLOT} if you upgrade"
-			elog "from xulrunner-1.9.0 to 1.9.1."
-			elog "To support xulrunner-1.9.2 (Firefox 3.6) and Chromium, enable USE=npplugin"
-		fi
-	fi
-}