From f251eefefa718416b0511adbf8daebdc3ae86c9b Mon Sep 17 00:00:00 2001
From: Tim Biermann <tbier@posteo.de>
Date: Fri, 21 May 2021 12:40:38 +0000
Subject: [PATCH] kotlin: 1.4.32 -> 1.5.0

---
 kotlin/.footprint | 3 ---
 kotlin/Pkgfile    | 7 +++----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/kotlin/.footprint b/kotlin/.footprint
index 4af3471..b02941e 100644
--- a/kotlin/.footprint
+++ b/kotlin/.footprint
@@ -20,13 +20,10 @@ drwxr-xr-x	root/root	usr/share/kotlin/lib/
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-annotation-processing-cli.jar
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-annotation-processing-runtime.jar
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-annotation-processing.jar
--rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-annotations-android.jar
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-annotations-jvm-sources.jar
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-annotations-jvm.jar
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-ant.jar
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-compiler.jar
--rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-coroutines-experimental-compat-sources.jar
--rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-coroutines-experimental-compat.jar
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-daemon-client.jar
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-daemon.jar
 -rw-r--r--	root/root	usr/share/kotlin/lib/kotlin-imports-dumper-compiler-plugin.jar
diff --git a/kotlin/Pkgfile b/kotlin/Pkgfile
index 0cb1a66..2207d9a 100644
--- a/kotlin/Pkgfile
+++ b/kotlin/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: openjdk8 openjdk9-jdk setconf python maven
 
 name=kotlin
-version=1.4.32
+version=1.5.0
 #version=1.4.20-M2
 release=1
 source=(https://github.com/JetBrains/kotlin/archive/v$version/$name-$version.tar.gz
@@ -13,13 +13,12 @@ source=(https://github.com/JetBrains/kotlin/archive/v$version/$name-$version.tar
 build() {
   cd $name-$version
   unset JAVA_HOME
-  export JAVA_HOME=/usr/lib/java/openjdk8/
-  export PATH="${JAVA_HOME}:$PATH"
+  export JAVA_HOME=/usr/lib/java/openjdk8
   export JDK_16=$JAVA_HOME
   export JDK_17=$JAVA_HOME
   export JDK_18=$JAVA_HOME
   export JDK_9=/usr/lib/java/openjdk9-jdk
-  export PATH="$JAVA_HOME/bin:$PATH"
+  export PATH="${JAVA_HOME}/bin:$PATH"
   # this doesn't work
   #ln -sf ../gradle.properties .