Thu Jul 17 03:55:04 UTC 2014

1 files changed, 33 insertions, 33 deletions

diff --git a/extra/java7-openjdk/PKGBUILD b/extra/java7-openjdk/PKGBUILD
index 9567ab032..30a2ccdf9 100644
--- a/extra/java7-openjdk/PKGBUILD
+++ b/extra/java7-openjdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 216747 2014-07-09 15:41:00Z guillaume $
+# $Id: PKGBUILD 216927 2014-07-16 12:41:52Z guillaume $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Guillaume ALAUX <guillaume@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
@@ -6,10 +6,10 @@
 pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
 pkgbase=java7-openjdk
 _java_ver=7
-_icedtea_ver=2.5.0
+_icedtea_ver=2.5.1
 
 # check "${srcdir}/icedtea-${_icedtea_ver}"/Makefile.am
-_JDK_UPDATE_VERSION=60
+_JDK_UPDATE_VERSION=65
 
 _bootstrap=0 # 0/1 for quick build or full bootstrap
 
@@ -25,15 +25,15 @@ makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
              'eclipse-ecj')
 
 _icedtea_url=http://icedtea.classpath.org/download
-_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver:0:3}
+_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver}
 source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
-        ${_drops_url}/openjdk.tar.bz2
-        ${_drops_url}/corba.tar.bz2
-        ${_drops_url}/jaxp.tar.bz2
-        ${_drops_url}/jaxws.tar.bz2
-        ${_drops_url}/jdk.tar.bz2
-        ${_drops_url}/langtools.tar.bz2
-        ${_drops_url}/hotspot.tar.bz2
+        icedtea_${_icedtea_ver}_openjdk.tar.bz2::${_drops_url}/openjdk.tar.bz2
+        icedtea_${_icedtea_ver}_corba.tar.bz2::${_drops_url}/corba.tar.bz2
+        icedtea_${_icedtea_ver}_jaxp.tar.bz2::${_drops_url}/jaxp.tar.bz2
+        icedtea_${_icedtea_ver}_jaxws.tar.bz2::${_drops_url}/jaxws.tar.bz2
+        icedtea_${_icedtea_ver}_jdk.tar.bz2::${_drops_url}/jdk.tar.bz2
+        icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
+        icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
         fontconfig-paths.diff
         openjdk7_nonreparenting-wm.diff
         giflib_5.1.diff
@@ -42,14 +42,14 @@ source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
         jre7-openjdk.profile
         jre7-openjdk.profile.csh)
 
-sha256sums=('4e369e35dbf37a5fcc1a837861a74609bf907d3d0b9be7ac98d4f9c99dba7100'
-            '9a2f9486a48d51f84bdf9b9a52dc34fe90b886aa60ff5447b7f2502479065859'
-            '1f9f07f31ce8588cd3cd12465f94e142c852c380059a3dab9831d86d3f264253'
-            '59edb741e1b00243c040b399986960fad9e42f7e5dbe0a1e34798752b080c488'
-            'ed3803635ed25f58cd86ad8ca27585f77cc50385da0342112980cc6ba8ff6028'
-            '508b4e26704749172022c95f44c5aa9feb391e82b54a545fdb79f3a51c269f83'
-            '0eb9c19cfbecfbc6ef1e37f475d73f16469b9e1d969f69b1af4b10cbc2415659'
-            '645a43adaec3be3d3297479d134c02e444af9f0be33d35942f0ca863592fea26'
+sha256sums=('06483c252099d41e33eade8ceee9231a15ba1e9594f90e2d32943d17c8802acd'
+            '0496072760c521aa184f3c26c1f515a89ef6f9a88df14fa888c6ee6cdd9379b7'
+            'd476f22db32e028cc30dda47fec81e5ba0e113f029c3ed7a30edf8fc1404819b'
+            'd13778e5bbf6cda22a40b9d5186d2a7d1a3f34d998b1ac4d65fe3abd12fffa25'
+            '29c39856af1153620023c3fa0313be2f23dc02208db1a8429ca80d1eebfce06f'
+            '76194344fca5db4c79e4a2af28efd9fbb2e38e879b5afc59042874519bb5f7fc'
+            '374174ea3b7eb2bb81d9dfae4749d7b3c9037d07004aa59aaa5e8ed5fba922d3'
+            '78d57f7c207d8f56bba2ee6aec232a836fd51830d352cfa4804d8077d9a7b32b'
             '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
             '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b'
             '77fba3032edf6cce549cd4e174d9296684b20f4589dc59179fcc8cba7426a4e9'
@@ -58,13 +58,13 @@ sha256sums=('4e369e35dbf37a5fcc1a837861a74609bf907d3d0b9be7ac98d4f9c99dba7100'
             'b7c045b08ad55a9f79390c104fa846d0e7dbb49fccffb2fab2a3824b6b19c9c8'
             '89d99d8ac269ca66e2e279aff652d5aac938a35faec93cd8cff8f048052bd3ce')
 
-noextract=(openjdk.tar.gz
-           corba.tar.gz
-           jaxp.tar.gz
-           jaxws.tar.gz
-           jdk.tar.gz
-           langtools.tar.gz
-           hotspot.tar.gz)
+noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
+           icedtea_${_icedtea_ver}_corba.tar.bz2
+           icedtea_${_icedtea_ver}_jaxp.tar.bz2
+           icedtea_${_icedtea_ver}_jaxws.tar.bz2
+           icedtea_${_icedtea_ver}_jdk.tar.bz2
+           icedtea_${_icedtea_ver}_lanbtools.tar.bz2
+           icedtea_${_icedtea_ver}_hotspot.tar.bz2)
 
 [ "$CARCH" = "x86_64" ] && _JARCH=amd64
 [ "$CARCH" = "i686" ]   && _JARCH=i386
@@ -102,13 +102,13 @@ build() {
         --disable-downloading --disable-Werror \
         --with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \
         --with-jdk-home=${JAVA_HOME} \
-        --with-openjdk-src-zip="${srcdir}/openjdk.tar.bz2" \
-        --with-hotspot-src-zip="${srcdir}/hotspot.tar.bz2" \
-        --with-corba-src-zip="${srcdir}/corba.tar.bz2" \
-        --with-jaxp-src-zip="${srcdir}/jaxp.tar.bz2" \
-        --with-jaxws-src-zip="${srcdir}/jaxws.tar.bz2" \
-        --with-jdk-src-zip="${srcdir}/jdk.tar.bz2" \
-        --with-langtools-src-zip="${srcdir}/langtools.tar.bz2" \
+        --with-openjdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_openjdk.tar.bz2" \
+        --with-hotspot-src-zip="${srcdir}/icedtea_${_icedtea_ver}_hotspot.tar.bz2" \
+        --with-corba-src-zip="${srcdir}/icedtea_${_icedtea_ver}_corba.tar.bz2" \
+        --with-jaxp-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxp.tar.bz2" \
+        --with-jaxws-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxws.tar.bz2" \
+        --with-jdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jdk.tar.bz2" \
+        --with-langtools-src-zip="${srcdir}/icedtea_${_icedtea_ver}_langtools.tar.bz2" \
         --enable-nss \
         --with-rhino \
         --with-abs-install-dir=${_jvmdir} \