Version bump, security bug #375977.

Package-Manager: portage-2.2.0_alpha45/cvs/Linux x86_64

4 files changed, 49 insertions, 147 deletions

diff --git a/dev-java/icedtea-web/ChangeLog b/dev-java/icedtea-web/ChangeLog
index 1aaed9b7f1c3..e4a2e8d88d62 100644
--- a/dev-java/icedtea-web/ChangeLog
+++ b/dev-java/icedtea-web/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/icedtea-web
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.6 2011/06/20 12:34:46 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/ChangeLog,v 1.7 2011/07/22 09:08:37 caster Exp $
+
+*icedtea-web-1.1.1 (22 Jul 2011)
+
+  22 Jul 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-web-1.0.1.ebuild,
+  -icedtea-web-1.0.2.ebuild, +icedtea-web-1.1.1.ebuild:
+  Version bump, security bug #375977.
 
   20 Jun 2011; Vlastimil Babka <caster@gentoo.org> icedtea-web-1.1.ebuild:
   Disable parallel make install until bug #372235 is resolved.
diff --git a/dev-java/icedtea-web/Manifest b/dev-java/icedtea-web/Manifest
index 6ce26e0fa669..3a8b7051ff1d 100644
--- a/dev-java/icedtea-web/Manifest
+++ b/dev-java/icedtea-web/Manifest
@@ -1,8 +1,6 @@
-DIST icedtea-web-1.0.1.tar.gz 834803 RMD160 d955a72a9b9d342ba7627824be1a124dc20cdbce SHA1 bb6de0b3ffa5ffd00075129ca2d10e1c7140dda2 SHA256 cfcb17e94d6cd406e7aceb08de2ae7c03fe3f2a730829cc5ac54ca6a90a9d46e
-DIST icedtea-web-1.0.2.tar.gz 750179 RMD160 9d8bd6f363fc9f9e17e4c14111be1bd6fe1088d8 SHA1 4dd03d3718c65b2ffd1a412bbf70ae7937b90361 SHA256 aa836e4c350eaaf3a3f474522ec47069f9b71c02ce59e8dd3d79881edb15115c
+DIST icedtea-web-1.1.1.tar.gz 806633 RMD160 7267f279726bc1aa70f298721f757822b5189cfb SHA1 332874daf5f01fd6db3e60b4dbe3b40b8b269014 SHA256 0051005302e698f2468e6cae275b8c58869c85be04c269f2f266389a4e6a66c7
 DIST icedtea-web-1.1.tar.gz 794939 RMD160 1930d9683889f2b383e7cd4a9957d6c8119e34ca SHA1 243bc20e26637df5d5b3cd52c60c84e564cd3134 SHA256 9ab60926f5d455d51e8e62120f71a12b1f18b20f599477d55dd71282a8055675
-EBUILD icedtea-web-1.0.1.ebuild 3145 RMD160 379fb9c7b069687ca5b0408a09af55843d38840f SHA1 c1e007c923d8db67d01b3a80e83f08719262a570 SHA256 3b0c31278db4ebb8debb7e7d8f3d2bbd985777c83a17adb364ac76513bf4f9fb
-EBUILD icedtea-web-1.0.2.ebuild 3145 RMD160 cd92513b58c0983e8dd85b2fa8bec2ac9b84b998 SHA1 f484d920eddfe7e60ec464daad26dc03034007c1 SHA256 fe95bf71250d7b79c0ca481e76f561223afa3416fbb343a7bc3fa6a05caaaa25
+EBUILD icedtea-web-1.1.1.ebuild 3939 RMD160 5c9b89c18766dde518b8f6f5a442464a5cff1d80 SHA1 cab1ac9021a1adcb1d237dc11224c08143481423 SHA256 cf529d6217d81edfbe9bdf40e4a36bfef0e84352c553e2120b76814a661e63b4
 EBUILD icedtea-web-1.1.ebuild 3736 RMD160 96eb90f54f69ba599fecf5332ddae987e09cb11c SHA1 33f23b8040b126d1c4cbcfb1ef6f06c91cb680fb SHA256 d0b927ea89531434da24bb6250a6290b03277e9bf16314badb0195a16dc26312
-MISC ChangeLog 1206 RMD160 a3efd9f34a05cfbbf79212835f97ee34d2956d5b SHA1 72e6f60bd2def88df0c489616eeb9c9ae2a1bd31 SHA256 0aee4c11658f344979582a694b7112cff7b7d5a69906c90564038b8f103b7c9a
+MISC ChangeLog 1413 RMD160 cb52d1e7cb9e664ea991b17dff713755c4d4bcd1 SHA1 4f4114348bf2f04a14bc932f099ccb864e7a9bab SHA256 1a165c78f22ce4824409665b98cde59a918a4fd1e6a43b087a41c393a0084a3a
 MISC metadata.xml 666 RMD160 0b4a727787334a8fb0755705a9a9abbea0ed2540 SHA1 529ff0c8f099d6b65d47880b4f5a338ef94c63fd SHA256 39c40293e8df643512c54fdfe6c2cae952fa38229b137c039c1477e4fb758bb6
diff --git a/dev-java/icedtea-web/icedtea-web-1.0.2.ebuild b/dev-java/icedtea-web/icedtea-web-1.0.2.ebuild
deleted file mode 100644
index 96ac184ab4a6..000000000000
--- a/dev-java/icedtea-web/icedtea-web-1.0.2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.0.2.ebuild,v 1.1 2011/04/08 13:15:30 caster Exp $
-# Build written by Andrew John Hughes (ahughes@redhat.com)
-
-EAPI="2"
-
-inherit eutils java-pkg-2 java-vm-2
-
-LICENSE="GPL-2 GPL-2-with-linking-exception LGPL-2"
-SLOT="6"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-
-DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
-SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
-HOMEPAGE="http://icedtea.classpath.org"
-
-IUSE="doc +nsplugin"
-
-RDEPEND="dev-java/icedtea:6
-	 nsplugin? ( >=net-libs/xulrunner-1.9.1 )"
-DEPEND="${RDEPEND}"
-
-# a bit of hack so the VM switching is triggered without causing dependency troubles
-JAVA_PKG_NV_DEPEND=">=virtual/jdk-1.6"
-JAVA_PKG_WANT_SOURCE="1.6"
-JAVA_PKG_WANT_TARGET="1.6"
-
-pkg_setup() {
-	# 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:6; then
-		JAVA_PKG_FORCE_VM="icedtea6"
-	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
-}
-
-unset_vars() {
-	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
-}
-
-src_unpack() {
-	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
-		die "Unable to find a supported VM for building"
-	fi
-
-	default
-}
-
-src_configure() {
-	local vmhome=$(java-config -O)
-	local icedtea6dir="${ROOT}usr/$(get_libdir)/icedtea6"
-
-	unset_vars
-
-	if [[ ${vmhome} == ${icedtea6dir} ]] ; then
-		installdir=${vmhome}
-		VMHANDLE="icedtea6"
-	else
-		die "Unexpected install location of IcedTea6"
-	fi
-
-	elog "Installing IcedTea-Web in ${installdir}"
-	if [ ! -e ${installdir} ] ; then
-		eerror "Could not find JDK install directory ${installdir}."
-	fi
-
-	econf \
-		--prefix=${installdir} \
-		--with-jdk-home=${vmhome} \
-		$(use_enable doc docs) \
-		$(use_enable nsplugin plugin) \
-		|| die "configure failed"
-}
-
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
-	dodoc AUTHORS README NEWS || die
-
-	if use nsplugin; then
-		local arch=${ARCH};
-		use x86 && arch=i386;
-		install_mozilla_plugin "${installdir}/jre/lib/${arch}/IcedTeaPlugin.so";
-	fi
-}
-
-pkg_postinst() {
-	java-vm_check-nsplugin
-	java_mozilla_clean_
-
-	if use nsplugin; then
-		elog "The icedtea browser plugin (NPPlugin) can be enabled using eselect java-nsplugin"
-		elog "Note that the plugin works only in browsers based on xulrunner-1.9.1 or later"
-		elog "such as Firefox 3.5+, Chromium and perhaps some others too."
-	fi
-}
-
-pkg_prerm() {
-	# override the java-vm-2 eclass check for removing a system VM, as it doesn't make sense here
-	:;
-}
diff --git a/dev-java/icedtea-web/icedtea-web-1.0.1.ebuild b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
index 1fd702575f8f..a9fe3110aaab 100644
--- a/dev-java/icedtea-web/icedtea-web-1.0.1.ebuild
+++ b/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.0.1.ebuild,v 1.3 2011/03/30 19:54:38 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-web/icedtea-web-1.1.1.ebuild,v 1.1 2011/07/22 09:08:37 caster Exp $
 # Build written by Andrew John Hughes (ahughes@redhat.com)
 
 EAPI="2"
@@ -15,9 +15,9 @@ DESCRIPTION="FOSS Java browser plugin and Web Start implementation"
 SRC_URI="http://icedtea.classpath.org/download/source/${P}.tar.gz"
 HOMEPAGE="http://icedtea.classpath.org"
 
-IUSE="doc +nsplugin"
+IUSE="build doc +nsplugin"
 
-RDEPEND="dev-java/icedtea:6
+RDEPEND="dev-java/icedtea:${SLOT}
 	 nsplugin? ( >=net-libs/xulrunner-1.9.1 )"
 DEPEND="${RDEPEND}"
 
@@ -31,8 +31,8 @@ pkg_setup() {
 	# 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:6; then
-		JAVA_PKG_FORCE_VM="icedtea6"
+	elif has_version dev-java/icedtea:${SLOT}; then
+		JAVA_PKG_FORCE_VM="icedtea${SLOT}"
 	else
 		JAVA_PKG_FORCE_VM=""
 		# don't die just yet if merging a binpkg - bug #258423
@@ -52,11 +52,6 @@ unset_vars() {
 	unset JAVA_HOME JDK_HOME CLASSPATH JAVAC JAVACFLAGS
 }
 
-src_compile() {
-	# we need this to override the src_compile from java-pkg-2
-	default
-}
-
 src_unpack() {
 	if [[ -n ${DIE_IF_NOT_BINPKG} ]]; then
 		die "Unable to find a supported VM for building"
@@ -67,39 +62,61 @@ src_unpack() {
 
 src_configure() {
 	local vmhome=$(java-config -O)
-	local icedtea6dir="${ROOT}usr/$(get_libdir)/icedtea6"
+
+	if use build; then
+		icedteadir="${ICEDTEA_BIN_DIR}"
+		installdir="/opt/icedtea${SLOT}-web-bin"
+	else
+		icedteadir="/usr/$(get_libdir)/icedtea${SLOT}"
+		installdir="/usr/$(get_libdir)/icedtea${SLOT}-web"
+	fi
 
 	unset_vars
 
-	if [[ ${vmhome} == ${icedtea6dir} ]] ; then
-		installdir=${vmhome}
-		VMHANDLE="icedtea6"
+	if use build || [[ ${vmhome} == ${icedteadir} ]] ; then
+		VMHANDLE="icedtea${SLOT}"
 	else
-		die "Unexpected install location of IcedTea6"
+		die "Unexpected install location of IcedTea${SLOT}"
 	fi
 
-	elog "Installing IcedTea-Web in ${installdir}"
-	if [ ! -e ${installdir} ] ; then
-		eerror "Could not find JDK install directory ${installdir}."
+	einfo "Installing IcedTea-Web in ${installdir}"
+	einfo "Installing IcedTea-Web for Icedtea${SLOT} in ${icedteadir}"
+	if [ ! -e ${vmhome} ] ; then
+		eerror "Could not find JDK install directory ${vmhome}."
+		die
 	fi
 
+	# we need to override all *dir variables that econf sets
+	# man page (javaws) is installed directly to icedteadir because it's easier than symlinking, as we don't know
+	# the suffix the man page will end up compressed with, anyway
 	econf \
-		--prefix=${installdir} \
-		--with-jdk-home=${vmhome} \
+		--prefix=${installdir} --mandir=${icedteadir}/man --infodir=${installdir}/share/info --datadir=${installdir}/share \
+		--with-jdk-home=${icedteadir} \
 		$(use_enable doc docs) \
 		$(use_enable nsplugin plugin) \
 		|| die "configure failed"
 }
 
+src_compile() {
+	# we need this to override the src_compile from java-pkg-2
+	default
+}
+
 src_install() {
-	emake DESTDIR="${D}" install || die "Install failed"
+	# parallel make problem bug #372235
+	emake -j1 DESTDIR="${D}" install || die "Install failed"
 	dodoc AUTHORS README NEWS || die
 
 	if use nsplugin; then
 		local arch=${ARCH};
 		use x86 && arch=i386;
-		install_mozilla_plugin "${installdir}/jre/lib/${arch}/IcedTeaPlugin.so";
+		install_mozilla_plugin "${installdir}/$(get_libdir)/IcedTeaPlugin.so";
 	fi
+
+	for binary in javaws itweb-settings; do
+		dosym ${installdir}/bin/${binary} ${icedteadir}/bin/${binary}
+		dosym ${installdir}/bin/${binary} ${icedteadir}/jre/bin/${binary}
+	done
 }
 
 pkg_postinst() {