main/lua-aports: regenerate index if packages was deleted

3 files changed, 63 insertions, 4 deletions

diff --git a/main/lua-aports/0001-buildrepo-regenerate-index-if-packages-been-deleted.patch b/main/lua-aports/0001-buildrepo-regenerate-index-if-packages-been-deleted.patch
new file mode 100644
index 0000000000..d3437fd636
--- /dev/null
+++ b/main/lua-aports/0001-buildrepo-regenerate-index-if-packages-been-deleted.patch
@@ -0,0 +1,26 @@
+From 922130c3e0359b04cfb5d7cd31ee2fb9a5aa4b8d Mon Sep 17 00:00:00 2001
+From: Natanael Copa <ncopa@alpinelinux.org>
+Date: Fri, 26 Aug 2016 21:29:43 +0000
+Subject: [PATCH] buildrepo: regenerate index if packages been deleted
+
+http://lists.alpinelinux.org/alpine-devel/5444.html
+---
+ buildrepo.lua | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/buildrepo.lua b/buildrepo.lua
+index c665711..bf0f39a 100755
+--- a/buildrepo.lua
++++ b/buildrepo.lua
+@@ -239,7 +239,7 @@ for _,repo in pairs(args) do
+ 	end
+ 
+ 	-- generate new apkindex
+-	if not opts.n and built > 0 then
++	if not opts.n and (built > 0 or deleted > 0) then
+ 		info("Updating apk index")
+ 		apkrepo.update_index(("%s/%s"):format(repodest, repo),
+ 				abuild.arch, db:git_describe())
+-- 
+2.9.3
+
diff --git a/main/lua-aports/0001-pkg-support-arch-arch-syntax.patch b/main/lua-aports/0001-pkg-support-arch-arch-syntax.patch
new file mode 100644
index 0000000000..65268483da
--- /dev/null
+++ b/main/lua-aports/0001-pkg-support-arch-arch-syntax.patch
@@ -0,0 +1,25 @@
+From d2e111262470976b190d6f9aabed0ebf3afe2cb9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Mon, 25 Jul 2016 13:15:20 +0300
+Subject: [PATCH] pkg: support arch="!arch" syntax
+
+---
+ aports/pkg.lua | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/aports/pkg.lua b/aports/pkg.lua
+index b99bf68..f21f352 100644
+--- a/aports/pkg.lua
++++ b/aports/pkg.lua
+@@ -91,7 +91,7 @@ function M.all_apks_exists(pkg)
+ end
+ 
+ function M.arch_enabled(pkg)
+-	return pkg.arch.all or pkg.arch.noarch or pkg.arch[abuild.arch]
++	return not pkg.arch["!"..abuild.arch] and (pkg.arch.all or pkg.arch.noarch or pkg.arch[abuild.arch])
+ end
+ 
+ function M.libc_enabled(pkg)
+-- 
+2.9.3
+
diff --git a/main/lua-aports/APKBUILD b/main/lua-aports/APKBUILD
index bd871224f4..aa0cde344d 100644
--- a/main/lua-aports/APKBUILD
+++ b/main/lua-aports/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lua-aports
 pkgver=0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Lua modules for parsing aports tree"
 url="http://dev.alpinelinux.org/archive/lua-aports/"
 arch="noarch"
@@ -14,6 +14,8 @@ replaces="abuild"
 subpackages=""
 source="http://dev.alpinelinux.org/archive/lua-aports/lua-aports-$pkgver.tar.xz
 	0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch
+	0001-pkg-support-arch-arch-syntax.patch
+	0001-buildrepo-regenerate-index-if-packages-been-deleted.patch
 	"
 
 _builddir="$srcdir"/lua-aports-$pkgver
@@ -37,8 +39,14 @@ package() {
 }
 
 md5sums="068ddedda0968d3e000637d2db8da4cd  lua-aports-0.5.tar.xz
-d66bc2a08712170da458b46466499c7a  0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch"
+d66bc2a08712170da458b46466499c7a  0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch
+5f5ab124bb210fcaac3f5127fdbad4d6  0001-pkg-support-arch-arch-syntax.patch
+09fe5b8ccf59aa2c68e00abb4604763b  0001-buildrepo-regenerate-index-if-packages-been-deleted.patch"
 sha256sums="fb7ff16a884ed17f6856dc241ec17f0d1586f6d07b83dc5aebc1b320b772d4a9  lua-aports-0.5.tar.xz
-738e8967dc247b555299c1f43aab379d27afa9c2d9ccf47d061d6883b5c1babb  0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch"
+738e8967dc247b555299c1f43aab379d27afa9c2d9ccf47d061d6883b5c1babb  0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch
+b4bf7873836d587071accf1dd4452383f373f2c76933c31395f9cd93c793543d  0001-pkg-support-arch-arch-syntax.patch
+38c251efed9d9039aa7397c6f1e7a0a70f4b5d7597d1be28d3edfd3199943f18  0001-buildrepo-regenerate-index-if-packages-been-deleted.patch"
 sha512sums="7047f0c902c8f65e8a45ed221e793dd0a0c8abf77f85b21b2d23c4f3c19ab12d9862565615718223ff2633465b85026f260bba4d5851a898475974c93f40797d  lua-aports-0.5.tar.xz
-74d282482c54671cdac7bb0b484818aa67a875719bd615d24fa69b8ebd9905b5cc685d029e478d7f7c4f351e86b94b6fd4ad207240e82071bcff3b23ff764caf  0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch"
+74d282482c54671cdac7bb0b484818aa67a875719bd615d24fa69b8ebd9905b5cc685d029e478d7f7c4f351e86b94b6fd4ad207240e82071bcff3b23ff764caf  0001-buildrepo-fix-bug-when-repodest-is-set-with-buildrep.patch
+442f4701ea8020dce801bd5ddc08cac2bccff5a70cf12cc3d1602d091ae3dffe3e6905037d04e78da87eb3734401718b3340721d25dac0be5dbb59dbec9dac5a  0001-pkg-support-arch-arch-syntax.patch
+165418eea5bfa8ef0c9782b29f43a27e5fd922ce0f54db0d12c7fe92ab174bc134e31a87d835a3fef6935f81a204573246a33a63adaf77580e21cf9d924bffe1  0001-buildrepo-regenerate-index-if-packages-been-deleted.patch"