Re: [PR PATCH] [Updated] C remove noarch

[sgn <sgn@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

There is an updated pull request by sgn against master on the void-packages repository

https://github.com/sgn/void-packages c-remove-noarch
https://github.com/void-linux/void-packages/pull/26559

C remove noarch


A patch file from https://github.com/void-linux/void-packages/pull/26559.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-c-remove-noarch-26559.patch --]
[-- Type: text/x-diff, Size: 16158 bytes --]

From 5e27f7cb7f62aa0289730522478b5e7d991be8ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:09 +0700
Subject: [PATCH 01/19] c: remove noarch

---
 srcpkgs/c/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/c/template b/srcpkgs/c/template
index 47c95d3060e..7b0086a5153 100644
--- a/srcpkgs/c/template
+++ b/srcpkgs/c/template
@@ -1,8 +1,7 @@
 # Template file for 'c'
 pkgname=c
 version=0.14
-revision=1
-archs=noarch
+revision=2
 depends="bash"
 short_desc="Compile and execute C scripts in one go!"
 maintainer="Orphaned <orphan@voidlinux.org>"

From e3144203f66facb1976b73ded0a2ce485f3de172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 02/19] catch2: remove noarch

---
 srcpkgs/catch2/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/catch2/template b/srcpkgs/catch2/template
index f8795cb6c77..ae4c9b2c38d 100644
--- a/srcpkgs/catch2/template
+++ b/srcpkgs/catch2/template
@@ -1,8 +1,7 @@
 # Template file for 'catch2'
 pkgname=catch2
 version=2.11.1
-revision=1
-archs=noarch
+revision=2
 wrksrc="Catch2-${version}"
 build_style=cmake
 configure_args="-DCATCH_USE_VALGRIND=OFF -DCATCH_BUILD_TESTING=ON

From 15e3a7561ec6644a032a671b221b1797812a785e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 03/19] cdemu-client: remove noarch

---
 srcpkgs/cdemu-client/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cdemu-client/template b/srcpkgs/cdemu-client/template
index 36d40de4bb5..c070247bc8b 100644
--- a/srcpkgs/cdemu-client/template
+++ b/srcpkgs/cdemu-client/template
@@ -1,8 +1,7 @@
 # Template file for 'cdemu-client'
 pkgname=cdemu-client
 version=3.2.4
-revision=1
-archs=noarch
+revision=2
 build_style=cmake
 configure_args="-DCMAKE_INSTALL_COMPLETIONSDIR=/usr/share/bash-completion/completions"
 hostmakedepends="python3 intltool pkg-config"

From 5e8f94a700cbe992a82edbdc43050cad00c6e6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 04/19] cdm: remove noarch

---
 srcpkgs/cdm/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cdm/template b/srcpkgs/cdm/template
index ae30eaaef91..f1fb8b2f646 100644
--- a/srcpkgs/cdm/template
+++ b/srcpkgs/cdm/template
@@ -1,15 +1,14 @@
 # Template file for 'cdm'
 pkgname=cdm
 version=0.7
-revision=2
+revision=3
+depends="dialog xinit kbd xdpyinfo"
 short_desc="Console Display Manager"
 maintainer="Andrea Brancaleoni <abc@pompel.me>"
-depends="dialog xinit kbd xdpyinfo"
 license="GPL-2.0-or-later"
 homepage="https://github.com/evertiro/cdm"
 distfiles="https://github.com/evertiro/cdm/archive/${version}.tar.gz"
 checksum=530042165ce65cdff3ec62ba9f077d0e8c6744c13f5d449d84fe2506a79d2e56
-archs=noarch
 
 do_install() {
 	sed -i 's| /| $PKGDESTDIR/|g' install.sh

From 14e522f221909c6a52c6fa09fb88b2ef1cda1041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 05/19] cereal: remove noarch

---
 srcpkgs/cereal/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cereal/template b/srcpkgs/cereal/template
index c454ed85833..8588f1ee882 100644
--- a/srcpkgs/cereal/template
+++ b/srcpkgs/cereal/template
@@ -1,8 +1,7 @@
 # Template file for 'cereal'
 pkgname=cereal
 version=1.3.0
