Renamed the icedtea directory into openjdk and fixed the PKGBUILD.

Now the package is named just "openjdk". This should hopefully make for easier replacements with newer major releases of OpenJDK.

openjdk/PKGBUILD

@@ -1,11 +1,12 @@
 # Maintainer: Daniele Cocca <jmc@chakra-project.org>
 
-pkgname=('openjdk7' 'openjdk7-src')
-pkgbase='openjdk7'
+pkgname=('openjdk' 'openjdk-src')
+pkgbase='openjdk'
 _icedtea_release="2.2.1"
+_icedtea_jdkver="7"
 _pkgver="7u5"
 pkgver="${_pkgver}_${_icedtea_release}"
-pkgrel=2
+pkgrel=1
 pkgdesc="An open-source implementation of the seventh edition of the Java SE Platform."
 arch=('i686' 'x86_64')
 url="http://icedtea.classpath.org/"
@@ -24,7 +25,7 @@ _jaxws_changeset="5471e01ef43b"
 _jdk_changeset="6c3b742b735d"
 _langtools_changeset="beea46c7086b"
 _openjdk_changeset="0b776ef59474"
-_jvmdir="/usr/lib/jvm/java-7-openjdk"
+_jvmdir="/usr/lib/jvm/java-${_icedtea_jdkver}-openjdk"
 
 source=("http://icedtea.classpath.org/download/source/icedtea-${_icedtea_release}.tar.gz"
         "${_hg_url}/archive/${_openjdk_changeset}.tar.gz"
@@ -39,8 +40,8 @@ source=("http://icedtea.classpath.org/download/source/icedtea-${_icedtea_release
         'archlinux-fix_corba_cmds_path.diff'
         'archlinux-openjdk7_fix_jdk_cmds_path.diff'
         'archlinux-openjdk7_nonreparenting-wm.diff'
-        'openjdk7.profile.sh'
-        'openjdk7.profile.csh')
+        'openjdk.profile.sh'
+        'openjdk.profile.csh')
 sha256sums=('0f5ba163904f7c50374ab345216dd1b66c077fc431592eb3d4801f7ecda200b6'
             '15a6eab62f5108efbf7937b1de7697bd789971886fc1fc08ee8199e16a5c10fe'
             'b892b0db6f3e4f89fd480d46ecb7c9ce5c71a884ae5bfe953b4bda9eedf7ea93'
@@ -77,7 +78,7 @@ build() {
 
   cd "${srcdir}/build"
 
-  [ -f /etc/profile.d/openjdk7.sh ]   && source /etc/profile.d/openjdk7.sh
+  [ -f /etc/profile.d/openjdk.sh ]    && source /etc/profile.d/openjdk.sh
   [ -f /etc/profile.d/apache-ant.sh ] && source /etc/profile.d/apache-ant.sh
 
   # Preserve the value of JAVA_HOME before unsetting it from the environment
@@ -124,12 +125,12 @@ build() {
   make
 }
 
-package_openjdk7() {
+package_openjdk() {
 pkgdesc="An open-source implementation of the seventh edition of the Java SE Platform."
-install="openjdk7.install"
-conflicts=('java-environment' 'java-runtime')
-provides=('java-environment=7' 'java-runtime=7')
-replaces=('openjdk6')
+install="openjdk.install"
+conflicts=('java-environment' 'java-runtime' 'openjdk6' 'openjdk7')
+provides=("java-environment=${_icedtea_jdkver}" "java-runtime=${_icedtea_jdkver}")
+replaces=('openjdk6' 'openjdk7')
 depends=('alsa-lib' 'libpulse' 'giflib' 'libjpeg' 'libpng' 'freetype2'
          'libpulse>=0.9.11' 'ca-certificates-java')
 optdepends=('icedtea-web: web browser plugin and Java Web Start support'
@@ -142,7 +143,7 @@ optdepends=('icedtea-web: web browser plugin and Java Web Start support'
   cp -r "openjdk.build/j2sdk-image" \
         "${pkgdir}/${_jvmdir#/}"
 
-  # Remove the .zip file which is going to be inside openjdk7-src
+  # Remove the .zip file which is going to be inside openjdk-src
   rm "${pkgdir}/${_jvmdir#/}/src.zip"
 
   # Symlink the binaries into /usr/bin
@@ -166,24 +167,30 @@ optdepends=('icedtea-web: web browser plugin and Java Web Start support'
         "${pkgdir}/${_jvmdir#/}/jre/lib/security/cacerts"
 
   # Setup the shell profile dropin configuration
-  install -D -m755 "${srcdir}/openjdk7.profile.sh" \
-                   "${pkgdir}/etc/profile.d/openjdk7.sh"
-  install -D -m755 "${srcdir}/openjdk7.profile.csh" \
-                   "${pkgdir}/etc/profile.d/openjdk7.csh"
+  install -D -m755 "${srcdir}/openjdk.profile.sh" \
+                   "${pkgdir}/etc/profile.d/openjdk.sh"
+  install -D -m755 "${srcdir}/openjdk.profile.csh" \
+                   "${pkgdir}/etc/profile.d/openjdk.csh"
 
   # Install the license file
   install -D -m644 "openjdk/LICENSE" \
                    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
-package_openjdk7-src() {
+package_openjdk-src() {
 pkgdesc="An open-source implementation of the seventh edition of the Java SE Platform. (Source package)"
 arch=('any')
-depends=('openjdk7')
+depends=("openjdk=${pkgver}")
 
   cd "${srcdir}/build"
+
+  # Install the source package
   install -D -m644 "openjdk.build/j2sdk-image/src.zip" \
                    "${pkgdir}/${_jvmdir#/}/src.zip"
+
+  # Install the license file
+  install -D -m644 "openjdk/LICENSE" \
+                   "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
 # vim:set ts=2 sw=2 et: