Merge remote branch 'amanison/master'

12 files changed, 53 insertions, 27 deletions

diff --git a/Makefile b/Makefile
index 67eb3daae..a85a3ff56 100644
--- a/Makefile
+++ b/Makefile
@@ -16,28 +16,28 @@ non-free-pkgs :=  $(shell ./aport.lua deplist $(rootdir) non-free)
 
 unstable-pkgs :=  $(shell ./aport.lua deplist $(rootdir) unstable)
 
-main: 
+main:
 	for p in $(main-pkgs) ; \
 	do \
 		cd $(rootdir)/$@/$$p; \
 		abuild -r; \
 	done
 
-testing: 
+testing:
 	for p in $(testing-pkgs) ; \
 	do \
 		cd $(rootdir)/$@/$$p; \
 		abuild -r; \
 	done
 
-non-free: 
+non-free:
 	for p in $(non-free-pkgs) ; \
 	do \
 		cd $(rootdir)/$@/$$p; \
 		abuild -r; \
 	done
 
-unstable: 
+unstable:
 	for p in $(unstable-pkgs) ; \
 	do \
 		cd $(rootdir)/$@/$$p; \
@@ -51,6 +51,12 @@ clean:
 		abuild cleanpkg; \
 	done
 
+cleanold:
+	for p in $(all-pkgs) ; do \
+		cd $(rootdir)/$$p; \
+		abuild cleanoldpkg; \
+	done
+
 fetch:
 	for p in $(all-pkgs) ; do \
 		cd $(rootdir)/$$p; \
diff --git a/main/gcc/APKBUILD b/main/gcc/APKBUILD
index da7f66248..5dc287321 100644
--- a/main/gcc/APKBUILD
+++ b/main/gcc/APKBUILD
@@ -6,15 +6,16 @@ _specsver=0.1.7
 _espfver=0.3.6
 _uclibc_abiver=0.9.32
 
-pkgrel=3
+pkgrel=4
 pkgdesc="The GNU Compiler Collection"
 url="http://gcc.gnu.org"
 license="GPL LGPL"
 depends="binutils libgcc libgomp"
 makedepends="bison flex gmp-dev mpfr-dev texinfo"
-subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp"
+subpackages="$pkgname-doc libstdc++:libcxx g++:gpp libgcc libgomp objc"
 source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-g++-$pkgver.tar.bz2
+	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
 	http://weaver.gentooenterprise.com/hardened/patches/gcc-$_pv-espf-$_espfver.tar.bz2
 	http://weaver.gentooenterprise.com/hardened/patches/gcc-$_pv-specs-$_specsver.tar.bz2
 	gcc-spec-env.patch
@@ -23,13 +24,14 @@ source="ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-core-$pkgver.tar.bz2
 	gcc-dynamic-linker.patch
 	PR32219.patch
 	"