-revision=1
-archs=noarch
+revision=2
 build_style=cmake
 configure_args="-DSKIP_PORTABILITY_TEST=1 -DTHREAD_SAFE=ON -DWITH_WERROR=OFF"
 short_desc="Header-only C++ serialization library"

From d6e6ad7c1605bdcddb2529ae9163aa0d6b64d319 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:10 +0700
Subject: [PATCH 06/19] chatty: remove noarch

---
 srcpkgs/chatty/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/chatty/template b/srcpkgs/chatty/template
index 16bbc44096d..00573e1c89f 100644
--- a/srcpkgs/chatty/template
+++ b/srcpkgs/chatty/template
@@ -1,8 +1,7 @@
 # Template file for 'chatty'
 pkgname=chatty
 version=0.12
-revision=1
-archs=noarch
+revision=2
 hostmakedepends="gradle"
 depends="virtual?java-runtime"
 short_desc="Twitch Chat Client for Desktop"

From 51ed665657d4a3ec83b8cf0ee3becaffcb11ae75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 07/19] cldr-emoji-annotation: remove noarch

---
 srcpkgs/cldr-emoji-annotation/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cldr-emoji-annotation/template b/srcpkgs/cldr-emoji-annotation/template
index 7910b83971b..2ce6e53f4e1 100644
--- a/srcpkgs/cldr-emoji-annotation/template
+++ b/srcpkgs/cldr-emoji-annotation/template
@@ -1,9 +1,8 @@
 # Template file for 'cldr-emoji-annotation'
 pkgname=cldr-emoji-annotation
 version=36.12.120191002.0
-revision=1
+revision=2
 _tag=${version%.*}_${version##*.}
-archs=noarch
 wrksrc="${pkgname}-${_tag}"
 build_style=gnu-configure
 short_desc="Emoji annotation files in CLDR"

From 7176ea8c1e14bb1355e33dec36a19126e4ca7e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 08/19] clearlooks-phenix-darkpurpy-theme: remove noarch

---
 srcpkgs/clearlooks-phenix-darkpurpy-theme/template | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/srcpkgs/clearlooks-phenix-darkpurpy-theme/template b/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
index a2d541c8896..bbc8c60559e 100644
--- a/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
+++ b/srcpkgs/clearlooks-phenix-darkpurpy-theme/template
@@ -1,10 +1,9 @@
 # Template file for 'clearlooks-phenix-darkpurpy-theme'
 pkgname=clearlooks-phenix-darkpurpy-theme
 version=7.0.2
-revision=1
+revision=2
 _devuan_rel="1+devuan2.0"
 build_style=fetch
-archs=noarch
 depends="gnome-themes-standard gtk-engine-murrine gtk2-engines"
 short_desc="Dark-purpified GTK3 port of Clearlooks theme"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -19,4 +18,3 @@ do_install() {
 	vmkdir usr/share/themes
 	vcopy usr/share/themes/Clearlooks-Phenix-DarkPurpy usr/share/themes
 }
-

From 279a5bd782e3b5532062b84c069a3b049eb6f87c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 09/19] clerk: remove noarch

---
 srcpkgs/clerk/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/clerk/template b/srcpkgs/clerk/template
index a04c6f2cef6..cad10f86a94 100644
--- a/srcpkgs/clerk/template
+++ b/srcpkgs/clerk/template
@@ -1,8 +1,7 @@
 # Template file for 'clerk'
 pkgname=clerk
 version=4.0.5
-revision=1
-archs=noarch
+revision=2
 depends="rofi fzf tmux mpc perl-Net-MPD perl-Data-MessagePack perl-File-Slurper
 perl-Config-Simple perl-Try-Tiny perl-IPC-Run perl-HTTP-Date perl-Data-Section-Simple"
 short_desc="MPD client written in Perl using rofi or fzf"

From 5de52193f81417cde24cd03f39d248ff77ff98dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:11 +0700
Subject: [PATCH 10/19] cloc: remove noarch

---
 srcpkgs/cloc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cloc/template b/srcpkgs/cloc/template
