Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports

17 files changed, 338 insertions, 26 deletions

diff --git a/testing/akonadi/APKBUILD b/testing/akonadi/APKBUILD
index 3f612f653b..be616a1fdf 100644
--- a/testing/akonadi/APKBUILD
+++ b/testing/akonadi/APKBUILD
@@ -30,7 +30,7 @@ prepare() {
 build() {
 	cd "$_builddir"/build
 	cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_SKIP_RPATH=ON "$_builddir" || return 1
-	make LDFLAGS="-lubacktrace" || return 1
+	make || return 1
 }
 
 package() {
diff --git a/testing/array-info/APKBUILD b/testing/array-info/APKBUILD
new file mode 100644
index 0000000000..77719a9c36
--- /dev/null
+++ b/testing/array-info/APKBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=array-info
+pkgver=0.16
+pkgrel=0
+pkgdesc="retrieve informations and status from RAID controllers"
+url="http://array-info.sourceforge.net/"
+license="GPL"
+arch="all"
+depends=
+makedepends="docbook-xsl gzip"
+install=
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/$pkgname/${pkgname}_$pkgver.tar.gz"
+
+build() {
+	cd "$srcdir"/$pkgname-$pkgver
+	local _xsl=$(echo /usr/share/xml/docbook/xsl-stylesheets-*/manpages/docbook.xsl)
+	make prefix=/usr DOCBOOK2XMAN="xsltproc --nonet $_xsl" \
+	#build_lib build_plugins abuild-info array-info.1.gz \
+}
+
+package() {
+	cd "$srcdir"/$pkgname-$pkgver
+	make prefix=/usr DESTDIR="$pkgdir" install
+}
+
+md5sums="802e9be5e40a5a945956a123fc81f65f  array-info_0.16.tar.gz"
diff --git a/testing/array-info/array-info-makefile.patch b/testing/array-info/array-info-makefile.patch
new file mode 100644
index 0000000000..db7c18e450
--- /dev/null
+++ b/testing/array-info/array-info-makefile.patch
@@ -0,0 +1,20 @@
+--- Makefile.orig	Tue Dec 29 13:46:28 2009
++++ Makefile	Tue Dec 29 13:47:38 2009
+@@ -1,5 +1,5 @@
+ DESTDIR =
+-prefix = /usr/local
++prefix = /usr
+ sbindir = $(prefix)/sbin
+ pkglibdir = $(prefix)/lib/array-info
+ mandir = $(prefix)/share/man
+@@ -8,8 +8,8 @@
+ 
+ INCLUDES = -I./include -I./linuxheaders
+ 
+-CFLAGS = -g2 -Wall $(INCLUDES) -DARRAY_PLUGIN_PATH=\"$(ARRAY_PLUGIN_PATH)\"
+-LDFLAGS = -L./lib -larray-info -ldl
++CFLAGS += -Wall $(INCLUDES) -DARRAY_PLUGIN_PATH=\"$(ARRAY_PLUGIN_PATH)\"
++LDFLAGS += -L./lib -larray-info -ldl
+ OBJS = array_plugin.o array_utils.o main.o
+ 
+ ARRAY_PLUGIN_PATH=$(pkglibdir)/plugins
diff --git a/testing/chromium/APKBUILD b/testing/chromium/APKBUILD
index 3cff4c6acd..b19ee388f3 100644
--- a/testing/chromium/APKBUILD
+++ b/testing/chromium/APKBUILD
@@ -23,7 +23,6 @@ source="http://build.chromium.org/official/chromium-$pkgver.tar.bz2
 	chromium-dlfcn.patch
 	chromium-yasm.patch
 	chromium-no-mit-screensaver.patch
-	chromium-ubacktrace.patch
 	chromium-tcmalloc.patch
 	chromium-no-sbrk.patch
 	chromium-stdstring.patch"
@@ -52,7 +51,6 @@ build() {
 		linux_sandbox_path=/usr/lib/${pkgname}/chromium-sandbox \
 		linux_sandbox_chrome_path=/usr/lib/${pkgname}/chromium \
 		release_extra_cflags='${CFLAGS}' \
-		release_extra_libs='-lubacktrace' \
 		proprietary_codecs=1 \
 		use_system_libjpeg=1 \
 		use_system_libxslt=1 \
@@ -88,7 +86,6 @@ md5sums="85d73864cc3b78dab29f8851965fc5fa  chromium-13.0.754.0.tar.bz2
 768d2ca4daa2db611fd4aeb561701f4e  chromium-dlfcn.patch
 76cb0975e631d54fb57bd298041cec05  chromium-yasm.patch
 f8c8711a358d43ecbd8e1859aa71cfa0  chromium-no-mit-screensaver.patch
-a020a7ccb8207e115ad8c010c6f7d712  chromium-ubacktrace.patch
 014dd7f7a9decb1d89c0d72f0258ca96  chromium-tcmalloc.patch
 e6302ae2635dc4d0c75c32e97a4bd3b0  chromium-no-sbrk.patch
 eb05d2763beaa02e20ddeaf51dadf327  chromium-stdstring.patch"
diff --git a/testing/chromium/chromium-ubacktrace.patch b/testing/chromium/chromium-ubacktrace.patch
deleted file mode 100644
index d91769b4c1..0000000000
--- a/testing/chromium/chromium-ubacktrace.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- chromium-13.0.754.0.orig/chrome/chrome_common.gypi
-+++ chromium-13.0.754.0/chrome/chrome_common.gypi
-@@ -263,6 +263,7 @@
-               '-lX11',
-               '-lXrender',
-               '-lXext',
-+              '-lubacktrace',
-             ],
-           },
-         },],
diff --git a/testing/clutter/APKBUILD b/testing/clutter/APKBUILD
index fc1f2d3453..8d8e29878c 100644
--- a/testing/clutter/APKBUILD
+++ b/testing/clutter/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer:
 pkgname=clutter
-pkgver=1.6.8
-pkgrel=2
+pkgver=1.6.14
+pkgrel=0
 pkgdesc="library for creating fast, visually-appealing interfaces"
 url="http://www.clutter-project.org/"
 arch="all"
@@ -37,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="9eedac4216f709a9f144940d24bfbb3e  clutter-1.6.8.tar.bz2"
+md5sums="1da9f983115f9bd28b0be8176e53fe36  clutter-1.6.14.tar.bz2"
diff --git a/testing/deadbeef/APKBUILD b/testing/deadbeef/APKBUILD
index 95c7de16fc..e14167f165 100644
--- a/testing/deadbeef/APKBUILD
+++ b/testing/deadbeef/APKBUILD
@@ -28,7 +28,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	LIBS="-lintl -lubacktrace" ./configure --prefix=/usr \
+	LIBS="-lintl" ./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--disable-sid \
 		--disable-ffap || return 1
diff --git a/testing/gource/APKBUILD b/testing/gource/APKBUILD
index 60c29226cf..44b3b8ef51 100644
--- a/testing/gource/APKBUILD
+++ b/testing/gource/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:  Francesco Colista <francesco.colista@gmail.com>
 pkgname=gource
 pkgver=0.32
-pkgrel=0
+pkgrel=1
 pkgdesc="Software version control visualization"
 url="http://code.google.com&p/gource"
 arch="all"
diff --git a/testing/networkmanager/APKBUILD b/testing/networkmanager/APKBUILD
index dd174c060a..e4eda1471a 100644
--- a/testing/networkmanager/APKBUILD
+++ b/testing/networkmanager/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=networkmanager
 pkgver=0.8.3.998
-pkgrel=1
+pkgrel=2
 pkgdesc="network management tool"
 url="http://projects.gnome.org/NetworkManager/"
 arch="all"
