[arch-commits] Commit in java7-openjdk/repos (24 files)

Guillaume Alaux guillaume at archlinux.org
Sat Feb 18 20:22:20 UTC 2017


    Date: Saturday, February 18, 2017 @ 20:22:20
  Author: guillaume
Revision: 289226

archrelease: copy trunk to extra-i686, extra-x86_64

Added:
  java7-openjdk/repos/extra-i686/PKGBUILD
    (from rev 289225, java7-openjdk/trunk/PKGBUILD)
  java7-openjdk/repos/extra-i686/fontconfig-paths.diff
    (from rev 289225, java7-openjdk/trunk/fontconfig-paths.diff)
  java7-openjdk/repos/extra-i686/jdk7-openjdk.install
    (from rev 289225, java7-openjdk/trunk/jdk7-openjdk.install)
  java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install
    (from rev 289225, java7-openjdk/trunk/jre7-openjdk-headless.install)
  java7-openjdk/repos/extra-i686/jre7-openjdk.install
    (from rev 289225, java7-openjdk/trunk/jre7-openjdk.install)
  java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff
    (from rev 289225, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff)
  java7-openjdk/repos/extra-x86_64/PKGBUILD
    (from rev 289225, java7-openjdk/trunk/PKGBUILD)
  java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff
    (from rev 289225, java7-openjdk/trunk/fontconfig-paths.diff)
  java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install
    (from rev 289225, java7-openjdk/trunk/jdk7-openjdk.install)
  java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install
    (from rev 289225, java7-openjdk/trunk/jre7-openjdk-headless.install)
  java7-openjdk/repos/extra-x86_64/jre7-openjdk.install
    (from rev 289225, java7-openjdk/trunk/jre7-openjdk.install)
  java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff
    (from rev 289225, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff)
Deleted:
  java7-openjdk/repos/extra-i686/PKGBUILD
  java7-openjdk/repos/extra-i686/fontconfig-paths.diff
  java7-openjdk/repos/extra-i686/jdk7-openjdk.install
  java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install
  java7-openjdk/repos/extra-i686/jre7-openjdk.install
  java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff
  java7-openjdk/repos/extra-x86_64/PKGBUILD
  java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff
  java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install
  java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install
  java7-openjdk/repos/extra-x86_64/jre7-openjdk.install
  java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff

----------------------------------------------+
 /PKGBUILD                                    |  630 +++++++++++++++++++++++++
 /fontconfig-paths.diff                       |  268 ++++++++++
 /jdk7-openjdk.install                        |  100 +++
 /jre7-openjdk-headless.install               |   96 +++
 /jre7-openjdk.install                        |  110 ++++
 /openjdk7_nonreparenting-wm.diff             |  116 ++++
 extra-i686/PKGBUILD                          |  313 ------------
 extra-i686/fontconfig-paths.diff             |  134 -----
 extra-i686/jdk7-openjdk.install              |   50 -
 extra-i686/jre7-openjdk-headless.install     |   48 -
 extra-i686/jre7-openjdk.install              |   55 --
 extra-i686/openjdk7_nonreparenting-wm.diff   |   58 --
 extra-x86_64/PKGBUILD                        |  313 ------------
 extra-x86_64/fontconfig-paths.diff           |  134 -----
 extra-x86_64/jdk7-openjdk.install            |   50 -
 extra-x86_64/jre7-openjdk-headless.install   |   48 -
 extra-x86_64/jre7-openjdk.install            |   55 --
 extra-x86_64/openjdk7_nonreparenting-wm.diff |   58 --
 18 files changed, 1320 insertions(+), 1316 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-i686/PKGBUILD	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,313 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