index 00cf43ef4b1..cf2d1f35d3f 100644
--- a/srcpkgs/cloc/template
+++ b/srcpkgs/cloc/template
@@ -1,8 +1,7 @@
 # Template file for 'cloc'
 pkgname=cloc
 version=1.88
-revision=1
-archs=noarch
+revision=2
 hostmakedepends="perl"
 depends="perl"
 short_desc="Count Lines of Code"

From e6f0561d40c3188bad02ab2bdf6ff5f1fdf79948 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 11/19] clyrics: remove noarch

---
 srcpkgs/clyrics/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/clyrics/template b/srcpkgs/clyrics/template
index 5a0144c5b30..955aaedc7c3 100644
--- a/srcpkgs/clyrics/template
+++ b/srcpkgs/clyrics/template
@@ -1,8 +1,7 @@
 # Template file for 'clyrics'
 pkgname=clyrics
 version=0.12
-revision=1
-archs=noarch
+revision=2
 depends="perl-LWP-Protocol-https perl-WWW-Mechanize"
 short_desc="Extensible lyrics fetcher, with daemon support for cmus and mocp"
 maintainer="Orphaned <orphan@voidlinux.org>"

From 0923ba1236a7ff22c81d10da8e8c569a33c9956d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 12/19] cmc: remove noarch

---
 srcpkgs/cmc/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/cmc/template b/srcpkgs/cmc/template
index 34a50561d1d..d94d241d7f5 100644
--- a/srcpkgs/cmc/template
+++ b/srcpkgs/cmc/template
@@ -1,8 +1,7 @@
 # Template file for 'cmc'
 pkgname=cmc
 version=1.1.4
-revision=1
-archs=noarch
+revision=2
 short_desc="SSH ControlMaster Controller"
 maintainer="Daniel A. Maierhofer <git@damadmai.at>"
 license="MIT"

From e38104aab4ae626c28fa752f4f8c32741dc6cf55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:12 +0700
Subject: [PATCH 13/19] collectl: remove noarch

---
 srcpkgs/collectl/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/collectl/template b/srcpkgs/collectl/template
index aec4b83ff46..59af99c7a5d 100644
--- a/srcpkgs/collectl/template
+++ b/srcpkgs/collectl/template
@@ -1,8 +1,7 @@
 # Template file for 'collectl'
 pkgname=collectl
 version=4.3.1
-revision=1
-archs=noarch
+revision=2
 conf_files="/etc/collectl.conf"
 depends="perl perl-Term-ReadKey"
 short_desc="Collects data that describes the current system status"

From 321fcf80e4cd7fab13d23ce0a9998883ab4a711b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 14/19] compiz-bcop: remove noarch

---
 srcpkgs/compiz-bcop/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/compiz-bcop/template b/srcpkgs/compiz-bcop/template
index c1a82cb881b..7cc20653931 100644
--- a/srcpkgs/compiz-bcop/template
+++ b/srcpkgs/compiz-bcop/template
@@ -1,8 +1,7 @@
 # Template file for 'compiz-bcop'
 pkgname=compiz-bcop
 version=0.8.18
-revision=1
-archs=noarch
+revision=2
 build_style=gnu-configure
 hostmakedepends="automake intltool libtool pkg-config libxslt"
 makedepends="libxslt-devel"

From 315057b533c65384f6358825c0c4e04345a56a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 15/19] coreboot-utils: remove noarch

---
 srcpkgs/coreboot-utils/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/coreboot-utils/template b/srcpkgs/coreboot-utils/template
index e6c57472ea1..8368dec2969 100644
--- a/srcpkgs/coreboot-utils/template
+++ b/srcpkgs/coreboot-utils/template
@@ -1,7 +1,7 @@
 # Template file for 'coreboot-utils'
 pkgname=coreboot-utils
 version=4.12
-revision=1
+revision=2
 archs="i686* x86_64*"
 wrksrc="coreboot-${version}"
 build_wrksrc="util"
@@ -32,7 +32,6 @@ do_install() {
 }
 
 coreboot-utils-me_cleaner_package() {
-	archs=noarch
 	python_version=3
 	depends="python3"
 	short_desc="Tool for partial deblobbing Intel ME/TXE firmware images"

From 47a2256c1ce73d94121ba7ded6ffc6ad526e4e00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 16/19] couchpotato: remove noarch

