From 45d9102edb56d428c76de70cd60c8a937fc01f83 Mon Sep 17 00:00:00 2001
From: Christian Kampka <christian@kampka.net>
Date: Sat, 16 Jul 2016 20:07:15 +0200
Subject: main/fakeroot: new upstream version 1.21

---
 main/fakeroot/APKBUILD        | 24 ++++++++++++++----------
 main/fakeroot/xstatjunk.patch | 11 -----------
 2 files changed, 14 insertions(+), 21 deletions(-)

(limited to 'main/fakeroot')

diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 623b71000b..c9da565ecd 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -1,16 +1,16 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=fakeroot
-pkgver=1.20.2
-pkgrel=4
+pkgver=1.21
+pkgrel=0
 pkgdesc="Gives a fake root environment, useful for building packages as a non-privileged user"
 arch="all"
 license='GPL'
 url="http://fakeroot.alioth.debian.org/"
 depends=
-makedepends_host="libcap-dev acl-dev linux-headers"
+makedepends_host="libcap-dev acl-dev linux-headers libtool autoconf automake po4a"
 makedepends="$makedepends_host"
 subpackages="$pkgname-doc"
-source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.bz2
+source="http://ftp.debian.org/debian/pool/main/f/$pkgname/${pkgname}_${pkgver}.orig.tar.gz
 	busybox-getopt.patch
 	fakeroot-hide-dlsym-errors.patch
 	fakeroot-no64.patch
