Sat Mar 29 03:28:40 UTC 2014

1 files changed, 40 insertions, 40 deletions

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 9cc2085df..4dbfe7020 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 204857 2014-01-29 14:49:34Z guillaume $
+# $Id: PKGBUILD 208914 2014-03-28 15:50:12Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,19 +6,19 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.4.5
+_icedtea_ver=2.4.6
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
 _JDK_UPDATE_VERSION=51
 
-_CORBA_CHANGESET=3594dbde270d
-_JAXP_CHANGESET=8fe156ad49e2
-_JAXWS_CHANGESET=32ea8b1ed91a
-_JDK_CHANGESET=9db88c18e114
-_LANGTOOLS_CHANGESET=dabd37b7e295
-_OPENJDK_CHANGESET=410eb7fef869
+_CORBA_CHANGESET=48ef1bb6d120
+_JAXP_CHANGESET=e0ba4b9a8b91
+_JAXWS_CHANGESET=4bd947cd146b
+_JDK_CHANGESET=b5282042aae0
+_LANGTOOLS_CHANGESET=06eeb77dac24
+_OPENJDK_CHANGESET=b028e58c1b77
 
-_HOTSPOT_CHANGESET=2cb58882dac3 # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
+_HOTSPOT_CHANGESET=172674e0ab65  # see "${srcdir}/icedtea-${_icedtea_ver}"/hotspot.map
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -30,18 +30,18 @@ license=('custom')
 options=('!emptydirs')
 makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
-             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget')
-[ "$_bootstrap" = "1" ] && makedepends=(${makedepends[@]} 'eclipse-ecj')
+             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget'
+             'eclipse-ecj')
 
 _url=http://icedtea.classpath.org/hg/release/icedtea7-forest-${_icedtea_ver:0:3}
 source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar.gz
-        ${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz						# openjdk.tar.gz
-        ${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz					# corba.tar.gz
-        ${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz						# jaxp.tar.gz
-        ${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz					# jaxws.tar.gz
-        ${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz						# jdk.tar.gz
-        ${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz			# langtools.tar.gz
-        ${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz				# hotspot.tar.gz
+        openjdk-${_OPENJDK_CHANGESET}.tar.gz::${_url}/archive/${_OPENJDK_CHANGESET}.tar.gz
+        corba-${_CORBA_CHANGESET}.tar.gz::${_url}/corba/archive/${_CORBA_CHANGESET}.tar.gz
+        jaxp-${_JAXP_CHANGESET}.tar.gz::${_url}/jaxp/archive/${_JAXP_CHANGESET}.tar.gz
+        jaxws-${_JAXWS_CHANGESET}.tar.gz::${_url}/jaxws/archive/${_JAXWS_CHANGESET}.tar.gz
+        jdk-${_JDK_CHANGESET}.tar.gz::${_url}/jdk/archive/${_JDK_CHANGESET}.tar.gz
+        langtools-${_LANGTOOLS_CHANGESET}.tar.gz::${_url}/langtools/archive/${_LANGTOOLS_CHANGESET}.tar.gz
+        hotspot-${_HOTSPOT_CHANGESET}.tar.gz::${_url}/hotspot/archive/${_HOTSPOT_CHANGESET}.tar.gz
         fontconfig-paths.diff
         openjdk7_nonreparenting-wm.diff
         jdk7-openjdk.profile
@@ -49,14 +49,14 @@ source=(http://icedtea.classpath.org/download/source/icedtea-${_icedtea_ver}.tar
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
 
-sha256sums=('10c08eeffaa0602b23cb957a2595a2ad3ab474cbe47b12743bbdd79037d5883d'
-            '2de151c7275d91ef082e63fcc0957c5f9290404ec6e20ecfa1e752e16bfab707'
-            'd1f97e143fe94ae3a56b45bb5a90f8ab10ec2be4ff770a788f0a1ac677e27a7d'
-            '0a2a40186cedfbeb8f87b0bc86bea2830943943081d4289fc74f7a783b2e1af3'
-            '08a169b6b02883759ec7a412aa91aa3e37480761cb50b95d092dbcdb2fc9a3d0'
-            '285e5b8ccbb29f3f9f9ea9ea7856d1ed97465c57d091fbcd9b2e55a1ffbb543e'
-            '86cb370ce2084c4b699d8c002ebe6c026e86206ffa82a2f3d7906aadb94ed79f'
-            'd8c1681ae76e660c1888065933cedbbc1309869c7a2fb98f07c424716d5ebaf9'
+sha256sums=('1f2ea0a29d946b0e8dd8f74c485adc41c02710e88c17ef827b635e1e4215ad33'
+            'e6be030ac5934781d9682dc3108980fa7d2330c32da3cea4ae74df11fbaa92f2'
+            '2fcfe699797154da8b4ba5242e32468b2f3f42a0cb17039915bfb1f84887a5b6'
+            'e7014057721b8392676bd24760c3f7b3dd40548abb3c8dfbe8df2fa04d7c1fca'
+            '17ed5278872ad0c9ec3a849caf1480e5942b714e35c9a4a949d09daac4b34c5a'
+            'ab9b0e973625604b12a2f027cb2a6f9bc5160ef7df55408da6ca8a9c3aaed2d5'
+            'a67e62618c70ef9190b2aef2b49be9d79624be9363bda258828b17494e092477'
+            '2aadfe9b1848a619bd2d35f802b3e71ef5286e7822f9e7b02ce2539ca817d9b0'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             'bd55299e08e6f8e61ba5baad0990170891801a29a1e8137e502b5e8a10fc37ea'
@@ -64,13 +64,13 @@ sha256sums=('10c08eeffaa0602b23cb957a2595a2ad3ab474cbe47b12743bbdd79037d5883d'
             'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
             '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
 
-noextract=("${_OPENJDK_CHANGESET}.tar.gz"
-           "${_CORBA_CHANGESET}.tar.gz"
-           "${_JAXP_CHANGESET}.tar.gz"
-           "${_JAXWS_CHANGESET}.tar.gz"
-           "${_JDK_CHANGESET}.tar.gz"
-           "${_LANGTOOLS_CHANGESET}.tar.gz"
-           "${_HOTSPOT_CHANGESET}.tar.gz")
+noextract=("openjdk-${_OPENJDK_CHANGESET}.tar.gz"
+           "corba-${_CORBA_CHANGESET}.tar.gz"
+           "jaxp-${_JAXP_CHANGESET}.tar.gz"
+           "jaxws-${_JAXWS_CHANGESET}.tar.gz"
+           "jdk-${_JDK_CHANGESET}.tar.gz"
+           "langtools-${_LANGTOOLS_CHANGESET}.tar.gz"
+           "hotspot-${_HOTSPOT_CHANGESET}.tar.gz")
 
   _jvmdir=/usr/lib/jvm/java-7-openjdk
 
@@ -102,13 +102,13 @@ build() {
         --disable-downloading --disable-Werror \
         --with-pkgversion="ArchLinux build ${pkgver}-${pkgrel}-${CARCH}" \
         --with-jdk-home=${JAVA_HOME} \
-        --with-openjdk-src-zip=${srcdir}/${_OPENJDK_CHANGESET}.tar.gz \
-        --with-hotspot-src-zip=${srcdir}/${_HOTSPOT_CHANGESET}.tar.gz \
-        --with-corba-src-zip=${srcdir}/${_CORBA_CHANGESET}.tar.gz \
-        --with-jaxp-src-zip=${srcdir}/${_JAXP_CHANGESET}.tar.gz \
-        --with-jaxws-src-zip=${srcdir}/${_JAXWS_CHANGESET}.tar.gz \
-        --with-jdk-src-zip=${srcdir}/${_JDK_CHANGESET}.tar.gz \
-        --with-langtools-src-zip=${srcdir}/${_LANGTOOLS_CHANGESET}.tar.gz \
+        --with-openjdk-src-zip=${srcdir}/openjdk-${_OPENJDK_CHANGESET}.tar.gz \
+        --with-hotspot-src-zip=${srcdir}/hotspot-${_HOTSPOT_CHANGESET}.tar.gz \
+        --with-corba-src-zip=${srcdir}/corba-${_CORBA_CHANGESET}.tar.gz \
+        --with-jaxp-src-zip=${srcdir}/jaxp-${_JAXP_CHANGESET}.tar.gz \
+        --with-jaxws-src-zip=${srcdir}/jaxws-${_JAXWS_CHANGESET}.tar.gz \
+        --with-jdk-src-zip=${srcdir}/jdk-${_JDK_CHANGESET}.tar.gz \
+        --with-langtools-src-zip=${srcdir}/langtools-${_LANGTOOLS_CHANGESET}.tar.gz \
         --enable-pulse-java \
         --enable-nss \
         --with-rhino \