-#	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2
+#	ftp://gcc.gnu.org/pub/gcc/releases/gcc-$pkgver/gcc-objc-$pkgver.tar.bz2		   1
+
 build ()
 {
 	cd "$srcdir"/gcc-$pkgver
 
 	# ESPF patches. we dont use objc yet
-	rm -f ../espf-gcc-$_pv/*_objc*lang-specs*.patch
+	#rm -f ../espf-gcc-$_pv/*_objc*lang-specs*.patch
 	# thanks to Zorry for hard work on those patches
 	for i in ../espf-gcc-$_pv/*.patch; do
 		msg "Applying $i"
@@ -60,7 +62,7 @@ build ()
 		--enable-__cxa_atexit \
 		--enable-cld \
 		--enable-espf \
-		--enable-languages=c,c++ \
+		--enable-languages=c,c++,objc \
 		--enable-shared \
 		--enable-target-optspace \
 		--enable-tls \
@@ -81,7 +83,7 @@ package() {
 
 	# binutils provides libiberty.a
 	rm -f "$pkgdir"/usr/lib/libiberty.a
-	
+
 	# install the specs
 	cd "$srcdir"/specs
 	install -d "$pkgdir"/usr/share/gcc
@@ -112,13 +114,20 @@ gpp() {
 	mv "$pkgdir"/usr/bin/*++ "$subpkgdir"/usr/bin/
 }
 
+objc() {
+	pkgdesc="GNU ObjectiveC library"
+	mkdir -p "$subpkgdir"/usr/lib
+
+	mv "$pkgdir"/usr/lib/*objc* "$subpkgdir"/usr/lib/
+}
+
 libgcc() {
 	pkgdesc="GNU C compiler runtime libraries"
 	depends=
 	mkdir -p "$subpkgdir"/usr/lib
 	mv "$pkgdir"/usr/lib/libgcc_s.so.* "$subpkgdir"/usr/lib/
 }
-	
+
 libgomp() {
 	pkgdesc="GCC shared-memory parallel programming API library"
 	depends=
@@ -129,6 +138,7 @@ libgomp() {
 
 md5sums="eb68755f64b9a4e37751992abb41c4fc  gcc-core-4.4.4.tar.bz2
 d51a6ec3eac1a90e7fc280d976ce7f80  gcc-g++-4.4.4.tar.bz2
+871cdd1a1ed8806a9bd5afcef0938fef  gcc-objc-4.4.4.tar.bz2
 72643cf4f9751d6cbfdbce483b92461d  gcc-4.4.2-espf-0.3.6.tar.bz2
 528926b586b2591474b6c2a7ef8ee6d7  gcc-4.4.2-specs-0.1.7.tar.bz2
 c4045bfa85d8be780affd465be9d8ca8  gcc-spec-env.patch
diff --git a/main/gmp5/APKBUILD b/main/gmp5/APKBUILD
index e07bff62c..1bbf41f4c 100644
--- a/main/gmp5/APKBUILD
+++ b/main/gmp5/APKBUILD
@@ -9,7 +9,7 @@ url="http://gmplib.org/"
 license="LGPL3"
 makedepends="m4 texinfo"
 depends=
-subpackages="$pkgname-doc gmp-dev:dev"
+subpackages="$pkgname-doc gmp-dev"
 source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2
 	gmp-4.1.4-noexecstack.patch
 	"
@@ -17,7 +17,7 @@ source="ftp://ftp.gnu.org/gnu/gmp/gmp-$pkgver.tar.bz2
 _builddir="$srcdir"/$_name-$pkgver
 build() {
 	cd "$_builddir"
-	patch -p1 < "$srcdir"/gmp-4.1.4-noexecstack.patch || return 1 
+	patch -p1 < "$srcdir"/gmp-4.1.4-noexecstack.patch || return 1
 
 	ABI="32" ./configure --prefix=/usr \
 		--build=${CHOST} \
diff --git a/main/gtk+/APKBUILD b/main/gtk+/APKBUILD
index d42980c0a..a8fa2fae6 100644
--- a/main/gtk+/APKBUILD
+++ b/main/gtk+/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=gtk+
 pkgver=2.20.1
-pkgrel=1
+pkgrel=2
 pkgdesc="The GTK+ Toolkit (v2)"
 url="http://www.gtk.org/"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.post-deinstall"
diff --git a/main/mpfr3/APKBUILD b/main/mpfr3/APKBUILD
index 31d912402..d7c4aa6a3 100644
--- a/main/mpfr3/APKBUILD
+++ b/main/mpfr3/APKBUILD
@@ -8,7 +8,7 @@ license="GPL LGPL"
 depends=
 makedepends="gmp-dev texinfo"
 source="http://www.mpfr.org/mpfr-current/mpfr-$pkgver.tar.bz2"
-subpackages="$pkgname-doc mpfr-dev:dev"
+subpackages="$pkgname-doc mpfr-dev"
 
 _builddir="$srcdir"/mpfr-$pkgver
 build() { 
diff --git a/main/pango/APKBUILD b/main/pango/APKBUILD
index 21e266719..762a4c6d5 100644
--- a/main/pango/APKBUILD
+++ b/main/pango/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pango
 pkgver=1.28.1
-pkgrel=0
+pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 url="http://www.pango.org/"
 license="LGPL"
diff --git a/main/poppler/APKBUILD b/main/poppler/APKBUILD
index 7b9c8935d..e766477ac 100644
--- a/main/poppler/APKBUILD
+++ b/main/poppler/APKBUILD
@@ -5,12 +5,12 @@
 # So we build gtk support in poppler-gtk
 pkgname=poppler
 pkgver=0.14.0
-pkgrel=0
+pkgrel=1
 pkgdesc="PDF rendering library based on xpdf 3.0"
 url="http://poppler.freedesktop.org/"
 license="GPL"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-utils"
-makedepends="jpeg-dev cairo-dev libxml2-dev fontconfig-dev pkgconfig"
+makedepends="jpeg-dev cairo-dev libxml2-dev fontconfig-dev pkgconfig libiconv-dev"
 depends=
 depends_dev="cairo-dev"
 source="http://$pkgname.freedesktop.org/$pkgname-$pkgver.tar.gz"
diff --git a/main/terminal/APKBUILD b/main/terminal/APKBUILD
index 620d3535d..147c03dae 100644
--- a/main/terminal/APKBUILD
+++ b/main/terminal/APKBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=terminal
 pkgver=0.4.5
-pkgrel=0
+pkgrel=1
 pkgdesc="A modern terminal emulator primarly for the Xfce desktop environment"
 url="http://www.xfce.org/projects/terminal/"
 license="GPL-2"
 subpackages="$pkgname-doc"
 depends="startup-notification hicolor-icon-theme"
 makedepends="pkgconfig exo-dev vte-dev dbus-glib-dev gettext-dev libiconv-dev
-	intltool"
+	intltool ncurses-dev"
 install=
 source="http://archive.xfce.org/src/apps/${pkgname}/0.4/Terminal-${pkgver}.tar.bz2
 	"
diff --git a/main/xorg-server/APKBUILD b/main/xorg-server/APKBUILD
index 2ae98aba2..8f22a6b2f 100644
--- a/main/xorg-server/APKBUILD
+++ b/main/xorg-server/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=xorg-server
 pkgver=1.7.7
-pkgrel=0
+pkgrel=1
 pkgdesc="X.Org X servers"
 url="http://xorg.freedesktop.org"
 license="custom"
@@ -25,7 +25,8 @@ makedepends="
 	libxxf86misc-dev
 	openssl-dev
 	pixman-dev
-
+	zlib-dev
+	
 	bigreqsproto
 	compositeproto
 	damageproto
diff --git a/rebuild-alpine.sh b/rebuild-alpine.sh
index 20756bd9a..24ce9d47b 100755
--- a/rebuild-alpine.sh
+++ b/rebuild-alpine.sh
@@ -26,15 +26,20 @@ build () {
         pkgno=$(expr "$pkgno" + 1)
         echo "Building $p ($pkgno of $pktcnt in $1 - $failed failed)"
         cd $rootdir/$1/$p
+        if [ -n "$debug" ] ; then
+            apk info | sort > $rootdir/packages.$1.$pkgno.$p.before
+        fi
         abuild -rm > $rootdir/$1_$p.txt 2>&1
         if [ "$?" = "0" ] ; then
-            rm $rootdir/$1_$p.txt
+    	    if [ -z "$debug" ] ; then
+                rm $rootdir/$1_$p.txt
+            fi
         else
             echo "Package $1/$p failed to build (output in $rootdir/$1_$p.txt)"
             if [ -n "$mail" ] ; then
                 maintainer=$(grep Maintainer APKBUILD | cut -d " " -f 3-)
                 if [ -n "$maintainer" ] ; then
-                    recipients="$maintainer -c dev@lists.alpinelinux.org"
+                    recipients="$maintainer -cc dev@lists.alpinelinux.org"
                 else
                     recipients="dev@lists.alpinelinux.org"
                 fi
@@ -46,6 +51,9 @@ build () {
             fi
             failed=$(expr "$failed" + 1)
         fi
+        if [ -n "$debug" ] ; then
+            apk info | sort > $rootdir/packages.$1.$pkgno.$p.after
+        fi
     done
     cd $rootdir
 }
@@ -54,10 +62,11 @@ touch START_OF_BUILD.txt
 
 unset clean
 unset mail
-while getopts "cm" opt; do
+while getopts "cmd" opt; do
 	case $opt in
 		'c') clean="--clean";;
 		'm') mail="--mail";;
+		'd') debug="--debug";;
 	esac
 done
 
diff --git a/testing/lua-rexlib/APKBUILD b/testing/lua-rex/APKBUILD
index 4f7bce089..4f7bce089 100644
--- a/testing/lua-rexlib/APKBUILD
+++ b/testing/lua-rex/APKBUILD
diff --git a/testing/multipath-tools/APKBUILD b/testing/multipath-tools/APKBUILD
index 471d9de2c..bb6227f93 100644
--- a/testing/multipath-tools/APKBUILD
+++ b/testing/multipath-tools/APKBUILD
@@ -2,12 +2,12 @@
 # Maintainer: Leonardo Arena <rnalrd@gmail.com>
 pkgname="multipath-tools"
 pkgver=0.4.8
-pkgrel=2
+pkgrel=3
 pkgdesc="Device Mapper Multipathing Driver"
 url="http://christophe.varoqui.free.fr/"
 license="GPL"
 depends=
-makedepends="lvm2-dev libaio-dev readline-dev"
+makedepends="lvm2-dev libaio-dev readline-dev ncurses-dev"
 install=
 subpackages="$pkgname-doc"
 source="http://christophe.varoqui.free.fr/$pkgname/$pkgname-$pkgver.tar.bz2