Kn prefix remove noarch

srcpkgs/kadu/template

@@ -1,7 +1,7 @@
 # Template file for 'kadu'
 pkgname=kadu
 version=4.3
-revision=5
+revision=6
 build_style=cmake
 configure_args="-DCMAKE_PREFIX_PATH=${XBPS_CROSS_BASE}/usr
  -DX11_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include
@@ -19,7 +19,7 @@ makedepends="libao-devel libsndfile-devel libarchive-devel
  qt5-plugin-mysql qt5-plugin-odbc qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds
  libmpdclient-devel qca-qt5-devel qxmpp-devel phonon-qt5-devel
  libX11-devel libXfixes-devel libXScrnSaver-devel"
-depends="${pkgname}-data-${version}_${revision} hicolor-icon-theme qca-qt5-ossl
+depends="hicolor-icon-theme qca-qt5-ossl
  $(vopt_if mysql qt5-plugin-mysql) $(vopt_if odbc qt5-plugin-odbc)
  $(vopt_if pgsql qt5-plugin-pgsql) $(vopt_if sqlite qt5-plugin-sqlite)
  $(vopt_if tds qt5-plugin-tds)"
@@ -29,6 +29,7 @@ license="GPL-2.0-or-later, GPL-3.0-or-later, LGPL-2.1-or-later"
 homepage="https://sourceforge.net/projects/kadu/"
 distfiles="${SOURCEFORGE_SITE}/kadu/${version}/kadu-${version}.tar.bz2"
 checksum=ad5d1cbb908c3cd07f2955d343d44b993cd5639427a48a2912441955cfd2bd6e
+replaces="kadu-data>=0"
 
 build_options="mysql odbc pgsql sqlite tds"
 build_options_default="sqlite"
@@ -53,22 +54,6 @@ pre_configure() {
 		-e "s;word_fix$;;"
 }
 
-kadu-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/icons
-		vmove "usr/share/kadu/configuration/*.ui"
-		vmove usr/share/kadu/themes
-		vmove usr/share/kadu/scripts
-		vmove usr/share/kadu/syntax
-		vmove "usr/share/kadu/plugins/*.desc"
-		vmove "usr/share/kadu/plugins/configuration/*.ui"
-		vmove usr/share/kadu/translations
-		vmove usr/share/kadu/plugins/data
-		vmove usr/share/kadu/plugins/translations
-	}
-}
 kadu-devel_package() {
 	short_desc+=" - development files"
 	depends="${sourcepkg}>=${version}_${revision}"

srcpkgs/kobodeluxe/template

@@ -1,19 +1,19 @@
 # Template file for 'kobodeluxe'
 pkgname=kobodeluxe
 version=0.5.1
-revision=2
+revision=3
 wrksrc="KoboDeluxe-${version}"
 build_style=gnu-configure
 configure_args="--sharedstatedir=/var/games"
 hostmakedepends="pkg-config"
 makedepends="SDL_image-devel"
-depends="${pkgname}-data"
 short_desc="Space shooter in 2D"
 maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
-license="GPL-2"
+license="GPL-2.0-or-later, LGPL-2.1-or-later"
 homepage="http://olofson.net/kobodl"
 distfiles="${homepage}/download/KoboDeluxe-${version}.tar.bz2"
 checksum=0f7b910a399d985437564af8c5d81d6dcf22b96b26b01488d72baa6a6fdb5c2c
+replaces="kobodeluxe-data>=0"
 
 post_extract() {
 	bsdtar xf icons.tar.gz
@@ -26,11 +26,3 @@ post_install() {
 	done
 	vinstall icons/KDE/icons/32x32/kobodl.png 644 usr/share/pixmaps
 }
-
-kobodeluxe-data_package() {
-	short_desc+=" - data files"
-	archs=noarch
-	pkg_install() {
-		vmove usr/share/kobo-deluxe
-	}
-}

srcpkgs/kpcli/template

@@ -1,8 +1,7 @@
 # Template file for 'kpcli'
 pkgname=kpcli
 version=3.3
-revision=1
-archs=noarch
+revision=2
 build_style=fetch
 depends="perl perl-Crypt-Rijndael perl-Sort-Naturally perl-Term-ReadKey perl-Term-ShellUI perl-File-KeePass perl-Clone perl-Term-ReadLine-Gnu perl-XML-Parser"
 short_desc="KeePass Command Line Interface"

srcpkgs/kupfer/template

@@ -1,14 +1,13 @@
 # Template file for 'kupfer'
 pkgname=kupfer
 version=319
-revision=2
-archs=noarch
-build_style=waf3
+revision=3
 wrksrc="${pkgname}-v${version}"
-python_version=3
+build_style=waf3
 pycompile_dirs="usr/share/kupfer/kupfer"
 configure_args="--no-update-mime --no-update-icon-cache"
-hostmakedepends="intltool python3-docutils"
+hostmakedepends="intltool python3-docutils python3-gobject python3-xdg
+ python3-dbus gtk+3"
 makedepends="libkeybinder3 libwnck python3-gobject python3-xdg python3-dbus"
 depends="$makedepends"
 short_desc="Interface for quick and convenient access to applications"
@@ -17,3 +16,4 @@ license="GPL-3.0-or-later"
 homepage="https://kupferlauncher.github.io/"
 distfiles="https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"
 checksum=22357233984a6588a9f9743002363af38ea63b5c2684af487693a13c42973d31
+python_version=3

srcpkgs/neofetch/template

@@ -1,8 +1,7 @@
 # Template file for 'neofetch'
 pkgname=neofetch
 version=7.1.0
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-makefile
 depends="bash"
 short_desc="Simple system information script"

srcpkgs/netbsd-wtf/template

@@ -1,13 +1,12 @@
 # Template file for 'netbsd-wtf'
 pkgname=netbsd-wtf
 version=20180621
-revision=2
+revision=3
 _commit=b1e5be48e340146f63b174cc14fef892a783168b
-archs=noarch
 build_style=gnu-makefile
-short_desc="The NetBSD's wtf(6) utility"
+short_desc="NetBSD's wtf(6) utility"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="Public domain"
+license="Public Domain"
 homepage="https://www.netbsd.org"
 distfiles="https://github.com/void-linux/netbsd-wtf/archive/$_commit.tar.gz"
 checksum=5da7c6c286673baa8cc0ce2840c16895eef3e884e038a6cb7dedabdd15753de7

srcpkgs/netdata/template

@@ -1,7 +1,7 @@
 # Template file for 'netdata'
 pkgname=netdata
 version=1.24.0
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_style=gnu-configure
 configure_args="--with-user=_netdata ac_cv_file_externaldeps_libbpf_libbpf_a=no"
@@ -53,7 +53,6 @@ post_install() {
 netdata-plugins-nodejs_package() {
 	short_desc+=" - NodeJS Plugins"
 	depends="${sourcepkg}>=${version}_${revision} virtual?nodejs-runtime"
-	archs=noarch
 	pkg_install() {
 		vmove usr/libexec/netdata/plugins.d/node.d.plugin
 		vmove usr/libexec/netdata/node.d
@@ -63,7 +62,6 @@ netdata-plugins-nodejs_package() {
 netdata-plugins-python_package() {
 	short_desc+=" - Python Plugins"
 	depends="${sourcepkg}>=${version}_${revision} python3"
-	archs=noarch
 	pkg_install() {
 		vmove usr/libexec/netdata/plugins.d/python.d.plugin
 		vmove usr/libexec/netdata/python.d

srcpkgs/netsurf-buildsystem/template

@@ -1,8 +1,7 @@
 # Template file for 'netsurf-buildsystem'
 pkgname=netsurf-buildsystem
 version=1.9
-revision=1
-archs=noarch
+revision=2
 wrksrc="${pkgname#netsurf-}-${version}"
 short_desc="Netsurf buildsystem"
 maintainer="Orphaned <orphan@voidlinux.org>"

srcpkgs/novaboot/template

@@ -1,8 +1,7 @@
 # Template file for 'novaboot'
 pkgname=novaboot
 version=20191023
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-makefile
 hostmakedepends="perl"
 makedepends="perl"

srcpkgs/ntp/template

@@ -1,7 +1,7 @@
 # Template file for 'ntp'
 pkgname=ntp
 version=4.2.8p15
-revision=2
+revision=3
 build_style=gnu-configure
 configure_args="--with-crypto --enable-linuxcap --enable-ipv6 --enable-ntp-signd
  --enable-all-clocks ol_cv_pthread_select_yields=yes"
@@ -42,7 +42,6 @@ post_install() {
 
 ntp-perl_package() {
 	depends="ntp>=$version perl"
-	archs=noarch
 	short_desc+=" - perl scripts"
 	pkg_install() {
 		vmove usr/bin/ntp-wait

srcpkgs/num-utils/template

@@ -1,16 +1,15 @@
 # Template file for 'num-utils'
 pkgname=num-utils
 version=0.5
-revision=1
+revision=2
 hostmakedepends="perl"
 depends="perl"
 short_desc="Programs for dealing with numbers from the Unix command line"
 maintainer="Leah Neukirchen <leah@vuxu.org>"
-license="GPL-2"
+license="GPL-2.0-or-later"
 homepage="http://suso.suso.org/xulu/Num-utils"
 distfiles="http://suso.suso.org/programs/${pkgname}/downloads/${pkgname}-${version}.tar.gz"
 checksum=03592760fc7844492163b14ddc9bb4e4d6526e17b468b5317b4a702ea7f6c64e
-archs=noarch
 
 post_extract() {
 	sed -i 's/\$new_number\^\$1/$new_number**$1/g' numprocess