---
 srcpkgs/couchpotato/template | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/couchpotato/template b/srcpkgs/couchpotato/template
index 3d7e27004d1..5c3d743442a 100644
--- a/srcpkgs/couchpotato/template
+++ b/srcpkgs/couchpotato/template
@@ -1,8 +1,7 @@
 # Template file for 'couchpotato'
 pkgname=couchpotato
 version=3.0.1
-revision=2
-archs=noarch
+revision=3
 wrksrc="CouchPotatoServer-build-${version}"
 pycompile_dirs="/usr/share/couchpotato"
 make_dirs="
@@ -14,12 +13,12 @@ license="GPL-3.0-or-later"
 homepage="http://couchpota.to"
 distfiles="https://github.com/RuudBurger/CouchPotatoServer/archive/build/${version}.tar.gz>${pkgname}-${version}.tar.gz"
 checksum=f08f9c6ac02f66c6667f17ded1eea4c051a62bbcbadd2a8673394019878e92f7
-python_version=2 #unverified
+python_version=2
 couchpotato_homedir="/var/lib/couchpotato"
 system_accounts="couchpotato"
 
 do_install() {
 	vmkdir usr/share/couchpotato
-	mv * ${DESTDIR}/usr/share/couchpotato
+	vcopy "*" usr/share/couchpotato
 	vsv couchpotato
 }

From d72b6a1a18dcce4002036570875c8dfd8613087c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 17/19] create_ap: remove noarch

---
 srcpkgs/create_ap/template | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/srcpkgs/create_ap/template b/srcpkgs/create_ap/template
index 481ba622def..fb4d5dc37a8 100644
--- a/srcpkgs/create_ap/template
+++ b/srcpkgs/create_ap/template
@@ -1,8 +1,7 @@
 # Template file for 'create_ap'
 pkgname=create_ap
 version=0.4.6
-revision=2
-archs=noarch
+revision=3
 conf_files="/etc/create_ap.conf"
 build_style=gnu-makefile
 depends="bash dnsmasq hostapd iproute2 iptables iw procps-ng util-linux"

From f9e68f96f0debd8b1851f2cf7007eff26e296657 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:13 +0700
Subject: [PATCH 18/19] culmus: remove noarch

---
 srcpkgs/culmus/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/culmus/template b/srcpkgs/culmus/template
index dc6599990ef..68186bb5e60 100644
--- a/srcpkgs/culmus/template
+++ b/srcpkgs/culmus/template
@@ -1,10 +1,9 @@
 # Template file for 'culmus'
 pkgname=culmus
 version=0.133
-revision=1
-archs=noarch
+revision=2
 depends="font-util"
-short_desc="A collection of Type1 and TrueType free Hebrew fonts"
+short_desc="Collection of Type1 and TrueType free Hebrew fonts"
 maintainer="DirectorX <void.directorx@protonmail.com>"
 license="GPL-2.0-or-later"
 homepage="http://culmus.sourceforge.net/"

From 58a30c13d8f91466dd06fb58524313267eedfd98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
 <congdanhqx@gmail.com>
Date: Sat, 21 Nov 2020 22:51:14 +0700
Subject: [PATCH 19/19] cycle: remove noarch

---
 srcpkgs/cycle/template | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/cycle/template b/srcpkgs/cycle/template
index 58649da6482..05008b6047d 100644
--- a/srcpkgs/cycle/template
+++ b/srcpkgs/cycle/template
@@ -1,8 +1,7 @@
 # Template file for 'cycle'
 pkgname=cycle
 version=0.3.2
-revision=1
-archs=noarch
+revision=2
 pycompile_dirs="usr/share/cycle"
 hostmakedepends="python"
 depends="wxPython"
@@ -12,7 +11,7 @@ license="GPL-2.0-or-later"
 homepage="https://github.com/jose1711/cycle"
 distfiles="${homepage}/archive/${version}.tar.gz"
 checksum=6ca5a8191653d435ed04968b91b4a52c8e0d3d90d31d2c008aba1e9edcc1adc9
-python_version=2 #unverified
+python_version=2
 
 do_install() {
 	# Program