@@ -30,7 +30,7 @@ prepare() {
 
 build() {
 	cd "$_builddir"
-	LIBS="-lubacktrace" ./configure --prefix=/usr \
+	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
diff --git a/testing/openbox/APKBUILD b/testing/openbox/APKBUILD
new file mode 100644
index 0000000000..35e2320707
--- /dev/null
+++ b/testing/openbox/APKBUILD
@@ -0,0 +1,78 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=openbox
+pkgver=3.4.11.2
+pkgrel=1
+pkgdesc="A highly configurable and standards-compliant X11 window manager"
+url="http://openbox.org"
+arch="all"
+license="GPLv2+"
+depends=
+depends_dev="pango-dev libxml2-dev libxcursor-dev libxrandr-dev libxinerama-dev startup-notification-dev"
+makedepends="$depends_dev"
+install=""
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-gnome $pkgname-kde"
+source="http://openbox.org/dist/openbox/openbox-$pkgver.tar.gz
+	http://icculus.org/openbox/tools/setlayout.c"
+
+_builddir="$srcdir"/openbox-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--disable-static \
+		|| return 1
+	make || return 1
+	gcc $CFLAGS $LDFLAGS -o setlayout "$srcdir"/setlayout.c -lX11 || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make -j1 DESTDIR="$pkgdir" install || return 1
+	install "$_builddir"/setlayout "$pkgdir"/usr/bin/setlayout
+	rm -f "$pkgdir"/usr/lib/*.la
+}
+
+libs() {
+	pkgdesc="Shared libraries for openbox"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
+}
+
+gnome() {
+	pkgdesc="GNOME integration for openbox"
+	mkdir -p "$subpkgdir"/usr/bin \
+		"$subpkgdir"/usr/share/xsessions
+
+	mv "$pkgdir"/usr/bin/*gnome* \
+		"$pkgdir"/usr/bin/gdm-control \
+		"$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/share/*gnome* \
+		"$subpkgdir"/usr/share/ || return 1
+	mv "$pkgdir"/usr/share/xsessions/*gnome* \
+		"$subpkgdir"/usr/share/xsessions/ || return 1
+}
+
+kde() {
+	pkgdesc="KDE integration for openbox"
+	mkdir -p "$subpkgdir"/usr/bin \
+		"$subpkgdir"/usr/share/xsessions
+
+	mv "$pkgdir"/usr/bin/*kde* \
+		"$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/share/xsessions/*kde* \
+		"$subpkgdir"/usr/share/xsessions/ || return 1
+}
+
+md5sums="30e669134fa81df810fe7d1dc59cd931  openbox-3.4.11.2.tar.gz
+16ca0d290cae2f4c16a35e9cdfb6f503  setlayout.c"
diff --git a/testing/partclone/APKBUILD b/testing/partclone/APKBUILD
new file mode 100644
index 0000000000..5855d2b09d
--- /dev/null
+++ b/testing/partclone/APKBUILD
@@ -0,0 +1,67 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=partclone
+pkgver=0.2.24
+pkgrel=0
+pkgdesc="Partition cloning tool"
+url="http://partclone.org/"
+arch="all"
+license="GPL"
+depends=
+makedepends="e2fsprogs-dev ncurses-dev"
+install=""
+subpackages="$pkgname-doc"
+source="http://downloads.sourceforge.net/project/partclone/testing/src/partclone-$pkgver.tar.gz
+	memtrace.patch"
+
+# TODO:
+# libreiserfs: http://reiserfs.linux.kiev.ua
+# ntfsprogs: http://download.sf.net/linux-ntfs/%{name}-%{version}.tar.bz2
+#
+
+_builddir="$srcdir"/partclone-$pkgver
+prepare() {
+	local i
+	cd "$_builddir"
+	for i in $source; do
+		case $i in
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		esac
+	done
+}
+
+build() {
+	cd "$_builddir"
+#  --enable-all            enable all supported file system
+#  --enable-extfs          enable ext2/3/4 file system
+#  --enable-xfs            enable XFS file system
+#  --enable-reiserfs       enable REISERFS 3.6/3.6 file system
+#  --enable-reiser4        enable Reiser4 file system
+#  --enable-hfsp           enable HFS plus file system
+#  --enable-fat            enable FAT file system
+#  --enable-ntfs           enable NTFS file system
+#  --enable-ufs            enable UFS(1/2) file system
+#  --enable-vmfs           enable vmfs file system
+#  --enable-jfs            enable jfs file system
+#  --enable-btrfs          enable btrfs file system
+##		--enable-xfs \
+	ac_cv_lib_rt_aio_init=yes ./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--localstatedir=/var \
+		--enable-extfs \
+		--enable-fat \
+		--enable-ncursesw \
+		--disable-nls \
+		|| return 1
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install || return 1
+}
+
+md5sums="d2856820ed3f92e064fcbda3cd20f94e  partclone-0.2.24.tar.gz
+83dfb01e5d68795266726826a49a2de8  memtrace.patch"
diff --git a/testing/partclone/memtrace.patch b/testing/partclone/memtrace.patch
new file mode 100644
index 0000000000..9c8ba9af1b
--- /dev/null
+++ b/testing/partclone/memtrace.patch
@@ -0,0 +1,14 @@
+diff --git a/src/main.c b/src/main.c
+index 2fb6b58..8f079f2 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -20,7 +20,9 @@
+ #include <sys/types.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#ifdef HAVE_MEMTRACE
+ #include <mcheck.h>
++#endif
+ #include <stdint.h>
+ #include <stdarg.h>
+ #include <string.h>
diff --git a/testing/py-eventlet/APKBUILD b/testing/py-eventlet/APKBUILD
index a64cfc9f5f..4825f7dc9c 100644
--- a/testing/py-eventlet/APKBUILD
+++ b/testing/py-eventlet/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
 # Contributor: Elizabeth Jennifer Myers <elizabeth@sporksirc.net>
 pkgname=py-eventlet
-pkgver=0.9.15
+pkgver=0.9.16
 pkgrel=0
 pkgdesc="Python library for seamless coroutine-based concurrency"
 url="http://eventlet.net/"
@@ -22,4 +22,4 @@ package() {
 	cd "$_builddir"
 	python setup.py install --root="$pkgdir"
 }
-md5sums="3d08f73418e87348de9fbeb3a0f2ddc8  eventlet-0.9.15.tar.gz"
+md5sums="4728e3bd7f72763c1e5dccac0296f8ea  eventlet-0.9.16.tar.gz"
diff --git a/testing/py-gevent/APKBUILD b/testing/py-gevent/APKBUILD
index 7cf3309200..9c1eda790c 100644
--- a/testing/py-gevent/APKBUILD
+++ b/testing/py-gevent/APKBUILD
@@ -1,13 +1,13 @@
 # Maintainer: Michael Zhou <zhoumichaely@gmail.com>
 # Contributor: Michael Zhou <zhoumichaely@gmail.com>
 pkgname=py-gevent
-pkgver=0.13.5
+pkgver=0.13.6
 pkgrel=0
 pkgdesc="Python library for seamless coroutine-based concurrency"
 url="http://gevent.org/"
 arch="x86 x86_64"
 license="MIT"
-depends="python py-greenlet libevent"
+depends="py-greenlet"
 makedepends="python-dev py-setuptools libevent-dev"
 source="http://pypi.python.org/packages/source/g/gevent/gevent-${pkgver}.tar.gz"
 
@@ -22,4 +22,4 @@ package() {
 	cd "$_builddir"
 	python setup.py install --root="$pkgdir"
 }
-md5sums="8143d708256eec0579fb65d76ab0b05c  gevent-0.13.5.tar.gz"
+md5sums="7c836ce2315d44ba0af6134efbcd38c9  gevent-0.13.6.tar.gz"
diff --git a/testing/sprunge/APKBUILD b/testing/sprunge/APKBUILD
new file mode 100644
index 0000000000..5ae053dcec
--- /dev/null
+++ b/testing/sprunge/APKBUILD
@@ -0,0 +1,33 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=sprunge
+pkgver=0.1
+pkgrel=0
+pkgdesc="Helper script to paste things to http://sprunge.us"
+url="http://strunge.us"
+arch="noarch"
+license="GPLv2"
+depends="curl"
+makedepends=
+install=""
+subpackages=
+source=""
+
+_builddir="$srcdir"
+prepare() {
+	return 0
+}
+
+build() {
+	cd "$_builddir"
+	cat >"$_builddir"/sprunge<<EOF
+#!/bin/sh
+exec curl -F 'sprunge=<-' http://sprunge.us
+EOF
+}
+
+package() {
+	cd "$_builddir"
+	install -Dm755 sprunge "$pkgdir"/usr/bin/sprunge
+}
+
diff --git a/testing/ttf-droid/APKBUILD b/testing/ttf-droid/APKBUILD
new file mode 100644
index 0000000000..90a44e80be
--- /dev/null
+++ b/testing/ttf-droid/APKBUILD
@@ -0,0 +1,61 @@
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=ttf-droid
+_date="20110607"
+pkgver=$_date
+pkgrel=0
+pkgdesc="Droid font family"
+url="http://android.git.kernel.org/?p=platform/frameworks/base.git;a=tree;f=data/fonts;hb=HEAD"
+arch="noarch"
+license="Apache 2.0"
+depends=
+makedepends=
+install=
+subpackages=
+source="http://dev.alpinelinux.org/~ncopa/ttf-droid-$pkgver.tar.gz"
+_ttf_source="
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/Ahem.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/Clockopia.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSans-Bold.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSans.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSansArabic.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSansFallback.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSansFallbackLegacy.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSansHebrew.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSansJapanese.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSansMono.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSansThai.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSerif-Bold.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSerif-BoldItalic.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSerif-Italic.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/DroidSerif-Regular.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/MTLc3m.ttf;hb=HEAD
+	http://android.git.kernel.org/?p=platform/frameworks/base.git;a=blob_plain;f=data/fonts/MTLmr3m.ttf;hb=HEAD
+"
+
+_ttfdir="$srcdir"/ttf-droid-$_date
+
+mkpkg() {
+	local i
+	mkdir -p "$srcdir"/ttf-droid-$_date
+	cd "$srcdir"/ttf-droid-$_date
+
+	for i in $_ttf_source; do
+		curl -J -O $i || return 1
+	done
+	cd ..
+	tar -czf ttf-droid-$_date.tar.gz ttf-droid-$_date
+}
+
+build() {
+	return 0
+}
+
+package()
+{
+	cd "$_ttfdir"
+        install -d $pkgdir/usr/share/fonts/TTF/ 
+        install -m644 *.ttf $pkgdir/usr/share/fonts/TTF/ 
+}
+
+md5sums="b40559c6d6f7e7f39a4e3e27a4fd84c0  ttf-droid-20110607.tar.gz"
diff --git a/testing/ttf-liberation/APKBUILD b/testing/ttf-liberation/APKBUILD
new file mode 100644
index 0000000000..52c1237879
--- /dev/null
+++ b/testing/ttf-liberation/APKBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+pkgname=ttf-liberation
+pkgver=1.07.0
+pkgrel=0
+pkgdesc="Red Hats Liberation fonts"
+url="https://fedorahosted.org/liberation-fonts/"
+license="custom GPL2"
+arch="noarch"
+depends=""
+makedepends="wget"
+install=
+source="https://fedorahosted.org/releases/l/i/liberation-fonts/liberation-fonts-ttf-$pkgver.tar.gz"
+
+_builddir="$srcdir"/liberation-fonts-ttf-$pkgver
+build() {
+	return 0
+}
+
+package() {
+	cd "$_builddir"
+	install -d "$pkgdir"/usr/share/fonts/truetype/liberation
+	cp -a *.ttf "$pkgdir"/usr/share/fonts/truetype/liberation/
+}
+
+md5sums="8150db1c6e27cacdfd524b563b85b69e  liberation-fonts-ttf-1.07.0.tar.gz"