Merge http://home.dereferenced.org/~nenolod/aports

11 files changed, 57 insertions, 15 deletions

diff --git a/main/audacious-plugins/APKBUILD b/main/audacious-plugins/APKBUILD
index d29f69062..8b8fdb454 100644
--- a/main/audacious-plugins/APKBUILD
+++ b/main/audacious-plugins/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=audacious-plugins
 pkgver=2.4.2
-pkgrel=7
+pkgrel=8
 pkgdesc="playlist-oriented media player with multiple interfaces (plugins)"
 url="http://audacious-media-player.org/"
 arch="all"
@@ -26,6 +26,8 @@ makedepends="libmowgli-dev
 	     libmms-dev
 	     libsndfile-dev
 
+	     libnotify-dev
+
 	     libogg-dev
              libvorbis-dev
 
diff --git a/testing/libcue/APKBUILD b/main/libcue/APKBUILD
index 3c61236a2..3c61236a2 100644
--- a/testing/libcue/APKBUILD
+++ b/main/libcue/APKBUILD
diff --git a/testing/libguess/APKBUILD b/main/libguess/APKBUILD
index a967cdda7..a967cdda7 100644
--- a/testing/libguess/APKBUILD
+++ b/main/libguess/APKBUILD
diff --git a/testing/libmcs/APKBUILD b/main/libmcs/APKBUILD
index b21a1cddc..b21a1cddc 100644
--- a/testing/libmcs/APKBUILD
+++ b/main/libmcs/APKBUILD
diff --git a/testing/libmowgli/APKBUILD b/main/libmowgli/APKBUILD
index 10e38dc55..10e38dc55 100644
--- a/testing/libmowgli/APKBUILD
+++ b/main/libmowgli/APKBUILD
diff --git a/testing/cdparanoia/APKBUILD b/testing/cdparanoia/APKBUILD
index 8bd123097..8cf900742 100644
--- a/testing/cdparanoia/APKBUILD
+++ b/testing/cdparanoia/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=cdparanoia
 pkgver=10.2
-pkgrel=1
+pkgrel=2
 pkgdesc="An audio CD extraction application"
 url="http://www.xiph.org/paranoia"
 arch="x86 x86_64"
@@ -13,20 +13,24 @@ install=
 subpackages="$pkgname-dev"
 source="http://downloads.xiph.org/releases/cdparanoia/$pkgname-III-$pkgver.src.tgz"
 
-build() {
+prepare() {
 	cd "$srcdir/$pkgname-III-$pkgver"
+
 	mv configure.guess config.guess
 	mv configure.sub config.sub
 	sed -i -e '/configure.\(guess\|sub\)/d' configure.in || return 1
 	aclocal && autoconf || return 1
 	libtoolize || return 1
+}	
+
+build() {
+	cd "$srcdir/$pkgname-III-$pkgver"
 
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info
-	make || return 1
-	#make DESTDIR="$pkgdir" install
+	make -j1 || return 1
 }
 
 package() {
diff --git a/testing/indent/APKBUILD b/testing/indent/APKBUILD
new file mode 100644
index 000000000..2c9d0cfbe
--- /dev/null
+++ b/testing/indent/APKBUILD
@@ -0,0 +1,37 @@
+# Contributor: William Pitcock <nenolod@dereferenced.org>
+# Maintainer: William Pitcock <nenolod@dereferenced.org>
+pkgname=indent
+pkgver=2.2.10
+pkgrel=0
+pkgdesc="indenting utility"
+url="http://www.gnu.org/software/indent/"
+license="GPL"
+depends=
+makedepends=
+install=
+subpackages="$pkgname-doc"
+source="http://astromirror.uchicago.edu/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
+arch="all"
+
+_builddir="$srcdir"/$pkgname-$pkgver
+
+prepare() {
+	cd "$_builddir"
+	# apply patches here
+}
+
+build() {
+	cd "$_builddir"
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info
+	make || return 1
+}
+
+package() {
+	cd "$_builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+md5sums="be35ea62705733859fbf8caf816d8959  indent-2.2.10.tar.gz"
diff --git a/testing/openxcap/APKBUILD b/testing/openxcap/APKBUILD
index e19b4b92b..c21653681 100644
--- a/testing/openxcap/APKBUILD
+++ b/testing/openxcap/APKBUILD
@@ -3,12 +3,12 @@
 
 pkgname=openxcap
 pkgver=1.2.0
-pkgrel=3
+pkgrel=4
 pkgdesc="Open source fully featured XCAP server "
 url="http://openxcap.org"
 pkgusers="openxcap"
 pkggroups="openxcap"
-arch="x86 x86_64"
+arch="noarch"
 license="GPL"
 depends="python py-application py-gnutls py-twisted py-twisted-web2 py-imaging
 	py-lxml py-mysqldb"
diff --git a/testing/valide/APKBUILD b/testing/valide/APKBUILD
index 53f83b482..21dc01039 100644
--- a/testing/valide/APKBUILD
+++ b/testing/valide/APKBUILD
@@ -4,7 +4,7 @@ pkgver=0.7.0
 pkgrel=0
 pkgdesc="Val(a)IDE is an Integrated Development Environment (IDE) for the Vala programming language"
 url="http://www.valaide.org/"
-arch="x86 x86_64"
+arch="x86"
 license="GPL"
 depends="vala"
 makedepends="gtk+-dev intltool gtksourceview-dev libunique-dev python
diff --git a/testing/xen/APKBUILD b/testing/xen/APKBUILD
index 3b36e1271..638a2ef4d 100644
--- a/testing/xen/APKBUILD
+++ b/testing/xen/APKBUILD
@@ -2,14 +2,12 @@
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xen
 pkgver=4.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Xen hypervisor"
 url="http://www.xen.org/"
 license="GPL"
-depends=
-makedepends="coreutils python sed gawk libgcrypt-dev gnutls-dev pciutils-dev
-	texinfo git wget mesa-dev sdl-dev zlib-dev openssl-dev
-	util-linux-ng-dev python-dev sed"
+depends="coreutils python sed gawk"
+makedepends="libgcrypt-dev gnutls-dev pciutils-dev texinfo wget mesa-dev sdl-dev zlib-dev openssl-dev util-linux-ng-dev python-dev gettext-dev ncurses-dev"
 install=
 subpackages="$pkgname-doc"
 source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.gz
@@ -21,7 +19,7 @@ source="http://bits.xensource.com/oss-xen/release/$pkgver/$pkgname-$pkgver.tar.g
 	xen-dont-use-lib64.patch
 	xend.initd
 	xendomains.initd"
-arch=""
+arch="x86_64"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 
@@ -49,6 +47,7 @@ build() {
 
 	# If we provide no parameters it tries to build a kernel image.  We
 	# definitely don't want that.
+	(cd tools/check; ./chk build) || return 1
 	make xen tools stubdom || return 1
 }
 
diff --git a/testing/xmlrpc-c/APKBUILD b/testing/xmlrpc-c/APKBUILD
index 3084815ec..a7df7289f 100644
--- a/testing/xmlrpc-c/APKBUILD
+++ b/testing/xmlrpc-c/APKBUILD
@@ -4,7 +4,7 @@ pkgver=1.06.40
 pkgrel=0
 pkgdesc="This library provides a modular implementation of XML-RPC for C and C++"
 url="http://xmlrpc-c.sourceforge.net/"
-arch="x86 x86_64"
+arch="x86"
 license="custom:xmlrpc-c"
 depends=
 makedepends="libtool curl-dev libxml2-dev zlib-dev"