-pkgbase=java7-openjdk
-_java_ver=7
-_icedtea_ver=2.6.7
-#pkgver() {
-#  _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
-#    | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
-#  echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
-#}
-_updatever=111
-pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
-pkgrel=1
-
-_bootstrap=0 # 0/1 for quick build or full bootstrap
-
-arch=('i686' 'x86_64')
-url='http://icedtea.classpath.org'
-license=('custom')
-options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
-             'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
-             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget'
-             'eclipse-ecj' 'pcsclite' 'lksctp-tools')
-
-_icedtea_url=http://icedtea.classpath.org/download
-_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver}
-source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
-        icedtea_${_icedtea_ver}_openjdk.tar.bz2::${_drops_url}/openjdk.tar.bz2
-        icedtea_${_icedtea_ver}_corba.tar.bz2::${_drops_url}/corba.tar.bz2
-        icedtea_${_icedtea_ver}_jaxp.tar.bz2::${_drops_url}/jaxp.tar.bz2
-        icedtea_${_icedtea_ver}_jaxws.tar.bz2::${_drops_url}/jaxws.tar.bz2
-        icedtea_${_icedtea_ver}_jdk.tar.bz2::${_drops_url}/jdk.tar.bz2
-        icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
-        icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
-        fontconfig-paths.diff
-        openjdk7_nonreparenting-wm.diff)
-
-# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
-
-sha256sums=('55dc6f3cf3a49745132c53592f0980c1aca37385c12dce33fea229471979c88e'
-            '5cacafbe543ad4b9179ab1cbfdb7d9baf8aa04d954510b9e7baf0bfef7db6878'
-            '0049439ea08f8391c0dae464ceb249f0af9d8e70c68142a734ceb25fa145e764'
-            '9fbd60855406879b898843d7eeac2a5df64b0ccdeb927c615c5be648b8fac70b'
-            'c9fcc1553bbb4fe1dd5ae4616b6a1f52f42c2bb990fd1cbdafeac43bfd6b30f7'
-            'e93cd330b2346bc6145bb76a141233aa1cc083eb25bbc82819632e1581290d81'
-            '13e700318ed4a00bc85890525a1fe16b7ff4798ad9e49acdf730b6dfe1a6b4e4'
-            '0412594f4dabd77a759957bba038aedf277dee87d06153505fb63919c0cb6a5c'
-            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
-
-
-noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
-           icedtea_${_icedtea_ver}_corba.tar.bz2
-           icedtea_${_icedtea_ver}_jaxp.tar.bz2
-           icedtea_${_icedtea_ver}_jaxws.tar.bz2
-           icedtea_${_icedtea_ver}_jdk.tar.bz2
-           icedtea_${_icedtea_ver}_langtools.tar.bz2
-           icedtea_${_icedtea_ver}_hotspot.tar.bz2)
-
-[ "$CARCH" = "x86_64" ] && _JARCH=amd64
-[ "$CARCH" = "i686" ]   && _JARCH=i386
-
-_jvmdir=/usr/lib/jvm/java-7-openjdk
-_imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
-_nonheadless=(bin/policytool
-              lib/${_JARCH}/libjsoundalsa.so
-              lib/${_JARCH}/libsplashscreen.so
-              lib/${_JARCH}/xawt/libmawt.so)
-
-
-
-build() {
-  cd "${srcdir}/icedtea-${_icedtea_ver}"
-
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-
-  . /etc/profile.d/apache-ant.sh
-
-  cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
-  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
-                               patches/openjdk7_nonreparenting-wm.diff"
-
-  if [ "$_bootstrap" = "1" ]; then
-     BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
-   else
-     BOOTSTRAPOPT="--disable-bootstrap"
-  fi
-
-  ./configure \
-        ${BOOTSTRAPOPT} \
-        --with-parallel-jobs="${MAKEFLAGS/-j}" \
-        --disable-tests \
-        --disable-downloading --disable-Werror \
-        --with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \
-        --with-jdk-home=${JAVA_HOME} \
-        --with-openjdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_openjdk.tar.bz2" \
-        --with-hotspot-src-zip="${srcdir}/icedtea_${_icedtea_ver}_hotspot.tar.bz2" \
-        --with-corba-src-zip="${srcdir}/icedtea_${_icedtea_ver}_corba.tar.bz2" \
-        --with-jaxp-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxp.tar.bz2" \
-        --with-jaxws-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxws.tar.bz2" \
-        --with-jdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jdk.tar.bz2" \
-        --with-langtools-src-zip="${srcdir}/icedtea_${_icedtea_ver}_langtools.tar.bz2" \
-        --enable-nss \
-        --with-rhino \
-        --with-abs-install-dir=${_jvmdir} \
-        --enable-infinality=no
-        # TODO latest version of openjdk will disable infinality by default
-    make
-}
-
-check() {
-  cd "${srcdir}/icedtea-${_icedtea_ver}"
-  make -k check
-}
-
-package_jre7-openjdk-headless() {
-  pkgdesc='OpenJDK Java 7 headless runtime environment'
-  depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-utils' 'libcups')
-  optdepends=('fontconfig: needed for Java Mauve support - libmawt.so'
-              'java-rhino: for some JavaScript support')
-  provides=('java-runtime-headless=7' 'java-runtime-headless-openjdk=7')
-  conflicts=('openjdk6')
-  # TODO remove after some time
-  replaces=('jre7-openjdk-headless-wm')
-  # Upstream config files that should go to etc and get backup
-  _backup_etc=(etc/java-7-openjdk/${_JARCH}/jvm.cfg
-               etc/java-7-openjdk/calendars.properties
-               etc/java-7-openjdk/content-types.properties
-               etc/java-7-openjdk/flavormap.properties
-               etc/java-7-openjdk/fontconfig.bfc
-               etc/java-7-openjdk/fontconfig.properties
-               etc/java-7-openjdk/images/cursors/cursors.properties
-               etc/java-7-openjdk/logging.properties
-               etc/java-7-openjdk/management/jmxremote.access
-               etc/java-7-openjdk/management/jmxremote.password
-               etc/java-7-openjdk/management/management.properties
-               etc/java-7-openjdk/management/snmp.acl
-               etc/java-7-openjdk/net.properties
-               etc/java-7-openjdk/psfont.properties.ja
-               etc/java-7-openjdk/psfontj2d.properties
-               etc/java-7-openjdk/security/java.policy
-               etc/java-7-openjdk/security/java.security
-               etc/java-7-openjdk/security/nss.cfg
-               etc/java-7-openjdk/sound.properties
-               etc/java-7-openjdk/tz.properties)
-  backup=(${_backup_etc[@]})
-  install=jre7-openjdk-headless.install
-
-  cd "${srcdir}/${_imgdir}/jre"
-
-  install -d -m755 "${pkgdir}${_jvmdir}/jre"
-  cp -a bin lib "${pkgdir}${_jvmdir}/jre"
-
-  # Set config files
-  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
-  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.bfc,bfc}
-  mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
-  mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
-  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.bfc
-  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.properties.src
-  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.properties.src
-
-  # Remove 'non-headless' files
-  for f in ${_nonheadless[@]}; do
-    rm "${pkgdir}${_jvmdir}/jre/${f}"
-  done
-
-  # Man pages
-  pushd "${pkgdir}${_jvmdir}/jre/bin"
-  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
-  for file in *; do
-    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
-      "${pkgdir}/usr/share/man/man1/${file}.1"
-    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
-      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
-  done
-  popd
-
-  # Link JKS keystore from ca-certificates-utils
-  rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
-
-  # Install license
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
-  install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
-                 "${pkgdir}/usr/share/licenses/${pkgbase}"
-  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-
-  # Move config files that were set in _backup_etc from ./lib to /etc
-  for file in ${_backup_etc[@]}; do
-    _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-7-openjdk/}
-    install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
-    ln -sf /${file} "${pkgdir}${_filepkgpath}"
-  done
-}
-
-package_jre7-openjdk() {
-  pkgdesc='OpenJDK Java 7 full runtime environment'
-  depends=("jre7-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
-  optdepends=('icedtea-web: web browser plugin + Java Web Start'
-             'alsa-lib: for basic sound support'
-             'giflib: for gif format support'
-             'libpulse: for advanced sound support'
-             'gtk2: for the Gtk+ look and feel - desktop usage'
-             'libxtst: linked in xawt/libmawt.so - desktop usage')
-  provides=('java-runtime=7' 'java-runtime-openjdk=7')
-  conflicts=('openjdk6')
-  # TODO remove after some time
-  replaces=('jre7-openjdk-wm')
-  install=jre7-openjdk.install
-
-  cd "${srcdir}/${_imgdir}/jre"
-
-  for f in ${_nonheadless[@]}; do
-    install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
-  done
-
-  # Man pages
-  pushd "${pkgdir}${_jvmdir}/jre/bin"
-  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
-  for file in *; do
-    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
-      "${pkgdir}/usr/share/man/man1/${file}.1"
-    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
-      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
-  done
-  popd
-
-  for s in 16 24 32 48; do
-    install -D -m 644 \
-      "${srcdir}/icedtea-${_icedtea_ver}/openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png"
-  done
-
-  # Install desktop files.
-  install -d -m755 "${pkgdir}/usr/share/applications"
-  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" "${pkgdir}/usr/share/applications"
-
-  # link license
-  install -d -m755 "${pkgdir}/usr/share/licenses"
-  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_jdk7-openjdk() {
-  pkgdesc='OpenJDK Java 7 development kit'
-  depends=('java-environment-common' "jre7-openjdk=${pkgver}-${pkgrel}")
-  provides=('java-environment=7' 'java-environment-openjdk=7')
-  replaces=('openjdk6' 'jdk7-openjdk-wm')
-  install=jdk7-openjdk.install
-
-  cd "${srcdir}/${_imgdir}"
-
-  # Main files
-  install -d -m755 "${pkgdir}${_jvmdir}"
-
-  cp -a include lib "${pkgdir}${_jvmdir}"
-
-  # 'bin' files
-  pushd bin
-  install -d -m755 "${pkgdir}${_jvmdir}/bin/" \
-                   "${pkgdir}"/usr/share/man/{,ja/}man1/
-
-  # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
-  for b in $(ls | grep -v java-rmi.cgi); do
-    if [ -e ../jre/bin/${b} ]; then
-      # Provide a link of the jre binary in the jdk/bin/ directory
-      ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
-    else
-      # Copy binary to jdk/bin/
-      install -m755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
-      # Copy man page
-      install -m644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}.1"
-      install -m644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}.1"
-    fi
-  done
-  popd
-
-  # Handling 'java-rmi.cgi' separately
-  install -D -m755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
-
-  # Install desktop files.
-  install -d -m755 "${pkgdir}/usr/share/applications"
-  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications"
-
-  # Temporarily fixing FS#35141
-  chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar"
-
-  # link license
-  install -d -m755 "${pkgdir}/usr/share/licenses"
-  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_openjdk7-src() {
-  pkgdesc='OpenJDK Java 7 sources'
-  replaces=('openjdk6-src')
-
-  install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
-}
-
-package_openjdk7-doc() {
-  pkgdesc='OpenJDK Java 7 documentation'
-
-  install -d -m755 "${pkgdir}/usr/share/doc/openjdk7-doc"
-  for i in "${srcdir}"/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
-    cp -a $i "${pkgdir}/usr/share/doc/openjdk7-doc/"
-  done
-}

Copied: java7-openjdk/repos/extra-i686/PKGBUILD (from rev 289225, java7-openjdk/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,315 @@
+## $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
+pkgbase=java7-openjdk
+_java_ver=7
+_icedtea_ver=2.6.9
+#pkgver() {
+#  _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
+#    | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
+#  echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
+#}
+_updatever=131
+pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
+pkgrel=1
+
+_bootstrap=0 # 0/1 for quick build or full bootstrap
+
+arch=('i686' 'x86_64')
+url='http://icedtea.classpath.org'
+license=('custom')
+options=('!emptydirs')
+makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
+             'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
+             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget'
+             'eclipse-ecj' 'pcsclite' 'lksctp-tools')
+
+_icedtea_url=http://icedtea.classpath.org/download
+_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver}
+source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.xz{,.sig}
+        icedtea_${_icedtea_ver}_openjdk.tar.bz2::${_drops_url}/openjdk.tar.bz2
+        icedtea_${_icedtea_ver}_corba.tar.bz2::${_drops_url}/corba.tar.bz2
+        icedtea_${_icedtea_ver}_jaxp.tar.bz2::${_drops_url}/jaxp.tar.bz2
+        icedtea_${_icedtea_ver}_jaxws.tar.bz2::${_drops_url}/jaxws.tar.bz2
+        icedtea_${_icedtea_ver}_jdk.tar.bz2::${_drops_url}/jdk.tar.bz2
+        icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
+        icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
+        fontconfig-paths.diff
+        openjdk7_nonreparenting-wm.diff)
+# EdDSA key may require `keyserver sks-keyservers.net` in GPG config
+validpgpkeys=('5132579DD1540ED23E04C5A0CFDA0F9B35964222') # Andrew John Hughes
+
+# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
+
+sha256sums=('8e4f3eb8d41ef66f1797825343141046973c124b18bf7d4698fae0a9a25495ea'
+            'SKIP'
+            '444c7dcfbcc665b4bb73b7c8b8256ac4d55fdb614ebdc3684a34d5f274684421'
+            '48df47fac80597978951125fda10366b4f65b73b322abb80aefbe1ec58227989'
+            'bf4e27af83fc88353986b906a0ac245658cf9d7b34629254e5e21b4aeff0621f'
+            'a5d499825c2b7745b73b5e3596057013503bd1df3d60d04cd924e02b25313ca3'
+            '44feb033ad9ae3d4b10f6561f1743fe28a13bbcacd150f2f33f5ef116fece7c5'
+            '3eb33811bf1f8a56ae19078e35da835273e828293bc355b5b04a416bd3c6c96a'
+            'd4ff2b6d44192a796af70e663b3ed2c7dd9e320729929ac650b4a1bc90ef329a'
+            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
+            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
+
+noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
+           icedtea_${_icedtea_ver}_corba.tar.bz2
+           icedtea_${_icedtea_ver}_jaxp.tar.bz2
+           icedtea_${_icedtea_ver}_jaxws.tar.bz2
+           icedtea_${_icedtea_ver}_jdk.tar.bz2
+           icedtea_${_icedtea_ver}_langtools.tar.bz2
+           icedtea_${_icedtea_ver}_hotspot.tar.bz2)
+
+[ "$CARCH" = "x86_64" ] && _JARCH=amd64
+[ "$CARCH" = "i686" ]   && _JARCH=i386
+
+_jvmdir=/usr/lib/jvm/java-7-openjdk
+_imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
+_nonheadless=(bin/policytool
+              lib/${_JARCH}/libjsoundalsa.so
+              lib/${_JARCH}/libsplashscreen.so
+              lib/${_JARCH}/xawt/libmawt.so)
+
+
+
+build() {
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
+
+  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
+  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
+
+  . /etc/profile.d/apache-ant.sh
+
+  cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
+  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
+                               patches/openjdk7_nonreparenting-wm.diff"
+
+  if [ "$_bootstrap" = "1" ]; then
+     BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
+   else
+     BOOTSTRAPOPT="--disable-bootstrap"
+  fi
+
+  ./configure \
+        ${BOOTSTRAPOPT} \
+        --with-parallel-jobs="${MAKEFLAGS/-j}" \
+        --disable-tests \
+        --disable-downloading --disable-Werror \
+        --with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \
+        --with-jdk-home=${JAVA_HOME} \
+        --with-openjdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_openjdk.tar.bz2" \
+        --with-hotspot-src-zip="${srcdir}/icedtea_${_icedtea_ver}_hotspot.tar.bz2" \
+        --with-corba-src-zip="${srcdir}/icedtea_${_icedtea_ver}_corba.tar.bz2" \
+        --with-jaxp-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxp.tar.bz2" \
+        --with-jaxws-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxws.tar.bz2" \
+        --with-jdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jdk.tar.bz2" \
+        --with-langtools-src-zip="${srcdir}/icedtea_${_icedtea_ver}_langtools.tar.bz2" \
+        --enable-nss \
+        --with-rhino \
+        --with-abs-install-dir=${_jvmdir} \
+        --enable-infinality=no
+        # TODO latest version of openjdk will disable infinality by default
+    make
+}
+
+check() {
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
+  make -k check
+}
+
+package_jre7-openjdk-headless() {
+  pkgdesc='OpenJDK Java 7 headless runtime environment'
+  depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-utils' 'libcups')
+  optdepends=('fontconfig: needed for Java Mauve support - libmawt.so'
+              'java-rhino: for some JavaScript support')
+  provides=('java-runtime-headless=7' 'java-runtime-headless-openjdk=7')
+  conflicts=('openjdk6')
+  # TODO remove after some time
+  replaces=('jre7-openjdk-headless-wm')
+  # Upstream config files that should go to etc and get backup
+  _backup_etc=(etc/java-7-openjdk/${_JARCH}/jvm.cfg
+               etc/java-7-openjdk/calendars.properties
+               etc/java-7-openjdk/content-types.properties
+               etc/java-7-openjdk/flavormap.properties
+               etc/java-7-openjdk/fontconfig.bfc
+               etc/java-7-openjdk/fontconfig.properties
+               etc/java-7-openjdk/images/cursors/cursors.properties
+               etc/java-7-openjdk/logging.properties
+               etc/java-7-openjdk/management/jmxremote.access
+               etc/java-7-openjdk/management/jmxremote.password
+               etc/java-7-openjdk/management/management.properties
+               etc/java-7-openjdk/management/snmp.acl
+               etc/java-7-openjdk/net.properties
+               etc/java-7-openjdk/psfont.properties.ja
+               etc/java-7-openjdk/psfontj2d.properties
+               etc/java-7-openjdk/security/java.policy
+               etc/java-7-openjdk/security/java.security
+               etc/java-7-openjdk/security/nss.cfg
+               etc/java-7-openjdk/sound.properties
+               etc/java-7-openjdk/tz.properties)
+  backup=(${_backup_etc[@]})
+  install=jre7-openjdk-headless.install
+
+  cd "${srcdir}/${_imgdir}/jre"
+
+  install -d -m755 "${pkgdir}${_jvmdir}/jre"
+  cp -a bin lib "${pkgdir}${_jvmdir}/jre"
+
+  # Set config files
+  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.bfc,bfc}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
+  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.bfc
+  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.properties.src
+  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.properties.src
+
+  # Remove 'non-headless' files
+  for f in ${_nonheadless[@]}; do
+    rm "${pkgdir}${_jvmdir}/jre/${f}"
+  done
+
+  # Man pages
+  pushd "${pkgdir}${_jvmdir}/jre/bin"
+  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+  for file in *; do
+    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/man1/${file}.1"
+    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
+  done
+  popd
+
+  # Link JKS keystore from ca-certificates-utils
+  rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
+  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
+
+  # Install license
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
+  install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
+                 "${pkgdir}/usr/share/licenses/${pkgbase}"
+  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  # Move config files that were set in _backup_etc from ./lib to /etc
+  for file in ${_backup_etc[@]}; do
+    _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-7-openjdk/}
+    install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
+    ln -sf /${file} "${pkgdir}${_filepkgpath}"
+  done
+}
+
+package_jre7-openjdk() {
+  pkgdesc='OpenJDK Java 7 full runtime environment'
+  depends=("jre7-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
+  optdepends=('icedtea-web: web browser plugin + Java Web Start'
+             'alsa-lib: for basic sound support'
+             'giflib: for gif format support'
+             'libpulse: for advanced sound support'
+             'gtk2: for the Gtk+ look and feel - desktop usage'
+             'libxtst: linked in xawt/libmawt.so - desktop usage')
+  provides=('java-runtime=7' 'java-runtime-openjdk=7')
+  conflicts=('openjdk6')
+  # TODO remove after some time
+  replaces=('jre7-openjdk-wm')
+  install=jre7-openjdk.install
+
+  cd "${srcdir}/${_imgdir}/jre"
+
+  for f in ${_nonheadless[@]}; do
+    install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
+  done
+
+  # Man pages
+  pushd "${pkgdir}${_jvmdir}/jre/bin"
+  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+  for file in *; do
+    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/man1/${file}.1"
+    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
+  done
+  popd
+
+  for s in 16 24 32 48; do
+    install -D -m 644 \
+      "${srcdir}/icedtea-${_icedtea_ver}/openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png"
+  done
+
+  # Install desktop files.
+  install -d -m755 "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" "${pkgdir}/usr/share/applications"
+
+  # link license
+  install -d -m755 "${pkgdir}/usr/share/licenses"
+  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_jdk7-openjdk() {
+  pkgdesc='OpenJDK Java 7 development kit'
+  depends=('java-environment-common' "jre7-openjdk=${pkgver}-${pkgrel}")
+  provides=('java-environment=7' 'java-environment-openjdk=7')
+  replaces=('openjdk6' 'jdk7-openjdk-wm')
+  install=jdk7-openjdk.install
+
+  cd "${srcdir}/${_imgdir}"
+
+  # Main files
+  install -d -m755 "${pkgdir}${_jvmdir}"
+
+  cp -a include lib "${pkgdir}${_jvmdir}"
+
+  # 'bin' files
+  pushd bin
+  install -d -m755 "${pkgdir}${_jvmdir}/bin/" \
+                   "${pkgdir}"/usr/share/man/{,ja/}man1/
+
+  # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
+  for b in $(ls | grep -v java-rmi.cgi); do
+    if [ -e ../jre/bin/${b} ]; then
+      # Provide a link of the jre binary in the jdk/bin/ directory
+      ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
+    else
+      # Copy binary to jdk/bin/
+      install -m755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
+      # Copy man page
+      install -m644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}.1"
+      install -m644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}.1"
+    fi
+  done
+  popd
+
+  # Handling 'java-rmi.cgi' separately
+  install -D -m755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
+
+  # Install desktop files.
+  install -d -m755 "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications"
+
+  # Temporarily fixing FS#35141
+  chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar"
+
+  # link license
+  install -d -m755 "${pkgdir}/usr/share/licenses"
+  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_openjdk7-src() {
+  pkgdesc='OpenJDK Java 7 sources'
+  replaces=('openjdk6-src')
+
+  install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
+}
+
+package_openjdk7-doc() {
+  pkgdesc='OpenJDK Java 7 documentation'
+
+  install -d -m755 "${pkgdir}/usr/share/doc/openjdk7-doc"
+  for i in "${srcdir}"/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
+    cp -a $i "${pkgdir}/usr/share/doc/openjdk7-doc/"
+  done
+}

Deleted: extra-i686/fontconfig-paths.diff
===================================================================
--- extra-i686/fontconfig-paths.diff	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-i686/fontconfig-paths.diff	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+

Copied: java7-openjdk/repos/extra-i686/fontconfig-paths.diff (from rev 289225, java7-openjdk/trunk/fontconfig-paths.diff)
===================================================================
--- extra-i686/fontconfig-paths.diff	                        (rev 0)
+++ extra-i686/fontconfig-paths.diff	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,134 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
+@@ -275,73 +275,61 @@
+ 
+ # Font File Names
+ 
+-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
+-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
+-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
+-
+-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
+-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
+-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
+-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
+-
+-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
+-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
+-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
+-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
+-
+-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
+-
+-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
+-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
+-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
+-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
+-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
+-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
+-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
+-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
+-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
+-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
+-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
+-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
+-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
+-
+-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
+-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
+-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
+-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
+-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
+-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
+-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
+-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
+-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
+-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
+-
+-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
+-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
+-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
+-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
+-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
+-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
+-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
+-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
+-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
+-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
+-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
+-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
+-
+-# AWT X11 font paths
+-awtfontpath.latin-1=/usr/share/fonts/X11/Type1
+-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
+-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
+-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
+-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
+-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
+-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
+-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
+-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
+-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
+-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
++
++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
++
++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
++
++filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
++
++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
++filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
++filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
++filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
++filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
++filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
++filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
++filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
++filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
++filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
++
++filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
++filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
++filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
++filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
++#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
++filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
++filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
++filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
++filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
++filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
++
++filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
++filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
++filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
++filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
++filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
++filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
++filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
++filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
++filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
++filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
++filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
++filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
++

Deleted: extra-i686/jdk7-openjdk.install
===================================================================
--- extra-i686/jdk7-openjdk.install	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-i686/jdk7-openjdk.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,50 +0,0 @@
-THIS_JDK='java-7-openjdk'
-
-fix_default() {
-  if [ ! -x /usr/bin/java ]; then
-    /usr/bin/archlinux-java unset
-    echo ""
-  else
-    /usr/bin/archlinux-java get
-  fi
-}
-
-post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "" | ${THIS_JDK}/jre)
-      /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
-}
-
-post_upgrade() {
-  default=$(fix_default)
-  if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then
-    /usr/bin/archlinux-java set ${THIS_JDK}
-  fi
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
-}
-
-pre_remove() {
-  if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
-    /usr/bin/archlinux-java unset
-    if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
-      /usr/bin/archlinux-java set ${THIS_JDK}/jre
-    fi
-  fi
-}

