Add missing cpio dep and remove the old libXext version variant, bug #389599.

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

4 files changed, 15 insertions, 267 deletions

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 00531e9a31f1..639512336bf6 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -1,259 +1,8 @@
 # ChangeLog for dev-java/icedtea
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.51 2011/11/18 21:02:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.52 2011/11/18 21:18:40 caster Exp $
 
   18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
   icedtea-7.2.0-r1.ebuild:
-  Remove 'cacao' and 'jamvm' USE flags. Also remove 'zero' flag and have it
-  used only for ppc/ppc64. This functionality was experimental and brought more
-  problems than benefits. Also remove the bootstrapping with cacao due to
-  failures. Fixes numerous bugs.
-
-  18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Add additional PaX markings to executables for x86. Bug 389751
-
-  18 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Fix detection of parallel jobs from MAKEOPTS to handle all syntax variants.
-  Fixes bug #337827 and #389791. Using syntax from waf-utils.eclass
-
-  18 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Add --disable-bootstrap on PaX enabled hosts when building using IcedTea7.
-  Bug #389751.
-
-  13 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Fix building with PaX enabled kernels. Bug #389751. Thanks to Daniel Kuehn
-  <enhaisa@gmail.com> and Magnus Granberg <zorry@gentoo.org> for their help
-  finding the patch
-
-  12 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Use java-vm_sandbox-predict for installing the controle file
-
-  11 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Support building using icedtea-bin-7.
-
-  10 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Fix building with unusal locales, bug #330433 #389717
-
-  08 Nov 2011; Ralph Sennhauser <sera@gentoo.org> icedtea-6.1.10.4-r1.ebuild,
-  icedtea-7.2.0-r1.ebuild:
-  Allow building of icedtea with icedtea-bin-6, bug 389885
-
-  07 Nov 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.10.4.ebuild,
-  icedtea-6.1.10.4-r1.ebuild, icedtea-7.2.0-r1.ebuild:
-  Prepare for icedtea-bin version and VMHANDLE migration.
-
-  06 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Fix build due to missing ant class when xalan and xerces are not installed,
-  bug #389625.
-
-  05 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Relax lcms dep to allow the stable 2.0a satisfy it.
-
-  05 Nov 2011; Diego E. Pettenò <flameeyes@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  QA fix: add missing cpio dependency.
-
-  04 Nov 2011; Vlastimil Babka <caster@gentoo.org> icedtea-7.2.0-r1.ebuild:
-  Add ~x86 keyword.
-
-*icedtea-7.2.0-r1 (04 Nov 2011)
-
-  04 Nov 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-7.2.0-r1.ebuild:
-  Version bump from the java-overlay, bug #382485.
-
-  04 Nov 2011; Vlastimil Babka <caster@gentoo.org>
-  -files/6.1.10.2-371405-linux_version.patch, -files/6.1.9.6-sparc.patch:
-  Remove unused patches.
-
-*icedtea-6.1.10.4-r1 (04 Nov 2011)
-
-  04 Nov 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.4-r1.ebuild:
-  Revbump to use EAPI=4 and change the VMHANDLE icedtea6 to the standard
-  icedtea-6. System vm setting is upgraded automatically. Any user-vm setting
-  have to be migrated manually.
-
-  30 Oct 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.10.2.ebuild,
-  -icedtea-6.1.10.3.ebuild, icedtea-6.1.10.4.ebuild:
-  Package move icedtea6-bin to icedtea-bin.
-
-*icedtea-6.1.10.4 (21 Oct 2011)
-
-  21 Oct 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.4.ebuild:
-  Version bump, security bug #387637.
-
-  09 Sep 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.10.2.ebuild,
-  icedtea-6.1.10.3.ebuild:
-  Use /usr/lib instead of get_libdir for the vmhome path, bug #380853.
-
-*icedtea-6.1.10.3 (22 Jul 2011)
-
-  22 Jul 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.3.ebuild:
-  Version bump, from java-overlay.
-
-  17 Jul 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.9.7-r1.ebuild,
-  -icedtea-6.1.10.ebuild, -icedtea-6.1.10.1.ebuild, icedtea-6.1.10.2.ebuild,
-  +files/6.1.10.2-371405-linux_version.patch:
-  Apply patch for Linux 3.* compatibility from overlay, fixing buf #371405.
-  Remove old versions.
-
-*icedtea-6.1.10.2 (09 Jun 2011)
-
-  09 Jun 2011; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.10.2.ebuild:
-  Version bump, security bug #370787.
-
-  22 Apr 2011; Jeroen Roovers <jer@gentoo.org> metadata.xml:
-  Spelling.
-
-*icedtea-6.1.10.1 (08 Apr 2011)
-
-  08 Apr 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.7-r1.ebuild,
-  icedtea-6.1.10.ebuild, +icedtea-6.1.10.1.ebuild, metadata.xml:
-  Version bump, bug #361921. Restrict libpng deps on older versions.
-
-  29 Mar 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.7-r1.ebuild,
-  icedtea-6.1.10.ebuild:
-  Slot GTK+ deps.
-
-*icedtea-6.1.10 (05 Mar 2011)
-
-  05 Mar 2011; <caster@gentoo.org> -icedtea-6.1.9.6.ebuild,
-  +icedtea-6.1.10.ebuild, metadata.xml:
-  Version bump, bug #357153.
-
-*icedtea-6.1.9.7-r1 (18 Feb 2011)
-
-  18 Feb 2011; Vlastimil Babka <caster@gentoo.org> -files/6.1.9.4-sparc.patch,
-  -icedtea-6.1.9.4.ebuild, -icedtea-6.1.9.5.ebuild, +icedtea-6.1.9.7-r1.ebuild,
-  -files/6.1.9.5-sparc.patch, -files/icedtea-old.env:
-  Version bump, security bug #355127. Webstart and nsplugin are now deferred to
-  separate icedtea-web package via PDEPEND.
-
-*icedtea-6.1.9.6 (09 Feb 2011)
-
-  09 Feb 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.6-sparc.patch,
-  +icedtea-6.1.9.6.ebuild:
-  Version bump, security bug #354231.
-
-*icedtea-6.1.9.5 (02 Feb 2011)
-
-  02 Feb 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.5-sparc.patch,
-  +icedtea-6.1.9.5.ebuild, +files/icedtea-old.env, -files/6.1.9.3-sparc.patch,
-  -icedtea-6.1.9.3.ebuild, icedtea-6.1.9.4.ebuild, files/icedtea.env:
-  Version bump, security bug #353418. Use get_libdir to set proper lib dir in
-  the env file.
-
-  21 Jan 2011; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.3.ebuild,
-  icedtea-6.1.9.4.ebuild:
-  Use virtual/jpeg, bug #347953.
-
-  21 Jan 2011; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.4-sparc.patch:
-  Add missing patch from the overlay, sorry. Bug #352314.
-
-*icedtea-6.1.9.4 (21 Jan 2011)
-
-  21 Jan 2011; Vlastimil Babka <caster@gentoo.org> -icedtea-6.1.9.1.ebuild,
-  -icedtea-6.1.9.2.ebuild, +icedtea-6.1.9.4.ebuild:
-  Version bump, including security fix for CVE-2010-4351: IcedTea JNLP
-  SecurityManager bypass. Bug #352035.
-
-  20 Jan 2011; Kacper Kowalik <xarthisius@gentoo.org>
-  icedtea-6.1.9.3.ebuild:
-  Mark ~ppc/~ppc64 wrt #308513. Thanks to Kris Hepler <khepler@gmail.com>
-  for testing.
-
-  12 Dec 2010; Vlastimil Babka <caster@gentoo.org> +files/6.1.9.3-sparc.patch,
-  icedtea-6.1.9.3.ebuild:
-  Add patch for sparc, bug #344659.
-
-  02 Dec 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.3.ebuild,
-  metadata.xml:
-  Check that webstart flag is enabled if nsplugin flag is enabled. Document
-  this in metadata.xml.
-
-*icedtea-6.1.9.3 (02 Dec 2010)
-
-  02 Dec 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.3.ebuild:
-  Version bump.
-
-  26 Nov 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.9.1.ebuild,
-  icedtea-6.1.9.2.ebuild:
-  Use versionator for ICEDTEA_VER
-
-*icedtea-6.1.9.2 (25 Nov 2010)
-
-  25 Nov 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.2.ebuild,
-  metadata.xml:
-  Security version bump, bug #346799, thanks to Andrew John Hughes
-  (gnu_andrew@member.fsf.org). Also adds webstart useflag.
-
-  14 Nov 2010; Vlastimil Babka <caster@gentoo.org>
-  -files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.8.0.ebuild,
-  -icedtea-6.1.8.1.ebuild, -icedtea-6.1.9.ebuild:
-  Remove old.
-
-  14 Nov 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.8.0.ebuild,
-  icedtea-6.1.8.1.ebuild, icedtea-6.1.9.ebuild, icedtea-6.1.9.1.ebuild:
-  Fix eselect-ecj deps.
-
-*icedtea-6.1.9.1 (13 Oct 2010)
-
-  13 Oct 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.1.ebuild,
-  metadata.xml:
-  Version bump, security bug #340819.
-
-*icedtea-6.1.9 (09 Sep 2010)
-
-  09 Sep 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.9.ebuild:
-  Version bump from java-overlay.
-
-*icedtea-6.1.8.1 (30 Jul 2010)
-
-  30 Jul 2010; Vlastimil Babka <caster@gentoo.org> -files/1.7.2-free.patch,
-  -files/6.1.7.3-systemtap-gcc-4.5.patch, -icedtea-6.1.7.2-r1.ebuild,
-  -icedtea-6.1.7.3.ebuild, +icedtea-6.1.8.1.ebuild, metadata.xml:
-  Security version bump, bug #330205. Remove the older 1.7.x.
-
-*icedtea-6.1.7.3 (03 May 2010)
-
-  03 May 2010; Vlastimil Babka <caster@gentoo.org>
-  +files/6.1.7.3-systemtap-gcc-4.5.patch,
-  +files/6.1.8.0-systemtap-gcc-4.5.patch, -icedtea-6.1.7.1.ebuild,
-  +icedtea-6.1.7.3.ebuild, icedtea-6.1.8.0.ebuild:
-  Fix building with gcc-4.5 and USE=systemtap - fixes bug #317343. Bump the
-  6.1.7.2-r1 to 6.7.1.3 (which is the same)for easier sync with the overlay.
-
-  15 Apr 2010; Vlastimil Babka <caster@gentoo.org> icedtea-6.1.8.0.ebuild:
-  Add ant-nodeps to DEPEND since it's used in ANT_TASKS variable. Bug
-  #315457.
-
-*icedtea-6.1.8.0 (14 Apr 2010)
-
-  14 Apr 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.8.0.ebuild:
-  Version bump, based on java-overlay ebuild. Remove the npplugin flag as
-  upstream removed the old plugin - the npplugin is now installed simply
-  with USE=nsplugin.
-
-  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)
-
-  31 Mar 2010; Vlastimil Babka <caster@gentoo.org> +files/1.7.2-free.patch,
-  +icedtea-6.1.7.2-r1.ebuild:
-  Revbump to fix buffer overflow in npplugin.
-
-*icedtea-6.1.7.2 (31 Mar 2010)
-
-  31 Mar 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.7.2.ebuild:
-  Version bump, security bug #312297.
-
-*icedtea-6.1.7.1 (04 Mar 2010)
-
-  04 Mar 2010; Vlastimil Babka <caster@gentoo.org> +icedtea-6.1.7.1.ebuild,
-  +files/generate-cacerts.pl, +files/icedtea.env, +metadata.xml:
-  Import of ebuild by Andrew John Hughes (gnu_andrew@member.fsf.org) from
-  java-overlay.
+  Add missing cpio dep and remove the old libXext version variant, bug #389599.
 
diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index e64099a7e54c..8bcb50523574 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -14,7 +14,7 @@ DIST jaxp144_01.zip 5964803 RMD160 6844ae747a7e7de289ce263ed06050a512416aec SHA1
 DIST jdk6-jaf-b20.zip 71243 RMD160 40b49d12c39b7010ee917eb671f3c38cd16f271c SHA1 69a54373e169bd7b04a45de6a310a199260424b9 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
 DIST jdk6-jaxws-b20.zip 5513069 RMD160 47b2d4fe528d770391e8926299df45cc6f68e9b5 SHA1 08366a70c9e2baa516afc77bb69f9e108e906aa9 SHA256 0c460583898b968a58bf88eb53f90a0e34369e2562d65fb3a143512dfcaeb3eb
 DIST openjdk-6-src-b22-28_feb_2011.tar.gz 45279689 RMD160 2b8f92cdb4d7dd3eb3cbb800a73e1666ee4bf5b1 SHA1 65a60153adbc8bc47fb95bb2b588a9a0b8701c95 SHA256 14a097d45b8c040e984be164a8cefbf22040a9ad57474fe87dd8cf2d0b08328b
-EBUILD icedtea-6.1.10.4-r1.ebuild 10045 RMD160 94fddd5b87c203a146e7c785f0846ebd19d04cbe SHA1 dca736b39f665c5a5dec6516c65b75af89fdb1ad SHA256 55ff4b30e7b2dcb8eb583549ce0a4ff7457a92f2c0c2fa84f4f234f742de88d8
-EBUILD icedtea-7.2.0-r1.ebuild 10945 RMD160 8f1c5471b1ba9f9fe64966c3ce6bd54fb2a7b19b SHA1 4186a65803aa7ae1975a86c93d0d095f6e908e3d SHA256 63da4b0aae6c0d76fec17ba59d0288863ba4de91a7c8d8eee6fbb118f5b5b927
-MISC ChangeLog 10021 RMD160 f9773d34c62cf2e0d84b23a2dc2a2c105f2c1002 SHA1 65edc128353f7a25676fa76a556a4f824f41e229 SHA256 7cc7f1c334601a295ec70dee70aae3ca2367d6a7737723408202fb2a240e4aa5
+EBUILD icedtea-6.1.10.4-r1.ebuild 10011 RMD160 92ac274b142785a7bd0c47b7bc7d5ec735956e19 SHA1 7943dd3646a3368f0714e7f318fcea77ad56edc0 SHA256 6128800be88b57ec0563c1c59d431a32ec24eb28d2508ccae31e8b4941d2c147
+EBUILD icedtea-7.2.0-r1.ebuild 11019 RMD160 3f69908fcc0647e0dc3aeba1fad57e61820c7968 SHA1 2ab4b7beec220c9c7aad9d57bf70175dc8783943 SHA256 cd94687a48d702f9cde08ea95b4ef00cf66b826ed6732bf81fbf60802670ce53
+MISC ChangeLog 393 RMD160 3881f82cb7d2515d9aa1513feab51388dd770db1 SHA1 40d609322d379190c94a1c341b69b0bdeac09bf7 SHA256 cea64c41b432ab134cd031e853f57e96a87c492634fca33a6701e59e1c1b6094
 MISC metadata.xml 1567 RMD160 7cb547ff92d8896cdbb0dd53aa682fe31d027b4e SHA1 c42d533a391f98fa303b591a4ba1471e0de94b7c SHA256 596df17fd33825a2abb567685bda63f6ff56cbfa616911199855e3fac8bec5e4
diff --git a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild b/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
index 4fe298e14ff4..4540ce103ed7 100644
--- a/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild
+++ b/dev-java/icedtea/icedtea-6.1.10.4-r1.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/icedtea-6.1.10.4-r1.ebuild,v 1.8 2011/11/18 21:02:03 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-6.1.10.4-r1.ebuild,v 1.9 2011/11/18 21:18:40 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -90,15 +90,11 @@ DEPEND="${RDEPEND}
 	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"
+	>=x11-libs/libXext-1.1.1
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xproto
+	sys-apps/lsb-release
+	app-arch/cpio"
 
 PDEPEND="webstart? ( dev-java/icedtea-web:6 )
 	nsplugin? ( dev-java/icedtea-web:6[nsplugin] )"
diff --git a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild b/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
index 6d8c48420bbc..1c7855fe70f8 100644
--- a/dev-java/icedtea/icedtea-7.2.0-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.0-r1.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/icedtea-7.2.0-r1.ebuild,v 1.15 2011/11/18 21:02:01 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/icedtea-7.2.0-r1.ebuild,v 1.16 2011/11/18 21:18:40 caster Exp $
 # Build written by Andrew John Hughes (gnu_andrew@member.fsf.org)
 
 # *********************************************************
@@ -51,6 +51,7 @@ RDEPEND=">=net-print/cups-1.2.12
 	 >=x11-libs/libXau-1.0.3
 	 >=x11-libs/libXdmcp-1.0.2
 	 >=x11-libs/libXtst-1.0.3
+	 >=x11-libs/libXext-1.1.1
 	 virtual/jpeg
 	 >=media-libs/libpng-1.2
 	 >=media-libs/giflib-4.1.6
@@ -86,6 +87,8 @@ DEPEND="${RDEPEND}
 	)
 	app-arch/zip
 	>=dev-libs/libxslt-1.1.26
+	>=x11-proto/xextproto-7.1.1
+	x11-proto/xproto
 	>=dev-java/ant-core-1.8.1
 	dev-java/ant-nodeps
 	app-misc/ca-certificates