Make jdk11-adoptopenjdk a transition package

6 files changed, 26 insertions, 199 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d6f2f97aa620..272d0105e395 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,54 +1,12 @@
 pkgbase = jdk11-adoptopenjdk
-	pkgdesc = OpenJDK Java 11 development kit (AdoptOpenJDK build)
-	pkgver = 11.0.13.u8
+	pkgdesc = DEPRECATED: Transition package. Please use jdk11-temurin instead.
+	pkgver = 11
 	pkgrel = 1
-	url = https://adoptopenjdk.net/
+	epoch = 1
+	url = https://adoptopenjdk.net
 	install = install_jdk11-adoptopenjdk.sh
-	arch = x86_64
-	license = custom
-	depends = java-runtime-common>=3
-	depends = ca-certificates-utils
-	depends = desktop-file-utils
-	depends = libxrender
-	depends = libxtst
-	depends = alsa-lib
-	optdepends = gtk2: for the Gtk+ 2 look and feel
-	optdepends = gtk3: for the Gtk+ 3 look and feel
-	provides = java-runtime-headless=11
-	provides = java-runtime-headless-openjdk=11
-	provides = jre11-openjdk-headless=11.0.13.u8
-	provides = jre-openjdk-headless=11.0.13.u8
-	provides = java-runtime=11
-	provides = java-runtime-openjdk=11
-	provides = jre11-openjdk=11.0.13.u8
-	provides = jre-openjdk=11.0.13.u8
-	provides = java-environment=11
-	provides = java-environment-openjdk=11
-	provides = jdk11-openjdk=11.0.13.u8
-	provides = jdk-openjdk=11.0.13.u8
-	provides = openjdk11-src=11.0.13.u8
-	provides = openjdk-src=11.0.13.u8
-	backup = etc/jdk11-adoptopenjdk/net.properties
-	backup = etc/jdk11-adoptopenjdk/logging.properties
-	backup = etc/jdk11-adoptopenjdk/security/java.security
-	backup = etc/jdk11-adoptopenjdk/security/policy/limited/exempt_local.policy
-	backup = etc/jdk11-adoptopenjdk/security/policy/limited/default_US_export.policy
-	backup = etc/jdk11-adoptopenjdk/security/policy/limited/default_local.policy
-	backup = etc/jdk11-adoptopenjdk/security/policy/unlimited/default_US_export.policy
-	backup = etc/jdk11-adoptopenjdk/security/policy/unlimited/default_local.policy
-	backup = etc/jdk11-adoptopenjdk/security/policy/README.txt
-	backup = etc/jdk11-adoptopenjdk/security/java.policy
-	backup = etc/jdk11-adoptopenjdk/management/management.properties
-	backup = etc/jdk11-adoptopenjdk/management/jmxremote.access
-	backup = etc/jdk11-adoptopenjdk/management/jmxremote.password.template
-	backup = etc/jdk11-adoptopenjdk/sound.properties
-	source = https://github.com/adoptium/temurin11-binaries/releases/download/jdk-11.0.13%2B8/OpenJDK11U-jdk_x64_linux_hotspot_11.0.13_8.tar.gz
-	source = freedesktop-java.desktop
-	source = freedesktop-jconsole.desktop
-	source = freedesktop-jshell.desktop
-	sha256sums = 3b1c0c34be4c894e64135a454f2d5aaa4bd10aea04ec2fa0c0efe6bb26528e30
-	sha256sums = 734aab5e8fca5360fd996142a0c0ff23434da56f83c21b26cfbcbf31556230eb
-	sha256sums = 53b7da18785675438d1d7cfa776be419a313c11049c48f791c7426224fe51025
-	sha256sums = bc4305c5870fa8e050c0a2cbc629a8f84e366200b436429c789038596a4259f6
+	arch = any
+	license = Unlicense
+	depends = jdk11-temurin
 
 pkgname = jdk11-adoptopenjdk
diff --git a/PKGBUILD b/PKGBUILD
index 4b6e038c7951..ca6069f50154 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,106 +1,22 @@
 # Maintainer: Michael Lass <bevan@bi-co.net>
 
-# This PKGBUILD heavily borrows from java-openjdk in [extra] maintained by:
-# Levente Polyak <anthraxx[at]archlinux[dot]org>
-# Guillaume ALAUX <guillaume@archlinux.org>
-
 # This PKGBUILD is maintained on github:
 # https://github.com/michaellass/AUR
 
