Make jdk-adoptopenjdk a transition package

6 files changed, 26 insertions, 199 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cbba1ef4f516..f0d1ae46e3fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,55 +1,12 @@
 pkgbase = jdk-adoptopenjdk
-	pkgdesc = Temurin (OpenJDK 17 Java binaries by Adoptium, formerly AdoptOpenJDK)
-	pkgver = 17.0.1.u12
+	pkgdesc = DEPRECATED: Transition package. Please use jdk-temurin instead.
+	pkgver = 17
 	pkgrel = 1
-	url = https://adoptium.net/
+	epoch = 1
+	url = https://adoptopenjdk.net
 	install = install_jdk-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=17
-	provides = java-runtime-headless-openjdk=17
-	provides = jre17-openjdk-headless=17.0.1.u12
-	provides = jre-openjdk-headless=17.0.1.u12
-	provides = java-runtime=17
-	provides = java-runtime-openjdk=17
-	provides = jre17-openjdk=17.0.1.u12
-	provides = jre-openjdk=17.0.1.u12
-	provides = java-environment=17
-	provides = java-environment-openjdk=17
-	provides = jdk17-openjdk=17.0.1.u12
-	provides = jdk-openjdk=17.0.1.u12
-	provides = openjdk17-src=17.0.1.u12
-	provides = openjdk-src=17.0.1.u12
-	backup = etc/jdk-adoptopenjdk/logging.properties
-	backup = etc/jdk-adoptopenjdk/management/jmxremote.access
-	backup = etc/jdk-adoptopenjdk/management/jmxremote.password.template
-	backup = etc/jdk-adoptopenjdk/management/management.properties
-	backup = etc/jdk-adoptopenjdk/net.properties
-	backup = etc/jdk-adoptopenjdk/sdp/sdp.conf.template
-	backup = etc/jdk-adoptopenjdk/security/java.policy
-	backup = etc/jdk-adoptopenjdk/security/java.security
-	backup = etc/jdk-adoptopenjdk/security/policy/limited/default_local.policy
-	backup = etc/jdk-adoptopenjdk/security/policy/limited/default_US_export.policy
-	backup = etc/jdk-adoptopenjdk/security/policy/limited/exempt_local.policy
-	backup = etc/jdk-adoptopenjdk/security/policy/README.txt
-	backup = etc/jdk-adoptopenjdk/security/policy/unlimited/default_local.policy
-	backup = etc/jdk-adoptopenjdk/security/policy/unlimited/default_US_export.policy
-	backup = etc/jdk-adoptopenjdk/sound.properties
-	source = https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz
-	source = freedesktop-java.desktop
-	source = freedesktop-jconsole.desktop
-	source = freedesktop-jshell.desktop
-	sha256sums = 6ea18c276dcbb8522feeebcfc3a4b5cb7c7e7368ba8590d3326c6c3efc5448b6
-	sha256sums = f1e1a1d78c8696b79a7b12c31fcff519913bb52cb88c71997e5bf88444307be2
-	sha256sums = 245ef426db05c256fc1cc5e94293fc5538227bc322e4259eedf4a093e7dc7b5c
-	sha256sums = d0dec731c8964dd1e42da135602e4d42f803f569d3c3df69bac94ee71971ced3
+	arch = any
+	license = Unlicense
+	depends = jdk-temurin
 
 pkgname = jdk-adoptopenjdk
diff --git a/PKGBUILD b/PKGBUILD
index b683a8bfe885..fd2ddef4b418 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,105 +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=17
-_completever=17.0.1
-_updatever=12
+epoch=1
+pkgver=17
 pkgrel=1
-pkgver=${_completever}.u${_updatever}
-_tag_ver=${_completever}+${_updatever}
-[ $_majorver != $_completever ] && _versuffix=U
 
 pkgname=jdk-adoptopenjdk
-pkgdesc="Temurin (OpenJDK ${_majorver} Java binaries by Adoptium, formerly AdoptOpenJDK)"
-arch=('x86_64')
-url='https://adoptium.net/'
-license=('custom')
+pkgdesc="DEPRECATED: Transition package. Please use jdk-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}/logging.properties
-        etc/${pkgname}/management/jmxremote.access
-        etc/${pkgname}/management/jmxremote.password.template
-        etc/${pkgname}/management/management.properties
-        etc/${pkgname}/net.properties
-        etc/${pkgname}/sdp/sdp.conf.template
-        etc/${pkgname}/security/java.policy
-        etc/${pkgname}/security/java.security
-        etc/${pkgname}/security/policy/limited/default_local.policy
-        etc/${pkgname}/security/policy/limited/default_US_export.policy
-        etc/${pkgname}/security/policy/limited/exempt_local.policy
-        etc/${pkgname}/security/policy/README.txt
-        etc/${pkgname}/security/policy/unlimited/default_local.policy
-        etc/${pkgname}/security/policy/unlimited/default_US_export.policy
-        etc/${pkgname}/sound.properties)
+depends=('jdk-temurin')
 install=install_jdk-adoptopenjdk.sh
 
-source=(https://github.com/adoptium/temurin${_majorver}-binaries/releases/download/jdk-${_tag_ver/+/%2B}/OpenJDK${_majorver}${_versuffix}-jdk_x64_linux_hotspot_${_tag_ver/+/_}.tar.gz
-        freedesktop-java.desktop
-        freedesktop-jconsole.desktop
-        freedesktop-jshell.desktop)
-sha256sums=('6ea18c276dcbb8522feeebcfc3a4b5cb7c7e7368ba8590d3326c6c3efc5448b6'
-            'f1e1a1d78c8696b79a7b12c31fcff519913bb52cb88c71997e5bf88444307be2'
-            '245ef426db05c256fc1cc5e94293fc5538227bc322e4259eedf4a093e7dc7b5c'
-            'd0dec731c8964dd1e42da135602e4d42f803f569d3c3df69bac94ee71971ced3')
-
-_jvmdir=/usr/lib/jvm/java-${_majorver}-adoptopenjdk
-_jdkdir=jdk-${_tag_ver}
-
 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/*; 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
 }
diff --git a/freedesktop-java.desktop b/freedesktop-java.desktop
deleted file mode 100644
index 9ab2025d912a..000000000000
--- a/freedesktop-java.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=AdoptOpenJDK Java 17 Runtime
-Comment=AdoptOpenJDK Java 17 Runtime
-Keywords=java;runtime
-Exec=/usr/lib/jvm/java-17-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 b6a2e51f941a..000000000000
--- a/freedesktop-jconsole.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=AdoptOpenJDK Java 17 Console
-Comment=AdoptOpenJDK Java 17 Monitoring & Management Console
-Keywords=java;console;monitoring
-Exec=/usr/lib/jvm/java-17-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 cf065265029c..000000000000
--- a/freedesktop-jshell.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=AdoptOpenJDK Java 17 Shell
-Comment=AdoptOpenJDK Java 17 Shell
-Keywords=java;shell
-Exec=/usr/lib/jvm/java-17-adoptopenjdk/bin/jshell
-Terminal=true
-Type=Application
-Categories=Application;System;
diff --git a/install_jdk-adoptopenjdk.sh b/install_jdk-adoptopenjdk.sh
index be258a041739..2b2619cc7076 100644
--- a/install_jdk-adoptopenjdk.sh
+++ b/install_jdk-adoptopenjdk.sh
@@ -1,5 +1,3 @@
-THIS_JDK='java-17-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: jdk-adoptopenjdk has been replaced by jdk-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-17-temurin" ]; then
+    # java-17-temurin might be accessed through java-17-adoptopenjdk.
+    # Explicitly set java-17-temurin as default.
+    /usr/bin/archlinux-java unset
+    /usr/bin/archlinux-java set java-17-temurin
   fi
 }