main/[various]: set proper arch

fixes commit "main/[various]: dont set arch in split function"

48 files changed, 81 insertions, 87 deletions

diff --git a/main/alsa-utils/APKBUILD b/main/alsa-utils/APKBUILD
index b2029c76b0..4ebc0fd8d8 100644
--- a/main/alsa-utils/APKBUILD
+++ b/main/alsa-utils/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=alsa-utils
 pkgver=1.1.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Advanced Linux Sound Architecture Utils (alsactl, alsamixer, etc.)"
 url="http://www.alsa-project.org"
 arch="all"
 license="GPL"
 makedepends="alsa-lib-dev pciutils-dev ncurses-dev fftw-dev"
 depends="dialog"
-subpackages="$pkgname-doc alsaconf $pkgname-dbg"
+subpackages="$pkgname-doc alsaconf::noarch $pkgname-dbg"
 source="ftp://ftp.alsa-project.org/pub/utils/$pkgname-$pkgver.tar.bz2
 	alsaconf.patch
 	alsa.initd
diff --git a/main/apache2/APKBUILD b/main/apache2/APKBUILD
index 34bf8dfe0b..da6b822afb 100644
--- a/main/apache2/APKBUILD
+++ b/main/apache2/APKBUILD
@@ -3,7 +3,7 @@
 pkgname=apache2
 _pkgreal=httpd
 pkgver=2.4.23
-pkgrel=7
+pkgrel=8
 pkgdesc="A high performance Unix-based HTTP server"
 url="http://httpd.apache.org/"
 arch="all"
@@ -16,9 +16,9 @@ makedepends="apr-dev apr-util-dev autoconf automake libxml2-dev lua-dev
              nghttp2-dev libressl-dev pcre-dev sed zlib-dev"
 subpackages="$pkgname-dev
              $pkgname-doc
-             $pkgname-error:_error
+             $pkgname-error:_error:noarch
              $pkgname-http2
-             $pkgname-icons
+             $pkgname-icons::noarch
              $pkgname-ldap
              $pkgname-lua:_lua
              $pkgname-proxy-html:proxy_html
diff --git a/main/aria2/APKBUILD b/main/aria2/APKBUILD
index 86b1061ac7..ea6d0cd57c 100644
--- a/main/aria2/APKBUILD
+++ b/main/aria2/APKBUILD
@@ -12,7 +12,7 @@ depends="ca-certificates"
 depends_dev=""
 makedepends="gnutls-dev expat-dev sqlite-dev c-ares-dev"
 install=""
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp"
+subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
 source="https://github.com/tatsuhiro-t/$pkgname/releases/download/release-$pkgver/$pkgname-$pkgver.tar.xz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
diff --git a/main/asciidoc/APKBUILD b/main/asciidoc/APKBUILD
index 51ec7e2821..ab34d07d57 100644
--- a/main/asciidoc/APKBUILD
+++ b/main/asciidoc/APKBUILD
@@ -9,21 +9,12 @@ license="GPL2"
 depends="python2 libxml2-utils docbook-xsl"
 makedepends=""
 install=""
-subpackages="$pkgname-doc $pkgname-vim"
+subpackages="$pkgname-doc $pkgname-vim::noarch"
 source="http://sourceforge.net/projects/asciidoc/files/asciidoc/$pkgver/asciidoc-$pkgver.tar.gz"
 
-_builddir="$srcdir"/$pkgname-$pkgver
-prepare() {
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
-
+builddir="$srcdir"/$pkgname-$pkgver
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -36,7 +27,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make DESTDIR="$pkgdir" install || return 1
 }
 
diff --git a/main/aspell/APKBUILD b/main/aspell/APKBUILD
index 06852e0f20..a7f3c411f4 100644
--- a/main/aspell/APKBUILD
+++ b/main/aspell/APKBUILD
@@ -7,7 +7,7 @@ pkgdesc="A spell checker designed to eventually replace Ispell"
 url="http://aspell.net/"
 arch="all"
 license="LGPL2+"
-subpackages="$pkgname-compat $pkgname-utils $pkgname-dev $pkgname-doc
+subpackages="$pkgname-compat::noarch $pkgname-utils $pkgname-dev $pkgname-doc
 	$pkgname-libs"
 depends=
 makedepends="ncurses-dev perl"
diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 7f76e5333c..24569b3a73 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -20,8 +20,8 @@ makedepends="autoconf automake libtool findutils tar wget bsd-compat-headers
 	bluez-dev libxml2-dev imap-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