-_majorver=11
-_minorver=0
-_securityver=13
-_updatever=8
+epoch=1
+pkgver=11
 pkgrel=1
-pkgver=${_majorver}.${_minorver}.${_securityver}.u${_updatever}
-_tag_ver=${_majorver}.${_minorver}.${_securityver}+${_updatever}
-_tag_ver_short=${_majorver}.${_minorver}.${_securityver}+${_updatever%.*}
 
 pkgname=jdk11-adoptopenjdk
-pkgdesc="OpenJDK Java ${_majorver} development kit (AdoptOpenJDK build)"
-arch=('x86_64')
-url='https://adoptopenjdk.net/'
-license=('custom')
+pkgdesc="DEPRECATED: Transition package. Please use jdk11-temurin instead."
+arch=('any')
+url='https://adoptopenjdk.net'
+license=('Unlicense')
 
-depends=('java-runtime-common>=3' 'ca-certificates-utils' 'desktop-file-utils' 'libxrender' 'libxtst' 'alsa-lib')
-optdepends=('gtk2: for the Gtk+ 2 look and feel'
-            'gtk3: for the Gtk+ 3 look and feel')
-provides=("java-runtime-headless=${_majorver}"
-          "java-runtime-headless-openjdk=${_majorver}"
-          "jre${_majorver}-openjdk-headless=${pkgver}"
-          "jre-openjdk-headless=${pkgver}"
-          "java-runtime=${_majorver}"
-          "java-runtime-openjdk=${_majorver}"
-          "jre${_majorver}-openjdk=${pkgver}"
-          "jre-openjdk=${pkgver}"
-          "java-environment=${_majorver}"
-          "java-environment-openjdk=${_majorver}"
-          "jdk${_majorver}-openjdk=${pkgver}"
-          "jdk-openjdk=${pkgver}"
-          "openjdk${_majorver}-src=${pkgver}"
-          "openjdk-src=${pkgver}")
-backup=(etc/${pkgname}/net.properties
-        etc/${pkgname}/logging.properties
-        etc/${pkgname}/security/java.security
-        etc/${pkgname}/security/policy/limited/exempt_local.policy
-        etc/${pkgname}/security/policy/limited/default_US_export.policy
-        etc/${pkgname}/security/policy/limited/default_local.policy
-        etc/${pkgname}/security/policy/unlimited/default_US_export.policy
-        etc/${pkgname}/security/policy/unlimited/default_local.policy
-        etc/${pkgname}/security/policy/README.txt
-        etc/${pkgname}/security/java.policy
-        etc/${pkgname}/management/management.properties
-        etc/${pkgname}/management/jmxremote.access
-        etc/${pkgname}/management/jmxremote.password.template
-        etc/${pkgname}/sound.properties)
+depends=('jdk11-temurin')
 install=install_jdk11-adoptopenjdk.sh
 
