[gentoo-commits] proj/java:master commit in: dev-java/icedtea/

["Andrew John Hughes" <gnu_andrew@member.fsf.org>]

commit:     1a205f74e22accfc303311c1004b64bee90f6638
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Fri Jan 22 12:12:00 2016 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Fri Jan 22 12:12:00 2016 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=1a205f74

dev-java/icedtea: Bump to 2.6.4 (http://bitly.com/it20604). Remove
CUPS Makefile hack; will be replaced by http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2803

Package-Manager: portage-2.2.26

 dev-java/icedtea/ChangeLog                          |  9 +++++++++
 dev-java/icedtea/Manifest                           | 16 ++++++++--------
 ...tea-7.2.6.3-r1.ebuild => icedtea-7.2.6.4.ebuild} | 21 ++++++++-------------
 dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild    |  5 -----
 4 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog
index 7dc3728..7a99fdb 100644
--- a/dev-java/icedtea/ChangeLog
+++ b/dev-java/icedtea/ChangeLog
@@ -2,6 +2,15 @@
 # Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*icedtea-7.2.6.4 (22 Jan 2016)
+
+  22 Jan 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  +icedtea-7.2.6.4.ebuild, -icedtea-7.2.6.3-r1.ebuild,
+  icedtea-7.2.7.0_pre00-r1.ebuild:
+  dev-java/icedtea: Bump to 2.6.4 (http://bitly.com/it20604). Remove CUPS
+  Makefile hack; will be replaced by
+  http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2803
+
 *icedtea-3.0.0_pre07-r1 (11 Jan 2016)
 
   11 Jan 2016; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest
index 59d1b11..e4641fc 100644
--- a/dev-java/icedtea/Manifest
+++ b/dev-java/icedtea/Manifest
@@ -1,11 +1,11 @@
-DIST icedtea-2.6-corba-9a3ca529125a.tar.bz2 1072549 SHA256 1052ae3c70908aa3374818ada320685cb7abdc7bd7bbd3cfb4f26fbbe7435ec6 SHA512 8d46557d564917514a14296b06cc35c1d84b1d7be7a3c6cd14770fe76481fcd02af9ff1cc528acde684cc1c5e2a065ce2e5254fae47fdaa3598c6e5ab8779697 WHIRLPOOL 8890517cc5b992d8d35c5486e3105c7e52dd86c94bdfafaa2657cf58a09e7b4e776b90cdd5a2ae311e12dadb6eab010b1b29416697cfb285f12ea5eceb31db36
-DIST icedtea-2.6-hotspot-c3cde6774003.tar.bz2 8163275 SHA256 dd8f3771439b4d51fa84e3f9b384b80e6656cf1a19ee3492b4f2fe09b37eef0e SHA512 3aadde373e01575cdd1fa3621ab132eb2273d70f08f8a3ad784cd238d8902626f9121c0f8abdddae7a810fb79cf70c0ea3fe7f2c2035fadd2803a2177a305ea9 WHIRLPOOL ccdd1f3bc14380673204021b7a3f57bc03d70c5ba085e34ead4a32349bc95ae85e706dcc207d2c335d087b6dcd3a53f109dc0f31ebcb6b2c8c59654b6fa03233
-DIST icedtea-2.6-jaxp-f7bf82fcbd09.tar.bz2 2732623 SHA256 a0e978bc07371901560a746cae492edf0bcb22ddbb9e47b77319ffda1351806b SHA512 4a0de68af85699b611e37af0749cccdb0483ac75af1fbd0f63cdc2f0c173605bca77c60bbb41aff916c768b5a29a933fbd8e34d8bd2dd67c22cbd629078061ab WHIRLPOOL 7904da721c88e6daf5ee32cb5492e5e3d09e10ec78c4275625f5ba0a04720cbec0de59f6a5900f62c90ce3284b9441400508b69e2660c43dc8561f15c4255601
-DIST icedtea-2.6-jaxws-39ef53b9c403.tar.bz2 2021458 SHA256 55897d92e368ac7df3e04d4f235e9dba12ea8264e20d4bd6b68e8c13e5addc1e SHA512 a4cd98bc6c4b1b54dcee68f4a373322e550246ed88412e33d3700631bbd662d390df89047f9cc40f80c10f1ffce81142c301db06ef46bbc16e1245880242151d WHIRLPOOL 0e1889c115a0e03a4f57bcc357b8b19470e768eeb2650554fe6573e057b4f6280c879101ce250b25d2b00b0964383c6399129736fd5236929964badef6a0228d
-DIST icedtea-2.6-jdk-5215185a1d57.tar.bz2 32415510 SHA256 583898549b52e958521474db34f2ce535b6a0926c7df1fa99a3f0321b3a109f5 SHA512 9cfe22d2a112d35c8008069c61118f5e289e78a91d325da301949843d5c7b747cdf99fa7c97c09ea4c15a263f47d09b65ee26ca01282aa4d9abed6087a09f656 WHIRLPOOL 3a7d1848f742318c1a93430956671d0618eb394f0282f3c7d81eba28770d942c11ba10fcae49342ffc50a056ec9e508d3cd6a3da6ce8c45e2850728bd80c5fcd
-DIST icedtea-2.6-langtools-91fdb0c83e50.tar.bz2 1710122 SHA256 f14716df84e047b19884ac5b0830e87b6cdf1925d0951195255c9124e89df27e SHA512 2aa47e622194e0afd773c3f56df67afa35e69edc7af0c6385edc4d26383a3b1a29d87470c6fb2bc3d3e51b58c0283023ddb53bca4c4bf5504ed22fe457c39bb1 WHIRLPOOL a1cd8f6b6ab9ebdf01c836480429ff877fd37b0f12faa1add187dae95628a5588b1d66aa5751dcf7ed969c821570483c010e0efc7a635e0d6f71810bc0eb1aae
-DIST icedtea-2.6-openjdk-f0e7f22f09ef.tar.bz2 129924 SHA256 9e5d26bb1888a8a1378e078953aa04314d4fb4f263ebbaf7f459110c21f8d46d SHA512 ff6246a8615a2113197eb41839912fa1fdc22d95252846b08ff1539db13715131aac65dc06f9086ffb83daa4558caf1b707091ed5ef058bebb5fffc9b665e472 WHIRLPOOL 73c87a7055493668d17a99e1d616d7de2320fd792455504c147d5211dff28168b4161c0bb057645678ab71e665ed84f914cc6aa910d00dd6fea8494fd21934ef
-DIST icedtea-2.6.3.tar.xz 2075476 SHA256 df38aa10b4d30f3bae089dcc72f4c32fb2385cb541491791c12829960f53c612 SHA512 ea3333739627d64513140db77c7db11d1d74b5e6802889d11e54d1930feaea3733241d1691cb01d4550d4035c0e2e1076a03883d93db400ebc26a3ab0c8092c3 WHIRLPOOL 3b15fa2a661ca58fbc31bb195dda1dcc185af1c66eb89475bb95b762bb84541b6db0df7d7e5eeda4276398b3ebdf47a0c7f32cde950a53c82bb3c3793c1c3afe
+DIST icedtea-2.6-corba-2135da66cc53.tar.bz2 1072269 SHA256 26bbfae0504fb7e83fd5eaba08d9e44e0c07a609cdf7c04fb6832a097b56bc08 SHA512 2e07d6529c347625c06aed7dc25b41b5ca425aedb0652cc92df477f8a4ab1343c4aa90b1204a94a327a550d75cfe13c0adaf607b7e064e11b5a9ed07afb9313f WHIRLPOOL 2cbf0e97038907800f6d88084fc9879714c8c1297842179e3f220dde416d6f47d076fdc2c2296600aa06dcf839ec029378db8e7a662ce8c3cbfd8eda67e9ac3b
+DIST icedtea-2.6-hotspot-19d919ae5506.tar.bz2 8162545 SHA256 3747417c3ba69d1ff7d80dc6df19454c4f4023c35f8b711e47baefe2fc772e65 SHA512 be3c356fac53112324f688e6336e8bcde453284f20671a1630b97a30bfaaedf1f7915984250e51aea106fbcc25790aca3f7d4ed419499394748f0391b17782c5 WHIRLPOOL 65251c4e6d91fd8a25bb2bc83b58aacd23f3e7f4f65112d135ec04f98136e351a8175a84a05c070a42d1a351c8301c55a34f65f120e908e129cecb0ff703d32d
+DIST icedtea-2.6-jaxp-bc6edb6c12a7.tar.bz2 2733735 SHA256 097cb0423271b6439b36db190a66bab9d447dd03ee22e42a6089a3b3b8363f62 SHA512 fb9a7607403ba15759427bd7ef1740949dc9cf3892e61a643b9dcdfda7633876d38606dd06af96b0fa362eec427c68b9faa458762defe502c81cdd97290a056b WHIRLPOOL 62583d7e1907b97b90f818b9b0e76fe10a0f57342597191157f6c0a696af8f1fdc4b4968aa2112c7b42900e6a988fd291b0d5ffe7c3de7d89473e536ab6b9e56
+DIST icedtea-2.6-jaxws-271b555de438.tar.bz2 2022035 SHA256 da7604aaaedaab93ba9ad21ee5ee8f18c807606a97d60037ae8c3647e823dfa1 SHA512 cc7d9ee95ba4350c44eb1e9c08e70f6c4e5f1c115a8bc1c3af91828e8c6b814c31494426edc08e75601506e8f6208d07e8425f0f5b14ba5f5de7c7e3165b76c4 WHIRLPOOL a9376fc7ccfd9fea8adf7716aa0da93a32f855acc565b6ea39fa38cbbf3a008a035e62d54d9b2e3633c8a1c185787e0a373d2b166ef609e6483a4d28a3fdd1fc
+DIST icedtea-2.6-jdk-dc86038147b2.tar.bz2 32420326 SHA256 9d3199c0f9c39238c6920c941026cf8661a92e97845f75d74e9ff277532b5d63 SHA512 d22cba72083b65ec5b818652e0520c7b63974ecd940f6f39e27ce83cac664de15c3c4611e088056b6ae123b77f605fb61c1226c05811b03086c39cc2e12f114d WHIRLPOOL 48d3cacd5ec54c8e7dd203abd53f956669ff861ebe98e677d107d31d6964467b2387995e644a64ba238f44dab287bb2f6ef5d6e8333aa167d994cd72d74fdda3
+DIST icedtea-2.6-langtools-fd0a34cb97b4.tar.bz2 1707682 SHA256 f9b0ce14c73c263276d3dfe78601714869cd2c0463bd01c637c8556d52a7d7cc SHA512 0044e405fdaaae8fa54dd576b9efec4e51bdc0ee410eeeb3f78984a20efd6bd31b678e9b113a9d33c4eafaab3cb4ef190c78a4d02172e010282768bad917c497 WHIRLPOOL 6c70b2b176b1186eb9faf1a017becef1cc05b7c1c49ddfe5251b5660972514bb65c613cd5a5de5a11a5f104d63414947d5a3229e30294f57e67ace001acd9ef9
+DIST icedtea-2.6-openjdk-4f1e498cad9c.tar.bz2 129984 SHA256 bb02e71972ad606e739c79fc11c6dc61b4840a526a41049a600a206cc37152e2 SHA512 0b5affd4dfd76f584d1cd921026c5ae1d1017ee176f323a14eaaa5d02aa699e744f4c42ca76c31be93b334bfade63e1ca6635f9d9191640841497ba92cfb813c WHIRLPOOL 46769805754e869e4348925e96e63acec443e7e7bc4181925eb3610181d78784c54e288d0383668607b86945ee1e2eb7eeb345a161abb4524cb9f5acc77566c2
+DIST icedtea-2.6.4.tar.xz 2078228 SHA256 d20a365feea95a4c01c9f9db1f7562f471f638bc672db9de6c6e654d2d826164 SHA512 96373c8452b3087804d906544cd84ddae5bd3969314bd856cb89a9aa02c49fde0ea04d602f6d0d9e82308d34c60aa6c309314ec03ec7c73a4bf3c18a8825d1e0 WHIRLPOOL 688051df4a304874761f5e37bd0b003e20df17cf9f1552230b9638aa6df62d09c8c29dcdf3c7646b523266cc40ad0b4a4528bf4dfb46eae2e91d7e5e575dbc5c
 DIST icedtea-2.7-corba-e3445769412d.tar.bz2 1071338 SHA256 5aebaa5d670337a87ecc154372bc9d225a5232599c44f31a1d231bf8c5b89fcb SHA512 587e4e382922a06f2cb73d767cee1a874011b0d2bf7c49671d41907300246d741280afa842f8b3b4af1e999776e8bb5484b63c11c2179e968bb041bcaf3b6cc9 WHIRLPOOL babdd0ac5089822c3b12f20be9212f94f36ebfedf27a3c7d9e3800e4ccd7d4e114e5702b75ba6be13ffe10d8e0ec94a8daab6a607e346d1f473c268af1261784
 DIST icedtea-2.7-hotspot-94f15794d5e7.tar.bz2 8157346 SHA256 8e580046488e2fc15fd98892add37fffd4f9f17bf5d62c5db0f5d1832707a31c SHA512 85fa2b91da2c565e3d57f4b39c70b00dca7ce4d1249b8989b554e73f298c99ba90940bec60fcc66476b567c54935de53bb711a9ff71a9deac8082a4ed9ce2b47 WHIRLPOOL b1d6c25a2d29221061a03c42f3b8bf8d0de3198ff35150d8502daad9d46257c2b5822fde5bfe40662d1815c29399e6e0818214fcbc74d1134d57638719210ff0
 DIST icedtea-2.7-jaxp-e3b08dc13807.tar.bz2 2737345 SHA256 8de42ee0a7cf50ac5ca9b55a36e3933992b4dc0160a29a380820aea5d8158c07 SHA512 52e2f3058514892721e2117bcd78fe0b45752874b68b5fd3e8aff4846eabb2fd4ba60e9a7bcd0a463001e22824bee5c88f3dbf2aff0236a3fe8e4a9e1b556638 WHIRLPOOL 934724081e3bcdb7c40fa9b799ae28d132c6b855daaa40305422993172cc7ea506d14c77f39ef7afcf5283fa7c8a360347569d21184413fca12a0a3c7ca9d29d

diff --git a/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild b/dev-java/icedtea/icedtea-7.2.6.4.ebuild
similarity index 96%
rename from dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild
rename to dev-java/icedtea/icedtea-7.2.6.4.ebuild
index 24312a3..ceac4b6 100644
--- a/dev-java/icedtea/icedtea-7.2.6.3-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.6.4.ebuild
@@ -16,13 +16,13 @@ ICEDTEA_VER=$(get_version_component_range 2-4)
 ICEDTEA_BRANCH=$(get_version_component_range 2-3)
 ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
 ICEDTEA_PRE=$(get_version_component_range _)
-CORBA_TARBALL="9a3ca529125a.tar.bz2"
-JAXP_TARBALL="f7bf82fcbd09.tar.bz2"
-JAXWS_TARBALL="39ef53b9c403.tar.bz2"
-JDK_TARBALL="5215185a1d57.tar.bz2"
-LANGTOOLS_TARBALL="91fdb0c83e50.tar.bz2"
-OPENJDK_TARBALL="f0e7f22f09ef.tar.bz2"
-HOTSPOT_TARBALL="c3cde6774003.tar.bz2"
+CORBA_TARBALL="2135da66cc53.tar.bz2"
+JAXP_TARBALL="bc6edb6c12a7.tar.bz2"
+JAXWS_TARBALL="271b555de438.tar.bz2"
+JDK_TARBALL="dc86038147b2.tar.bz2"
+LANGTOOLS_TARBALL="fd0a34cb97b4.tar.bz2"
+OPENJDK_TARBALL="4f1e498cad9c.tar.bz2"
+HOTSPOT_TARBALL="19d919ae5506.tar.bz2"
 
 CACAO_TARBALL="cacao-c182f119eaad.tar.gz"
 JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@@ -62,7 +62,7 @@ RESTRICT="test"
 
 IUSE="+alsa cacao cjk +cups debug doc examples +gtk headless-awt infinality
 	jamvm javascript +jbootstrap kerberos nsplugin nss pax_kernel
-	pulseaudio sctp selinux smartcard source +sunec test webstart zero"
+	pulseaudio sctp selinux smartcard source +sunec test +webstart zero"
 
 REQUIRED_USE="gtk? ( !headless-awt )"
 
@@ -193,11 +193,6 @@ src_unpack() {
 }
 
 java_prepare() {
-	if ! use cups; then
-		# CUPS is always needed at build time but you can at least make it dlopen.
-		sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
-	fi
-
 	# For bootstrap builds as the sandbox control file might not yet exist.
 	addpredict /proc/self/coredump_filter
 

diff --git a/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild b/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild
index 7b9b236..1e4a708 100644
--- a/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild
+++ b/dev-java/icedtea/icedtea-7.2.7.0_pre00-r1.ebuild
@@ -193,11 +193,6 @@ src_unpack() {
 }
 
 java_prepare() {
-	if ! use cups; then
-		# CUPS is always needed at build time but you can at least make it dlopen.
-		sed -i 's/SYSTEM_CUPS="true"/SYSTEM_CUPS="false"/g' Makefile.in || die
-	fi
-
 	# For bootstrap builds as the sandbox control file might not yet exist.
 	addpredict /proc/self/coredump_filter