From a2e061d5095bdd9ec5421e02fdfe2315e1b05136 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Wed, 2 Nov 2016 11:51:56 +0200 Subject: community/[various]: dont set arch in split function --- community/arpack/APKBUILD | 1 - community/bareos-webui/APKBUILD | 2 +- community/cfengine/APKBUILD | 4 ++-- community/chicken/APKBUILD | 3 +-- community/cmus/APKBUILD | 6 ++---- community/dnscrypt-proxy/APKBUILD | 4 ++-- community/docker/APKBUILD | 9 +++------ community/firejail/APKBUILD | 3 +-- community/hub/APKBUILD | 6 ++---- community/icinga2/APKBUILD | 4 ++-- community/icingaweb2/APKBUILD | 4 ++-- community/java-jffi/APKBUILD | 4 +--- community/java-lz4/APKBUILD | 3 +-- community/java-snappy/APKBUILD | 1 - community/knot/APKBUILD | 6 ++---- community/lua-compat53/APKBUILD | 3 +-- community/lua-lpeg/APKBUILD | 3 +-- community/lua-lunix/APKBUILD | 3 +-- community/minetest/APKBUILD | 3 +-- community/mpv/APKBUILD | 3 +-- community/mumble/APKBUILD | 3 +-- community/mumudvb/APKBUILD | 1 - community/notmuch/APKBUILD | 6 ++---- community/openblas/APKBUILD | 1 - community/openjdk7/APKBUILD | 3 +-- community/openjdk8/APKBUILD | 3 +-- community/php7/APKBUILD | 6 ++---- community/py-cx_freeze/APKBUILD | 4 ++-- community/py-gevent/APKBUILD | 4 ++-- community/py-greenlet/APKBUILD | 3 +-- community/py-lz4/APKBUILD | 3 +-- community/py-msgpack/APKBUILD | 3 +-- community/py-psutil/APKBUILD | 3 +-- community/py-pygit2/APKBUILD | 3 +-- community/py-pyldap/APKBUILD | 3 +-- community/py-pysqlite/APKBUILD | 6 +++--- community/py-setproctitle/APKBUILD | 3 +-- community/py-sqlalchemy/APKBUILD | 6 +++--- community/py-ws4py/APKBUILD | 4 ++-- community/py-zmq/APKBUILD | 3 +-- community/quassel/APKBUILD | 4 ++-- community/remind/APKBUILD | 3 +-- community/ruby2.1/APKBUILD | 11 +++-------- community/ruby2.2/APKBUILD | 11 +++-------- community/spacefm/APKBUILD | 4 +--- community/sphinx/APKBUILD | 7 +++---- community/todo.txt-cli/APKBUILD | 1 - community/tpm/APKBUILD | 2 -- community/tvheadend/APKBUILD | 4 +--- community/xpra/APKBUILD | 4 +--- community/youtube-dl/APKBUILD | 3 --- community/zram-init/APKBUILD | 1 - 52 files changed, 69 insertions(+), 132 deletions(-) (limited to 'community') diff --git a/community/arpack/APKBUILD b/community/arpack/APKBUILD index 8282e98c73..aa3ce4f70f 100644 --- a/community/arpack/APKBUILD +++ b/community/arpack/APKBUILD @@ -73,7 +73,6 @@ package() { ilp64() { pkgdesc="$pkgdesc (ILP64)" - arch="x86_64" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libarpack64_* "$subpkgdir"/usr/lib/ diff --git a/community/bareos-webui/APKBUILD b/community/bareos-webui/APKBUILD index 5d6e373ff5..0f63ddb0ab 100644 --- a/community/bareos-webui/APKBUILD +++ b/community/bareos-webui/APKBUILD @@ -30,7 +30,7 @@ package() { apache2() { pkgdesc="Apache configuration files for $pkgname" depends="apache2 php5-apache2" - arch="noarch" + mkdir -p "$subpkgdir"/etc/ mv "$pkgdir"/etc/apache2 "$subpkgdir"/etc/apache2 } diff --git a/community/cfengine/APKBUILD b/community/cfengine/APKBUILD index 91b43121af..043f544380 100644 --- a/community/cfengine/APKBUILD +++ b/community/cfengine/APKBUILD @@ -12,7 +12,7 @@ depends_dev="" makedepends="$depends_dev lmdb-dev libressl-dev bison flex-dev acl-dev pcre-dev linux-headers" install="" -subpackages="$pkgname-doc $pkgname-masterfiles" +subpackages="$pkgname-doc $pkgname-masterfiles::noarch" source="https://cfengine-package-repos.s3.amazonaws.com/tarballs/$pkgname-$pkgver.tar.gz https://cfengine-package-repos.s3.amazonaws.com/tarballs/$pkgname-masterfiles-$pkgver.tar.gz" @@ -56,8 +56,8 @@ package() { masterfiles() { pkgdesc="Cfengine default masterfiles" - arch="noarch" depends="cfengine" + cd "$_builddirmasterfiles" ./configure \ --prefix=/var/lib/cfengine \ diff --git a/community/chicken/APKBUILD b/community/chicken/APKBUILD index 807b3dec45..99f30aac83 100644 --- a/community/chicken/APKBUILD +++ b/community/chicken/APKBUILD @@ -11,7 +11,7 @@ depends="gcc libc-dev $pkgname-dev $pkgname-libs" depends_dev="" makedepends="$depends_dev" install="" -subpackages="$pkgname-doc $pkgname-libs $pkgname-dev $pkgname-feathers" +subpackages="$pkgname-doc $pkgname-libs $pkgname-dev $pkgname-feathers::noarch" source="http://code.call-cc.org/releases/$pkgver/$pkgname-$pkgver.tar.gz" builddir="$srcdir"/$pkgname-$pkgver @@ -40,7 +40,6 @@ package() { feathers() { pkgdesc="A debugger for compiled chicken programs" depends="tk" - arch="noarch" mkdir -p "$subpkgdir"/usr/bin/ \ "$subpkgdir"/usr/share/chicken/ diff --git a/community/cmus/APKBUILD b/community/cmus/APKBUILD index ccb8297e08..7a72950e35 100644 --- a/community/cmus/APKBUILD +++ b/community/cmus/APKBUILD @@ -15,8 +15,8 @@ makedepends="alsa-lib-dev faad2-dev flac-dev libmad-dev opusfile-dev install="" subpackages=" $pkgname-doc - $pkgname-zsh-completion:zshcomp - $pkgname-bash-completion:bashcomp" + $pkgname-zsh-completion:zshcomp:noarch + $pkgname-bash-completion:bashcomp:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/cmus/cmus/archive/v${pkgver}.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver @@ -39,7 +39,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" install -Dm644 "$_builddir"/contrib/$pkgname.bash-completion \ "$subpkgdir"/usr/share/bash-completion/completions/$pkgname @@ -49,7 +48,6 @@ zshcomp() { depends="" pkgdesc="Zsh completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel zsh" - arch="noarch" install -Dm644 "$_builddir"/contrib/_$pkgname \ "$subpkgdir"/usr/share/zsh/site-functions/_$pkgname diff --git a/community/dnscrypt-proxy/APKBUILD b/community/dnscrypt-proxy/APKBUILD index ca0bbc5b01..d53d5016f8 100644 --- a/community/dnscrypt-proxy/APKBUILD +++ b/community/dnscrypt-proxy/APKBUILD @@ -13,7 +13,7 @@ makedepends="$depends_dev libsodium-dev" install="$pkgname.pre-install" pkgusers=dnscrypt pkggroups=dnscrypt -subpackages="$pkgname-doc $pkgname-setup" +subpackages="$pkgname-doc $pkgname-setup::noarch" source="http://download.dnscrypt.org/$pkgname/$pkgname-$pkgver.tar.bz2 $pkgname.initd $pkgname.confd @@ -48,9 +48,9 @@ package() { } setup() { - arch="noarch" pkgdesc="Script for setting up DNSCrypt Proxy" depends="sed wget $pkgname" + mkdir -p "$subpkgdir"/sbin install -m755 -D "$srcdir"/$pkgname.setup "$subpkgdir"/sbin/setup-dnscrypt } diff --git a/community/docker/APKBUILD b/community/docker/APKBUILD index 784ce291b4..39d7c42114 100644 --- a/community/docker/APKBUILD +++ b/community/docker/APKBUILD @@ -21,9 +21,9 @@ _runc_ver=cc29e3dded8e27ba8f65738f40d251c885030a28 _containerd_ver=0ac3cd1be170d180b2baed755e8f0da547ceb267 subpackages=" - $pkgname-bash-completion:bashcomp - $pkgname-zsh-completion:zshcomp - $pkgname-vim:vim + $pkgname-bash-completion:bashcomp:noarch + $pkgname-zsh-completion:zshcomp:noarch + $pkgname-vim:vim:noarch " source=" $pkgname-$pkgver.tar.gz::https://github.com/docker/docker/archive/v$_ver.tar.gz @@ -119,7 +119,6 @@ package() { bashcomp() { pkgdesc="Bash completion for Docker" - arch="noarch" depends="" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" @@ -129,7 +128,6 @@ bashcomp() { zshcomp() { pkgdesc="Zsh completion for $pkgname" - arch="noarch" depends="" install_if="$pkgname=$pkgver-r$pkgrel zsh" @@ -140,7 +138,6 @@ zshcomp() { vim() { depends="" pkgdesc="Vim syntax for Docker" - arch="noarch" local f= for f in ftdetect/dockerfile.vim syntax/dockerfile.vim; do diff --git a/community/firejail/APKBUILD b/community/firejail/APKBUILD index 8a261ada22..d483149884 100644 --- a/community/firejail/APKBUILD +++ b/community/firejail/APKBUILD @@ -10,7 +10,7 @@ license="GPL2" depends="bash" makedepends="linux-headers" options="suid" -subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp" +subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/netblue30/$pkgname/archive/$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" @@ -37,7 +37,6 @@ build() { bashcomp() { pkgdesc="Bash completions for $pkgname" - arch="noarch" depends="bash" install_if="$pkgname=$pkgver-r$pkgrel bash" diff --git a/community/hub/APKBUILD b/community/hub/APKBUILD index 171a2e4775..4db9f8244e 100644 --- a/community/hub/APKBUILD +++ b/community/hub/APKBUILD @@ -14,8 +14,8 @@ install="" options="!strip" subpackages=" $pkgname-doc - $pkgname-bash-completion:bashcomp - $pkgname-zsh-completion:zshcomp" + $pkgname-bash-completion:bashcomp:noarch + $pkgname-zsh-completion:zshcomp:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/github/hub/archive/v$pkgver.tar.gz" _builddir="$srcdir/$pkgname-$pkgver" @@ -36,7 +36,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" install -Dm644 "$_builddir"/etc/hub.bash_completion.sh \ "$subpkgdir"/usr/share/bash-completion/completions/$pkgname || return 1 @@ -46,7 +45,6 @@ zshcomp() { depends="" pkgdesc="Zsh completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel zsh" - arch="noarch" install -Dm644 "$_builddir"/etc/$pkgname.zsh_completion \ "$subpkgdir"/usr/share/zsh/site-functions/_$pkgname || return 1 diff --git a/community/icinga2/APKBUILD b/community/icinga2/APKBUILD index ae8c2110ba..b577b29ef2 100644 --- a/community/icinga2/APKBUILD +++ b/community/icinga2/APKBUILD @@ -13,7 +13,7 @@ makedepends="$depends_dev cmake bison flex boost-dev yajl-dev install="$pkgname.pre-install $pkgname.post-install" pkgusers="icinga" pkggroups="icinga" -subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp" +subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/Icinga/$pkgname/archive/v$pkgver.tar.gz $pkgname.initd" @@ -99,7 +99,7 @@ EOF bashcomp() { depends="bash" pkgdesc="Bash completions for $pkgname" - arch="noarch" + mkdir -p "$subpkgdir"/usr/share/bash-completion/completions mv "$pkgdir"/etc/bash_completion.d/$pkgname "$subpkgdir"/usr/share/bash-completion/completions/$pkgname } diff --git a/community/icingaweb2/APKBUILD b/community/icingaweb2/APKBUILD index d206c4efd0..e84828f076 100644 --- a/community/icingaweb2/APKBUILD +++ b/community/icingaweb2/APKBUILD @@ -16,7 +16,7 @@ depends_dev="" makedepends="$depends_dev" pkggroups="icingaweb2" install="$pkgname.pre-install $pkgname.post-install" -subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp" +subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/Icinga/${pkgname}/archive/v${pkgver}.tar.gz" _builddir="$srcdir"/$pkgname-$pkgver @@ -69,7 +69,7 @@ EOF bashcomp() { depends="bash" pkgdesc="Bash completions for $pkgname" - arch="noarch" + cd "$_builddir" mkdir -p "$subpkgdir"/usr/share/bash-completion/completions mv etc/bash_completion.d/icingacli "$subpkgdir"/usr/share/bash-completion/completions/icingacli diff --git a/community/java-jffi/APKBUILD b/community/java-jffi/APKBUILD index 5ff276eb2d..d704147489 100644 --- a/community/java-jffi/APKBUILD +++ b/community/java-jffi/APKBUILD @@ -7,7 +7,7 @@ _libver=${pkgver%.*} pkgrel=1 pkgdesc="Java Foreign Function Interface" url="https://github.com/jnr/jffi" -arch="noarch" +arch="all" license="ASL-2.0" depends="openjdk8-jre-base" makedepends="apache-ant file openjdk8" @@ -29,8 +29,6 @@ package() { } native() { - arch="all" - # Note: jffi expects file named libjffi-x.y.so, not libjffi.so.x.y. install -m755 -D "$builddir"/build/jni/libjffi-$_libver.so \ "$subpkgdir"/usr/lib/libjffi-$_libver.so diff --git a/community/java-lz4/APKBUILD b/community/java-lz4/APKBUILD index 677f9a0d57..f11484808e 100644 --- a/community/java-lz4/APKBUILD +++ b/community/java-lz4/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.3.0 pkgrel=2 pkgdesc="LZ4 compression for Java" url="https://github.com/jpountz/lz4-java" -arch="noarch" +arch="all" license="ASL-2.0" depends="openjdk8-jre-base" makedepends="apache-ant openjdk8" @@ -34,7 +34,6 @@ package() { } native() { - arch="all" local soname="liblz4-java.so" install -m755 -D "$builddir"/build/jni/*/*/$soname \ diff --git a/community/java-snappy/APKBUILD b/community/java-snappy/APKBUILD index 7320ca9ad9..9af31496b9 100644 --- a/community/java-snappy/APKBUILD +++ b/community/java-snappy/APKBUILD @@ -43,7 +43,6 @@ build() { } package() { - arch="noarch" depends="$depends $pkgname-native" install -m644 -D "$builddir"/target/$_pkgname-*.jar \ diff --git a/community/knot/APKBUILD b/community/knot/APKBUILD index f7507c70ee..9aba0ca0b8 100644 --- a/community/knot/APKBUILD +++ b/community/knot/APKBUILD @@ -19,8 +19,8 @@ pkgusers="knot" pkggroups="knot" subpackages="$pkgname-libs $pkgname-utils - $pkgname-bash-completion:bashcomp - $pkgname-zsh-completion:zshcomp + $pkgname-bash-completion:bashcomp:noarch + $pkgname-zsh-completion:zshcomp:noarch $pkgname-dev $pkgname-doc " @@ -89,7 +89,6 @@ utils() { bashcomp() { pkgdesc="Bash completions for knot" - arch="noarch" depends="bash" install_if="$pkgname=$pkgver-r$pkgrel bash" @@ -99,7 +98,6 @@ bashcomp() { zshcomp() { pkgdesc="ZSH completions for knot" - arch="noarch" depends="zsh" install_if="$pkgname=$pkgver-r$pkgrel zsh" diff --git a/community/lua-compat53/APKBUILD b/community/lua-compat53/APKBUILD index 7967873add..878c568a3d 100644 --- a/community/lua-compat53/APKBUILD +++ b/community/lua-compat53/APKBUILD @@ -7,7 +7,7 @@ pkgver=0.3 pkgrel=0 pkgdesc="Compatibility module providing Lua-5.3-style APIs for Lua" url="https://github.com/keplerproject/lua-compat-5.3" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="" @@ -41,7 +41,6 @@ package() { _package() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc $lver" - arch="all" depends="lua$lver" install_if="$pkgname=$pkgver-r$pkgrel lua$lver" diff --git a/community/lua-lpeg/APKBUILD b/community/lua-lpeg/APKBUILD index a777a01025..d1be6eb84c 100644 --- a/community/lua-lpeg/APKBUILD +++ b/community/lua-lpeg/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.0 pkgrel=0 pkgdesc="Pattern-matching library for Lua" url="http://www.inf.puc-rio.br/~roberto/lpeg" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="" @@ -48,7 +48,6 @@ package() { _package() { local lver="${subpkgname:3:3}" pkgdesc="Pattern-matching library for Lua $lver" - arch="all" depends="lua$lver" install_if="lua$lver $pkgname=$pkgver-r$pkgrel" diff --git a/community/lua-lunix/APKBUILD b/community/lua-lunix/APKBUILD index 9b8533fb50..de5e400b23 100644 --- a/community/lua-lunix/APKBUILD +++ b/community/lua-lunix/APKBUILD @@ -7,7 +7,7 @@ pkgver=20150923 pkgrel=0 pkgdesc="Comprehensive Unix API Module for Lua" url="https://github.com/wahern/lunix" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="" @@ -36,7 +36,6 @@ package() { _package() { local lver="${subpkgname:3:3}" pkgdesc="$pkgdesc $lver" - arch="all" install_if="lua$lver $pkgname=$pkgver-r$pkgrel" cd "$builddir" diff --git a/community/minetest/APKBUILD b/community/minetest/APKBUILD index ca2da06055..1192274a5a 100644 --- a/community/minetest/APKBUILD +++ b/community/minetest/APKBUILD @@ -18,7 +18,7 @@ source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/minetest/${pkgname} minetest-server.confd minetest-server.initd " -subpackages="$pkgname-doc $pkgname-common $pkgname-server" +subpackages="$pkgname-doc $pkgname-common::noarch $pkgname-server" _builddir="${srcdir}"/${pkgname}-${pkgver} @@ -64,7 +64,6 @@ build() { } common() { - arch="noarch" install -o minetest -g minetest -d "$subpkgdir"/var/lib/minetest \ || return 1 mkdir -p "${subpkgdir}/usr/share/minetest" diff --git a/community/mpv/APKBUILD b/community/mpv/APKBUILD index 83b9629476..ddefdb2d6d 100644 --- a/community/mpv/APKBUILD +++ b/community/mpv/APKBUILD @@ -18,7 +18,7 @@ makedepends="libxxf86dga-dev libxv-dev libmad-dev lame-dev libao-dev subpackages=" $pkgname-doc $pkgname-libs - $pkgname-zsh-completion:zshcomp" + $pkgname-zsh-completion:zshcomp:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/mpv-player/$pkgname/archive/v$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" @@ -63,7 +63,6 @@ zshcomp() { depends="" pkgdesc="Zsh completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel zsh" - arch="noarch" mkdir -p "$subpkgdir/usr/share/zsh/site-functions" mv "$pkgdir/usr/share/zsh/site-functions"/* \ diff --git a/community/mumble/APKBUILD b/community/mumble/APKBUILD index bcfa486752..96a96ae206 100644 --- a/community/mumble/APKBUILD +++ b/community/mumble/APKBUILD @@ -15,7 +15,7 @@ makedepends="qt-dev libsndfile-dev boost-dev avahi-dev protobuf-dev install="murmur.pre-install" pkgusers="murmur" pkggroups="murmur" -subpackages="$pkgname-doc murmur murmur-doc:murmur_doc" +subpackages="$pkgname-doc murmur murmur-doc:murmur_doc:noarch" source="https://github.com/mumble-voip/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz murmur.initd" @@ -93,7 +93,6 @@ murmur() { murmur_doc() { pkgdesc="Murmur is the server component of Mumble" - arch="noarch" cd "$builddir" install -Dm644 ./man/murmurd.1 \ diff --git a/community/mumudvb/APKBUILD b/community/mumudvb/APKBUILD index 6997197e1c..a4574b664d 100644 --- a/community/mumudvb/APKBUILD +++ b/community/mumudvb/APKBUILD @@ -44,7 +44,6 @@ package() { doc() { pkgdesc="$pkgname documentation" - arch="noarch" _docdir="configuration_examples diagrams html transcode" cd "$builddir"/doc make doc || return 1 diff --git a/community/notmuch/APKBUILD b/community/notmuch/APKBUILD index e78321184f..bc9e5bd544 100644 --- a/community/notmuch/APKBUILD +++ b/community/notmuch/APKBUILD @@ -12,8 +12,8 @@ makedepends="gzip xapian-core-dev gmime-dev talloc-dev subpackages=" $pkgname-dev $pkgname-doc - $pkgname-zsh-completion:zshcomp - $pkgname-bash-completion:bashcomp" + $pkgname-zsh-completion:zshcomp:noarch + $pkgname-bash-completion:bashcomp:noarch" source="https://notmuchmail.org/releases/$pkgname-$pkgver.tar.gz" builddir="$srcdir/$pkgname-$pkgver" @@ -41,7 +41,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/bash-completion/completions/ mv "$pkgdir"/usr/share/bash-completion/completions/$pkgname \ @@ -52,7 +51,6 @@ zshcomp() { depends="" pkgdesc="Zsh completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel zsh" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/zsh/site-functions/ mv "$pkgdir"/usr/share/zsh/site-functions/_${pkgname} \ diff --git a/community/openblas/APKBUILD b/community/openblas/APKBUILD index 5d4e70d959..dcefcaa6cd 100644 --- a/community/openblas/APKBUILD +++ b/community/openblas/APKBUILD @@ -90,7 +90,6 @@ package() { ilp64() { pkgdesc="$pkgdesc (ILP64)" - arch="x86_64" mkdir -p "$subpkgdir"/usr/lib mv "$pkgdir"/usr/lib/libopenblas64_* "$subpkgdir"/usr/lib/ diff --git a/community/openjdk7/APKBUILD b/community/openjdk7/APKBUILD index 6482e4f62e..aa57dc8abc 100644 --- a/community/openjdk7/APKBUILD +++ b/community/openjdk7/APKBUILD @@ -45,7 +45,7 @@ _jrelib="$INSTALL_BASE/jre/lib/$_jarch" ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli" sonameprefix="$pkgname:" -subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase +subpackages="$pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase $pkgname-doc:doc" if [ "$BOOTSTRAP" != "no" ]; then @@ -193,7 +193,6 @@ package() { jrelib() { pkgdesc="OpenJDK 7 Java Runtime (class libraries)" - arch="noarch" depends="" local A; for A in jre/lib/zi jre/lib/images jre/lib/*.jar \ diff --git a/community/openjdk8/APKBUILD b/community/openjdk8/APKBUILD index fc527be52b..155f7ee128 100644 --- a/community/openjdk8/APKBUILD +++ b/community/openjdk8/APKBUILD @@ -38,7 +38,7 @@ _jrelib="$_java_home/jre/lib/$_jarch" ldpath="$_jrelib:$_jrelib/native_threads:$_jrelib/headless:$_jrelib/server:$_jrelib/jli" sonameprefix="$pkgname:" -subpackages="$pkgname-jre-lib:jrelib $pkgname-jre $pkgname-jre-base:jrebase +subpackages="$pkgname-jre-lib:jrelib:noarch $pkgname-jre $pkgname-jre-base:jrebase $pkgname-doc $pkgname-demos" _dropsver=$_icedteaver @@ -167,7 +167,6 @@ package() { jrelib() { pkgdesc="OpenJDK 8 Java Runtime (class libraries)" - arch="noarch" depends="" local file dir diff --git a/community/php7/APKBUILD b/community/php7/APKBUILD index e5d3a4f7c5..e3ecf30da2 100644 --- a/community/php7/APKBUILD +++ b/community/php7/APKBUILD @@ -42,7 +42,7 @@ _exts="bcmath bz2 calendar ctype curl dba dom enchant exif ftp gd gettext gmp ic sockets sqlite3 sysvmsg sysvsem sysvshm tidy wddx xml xmlreader xmlrpc xsl zip zlib " subpackages="$pkgname-dev $pkgname-doc $pkgname-apache2 $pkgname-phpdbg $pkgname-embed - $pkgname-litespeed $pkgname-cgi $pkgname-fpm $pkgname-pear + $pkgname-litespeed $pkgname-cgi $pkgname-fpm $pkgname-pear::noarch " for _ext in $_exts; do case "$_ext" in @@ -50,7 +50,7 @@ for _ext in $_exts; do *) subpackages="$subpackages $pkgname-$_ext:_package_ext";; esac done -subpackages="$subpackages $pkgname-common" +subpackages="$subpackages $pkgname-common::noarch" _apiver="20151012" @@ -282,7 +282,6 @@ fpm() { } pear() { - arch="noarch" pkgdesc="PHP Extension and Application Repository" depends="$pkgname $pkgname-xml" @@ -297,7 +296,6 @@ pear() { } common() { - arch="noarch" pkgdesc="$pkgdesc (common config)" mkdir -p "$subpkgdir"/usr diff --git a/community/py-cx_freeze/APKBUILD b/community/py-cx_freeze/APKBUILD index 3b01e4a2ff..450171d038 100644 --- a/community/py-cx_freeze/APKBUILD +++ b/community/py-cx_freeze/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.3.4 pkgrel=2 pkgdesc="Set of utilities for freezing Python scripts into executables" url="http://cx-freeze.sourceforge.net/" -arch="noarch" +arch="all" license="PSF" depends="" depends_dev="" @@ -30,8 +30,8 @@ package() { _py() { local python=$1 pkgdesc="$pkgdesc - $python" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" + cd "$builddir" $python setup.py install --prefix=/usr --root="$subpkgdir" } diff --git a/community/py-gevent/APKBUILD b/community/py-gevent/APKBUILD index 2de49a0e14..837d857b82 100644 --- a/community/py-gevent/APKBUILD +++ b/community/py-gevent/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.1.2 pkgrel=0 pkgdesc="Python library for seamless coroutine-based concurrency" url="http://gevent.org/" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="python2-dev py-setuptools python3-dev libevent-dev file" @@ -27,8 +27,8 @@ package() { _py() { local python=$1 pkgdesc="$pkgdesc - $python" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" + cd "$builddir" $python setup.py install --prefix=/usr --root="$subpkgdir" } diff --git a/community/py-greenlet/APKBUILD b/community/py-greenlet/APKBUILD index 2d01996cbf..c0ab2072cd 100644 --- a/community/py-greenlet/APKBUILD +++ b/community/py-greenlet/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.4.10 pkgrel=3 pkgdesc="Lightweight in-process concurrent programming" url="http://pypi.python.org/pypi/greenlet" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="python2-dev py-setuptools python3-dev" @@ -28,7 +28,6 @@ package() { _py() { local python=$1 pkgdesc="$pkgdesc - $python" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/community/py-lz4/APKBUILD b/community/py-lz4/APKBUILD index eeba813350..89dfb671e4 100644 --- a/community/py-lz4/APKBUILD +++ b/community/py-lz4/APKBUILD @@ -6,7 +6,7 @@ _pkgname=${pkgname#py-} pkgrel=0 pkgdesc="LZ4 Bindings for Python" url="https://pypi.python.org/pypi/lz4" -arch="noarch" +arch="all" license="BSD" makedepends="python2-dev python3-dev py-setuptools lz4-dev" subpackages="py3-${pkgname/py-/}:_py3 py2-${pkgname/py-/}:_py2 $pkgname-tests:_tests" @@ -27,7 +27,6 @@ _py() { local python=$1 pkgdesc="$pkgdesc ${python#python}" depends="$python" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/community/py-msgpack/APKBUILD b/community/py-msgpack/APKBUILD index 5d0c65030f..a592cf4b7f 100644 --- a/community/py-msgpack/APKBUILD +++ b/community/py-msgpack/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.4.8 pkgrel=1 pkgdesc="A Python module for MessagePack serialization/deserialization" url="http://pypi.python.org/pypi/msgpack-python/" -arch="noarch" +arch="all" license="ASL 2.0" depends="" makedepends="python2-dev python3-dev py-setuptools" @@ -27,7 +27,6 @@ package() { _py() { local python=$1 pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/community/py-psutil/APKBUILD b/community/py-psutil/APKBUILD index cf7f23d31c..7287fd1f4f 100644 --- a/community/py-psutil/APKBUILD +++ b/community/py-psutil/APKBUILD @@ -6,7 +6,7 @@ pkgver=4.3.1 pkgrel=0 pkgdesc="A cross-platform process and system utilities module for Python" url="https://github.com/giampaolo/psutil" -arch="noarch" +arch="all" license="BSD" depends="" makedepends="$depends_dev linux-headers python2-dev python3-dev" @@ -29,7 +29,6 @@ package() { _py() { local python=$1 pkgdesc="$pkgdesc - $python" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" $python setup.py install --prefix=/usr --root="$subpkgdir" diff --git a/community/py-pygit2/APKBUILD b/community/py-pygit2/APKBUILD index 17f845e407..83e63bb3c0 100644 --- a/community/py-pygit2/APKBUILD +++ b/community/py-pygit2/APKBUILD @@ -6,7 +6,7 @@ pkgver=0.24.1 pkgrel=3 pkgdesc="Python bindings for libgit2" url="https://github.com/libgit2/pygit2" -arch="noarch" +arch="all" license="GPLv2" subpackages="py2-${pkgname#py-}:_py2 py3-${pkgname#py-}:_py3" depends="" @@ -38,7 +38,6 @@ _py3() { _py() { local python=$1 - arch="all" pkgdesc="$pkgdesc - $python" depends="$depends $python libgit2" install_if="$pkgname=$pkgver-r$pkgrel $python" diff --git a/community/py-pyldap/APKBUILD b/community/py-pyldap/APKBUILD index 8e50840bff..8d421a1108 100644 --- a/community/py-pyldap/APKBUILD +++ b/community/py-pyldap/APKBUILD @@ -8,7 +8,7 @@ _verminor=${pkgver#*.}; _verminor=${_verminor%%.*} pkgrel=1 pkgdesc="Python modules for implementing LDAP clients" url="https://github.com/pyldap/pyldap" -arch="noarch" +arch="all" license="PSF" depends="libldap>=$_vermajor.$_verminor" makedepends="python2-dev python3-dev openldap-dev>=$_vermajor.$_verminor" @@ -39,7 +39,6 @@ _py3() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/community/py-pysqlite/APKBUILD b/community/py-pysqlite/APKBUILD index 6ea32b9382..5244917577 100644 --- a/community/py-pysqlite/APKBUILD +++ b/community/py-pysqlite/APKBUILD @@ -7,7 +7,7 @@ pkgver=2.8.3 pkgrel=0 pkgdesc="Python DB-API 2.0 interface for the SQLite" url="https://pypi.python.org/pypi/pysqlite" -arch="noarch" +arch="all" license="MIT" subpackages="py2-${pkgname/py-/}:_py2" makedepends="python2-dev py-setuptools sqlite-dev" @@ -28,8 +28,8 @@ package() { _py() { local python=$1 pkgdesc="$pkgdesc - $python" - arch="all" - install_if="$pkgname=$pkgver-r$pkgrel $python" + install_if="$pkgname=$pkgver-r$pkgrel $python" + cd "$builddir" $python setup.py install --prefix=/usr --root="$subpkgdir" } diff --git a/community/py-setproctitle/APKBUILD b/community/py-setproctitle/APKBUILD index 96c3617e65..a686caa177 100644 --- a/community/py-setproctitle/APKBUILD +++ b/community/py-setproctitle/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.1.10 pkgrel=1 pkgdesc="A Python module to customize the process title" url="https://github.com/dvarrazzo/py-setproctitle" -arch="noarch" +arch="all" license="BSD" depends="" makedepends="python2-dev python3-dev musl-dev" @@ -37,7 +37,6 @@ _py3() { _py() { local python="$1" pkgdesc="$pkgdesc (for $python)" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/community/py-sqlalchemy/APKBUILD b/community/py-sqlalchemy/APKBUILD index d11abe9480..e3df7dcd35 100644 --- a/community/py-sqlalchemy/APKBUILD +++ b/community/py-sqlalchemy/APKBUILD @@ -6,7 +6,7 @@ pkgver=1.0.14 pkgrel=0 pkgdesc="object relational mapper for python" url="http://pypi.python.org/pypi/SQLAlchemy" -arch="noarch" +arch="all" license="MIT" depends="" makedepends="python2-dev py-setuptools python3-dev" @@ -30,8 +30,8 @@ package() { _py() { local python=$1 pkgdesc="$pkgdesc - $python" - arch="all" - install_if="$pkgname=$pkgver-r$pkgrel $python" + install_if="$pkgname=$pkgver-r$pkgrel $python" + cd "$builddir" $python setup.py install --prefix=/usr --root="$subpkgdir" } diff --git a/community/py-ws4py/APKBUILD b/community/py-ws4py/APKBUILD index 097baed84b..ca86f6dbc3 100644 --- a/community/py-ws4py/APKBUILD +++ b/community/py-ws4py/APKBUILD @@ -29,8 +29,8 @@ package() { _py() { local python=$1 pkgdesc="$pkgdesc - $python" - arch="noarch" - install_if="$pkgname=$pkgver-r$pkgrel $python" + install_if="$pkgname=$pkgver-r$pkgrel $python" + cd "$builddir" $python setup.py install --prefix=/usr --root="$subpkgdir" } diff --git a/community/py-zmq/APKBUILD b/community/py-zmq/APKBUILD index da85480aba..f8209de3e3 100644 --- a/community/py-zmq/APKBUILD +++ b/community/py-zmq/APKBUILD @@ -6,7 +6,7 @@ pkgver=15.4.0 pkgrel=0 pkgdesc="Python bindings for ZeroMQ" url="http://pypi.python.org/pypi/pyzmq" -arch="noarch" +arch="all" license="LGPL3+ BSD" depends="" makedepends="python2-dev python3-dev py-setuptools zeromq-dev" @@ -28,7 +28,6 @@ package() { _py() { local python=$1 pkgdesc="$pkgdesc - $python" - arch="all" install_if="$pkgname=$pkgver-r$pkgrel $python" cd "$builddir" diff --git a/community/quassel/APKBUILD b/community/quassel/APKBUILD index f6b1c19631..97f4bf7ec5 100644 --- a/community/quassel/APKBUILD +++ b/community/quassel/APKBUILD @@ -10,7 +10,7 @@ license="GPL" install="quassel-core.pre-install" depends="quassel-common" makedepends="qt-dev cmake dbus-dev libressl-dev paxmark" -subpackages="$pkgname-common $pkgname-core $pkgname-client" +subpackages="$pkgname-common::noarch $pkgname-core $pkgname-client" source="http://www.quassel-irc.org/pub/quassel-$pkgver.tar.bz2 quasselcore.confd quasselcore.initd" @@ -44,7 +44,7 @@ package() { common() { pkgdesc="Quassel common/shared files" - arch="noarch" + mkdir -p "$subpkgdir"/usr/share mv "$pkgdir"/usr/share/icons \ "$subpkgdir"/usr/share diff --git a/community/remind/APKBUILD b/community/remind/APKBUILD index 48dc9624d3..9ccfaa87d6 100644 --- a/community/remind/APKBUILD +++ b/community/remind/APKBUILD @@ -7,7 +7,7 @@ pkgdesc="Sophisticated calendar and alarm program" url="https://www.roaringpenguin.com/products/remind" arch="all" license="GPL2" -subpackages="$pkgname-doc tkremind" +subpackages="$pkgname-doc tkremind::noarch" source="https://www.roaringpenguin.com/files/download/remind-$pkgver.tar.gz" _builddir="$srcdir"/remind-$pkgver @@ -22,7 +22,6 @@ package() { } tkremind() { - arch=noarch depends="remind tk" local src="$pkgdir"/usr/bin diff --git a/community/ruby2.1/APKBUILD b/community/ruby2.1/APKBUILD index 221ceaaf62..0c9667bf0f 100644 --- a/community/ruby2.1/APKBUILD +++ b/community/ruby2.1/APKBUILD @@ -14,9 +14,9 @@ license="Ruby" depends="" makedepends="zlib-dev libressl-dev gdbm-dev db-dev readline-dev libffi-dev coreutils yaml-dev 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 " source="ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/$_pkgname-$_pkgver.tar.bz2" @@ -94,7 +94,6 @@ package() { rake() { pkgdesc="Ruby based make-like utility" depends="$pkgname" - arch="noarch" _mvgem rake || return 1 _mv usr/bin/rake$_majorver @@ -104,7 +103,6 @@ irb() { pkgdesc="The Interactive Ruby" replaces="$pkgname" depends="$pkgname" - arch="noarch" cd "$pkgdir" _mv usr/bin/irb$_majorver \ @@ -114,7 +112,6 @@ irb() { rdoc() { pkgdesc="Ruby documentation tool" depends="$pkgname $pkgname-json" - arch="noarch" _mvgem rdoc || return 1 _mv usr/bin/ri$_majorver \ @@ -124,7 +121,6 @@ rdoc() { bigdecimal() { pkgdesc="Ruby arbitrary-precision floating point decimal arithmetic" depends="$pkgname" - arch="noarch" _mvgem bigdecimal } @@ -141,7 +137,6 @@ io_console() { minitest() { pkgdesc="Ruby suite of testing facilities" depends="$pkgname" - arch="noarch" _mvgem minitest } diff --git a/community/ruby2.2/APKBUILD b/community/ruby2.2/APKBUILD index 432a44c2b9..8ec999bbf9 100644 --- a/community/ruby2.2/APKBUILD +++ b/community/ruby2.2/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 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 " source="ftp://ftp.ruby-lang.org/pub/ruby/${pkgver%.*}/$_pkgname-$_pkgver.tar.bz2" @@ -95,7 +95,6 @@ package() { rake() { pkgdesc="Ruby based make-like utility" depends="$pkgname" - arch="noarch" _mvgem rake || return 1 _mv usr/bin/rake$_majorver @@ -105,7 +104,6 @@ irb() { pkgdesc="The Interactive Ruby" replaces="$pkgname" depends="$pkgname" - arch="noarch" cd "$pkgdir" _mv usr/bin/irb$_majorver \ @@ -115,7 +113,6 @@ irb() { rdoc() { pkgdesc="Ruby documentation tool" depends="$pkgname $pkgname-json" - arch="noarch" _mvgem rdoc || return 1 _mv usr/bin/ri$_majorver \ @@ -125,7 +122,6 @@ rdoc() { bigdecimal() { pkgdesc="Ruby arbitrary-precision floating point decimal arithmetic" depends="$pkgname" - arch="noarch" _mvgem bigdecimal } @@ -142,7 +138,6 @@ io_console() { minitest() { pkgdesc="Ruby suite of testing facilities" depends="$pkgname" - arch="noarch" _mvgem minitest } diff --git a/community/spacefm/APKBUILD b/community/spacefm/APKBUILD index e70c9386f9..8318313565 100644 --- a/community/spacefm/APKBUILD +++ b/community/spacefm/APKBUILD @@ -9,7 +9,7 @@ url="http://ignorantguru.github.com/spacefm/" license="GPL3" depends="bash" makedepends="intltool gettext-dev gtk+2.0-dev gtk+3.0-dev eudev-dev ffmpegthumbnailer-dev linux-headers" -subpackages="$pkgname-lang $pkgname-doc $pkgname-gtk3 $pkgname-gtk3-lang:lang3 $pkgname-gtk3-doc:doc3" +subpackages="$pkgname-lang $pkgname-doc $pkgname-gtk3 $pkgname-gtk3-lang:lang3:noarch $pkgname-gtk3-doc:doc3:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/IgnorantGuru/spacefm/archive/$pkgver.tar.gz" builddir="$srcdir"/$pkgname-$pkgver @@ -43,13 +43,11 @@ gtk3() { } lang3() { - arch="noarch" mkdir -p "$subpkgdir/usr/share" mv "${pkgdir%*spacefm}$pkgname-gtk3/usr/share/locale" "$subpkgdir/usr/share/" } doc3() { - arch="noarch" mkdir -p "$subpkgdir/usr/share" mv "${pkgdir%*spacefm}$pkgname-gtk3/usr/share/doc" \ "$subpkgdir/usr/share/" || return 1 diff --git a/community/sphinx/APKBUILD b/community/sphinx/APKBUILD index bdf8c5009d..b09022d0c8 100644 --- a/community/sphinx/APKBUILD +++ b/community/sphinx/APKBUILD @@ -15,7 +15,7 @@ makedepends="$depends_dev postgresql-dev mariadb-dev unixodbc-dev expat-dev install="" pkgusers="$pkgname" pkggroups="$pkgname" -subpackages="$pkgname-doc $pkgname-php $pkgname-python" +subpackages="$pkgname-doc $pkgname-php::noarch $pkgname-python::noarch" source="http://sphinxsearch.com/files/$pkgname-$pkgver-release.tar.gz sphinx.initd sphinx.confd @@ -66,7 +66,7 @@ package() { php() { pkgdesc="PHP api for sphinx search engine" - arch="noarch" + mkdir -p "$subpkgdir"/usr/share/php/$pkgname/api for i in $(ls $_builddir/api/*.php); do mv $i "$subpkgdir"/usr/share/php/$pkgname/api ; @@ -75,9 +75,8 @@ php() { python() { - pkgdesc="Python api for sphinx search engine" - arch="noarch" + mkdir -p "$subpkgdir"/usr/lib/python2.7/site-packages/$pkgname/ for i in $(ls $_builddir/api/*.py); do mv $i "$subpkgdir"/usr/lib/python2.7/site-packages/$pkgname/ ; diff --git a/community/todo.txt-cli/APKBUILD b/community/todo.txt-cli/APKBUILD index d9a3111e94..4836ca3449 100644 --- a/community/todo.txt-cli/APKBUILD +++ b/community/todo.txt-cli/APKBUILD @@ -40,7 +40,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" install -Dm644 "$builddir"/todo_completion \ "$subpkgdir"/usr/share/bash-completion/completions/${pkgname} || return 1 diff --git a/community/tpm/APKBUILD b/community/tpm/APKBUILD index bfb71fcc0d..4245a6ce11 100644 --- a/community/tpm/APKBUILD +++ b/community/tpm/APKBUILD @@ -30,7 +30,6 @@ bashcomp() { depends="" pkgdesc="Bash completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" - arch="noarch" install -Dm644 "$builddir"/contrib/bash_completion \ "$subpkgdir"/usr/share/bash-completion/completions/$pkgname || return 1 @@ -40,7 +39,6 @@ zshcomp() { depends="" pkgdesc="Zsh completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel zsh" - arch="noarch" install -Dm644 "$builddir"/contrib/zsh_completion \ "$subpkgdir"/usr/share/zsh/site-functions/_$pkgname || return 1 diff --git a/community/tvheadend/APKBUILD b/community/tvheadend/APKBUILD index 28015c5099..cc4e19996b 100644 --- a/community/tvheadend/APKBUILD +++ b/community/tvheadend/APKBUILD @@ -14,7 +14,7 @@ makedepends="$depends_dev findutils bash git python2 linux-headers pkgusers="$pkgname" pkggroups="$pkgname" install="$pkgname.pre-install" -subpackages="$pkgname-doc $pkgname-dvb-scan:dvb_scan $pkgname-satellites-xml:satellites_xml" +subpackages="$pkgname-doc $pkgname-dvb-scan:dvb_scan:noarch $pkgname-satellites-xml:satellites_xml:noarch" source="$pkgname-$pkgver.tar.gz::https://github.com/tvheadend/tvheadend/archive/v$pkgver.tar.gz $pkgname.initd $pkgname.confd @@ -56,7 +56,6 @@ package() { dvb_scan() { pkgdesc="$pkgname dvb scan files" depends="$pkgname" - arch="noarch" cd "$builddir" @@ -68,7 +67,6 @@ dvb_scan() { satellites_xml() { pkgdesc="$pkgname sattelites from http://satellites-xml.eu" depends="$pkgname" - arch="noarch" cd "$builddir" diff --git a/community/xpra/APKBUILD b/community/xpra/APKBUILD index 887f777133..1c8c928033 100644 --- a/community/xpra/APKBUILD +++ b/community/xpra/APKBUILD @@ -13,7 +13,7 @@ depends_dev="python2-dev cython-dev libx11-dev libxtst-dev libxcomposite-dev lib libxrandr-dev py-gobject-dev py-gtk-dev libxkbfile-dev gtk+2.0-dev x264-dev x265-dev libvpx-dev ffmpeg-dev libwebp-dev" makedepends="$depends_dev cython linux-headers" -subpackages="$pkgname-dev $pkgname-doc $pkgname-tests" +subpackages="$pkgname-dev $pkgname-doc $pkgname-tests::noarch" source="http://xpra.org/src/$pkgname-$pkgver.tar.xz" builddir="$srcdir/$pkgname-$pkgver" @@ -34,8 +34,6 @@ package() { } tests() { - arch="noarch" - cd "$builddir" mkdir -p "$subpkgdir"/usr/share/xpra cp -rf tests "$subpkgdir"/usr/share/xpra/ diff --git a/community/youtube-dl/APKBUILD b/community/youtube-dl/APKBUILD index 94d44feeff..b256cccfe4 100644 --- a/community/youtube-dl/APKBUILD +++ b/community/youtube-dl/APKBUILD @@ -33,7 +33,6 @@ package() { zshcomp() { pkgdesc="Zsh completions for $pkgname" - arch="noarch" depends="" install_if="$pkgname=$pkgver-r$pkgrel zsh" @@ -43,7 +42,6 @@ zshcomp() { bashcomp() { pkgdesc="Bash completions for $pkgname" - arch="noarch" depends="" install_if="$pkgname=$pkgver-r$pkgrel bash-completion" @@ -54,7 +52,6 @@ bashcomp() { fishcomp() { pkgdesc="Fish completions for $pkgname" - arch="noarch" depends="" install_if="$pkgname=$pkgver-r$pkgrel fish" diff --git a/community/zram-init/APKBUILD b/community/zram-init/APKBUILD index 023be5b125..5e291e5d33 100644 --- a/community/zram-init/APKBUILD +++ b/community/zram-init/APKBUILD @@ -28,7 +28,6 @@ zshcomp() { depends="" pkgdesc="Zsh completions for $pkgname" install_if="$pkgname=$pkgver-r$pkgrel zsh" - arch="noarch" install -Dm644 "$builddir"/zsh/_$pkgname \ "$subpkgdir"/usr/share/zsh/site-functions/_$pkgname -- cgit v1.2.3