Merge git://dev.alpinelinux.org/aports

20 files changed, 602 insertions, 58 deletions

diff --git a/testing/bluez-hcidump/APKBUILD b/testing/bluez-hcidump/APKBUILD
index 7f300493e..09b709209 100644
--- a/testing/bluez-hcidump/APKBUILD
+++ b/testing/bluez-hcidump/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez-hcidump
 pkgver=2.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Bluetooth HCI package analyzer"
 url="http://www.bluez.org/"
 arch="all"
@@ -9,10 +9,22 @@ license="GPL2"
 depends=
 makedepends="bluez-dev"
 subpackages="$pkgname-doc"
-source="http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-$pkgver.tar.gz"
+source="http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-$pkgver.tar.gz
+	ntoh64.patch"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
 
 build() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	./configure --prefix=/usr \
 		--mandir=/usr/share/man \
 		|| return 1
@@ -20,7 +32,8 @@ build() {
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
+	cd "$_builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
-md5sums="5c2e3ef0a68b2845047867ba51ff8ac9  bluez-hcidump-2.0.tar.gz"
+md5sums="5c2e3ef0a68b2845047867ba51ff8ac9  bluez-hcidump-2.0.tar.gz
+fee39a3c089125cdc9f7b01f84ea8b33  ntoh64.patch"
diff --git a/testing/bluez-hcidump/ntoh64.patch b/testing/bluez-hcidump/ntoh64.patch
new file mode 100644
index 000000000..6ab411f54
--- /dev/null
+++ b/testing/bluez-hcidump/ntoh64.patch
@@ -0,0 +1,19 @@
+--- ./src/hcidump.c.orig
++++ ./src/hcidump.c
+@@ -51,6 +51,8 @@
+ #include "parser/sdp.h"
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
++#if 0
++/* defined in bluetooth.h from bluez */
+ static inline uint64_t ntoh64(uint64_t n)
+ {
+ 	uint64_t h;
+@@ -59,6 +61,7 @@
+ 	h |= tmp << 32;
+ 	return h;
+ }
++#endif
+ #elif __BYTE_ORDER == __BIG_ENDIAN
+ #define ntoh64(x) (x)
+ #else
diff --git a/testing/bluez/APKBUILD b/testing/bluez/APKBUILD
index 158c7fcfa..9e27f335b 100644
--- a/testing/bluez/APKBUILD
+++ b/testing/bluez/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=bluez
-pkgver=4.89
-pkgrel=0
+pkgver=4.90
+pkgrel=1
 pkgdesc="Tools for the Bluetooth protocol stack"
 url="http://www.bluez.org/"
 arch="all"
 license="GPL2"
-depends=
+depends="consolekit"
 makedepends="dbus-dev gst-plugins-base-dev alsa-lib-dev libusb-compat-dev
-	libnl-dev"
-subpackages="$pkgname-dev $pkgname-doc libbluetooth $pkgname-alsa $pkgname-cups
-	$pkgname-gstreamer"
+	libnl-dev consolekit-dev"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-alsa
+	$pkgname-cups $pkgname-gstreamer"
 source="http://www.kernel.org/pub/linux/bluetooth/$pkgname-$pkgver.tar.bz2
 	bluetooth.initd
 	bluetooth.confd
@@ -48,7 +48,7 @@ package() {
 	install -Dm755 test/simple-agent "$pkgdir"/usr/bin/bluez-simple-agent
 }
 
-libbluetooth() {
+libs() {
 	pkgdesc="Libraries for Bluetooth protocol stack"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libbluetooth.so.* "$subpkgdir"/usr/lib/
@@ -73,6 +73,6 @@ gstreamer() {
 	mv "$pkgdir"/usr/lib/gstreamer* \
 		"$subpkgdir"/usr/lib/
 }
-md5sums="e35936694cc745987ebce2053c51a840  bluez-4.89.tar.bz2
+md5sums="b111de22ff0f5c2b31f62b6be44dca00  bluez-4.90.tar.bz2
 c511078403d7d27673581a8bb468b90b  bluetooth.initd
 a159d897a057f4675548327329c4cc22  bluetooth.confd"
diff --git a/testing/gnokii/APKBUILD b/testing/gnokii/APKBUILD
index 6a0941b40..203399ea0 100644
--- a/testing/gnokii/APKBUILD
+++ b/testing/gnokii/APKBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gnokii
 pkgver=0.6.30
-pkgrel=0
+pkgrel=2
 pkgdesc="Tools and user space driver for use with mobile phones"
 url="http://www.gnokii.org/"
 arch="all"
 license="GPL"
 depends=""
-subpackages="$pkgname-dev $pkgname-doc libgnokii xgnokii $pkgname-smsd
-	$pkgname-smsd-pgsql:pgsql $pkgname-smsd-mysql:mysql"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs xgnokii $pkgname-smsd
+	$pkgname-smsd-pgsql:pgsql $pkgname-smsd-mysql:mysql
+	$pkgname-smsd-sqlite:sqlite"
 
 makedepends="gtk+-dev mysql-dev intltool libusb-compat-dev libxpm-dev
-	bluez-dev libical-dev postgresql-dev"
+	bluez-dev libical-dev postgresql-dev sqlite-dev"
 source="http://www.gnokii.org/download/gnokii/gnokii-$pkgver.tar.bz2
 	gnokii.patch"
 
@@ -38,8 +39,9 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-libgnokii() {
+libs() {
 	pkgdesc="gnokii shared libraries"
+	replaces="libgnokii"
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libgnokii.so.* "$subpkgdir"/usr/lib/
 }
@@ -70,5 +72,11 @@ mysql() {
 	mv "$pkgdir"/usr/lib/smsd/*mysql.so "$subpkgdir"/usr/lib/smsd/
 }
 
+sqlite() {
+	pkgdesc="SMSD plugin for SQLite storage backend"
+	depends="gnokii-smsd"
+	mkdir -p "$subpkgdir"/usr/lib/smsd
+	mv "$pkgdir"/usr/lib/smsd/*sqlite*.so "$subpkgdir"/usr/lib/smsd/
+}
 md5sums="c90137d403febbc16712d64f0eb196de  gnokii-0.6.30.tar.bz2
 4d764727686ee34bc73489c8b1321c82  gnokii.patch"
diff --git a/testing/gvfs/APKBUILD b/testing/gvfs/APKBUILD
index b3c341582..ea5e22de2 100644
--- a/testing/gvfs/APKBUILD
+++ b/testing/gvfs/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gvfs
 pkgver=1.7.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Backends for the gio framework in GLib"
 url="http://ftp.gnome.org/pub/gnome/sources/gvfs/${pkgver%.*}/"
 arch="all"
diff --git a/testing/java-common/APKBUILD b/testing/java-common/APKBUILD
new file mode 100644
index 000000000..d5e3e4d38
--- /dev/null
+++ b/testing/java-common/APKBUILD
@@ -0,0 +1,24 @@
+# Contributor: Timo Teras <timo.teras@iki.fi>
+# Maintainer: Timo Teras <timo.teras@iki.fi>
+pkgname=java-common
+pkgver=0.1
+pkgrel=0
+pkgdesc="Java common (updates java links)"
+url="http://git.alpinelinux.org/aports.git"
+arch="noarch"
+license="GPL2"
+depends=
+makedepends=""
+install=""
+subpackages=""
+source=""
+triggers="java-common.trigger:/usr/lib/jvm"
+
+package() {
+	mkdir -p "$pkgdir"/usr/bin
+	ln -sf ../lib/jvm/default-jvm/jre/bin/java "$pkgdir"/usr/bin
+	ln -sf ../lib/jvm/default-jvm/jre/bin/rmiregistry "$pkgdir"/usr/bin
+	ln -sf ../lib/jvm/default-jvm/jre/bin/keytool "$pkgdir"/usr/bin
+	ln -sf ../lib/jvm/default-jvm/bin/appletviewer "$pkgdir"/usr/bin
+}
+
diff --git a/testing/java-common/java-common.trigger b/testing/java-common/java-common.trigger
new file mode 100644
index 000000000..6d0613d48
--- /dev/null
+++ b/testing/java-common/java-common.trigger
@@ -0,0 +1,13 @@
+#!/bin/sh
+
+if [ -x /usr/lib/jvm/forced-jvm ]; then
+	ln -sfn forced-jvm default-jvm
+	exit 0
+fi
+
+cd /usr/lib/jvm
+LATEST=`ls -d java-* | sort -r | head -1`
+if [ "$LATEST" ]; then
+	ln -sfn $LATEST default-jvm
+fi
+
diff --git a/testing/java-gcj-compat/APKBUILD b/testing/java-gcj-compat/APKBUILD
new file mode 100644
index 000000000..627f7b7ff
--- /dev/null
+++ b/testing/java-gcj-compat/APKBUILD
@@ -0,0 +1,65 @@
+# Contributor: Timo Teras <timo.teras@iki.fi>
+# Maintainer: Timo Teras <timo.teras@iki.fi>
+
+gccver=`(. ../../main/gcc/APKBUILD ; echo "$pkgver")`
+gccpkgrel=`(. ../../main/gcc/APKBUILD ; echo "$pkgrel")`
+
+pkgname=java-gcj-compat
+pkgver=$gccver
+_mypkgrel=0
+pkgrel=$(( $_mypkgrel + $gccpkgrel ))
+pkgdesc="JDK like environment using GCJ"
+url="http://git.alpinelinux.org/aports.git"
+arch="all"
+license="GPL"
+depends="fastjar gcc-java=$gccver-r$gccpkgrel java-common"
+makedepends="gcc-java=$gccver-r$gccpkgrel"
+install=""
+subpackages=""
+source=""
+
+_builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	mkdir -p $_builddir
+	cd $_builddir
+	gcj -Wl,-Bsymbolic -findirect-dispatch -o ecj \
+		--main=org.eclipse.jdt.internal.compiler.batch.Main \
+		/usr/share/java/ecj.jar
+}
+
+package() {
+	JVM_DIR=$pkgdir/usr/lib/jvm
+	JDK_DIR=$JVM_DIR/java-1.5-gcj
+	JDK_BIN_DIR=$JDK_DIR/bin
+	JRE_DIR=$JDK_DIR/jre
+	JRE_BIN_DIR=$JRE_DIR/bin
+	JRE_LIB_DIR=$JRE_DIR/lib
+
+	CPU=$(uname -m | sed -e 's/i.86/i386/g' -e 's/x86_64/amd64/g')
+
+	mkdir -p $JDK_BIN_DIR
+	ln -sf ../../../../bin/gij $JDK_BIN_DIR/java
+	ln -sf ../../../../bin/fastjar $JDK_BIN_DIR/fastjar
+	ln -sf ../../../../bin/sinjdoc $JDK_BIN_DIR/javadoc
+	ln -sf ../../../../bin/grmic $JDK_BIN_DIR/rmic
+	ln -sf ../../../../bin/gjavah $JDK_BIN_DIR/javah
+	install -s $_builddir/ecj $JDK_BIN_DIR/javac
+	ln -sf ../../../../bin/gappletviewer $JDK_BIN_DIR/appletviewer
+	ln -sf ../../../../bin/gjarsigner $JDK_BIN_DIR/jarsigner
+	ln -sf ../../../../bin/grmiregistry $JDK_BIN_DIR/rmiregistry
+	ln -sf ../../../../bin/gkeytool $JDK_BIN_DIR/keytool
+
+	gcjrel=`ls -d /usr/lib/gcj-$gccver-* | cut -d '-' -f 3`
+	
+	mkdir -p $JRE_BIN_DIR $JRE_LIB_DIR/$CPU
+	ln -sf ../../../../../bin/gij $JRE_BIN_DIR/java
+	ln -sf ../../../../../bin/grmiregistry $JRE_BIN_DIR/rmiregistry
+	ln -sf ../../../../../bin/gkeytool $JRE_BIN_DIR/keytool
+	ln -sf ../../../../../share/java/libgcj-$gccver.jar $JRE_LIB_DIR/rt.jar
+	ln -sf ../../../../../share/java/libgcj-tools-$gccver.jar $JRE_LIB_DIR/tools.jar
+	ln -sf ../../../../../../lib/gcj-$gccver-$gcjrel/libjvm.so $JRE_LIB_DIR/$CPU
+	ln -sf ../../../../../../lib/gcj-$gccver-$gcjrel/libjavamath.so $JRE_LIB_DIR/$CPU
+	ln -sf ../../../../../../lib/gcj-$gccver-$gcjrel/classmap.db $JRE_LIB_DIR/$CPU
+}
+
diff --git a/testing/librsync/APKBUILD b/testing/librsync/APKBUILD
deleted file mode 100644
index 248cda5c9..000000000
--- a/testing/librsync/APKBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Jeremy Thomerson <jeremy@thomersonfamily.com>
-# Maintainer: Jeremy Thomerson <jeremy@thomersonfamily.com>
-pkgname=librsync
-pkgver=0.9.7
-pkgrel=0
-pkgdesc="librsync implements the rolling-checksum algorithm of rsync"
-url="http://sourceforge.net/projects/librsync/"
-arch="all"
-license="LGPL 2.1"
-depends=""
-makedepends=""
-install=
-subpackages="$pkgname-dev"
-source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir"/$pkgname-$pkgver
-
-build() {
-	cd "$_builddir"
-
-	./configure --prefix=/usr --mandir=/usr/share/man --enable-shared
-	make || return 1
-}
-
-package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
-}
-
-md5sums="24cdb6b78f45e0e83766903fd4f6bc84  librsync-0.9.7.tar.gz"
diff --git a/testing/libsyncml/APKBUILD b/testing/libsyncml/APKBUILD
index 5a7e1b6fb..550f4b40f 100644
--- a/testing/libsyncml/APKBUILD
+++ b/testing/libsyncml/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=libsyncml
 pkgver=0.5.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Implementation of the SyncML protocol"
 url="http://libsyncml.opensync.org/"
 arch="all"
diff --git a/testing/obex-data-server/APKBUILD b/testing/obex-data-server/APKBUILD
index d0ea7f2b1..bb09445d5 100644
--- a/testing/obex-data-server/APKBUILD
+++ b/testing/obex-data-server/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=obex-data-server
 pkgver=0.4.5
-pkgrel=0
+pkgrel=1
 pkgdesc="D-Bus service for Obex access"
 url="http://wiki.muiline.com/obex-data-server"
 license="GPLv2+"
diff --git a/testing/obexd/APKBUILD b/testing/obexd/APKBUILD
index 7c04bb879..5e6087284 100644
--- a/testing/obexd/APKBUILD
+++ b/testing/obexd/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=obexd
 pkgver=0.40
-pkgrel=0
+pkgrel=1
 pkgdesc="D-Bus service for Obex Server"
 url="http://www.bluez.org/"
 arch="all"
diff --git a/testing/obexftp/APKBUILD b/testing/obexftp/APKBUILD
index 94ef14408..965f8d307 100644
--- a/testing/obexftp/APKBUILD
+++ b/testing/obexftp/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=obexftp
 pkgver=0.23
-pkgrel=1
+pkgrel=2
 pkgdesc="A tool for transfer files to/from any OBEX enabled device"
 url="http://openobex.triq.net/obexftp/obexftp"
 arch="all"
diff --git a/testing/openjdk6/APKBUILD b/testing/openjdk6/APKBUILD
new file mode 100644
index 000000000..161964755
--- /dev/null
+++ b/testing/openjdk6/APKBUILD
@@ -0,0 +1,178 @@
+# Contributor: Timo Teras <timo.teras@iki.fi>
+# Maintainer: Timo Teras <timo.teras@iki.fi>
+pkgname=openjdk6
+pkgver=1.6.0_p22
+icedteaver=1.10
+pkgrel=0
+pkgdesc="Sun OpenJDK 6 via IcedTea"
+url="http://icedtea.classpath.org/"
+arch="x86"
+license="GPL-2 with Classpath"
+depends="$pkgname-jre"
+makedepends="java-gcj-compat findutils tar zip gawk pkgconfig util-linux-ng
+	     nss-dev cups-dev jpeg-dev giflib-dev libpng-dev libxt-dev
+	     libxp-dev libxtst-dev libxinerama-dev libiconv-dev
+	     libxrender-dev alsa-lib-dev freetype-dev xulrunner-dev
+	     gtk+2.0-dev"
+install=""
+subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase
+	     $pkgname-doc:doc"
+BOOTSTRAP_JAVA_HOME=/usr/lib/jvm/java-1.5-gcj/
+OPENJDK_VERSION=b22
+OPENJDK_DATE=28_feb_2011
+XALAN2_VER=2_7_1
+XERCES_VER=2.9.0
+RHINO_VER=1_7R2
+ANT_VER=1.8.2
+JAXWS_DROP_ZIP=jdk6-jaxws-b20.zip
+JAXP_DROP_ZIP=jaxp144_01.zip
+JAF_DROP_ZIP=jdk6-jaf-b20.zip
+source="http://download.java.net/openjdk/jdk6/promoted/$OPENJDK_VERSION/openjdk-6-src-$OPENJDK_VERSION-$OPENJDK_DATE.tar.gz
+	http://icedtea.classpath.org/download/source/icedtea6-$icedteaver.tar.gz
+	http://archive.apache.org/dist/ant/binaries/apache-ant-$ANT_VER-bin.tar.gz
+	http://archive.apache.org/dist/xml/xalan-j/xalan-j_$XALAN2_VER-bin-2jars.tar.gz
+	http://archive.apache.org/dist/xml/xerces-j/Xerces-J-bin.$XERCES_VER.tar.gz
+	ftp://ftp.mozilla.org/pub/mozilla.org/js/rhino$RHINO_VER.zip
+	http://icedtea.classpath.org/download/drops/$JAXWS_DROP_ZIP
+	http://icedtea.classpath.org/download/drops/$JAXP_DROP_ZIP
+	http://icedtea.classpath.org/download/drops/$JAF_DROP_ZIP
+	icedtea-hotspot-uclibc-fixes.patch
+	icedtea-jdk-iconv-uclibc.patch
+	icedtea-jdk-execinfo.patch
+	icedtea-jdk-no-lib-nsl.patch
+	"
+
+_builddir="$srcdir/icedtea6-$icedteaver"
+INSTALL_BASE=/usr/lib/jvm/java-1.6-openjdk
+CPU=`uname -m | sed -e 's/i.86/i386/g' -e 's/x86_64/amd64/g'`
+
+unpack() {
+	if [ -z "$force" ]; then
+		md5check || return 1
+		initdcheck || return 1
+	fi
+	mkdir -p "$srcdir"
+	msg "Unpacking sources..."
+	tar -C "$srcdir" -zxf icedtea6-$icedteaver.tar.gz || return 1
+	tar -C "$srcdir" -zxf apache-ant-$ANT_VER-bin.tar.gz || return 1
+	tar -C "$srcdir" -zxf xalan-j_$XALAN2_VER-bin-2jars.tar.gz || return 1
+	tar -C "$srcdir" -zxf Xerces-J-bin.$XERCES_VER.tar.gz || return 1
+	unzip -o -q "rhino$RHINO_VER.zip" -d "$srcdir" || return 1
+}
+
+prepare() {
+	cd "$_builddir"
+
+	# Busybox sha256 does not support longopts
+	sed -e "s/--check/-c/g" -i Makefile.in
+
+	cp ../icedtea-*.patch patches
+}
+
+build() {
+	export JAVA_HOME=$BOOTSTRAP_JAVA_HOME
+	export PATH=$JAVA_HOME/bin:$srcdir/apache-ant-$ANT_VER/bin:$PATH
+	export DISTRIBUTION_PATCHES=`echo $source | awk -v RS=' ' '/icedtea-[^ ]*\.patch/ { printf "patches/%s ",$1 }'`
+	
+	JOBS=`echo $MAKEFLAGS | sed -n -e 's/.*-j\([0-9]\+\).*/\1/p'`
+	if [ "$JOBS" ]; then
+		confjobs="--with-parallel-jobs=$JOBS"
+	else
+		confjobs=""
+	fi
+
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--disable-dependency-tracking \
+		--with-gcj $confjobs \
+		--with-openjdk-src-zip=$srcdir/openjdk-6-src-$OPENJDK_VERSION-$OPENJDK_DATE.tar.gz \
+		--with-jaxp-drop-zip=$srcdir/$JAXP_DROP_ZIP \
+		--with-jaf-drop-zip=$srcdir/$JAF_DROP_ZIP \
+		--with-jaxws-drop-zip=$srcdir/$JAXWS_DROP_ZIP \
+		--with-jdk-home=$BOOTSTRAP_JAVA_HOME \
+		--with-ant-home=$srcdir/apache-ant-$ANT_VER \
+		--with-xalan2-jar=$srcdir/xalan-j_$XALAN2_VER/xalan.jar \
+		--with-xalan2-serializer-jar=$srcdir/xalan-j_$XALAN2_VER/serializer.jar \
+		--with-xerces2-jar=$srcdir/xerces-${XERCES_VER//./_}/xercesImpl.jar \
+		--with-rhino=$srcdir/rhino$RHINO_VER/js.jar \
+		--with-pkgversion=Alpine_Linux \
+		  || return 1
+
+	make || return 1
+}
+
+package() {
+	mkdir -p "$pkgdir"/$INSTALL_BASE
+	cp -a "$_builddir"/openjdk.build/j2sdk-image/* "$pkgdir"/$INSTALL_BASE
+	rm "$pkgdir"/$INSTALL_BASE/src.zip
+}
+
+jrelib() {
+	pkgdesc="OpenJDK 6 Java Runtime (class libraries)"
+	arch="noarch"
+	depends=""
+
+	for A in jre/lib/zi jre/lib/images jre/lib/*.jar jre/lib/security \
+		 jre/lib/ext/*.jar jre/lib/cmm jre/ASSEMBLY_EXCEPTION \
+		 jre/THIRD_PARTY_README jre/LICENSE ; do
+		dirname=${A%/*}
+		mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
+		mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
+	done
+}
+
+jrebase() {
+	pkgdesc="OpenJDK 6 Java Runtime (no GUI support)"
+	depends="$pkgname-jre-lib java-common"
+
+	mkdir -p "$subpkgdir"/$INSTALL_BASE/bin
+
+	for A in java orbd rmid servertool unpack200 keytool \
+		 pack200 rmiregistry tnameserv ; do
+		mv "$pkgdir"/$INSTALL_BASE/bin/$A "$subpkgdir"/$INSTALL_BASE/bin
+	done
+
+	# rest of the jre subdir (which were not taken by -jre subpkg)
+	mv "$pkgdir"/$INSTALL_BASE/jre "$subpkgdir"/$INSTALL_BASE
+}
+
+jre() {
+	pkgdesc="OpenJDK 6 Java Runtime"
+	depends=""
+
+	mkdir -p "$subpkgdir"
+	for A in jre/bin/policytool \
+		 bin/appletviewer \
+		 bin/policytool \
+		 jre/lib/$CPU/xawt \
+		 jre/lib/$CPU/libsplashscreen.so ; do
+		dirname=${A%/*}
+		mkdir -p "$subpkgdir"/$INSTALL_BASE/$dirname
+		mv "$pkgdir"/$INSTALL_BASE/$A "$subpkgdir"/$INSTALL_BASE/$dirname
+	done
+}
+
+doc() {
+	default_doc
+
+	mkdir -p "$subpkgdir"/$INSTALL_BASE/
+	mv "$pkgdir"/$INSTALL_BASE/man "$subpkgdir"/$INSTALL_BASE/
+}
+
+md5sums="2d2bbbb0f9b81f1fec41ec730da8a933  openjdk-6-src-b22-28_feb_2011.tar.gz
+fd3f35e8a8a2ef9a64c035ed66cea06d  icedtea6-1.10.tar.gz
+afb0c7950a663f94e65da9f3be676d8f  apache-ant-1.8.2-bin.tar.gz
+3ccda39bcd08b780436dfd2f22fb23d5  xalan-j_2_7_1-bin-2jars.tar.gz
+138f2d1cddd823281d5dfb700f2bd7d4  Xerces-J-bin.2.9.0.tar.gz
+40d0a9abec8169e42920214b37fa8e0e  rhino1_7R2.zip
+91adfd41e6f001add4f92ae31216b1e3  jdk6-jaxws-b20.zip
+ef7a8b3624ea904bf584bc46d79b5e75  jaxp144_01.zip
+bc95c133620bd68c161cac9891592901  jdk6-jaf-b20.zip
+dc6a1e28a97d897d7a1057c11696727d  icedtea-hotspot-uclibc-fixes.patch
+7c0814181e5adc0763c5c0a24b01d4cb  icedtea-jdk-iconv-uclibc.patch
+dae2ba8b87e2106b53974ace07e4ca72  icedtea-jdk-execinfo.patch
+c4bb40d5b1ff690b27900c5cd06bc1e5  icedtea-jdk-no-lib-nsl.patch"
diff --git a/testing/openjdk6/icedtea-hotspot-uclibc-fixes.patch b/testing/openjdk6/icedtea-hotspot-uclibc-fixes.patch
new file mode 100644
index 000000000..fb75ffc34
--- /dev/null
+++ b/testing/openjdk6/icedtea-hotspot-uclibc-fixes.patch
@@ -0,0 +1,90 @@
+--- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp
+@@ -53,7 +53,6 @@
+ # include <string.h>
+ # include <syscall.h>
+ # include <sys/sysinfo.h>
+-# include <gnu/libc-version.h>
+ # include <sys/ipc.h>
+ # include <sys/shm.h>
+ # include <link.h>
+@@ -553,9 +552,7 @@
+      os::Linux::set_glibc_version(str);
+   } else {
+      // _CS_GNU_LIBC_VERSION is not supported, try gnu_get_libc_version()
+-     static char _gnu_libc_version[32];
+-     jio_snprintf(_gnu_libc_version, sizeof(_gnu_libc_version),
+-              "glibc %s %s", gnu_get_libc_version(), gnu_get_libc_release());
++     static char _gnu_libc_version[32] = "2.9";
+      os::Linux::set_glibc_version(_gnu_libc_version);
+   }
+ 
+@@ -2434,11 +2431,7 @@
+ // If we are running with earlier version, which did not have symbol versions,
+ // we should use the base version.
+ void* os::Linux::libnuma_dlsym(void* handle, const char *name) {
+-  void *f = dlvsym(handle, name, "libnuma_1.1");
+-  if (f == NULL) {
+-    f = dlsym(handle, name);
+-  }
+-  return f;
++  return dlsym(handle, name);
+ }
+ 
+ bool os::Linux::libnuma_init() {
+@@ -4446,7 +4439,22 @@
+ // Linux doesn't yet have a (official) notion of processor sets,
+ // so just return the system wide load average.
+ int os::loadavg(double loadavg[], int nelem) {
+-  return ::getloadavg(loadavg, nelem);
++
++	FILE *LOADAVG;
++	double avg[3] = { 0.0, 0.0, 0.0 };
++	int i, res = -1;;
++
++	if ((LOADAVG = fopen("/proc/loadavg", "r"))) {
++		fscanf(LOADAVG, "%lf %lf %lf", &avg[0], &avg[1], &avg[2]);
++		res = 0;
++		fclose(LOADAVG);
++	}
++
++	for (i = 0; (i < nelem) && (i < 3); i++) {
++		loadavg[i] = avg[i];
++	}
++
++	return res;
+ }
+ 
+ void os::pause() {
+Only in openjdk: hotspot/src/os/linux/vm/os_linux.cpp.orig
+--- openjdk.orig/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
++++ openjdk/hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp
+@@ -231,14 +231,14 @@
+ // checking for nanness
+ #ifdef SOLARIS
+ #ifdef SPARC
+-inline int g_isnan(float  f) { return isnanf(f); }
++inline int g_isnan(float  f) { return __isnanf(f); }
+ #else
+ // isnanf() broken on Intel Solaris use isnand()
+ inline int g_isnan(float  f) { return isnand(f); }
+ #endif
+ inline int g_isnan(double f) { return isnand(f); }
+ #elif LINUX
+-inline int g_isnan(float  f) { return isnanf(f); }
++inline int g_isnan(float  f) { return __isnanf(f); }
+ inline int g_isnan(double f) { return isnan(f); }
+ #else
+ #error "missing platform-specific definition here"
+@@ -252,8 +252,8 @@
+ 
+ // Checking for finiteness
+ 
+-inline int g_isfinite(jfloat  f)                 { return finite(f); }
+-inline int g_isfinite(jdouble f)                 { return finite(f); }
++inline int g_isfinite(jfloat  f)                 { return isfinite(f); }
++inline int g_isfinite(jdouble f)                 { return isfinite(f); }
+ 
+ 
+ // Wide characters
+Only in openjdk: hotspot/src/share/vm/utilities/globalDefinitions_gcc.hpp.orig
diff --git a/testing/openjdk6/icedtea-jdk-execinfo.patch b/testing/openjdk6/icedtea-jdk-execinfo.patch
new file mode 100644
index 000000000..fb17ab692
--- /dev/null
+++ b/testing/openjdk6/icedtea-jdk-execinfo.patch
@@ -0,0 +1,40 @@
+--- openjdk.orig/jdk/src/solaris/native/sun/awt/awt_xembed_server.c
++++ openjdk/jdk/src/solaris/native/sun/awt/awt_xembed_server.c
+@@ -35,7 +35,7 @@
+ #include <X11/Xlib.h>
+ #include <X11/Xatom.h>
+ #include <Xm/MwmUtil.h>
+-#ifdef __linux__
++#if defined(__linux__) && ! defined(__UCLIBC__)
+ #include <execinfo.h>
+ #endif
+ #include <stdio.h>
+@@ -835,7 +835,7 @@
+     AWT_UNLOCK();
+ }
+ 
+-#ifdef __linux__
++#if defined(__linux__) && ! defined(__UCLIBC__)
+ void
+ print_stack (void)
+ {
+--- openjdk.orig/jdk/src/solaris/native/sun/xawt/XToolkit.c
++++ openjdk/jdk/src/solaris/native/sun/xawt/XToolkit.c
+@@ -27,7 +27,7 @@
+ #include <X11/Xutil.h>
+ #include <X11/Xos.h>
+ #include <X11/Xatom.h>
+-#ifdef __linux__
++#if defined(__linux__) && ! defined(__UCLIBC__)
+ #include <execinfo.h>
+ #endif
+ 
+@@ -689,7 +689,7 @@
+     return ret;
+ }
+ 
+-#ifdef __linux__
++#if defined(__linux__) && ! defined(__UCLIBC__)
+ void print_stack(void)
+ {
+   void *array[10];
diff --git a/testing/openjdk6/icedtea-jdk-iconv-uclibc.patch b/testing/openjdk6/icedtea-jdk-iconv-uclibc.patch
new file mode 100644
index 000000000..68f858167
--- /dev/null
+++ b/testing/openjdk6/icedtea-jdk-iconv-uclibc.patch
@@ -0,0 +1,39 @@
+Index: openjdk/jdk/make/java/npt/Makefile
+===================================================================
+--- openjdk/jdk/make/java/npt/Makefile	2010-06-13 15:11:02.598512448 +0200
++++ openjdk/jdk/make/java/npt/Makefile	2010-06-13 15:11:28.504759286 +0200
+@@ -65,6 +65,8 @@
+ # We don't want to link against -ljava
+ JAVALIB=
+ 
++LDLIBS += -liconv
++
+ # Add -export options to explicitly spell exported symbols
+ ifeq ($(PLATFORM), windows)
+   OTHER_LCF += -export:nptInitialize -export:nptTerminate
+Index: icedtea6-1.8/openjdk-ecj/jdk/make/java/instrument/Makefile
+===================================================================
+--- openjdk/jdk/make/java/instrument/Makefile	2010-06-13 15:12:14.688505195 +0200
++++ openjdk/jdk/make/java/instrument/Makefile	2010-06-13 15:12:32.641425670 +0200
+@@ -123,6 +123,8 @@
+ # We don't want to link against -ljava
+ JAVALIB=
+ 
++LDLIBS += -liconv
++
+ #
+ # Add to ambient vpath so we pick up the library files
+ #
+Index: openjdk/jdk/make/sun/splashscreen/Makefile
+===================================================================
+--- openjdk/jdk/make/sun/splashscreen/Makefile	2010-06-13 15:12:48.951840824 +0200
++++ openjdk/jdk/make/sun/splashscreen/Makefile	2010-06-13 15:13:01.191422891 +0200
+@@ -55,6 +55,8 @@
+ 
+ JAVALIB=
+ 
++LDLIBS += -liconv
++
+ #
+ # C Flags
+ #
diff --git a/testing/openjdk6/icedtea-jdk-no-lib-nsl.patch b/testing/openjdk6/icedtea-jdk-no-lib-nsl.patch
new file mode 100644
index 000000000..26f89bb54
--- /dev/null
+++ b/testing/openjdk6/icedtea-jdk-no-lib-nsl.patch
@@ -0,0 +1,84 @@
+--- openjdk.orig/hotspot/agent/src/os/solaris/dbx/Makefile
++++ openjdk/hotspot/agent/src/os/solaris/dbx/Makefile
+@@ -50,7 +50,7 @@
+ CFLAGS_32bit := -xarch=v8
+ CFLAGS_64bit := -xarch=v9
+ CFLAGS   := -PIC -xO3 $(INCLUDES)
+-LIBS     := -lsocket -lnsl -lrtld_db
++LIBS     := -lsocket  -lrtld_db
+ LDFLAGS  := -G
+ 
+ ifneq "$(ARCH)" "i486"
+--- openjdk.orig/jdk/make/java/hpi/hpi_common.gmk
++++ openjdk/jdk/make/java/hpi/hpi_common.gmk
+@@ -86,5 +86,5 @@
+ # Things that must be linked in.
+ #
+ ifneq ($(PLATFORM), windows)
+-OTHER_LDLIBS += $(LIBSOCKET) -lnsl $(LIBM) -ldl
++OTHER_LDLIBS += $(LIBSOCKET)  $(LIBM) -ldl
+ endif
+--- openjdk.orig/jdk/make/java/java/Makefile
++++ openjdk/jdk/make/java/java/Makefile
+@@ -205,7 +205,7 @@
+ OTHER_LDLIBS += $(JVMLIB) -libpath:$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) fdlibm.lib \
+ 		       -libpath:$(OBJDIR)/../../../verify/$(OBJDIRNAME) verify.lib
+ else
+-OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET) -lnsl -ldl \
++OTHER_LDLIBS += $(JVMLIB) -lverify $(LIBSOCKET)  -ldl \
+ 		-L$(OBJDIR)/../../../fdlibm/$(OBJDIRNAME) -lfdlibm.$(ARCH)
+ endif
+ 
+--- openjdk.orig/jdk/make/java/java_hprof_demo/Makefile
++++ openjdk/jdk/make/java/java_hprof_demo/Makefile
+@@ -83,7 +83,7 @@
+ ifeq ($(PLATFORM), windows)
+   OTHER_LDLIBS += wsock32.lib winmm.lib
+ else
+-  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
++  OTHER_LDLIBS += $(LIBSOCKET)  -ldl
+ endif
+ 
+ #
+--- openjdk.orig/jdk/make/java/net/Makefile
++++ openjdk/jdk/make/java/net/Makefile
+@@ -97,7 +97,7 @@
+   # Will not compile at warning level 3 if warnings are fatal
+   COMPILER_WARNINGS_FATAL=false
+ else
+-  OTHER_LDLIBS = $(LIBSOCKET) -lnsl -ldl $(JVMLIB)
++  OTHER_LDLIBS = $(LIBSOCKET)  -ldl $(JVMLIB)
+ endif
+ ifeq ($(PLATFORM), linux)
+   OTHER_LDLIBS += -lpthread
+--- openjdk.orig/jdk/make/jpda/transport/socket/Makefile
++++ openjdk/jdk/make/jpda/transport/socket/Makefile
+@@ -42,11 +42,11 @@
+ endif
+ 
+ ifeq ($(PLATFORM), linux)
+-  OTHER_LDLIBS += -lnsl $(LIBSOCKET) -lpthread
++  OTHER_LDLIBS +=  $(LIBSOCKET) -lpthread
+ endif
+ 
+ ifeq ($(PLATFORM), solaris)
+-  OTHER_LDLIBS += -lnsl $(LIBSOCKET)
++  OTHER_LDLIBS +=  $(LIBSOCKET)
+ endif
+ 
+ ifeq ($(PLATFORM), windows)
+--- openjdk.orig/jdk/make/mkdemo/jvmti/hprof/Makefile
++++ openjdk/jdk/make/mkdemo/jvmti/hprof/Makefile
+@@ -39,10 +39,10 @@
+   EXTRA_LIBS += wsock32.lib winmm.lib
+ endif
+ ifeq ($(PLATFORM), solaris)
+-  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl
++  OTHER_LDLIBS += $(LIBSOCKET)  -ldl
+ endif
+ ifeq ($(PLATFORM), linux)
+-  OTHER_LDLIBS += $(LIBSOCKET) -lnsl -ldl -lpthread
++  OTHER_LDLIBS += $(LIBSOCKET)  -ldl -lpthread
+ endif
+ 
+ #
diff --git a/testing/openobex/APKBUILD b/testing/openobex/APKBUILD
index 582dadb31..caaecb85e 100644
--- a/testing/openobex/APKBUILD
+++ b/testing/openobex/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openobex
 pkgver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Implementation of the OBject EXchange (OBEX) protocol"
 url="http://dev.zuckschwerdt.org/openobex/"
 arch="all"
diff --git a/testing/shotwell/APKBUILD b/testing/shotwell/APKBUILD
index 9825c5153..adfd248c2 100644
--- a/testing/shotwell/APKBUILD
+++ b/testing/shotwell/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=shotwell
-pkgver=0.8.1
-pkgrel=1
+pkgver=0.9.0
+pkgrel=0
 pkgdesc="A digital photo organizer designed for the GNOME desktop environment"
 url="http://yorba.org/shotwell/"
 arch="all"
@@ -10,7 +10,8 @@ install="shotwell.post-upgrade shotwell.post-install shotwell.pre-deinstall"
 depends=""
 makedepends="intltool vala libgee-dev libunique-dev webkit-dev libexif-dev
 	librsvg-dev sqlite-dev udev-dev dbus-glib-dev libgphoto2-dev
-	libgexiv2-dev libraw-dev librsvg-dev gconf-dev json-glib-dev"
+	libgexiv2-dev libraw-dev librsvg-dev gconf-dev json-glib-dev
+	gnome-vfs-dev"
 install=
 source="http://yorba.org/download/shotwell/${pkgver%.*}/shotwell-$pkgver.tar.bz2"
 
@@ -41,4 +42,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="378168735006dfe0733431dd47f870c4  shotwell-0.8.1.tar.bz2"
+md5sums="6701d9a7c0a2f4f720fdeed1d6e54758  shotwell-0.9.0.tar.bz2"