From 95b4f97f56da524aee12bde2fc45e39dca90e5a8 Mon Sep 17 00:00:00 2001
From: Enno Boland <gottox@voidlinux.eu>
Date: Wed, 18 Nov 2015 22:07:22 +0100
Subject: [PATCH] oracle-jre: fix broken alternatives.

---
 srcpkgs/oracle-jre/template | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/srcpkgs/oracle-jre/template b/srcpkgs/oracle-jre/template
index ae300e0eed8..8e0c9f79660 100644
--- a/srcpkgs/oracle-jre/template
+++ b/srcpkgs/oracle-jre/template
@@ -1,7 +1,7 @@
 # Template file for 'oracle-jre'
 pkgname=oracle-jre
 version=8u66
-revision=4
+revision=5
 
 _longVersion=1.8.0_66
 _build=17
@@ -31,21 +31,21 @@ i686)
 esac
 
 alternatives="
- java:/usr/bin/java:/usr/lib/jvm/oracle-jre/bin/java
- java:/usr/bin/javaws:/usr/lib/jvm/oracle-jre/bin/javaws
- java:/usr/bin/jcontrol:/usr/lib/jvm/oracle-jre/bin/jcontrol
- java:/usr/bin/jjs:/usr/lib/jvm/oracle-jre/bin/jjs
- java:/usr/bin/keytool:/usr/lib/jvm/oracle-jre/bin/keytool
- java:/usr/bin/orbd:/usr/lib/jvm/oracle-jre/bin/orbd
- java:/usr/bin/pack200:/usr/lib/jvm/oracle-jre/bin/pack200
- java:/usr/bin/policytool:/usr/lib/jvm/oracle-jre/bin/policytool
- java:/usr/bin/rmid:/usr/lib/jvm/oracle-jre/bin/rmid
- java:/usr/bin/rmiregistry:/usr/lib/jvm/oracle-jre/bin/rmiregistry
- java:/usr/bin/servertool:/usr/lib/jvm/oracle-jre/bin/servertool
- java:/usr/bin/tnameserv:/usr/lib/jvm/oracle-jre/bin/tnameserv
- java:/usr/bin/unpack200:/usr/lib/jvm/oracle-jre/bin/unpack200
+ java:/usr/bin/java:/usr/lib/jvm/jre${_longVersion}/bin/java
+ java:/usr/bin/javaws:/usr/lib/jvm/jre${_longVersion}/bin/javaws
+ java:/usr/bin/jcontrol:/usr/lib/jvm/jre${_longVersion}/bin/jcontrol
+ java:/usr/bin/jjs:/usr/lib/jvm/jre${_longVersion}/bin/jjs
+ java:/usr/bin/keytool:/usr/lib/jvm/jre${_longVersion}/bin/keytool
+ java:/usr/bin/orbd:/usr/lib/jvm/jre${_longVersion}/bin/orbd
+ java:/usr/bin/pack200:/usr/lib/jvm/jre${_longVersion}/bin/pack200
+ java:/usr/bin/policytool:/usr/lib/jvm/jre${_longVersion}/bin/policytool
+ java:/usr/bin/rmid:/usr/lib/jvm/jre${_longVersion}/bin/rmid
+ java:/usr/bin/rmiregistry:/usr/lib/jvm/jre${_longVersion}/bin/rmiregistry
+ java:/usr/bin/servertool:/usr/lib/jvm/jre${_longVersion}/bin/servertool
+ java:/usr/bin/tnameserv:/usr/lib/jvm/jre${_longVersion}/bin/tnameserv
+ java:/usr/bin/unpack200:/usr/lib/jvm/jre${_longVersion}/bin/unpack200
 
- java-plugin:/usr/lib/mozilla/plugins/libnpjp2.so:/usr/lib/jvm/oracle-jre/lib/$_arch/libnpjp2.so
+ java-plugin:/usr/lib/mozilla/plugins/libnpjp2.so:/usr/lib/jvm/jre${_longVersion}/lib/$_arch/libnpjp2.so
 "
 
 distfiles="http://download.oracle.com/otn-pub/java/jdk/${version}-b${_build}/${_filename}"