Copied: java7-openjdk/repos/extra-i686/jdk7-openjdk.install (from rev 289225, java7-openjdk/trunk/jdk7-openjdk.install)
===================================================================
--- extra-i686/jdk7-openjdk.install	                        (rev 0)
+++ extra-i686/jdk7-openjdk.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,50 @@
+THIS_JDK='java-7-openjdk'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "" | ${THIS_JDK}/jre)
+      /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
+}
+
+post_upgrade() {
+  default=$(fix_default)
+  if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then
+    /usr/bin/archlinux-java set ${THIS_JDK}
+  fi
+
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/bin/update-ca-trust
+  fi
+}
+
+pre_remove() {
+  if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
+    /usr/bin/archlinux-java unset
+    if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
+      /usr/bin/archlinux-java set ${THIS_JDK}/jre
+    fi
+  fi
+}

Deleted: extra-i686/jre7-openjdk-headless.install
===================================================================
--- extra-i686/jre7-openjdk-headless.install	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-i686/jre7-openjdk-headless.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,48 +0,0 @@
-THIS_JRE='java-7-openjdk/jre'
-
-fix_default() {
-  if [ ! -x /usr/bin/java ]; then
-    /usr/bin/archlinux-java unset
-    echo ""
-  else
-    /usr/bin/archlinux-java get
-  fi
-}
-
-post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "")
-      /usr/bin/archlinux-java set ${THIS_JRE}
-      ;;
-    ${THIS_JRE} | ${THIS_JRE/\/jre})
-      # 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
-}
-
-post_upgrade() {
-  if [ -z $(fix_default) ]; then
-    /usr/bin/archlinux-java set ${THIS_JRE}
-  fi
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
-}
-
-pre_remove() {
-  default=$(fix_default)
-  if [ "x${default/\/jre}" = "x${THIS_JRE/\/jre}" ]; then
-    /usr/bin/archlinux-java unset
-    echo "No Java environment is set as default anymore"
-  fi
-}

Copied: java7-openjdk/repos/extra-i686/jre7-openjdk-headless.install (from rev 289225, java7-openjdk/trunk/jre7-openjdk-headless.install)
===================================================================
--- extra-i686/jre7-openjdk-headless.install	                        (rev 0)
+++ extra-i686/jre7-openjdk-headless.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,48 @@
+THIS_JRE='java-7-openjdk/jre'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "")
+      /usr/bin/archlinux-java set ${THIS_JRE}
+      ;;
+    ${THIS_JRE} | ${THIS_JRE/\/jre})
+      # 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
+}
+
+post_upgrade() {
+  if [ -z $(fix_default) ]; then
+    /usr/bin/archlinux-java set ${THIS_JRE}
+  fi
+
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/bin/update-ca-trust
+  fi
+}
+
+pre_remove() {
+  default=$(fix_default)
+  if [ "x${default/\/jre}" = "x${THIS_JRE/\/jre}" ]; then
+    /usr/bin/archlinux-java unset
+    echo "No Java environment is set as default anymore"
+  fi
+}

Deleted: extra-i686/jre7-openjdk.install
===================================================================
--- extra-i686/jre7-openjdk.install	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-i686/jre7-openjdk.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,55 +0,0 @@
-THIS_JRE='java-7-openjdk/jre'
-
-fix_default() {
-  if [ ! -x /usr/bin/java ]; then
-    /usr/bin/archlinux-java unset
-    echo ""
-  else
-    /usr/bin/archlinux-java get
-  fi
-}
-
-post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "")
-      /usr/bin/archlinux-java set ${THIS_JRE}
-      ;;
-    ${THIS_JRE} | ${THIS_JRE/\/jre})
-      # Nothing
-      ;;
-    *)
-      echo "Default Java environment is already set to '${default}'"
-      echo "See 'archlinux-java help' to change it"
-      ;;
-  esac
-
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  echo "when you use a non-reparenting window manager,"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
-
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  if [ -z $(fix_default) ]; then
-    /usr/bin/archlinux-java set ${THIS_JRE}
-  fi
-
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-
-#  update-desktop-database -q
-}
-
-pre_remove() {
-  if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then
-    /usr/bin/archlinux-java unset
-    echo "No Java environment is set as default anymore"
-  fi
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-
-#  update-desktop-database -q
-}