-	$pkgname-tds $pkgname-fax $pkgname-sample-config:sample
-	$pkgname-sounds-moh:sound_moh $pkgname-sounds-en:sound_en
+	$pkgname-tds $pkgname-fax $pkgname-sample-config:sample:noarch
+	$pkgname-sounds-moh:sound_moh:noarch $pkgname-sounds-en:sound_en:noarch
 	$pkgname-mobile $pkgname-curl:_curl $pkgname-srtp $pkgname-dahdi
 	$pkgname-speex $pkgname-alsa $pkgname-cdr-mysql:cdr_mysql"
 
diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index 8881e61d2f..7e65b4b8b4 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -8,7 +8,7 @@ arch="all"
 license="LGPL2+"
 depends=""
 makedepends="readline-dev libxml2-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tests $pkgname-libs"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tests::noarch $pkgname-libs"
 source="http://download.augeas.net/augeas-$pkgver.tar.gz
 	acf.aug"
 builddir="$srcdir/$pkgname-$pkgver"
diff --git a/main/btrfs-progs/APKBUILD b/main/btrfs-progs/APKBUILD
index 31498e2794..4e7c4106f9 100644
--- a/main/btrfs-progs/APKBUILD
+++ b/main/btrfs-progs/APKBUILD
@@ -13,7 +13,8 @@ makedepends="util-linux-dev bash attr-dev acl-dev e2fsprogs-dev zlib-dev
 	lzo-dev asciidoc xmlto linux-headers
 	autoconf automake libtool"
 install=
-subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:completion $pkgname-libs $pkgname-extra"
+subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:completion:noarch
+	$pkgname-libs $pkgname-extra"
 source="https://www.kernel.org/pub/linux/kernel/people/kdave/$pkgname/$pkgname-v$pkgver.tar.xz
 	includes.patch
 	musl-compat.patch
diff --git a/main/collectd/APKBUILD b/main/collectd/APKBUILD
index 4af5d4eac7..bf0674be3a 100644
--- a/main/collectd/APKBUILD
+++ b/main/collectd/APKBUILD
@@ -14,7 +14,7 @@ makedepends="curl-dev net-snmp-dev postgresql-dev perl-dev python2-dev
 	hiredis-dev
 	autoconf automake libtool"
 install=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-perl $pkgname-snmp
+subpackages="$pkgname-dev $pkgname-doc $pkgname-perl::noarch $pkgname-snmp
 	$pkgname-curl:_curl
 	$pkgname-write_http $pkgname-nginx $pkgname-apache $pkgname-postgresql
 	$pkgname-mysql $pkgname-network $pkgname-rrdtool $pkgname-sensors
diff --git a/main/drbd-utils/APKBUILD b/main/drbd-utils/APKBUILD
index 45b0563332..50b6d5770b 100644
--- a/main/drbd-utils/APKBUILD
+++ b/main/drbd-utils/APKBUILD
@@ -11,7 +11,7 @@ depends="bash"
 makedepends="bash bison flex linux-headers libxslt docbook-xsl"
 install=
 provides="drbd"
-subpackages="$pkgname-doc $pkgname-pacemaker"
+subpackages="$pkgname-doc $pkgname-pacemaker::noarch"
 source="http://oss.linbit.com/drbd/drbd-utils-$pkgver.tar.gz
 	drbdsetup-permissions.patch
 	drbd.initd"
diff --git a/main/eudev/APKBUILD b/main/eudev/APKBUILD
index 46c579ab7c..1a393e3583 100644
--- a/main/eudev/APKBUILD
+++ b/main/eudev/APKBUILD
@@ -12,7 +12,7 @@ depends_dev=""
 replaces="udev"
 makedepends="$depends_dev gperf glib-dev linux-headers kmod-dev
 	gobject-introspection-dev util-linux-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-netifnames"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-netifnames::noarch"
 source="http://dev.gentoo.org/~blueness/$pkgname/$pkgname-$pkgver.tar.gz
 	default-rules.patch
 	udev-postmount.initd
diff --git a/main/freeswitch/APKBUILD b/main/freeswitch/APKBUILD
index 4cbdc3ac0f..197575bfb7 100644
--- a/main/freeswitch/APKBUILD
+++ b/main/freeswitch/APKBUILD
@@ -54,8 +54,8 @@ makedepends="
 	autoconf automake libtool
 	"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-flite $pkgname-timezones
-	$pkgname-sample-config:conf $pkgname-freetdm $pkgname-sangoma
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-flite $pkgname-timezones::noarch
+	$pkgname-sample-config:conf:noarch $pkgname-freetdm $pkgname-sangoma
 	$pkgname-snmp $pkgname-pgsql $pkgname-perl $pkgname-perlesl"
 
 _json_c="json-c-0.9.tar.gz"
diff --git a/main/git/APKBUILD b/main/git/APKBUILD
index 86ce63c870..2959fb605a 100644
--- a/main/git/APKBUILD
+++ b/main/git/APKBUILD
@@ -12,20 +12,20 @@ replaces="git-perl"
 
 # note that order matters
 subpackages="$pkgname-doc
-	$pkgname-bash-completion:completion
-	perl-$pkgname-svn:_perl_git_svn
-	perl-$pkgname:_perl_git
-	$pkgname-svn
-	$pkgname-email
-	$pkgname-cvs
-	$pkgname-p4
+	$pkgname-bash-completion:completion:noarch
+	perl-$pkgname-svn:_perl_git_svn:noarch
+	perl-$pkgname:_perl_git:noarch
+	$pkgname-svn::noarch
+	$pkgname-email::noarch
+	$pkgname-cvs::noarch
+	$pkgname-p4::noarch
 	$pkgname-daemon
-	$pkgname-gitweb
-	$pkgname-subtree
-	$pkgname-subtree-doc:subtree_doc
-	$pkgname-perl:_git_perl
-	$pkgname-gui
-	$pkgname-gitk
+	$pkgname-gitweb::noarch
+	$pkgname-subtree::noarch
+	$pkgname-subtree-doc:subtree_doc:noarch
+	$pkgname-perl:_git_perl:noarch
+	$pkgname-gui::noarch
+	$pkgname-gitk::noarch
 	"
 # we need tcl and tk to be built before git due to git-gui and gitk
 makedepends="zlib-dev libressl-dev curl-dev expat-dev perl-dev python2-dev
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 67357c3680..a9e784f109 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -15,7 +15,7 @@ makedepends="$depends_dev pcre-dev"
 source="http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
 	0001-gquark-fix-initialization-with-c-constructors.patch
 	"
-subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp"
+subpackages="$pkgname-dbg $pkgname-doc $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch"
 
 _builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
diff --git a/main/herbstluftwm/APKBUILD b/main/herbstluftwm/APKBUILD
index 259de309f8..c33e1785ef 100644
--- a/main/herbstluftwm/APKBUILD
+++ b/main/herbstluftwm/APKBUILD
@@ -14,8 +14,9 @@ options=""
 install=""
 subpackages="
 	$pkgname-doc
-	$pkgname-bash-completion:bashcomp
-	$pkgname-zsh-completion:zshcomp"
+	$pkgname-bash-completion:bashcomp:noarch
+	$pkgname-zsh-completion:zshcomp:noarch
+	"
 source="$url/tarballs/$pkgname-$pkgver.tar.gz
 	no-colors.patch"
 
diff --git a/main/iproute2/APKBUILD b/main/iproute2/APKBUILD
index 98ac1c0ebe..e6e6545b39 100644
--- a/main/iproute2/APKBUILD
+++ b/main/iproute2/APKBUILD
@@ -10,7 +10,7 @@ license="GPL2"
 depends=
 install="$pkgname.post-install"
 makedepends="bison flex bash iptables-dev libelf-dev"
-subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp"
+subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch"
 source="http://kernel.org/pub/linux/utils/net/iproute2/iproute2-$pkgver.tar.xz
 	musl-fixes.patch"
 
diff --git a/main/kbd/APKBUILD b/main/kbd/APKBUILD
index ae39fa5eb0..8a307ff7b2 100644
--- a/main/kbd/APKBUILD
+++ b/main/kbd/APKBUILD
@@ -10,7 +10,7 @@ license="GPL2+"
 depends="kbd-misc"
 makedepends="linux-headers bison flex autoconf automake linux-pam-dev check-dev"
 install=""
-subpackages="$pkgname-misc $pkgname-doc $pkgname-vlock"
+subpackages="$pkgname-misc::noarch $pkgname-doc $pkgname-vlock"
 source="ftp://ftp.altlinux.org/pub/people/legion/kbd/kbd-$pkgver.tar.gz
 	error.h
 	"
diff --git a/main/kmod/APKBUILD b/main/kmod/APKBUILD
index 975232d4fc..740e0883a1 100644
--- a/main/kmod/APKBUILD
+++ b/main/kmod/APKBUILD
@@ -16,7 +16,7 @@ makedepends="$makedepends_build $makedepends_host"
 install=""
 triggers="$pkgname.trigger=/lib/modules/*"
 subpackages="$pkgname-dev $pkgname-doc
-	$pkgname-bash-completion:bashcomp"
+	$pkgname-bash-completion:bashcomp:noarch"
 source="http://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-$pkgver.tar.xz
 	strndupa.patch
 	kmod-static-nodes.initd
diff --git a/main/lua-cqueues/APKBUILD b/main/lua-cqueues/APKBUILD
index fa1d52acbe..3709c110f0 100644
--- a/main/lua-cqueues/APKBUILD
+++ b/main/lua-cqueues/APKBUILD
@@ -4,10 +4,10 @@ _luaversions="5.1 5.2 5.3"
 pkgname=lua-cqueues
 _pkgname=cqueues
 pkgver=20160808
-pkgrel=3
+pkgrel=4
 pkgdesc="Lua event loop using coroutines"
 url="http://25thandclement.com/~william/projects/cqueues.html"
-arch="noarch"
+arch="all"
 license="MIT"
 depends=""
 makedepends="libressl-dev m4 bsd-compat-headers"
diff --git a/main/lua-curl/APKBUILD b/main/lua-curl/APKBUILD
index 17e4f20ca1..0f0b8b8670 100644
--- a/main/lua-curl/APKBUILD
+++ b/main/lua-curl/APKBUILD
@@ -3,10 +3,10 @@ _luaversions="5.1 5.2 5.3"
 pkgname=lua-curl
 _pkgname=Lua-cURLv3
 pkgver=0.3.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Lua bindings to cURL library"
 url="https://github.com/Lua-cURL/Lua-cURLv3"
-arch="noarch"
+arch="all"
 license="MIT/X11"
 depends=""
 makedepends="curl-dev"
diff --git a/main/lua-pty/APKBUILD b/main/lua-pty/APKBUILD
index e116ac266a..38b9e60ef2 100644
--- a/main/lua-pty/APKBUILD
+++ b/main/lua-pty/APKBUILD
@@ -6,7 +6,7 @@ _rockver=1
 pkgrel=0
 pkgdesc="Lua module to control other programs via PTYs."
 url="http://www.tset.de/lpty/"
-arch=""
+arch="all"
 license="MIT/X11"
 depends=""
 makedepends=""
diff --git a/main/lxc/APKBUILD b/main/lxc/APKBUILD
index d7cf267042..905183212b 100644
--- a/main/lxc/APKBUILD
+++ b/main/lxc/APKBUILD
@@ -15,8 +15,8 @@ depends_dev="libcap-dev"
 makedepends="$depends_dev lvm2 util-linux automake autoconf libtool lua5.2-dev
 	linux-headers bash tar docbook2x libseccomp-dev"
 options="suid"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-lvm lua5.2-lxc:_lua52
-	$pkgname-download:_download $pkgname-templates $pkgname-libs"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-lvm::noarch lua5.2-lxc:_lua52
+	$pkgname-download:_download:noarch $pkgname-templates::noarch $pkgname-libs"
 source="https://github.com/lxc/lxc/archive/lxc-$_pkgver.tar.gz
 	version.patch
 	lxc.initd
diff --git a/main/mcabber/APKBUILD b/main/mcabber/APKBUILD
index 4185f58fe6..ed8ea90b64 100644
--- a/main/mcabber/APKBUILD
+++ b/main/mcabber/APKBUILD
@@ -13,7 +13,7 @@ options="libtool"
 makedepends="loudmouth-dev glib-dev ncurses-dev gpgme-dev aspell-dev
 			libotr3-dev libidn-dev enchant-dev"
 install=""
-subpackages="$pkgname-dev $pkgname-doc $pkgname-example"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-example::noarch"
 source="http://mcabber.com/files/$pkgname-$pkgver.tar.bz2"
 
 builddir="$srcdir"/$pkgname-$pkgver
diff --git a/main/mdocml/APKBUILD b/main/mdocml/APKBUILD
index 6bbdaaf133..d7968759de 100644
--- a/main/mdocml/APKBUILD
+++ b/main/mdocml/APKBUILD
@@ -10,7 +10,7 @@ depends=""
 makedepends="sqlite-dev zlib-dev"
 install="$pkgname.post-deinstall"
 triggers="$pkgname-apropos.trigger=/usr/share/man/*"
-subpackages="$pkgname-doc $pkgname-dev man $pkgname-apropos $pkgname-soelim"
+subpackages="$pkgname-doc $pkgname-dev man::noarch $pkgname-apropos $pkgname-soelim"
 source="http://mdocml.bsd.lv/snapshots/$pkgname-$pkgver.tar.gz
 	gcc6-fix.patch
 	shared-libmandoc.patch
diff --git a/main/mercurial/APKBUILD b/main/mercurial/APKBUILD
index 72ff3d2155..750dee0fbb 100644
--- a/main/mercurial/APKBUILD
+++ b/main/mercurial/APKBUILD
@@ -11,9 +11,9 @@ depends=""
 makedepends="python2-dev"
 subpackages="
 	$pkgname-doc
-	$pkgname-vim:vim
-	$pkgname-zsh-completion:zshcomp
-	$pkgname-bash-completion:bashcomp"
+	$pkgname-vim:vim:noarch
+	$pkgname-zsh-completion:zshcomp:noarch
+	$pkgname-bash-completion:bashcomp:noarch"
 source="https://www.mercurial-scm.org/release/$pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
diff --git a/main/mpc/APKBUILD b/main/mpc/APKBUILD
index 2c7e144d6b..b9c020a2ed 100644
--- a/main/mpc/APKBUILD
+++ b/main/mpc/APKBUILD
@@ -10,7 +10,7 @@ license="GPL2"
 depends=""
 depends_dev=""
 makedepends="libmpdclient-dev"
-subpackages="$pkgname-bash-completion:bashcomp $pkgname-doc"
+subpackages="$pkgname-bash-completion:bashcomp:noarch $pkgname-doc"
 source="http://www.musicpd.org/download/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
diff --git a/main/msmtp/APKBUILD b/main/msmtp/APKBUILD
index af67f097ad..7c8af31751 100644
--- a/main/msmtp/APKBUILD
+++ b/main/msmtp/APKBUILD
@@ -10,7 +10,7 @@ license="GPLv3+"
 depends=""
 makedepends="libressl-dev"
 install=""
-subpackages="$pkgname-doc $pkgname-vim:vim"
+subpackages="$pkgname-doc $pkgname-vim:vim:noarch"
 source="http://downloads.sourceforge.net/project/$pkgname/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz"
 
 _builddir="$srcdir"/$pkgname-$pkgver
diff --git a/main/nagios/APKBUILD b/main/nagios/APKBUILD
index 6a9f06ddd7..8fa16a1c63 100644
--- a/main/nagios/APKBUILD
+++ b/main/nagios/APKBUILD
@@ -14,7 +14,7 @@ source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	nagios.confd
 	nagios.initd
 	lighttpd-nagios.conf"
-subpackages="${pkgname}-web"
+subpackages="${pkgname}-web::noarch"
 pkgusers="nagios"
 pkggroups="nagios"
 
diff --git a/main/nano/APKBUILD b/main/nano/APKBUILD
index 716db797a5..f1e16eaba2 100644
--- a/main/nano/APKBUILD
+++ b/main/nano/APKBUILD
@@ -9,7 +9,7 @@ arch="all"
 license="GPL"
 depends=
 makedepends="ncurses-dev"
-subpackages="$pkgname-doc $pkgname-syntax"
+subpackages="$pkgname-doc $pkgname-syntax::noarch"
 source="http://www.nano-editor.org/dist/v${pkgver%.*}/$pkgname-$pkgver.tar.gz
 	"
 
diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
index 1dc1b73e5e..627910a331 100644
--- a/main/nginx/APKBUILD
+++ b/main/nginx/APKBUILD
@@ -59,7 +59,7 @@ _grp_ngx="nginx"
 _grp_www="www-data"
 pkggroups="$_grp_ngx $_grp_www"
 install="$pkgname.pre-install $pkgname.post-upgrade"
-subpackages="$pkgname-doc $pkgname-vim"
+subpackages="$pkgname-doc $pkgname-vim::noarch"
 replaces="$pkgname-common $pkgname-initscripts $pkgname-lua $pkgname-rtmp"
 source="http://nginx.org/download/$pkgname-$pkgver.tar.gz
 	$_devel_kit_name-$_devel_kit_ver.tar.gz::https://github.com/simpl/$_devel_kit_name/archive/v$_devel_kit_ver.tar.gz
diff --git a/main/nmap/APKBUILD b/main/nmap/APKBUILD
index d2f70cf4ef..bda039ad1b 100644
--- a/main/nmap/APKBUILD
+++ b/main/nmap/APKBUILD
@@ -11,8 +11,8 @@ makedepends="libpcap-dev libressl-dev lua-dev linux-headers"
 install=""
 subpackages="
 	$pkgname-doc
-	$pkgname-scripts
-	$pkgname-nselibs
+	$pkgname-scripts::noarch
+	$pkgname-nselibs::noarch
 	$pkgname-nping
 	$pkgname-ncat"
 source="http://nmap.org/dist/$pkgname-$pkgver.tar.bz2
diff --git a/main/openvswitch/APKBUILD b/main/openvswitch/APKBUILD
index 37f54fa811..e27439a1a8 100644
--- a/main/openvswitch/APKBUILD
+++ b/main/openvswitch/APKBUILD
@@ -10,7 +10,8 @@ license="ASL 2.0"
 depends=""
 depends_dev="libressl-dev"
 makedepends="$depends_dev perl python2 linux-headers bash py-six"
-subpackages="$pkgname-doc $pkgname-dbg $pkgname-dev $pkgname-monitor $pkgname-bash-completion:bashcomp"
+subpackages="$pkgname-doc $pkgname-dbg $pkgname-dev
+	$pkgname-monitor::noarch $pkgname-bash-completion:bashcomp:noarch"
 source="http://openvswitch.org/releases/$pkgname-$pkgver.tar.gz
 	ovsdb-server.initd
 	ovsdb-server.confd
diff --git a/main/php5/APKBUILD b/main/php5/APKBUILD
index 411fb2596f..51f5c1b28d 100644
--- a/main/php5/APKBUILD
+++ b/main/php5/APKBUILD
@@ -51,11 +51,11 @@ makedepends="
 	autoconf
 	bison
 	"
-subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-common $pkgname-cgi
+subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-common::noarch $pkgname-cgi
 	$pkgname-cli $pkgname-fpm $pkgname-apache2 $pkgname-embed
 	$pkgname-phpdbg
 
-	$pkgname-pear
+	$pkgname-pear::noarch
 	$pkgname-bcmath
 	$pkgname-bz2
 	$pkgname-calendar
diff --git a/main/protobuf/APKBUILD b/main/protobuf/APKBUILD
index 642e5cfe0c..8297e09f81 100644
--- a/main/protobuf/APKBUILD
+++ b/main/protobuf/APKBUILD
@@ -10,7 +10,7 @@ license="BSD"
 depends=""
 depends_dev="zlib-dev"
 makedepends="$depends_dev autoconf automake libtool"
-subpackages="$pkgname-dev $pkgname-vim"
+subpackages="$pkgname-dev $pkgname-vim::noarch"
 source="$pkgname-$pkgver.tar.gz::https://github.com/google/$pkgname/archive/v$pkgver.tar.gz
 	musl-fix.patch
 	"
diff --git a/main/py-cffi/APKBUILD b/main/py-cffi/APKBUILD
index e29053db45..0d2e480127 100644
--- a/main/py-cffi/APKBUILD
+++ b/main/py-cffi/APKBUILD
@@ -6,7 +6,7 @@ pkgver=1.8.3
 pkgrel=0
 pkgdesc="A foreign function interface for calling C code from Python"
 url="http://cffi.readthedocs.org/"
-arch="noarch"
+arch="all"
 license="MIT"
 depends=""
 makedepends="python2-dev python3-dev py-setuptools libffi-dev"
diff --git a/main/py-gnome/APKBUILD b/main/py-gnome/APKBUILD
index df2cb5a6ca..53b3d5e841 100644
--- a/main/py-gnome/APKBUILD
+++ b/main/py-gnome/APKBUILD
@@ -13,7 +13,7 @@ depends="$pkgname-bonobo $pkgname-gconf $pkgname-libgnome $pkgname-gnomevfs"
 depends_dev="gtk+2.0-dev libgnome-dev py-gobject-dev py-gtk-dev python2-dev"
 makedepends="$depends_dev"
 install=""
-subpackages="$pkgname-dev $pkgname-bonobo $pkgname-gconf $pkgname-libgnome \
+subpackages="$pkgname-dev $pkgname-bonobo::noarch $pkgname-gconf $pkgname-libgnome \
 	$pkgname-gnomevfs"
 source="http://ftp.gnome.org/pub/gnome/sources/$_realname/$_basever/$_realname-$pkgver.tar.bz2"
 
diff --git a/main/py-libvirt/APKBUILD b/main/py-libvirt/APKBUILD
index c1ff1245f8..5a4f838496 100644
--- a/main/py-libvirt/APKBUILD
+++ b/main/py-libvirt/APKBUILD
@@ -5,7 +5,7 @@ pkgver=2.2.0
 pkgrel=0
 pkgdesc="The libvirt virtualization API python binding"
 url="http://libvirt.org"
-arch=""
+arch="all"
 license="LGPLv2+"
 depends=""
 makedepends="python2-dev python3-dev libvirt-dev"
diff --git a/main/py-urwid/APKBUILD b/main/py-urwid/APKBUILD
index 5249abe687..6ee6ecb0a8 100644
--- a/main/py-urwid/APKBUILD
+++ b/main/py-urwid/APKBUILD
@@ -11,7 +11,7 @@ license="LGPL2+"
 depends=""
 makedepends="python2-dev py-setuptools py-templayer py-sphinx"
 install=""
-subpackages="$pkgname-doc $pkgname-examples"
+subpackages="$pkgname-doc $pkgname-examples::noarch"
 source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
 
 _builddir="$srcdir"/$_pkgname-$pkgver
diff --git a/main/python2-tkinter/APKBUILD b/main/python2-tkinter/APKBUILD
index 09fed5dd61..8a4dcf8900 100644
--- a/main/python2-tkinter/APKBUILD
+++ b/main/python2-tkinter/APKBUILD
@@ -11,7 +11,7 @@ pkgdesc="A graphical user interface for the Python"
 url="https://wiki.python.org/moin/TkInter"
 arch="all"
 license="custom"
-subpackages="$pkgname-tests python2-idle:_idle"
+subpackages="$pkgname-tests python2-idle:_idle:noarch"
 depends=""
 makedepends="expat-dev libressl-dev zlib-dev ncurses-dev bzip2-dev
 	gdbm-dev sqlite-dev libffi-dev readline-dev linux-headers paxmark
diff --git a/main/python3/APKBUILD b/main/python3/APKBUILD
index a133f325e3..e1ecbe57bf 100644
--- a/main/python3/APKBUILD
+++ b/main/python3/APKBUILD
@@ -10,7 +10,7 @@ url="http://www.python.org"
 arch="all"
 license="custom"
 provides="py3-pip"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-tests py3-tkinter:tkinter"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-tests::noarch py3-tkinter:tkinter"
 depends=""
 makedepends="expat-dev libressl-dev zlib-dev ncurses-dev bzip2-dev xz-dev
 	sqlite-dev libffi-dev tcl-dev linux-headers gdbm-dev readline-dev
diff --git a/main/ruby/APKBUILD b/main/ruby/APKBUILD
index 55980c6025..2741f26733 100644
--- a/main/ruby/APKBUILD
+++ b/main/ruby/APKBUILD
@@ -15,9 +15,9 @@ depends=""
 depends_dev="gmp-dev"
 makedepends="$depends_dev zlib-dev libressl-dev gdbm-dev db-dev libedit-dev
 	libffi-dev coreutils yaml-dev linux-headers autoconf"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-irb
-	$pkgname-rdoc $pkgname-rake $pkgname-bigdecimal
-	$pkgname-io-console:io_console $pkgname-minitest
+subpackages="$pkgname-doc $pkgname-dev $pkgname-irb::noarch
+	$pkgname-rdoc::noarch $pkgname-rake::noarch $pkgname-bigdecimal::noarch
+	$pkgname-io-console:io_console $pkgname-minitest::noarch
 	$pkgname-json $pkgname-libs
 	"
 patches="
diff --git a/main/teeworlds/APKBUILD b/main/teeworlds/APKBUILD
index 7978f9ac53..527e38cf0c 100644
--- a/main/teeworlds/APKBUILD
+++ b/main/teeworlds/APKBUILD
@@ -10,7 +10,7 @@ url='https://www.teeworlds.com'
 license='custom'
 depends=
 makedepends="python2 mesa-dev glu-dev sdl-dev freetype-dev alsa-lib-dev bam"
-subpackages="$pkgname-server $pkgname-common"
+subpackages="$pkgname-server $pkgname-common::noarch"
 source="https://downloads.teeworlds.com/teeworlds-$pkgver-src.tar.gz"
 
 _builddir=""$srcdir"/$pkgname-$pkgver-src"
diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD
index d42f2d120c..83290a38af 100644
--- a/main/unbound/APKBUILD
+++ b/main/unbound/APKBUILD
@@ -14,7 +14,7 @@ depends="dnssec-root"
 depends_dev="libressl-dev expat-dev ldns-dev libevent-dev"
 makedepends="$depends_dev python2-dev swig linux-headers"
 install="$pkgname.pre-install"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-dbg py-unbound:py $pkgname-migrate"
+subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-dbg py-unbound:py $pkgname-migrate::noarch"
 source="http://unbound.net/downloads/unbound-$pkgver.tar.gz
 	conf.patch
 	update-unbound-root-hints
diff --git a/main/util-linux/APKBUILD b/main/util-linux/APKBUILD
index be7cc9809c..e7203855ac 100644
--- a/main/util-linux/APKBUILD
+++ b/main/util-linux/APKBUILD
@@ -24,7 +24,7 @@ source="http://www.kernel.org/pub/linux/utils/$pkgname/v${_v}/$pkgname-$pkgver.t
 	libblkid-reduce-probing-area-for-crazy-CDROMs.patch
 	ttydefaults.h
 	"
-subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp
+subpackages="$pkgname-doc $pkgname-dev $pkgname-bash-completion:bashcomp:noarch
 	libuuid libblkid libmount libsmartcols libfdisk sfdisk cfdisk
 	findmnt:_findmnt mcookie blkid"
 if [ -z "$BOOTSTRAP" ]; then
diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index daf40d63f2..ef7690cbf5 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -10,7 +10,7 @@ arch="all"
 license="custom"
 depends=""
 makedepends="ncurses-dev lua5.2-dev python3-dev"
-subpackages="$pkgname-doc ${pkgname}diff"
+subpackages="$pkgname-doc ${pkgname}diff::noarch"
 source="$pkgname-$pkgver.tar.gz::https://github.com/$pkgname/$pkgname/archive/v$pkgver.tar.gz
 	vimrc
 	"
diff --git a/main/vlc/APKBUILD b/main/vlc/APKBUILD
index 0bacc36b1b..90328b4662 100644
--- a/main/vlc/APKBUILD
+++ b/main/vlc/APKBUILD
@@ -17,7 +17,7 @@ subpackages="$pkgname-dev
 	$pkgname-doc
 	$pkgname-qt
 	$pkgname-xorg
-	$pkgname-daemon
+	$pkgname-daemon::noarch
 	$pkgname-libs
 	$pkgname-plugins
 
diff --git a/main/zabbix/APKBUILD b/main/zabbix/APKBUILD
index 1d409daa60..342af9f108 100644
--- a/main/zabbix/APKBUILD
+++ b/main/zabbix/APKBUILD
@@ -21,7 +21,7 @@ install="$pkgname.pre-install"
 pkgusers="zabbix"
 pkggroups="zabbix"
 subpackages="$pkgname-doc $pkgname-agent $pkgname-pgsql $pkgname-mysql
-	$pkgname-webif $pkgname-sqlite $pkgname-utils $pkgname-setup"
+	$pkgname-webif::noarch $pkgname-sqlite $pkgname-utils $pkgname-setup::noarch"
 source="http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	zabbix-getloadavg.patch
 	automake.patch
diff --git a/main/zsh/APKBUILD b/main/zsh/APKBUILD
index 65f80ffb79..7f0feef22f 100644
--- a/main/zsh/APKBUILD
+++ b/main/zsh/APKBUILD
@@ -16,7 +16,7 @@ source="http://www.zsh.org/pub/$pkgname-$pkgver.tar.xz
 	fix-zle-segfault.patch
 	fix-oom-fatal-error.patch
 	fix-vcs_info.patch"
-subpackages="$pkgname-doc $pkgname-calendar $pkgname-vcs $pkgname-zftp"
+subpackages="$pkgname-doc $pkgname-calendar::noarch $pkgname-vcs::noarch $pkgname-zftp::noarch"
 builddir="$srcdir/$pkgname-$pkgver"
 
 _libdir="usr/lib/zsh/$pkgver"