@@ -37,6 +37,8 @@ build() {
 		export CFLAGS="-D_STAT_VER=0 $CFLAGS"
 	fi
 
+	CONFIG_SHELL=/bin/sh \
+	./bootstrap || return 1
 	CONFIG_SHELL=/bin/sh \
 	./configure \
 		--build=$CBUILD \
@@ -45,6 +47,8 @@ build() {
 		--disable-static \
 		|| return 1
 	make || return 1
+	cd doc
+	po4a -k 0 --rm-backups --variable "srcdir=../doc/" po4a/po4a.cfg || return 1
 }
 
 package() {
@@ -52,24 +56,24 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="a4b4564a75024aa96c86e4d1017ac786  fakeroot_1.20.2.orig.tar.bz2
+md5sums="be5c9a0e516869fca4a6758105968e5a  fakeroot_1.21.orig.tar.gz
 7ca69287e73bdd65947e70e439b5bb64  busybox-getopt.patch
 624cd86a66d020d01bde4ba60efc4d40  fakeroot-hide-dlsym-errors.patch
 3fc66a8ffb365fcf2acd652d33f101a2  fakeroot-no64.patch
 50a899380cfd5eae8ce3aaf878fb17b2  fakeroot-stdint.patch
 75b41eae4e68552728c6df4cbce28bf2  fakeroot-no-ldlibrarypath.patch
-ff42badefea59d969f2df3994110d747  xstatjunk.patch"
-sha256sums="7c0a164d19db3efa9e802e0fc7cdfeff70ec6d26cdbdc4338c9c2823c5ea230c  fakeroot_1.20.2.orig.tar.bz2
+2438e71f447a784eac87f19a7fdbc531  xstatjunk.patch"
+sha256sums="5d293c1b3604b2a9265d1811a9890c749887ef08aec55f3237d32bf35836171a  fakeroot_1.21.orig.tar.gz
 6b881eaecacacba100cbaa96d552c51a622639a40f3d7701b6756b4cde0e5d95  busybox-getopt.patch
 915313c164b2968bc785621d14e652aae0bb74cec01510457d1fa601f23e0ca2  fakeroot-hide-dlsym-errors.patch
 3420da0789caef582fcfc890c657da4136b3b06d1205443f4409cdf85ab02a46  fakeroot-no64.patch
 8739c0b79c3f2b0e46cd0dffa8b73d946efbe994f61f69f7d1115c2dcec22df1  fakeroot-stdint.patch
 e95d525b119d97aeacc944879664b281218292f70eabe9ee65fae38a8712c6c2  fakeroot-no-ldlibrarypath.patch
-78f2fcc1ffcacdfbfa8c74bdb2a528c9226921fde949d451a0269d8c35d6a027  xstatjunk.patch"
-sha512sums="1ac231f995774aa40f43c4325cd9e6de45365963277c32a85776690c3e7fd281ac410f3d91395dc1e5e5ca3b143e89914e048632011a3985ead216e870852231  fakeroot_1.20.2.orig.tar.bz2
+5694b33fcfc9682f42b4c11ab49a8b5b402128dd9f0cd870eaad659c9b2679cf  xstatjunk.patch"
+sha512sums="b55ec626bbe4ce7df7d3ea519db34961163ef824143d08366af2931e2576db6fa532e7cb49eab49f7566228058bc269555444d8bbc28b6937d1d43e9df11cb13  fakeroot_1.21.orig.tar.gz
 9024263f4452bcb46c9670f8b8106e67c2d9b4cf45215def7ff4e78d2c908e4f98d494dd6f514fb3325165b0f61571fa031632b4642163cf9b1b3386d0867c5f  busybox-getopt.patch
 666f41d6adc5e65eba419e08d5bbc4f561e40b0fc7bfa82090eb87962a7f3193bf319754e04aca289e865c66df2ecced1dbb45c9aa9f093657f22193dda25354  fakeroot-hide-dlsym-errors.patch
 7a832e6bed3838c7c488e0e12ba84b8d256e84bbb06d6020247452a991de505fa5c6bd7bcb84dce8753eb242e0fcab863b5461301cd56695f2b003fe8d6ff209  fakeroot-no64.patch
 ed7a58b0d201139545420f9e5429f503c00e00f36dea84473e77ea99b23bb8d421da1a8a8ce98ff90e72e378dff4cb9ea3c1a863a969899a5f50dfac3b9c5fac  fakeroot-stdint.patch
 acfc1e5efce132279adddf9e11c28d65602059d5cd723ad98b67cb9183e1de68445f3bba7ac54ee60265b85f25141fcc9b2156f551aa5c624a92631320f5b743  fakeroot-no-ldlibrarypath.patch
-27bac2aaea72547efc7c48313f8c2eee3b60d778e7bf4ebb49a37a750b7477a5080cfa7fbc2c135527ade7e9fb826ccaaba06b85d2713cad21891608e9c1ad4d  xstatjunk.patch"
+5efd33fd778bd94a529ed7e439fb8fea25ff865dda3f6f9e431264e942b37f3b5d7a0ad14107b55c5fa81b86efd5a82aedb3803cfab08ec57f27f5b229d2fe88  xstatjunk.patch"
diff --git a/main/fakeroot/xstatjunk.patch b/main/fakeroot/xstatjunk.patch
index b27b2b5199..12f2759b48 100644
--- a/main/fakeroot/xstatjunk.patch
+++ b/main/fakeroot/xstatjunk.patch
@@ -1,14 +1,3 @@
---- fakeroot-1.18.4.orig/configure	2012-06-02 18:28:46.000000000 +0000
-+++ fakeroot-1.18.4/configure	2015-09-24 21:46:28.804464060 +0000
-@@ -12577,7 +12577,7 @@
-   FUNC=`echo $SEARCH|sed -e 's/.*%//'`
-   PRE=`echo $SEARCH|sed -e 's/%.*//'`
-   FOUND=
--  for WRAPPED in __${PRE}x${FUNC} _${PRE}x${FUNC} __${PRE}${FUNC}13 ${PRE}${FUNC}; do
-+  for WRAPPED in ${PRE}${FUNC}; do
-     for ac_func in $WRAPPED
- do :
-   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 --- fakeroot-1.18.4.orig/configure.ac	2012-06-02 18:23:41.000000000 +0000
 +++ fakeroot-1.18.4configure.ac	2015-09-24 23:15:56.917470073 +0000
 @@ -301,7 +301,7 @@
-- 
cgit v1.2.3