main/abuild: another fix for provides in subpackages

2 files changed, 66 insertions, 4 deletions

diff --git a/main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch b/main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch
new file mode 100644
index 000000000..275e52393
--- /dev/null
+++ b/main/abuild/0001-abuild-fix-provides-and-install_if-in-subpackages.patch
@@ -0,0 +1,58 @@
+From 0e58eeff8089c8c148c20a5e239d618095ec434f Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Thu, 11 Jun 2015 11:56:04 +0000
+Subject: [PATCH] abuild: fix provides and install_if in subpackages
+
+we need to clear provides set in global scope before splitting the
+subpackages so the subpackage does not inherit main packages' provides.
+
+But at the same time, we must not clear the provides/install_if set in
+the splitfunction itself.
+---
+ abuild.in | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/abuild.in b/abuild.in
+index cb069f2..dc72d79 100644
+--- a/abuild.in
++++ b/abuild.in
+@@ -683,6 +683,15 @@ postcheck() {
+ 	return 0
+ }
+ 
++pre_split() {
++	if [ -z "$subpkgname" ]; then
++		return 0
++	fi
++	# the subpackages should not inherit those form main package
++	provides=""
++	install_if=""
++}
++
+ prepare_subpackages() {
+ 	local i
+ 	cd "$startdir"
+@@ -692,7 +701,7 @@ prepare_subpackages() {
+ 		msg "Running split function $func..."
+ 		local dir="$pkgbasedir/${i%:*}" name="${i%:*}"
+ 		( subpkgdir="$dir" subpkgname="$name" \
+-			$0 $func prepare_package \
++			$0 pre_split $func prepare_package \
+ 			&& postcheck "$dir" "$name" ) || return 1
+ 	done
+ 	postcheck "$pkgdir" "$pkgname" || return 1
+@@ -947,11 +956,6 @@ archcheck() {
+ 
+ prepare_package() {
+ 	msg "Preparing ${subpkgname:+sub}package ${subpkgname:-$pkgname}..."
+-	if [ -n "$subpkgname" ]; then
+-		# the subpackages should not inherit those
+-		provides=""
+-		install_if=""
+-	fi
+ 	stripbin
+ 	prepare_metafiles \
+ 		&& prepare_trace_rpaths \
+-- 
+2.4.2
+
diff --git a/main/abuild/APKBUILD b/main/abuild/APKBUILD
index 6d863f98e..756c43081 100644
--- a/main/abuild/APKBUILD
+++ b/main/abuild/APKBUILD
@@ -2,7 +2,7 @@
 pkgname=abuild
 pkgver=2.23.0_rc2
 _ver=${pkgver%_git*}
-pkgrel=1
+pkgrel=2
 pkgdesc="Script to build Alpine Packages"
 url="http://git.alpinelinux.org/cgit/abuild/"
 arch="all"
@@ -21,6 +21,7 @@ options="suid"
 pkggroups="abuild"
 source="http://dev.alpinelinux.org/archive/abuild/abuild-$_ver.tar.xz
 	0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch
+	0001-abuild-fix-provides-and-install_if-in-subpackages.patch
 	"
 
 _builddir="$srcdir/$pkgname-$_ver"
@@ -58,8 +59,11 @@ cpan() {
 }
 
 md5sums="fd07e1df3a8b3eac403d8b931ffd2cdd  abuild-2.23.0_rc2.tar.xz
-00bdd3304f7d89decc5d4b84e30a10b5  0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch"
+00bdd3304f7d89decc5d4b84e30a10b5  0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch
+60460524b974ad082e722b8a5d65460a  0001-abuild-fix-provides-and-install_if-in-subpackages.patch"
 sha256sums="efe6be2a16f55d851bd7125ed3a36f63ea03a546cf4a8cc847cfdb6a801c4bf0  abuild-2.23.0_rc2.tar.xz
-d8744ecb58d86ecb40ee22edbdbcdba1e93cc8e331a9d98641446c08b307873a  0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch"
+d8744ecb58d86ecb40ee22edbdbcdba1e93cc8e331a9d98641446c08b307873a  0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch
+c305ef06ba09e40a886674bc4e36c253e91910ed7818ea6544f82ccf345f580e  0001-abuild-fix-provides-and-install_if-in-subpackages.patch"
 sha512sums="0b32c7ed6a59a57356a30767869d3e9aaa932aa55dd2982c102821a50a26c9e4a80415d768f24a228e34ecb450bfcbc2f88762fe95c5e218451611c946b6173a  abuild-2.23.0_rc2.tar.xz
-bb55aad137f2cf02f36ce57581a1dc00f6f70f5d4df1c3fcf509772757668abfb3e5e862e40f2b62fad707ec44278f33242f8d37a64473bc72423263df939fea  0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch"
+bb55aad137f2cf02f36ce57581a1dc00f6f70f5d4df1c3fcf509772757668abfb3e5e862e40f2b62fad707ec44278f33242f8d37a64473bc72423263df939fea  0001-abuild-clear-inherit-provides-and-install_if-for-sub.patch
+7269481a60a87bf2196c1a10ccfc6226d20c99e45a20e45f10aff2f174aaa2e5f92a88e374c15fbc76f3ffada49841bac3ad2208b78587a185048060aa3e5eb3  0001-abuild-fix-provides-and-install_if-in-subpackages.patch"