Sun Mar 3 01:04:55 PST 2013

22 files changed, 238 insertions, 620 deletions

diff --git a/extra/graphite/PKGBUILD b/extra/graphite/PKGBUILD
index b46e5f298..914b2bc03 100644
--- a/extra/graphite/PKGBUILD
+++ b/extra/graphite/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 173763 2012-12-22 16:44:26Z andyrtr $
+# $Id: PKGBUILD 179056 2013-03-02 11:28:27Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=graphite
-pkgver=1.2.0
+pkgver=1.2.1
 pkgrel=1
 epoch=1
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'freetype2' 'python2')
 # 'doxygen' 'texlive-latexextra' 'graphviz' 'asciidoc' 'perl-module-build' 'icu') - only for docs - target doesn't install properly
 options=('!libtool' '!emptydirs')
 source=("http://downloads.sourceforge.net/project/silgraphite/graphite2/graphite2-${pkgver}.tgz")
-md5sums=('f5ef3f7f10fa8c3542c6a085a233080b')
+md5sums=('edf70ab2f7d789be219f47b1df00d67e')
 
 build() {
   cd "${srcdir}"
@@ -26,7 +26,7 @@ build() {
 	-DCMAKE_BUILD_TYPE:STRING=Release \
 	-DGRAPHITE2_COMPARE_RENDERER=OFF
   make
-  make docs
+#  make docs
 }
 
 check() {
diff --git a/extra/icedtea-web/PKGBUILD b/extra/icedtea-web/PKGBUILD
deleted file mode 100644
index 1e1eaa593..000000000
--- a/extra/icedtea-web/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 170458 2012-11-07 20:07:26Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgbase=icedtea-web
-pkgname=('icedtea-web' 'icedtea-web-doc')
-pkgver=1.3.1
-pkgrel=1
-arch=('i686' 'x86_64')
-url="http://icedtea.classpath.org/wiki/IcedTea-Web"
-license=('GPL2')
-makedepends=('openjdk6' 'zip' 'gtk2' 'npapi-sdk' 'rhino' 'junit' 'firefox' 'chromium' 'epiphany')
-noextract=$pkgname-$pkgver.tar.gz # due to broken path names in the tarball that fails with LANG=C in our chroot
-source=(http://icedtea.classpath.org/download/source/$pkgname-$pkgver.tar.gz)
-sha256sums=('20c7fd1eef6c79cbc6478bb01236a3eb2f0af6184eaed24baca59a3c37eafb56')
-
-_javaver=6
-_jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-build() {
-  # extract it
-  cd "$srcdir"
-  LANG=en_US.UTF-8 bsdtar -x -f ${srcdir}/$pkgname-$pkgver.tar.gz
-
-  cd "$srcdir/$pkgname-$pkgver"
-  ./configure --prefix=${_jvmdir} \
-      --datarootdir=/usr/share \
-      --with-browser-tests \
-      --with-firefox=/usr/bin/firefox \
-      --with-chromium=/usr/bin/chromium \
-      --with-epiphany=/usr/bin/epiphany \
-      --with-gtk=2
-  make
-}
-
-check() {
-  cd "$srcdir/$pkgname-$pkgver"
-  # as more tests have been added some are expectged to fail
-  # see http://mail.openjdk.java.net/pipermail/distro-pkg-dev/2012-March/017566.html
-  make -k check || /bin/true
-}
-
-
-package_icedtea-web() {
-
-  pkgdesc="provides a Free Software web browser plugin running applets written in the Java programming language and an implementation of Java Web Start, originally based on the NetX project"
-  depends=('openjdk6' 'gtk2' 'desktop-file-utils')
-  provides=('java-web-start=6')
-  install=$pkgname.install
-
-  cd "$srcdir/$pkgname-$pkgver"
-  # possible make target (see bottom of Makefile.am: install-exec-local install-data-local
-  make DESTDIR="$pkgdir" install-exec-local install-data-local
-
-  # Install desktop files.
-  install -m755 -d ${pkgdir}/usr/share/{applications,pixmaps}
-  install -m644 javaws.png ${pkgdir}/usr/share/pixmaps
-  install -m644 {javaws,itweb-settings}.desktop ${pkgdir}/usr/share/applications
-  # remove splitted doc files
-  rm -rf ${pkgdir}/usr/share/doc
-
-  # link binaries into /usr/bin + jre/bin
-  install -m755 -d ${pkgdir}/usr/bin
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre/bin
-  pushd ${pkgdir}/${_jvmdir}/bin
-  for file in *; do
-    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/usr/bin
-    ln -sf ${_jvmdir}/bin/${file} ${pkgdir}/${_jvmdir}/jre/bin
-  done
-  popd
-
-  # link the mozilla-plugin - test it here http://www.java.com/en/download/help/testvm.xml
-  install -m755 -d ${pkgdir}/usr/lib/mozilla/plugins/
-  ln -sf ${_jvmdir}/lib/IcedTeaPlugin.so ${pkgdir}/usr/lib/mozilla/plugins/
-}
-
-package_icedtea-web-doc() {
-
-  pkgdesc="icedtea-web browser plugin + Java WebStart - documentation files"
-
-  cd "$srcdir/$pkgbase-$pkgver"
-  make DESTDIR="$pkgdir" install-data-local
-  # remove javaws about and man page
-  rm -rf ${pkgdir}/usr/lib
-  rm -rf ${pkgdir}/usr/share/man
-  rm -rf ${pkgdir}/usr/share/icedtea-web # conflicting and unneeded file it seems
-}
diff --git a/extra/icedtea-web/icedtea-web.install b/extra/icedtea-web/icedtea-web.install
deleted file mode 100644
index 80312d4a6..000000000
--- a/extra/icedtea-web/icedtea-web.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  update-desktop-database -q
-}
-
-post_remove() {
-  update-desktop-database -q
-}
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index e32fe24e5..a2b13d6f1 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178048 2013-02-14 17:38:00Z giovanni $
+# $Id: PKGBUILD 179062 2013-03-02 20:09:24Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2013.02.11
+pkgver=2013.02.27
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('1dc7bc4dee0c63efe1eefe13478d168d')
+md5sums=('7d0b620c37e2ab1646a33074d7fc39f9')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mariadb/PKGBUILD b/extra/mariadb/PKGBUILD
new file mode 100644
index 000000000..9678abd12
--- /dev/null
+++ b/extra/mariadb/PKGBUILD
@@ -0,0 +1,136 @@
+# $Id: PKGBUILD 179064 2013-03-02 21:39:03Z bpiotrowski $
+# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+
+pkgbase=mariadb
+pkgname=('libmariadbclient' 'mariadb-clients' 'mariadb')
+pkgver=5.5.29
+pkgrel=4
+arch=('i686' 'x86_64')
+license=('GPL')
+url='http://mariadb.org/'
+makedepends=('cmake' 'openssl' 'zlib')
+options=('!libtool')
+source=(http://mirrors.supportex.net/$pkgbase/$pkgbase-$pkgver/kvm-tarbake-jaunty-x86/$pkgbase-$pkgver.tar.gz
+        mariadb.service
+        mariadb-post.sh
+        mariadb-tmpfile.conf)
+sha256sums=('b0e25b5451dbf8e8c8bf243bbd0aeb264db0da2caceafc7e2c9fad77b8d4be74'
+            'a6cf5446159fff16598d0d787dd3a3c30a53a656a5f876ddb608bc60e234d334'
+            '368f9fd2454d80eb32abb8f29f703d1cf9553353fb9e1ae4529c4b851cb8c5dd'
+            '2af318c52ae0fe5428e8a9245d1b0fc3bc5ce153842d1563329ceb1edfa83ddd')
+
+build() {
+  cd $srcdir
+  mkdir build
+  cd build
+
+  cmake ../$pkgbase-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DSYSCONFDIR=/etc/mysql \
+    -DMYSQL_DATADIR=/var/lib/mysql \
+    -DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock \
+    -DDEFAULT_CHARSET=utf8 \
+    -DDEFAULT_COLLATION=utf8_general_ci \
+    -DENABLED_LOCAL_INFILE=ON \
+    -DINSTALL_INFODIR=share/mysql/docs \
+    -DINSTALL_MANDIR=share/man \
+    -DINSTALL_PLUGINDIR=/usr/lib/mysql/plugin \
+    -DINSTALL_SCRIPTDIR=bin \
+    -DINSTALL_INCLUDEDIR=include/mysql \
+    -DINSTALL_DOCREADMEDIR=share/mysql \
+    -DINSTALL_SUPPORTFILESDIR=share/mysql \
+    -DINSTALL_MYSQLSHAREDIR=share/mysql \
+    -DINSTALL_DOCDIR=share/mysql/docs \
+    -DINSTALL_SHAREDIR=share/mysql \
+    -DWITH_READLINE=ON \
+    -DWITH_ZLIB=system \
+    -DWITH_SSL=system \
+    -DWITH_LIBWRAP=OFF \
+    -DWITH_EXTRA_CHARSETS=complex \
+    -DWITH_EMBEDDED_SERVER=ON \
+    -DWITH_ARCHIVE_STORAGE_ENGINE=1 \
+    -DWITH_BLACKHOLE_STORAGE_ENGINE=1 \
+    -DWITH_INNOBASE_STORAGE_ENGINE=1 \
+    -DWITH_PARTITION_STORAGE_ENGINE=1 \
+    -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \
+    -DWITHOUT_FEDERATED_STORAGE_ENGINE=1 \
+    -DWITHOUT_PBXT_STORAGE_ENGINE=1 \
+    -DCMAKE_C_FLAGS="-fPIC ${CFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -fomit-frame-pointer" \
+    -DCMAKE_CXX_FLAGS="-fPIC ${CXXFLAGS} -fno-strict-aliasing -DBIG_JOINS=1 -felide-constructors -fno-rtti" \
+    -DWITH_MYSQLD_LDFLAGS="${LDFLAGS}"
+
+
+  make
+}
+
+package_libmariadbclient() {
+  pkgdesc="MariaDB client libraries"
+  depends=('openssl')
+  conflicts=('libmysqlclient')
+  provides=("libmysqlclient=$pkgver")
+  
+  cd "$srcdir"/build
+  for dir in include libmysql libmysqld libservices; do
+    make -C $dir DESTDIR="$pkgdir" install
+  done
+
+  install -d "$pkgdir"/usr/bin
+  install -m755 scripts/mysql_config "$pkgdir"/usr/bin/
+  install -d "$pkgdir"/usr/share/man/man1
+  for man in mysql_config mysql_client_test_embedded mysqltest_embedded; do
+    install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+  done
+}
+
+package_mariadb-clients() {
+  pkgdesc="MariaDB client tools"
+  depends=('libmariadbclient')
+  conflicts=('mysql-clients')
+  provides=("mysql-clients=$pkgver")
+  
+  cd "$srcdir"/build
+  make -C client DESTDIR="$pkgdir" install
+
+  # install man pages
+  install -d "$pkgdir"/usr/share/man/man1
+  for man in mysql mysqladmin mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap; do
+    install -m644 "$srcdir"/$pkgbase-$pkgver/man/$man.1 "$pkgdir"/usr/share/man/man1/$man.1
+  done
+
+  # provided by mariadb
+  rm "$pkgdir"/usr/bin/{mysql_{plugin,upgrade},mysqlbinlog,mysqltest}
+}
+
+package_mariadb() {
+  pkgdesc="A fast SQL database server, drop-in replacement for MySQL"
+  backup=('etc/mysql/my.cnf')
+  install=mariadb.install
+  depends=('mariadb-clients')
+  conflicts=('mysql')
+  provides=("mysql=$pkgver")
+  optdepends=('perl-dbi' 'perl-dbd-mysql')
+  options=('emptydirs')
+
+  cd "$srcdir"/build
+  make DESTDIR="$pkgdir" install
+
+  install -Dm644 "$pkgdir"/usr/share/mysql/my-medium.cnf "$pkgdir"/etc/mysql/my.cnf
+  install -Dm755 "$srcdir"/mariadb-post.sh "$pkgdir"/usr/bin/mysqld-post
+  install -Dm644 "$srcdir"/mariadb.service "$pkgdir"/usr/lib/systemd/system/mysqld.service
+  install -Dm644 "$srcdir"/mariadb-tmpfile.conf "$pkgdir"/usr/lib/tmpfiles.d/mysql.conf
+
+  # provided by libmariadbclient
+  rm "$pkgdir"/usr/bin/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}
+  rm "$pkgdir"/usr/lib/libmysql*
+  rm -r "$pkgdir"/usr/include/
+  rm "$pkgdir"/usr/share/man/man1/{mysql_config,mysql_client_test_embedded,mysqltest_embedded}.1
+  
+  # provided by mariadb-clients
+  rm "$pkgdir"/usr/bin/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}
+  rm "$pkgdir"/usr/share/man/man1/{mysql,mysqladmin,mysqlcheck,mysqldump,mysqlimport,mysqlshow,mysqlslap}.1
+
+  # not needed
+  rm -r "$pkgdir"/usr/{data,mysql-test,sql-bench}
+  rm "$pkgdir"/usr/share/man/man1/mysql-test-run.pl.1
+}
diff --git a/extra/mariadb/mariadb-post.sh b/extra/mariadb/mariadb-post.sh
new file mode 100755
index 000000000..c4ac18171
--- /dev/null
+++ b/extra/mariadb/mariadb-post.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+while true; do
+    response=$(/usr/bin/mysqladmin -uUNKNOWN_USER ping 2>&1) && break
+    echo "$response" | grep -q "mysqld is alive" && break
+    echo "$response" | grep -q "Access denied for user" && break 
+    sleep 1
+done
diff --git a/extra/mariadb/mariadb-tmpfile.conf b/extra/mariadb/mariadb-tmpfile.conf
new file mode 100644
index 000000000..6883dc798
--- /dev/null
+++ b/extra/mariadb/mariadb-tmpfile.conf
@@ -0,0 +1 @@
+d /run/mysqld 0755 mysql mysql -
diff --git a/extra/mariadb/mariadb.install b/extra/mariadb/mariadb.install
new file mode 100644
index 000000000..de619b668
--- /dev/null
+++ b/extra/mariadb/mariadb.install
@@ -0,0 +1,44 @@
+if [[ $(command -v my_print_defaults >/dev/null 2>&1) ]]; then
+  datadir=$(my_print_defaults mysqld | sed -n "s/^--datadir=//p")
+fi
+[[ -z $datadir ]] && datadir=/var/lib/mysql
+
+post_install(){
+  groupadd -g 89 mysql &>/dev/null
+  useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+
+  if [[ ! -e $datadir ]]; then
+    install -dm700 $datadir
+    usr/bin/mysql_install_db --user=mysql --basedir=/usr --datadir=$datadir
+    chown -R mysql:mysql var/lib/mysql &>/dev/null
+  fi
+
+  usr/bin/systemd-tmpfiles --create mysqld.conf
+}
+
+post_upgrade(){
+  getent group mysql >/dev/null 2>&1 || groupadd -g 89 mysql &>/dev/null
+  getent passwd mysql >/dev/null 2>&1 || useradd -u 89 -g mysql -d $datadir -s /bin/false mysql &>/dev/null
+
+  if [[ "$(vercmp $2 5.5.25-4)" -lt 0 ]] && [[ -d /data ]]; then
+    for x in data/*; do
+      cp -r $x $datadir/
+    done
+    rm -rf data
+  fi
+
+  if [[ "$(vercmp $2 5.5.25-5)" -lt 0 ]]; then
+    echo ">>> mysql.service has been renamed to mysqld.service to keep"
+    echo "    consistency with MySQL package." 
+  fi
+}
+
+post_remove(){
+  if getent passwd mysql >/dev/null 2>&1; then
+    userdel mysql
+
+  fi
+  if getent group mysql >/dev/null 2>&1; then
+    groupdel mysql
+  fi
+}
diff --git a/extra/mariadb/mariadb.service b/extra/mariadb/mariadb.service
new file mode 100644
index 000000000..dd65511d7
--- /dev/null
+++ b/extra/mariadb/mariadb.service
@@ -0,0 +1,16 @@
+[Unit]
+Description=MariaDB database server
+After=syslog.target
+
+[Service]
+User=mysql
+Group=mysql
+
+ExecStart=/usr/bin/mysqld --pid-file=/run/mysqld/mysqld.pid 
+ExecStartPost=/usr/bin/mysqld-post
+
+Restart=always
+PrivateTmp=true
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/openjdk6/PKGBUILD b/extra/openjdk6/PKGBUILD
deleted file mode 100644
index e4d5eec23..000000000
--- a/extra/openjdk6/PKGBUILD
+++ /dev/null
@@ -1,184 +0,0 @@
-# $Id: PKGBUILD 178353 2013-02-20 17:01:28Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor: Jan de Groot <jgc@archlinux.org>
-
-pkgname=('openjdk6' 'openjdk6-src')
-pkgbase="openjdk6"
-_javaver=6
-_icedteaver=1.12.3
-_openjdk_version=b27
-_openjdk_date=26_oct_2012
-pkgver=${_javaver}.${_openjdk_version}_${_icedteaver}
-pkgrel=1
-url='http://icedtea.classpath.org'
-arch=('i686' 'x86_64')
-license=('custom')
-makedepends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'alsa-lib' 'giflib' 'libxp' 'gtk2'
-	     'nspr' 'zlib' 'freetype2' 'libjpeg>=8' 'libx11' 'libcups' 'patch' 'libxt' 'nss' 'libxslt'
-	     'apache-ant' 'autoconf' 'unzip' 'rhino' 'mercurial' 'zip' 'cpio' 'openjdk6' 'inetutils' 'wget')
-options=('!emptydirs')
-source=(http://icedtea.classpath.org/download/source/icedtea6-${_icedteaver}.tar.gz{,.sig}
-	http://download.java.net/openjdk/jdk6/promoted/${_openjdk_version}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	http://icedtea.classpath.org/download/drops/jaxp144_04.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaxws2_1_6-2011_06_13.zip
-	http://icedtea.classpath.org/download/drops/jdk6-jaf-b20.zip
-	fix_jdk_cmds_path.diff
-	fix_corba_cmds_path.diff
-	fontconfig-paths.diff
-	nonreparenting-wm.diff
-	disable_Werror.diff
-	openjdk6.profile
-	openjdk6.profile.csh)
-noextract=(openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz
-	jaxp144_04.zip
-	jdk6-jaxws2_1_6-2011_06_13.zip
-	jdk6-jaf-b20.zip)
-sha256sums=('db9dc14fa537fb22616fcd9e5b80758aa7baa66e0b6f8adfe3d5e80414574b4c'
-            'a6cbeccc4f25f72a940b9ac0c3e05ece50edc16c1c13f7a1a82ee895563930e3'
-            '044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0'
-            '490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c'
-            '229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3'
-            '78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012'
-            'f5f59e121f7645ebc449bb13569fd924cbab3194e41db901f4fbe9dbd45720c5'
-            '7b2db65bfb9d5014e1522178d65cabf05dfa85e0926cde5648b5a338db376479'
-            '9ad943ceb3dbcdf45d72974fc3667886a7ed65c69ab9abc17be5412827551a7f'
-            '9c3c55c30729ec44fab14c3f3f841c273730c7467d8908a72f018bc9e9f65bd9'
-            'eb4c7f4cf50f5f74b683857f707bd21ec3847267e2e5e3173f42a6910a024f97'
-            '26e2cd5a6034f08a685129c9412f487b9931fb0d556f1ccceab17bdb75a372cd'
-            '0c2d9116d6e550021994d6713a93621a9df685d2182996be3249ad812712b007')
-
-build() {
-
-  unset JAVA_HOME
-  unset CLASSPATH
-  
-    [ -z "${ANT_HOME}" ] && . /etc/profile.d/apache-ant.sh
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-
-  ln -s ${srcdir}/openjdk-6-src-${_openjdk_version}-${_openjdk_date}.tar.gz .
-
-  cp ${srcdir}/*.diff ${srcdir}/icedtea6-${_icedteaver}/patches/
-
-  autoreconf -i
-
-  export DISTRIBUTION_PATCHES="patches/fix_jdk_cmds_path.diff patches/fontconfig-paths.diff patches/fix_corba_cmds_path.diff patches/nonreparenting-wm.diff patches/disable_Werror.diff"
-
-  export ALT_PARALLEL_COMPILE_JOBS="${MAKEFLAGS/-j}"
-  export HOTSPOT_BUILD_JOBS="${ALT_PARALLEL_COMPILE_JOBS}"
-  unset MAKEFLAGS
-
-  ./configure --with-parallel-jobs=${HOTSPOT_BUILD_JOBS} \
-	--with-ant-home=/usr/share/java/apache-ant \
-	--with-pkgversion=ArchLinux-${pkgver}-${pkgrel}-$CARCH \
-	--with-jaxp-drop-zip=${srcdir}/jaxp144_04.zip \
-  	--with-jaxws-drop-zip=${srcdir}/jdk6-jaxws2_1_6-2011_06_13.zip \
-	--with-jaf-drop-zip=${srcdir}/jdk6-jaf-b20.zip \
-	--disable-bootstrap \
-	--with-abs-install-dir=${_jvmdir}
-  LD_PRELOAD="" make 
-}
-
-package_openjdk6() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 with IcedTea6 replacing binary plugs.'
- backup=(etc/profile.d/openjdk6.sh)
- depends=('gcc-libs' 'xdg-utils' 'hicolor-icon-theme' 'ca-certificates-java' 'libxtst' 'libxt' 'nss' 'libjpeg' 'freetype2' 'libxrender' 'libpng>=1.5.7')
- optdepends=('icedtea-web: web browser plugin + Java Web Start'
-            'alsa-lib: for sound'
-            'giflib: for gif format support')
- conflicts=('java-environment' 'java-runtime')
- provides=('java-environment=6' 'java-runtime=6' 'java-runtime-headless=6')
- install=openjdk6.install
-
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
-
-   # Install main files.
-  cp -a bin include lib ${pkgdir}/${_jvmdir}/ 
-  cp -a jre/bin jre/lib ${pkgdir}/${_jvmdir}/jre/ 
-
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.properties.src \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.properties.src 
-  mv ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.Ubuntu.bfc \
-     ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.bfc 
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.bfc
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/fontconfig.*.properties.src
-
-   # Install man pages.
-  install -m755 -d ${pkgdir}/usr/share/man/man1
-  install -m644 man/man1/*.1 ${pkgdir}/usr/share/man/man1/ 
-  
-   # Install demos and samples.
-  cp -a demo ${pkgdir}/${_jvmdir}/ 
-  install -m755 -d sample/rmi
-  mv bin/java-rmi.cgi sample/rmi 
-  cp -a sample ${pkgdir}/${_jvmdir}/ 
-  popd
-
-  # Install icons and menu entries.
-  for s in 16 24 32 48 ; do
-    install -m755 -d ${pkgdir}/usr/share/icons/hicolor/${s}x${s}/apps
-    install -m644 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 -m755 -d ${pkgdir}/usr/share/applications
-  install -m644 {jconsole,policytool}.desktop ${pkgdir}/usr/share/applications
-
-  # link binaries into /usr/bin
-  install -m755 -d ${pkgdir}/usr/bin
-  pushd ${pkgdir}/${_jvmdir}/bin
-  for file in *; do
-    ln -sf ${_jvmdir}/bin/${file} \
-      ${pkgdir}/usr/bin 
-  done
-  popd
-
-  # link JKS keystore from ca-certificates-java
-  rm -f ${pkgdir}/${_jvmdir}/jre/lib/security/cacerts
-  ln -sf /etc/ssl/certs/java/cacerts "${pkgdir}/${_jvmdir}/jre/lib/security/cacerts"
- 
-  # set some variables
-  install -m755 -d ${pkgdir}/etc/profile.d
-  install -m755 ${srcdir}/openjdk6.profile ${pkgdir}/etc/profile.d/openjdk6.sh 
-  install -m755 ${srcdir}/openjdk6.profile.csh ${pkgdir}/etc/profile.d/openjdk6.csh 
-  
-  # install license
-  install -Dm644 ${srcdir}//icedtea6-${_icedteaver}/openjdk/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
-}
-
-package_openjdk6-src() {
- pkgdesc='Free Java environment based on OpenJDK 6.0 Source Bundle'
- depends=('openjdk6')
- 
-  if [ "${CARCH}" = "x86_64" ]; then
-    _arch=amd64
-  else
-    _arch=i586
-  fi
-
-  _javaver=6
-  _jvmdir=/usr/lib/jvm/java-${_javaver}-openjdk
-
-  cd ${srcdir}/icedtea6-${_icedteaver}
-  install -m755 -d ${pkgdir}/${_jvmdir}/jre
-  
-  pushd ${srcdir}/icedtea6-${_icedteaver}/openjdk.build/j2sdk-image
-   # Install src.zip file
-  cp -a src.zip ${pkgdir}/${_jvmdir}/ 
-}
diff --git a/extra/openjdk6/disable_Werror.diff b/extra/openjdk6/disable_Werror.diff
deleted file mode 100644
index fa8887a10..000000000
--- a/extra/openjdk6/disable_Werror.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- openjdk/hotspot/make/linux/makefiles/gcc.make	2012-06-07 16:30:51.000000000 +0200
-+++ openjdk/hotspot/make/linux/makefiles/gcc.make.new	2012-06-14 15:32:44.967695139 +0200
-@@ -150,7 +150,7 @@
- endif
- 
- # Compiler warnings are treated as errors
--WARNINGS_ARE_ERRORS = -Werror
-+#WARNINGS_ARE_ERRORS = -Werror
- 
- # Except for a few acceptable ones
- # Since GCC 4.3, -Wconversion has changed its meanings to warn these implicit
diff --git a/extra/openjdk6/fix_corba_cmds_path.diff b/extra/openjdk6/fix_corba_cmds_path.diff
deleted file mode 100644
index 7a3db9567..000000000
--- a/extra/openjdk6/fix_corba_cmds_path.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- openjdk/corba/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:26:12.000000000 +0300
-+++ openjdk/corba/make/common/shared/Defs-utils.gmk	2008-04-14 15:35:13.000000000 +0300
-@@ -76,7 +76,7 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -125,7 +125,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -176,7 +176,7 @@
-   # others have it in /usr/bin.
-   SORT=$(firstword $(wildcard $(UTILS_COMMAND_PATH)sort) \
- 		   $(wildcard $(UTILS_USR_BIN_PATH)sort))
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/extra/openjdk6/fix_jdk_cmds_path.diff b/extra/openjdk6/fix_jdk_cmds_path.diff
deleted file mode 100644
index bd37dd4ba..000000000
--- a/extra/openjdk6/fix_jdk_cmds_path.diff
+++ /dev/null
@@ -1,29 +0,0 @@
---- openjdk/jdk/make/common/shared/Defs-utils.gmk.old	2008-04-13 13:33:23.000000000 +0300
-+++ openjdk/jdk/make/common/shared/Defs-utils.gmk	2008-04-14 15:37:34.000000000 +0300
-@@ -89,7 +89,7 @@
- CHMOD          = $(UTILS_COMMAND_PATH)chmod
- CMP            = $(UTILS_USR_BIN_PATH)cmp
- COMM           = $(UTILS_USR_BIN_PATH)comm
--COMPRESS       = $(UTILS_USR_BIN_PATH)compress
-+COMPRESS       = $(UTILS_COMMAND_PATH)compress
- CP             = $(UTILS_COMMAND_PATH)cp
- CPIO           = $(UTILS_COMMAND_PATH)cpio
- CUT            = $(UTILS_USR_BIN_PATH)cut
-@@ -137,7 +137,7 @@
- TAIL           = $(UTILS_USR_BIN_PATH)tail
- TAR            = $(UTILS_COMMAND_PATH)tar
- TEST           = $(UTILS_USR_BIN_PATH)test
--TOUCH          = $(UTILS_COMMAND_PATH)touch
-+TOUCH          = $(UTILS_USR_BIN_PATH)touch
- TR             = $(UTILS_USR_BIN_PATH)tr
- TRUE           = $(UTILS_COMMAND_PATH)true
- UNAME          = $(UTILS_COMMAND_PATH)uname
-@@ -178,7 +178,7 @@
-   BASENAME=$(firstword $(wildcard $(UTILS_COMMAND_PATH)basename) \
-                        $(wildcard $(UTILS_USR_BIN_PATH)basename))
- 
--  NAWK           = $(USRBIN_PATH)gawk
-+  NAWK           = $(UTILS_COMMAND_PATH)gawk
-   # Intrinsic unix command, with backslash-escaped character interpretation
-   ECHO           = /bin/echo -e
-   # These are really in UTILS_USR_BIN_PATH on Linux (only sccs is not)
diff --git a/extra/openjdk6/fontconfig-paths.diff b/extra/openjdk6/fontconfig-paths.diff
deleted file mode 100644
index fa08db629..000000000
--- a/extra/openjdk6/fontconfig-paths.diff
+++ /dev/null
@@ -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
-+
diff --git a/extra/openjdk6/nonreparenting-wm.diff b/extra/openjdk6/nonreparenting-wm.diff
deleted file mode 100644
index 65fa66e89..000000000
--- a/extra/openjdk6/nonreparenting-wm.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff --git a/jdk/src/solaris/classes/sun/awt/X11/XWM.java b/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-index 68d1ff7..878327e 100644
---- openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-+++ openjdk/jdk/src/solaris/classes/sun/awt/X11/XWM.java
-@@ -99,7 +99,8 @@
-         METACITY_WM = 11,
-         COMPIZ_WM = 12,
-         LG3D_WM = 13,
--        MUTTER_WM = 14;
-+        MUTTER_WM = 14,
-+        OTHER_NONREPARENTING_WM = 15;
-     public String toString() {
-         switch  (WMID) {
-           case NO_WM:
-@@ -564,7 +567,7 @@ class XWM implements MWMConstants, XUtilConstants {
-     }
- 
-     static boolean isNonReparentingWM() {
--        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM);
-+        return (XWM.getWMID() == XWM.COMPIZ_WM || XWM.getWMID() == XWM.LG3D_WM || XWM.getWMID() == XWM.OTHER_NONREPARENTING_WM);
-     }
- 
-     /*
-@@ -764,9 +767,17 @@ class XWM implements MWMConstants, XUtilConstants {
-              * 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.
-@@ -777,6 +788,8 @@ class XWM implements MWMConstants, XUtilConstants {
-                 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;
-             }
-@@ -1298,6 +1311,7 @@ class XWM implements MWMConstants, XUtilConstants {
-                   res = new Insets(28, 6, 6, 6);
-                   break;
-               case NO_WM:
-+              case OTHER_NONREPARENTING_WM:
-               case LG3D_WM:
-                   res = zeroInsets;
-                   break;
diff --git a/extra/openjdk6/openjdk6.install b/extra/openjdk6/openjdk6.install
deleted file mode 100644
index 653c8fe2f..000000000
--- a/extra/openjdk6/openjdk6.install
+++ /dev/null
@@ -1,24 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-  echo "when you use a non-reparenting window manager"
-  echo "set _JAVA_AWT_WM_NONREPARENTING=1 in"
-  echo "/etc/profile.d/openjdk6.sh"
-#  update-desktop-database -q
-}
-
-post_upgrade() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-  if [ ! -f /etc/ssl/certs/java/cacerts ]; then
-    /usr/sbin/init-jks-keystore
-  fi
-#  update-desktop-database -q
-}
-
-
-post_remove() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
-#  update-desktop-database -q
-}
diff --git a/extra/openjdk6/openjdk6.profile b/extra/openjdk6/openjdk6.profile
deleted file mode 100644
index 9da4421ef..000000000
--- a/extra/openjdk6/openjdk6.profile
+++ /dev/null
@@ -1,6 +0,0 @@
-export J2SDKDIR=/usr/lib/jvm/java-6-openjdk
-export J2REDIR=$J2SDKDIR/jre
-export JAVA_HOME=/usr/lib/jvm/java-6-openjdk
-
-# enable this for non-reparenting window managers
-#export _JAVA_AWT_WM_NONREPARENTING=1
diff --git a/extra/openjdk6/openjdk6.profile.csh b/extra/openjdk6/openjdk6.profile.csh
deleted file mode 100644
index 3cb15fd49..000000000
--- a/extra/openjdk6/openjdk6.profile.csh
+++ /dev/null
@@ -1,6 +0,0 @@
-setenv J2SDKDIR "/usr/lib/jvm/java-6-openjdk"
-setenv J2REDIR "$J2SDKDIR/jre"
-setenv JAVA_HOME "/usr/lib/jvm/java-6-openjdk"
-
-# enable this for non-reparenting window managers
-#setenv _JAVA_AWT_WM_NONREPARENTING 1
diff --git a/extra/qoauth/PKGBUILD b/extra/qoauth/PKGBUILD
index 86b4adc21..de947b29e 100644
--- a/extra/qoauth/PKGBUILD
+++ b/extra/qoauth/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 153702 2012-03-18 08:58:10Z andrea $
+# $Id: PKGBUILD 179067 2013-03-02 22:33:09Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Peter Richard Lewis <plewis@aur.archlinux.org>
 
 pkgname=qoauth
 pkgver=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="Support with OAuth-powered network services"
 url='http://github.com/ayoy/qoauth'
 license=('GPL')
@@ -15,16 +15,16 @@ source=("http://files.ayoy.net/qoauth/release/current/src/${pkgname}-${pkgver}-s
 md5sums=('bcb6d01e6c9a6fb22099c9e0f5889578')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}-src"
+  cd ${pkgname}-${pkgver}-src
 
   # Install libraries in /usr/lib/
   sed -i 's|lib64|lib|' src/src.pro
 
-  qmake
+  qmake-qt4
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}-src"
+  cd ${pkgname}-${pkgver}-src
   make INSTALL_ROOT="${pkgdir}" install
 }
diff --git a/extra/qt-assistant-compat/PKGBUILD b/extra/qt-assistant-compat/PKGBUILD
index 8c8d6859a..a189b314b 100644
--- a/extra/qt-assistant-compat/PKGBUILD
+++ b/extra/qt-assistant-compat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178985 2013-03-01 10:24:14Z andrea $
+# $Id: PKGBUILD 179069 2013-03-02 22:41:59Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qt-assistant-compat
 pkgver=4.6.3
-pkgrel=3
+pkgrel=4
 pkgdesc="compat version of Qt Assistant"
 url="http://qt-project.org/"
 arch=('i686' 'x86_64')
@@ -16,8 +16,6 @@ md5sums=('a20148e0488d5c12ab35ccc107dcc64d'
 
 # separate package function does not really work here due to broken build files
 build() {
-    . /etc/profile.d/qt4.sh
-
 	cd ${srcdir}/qt-assistant-qassistantclient-library-compat-version-${pkgver}
 
 	patch -Np1 -i ${srcdir}/debian_patches_01_build_system.diff
@@ -25,11 +23,11 @@ build() {
 	cd lib; if [ -e Makefile ]; then $(MAKE) distclean; fi
 	rm -f translations/assistant_adp_*.qm
 
-	qmake CONFIG+=create_prl
+	qmake-qt4 CONFIG+=create_prl
 	make
 	cd  ../translations; lrelease assistant_adp_*.ts
 	cd ..
-	qmake CONFIG+=create_prl
+	qmake-qt4 CONFIG+=create_prl
 	make
 }
 
@@ -46,11 +44,11 @@ package() {
 		${pkgdir}/usr/lib/libQtAssistantClient.prl
 
 	# Install translations
-	install -d ${pkgdir}/usr/share/qt/translations/
+	install -d ${pkgdir}/usr/share/qt4/translations/
 	install -p -m0644 translations/assistant_adp_*.qm \
-		${pkgdir}/usr/share/qt/translations/
+		${pkgdir}/usr/share/qt4/translations/
 
 	# Install prf file
 	install -D -p -m0644 features/assistant.prf \
-		${pkgdir}/usr/share/qt/mkspecs/features/assistant.prf
+		${pkgdir}/usr/share/qt4/mkspecs/features/assistant.prf
 }
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index c101f1f2b..2efcd355f 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179026 2013-03-01 17:55:20Z andrea $
+# $Id: PKGBUILD 179054 2013-03-02 09:03:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt4
 pkgver=4.8.4
-pkgrel=12
+pkgrel=13
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -114,8 +114,6 @@ package() {
     find "${pkgdir}/usr/lib" -type f -name '*.prl' \
       -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d;s/\(QMAKE_PRL_LIBS =\).*/\1/' {} \;
 
-    # Do not install the qttools
-    rm "${pkgdir}"/usr/lib/qt4/bin/{assistant,designer,linguist}
-    rm -r "${pkgdir}"/usr/lib/qt4/plugins/designer
-    rm "${pkgdir}"/usr/share/qt4/translations/{assistant,designer,linguist}_*.qm
+    # The TGA plugin is broken (FS#33568)
+    rm "${pkgdir}"/usr/lib/qt4/plugins/imageformats/libqtga.so
 }