-source=(https://github.com/adoptium/temurin${_majorver}-binaries/releases/download/jdk-${_tag_ver/+/%2B}/OpenJDK${_majorver}U-jdk_x64_linux_hotspot_${_tag_ver_short/+/_}.tar.gz
-        freedesktop-java.desktop
-        freedesktop-jconsole.desktop
-        freedesktop-jshell.desktop)
-
-
-_jvmdir=/usr/lib/jvm/java-${_majorver}-adoptopenjdk
-_jdkdir=jdk-${_tag_ver_short}
-
 package() {
-
-  install -dm 755 "${pkgdir}${_jvmdir}"
-  cp -a "${srcdir}/${_jdkdir}"/* "${pkgdir}${_jvmdir}"
-
-  cd "${pkgdir}${_jvmdir}"
-
-  # Conf
-  install -dm 755 "${pkgdir}/etc"
-  mv conf "${pkgdir}/etc/${pkgname}"
-  ln -sf /etc/${pkgname} conf
-
-  # Legal
-  install -dm 755 "${pkgdir}/usr/share/licenses"
-  mv legal "${pkgdir}/usr/share/licenses/${pkgname}"
-  ln -sf /usr/share/licenses/${pkgname} legal
-
-  # Man pages
-  for f in man/man1/* man/ja/man1/* man/ja_JP.UTF-8/man1/*; do
-    install -Dm 644 "${f}" "${pkgdir}/usr/share/${f/\.1/-adoptopenjdk${_majorver}.1}"
-  done
-  rm -rf man
-  ln -sf /usr/share/man man
-
-  # Link JKS keystore from ca-certificates-utils
-  rm -f lib/security/cacerts
-  ln -sf /etc/ssl/certs/java/cacerts lib/security/cacerts
-
-  # Desktop files
-  for f in jconsole java jshell; do
-    install -Dm 644 \
-      "${srcdir}/freedesktop-${f}.desktop" \
-      "${pkgdir}/usr/share/applications/${f}-${pkgname}.desktop"
-  done
-
+    install -dm 755 ${pkgdir}/usr/lib/jvm
+    ln -sf /usr/lib/jvm/java-${pkgver}-temurin ${pkgdir}/usr/lib/jvm/java-${pkgver}-adoptopenjdk
 }
-sha256sums=('3b1c0c34be4c894e64135a454f2d5aaa4bd10aea04ec2fa0c0efe6bb26528e30'
-            '734aab5e8fca5360fd996142a0c0ff23434da56f83c21b26cfbcbf31556230eb'
-            '53b7da18785675438d1d7cfa776be419a313c11049c48f791c7426224fe51025'
-            'bc4305c5870fa8e050c0a2cbc629a8f84e366200b436429c789038596a4259f6')
diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop
deleted file mode 100644
index 337bb9658c4e..000000000000
--- a/freedesktop-java.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=AdoptOpenJDK Java 11 Runtime
-Comment=AdoptOpenJDK Java 11 Runtime
-Keywords=java;runtime
-Exec=/usr/lib/jvm/java-11-adoptopenjdk/bin/java -jar
-Terminal=false
-Type=Application
-MimeType=application/x-java-archive;application/java-archive;application/x-jar;
-NoDisplay=true
diff --git a/freedesktop-jconsole.desktop b/freedesktop-jconsole.desktop
deleted file mode 100644
index a42acf6fb6f7..000000000000
--- a/freedesktop-jconsole.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=AdoptOpenJDK Java 11 Console
-Comment=AdoptOpenJDK Java 11 Monitoring & Management Console
-Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-11-adoptopenjdk/bin/jconsole
-Terminal=false
-Type=Application
-Categories=Application;System;
diff --git a/freedesktop-jshell.desktop b/freedesktop-jshell.desktop
deleted file mode 100644
index f0f91bf4f0b2..000000000000
--- a/freedesktop-jshell.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=AdoptOpenJDK Java 11 Shell
-Comment=AdoptOpenJDK Java 11 Shell
-Keywords=java;shell
-Exec=/usr/lib/jvm/java-11-adoptopenjdk/bin/jshell
-Terminal=true
-Type=Application
-Categories=Application;System;
diff --git a/install_jdk11-adoptopenjdk.sh b/install_jdk11-adoptopenjdk.sh
index eaf25f39354c..f2ec81bf629f 100644
--- a/install_jdk11-adoptopenjdk.sh
+++ b/install_jdk11-adoptopenjdk.sh
@@ -1,5 +1,3 @@
-THIS_JDK='java-11-adoptopenjdk'
-
 fix_default() {
   if [ ! -x /usr/bin/java ]; then
     /usr/bin/archlinux-java unset
@@ -10,41 +8,21 @@ fix_default() {
 }
 
 post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "")
-      /usr/bin/archlinux-java set ${THIS_JDK}
-      ;;
-    ${THIS_JDK})
-      # Nothing
-      ;;
-    *)
-      echo "Default Java environment is already set to '${default}'"
-      echo "See 'archlinux-java help' to change it"
-      ;;
-  esac
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
+  echo
+  echo "WARNING: jdk11-adoptopenjdk has been replaced by jdk11-temurin!"
+  echo "         Please uninstall this package."
+  echo
 }
 
 post_upgrade() {
-  default=$(fix_default)
-  if [ -z "${default}" ]; then
-    /usr/bin/archlinux-java set ${THIS_JDK}
-  fi
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
+  post_install
 }
 
 pre_remove() {
-  if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
-    # Check JRE is still available
-    if [ -x /usr/lib/jvm/${THIS_JDK}/bin/java ]; then
-      /usr/bin/archlinux-java unset
-    fi
+  if [ "x$(fix_default)" = "xjava-11-temurin" ]; then
+    # java-11-temurin might be accessed through java-11-adoptopenjdk.
+    # Explicitly set java-11-temurin as default.
+    /usr/bin/archlinux-java unset
+    /usr/bin/archlinux-java set java-11-temurin
   fi
 }