Copied: java7-openjdk/repos/extra-i686/jre7-openjdk.install (from rev 289225, java7-openjdk/trunk/jre7-openjdk.install)
===================================================================
--- extra-i686/jre7-openjdk.install	                        (rev 0)
+++ extra-i686/jre7-openjdk.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,55 @@
+THIS_JRE='java-7-openjdk/jre'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "")
+      /usr/bin/archlinux-java set ${THIS_JRE}
+      ;;
+    ${THIS_JRE} | ${THIS_JRE/\/jre})
+      # Nothing
+      ;;
+    *)
+      echo "Default Java environment is already set to '${default}'"
+      echo "See 'archlinux-java help' to change it"
+      ;;
+  esac
+
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  echo "when you use a non-reparenting window manager,"
+  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
+
+#  update-desktop-database -q
+}
+
+post_upgrade() {
+  if [ -z $(fix_default) ]; then
+    /usr/bin/archlinux-java set ${THIS_JRE}
+  fi
+
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+
+#  update-desktop-database -q
+}
+
+pre_remove() {
+  if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then
+    /usr/bin/archlinux-java unset
+    echo "No Java environment is set as default anymore"
+  fi
+}
+
+post_remove() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+
+#  update-desktop-database -q
+}

Deleted: extra-i686/openjdk7_nonreparenting-wm.diff
===================================================================
--- extra-i686/openjdk7_nonreparenting-wm.diff	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-i686/openjdk7_nonreparenting-wm.diff	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,58 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2013-10-16 16:17:14.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2013-10-21 20:57:34.768580842 +0200
-@@ -105,7 +105,8 @@
-         LG3D_WM = 13,
-         CWM_WM = 14,
-         MUTTER_WM = 15,
--        MARCO_WM = 16;
-+        MARCO_WM = 16,
-+        OTHER_NONREPARENTING_WM = 17;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -591,7 +592,7 @@
-     // TODO: according to wikipedia, compiz is now reparenting. This should
-     // probably be updated.
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -781,9 +782,17 @@
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+                }
-             } else if (win.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+                }
-             }
-             /*
-              * Check for legacy WMs.
-@@ -794,6 +803,8 @@
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1309,6 +1320,7 @@
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;

Copied: java7-openjdk/repos/extra-i686/openjdk7_nonreparenting-wm.diff (from rev 289225, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff)
===================================================================
--- extra-i686/openjdk7_nonreparenting-wm.diff	                        (rev 0)
+++ extra-i686/openjdk7_nonreparenting-wm.diff	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,58 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2013-10-16 16:17:14.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2013-10-21 20:57:34.768580842 +0200
+@@ -105,7 +105,8 @@
+         LG3D_WM = 13,
+         CWM_WM = 14,
+         MUTTER_WM = 15,
+-        MARCO_WM = 16;
++        MARCO_WM = 16,
++        OTHER_NONREPARENTING_WM = 17;
+     public String toString() {
+         switch  (WMID) {
+           case NO_WM:
+@@ -591,7 +592,7 @@
+     // TODO: according to wikipedia, compiz is now reparenting. This should
+     // probably be updated.
+     static boolean isNonReparentingWM() {
+-        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
++        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
+     }
+ 
+     /*
+@@ -781,9 +782,17 @@
+              * supports WIN or _NET wm spec.
+              */
+             else if (l_net_protocol.active()) {
+-                awt_wmgr = XWM.OTHER_WM;
++                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++                } else {
++                    awt_wmgr = XWM.OTHER_WM;
++                }
+             } else if (win.active()) {
+-                awt_wmgr = XWM.OTHER_WM;
++                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++                } else {
++                    awt_wmgr = XWM.OTHER_WM;
++                }
+             }
+             /*
+              * Check for legacy WMs.
+@@ -794,6 +803,8 @@
+                 awt_wmgr = XWM.MOTIF_WM;
+             } else if (isOpenLook()) {
+                 awt_wmgr = XWM.OPENLOOK_WM;
++            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
+             } else {
+                 awt_wmgr = XWM.OTHER_WM;
+             }
+@@ -1309,6 +1320,7 @@
+                   res = new Insets(28, 6, 6, 6);
+                   break;
+               case NO_WM:
++              case OTHER_NONREPARENTING_WM:
+               case LG3D_WM:
+                   res = zeroInsets;
+                   break;

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-x86_64/PKGBUILD	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,313 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
-pkgbase=java7-openjdk
-_java_ver=7
-_icedtea_ver=2.6.7
-#pkgver() {
-#  _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
-#    | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
-#  echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
-#}
-_updatever=111
-pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
-pkgrel=1
-
-_bootstrap=0 # 0/1 for quick build or full bootstrap
-
-arch=('i686' 'x86_64')
-url='http://icedtea.classpath.org'
-license=('custom')
-options=('!emptydirs')
-makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
-             'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
-             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget'
-             'eclipse-ecj' 'pcsclite' 'lksctp-tools')
-
-_icedtea_url=http://icedtea.classpath.org/download
-_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver}
-source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.gz
-        icedtea_${_icedtea_ver}_openjdk.tar.bz2::${_drops_url}/openjdk.tar.bz2
-        icedtea_${_icedtea_ver}_corba.tar.bz2::${_drops_url}/corba.tar.bz2
-        icedtea_${_icedtea_ver}_jaxp.tar.bz2::${_drops_url}/jaxp.tar.bz2
-        icedtea_${_icedtea_ver}_jaxws.tar.bz2::${_drops_url}/jaxws.tar.bz2
-        icedtea_${_icedtea_ver}_jdk.tar.bz2::${_drops_url}/jdk.tar.bz2
-        icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
-        icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
-        fontconfig-paths.diff
-        openjdk7_nonreparenting-wm.diff)
-
-# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
-
-sha256sums=('55dc6f3cf3a49745132c53592f0980c1aca37385c12dce33fea229471979c88e'
-            '5cacafbe543ad4b9179ab1cbfdb7d9baf8aa04d954510b9e7baf0bfef7db6878'
-            '0049439ea08f8391c0dae464ceb249f0af9d8e70c68142a734ceb25fa145e764'
-            '9fbd60855406879b898843d7eeac2a5df64b0ccdeb927c615c5be648b8fac70b'
-            'c9fcc1553bbb4fe1dd5ae4616b6a1f52f42c2bb990fd1cbdafeac43bfd6b30f7'
-            'e93cd330b2346bc6145bb76a141233aa1cc083eb25bbc82819632e1581290d81'
-            '13e700318ed4a00bc85890525a1fe16b7ff4798ad9e49acdf730b6dfe1a6b4e4'
-            '0412594f4dabd77a759957bba038aedf277dee87d06153505fb63919c0cb6a5c'
-            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
-
-
-noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
-           icedtea_${_icedtea_ver}_corba.tar.bz2
-           icedtea_${_icedtea_ver}_jaxp.tar.bz2
-           icedtea_${_icedtea_ver}_jaxws.tar.bz2
-           icedtea_${_icedtea_ver}_jdk.tar.bz2
-           icedtea_${_icedtea_ver}_langtools.tar.bz2
-           icedtea_${_icedtea_ver}_hotspot.tar.bz2)
-
-[ "$CARCH" = "x86_64" ] && _JARCH=amd64
-[ "$CARCH" = "i686" ]   && _JARCH=i386
-
-_jvmdir=/usr/lib/jvm/java-7-openjdk
-_imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
-_nonheadless=(bin/policytool
-              lib/${_JARCH}/libjsoundalsa.so
-              lib/${_JARCH}/libsplashscreen.so
-              lib/${_JARCH}/xawt/libmawt.so)
-
-
-
-build() {
-  cd "${srcdir}/icedtea-${_icedtea_ver}"
-
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-
-  . /etc/profile.d/apache-ant.sh
-
-  cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
-  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
-                               patches/openjdk7_nonreparenting-wm.diff"
-
-  if [ "$_bootstrap" = "1" ]; then
-     BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
-   else
-     BOOTSTRAPOPT="--disable-bootstrap"
-  fi
-
-  ./configure \
-        ${BOOTSTRAPOPT} \
-        --with-parallel-jobs="${MAKEFLAGS/-j}" \
-        --disable-tests \
-        --disable-downloading --disable-Werror \
-        --with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \
-        --with-jdk-home=${JAVA_HOME} \
-        --with-openjdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_openjdk.tar.bz2" \
-        --with-hotspot-src-zip="${srcdir}/icedtea_${_icedtea_ver}_hotspot.tar.bz2" \
-        --with-corba-src-zip="${srcdir}/icedtea_${_icedtea_ver}_corba.tar.bz2" \
-        --with-jaxp-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxp.tar.bz2" \
-        --with-jaxws-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxws.tar.bz2" \
-        --with-jdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jdk.tar.bz2" \
-        --with-langtools-src-zip="${srcdir}/icedtea_${_icedtea_ver}_langtools.tar.bz2" \
-        --enable-nss \
-        --with-rhino \
-        --with-abs-install-dir=${_jvmdir} \
-        --enable-infinality=no
-        # TODO latest version of openjdk will disable infinality by default
-    make
-}
-
-check() {
-  cd "${srcdir}/icedtea-${_icedtea_ver}"
-  make -k check
-}
-
-package_jre7-openjdk-headless() {
-  pkgdesc='OpenJDK Java 7 headless runtime environment'
-  depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-utils' 'libcups')
-  optdepends=('fontconfig: needed for Java Mauve support - libmawt.so'
-              'java-rhino: for some JavaScript support')
-  provides=('java-runtime-headless=7' 'java-runtime-headless-openjdk=7')
-  conflicts=('openjdk6')
-  # TODO remove after some time
-  replaces=('jre7-openjdk-headless-wm')
-  # Upstream config files that should go to etc and get backup
-  _backup_etc=(etc/java-7-openjdk/${_JARCH}/jvm.cfg
-               etc/java-7-openjdk/calendars.properties
-               etc/java-7-openjdk/content-types.properties
-               etc/java-7-openjdk/flavormap.properties
-               etc/java-7-openjdk/fontconfig.bfc
-               etc/java-7-openjdk/fontconfig.properties
-               etc/java-7-openjdk/images/cursors/cursors.properties
-               etc/java-7-openjdk/logging.properties
-               etc/java-7-openjdk/management/jmxremote.access
-               etc/java-7-openjdk/management/jmxremote.password
-               etc/java-7-openjdk/management/management.properties
-               etc/java-7-openjdk/management/snmp.acl
-               etc/java-7-openjdk/net.properties
-               etc/java-7-openjdk/psfont.properties.ja
-               etc/java-7-openjdk/psfontj2d.properties
-               etc/java-7-openjdk/security/java.policy
-               etc/java-7-openjdk/security/java.security
-               etc/java-7-openjdk/security/nss.cfg
-               etc/java-7-openjdk/sound.properties
-               etc/java-7-openjdk/tz.properties)
-  backup=(${_backup_etc[@]})
-  install=jre7-openjdk-headless.install
-
-  cd "${srcdir}/${_imgdir}/jre"
-
-  install -d -m755 "${pkgdir}${_jvmdir}/jre"
-  cp -a bin lib "${pkgdir}${_jvmdir}/jre"
-
-  # Set config files
-  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
-  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.bfc,bfc}
-  mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
-  mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
-  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.bfc
-  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.properties.src
-  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.properties.src
-
-  # Remove 'non-headless' files
-  for f in ${_nonheadless[@]}; do
-    rm "${pkgdir}${_jvmdir}/jre/${f}"
-  done
-
-  # Man pages
-  pushd "${pkgdir}${_jvmdir}/jre/bin"
-  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
-  for file in *; do
-    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
-      "${pkgdir}/usr/share/man/man1/${file}.1"
-    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
-      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
-  done
-  popd
-
-  # Link JKS keystore from ca-certificates-utils
-  rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
-
-  # Install license
-  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
-  install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
-                 "${pkgdir}/usr/share/licenses/${pkgbase}"
-  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-
-  # Move config files that were set in _backup_etc from ./lib to /etc
-  for file in ${_backup_etc[@]}; do
-    _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-7-openjdk/}
-    install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
-    ln -sf /${file} "${pkgdir}${_filepkgpath}"
-  done
-}
-
-package_jre7-openjdk() {
-  pkgdesc='OpenJDK Java 7 full runtime environment'
-  depends=("jre7-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
-  optdepends=('icedtea-web: web browser plugin + Java Web Start'
-             'alsa-lib: for basic sound support'
-             'giflib: for gif format support'
-             'libpulse: for advanced sound support'
-             'gtk2: for the Gtk+ look and feel - desktop usage'
-             'libxtst: linked in xawt/libmawt.so - desktop usage')
-  provides=('java-runtime=7' 'java-runtime-openjdk=7')
-  conflicts=('openjdk6')
-  # TODO remove after some time
-  replaces=('jre7-openjdk-wm')
-  install=jre7-openjdk.install
-
-  cd "${srcdir}/${_imgdir}/jre"
-
-  for f in ${_nonheadless[@]}; do
-    install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
-  done
-
-  # Man pages
-  pushd "${pkgdir}${_jvmdir}/jre/bin"
-  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
-  for file in *; do
-    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
-      "${pkgdir}/usr/share/man/man1/${file}.1"
-    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
-      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
-  done
-  popd
-
-  for s in 16 24 32 48; do
-    install -D -m 644 \
-      "${srcdir}/icedtea-${_icedtea_ver}/openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png" \
-      "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png"
-  done
-
-  # Install desktop files.
-  install -d -m755 "${pkgdir}/usr/share/applications"
-  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" "${pkgdir}/usr/share/applications"
-
-  # link license
-  install -d -m755 "${pkgdir}/usr/share/licenses"
-  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_jdk7-openjdk() {
-  pkgdesc='OpenJDK Java 7 development kit'
-  depends=('java-environment-common' "jre7-openjdk=${pkgver}-${pkgrel}")
-  provides=('java-environment=7' 'java-environment-openjdk=7')
-  replaces=('openjdk6' 'jdk7-openjdk-wm')
-  install=jdk7-openjdk.install
-
-  cd "${srcdir}/${_imgdir}"
-
-  # Main files
-  install -d -m755 "${pkgdir}${_jvmdir}"
-
-  cp -a include lib "${pkgdir}${_jvmdir}"
-
-  # 'bin' files
-  pushd bin
-  install -d -m755 "${pkgdir}${_jvmdir}/bin/" \
-                   "${pkgdir}"/usr/share/man/{,ja/}man1/
-
-  # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
-  for b in $(ls | grep -v java-rmi.cgi); do
-    if [ -e ../jre/bin/${b} ]; then
-      # Provide a link of the jre binary in the jdk/bin/ directory
-      ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
-    else
-      # Copy binary to jdk/bin/
-      install -m755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
-      # Copy man page
-      install -m644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}.1"
-      install -m644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}.1"
-    fi
-  done
-  popd
-
-  # Handling 'java-rmi.cgi' separately
-  install -D -m755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
-
-  # Install desktop files.
-  install -d -m755 "${pkgdir}/usr/share/applications"
-  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications"
-
-  # Temporarily fixing FS#35141
-  chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar"
-
-  # link license
-  install -d -m755 "${pkgdir}/usr/share/licenses"
-  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
-}
-
-package_openjdk7-src() {
-  pkgdesc='OpenJDK Java 7 sources'
-  replaces=('openjdk6-src')
-
-  install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
-}
-
-package_openjdk7-doc() {
-  pkgdesc='OpenJDK Java 7 documentation'
-
-  install -d -m755 "${pkgdir}/usr/share/doc/openjdk7-doc"
-  for i in "${srcdir}"/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
-    cp -a $i "${pkgdir}/usr/share/doc/openjdk7-doc/"
-  done
-}

Copied: java7-openjdk/repos/extra-x86_64/PKGBUILD (from rev 289225, java7-openjdk/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,315 @@
+## $Id$
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+# Maintainer: Guillaume ALAUX <guillaume at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+pkgname=('jre7-openjdk-headless' 'jre7-openjdk' 'jdk7-openjdk' 'openjdk7-src' 'openjdk7-doc')
+pkgbase=java7-openjdk
+_java_ver=7
+_icedtea_ver=2.6.9
+#pkgver() {
+#  _updatever=$(grep -E "^JDK_UPDATE_VERSION = (.)+" ${srcdir}/icedtea-${_icedtea_ver}/Makefile.am \
+#    | sed -r 's/^JDK_UPDATE_VERSION = (.+)$/\1/')
+#  echo ${_java_ver}.u${_updatever}_${_icedtea_ver}
+#}
+_updatever=131
+pkgver=${_java_ver}.u${_updatever}_${_icedtea_ver}
+pkgrel=1
+
+_bootstrap=0 # 0/1 for quick build or full bootstrap
+
+arch=('i686' 'x86_64')
+url='http://icedtea.classpath.org'
+license=('custom')
+options=('!emptydirs')
+makedepends=('jdk7-openjdk' 'libxp' 'libxslt'
+             'alsa-lib' 'apache-ant>=1.8.1' 'giflib' 'libpng>=1.5.7' 'gtk2'
+             'java-rhino' 'libpulse>=0.9.11' 'zip' 'unzip' 'cpio' 'fastjar' 'wget'
+             'eclipse-ecj' 'pcsclite' 'lksctp-tools')
+
+_icedtea_url=http://icedtea.classpath.org/download
+_drops_url=${_icedtea_url}/drops/icedtea7/${_icedtea_ver}
+source=(${_icedtea_url}/source/icedtea-${_icedtea_ver}.tar.xz{,.sig}
+        icedtea_${_icedtea_ver}_openjdk.tar.bz2::${_drops_url}/openjdk.tar.bz2
+        icedtea_${_icedtea_ver}_corba.tar.bz2::${_drops_url}/corba.tar.bz2
+        icedtea_${_icedtea_ver}_jaxp.tar.bz2::${_drops_url}/jaxp.tar.bz2
+        icedtea_${_icedtea_ver}_jaxws.tar.bz2::${_drops_url}/jaxws.tar.bz2
+        icedtea_${_icedtea_ver}_jdk.tar.bz2::${_drops_url}/jdk.tar.bz2
+        icedtea_${_icedtea_ver}_langtools.tar.bz2::${_drops_url}/langtools.tar.bz2
+        icedtea_${_icedtea_ver}_hotspot.tar.bz2::${_drops_url}/hotspot.tar.bz2
+        fontconfig-paths.diff
+        openjdk7_nonreparenting-wm.diff)
+# EdDSA key may require `keyserver sks-keyservers.net` in GPG config
+validpgpkeys=('5132579DD1540ED23E04C5A0CFDA0F9B35964222') # Andrew John Hughes
+
+# http://icedtea.classpath.org/bugzilla/show_bug.cgi?id=2357
+
+sha256sums=('8e4f3eb8d41ef66f1797825343141046973c124b18bf7d4698fae0a9a25495ea'
+            'SKIP'
+            '444c7dcfbcc665b4bb73b7c8b8256ac4d55fdb614ebdc3684a34d5f274684421'
+            '48df47fac80597978951125fda10366b4f65b73b322abb80aefbe1ec58227989'
+            'bf4e27af83fc88353986b906a0ac245658cf9d7b34629254e5e21b4aeff0621f'
+            'a5d499825c2b7745b73b5e3596057013503bd1df3d60d04cd924e02b25313ca3'
+            '44feb033ad9ae3d4b10f6561f1743fe28a13bbcacd150f2f33f5ef116fece7c5'
+            '3eb33811bf1f8a56ae19078e35da835273e828293bc355b5b04a416bd3c6c96a'
+            'd4ff2b6d44192a796af70e663b3ed2c7dd9e320729929ac650b4a1bc90ef329a'
+            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
+            '56b919ababb13bd6afdcdaceb112b529b6e82539255f2dae9a7e5eb91645164b')
+
+noextract=(icedtea_${_icedtea_ver}_openjdk.tar.bz2
+           icedtea_${_icedtea_ver}_corba.tar.bz2
+           icedtea_${_icedtea_ver}_jaxp.tar.bz2
+           icedtea_${_icedtea_ver}_jaxws.tar.bz2
+           icedtea_${_icedtea_ver}_jdk.tar.bz2
+           icedtea_${_icedtea_ver}_langtools.tar.bz2
+           icedtea_${_icedtea_ver}_hotspot.tar.bz2)
+
+[ "$CARCH" = "x86_64" ] && _JARCH=amd64
+[ "$CARCH" = "i686" ]   && _JARCH=i386
+
+_jvmdir=/usr/lib/jvm/java-7-openjdk
+_imgdir="icedtea-${_icedtea_ver}/openjdk.build/j2sdk-image"
+_nonheadless=(bin/policytool
+              lib/${_JARCH}/libjsoundalsa.so
+              lib/${_JARCH}/libsplashscreen.so
+              lib/${_JARCH}/xawt/libmawt.so)
+
+
+
+build() {
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
+
+  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
+  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
+
+  . /etc/profile.d/apache-ant.sh
+
+  cp "${srcdir}"/*.diff "${srcdir}"/icedtea-${_icedtea_ver}/patches
+  export DISTRIBUTION_PATCHES="patches/fontconfig-paths.diff \
+                               patches/openjdk7_nonreparenting-wm.diff"
+
+  if [ "$_bootstrap" = "1" ]; then
+     BOOTSTRAPOPT="--enable-bootstrap --with-ecj-jar=/usr/share/java/ecj.jar"
+   else
+     BOOTSTRAPOPT="--disable-bootstrap"
+  fi
+
+  ./configure \
+        ${BOOTSTRAPOPT} \
+        --with-parallel-jobs="${MAKEFLAGS/-j}" \
+        --disable-tests \
+        --disable-downloading --disable-Werror \
+        --with-pkgversion="Arch Linux build ${pkgver}-${pkgrel}-${CARCH}" \
+        --with-jdk-home=${JAVA_HOME} \
+        --with-openjdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_openjdk.tar.bz2" \
+        --with-hotspot-src-zip="${srcdir}/icedtea_${_icedtea_ver}_hotspot.tar.bz2" \
+        --with-corba-src-zip="${srcdir}/icedtea_${_icedtea_ver}_corba.tar.bz2" \
+        --with-jaxp-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxp.tar.bz2" \
+        --with-jaxws-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jaxws.tar.bz2" \
+        --with-jdk-src-zip="${srcdir}/icedtea_${_icedtea_ver}_jdk.tar.bz2" \
+        --with-langtools-src-zip="${srcdir}/icedtea_${_icedtea_ver}_langtools.tar.bz2" \
+        --enable-nss \
+        --with-rhino \
+        --with-abs-install-dir=${_jvmdir} \
+        --enable-infinality=no
+        # TODO latest version of openjdk will disable infinality by default
+    make
+}
+
+check() {
+  cd "${srcdir}/icedtea-${_icedtea_ver}"
+  make -k check
+}
+
+package_jre7-openjdk-headless() {
+  pkgdesc='OpenJDK Java 7 headless runtime environment'
+  depends=('java-runtime-common' 'libjpeg-turbo' 'lcms2' 'nss' 'ca-certificates-utils' 'libcups')
+  optdepends=('fontconfig: needed for Java Mauve support - libmawt.so'
+              'java-rhino: for some JavaScript support')
+  provides=('java-runtime-headless=7' 'java-runtime-headless-openjdk=7')
+  conflicts=('openjdk6')
+  # TODO remove after some time
+  replaces=('jre7-openjdk-headless-wm')
+  # Upstream config files that should go to etc and get backup
+  _backup_etc=(etc/java-7-openjdk/${_JARCH}/jvm.cfg
+               etc/java-7-openjdk/calendars.properties
+               etc/java-7-openjdk/content-types.properties
+               etc/java-7-openjdk/flavormap.properties
+               etc/java-7-openjdk/fontconfig.bfc
+               etc/java-7-openjdk/fontconfig.properties
+               etc/java-7-openjdk/images/cursors/cursors.properties
+               etc/java-7-openjdk/logging.properties
+               etc/java-7-openjdk/management/jmxremote.access
+               etc/java-7-openjdk/management/jmxremote.password
+               etc/java-7-openjdk/management/management.properties
+               etc/java-7-openjdk/management/snmp.acl
+               etc/java-7-openjdk/net.properties
+               etc/java-7-openjdk/psfont.properties.ja
+               etc/java-7-openjdk/psfontj2d.properties
+               etc/java-7-openjdk/security/java.policy
+               etc/java-7-openjdk/security/java.security
+               etc/java-7-openjdk/security/nss.cfg
+               etc/java-7-openjdk/sound.properties
+               etc/java-7-openjdk/tz.properties)
+  backup=(${_backup_etc[@]})
+  install=jre7-openjdk-headless.install
+
+  cd "${srcdir}/${_imgdir}/jre"
+
+  install -d -m755 "${pkgdir}${_jvmdir}/jre"
+  cp -a bin lib "${pkgdir}${_jvmdir}/jre"
+
+  # Set config files
+  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.properties.src,properties}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.{Ubuntu.bfc,bfc}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/management/jmxremote.password{.template,}
+  mv "${pkgdir}${_jvmdir}"/jre/lib/management/snmp.acl{.template,}
+  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.bfc
+  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.*.properties.src
+  rm -f "${pkgdir}${_jvmdir}"/jre/lib/fontconfig.properties.src
+
+  # Remove 'non-headless' files
+  for f in ${_nonheadless[@]}; do
+    rm "${pkgdir}${_jvmdir}/jre/${f}"
+  done
+
+  # Man pages
+  pushd "${pkgdir}${_jvmdir}/jre/bin"
+  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+  for file in *; do
+    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/man1/${file}.1"
+    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
+  done
+  popd
+
+  # Link JKS keystore from ca-certificates-utils
+  rm -f "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
+  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}${_jvmdir}/jre/lib/security/cacerts"
+
+  # Install license
+  install -d -m755 "${pkgdir}/usr/share/licenses/${pkgbase}/"
+  install -m644 ASSEMBLY_EXCEPTION LICENSE THIRD_PARTY_README \
+                 "${pkgdir}/usr/share/licenses/${pkgbase}"
+  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+
+  # Move config files that were set in _backup_etc from ./lib to /etc
+  for file in ${_backup_etc[@]}; do
+    _filepkgpath=${_jvmdir}/jre/lib/${file#etc/java-7-openjdk/}
+    install -D -m 644 "${pkgdir}${_filepkgpath}" "${pkgdir}/${file}"
+    ln -sf /${file} "${pkgdir}${_filepkgpath}"
+  done
+}
+
+package_jre7-openjdk() {
+  pkgdesc='OpenJDK Java 7 full runtime environment'
+  depends=("jre7-openjdk-headless=${pkgver}-${pkgrel}" 'xdg-utils' 'hicolor-icon-theme')
+  optdepends=('icedtea-web: web browser plugin + Java Web Start'
+             'alsa-lib: for basic sound support'
+             'giflib: for gif format support'
+             'libpulse: for advanced sound support'
+             'gtk2: for the Gtk+ look and feel - desktop usage'
+             'libxtst: linked in xawt/libmawt.so - desktop usage')
+  provides=('java-runtime=7' 'java-runtime-openjdk=7')
+  conflicts=('openjdk6')
+  # TODO remove after some time
+  replaces=('jre7-openjdk-wm')
+  install=jre7-openjdk.install
+
+  cd "${srcdir}/${_imgdir}/jre"
+
+  for f in ${_nonheadless[@]}; do
+    install -D ${f} "${pkgdir}${_jvmdir}/jre/${f}"
+  done
+
+  # Man pages
+  pushd "${pkgdir}${_jvmdir}/jre/bin"
+  install -d -m 755 "${pkgdir}"/usr/share/man/{,ja/}man1/
+  for file in *; do
+    install -m 644 "${srcdir}/${_imgdir}/man/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/man1/${file}.1"
+    install -m 644 "${srcdir}/${_imgdir}/man/ja/man1/${file}.1" \
+      "${pkgdir}/usr/share/man/ja/man1/${file}.1"
+  done
+  popd
+
+  for s in 16 24 32 48; do
+    install -D -m 644 \
+      "${srcdir}/icedtea-${_icedtea_ver}/openjdk/jdk/src/solaris/classes/sun/awt/X11/java-icon${s}.png" \
+      "${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps/java.png"
+  done
+
+  # Install desktop files.
+  install -d -m755 "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/policytool.desktop" "${pkgdir}/usr/share/applications"
+
+  # link license
+  install -d -m755 "${pkgdir}/usr/share/licenses"
+  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_jdk7-openjdk() {
+  pkgdesc='OpenJDK Java 7 development kit'
+  depends=('java-environment-common' "jre7-openjdk=${pkgver}-${pkgrel}")
+  provides=('java-environment=7' 'java-environment-openjdk=7')
+  replaces=('openjdk6' 'jdk7-openjdk-wm')
+  install=jdk7-openjdk.install
+
+  cd "${srcdir}/${_imgdir}"
+
+  # Main files
+  install -d -m755 "${pkgdir}${_jvmdir}"
+
+  cp -a include lib "${pkgdir}${_jvmdir}"
+
+  # 'bin' files
+  pushd bin
+  install -d -m755 "${pkgdir}${_jvmdir}/bin/" \
+                   "${pkgdir}"/usr/share/man/{,ja/}man1/
+
+  # 'java-rmi.cgi' will be handled separately as it should not be in the PATH and has no man page
+  for b in $(ls | grep -v java-rmi.cgi); do
+    if [ -e ../jre/bin/${b} ]; then
+      # Provide a link of the jre binary in the jdk/bin/ directory
+      ln -s ../jre/bin/${b} "${pkgdir}${_jvmdir}/bin/${b}"
+    else
+      # Copy binary to jdk/bin/
+      install -m755 ${b} "${pkgdir}${_jvmdir}/bin/${b}"
+      # Copy man page
+      install -m644 ../man/man1/${b}.1 "${pkgdir}/usr/share/man/man1/${b}.1"
+      install -m644 ../man/ja/man1/${b}.1 "${pkgdir}/usr/share/man/ja/man1/${b}.1"
+    fi
+  done
+  popd
+
+  # Handling 'java-rmi.cgi' separately
+  install -D -m755 bin/java-rmi.cgi "${pkgdir}${_jvmdir}/bin/java-rmi.cgi"
+
+  # Install desktop files.
+  install -d -m755 "${pkgdir}/usr/share/applications"
+  install -m644 "${srcdir}/icedtea-${_icedtea_ver}/jconsole.desktop" "${pkgdir}/usr/share/applications"
+
+  # Temporarily fixing FS#35141
+  chmod go+r "${pkgdir}${_jvmdir}/lib/sa-jdi.jar"
+
+  # link license
+  install -d -m755 "${pkgdir}/usr/share/licenses"
+  ln -sf /usr/share/licenses/${pkgbase} "${pkgdir}/usr/share/licenses/${pkgname}"
+}
+
+package_openjdk7-src() {
+  pkgdesc='OpenJDK Java 7 sources'
+  replaces=('openjdk6-src')
+
+  install -D "${srcdir}/${_imgdir}/src.zip" "${pkgdir}${_jvmdir}/src.zip"
+}
+
+package_openjdk7-doc() {
+  pkgdesc='OpenJDK Java 7 documentation'
+
+  install -d -m755 "${pkgdir}/usr/share/doc/openjdk7-doc"
+  for i in "${srcdir}"/icedtea-${_icedtea_ver}/openjdk.build/docs/*; do
+    cp -a $i "${pkgdir}/usr/share/doc/openjdk7-doc/"
+  done
+}

Deleted: extra-x86_64/fontconfig-paths.diff
===================================================================
--- extra-x86_64/fontconfig-paths.diff	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-x86_64/fontconfig-paths.diff	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,134 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
-+++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
-@@ -275,73 +275,61 @@
- 
- # Font File Names
- 
--filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
--filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
--filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
--filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
--
--filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
--filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
--filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
--filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
--
--filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
--filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
--filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
--filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
--
--filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
--filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
--
--filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
--filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
--filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
--filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
--filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
--filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
--filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
--filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
--filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
--filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
--filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
--filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
--filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
--
--filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
--filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
--filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
--filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
--#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
--filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
--filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
--filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
--filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
--filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
--
--filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
--filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
--filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
--filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
--filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
--filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
--filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
--filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
--filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
--filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
--filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
--filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
--
--# AWT X11 font paths
--awtfontpath.latin-1=/usr/share/fonts/X11/Type1
--awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
--awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
--awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
--awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
--awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
--awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
--awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
--awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
--awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
--awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
-+filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
-+filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
-+filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
-+filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
-+
-+filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
-+filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
-+filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
-+filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
-+
-+filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
-+filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
-+filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
-+filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
-+
-+filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
-+filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
-+
-+filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
-+filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
-+filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
-+filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
-+filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
-+filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
-+filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
-+filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
-+filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
-+filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
-+filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
-+filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
-+filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
-+
-+filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
-+filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
-+filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
-+filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
-+#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
-+filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
-+filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
-+filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
-+filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
-+filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
-+
-+filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
-+filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
-+filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
-+filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
-+filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
-+filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
-+filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
-+filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
-+filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
-+filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
-+filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
-+filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
-+

Copied: java7-openjdk/repos/extra-x86_64/fontconfig-paths.diff (from rev 289225, java7-openjdk/trunk/fontconfig-paths.diff)
===================================================================
--- extra-x86_64/fontconfig-paths.diff	                        (rev 0)
+++ extra-x86_64/fontconfig-paths.diff	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,134 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties	2009-05-29 22:45:23.024341869 +0000
++++ openjdk/jdk/src/solaris/classes/sun/awt/fontconfigs/linux.fontconfig.Ubuntu.properties.new	2009-05-29 22:55:13.681366890 +0000
+@@ -275,73 +275,61 @@
+ 
+ # Font File Names
+ 
+-filename.DejaVu_Sans=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf
+-filename.DejaVu_Sans_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf
+-filename.DejaVu_Sans_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Oblique.ttf
+-filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-BoldOblique.ttf
+-
+-filename.DejaVu_Sans_Mono=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf
+-filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Bold.ttf
+-filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-Oblique.ttf
+-filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono-BoldOblique.ttf
+-
+-filename.DejaVu_Serif=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif.ttf
+-filename.DejaVu_Serif_Bold=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Bold.ttf
+-filename.DejaVu_Serif_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-Oblique.ttf
+-filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/truetype/ttf-dejavu/DejaVuSerif-BoldOblique.ttf
+-
+-filename.AR_PL_UMing_CN=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_UMing_HK=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_UMing_TW=/usr/share/fonts/truetype/arphic/uming.ttc
+-filename.AR_PL_ShanHeiSun_Uni=/usr/share/fonts/truetype/arphic/uming.ttf
+-
+-filename.WenQuanYi_Zen_Hei=/usr/share/fonts/truetype/wqy/wqy-zenhei.ttf
+-filename.Baekmuk_Batang=/usr/share/fonts/truetype/baekmuk/batang.ttf
+-filename.UnBatang=/usr/share/fonts/truetype/unfonts/UnBatang.ttf
+-filename.UnBatang_Bold=/usr/share/fonts/truetype/unfonts/UnBatangBold.ttf
+-filename.Baekmuk_Gulim=/usr/share/fonts/truetype/baekmuk/gulim.ttf
+-filename.UnDotum=/usr/share/fonts/truetype/unfonts/UnDotum.ttf
+-filename.UnDotum_Bold=/usr/share/fonts/truetype/unfonts/UnDotumBold.ttf
+-filename.Kochi_Gothic=/usr/share/fonts/truetype/kochi/kochi-gothic.ttf
+-filename.Sazanami_Gothic=/usr/share/fonts/truetype/sazanami/sazanami-gothic.ttf
+-filename.Kochi_Mincho=/usr/share/fonts/truetype/kochi/kochi-mincho.ttf
+-filename.Sazanami_Mincho=/usr/share/fonts/truetype/sazanami/sazanami-mincho.ttf
+-filename.VL_Gothic=/usr/share/fonts/truetype/vlgothic/VL-Gothic-Regular.ttf
+-filename.VL_PGothic=/usr/share/fonts/truetype/vlgothic/VL-PGothic-Regular.ttf
+-
+-filename.Lohit_Bengali=/usr/share/fonts/truetype/ttf-bengali-fonts/lohit_bn.ttf
+-filename.Lohit_Gujarati=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_gu.ttf
+-filename.Lohit_Hindi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_hi.ttf
+-filename.Lohit_Kannda=/usr/share/fonts/truetype/ttf-kannada-fonts/lohit_kn.ttf
+-#filename.Lohit_Malayalam=/usr/share/fonts/lohit-malayalam/lohit_ml.ttf
+-filename.Lohit_Oriya=/usr/share/fonts/truetype/ttf-oriya-fonts/lohit_or.ttf
+-filename.Lohit_Punjabi=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_pa.ttf
+-filename.Lohit_Tamil=/usr/share/fonts/truetype/ttf-indic-fonts-core/lohit_ta.ttf
+-filename.Lohit_Telugu=/usr/share/fonts/truetype/ttf-telugu-fonts/lohit_te.ttf
+-filename.LKLUG=/usr/share/fonts/truetype/ttf-sinhala-lklug/lklug.ttf
+-
+-filename.LuxiSans-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisr.ttf
+-filename.LuxiSans-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisb.ttf
+-filename.LuxiSans-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisri.ttf
+-filename.LuxiSans-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxisbi.ttf
+-filename.LuxiMono-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximr.ttf
+-filename.LuxiMono-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximb.ttf
+-filename.LuxiMono-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximri.ttf
+-filename.LuxiMono-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luximbi.ttf
+-filename.LuxiSerif-Regular=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirr.ttf
+-filename.LuxiSerif-Bold=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirb.ttf
+-filename.LuxiSerif-Oblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirri.ttf
+-filename.LuxiSerif-BoldOblique=/usr/share/fonts/truetype/ttf-xfree86-nonfree/luxirbi.ttf
+-
+-# AWT X11 font paths
+-awtfontpath.latin-1=/usr/share/fonts/X11/Type1
+-awtfontpath.umingcn=/usr/share/fonts/truetype/arphic
+-awtfontpath.uminghk=/usr/share/fonts/truetype/arphic
+-awtfontpath.umingtw=/usr/share/fonts/truetype/arphic
+-awtfontpath.shanheisun=/usr/share/fonts/truetype/arphic
+-awtfontpath.wqy-zenhei=/usr/share/fonts/truetype/wqy
+-awtfontpath.japanese-kochi=/usr/share/fonts/truetype/kochi
+-awtfontpath.japanese-sazanami=/usr/share/fonts/truetype/sazanami
+-awtfontpath.japanese-vlgothic=/usr/share/fonts/truetype/vlgothic
+-awtfontpath.korean-baekmuk=/usr/share/fonts/truetype/baekmuk
+-awtfontpath.korean-un=/usr/share/fonts/truetype/unfonts
++filename.DejaVu_Sans=/usr/share/fonts/TTF/DejaVuSans.ttf
++filename.DejaVu_Sans_Bold=/usr/share/fonts/TTF/DejaVuSans-Bold.ttf
++filename.DejaVu_Sans_Oblique=/usr/share/fonts/TTF/DejaVuSans-Oblique.ttf
++filename.DejaVu_Sans_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSans-BoldOblique.ttf
++
++filename.DejaVu_Sans_Mono=/usr/share/fonts/TTF/DejaVuSansMono.ttf
++filename.DejaVu_Sans_Mono_Bold=/usr/share/fonts/TTF/DejaVuSansMono-Bold.ttf
++filename.DejaVu_Sans_Mono_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-Oblique.ttf
++filename.DejaVu_Sans_Mono_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSansMono-BoldOblique.ttf
++
++filename.DejaVu_Serif=/usr/share/fonts/TTF/DejaVuSerif.ttf
++filename.DejaVu_Serif_Bold=/usr/share/fonts/TTF/DejaVuSerif-Bold.ttf
++filename.DejaVu_Serif_Oblique=/usr/share/fonts/TTF/DejaVuSerif-Oblique.ttf
++filename.DejaVu_Serif_Bold_Oblique=/usr/share/fonts/TTF/DejaVuSerif-BoldOblique.ttf
++
++filename.AR_PL_UMing_CN=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_UMing_HK=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_UMing_TW=/usr/share/fonts/TTF/uming.ttc
++filename.AR_PL_ShanHeiSun_Uni=/usr/share/TTF/uming.ttf
++
++filename.WenQuanYi_Zen_Hei=/usr/share/fonts/TTF/wqy-zenhei.ttf
++filename.Baekmuk_Batang=/usr/share/fonts/TTF/batang.ttf
++filename.UnBatang=/usr/share/fonts/TTF/UnBatang.ttf
++filename.UnBatang_Bold=/usr/share/fonts/TTF/UnBatangBold.ttf
++filename.Baekmuk_Gulim=/usr/share/fonts/TTF/gulim.ttf
++filename.UnDotum=/usr/share/fonts/TTF/UnDotum.ttf
++filename.UnDotum_Bold=/usr/share/fonts/TTF/UnDotumBold.ttf
++filename.Kochi_Gothic=/usr/share/fonts/TTF/kochi-gothic.ttf
++filename.Sazanami_Gothic=/usr/share/fonts/TTF/sazanami-gothic.ttf
++filename.Kochi_Mincho=/usr/share/fonts/TTF/kochi-mincho.ttf
++filename.Sazanami_Mincho=/usr/share/fonts/TTF/sazanami-mincho.ttf
++filename.VL_Gothic=/usr/share/fonts/TTF/VL-Gothic-Regular.ttf
++filename.VL_PGothic=/usr/share/fonts/TTF/VL-PGothic-Regular.ttf
++
++filename.Lohit_Bengali=/usr/share/fonts/TTF/lohit_bn.ttf
++filename.Lohit_Gujarati=/usr/share/fonts/TTF/lohit_gu.ttf
++filename.Lohit_Hindi=/usr/share/fonts/TTF/lohit_hi.ttf
++filename.Lohit_Kannda=/usr/share/fonts/TTF/lohit_kn.ttf
++#filename.Lohit_Malayalam=/usr/share/fonts/TTF/lohit_ml.ttf
++filename.Lohit_Oriya=/usr/share/fonts/TTF/lohit_or.ttf
++filename.Lohit_Punjabi=/usr/share/fonts/TTF/lohit_pa.ttf
++filename.Lohit_Tamil=/usr/share/fonts/TTF/lohit_ta.ttf
++filename.Lohit_Telugu=/usr/share/fonts/TTF/lohit_te.ttf
++filename.LKLUG=/usr/share/fonts/TTF/lklug.ttf
++
++filename.LuxiSans-Regular=/usr/share/fonts/TTF/luxisr.ttf
++filename.LuxiSans-Bold=/usr/share/fonts/TTF/luxisb.ttf
++filename.LuxiSans-Oblique=/usr/share/fonts/TTF/luxisri.ttf
++filename.LuxiSans-BoldOblique=/usr/share/fonts/TTF/luxisbi.ttf
++filename.LuxiMono-Regular=/usr/share/fonts/TTF/luximr.ttf
++filename.LuxiMono-Bold=/usr/share/fonts/TTF/luximb.ttf
++filename.LuxiMono-Oblique=/usr/share/fonts/TTF/luximri.ttf
++filename.LuxiMono-BoldOblique=/usr/share/fonts/TTF/luximbi.ttf
++filename.LuxiSerif-Regular=/usr/share/fonts/TTF/luxirr.ttf
++filename.LuxiSerif-Bold=/usr/share/fonts/TTF/luxirb.ttf
++filename.LuxiSerif-Oblique=/usr/share/fonts/TTF/luxirri.ttf
++filename.LuxiSerif-BoldOblique=/usr/share/fonts/TTF/luxirbi.ttf
++

Deleted: extra-x86_64/jdk7-openjdk.install
===================================================================
--- extra-x86_64/jdk7-openjdk.install	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-x86_64/jdk7-openjdk.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,50 +0,0 @@
-THIS_JDK='java-7-openjdk'
-
-fix_default() {
-  if [ ! -x /usr/bin/java ]; then
-    /usr/bin/archlinux-java unset
-    echo ""
-  else
-    /usr/bin/archlinux-java get
-  fi
-}
-
-post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "" | ${THIS_JDK}/jre)
-      /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
-}
-
-post_upgrade() {
-  default=$(fix_default)
-  if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then
-    /usr/bin/archlinux-java set ${THIS_JDK}
-  fi
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
-}
-
-pre_remove() {
-  if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
-    /usr/bin/archlinux-java unset
-    if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
-      /usr/bin/archlinux-java set ${THIS_JDK}/jre
-    fi
-  fi
-}

Copied: java7-openjdk/repos/extra-x86_64/jdk7-openjdk.install (from rev 289225, java7-openjdk/trunk/jdk7-openjdk.install)
===================================================================
--- extra-x86_64/jdk7-openjdk.install	                        (rev 0)
+++ extra-x86_64/jdk7-openjdk.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,50 @@
+THIS_JDK='java-7-openjdk'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "" | ${THIS_JDK}/jre)
+      /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
+}
+
+post_upgrade() {
+  default=$(fix_default)
+  if [ -z "${default}" -o "x${default}" = "x${THIS_JDK}/jre" ]; then
+    /usr/bin/archlinux-java set ${THIS_JDK}
+  fi
+
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/bin/update-ca-trust
+  fi
+}
+
+pre_remove() {
+  if [ "x$(fix_default)" = "x${THIS_JDK}" ]; then
+    /usr/bin/archlinux-java unset
+    if [ -x /usr/lib/jvm/${THIS_JDK}/jre/bin/java ]; then
+      /usr/bin/archlinux-java set ${THIS_JDK}/jre
+    fi
+  fi
+}

Deleted: extra-x86_64/jre7-openjdk-headless.install
===================================================================
--- extra-x86_64/jre7-openjdk-headless.install	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-x86_64/jre7-openjdk-headless.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,48 +0,0 @@
-THIS_JRE='java-7-openjdk/jre'
-
-fix_default() {
-  if [ ! -x /usr/bin/java ]; then
-    /usr/bin/archlinux-java unset
-    echo ""
-  else
-    /usr/bin/archlinux-java get
-  fi
-}
-
-post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "")
-      /usr/bin/archlinux-java set ${THIS_JRE}
-      ;;
-    ${THIS_JRE} | ${THIS_JRE/\/jre})
-      # 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
-}
-
-post_upgrade() {
-  if [ -z $(fix_default) ]; then
-    /usr/bin/archlinux-java set ${THIS_JRE}
-  fi
-
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/bin/update-ca-trust
-  fi
-}
-
-pre_remove() {
-  default=$(fix_default)
-  if [ "x${default/\/jre}" = "x${THIS_JRE/\/jre}" ]; then
-    /usr/bin/archlinux-java unset
-    echo "No Java environment is set as default anymore"
-  fi
-}

Copied: java7-openjdk/repos/extra-x86_64/jre7-openjdk-headless.install (from rev 289225, java7-openjdk/trunk/jre7-openjdk-headless.install)
===================================================================
--- extra-x86_64/jre7-openjdk-headless.install	                        (rev 0)
+++ extra-x86_64/jre7-openjdk-headless.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,48 @@
+THIS_JRE='java-7-openjdk/jre'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "")
+      /usr/bin/archlinux-java set ${THIS_JRE}
+      ;;
+    ${THIS_JRE} | ${THIS_JRE/\/jre})
+      # 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
+}
+
+post_upgrade() {
+  if [ -z $(fix_default) ]; then
+    /usr/bin/archlinux-java set ${THIS_JRE}
+  fi
+
+  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
+    /usr/bin/update-ca-trust
+  fi
+}
+
+pre_remove() {
+  default=$(fix_default)
+  if [ "x${default/\/jre}" = "x${THIS_JRE/\/jre}" ]; then
+    /usr/bin/archlinux-java unset
+    echo "No Java environment is set as default anymore"
+  fi
+}

Deleted: extra-x86_64/jre7-openjdk.install
===================================================================
--- extra-x86_64/jre7-openjdk.install	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-x86_64/jre7-openjdk.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,55 +0,0 @@
-THIS_JRE='java-7-openjdk/jre'
-
-fix_default() {
-  if [ ! -x /usr/bin/java ]; then
-    /usr/bin/archlinux-java unset
-    echo ""
-  else
-    /usr/bin/archlinux-java get
-  fi
-}
-
-post_install() {
-  default=$(fix_default)
-  case ${default} in
-    "")
-      /usr/bin/archlinux-java set ${THIS_JRE}
-      ;;
-    ${THIS_JRE} | ${THIS_JRE/\/jre})
-      # Nothing
-      ;;
-    *)
-      echo "Default Java environment is already set to '${default}'"
-      echo "See 'archlinux-java help' to change it"
-      ;;
-  esac
-
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  echo "when you use a non-reparenting window manager,"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
-
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  if [ -z $(fix_default) ]; then
-    /usr/bin/archlinux-java set ${THIS_JRE}
-  fi
-
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-
-#  update-desktop-database -q
-}
-
-pre_remove() {
-  if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then
-    /usr/bin/archlinux-java unset
-    echo "No Java environment is set as default anymore"
-  fi
-}
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-
-#  update-desktop-database -q
-}

Copied: java7-openjdk/repos/extra-x86_64/jre7-openjdk.install (from rev 289225, java7-openjdk/trunk/jre7-openjdk.install)
===================================================================
--- extra-x86_64/jre7-openjdk.install	                        (rev 0)
+++ extra-x86_64/jre7-openjdk.install	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,55 @@
+THIS_JRE='java-7-openjdk/jre'
+
+fix_default() {
+  if [ ! -x /usr/bin/java ]; then
+    /usr/bin/archlinux-java unset
+    echo ""
+  else
+    /usr/bin/archlinux-java get
+  fi
+}
+
+post_install() {
+  default=$(fix_default)
+  case ${default} in
+    "")
+      /usr/bin/archlinux-java set ${THIS_JRE}
+      ;;
+    ${THIS_JRE} | ${THIS_JRE/\/jre})
+      # Nothing
+      ;;
+    *)
+      echo "Default Java environment is already set to '${default}'"
+      echo "See 'archlinux-java help' to change it"
+      ;;
+  esac
+
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  echo "when you use a non-reparenting window manager,"
+  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in /etc/profile.d/jre.sh"
+
+#  update-desktop-database -q
+}
+
+post_upgrade() {
+  if [ -z $(fix_default) ]; then
+    /usr/bin/archlinux-java set ${THIS_JRE}
+  fi
+
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+
+#  update-desktop-database -q
+}
+
+pre_remove() {
+  if [ "x$(fix_default)" = "x${THIS_JRE/\/jre}" ]; then
+    /usr/bin/archlinux-java unset
+    echo "No Java environment is set as default anymore"
+  fi
+}
+
+post_remove() {
+  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+
+#  update-desktop-database -q
+}

Deleted: extra-x86_64/openjdk7_nonreparenting-wm.diff
===================================================================
--- extra-x86_64/openjdk7_nonreparenting-wm.diff	2017-02-18 20:08:50 UTC (rev 289225)
+++ extra-x86_64/openjdk7_nonreparenting-wm.diff	2017-02-18 20:22:20 UTC (rev 289226)
@@ -1,58 +0,0 @@
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2013-10-16 16:17:14.000000000 +0200
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2013-10-21 20:57:34.768580842 +0200
-@@ -105,7 +105,8 @@
-         LG3D_WM = 13,
-         CWM_WM = 14,
-         MUTTER_WM = 15,
--        MARCO_WM = 16;
-+        MARCO_WM = 16,
-+        OTHER_NONREPARENTING_WM = 17;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -591,7 +592,7 @@
-     // TODO: according to wikipedia, compiz is now reparenting. This should
-     // probably be updated.
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -781,9 +782,17 @@
-              * supports WIN or _NET wm spec.
-              */
-             else if (l_net_protocol.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+                }
-             } else if (win.active()) {
--                awt_wmgr = XWM.OTHER_WM;
-+                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-+                } else {
-+                    awt_wmgr = XWM.OTHER_WM;
-+                }
-             }
-             /*
-              * Check for legacy WMs.
-@@ -794,6 +803,8 @@
-                 awt_wmgr = XWM.MOTIF_WM;
-             } else if (isOpenLook()) {
-                 awt_wmgr = XWM.OPENLOOK_WM;
-+            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
-+                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
-             } else {
-                 awt_wmgr = XWM.OTHER_WM;
-             }
-@@ -1309,6 +1320,7 @@
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;

Copied: java7-openjdk/repos/extra-x86_64/openjdk7_nonreparenting-wm.diff (from rev 289225, java7-openjdk/trunk/openjdk7_nonreparenting-wm.diff)
===================================================================
--- extra-x86_64/openjdk7_nonreparenting-wm.diff	                        (rev 0)
+++ extra-x86_64/openjdk7_nonreparenting-wm.diff	2017-02-18 20:22:20 UTC (rev 289226)
@@ -0,0 +1,58 @@
+--- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java.orig	2013-10-16 16:17:14.000000000 +0200
++++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java	2013-10-21 20:57:34.768580842 +0200
+@@ -105,7 +105,8 @@
+         LG3D_WM = 13,
+         CWM_WM = 14,
+         MUTTER_WM = 15,
+-        MARCO_WM = 16;
++        MARCO_WM = 16,
++        OTHER_NONREPARENTING_WM = 17;
+     public String toString() {
+         switch  (WMID) {
+           case NO_WM:
+@@ -591,7 +592,7 @@
+     // TODO: according to wikipedia, compiz is now reparenting. This should
+     // probably be updated.
+     static boolean isNonReparentingWM() {
+-        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM);
++        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.CWM_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
+     }
+ 
+     /*
+@@ -781,9 +782,17 @@
+              * supports WIN or _NET wm spec.
+              */
+             else if (l_net_protocol.active()) {
+-                awt_wmgr = XWM.OTHER_WM;
++                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++                } else {
++                    awt_wmgr = XWM.OTHER_WM;
++                }
+             } else if (win.active()) {
+-                awt_wmgr = XWM.OTHER_WM;
++                if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                    awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
++                } else {
++                    awt_wmgr = XWM.OTHER_WM;
++                }
+             }
+             /*
+              * Check for legacy WMs.
+@@ -794,6 +803,8 @@
+                 awt_wmgr = XWM.MOTIF_WM;
+             } else if (isOpenLook()) {
+                 awt_wmgr = XWM.OPENLOOK_WM;
++            } else if (XToolkit.getEnv("_JAVA_AWT_WM_NONREPARENTING") != null) {
++                awt_wmgr = XWM.OTHER_NONREPARENTING_WM;
+             } else {
+                 awt_wmgr = XWM.OTHER_WM;
+             }
+@@ -1309,6 +1320,7 @@
+                   res = new Insets(28, 6, 6, 6);
+                   break;
+               case NO_WM:
++              case OTHER_NONREPARENTING_WM:
+               case LG3D_WM:
+                   res = zeroInsets;
+                   break;



More information about the arch-commits mailing list