diff --git a/extra/qwt/PKGBUILD b/extra/qwt/PKGBUILD
index 2d653e600..1fe4ae2c7 100644
--- a/extra/qwt/PKGBUILD
+++ b/extra/qwt/PKGBUILD
@@ -1,31 +1,27 @@
-# $Id: PKGBUILD 178991 2013-03-01 10:24:47Z andrea $
+# $Id: PKGBUILD 179060 2013-03-02 20:03:20Z andrea $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=qwt
 pkgver=6.0.1
-pkgrel=4
+pkgrel=5
 pkgdesc="Qt Widgets for Technical Applications"
 arch=('i686' 'x86_64')
 url="http://qwt.sourceforge.net/"
 depends=('qt4')
-options=('!makeflags')
 license=("custom:$pkgname")
-source=("http://downloads.sourceforge.net/sourceforge/qwt/$pkgname-$pkgver.tar.bz2" \
+source=("http://downloads.sourceforge.net/${pkgname}/$pkgname-$pkgver.tar.bz2" \
         "qwtconfig-archlinux.pri")
 sha1sums=('301cca0c49c7efc14363b42e082b09056178973e'
           'aba0fc75f6d450237028b7b143bdcf05a79cabb3')
 
 build() {
-  . /etc/profile.d/qt4.sh
-
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # copy our config file to the right place
-  install -Dm644 ${srcdir}/qwtconfig-archlinux.pri \
-	${srcdir}/${pkgname}-${pkgver}/qwtconfig.pri
+  cp ${srcdir}/qwtconfig-archlinux.pri qwtconfig.pri
 
   # build qwt:
-  qmake qwt.pro
+  qmake-qt4 qwt.pro
   make
 }
 
@@ -39,11 +35,12 @@ package() {
   install -Dm755 designer/plugins/designer/libqwt_designer_plugin.so \
     ${pkgdir}/usr/lib/qt4/plugins/designer/
 
-  # Move man files to proper directory.
-#  install -d ${pkgdir}/usr/share/man/man3
-#  mv -f ${pkgdir}/usr/share/doc/qwt/man/man3/* ${pkgdir}/usr/share/man/man3
+  # needed by qmake (FS#30407)
+  install -d "${pkgdir}"/usr/share/qt4/mkspecs/features/
+  install -m644 qwtconfig.pri qwt.prf \
+    "${pkgdir}"/usr/share/qt4/mkspecs/features/
 
   # install licence
   install -Dm644 ${srcdir}/${pkgname}-${pkgver}/COPYING \
-	${pkgdir}/usr/share/licenses/${pkgname}/license.txt
+	${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }