From 3ae8ad310c9236bbb06389c6eea59ac0bbf6ed10 Mon Sep 17 00:00:00 2001
From: Enno Boland <g@s01.de>
Date: Wed, 16 Jul 2014 21:04:16 +0200
Subject: [PATCH] oracle-jdk: update to 8u6

---
 srcpkgs/oracle-jdk/template     | 29 ++++++-----
 srcpkgs/oracle-jdk/template.foo | 91 +++++++++++++++++++++++++++++++++
 2 files changed, 108 insertions(+), 12 deletions(-)
 create mode 100644 srcpkgs/oracle-jdk/template.foo

diff --git a/srcpkgs/oracle-jdk/template b/srcpkgs/oracle-jdk/template
index 6f94632a8a1..7d510f06d99 100644
--- a/srcpkgs/oracle-jdk/template
+++ b/srcpkgs/oracle-jdk/template
@@ -1,8 +1,10 @@
 # Template file for 'oracle-jdk'
 pkgname=oracle-jdk
-version=8u5
-_longVersion=1.8.0_05
-revision=4
+version=8u6
+_longVersion=1.8.0_06
+revision=1
+_build=23
+
 short_desc="Java Development Kit (JDK)"
 maintainer="Enno Boland <eb@s01.de>"
 homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
@@ -20,33 +22,36 @@ case "${XBPS_TARGET_MACHINE}" in
 x86_64)
 	_arch=amd64
 	_filename=jdk-${version}-linux-x64.tar.gz
-	checksum="44901389e9fb118971534ad0f58558ba8c43f315b369117135bd6617ae631edc"
+	checksum="f3593b248b64cc53bf191f45b92a1f10e8c5099c2f84bd5bd5d6465dfd07a8e9"
 	;;
 i686)
 	_arch=i386
 	_filename=jdk-${version}-linux-i586.tar.gz
-	checksum="779f83efb8dc9ce7c1143ba9bbd38fa2d8a1c49dcb61f7d36972d37d109c5fc9"
+	checksum="3981e6fb7d35b20ac3c05ec56fb3798ac1cd872a9e968bb3d77a718af7b146d1"
 	;;
 armv*)
 	_arch=arm
 	_filename=jdk-${version}-linux-arm-vfp-hflt.tar.gz
-	checksum="54e04ccf8383fb631b0c4a355e9136a05e53690b5caca52ef7581ae67e686179"
+	checksum="348252453db819a4cda146753b54b86ebd32191e47ff9f9be671e88aaf919d7c"
 	;;
 esac
 
-distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b13/${_filename}"
+distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b${_build}/${_filename}"
 wrksrc="jdk$_longVersion"
 
 do_fetch() {
-	local path="${XBPS_SRCDISTDIR}/${pkgname}-${version}/$_filename"
-	mkdir -p "${XBPS_SRCDISTDIR}/${pkgname}-${version}" "${XBPS_BUILDDIR}/${pkgname}-${version}"
+	mkdir -p $wrksrc
+	cd $wrksrc
 	wget \
 		--header "Cookie: oraclelicense=accept-securebackup-cookie" \
 		--progress=bar:force \
-		-c -O $path \
+		-c -O $_filename \
 		$distfiles
-	mkdir -p $wrksrc
-	echo "$checksum  $path" | sha256sum -c || { sha256sum "$path"; return 1; }
+	echo "$checksum  $_filename" | sha256sum -c || { sha256sum "$_filename"; return 1; }
+}
+
+do_extract() {
+	tar xf $_filename -C ..
 }
 
 do_build() {
diff --git a/srcpkgs/oracle-jdk/template.foo b/srcpkgs/oracle-jdk/template.foo
new file mode 100644
index 00000000000..7354fb44ae3
--- /dev/null
+++ b/srcpkgs/oracle-jdk/template.foo
@@ -0,0 +1,91 @@
+# Template file for 'oracle-jdk'
+pkgname=oracle-jdk
+version=8u5
+_longVersion=1.8.0_05
+revision=4
+short_desc="Java Development Kit (JDK)"
+maintainer="Enno Boland <eb@s01.de>"
+homepage="http://www.oracle.com/technetwork/java/javase/downloads/index.html"
+license="oracle"
+lib32disabled=yes
+nonfree=yes
+only_for_archs="i686 x86_64 armv6l armv7l"
+depends="hicolor-icon-theme desktop-file-utils xdg-utils shared-mime-info wget"
+hostmakedepends="wget"
+provides="java-runtime-${version}_1 oracle-jre-${version}_${revision}"
+conflicts="oracle-jre>=0"
+replaces="java-runtime>=0 oracle-jre>=0"
+
+case "${XBPS_TARGET_MACHINE}" in
+x86_64)
+	_arch=amd64
+	_filename=jdk-${version}-linux-x64.tar.gz
+	checksum="44901389e9fb118971534ad0f58558ba8c43f315b369117135bd6617ae631edc"
+	;;
+i686)
+	_arch=i386
+	_filename=jdk-${version}-linux-i586.tar.gz
+	checksum="779f83efb8dc9ce7c1143ba9bbd38fa2d8a1c49dcb61f7d36972d37d109c5fc9"
+	;;
+armv*)
+	_arch=arm
+	_filename=jdk-${version}-linux-arm-vfp-hflt.tar.gz
+	checksum="54e04ccf8383fb631b0c4a355e9136a05e53690b5caca52ef7581ae67e686179"
+	;;
+esac
+
+distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b13/${_filename}"
+wrksrc="jdk$_longVersion"
+
+do_fetch() {
+	mkdir -p "$wrksrc"
+	cd "$wrksrc"
+	wget \
+		--header "Cookie: oraclelicense=accept-securebackup-cookie" \
+		--progress=bar:force \
+		-c -O $_filename \
+		$distfiles
+	echo "$checksum  $_filename" | sha256sum -c || { sha256sum "$_filename"; return 1; }
+
+}
+
+do_extract() {
+	tar xf "$_filename" -C ..
+}
+
+do_build() {
+	sed \
+		-e "s|%LONG_VERSION%|${_longVersion}|" \
+			${FILESDIR}/oracle-jdk.sh.in > oracle-jdk.sh
+	sed \
+		-e "s|%LONG_VERSION%|${_longVersion}|" \
+		-e "s|%ORACLE_JDK_URL%|${distfiles}|" \
+		-e "s|%ORACLE_JDK_CHECKSUM%|${checksum}|" \
+			${FILESDIR}/oracle-jdk-vars.sh.in > oracle-jdk-vars.sh
+	sed \
+		-e "s|^Exec=|Exec=/usr/share/java/$pkgname/bin/policytool|" \
+			${FILESDIR}/java-policy-settings.desktop.in > java-policy-settings.desktop
+}
+
+do_install() {
+	vmkdir "usr/share/licenses/${pkgname}"
+	vmkdir "usr/share/java/$pkgname/jre"
+	vinstall oracle-jdk-vars.sh 644 "usr/share/java"
+
+	vlicense LICENSE
+	vinstall java-policy-settings.desktop 644 usr/share/applications
+
+	ln -sr $DESTDIR/usr/share/java/$pkgname/jre $DESTDIR/usr/share/java/oracle-jre
+
+	for i in 16 20 22 24 32 40 48 64 72 96 128 256 512; do
+		vinstall $FILESDIR/oracle-jdk-${i}x${i}.png 644 usr/share/icons/hicolor/${i}x${i}/apps oracle-java.png
+	done
+
+	vmkdir "usr/lib/mozilla/plugins"
+	ln -srf ${DESTDIR}/usr/share/java/oracle-jre/lib/${_arch}/libnpjp2.so \
+		${DESTDIR}/usr/lib/mozilla/plugins
+
+
+	vmkdir "etc/profile.d"
+	vinstall oracle-jdk.sh 644 "etc/profile.d"
+}