commitpkg: handle option parsind and help before abort checks

Previously it was not possible to call for the help of find early
command line option problems when invoking in any location on the shell
as the command aborted without PKGBUILD being present.

Fix this by moving everything related to options at the very top.

.editorconfig

@@ -1,15 +0,0 @@
-# EditorConfig configuration for devtools
-# https://editorconfig.org
-
-# Top-most EditorConfig file
-root = true
-
-# Unix-style newlines without trailing whitespaces, but with a newline
-# ending every file, utf-8 charset, set indent to tabs
-[*]
-end_of_line = lf
-insert_final_newline = true
-trim_trailing_whitespace = true
-charset = utf-8
-indent_style = tab
-tab_width = 4

.gitignore

@@ -1,3 +1,3 @@
 *~
 devtools-*.tar.gz*
-/build/
+build/

.gitlab-ci.yml

@@ -8,37 +8,14 @@ build:
   stage: build
   needs: []
   script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoctor
+    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoc
     - make PREFIX=/usr
     - make PREFIX=/usr DESTDIR=build install
 
-lint:
+check:
   stage: test
   needs: []
   script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoctor shellcheck
+    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils asciidoc shellcheck
     - make check || true
     - SHELLCHECK_OPTS="-S error" make check
-
-test:
-  stage: test
-  needs: []
-  script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils coreutils asciidoctor shellcheck nvchecker bats
-    - make test BATS_EXTRA_ARGS='--formatter junit'
-  artifacts:
-    reports:
-      junit: build/coverage/bats-report.xml
-
-coverage:
-  stage: test
-  needs: []
-  script:
-    - pacman -Syu --noconfirm m4 make openssh subversion rsync arch-install-scripts git bzr mercurial diffutils coreutils asciidoctor shellcheck nvchecker bats kcov jq
-    - make coverage
-  coverage: '/Percent covered\s+\d+\.\d+/'
-  artifacts:
-    reports:
-      coverage_report:
-        coverage_format: cobertura
-        path: build/coverage/bats.*/cobertura.xml

Makefile

@@ -1,32 +1,23 @@
-SHELL=/bin/bash -o pipefail
-
-V=1.4.0
+V=20220621
 BUILDTOOLVER ?= $(V)
 
 PREFIX = /usr/local
 MANDIR = $(PREFIX)/share/man
-DATADIR = $(PREFIX)/share/devtools
 BUILDDIR = build
 
-rwildcard=$(foreach d,$(wildcard $(1:=/*)),$(call rwildcard,$d,$2) $(filter $(subst *,%,$2),$d))
-
-BINPROGS_SRC = $(wildcard src/*.in)
-BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(BINPROGS_SRC))))
-LIBRARY_SRC = $(call rwildcard,src/lib,*.sh)
-LIBRARY = $(addprefix $(BUILDDIR)/,$(patsubst src/%,%,$(patsubst %.in,%,$(LIBRARY_SRC))))
+BINPROGS = $(addprefix $(BUILDDIR)/,$(patsubst src/%,bin/%,$(patsubst %.in,%,$(wildcard src/*.in))))
 MAKEPKG_CONFIGS=$(wildcard config/makepkg/*)
 PACMAN_CONFIGS=$(wildcard config/pacman/*)
-GIT_CONFIGS = $(wildcard config/git/*)
 SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
 MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc)))
-DATA_FILES = $(wildcard data/*)
 
 COMMITPKG_LINKS = \
-	core-testingpkg \
-	core-stagingpkg \
 	extrapkg \
-	extra-testingpkg \
-	extra-stagingpkg \
+	testingpkg \
+	stagingpkg \
+	communitypkg \
+	community-testingpkg \
+	community-stagingpkg \
 	multilibpkg \
 	multilib-testingpkg \
 	multilib-stagingpkg \
@@ -34,35 +25,30 @@ COMMITPKG_LINKS = \
 	gnome-unstablepkg
 
 ARCHBUILD_LINKS = \
-	core-testing-x86_64-build \
-	core-testing-x86_64_v3-build \
-	core-staging-x86_64-build \
-	core-staging-x86_64_v3-build \
 	extra-x86_64-build \
 	extra-x86_64_v3-build \
-	extra-testing-x86_64-build \
-	extra-testing-x86_64_v3-build \
-	extra-staging-x86_64-build \
-	extra-staging-x86_64_v3-build \
+	testing-x86_64-build \
+	testing-x86_64_v3-build \
+	staging-x86_64-build \
+	staging-x86_64_v3-build \
 	multilib-build \
 	multilib-testing-build \
 	multilib-staging-build \
 	kde-unstable-x86_64-build \
 	gnome-unstable-x86_64-build
 
+CROSSREPOMOVE_LINKS = \
+	extra2community \
+	community2extra
+
 COMPLETIONS = $(addprefix $(BUILDDIR)/,$(patsubst %.in,%,$(wildcard contrib/completion/*/*)))
+BASHCOMPLETION_LINKS = \
+	archco \
+	communityco
 
 
-CASES ?= test/case
-JOBS ?= $(shell nproc)
-BATS_EXTRA_ARGS ?=
-BATS_ARGS ?= --jobs $(JOBS) $(BATS_EXTRA_ARGS) --verbose-run
-COVERAGE_DIR ?= $(BUILDDIR)/coverage
-
-
-all: binprogs library conf completion man data
+all: binprogs completion man
 binprogs: $(BINPROGS)
-library: $(LIBRARY)
 completion: $(COMPLETIONS)
 man: $(MANS)
 
@@ -81,118 +67,80 @@ ifneq ($(wildcard setarch-aliases.d/*),)
 endif
 
 
-edit = sed \
-	-e "s|@pkgdatadir[@]|$(DATADIR)|g" \
-	-e "s|@buildtoolver[@]|$(BUILDTOOLVER)|g"
+edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
 GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
 
 define buildInScript
-$(1)/%: $(2)%$(3)
+$(1)/%: $(2)%.in
 	$$(GEN_MSG)
 	@mkdir -p $$(dir $$@)
 	@$(RM) "$$@"
-	@cat $$< | $(edit) >$$@
-	@chmod $(4) "$$@"
+	@{ echo -n 'm4_changequote([[[,]]])'; cat $$<; } | m4 -P --define=m4_devtools_version=$$(BUILDTOOLVER) | $(edit) >$$@
+	@chmod $(3) "$$@"
 	@bash -O extglob -n "$$@"
 endef
 
-$(eval $(call buildInScript,build/bin,src/,.in,755))
-$(eval $(call buildInScript,build/lib,src/lib/,,644))
-$(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,.in,444)))
+$(eval $(call buildInScript,build/bin,src/,555))
+$(foreach completion,$(wildcard contrib/completion/*),$(eval $(call buildInScript,build/$(completion),$(completion)/,444)))
 
-$(BUILDDIR)/doc/man/%: doc/man/%.asciidoc doc/man/include/footer.asciidoc
+$(BUILDDIR)/doc/man/%: doc/man/%.asciidoc doc/asciidoc.conf doc/man/include/footer.asciidoc
 	$(GEN_MSG)
 	@mkdir -p $(BUILDDIR)/doc/man
-	@asciidoctor --backend=manpage --destination-dir=$(BUILDDIR)/doc/man --attribute pkgdatadir=$(DATADIR) $<
-
-conf:
-	@install -d $(BUILDDIR)/makepkg.conf.d
-	@cp -ra $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
-	@install -d $(BUILDDIR)/pacman.conf.d
-	@cp -a $(PACMAN_CONFIGS) $(BUILDDIR)/pacman.conf.d
-	@install -d $(BUILDDIR)/git.conf.d
-	@cp -a $(GIT_CONFIGS) $(BUILDDIR)/git.conf.d
-
-data:
-	@install -d $(BUILDDIR)/data
-	@cp -ra $(DATA_FILES) $(BUILDDIR)/data
+	@a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc/man -a pkgdatadir=$(PREFIX)/share/devtools $<
 
 clean:
 	rm -rf $(BUILDDIR)
 
 install: all
 	install -dm0755 $(DESTDIR)$(PREFIX)/bin
-	install -dm0755 $(DESTDIR)$(DATADIR)/setarch-aliases.d
-	install -dm0755 $(DESTDIR)$(DATADIR)/makepkg.conf.d
-	install -dm0755 $(DESTDIR)$(DATADIR)/pacman.conf.d
+	install -dm0755 $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d
 	install -m0755 ${BINPROGS} $(DESTDIR)$(PREFIX)/bin
-	install -dm0755 $(DESTDIR)$(DATADIR)/lib
-	install -dm0755 $(DESTDIR)$(DATADIR)/data
-	cp -ra $(BUILDDIR)/lib/* $(DESTDIR)$(DATADIR)/lib
-	cp -a $(BUILDDIR)/git.conf.d -t $(DESTDIR)$(DATADIR)
-	cp -ra $(BUILDDIR)/makepkg.conf.d -t $(DESTDIR)$(DATADIR)
-	cp -ra $(BUILDDIR)/data -t $(DESTDIR)$(DATADIR)
-	for conf in $(notdir $(PACMAN_CONFIGS)); do install -Dm0644 $(BUILDDIR)/pacman.conf.d/$$conf $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
-	for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(DATADIR)/setarch-aliases.d; done
+	for conf in ${MAKEPKG_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
+	for conf in ${PACMAN_CONFIGS}; do install -Dm0644 $$conf $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
+	for a in ${SETARCH_ALIASES}; do install -m0644 $$a -t $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d; done
 	for l in ${COMMITPKG_LINKS}; do ln -sf commitpkg $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do ln -sf archbuild $(DESTDIR)$(PREFIX)/bin/$$l; done
+	for l in ${CROSSREPOMOVE_LINKS}; do ln -sf crossrepomove $(DESTDIR)$(PREFIX)/bin/$$l; done
 	ln -sf find-libdeps $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	install -Dm0644 $(BUILDDIR)/contrib/completion/bash/devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
-	for f in $(notdir $(BINPROGS)); do ln -sf devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$f; done
+	for l in ${BASHCOMPLETION_LINKS}; do ln -sf devtools $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
 	install -Dm0644 $(BUILDDIR)/contrib/completion/zsh/_devtools $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
+	ln -sf archco $(DESTDIR)$(PREFIX)/bin/communityco
 	for manfile in $(MANS); do \
 		install -Dm644 $$manfile -t $(DESTDIR)$(MANDIR)/man$${manfile##*.}; \
 	done;
 
 uninstall:
 	for f in $(notdir $(BINPROGS)); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
-	for f in $(notdir $(LIBRARY)); do rm -f $(DESTDIR)$(DATADIR)/lib/$$f; done
-	rm -rf $(DESTDIR)$(DATADIR)/lib
-	rm -rf $(DESTDIR)$(DATADIR)/git.conf.d
-	rm -rf $(DESTDIR)$(DATADIR)/makepkg.conf.d
-	rm -rf $(DESTDIR)$(DATADIR)/data
-	for conf in $(notdir $(PACMAN_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/pacman.conf.d/$${conf##*/}; done
-	for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(DATADIR)/setarch-aliases.d/$$f; done
+	for conf in ${MAKEPKG_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/makepkg-$${conf##*/}; done
+	for conf in ${PACMAN_CONFIGS}; do rm -f $(DESTDIR)$(PREFIX)/share/devtools/pacman-$${conf##*/}; done
+	for f in $(notdir $(SETARCH_ALIASES)); do rm -f $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d/$$f; done
 	for l in ${COMMITPKG_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
 	for l in ${ARCHBUILD_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
-	rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
-	for f in $(notdir $(BINPROGS)); do rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$f; done
-	rm -f $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
+	for l in ${CROSSREPOMOVE_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$l; done
+	for l in ${BASHCOMPLETION_LINKS}; do rm -f $(DESTDIR)$(PREFIX)/share/bash-completion/completions/$$l; done
+	rm $(DESTDIR)$(PREFIX)/share/bash-completion/completions/devtools
+	rm $(DESTDIR)$(PREFIX)/share/zsh/site-functions/_devtools
+	rm -f $(DESTDIR)$(PREFIX)/bin/communityco
 	rm -f $(DESTDIR)$(PREFIX)/bin/find-libprovides
 	for manfile in $(notdir $(MANS)); do rm -f $(DESTDIR)$(MANDIR)/man$${manfile##*.}/$${manfile}; done;
-	rmdir --ignore-fail-on-non-empty \
-		$(DESTDIR)$(DATADIR)/setarch-aliases.d \
-		$(DESTDIR)$(DATADIR)/pacman.conf.d \
-		$(DESTDIR)$(DATADIR)
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(PREFIX)/share/devtools/setarch-aliases.d $(DESTDIR)$(PREFIX)/share/devtools
 
+TODAY=$(shell date +"%Y%m%d")
 tag:
-	git cliff --strip=all --unreleased
-	@echo "current version: v$(V)"
-	@read -r -p "tag version: v" VERSION && \
-	sed -E "s|^V=.+|V=$$VERSION|" -i Makefile && \
-	git commit --gpg-sign --message "chore(release): version v$$VERSION" Makefile && \
-	git tag --sign --message "Version v$$VERSION" v$$VERSION
-
-release: dist
-	git push --tags origin master
-	git cliff --version >/dev/null
-	GITLAB_HOST=gitlab.archlinux.org glab release create v$(V) devtools-$(V).tar.gz* --milestone v$(V) --notes-file <(git cliff --strip=all --latest)
+	@sed -E "s|^V=[0-9]{8}|V=$(TODAY)|" -i Makefile
+	@git commit --gpg-sign --message "Version $(TODAY)" Makefile
+	@git tag --sign --message "Version $(TODAY)" $(TODAY)
 
 dist:
-	git archive --format=tar --prefix=devtools-$(V)/ v$(V) | gzip > devtools-$(V).tar.gz
+	git archive --format=tar --prefix=devtools-$(V)/ $(V) | gzip > devtools-$(V).tar.gz
 	gpg --detach-sign --use-agent devtools-$(V).tar.gz
 
-test: binprogs library conf completion man
-	@mkdir -p $(COVERAGE_DIR)
-	bats $(BATS_ARGS) $(CASES) | tee $(COVERAGE_DIR)/bats-report.xml
+upload:
+	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig repos.archlinux.org:/srv/ftp/other/devtools/
 
-coverage: binprogs library conf completion man
-	kcov --include-path=src $(COVERAGE_DIR) bats $(BATS_ARGS) $(CASES)
-	jq -r '. | ["Percent covered", .percent_covered], ["Covered lines", .covered_lines], ["Total lines", .total_lines], ["Percent low", .percent_low], ["Percent high", .percent_high] | @tsv' \
-		$(COVERAGE_DIR)/bats.*/coverage.json
-
-check: $(BINPROGS_SRC) $(LIBRARY_SRC) contrib/completion/bash/devtools.in config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
+check: $(BINPROGS) $(BUILDDIR)/contrib/completion/bash/devtools config/makepkg/x86_64.conf contrib/makepkg/PKGBUILD.proto
 	shellcheck $^
 
-.PHONY: all binprogs library completion conf man data clean install uninstall tag dist upload test coverage check
+.PHONY: all completion man clean install uninstall dist upload check tag
 .DELETE_ON_ERROR:

README.md

@@ -14,43 +14,6 @@ files like `makepkg.conf`.
 BUILDTOOLVER="${pkgver}-${pkgrel}-${arch}" make all
 ```
 
-## Development
-
-For local development testing, there is a convenience wrapper for `pkgctl` that
-will automatically build the project and proxy all calls to the local build directory:
-
-```sh
-./test/bin/pkgctl --help
-```
-
-### Commit messages
-
-All commits must follow [conventional commits](https://www.conventionalcommits.org).
-
-The following groups are allowed:
-
-- chore
-- feat
-- fix
-- doc
-- perf
-- test
-
-To override the scope for the changelog entry use the `Component:` trailer.
-
-Example:
-
-```
-feat(db): yay mega cool feature
-
-Very long and useful description.
-
-Fixes #1
-Fixes #2
-
-Component: pkgctl db remove
-```
-
 ## Releasing
 
 1. bump the version in the Makefile
@@ -60,49 +23,6 @@ Component: pkgctl db remove
 5. Upload the source tarball with ```make dist upload```
 6. Update the package
 
-## Dependencies
-
-### Runtime Dependencies
-
-- arch-install-scripts
-- awk
-- bash
-- binutils
-- coreutils
-- curl
-- diffutils
-- expac
-- fakeroot
-- findutils
-- glow
-- grep
-- gum
-- jq
-- ncurses
-- openssh
-- parallel
-- rsync
-- sed
-- systemd
-- util-linux
-- bzr
-- git
-- mercurial
-- subversion
-
-### Optional Dependencies
-
-- bat (pretty printing)
-- nvchecker (version checking)
-- reuse (license compliance)
-
-### Development Dependencies
-
-- asciidoctor
-- make
-- shellcheck
-- bats
-
 ## License
 
 Devtools is licensed under the terms of the **GPL-3.0-or-later** (see [LICENSE](LICENSE)).

cliff.toml

@@ -1,45 +0,0 @@
-[changelog]
-header = "# Changelog\n\n"
-body = """
-{%- if version -%}
-    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
-{%- else -%}
-    ## [unreleased]
-{%- endif %}
-{% for group, commits in commits | group_by(attribute="group") %}
-    ### {{ group | upper_first }}
-    {% for commit in commits | sort(attribute="message") %}
-		- {% set component = commit.footers | filter(attribute="token", value="Component") | map(attribute="value") | join(sep=", ") %}
-		{%- if component %}{{ component }}: {% elif commit.scope %}{{ commit.scope }}: {% endif %}
-		{{- commit.message | upper_first }}
-		{%- if commit.breaking %} (breaking){% endif %}
-		{%- set fixes = commit.footers | filter(attribute="token", value="Fixes") %}
-		{%- for fix in fixes %}{% if fix.separator|trim == '#' %}{{ fix.separator }}{{ fix.value }}{% endif %}{% endfor %}
-    {%- endfor %}
-{% endfor %}
-
-"""
-footer = ""
-
-# remove the leading and trailing whitespaces from the template
-trim = true
-
-[git]
-# allow only conventional commits
-# https://www.conventionalcommits.org
-conventional_commits = true
-# regex for parsing and grouping commits
-commit_parsers = [
-    { message = "^chore\\(release\\): version", skip = true},
-    { message = "^feat", group = "Features"},
-    { message = "^fix", group = "Bug Fixes"},
-    { message = "^doc", group = "Documentation"},
-    { message = "^perf", group = "Performance"},
-    { message = "^test", group = "Testing"},
-    { message = "^chore", group = "Miscellaneous Tasks"},
-    { body = ".*security", group = "Security"},
-]
-# filter out the commits that are not matched by commit parsers
-filter_commits = false
-# regex for matching git tags
-tag_pattern = "^v[0-9]+\\.[0-9]+\\.[0-9]+.*"

config/git/template/hooks/applypatch-msg

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/commit-msg

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/post-applypatch

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/post-checkout

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/post-commit

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/post-merge

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-applypatch

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-commit

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-merge-commit

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-push

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/pre-rebase

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/hooks/prepare-commit-msg

@@ -1 +0,0 @@
-#!/bin/sh

config/git/template/info/exclude

@@ -1,29 +0,0 @@
-/pkg
-/src
-/*/
-!/keys/
-!/LICENSES/
-
-/*.log
-/*.tar.*
-/*.tar
-/*.tgz
-/*.zst
-/*.gz
-/*.xz
-/*.bz2
-/*.zip
-/*.xpi
-/*.jar
-/*.whl
-/*.war
-/*.deb
-/*.ttf
-/*.dat
-/*.iso
-/*.asc
-/*.sig
-/*.signature
-/*.sign
-/*.SHA256SUMS
-/*.sha256

config/makepkg/conf.d/fortran.conf

@@ -1,22 +0,0 @@
-#!/hint/bash
-# shellcheck disable=2034
-
-#
-# /etc/makepkg.conf.d/fortran.conf
-#
-
-#########################################################################
-# FORTRAN LANGUAGE SUPPORT
-#########################################################################
-
-# Flags used for the Fortran compiler, similar in spirit to CFLAGS. Read
-# linkman:gfortran[1] for more details on the available flags.
-FFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt \
-        -Wp,-D_FORTIFY_SOURCE=3 -fstack-clash-protection -fcf-protection \
-        -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
-FCFLAGS="$FFLAGS"
-
-# Additional compiler flags appended to `FFLAGS` and `FCFLAGS` for use in debugging. Usually
-# this would include: ``-g''. Read linkman:gfortran[1] for more details on the wide
-# variety of compiler flags available.
-DEBUG_FFLAGS="-g"

config/makepkg/conf.d/rust.conf

@@ -1,19 +0,0 @@
-#!/hint/bash
-# shellcheck disable=2034
-
-#
-# /etc/makepkg.conf.d/rust.conf
-#
-
-#########################################################################
-# RUST LANGUAGE SUPPORT
-#########################################################################
-
-# Flags used for the Rust compiler, similar in spirit to CFLAGS. Read
-# linkman:rustc[1] for more details on the available flags.
-RUSTFLAGS="-C force-frame-pointers=yes"
-
-# Additional compiler flags appended to `RUSTFLAGS` for use in debugging.
-# Usually this would include: ``-C debuginfo=2''. Read linkman:rustc[1] for
-# more details on the available flags.
-DEBUG_RUSTFLAGS="-C debuginfo=2"

config/makepkg/x86_64.conf

@@ -25,7 +25,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
-VCSCLIENTS=('bzr::breezy'
+VCSCLIENTS=('bzr::bzr'
             'fossil::fossil'
             'git::git'
             'hg::mercurial'
@@ -41,18 +41,18 @@ CHOST="x86_64-pc-linux-gnu"
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
 CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection \
-        -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+        -fstack-clash-protection -fcf-protection"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
-         -Wl,-z,pack-relative-relocs"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -81,7 +81,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps)
+# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -93,9 +93,8 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
-#-- autodeps:   Automatically add depends/provides
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(sha256)
@@ -113,8 +112,6 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #-- Directory to store source code in for debug packages
 DBGSRCDIR="/usr/src/debug"
-#-- Prefix and directories for library autodeps
-LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32')
 
 #########################################################################
 # PACKAGE OUTPUT

config/makepkg/x86_64.conf.d/fortran.conf

@@ -1 +0,0 @@
-../conf.d/fortran.conf

config/makepkg/x86_64.conf.d/rust.conf

@@ -1 +0,0 @@
-../conf.d/rust.conf

config/makepkg/x86_64_v3.conf

@@ -25,7 +25,7 @@ DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u'
 
 #-- The package required by makepkg to download VCS sources
 #  Format: 'protocol::package'
-VCSCLIENTS=('bzr::breezy'
+VCSCLIENTS=('bzr::bzr'
             'fossil::fossil'
             'git::git'
             'hg::mercurial'
@@ -41,18 +41,18 @@ CHOST="x86_64-pc-linux-gnu"
 #-- Compiler and Linker Flags
 #CPPFLAGS=""
 CFLAGS="-march=x86-64-v3 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
-        -Wp,-D_FORTIFY_SOURCE=3 -Wformat -Werror=format-security \
-        -fstack-clash-protection -fcf-protection \
-        -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer"
+        -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security \
+        -fstack-clash-protection -fcf-protection"
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
-LDFLAGS="-Wl,-O1 -Wl,--sort-common -Wl,--as-needed -Wl,-z,relro -Wl,-z,now \
-         -Wl,-z,pack-relative-relocs"
+LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"
+#RUSTFLAGS="-C opt-level=2"
 #-- Make Flags: change this for DistCC/SMP systems
 #MAKEFLAGS="-j2"
 #-- Debugging flags
 DEBUG_CFLAGS="-g"
 DEBUG_CXXFLAGS="$DEBUG_CFLAGS"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"
 
 #########################################################################
 # BUILD ENVIRONMENT
@@ -81,7 +81,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #   These are default values for the options=() settings
 #########################################################################
 #
-# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto !autodeps)
+# Makepkg defaults: OPTIONS=(!strip docs libtool staticlibs emptydirs !zipman !purge !debug !lto)
 #  A negated option will do the opposite of the comments below.
 #
 #-- strip:      Strip symbols from binaries/libraries
@@ -93,9 +93,8 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- purge:      Remove files specified by PURGE_TARGETS
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
-#-- autodeps:   Automatically add depends/provides
 #
-OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge debug lto)
+OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge !debug lto)
 
 #-- File integrity checks to use. Valid: md5, sha1, sha224, sha256, sha384, sha512, b2
 INTEGRITY_CHECK=(sha256)
@@ -113,8 +112,6 @@ DOC_DIRS=(usr/{,local/}{,share/}{doc,gtk-doc} opt/*/{doc,gtk-doc})
 PURGE_TARGETS=(usr/{,share}/info/dir .packlist *.pod)
 #-- Directory to store source code in for debug packages
 DBGSRCDIR="/usr/src/debug"
-#-- Prefix and directories for library autodeps
-LIB_DIRS=('lib:usr/lib' 'lib32:usr/lib32')
 
 #########################################################################
 # PACKAGE OUTPUT

config/makepkg/x86_64_v3.conf.d/fortran.conf

@@ -1 +0,0 @@
-../conf.d/fortran.conf

config/makepkg/x86_64_v3.conf.d/rust.conf

@@ -1 +0,0 @@
-../conf.d/rust.conf

config/pacman/core-staging.conf

@@ -1,97 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[core-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[core-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

config/pacman/core-testing-x86_64_v3.conf

@@ -1,91 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = x86_64_v3 x86_64
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[core-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

config/pacman/extra-staging-x86_64_v3.conf

@@ -1,97 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = x86_64_v3 x86_64
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[core-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[core-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

config/pacman/extra-testing.conf

@@ -1,91 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[core-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

config/pacman/extra-x86_64_v3.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -72,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[core-testing]
+#[testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-#[extra-testing]
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/extra.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -72,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[core-testing]
+#[testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-#[extra-testing]
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/gnome-unstable.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -75,16 +73,19 @@ LocalFileSigLevel = Optional
 [gnome-unstable]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/kde-unstable.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -75,16 +73,19 @@ LocalFileSigLevel = Optional
 [kde-unstable]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/multilib-staging.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -72,24 +70,27 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-staging]
+[staging]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
 # If you want to run 32 bit applications on your x86_64 system,
 # enable the multilib repositories as required here.
 [multilib-staging]

config/pacman/multilib-testing.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -72,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,

config/pacman/multilib.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -72,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-#[core-testing]
+#[testing]
 #Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-#[extra-testing]
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+#[community-testing]
 #Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # If you want to run 32 bit applications on your x86_64 system,

config/pacman/staging-x86_64_v3.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -72,24 +70,27 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-staging]
+[staging]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]

config/pacman/staging.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -72,24 +70,27 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-staging]
+[staging]
 Include = /etc/pacman.d/mirrorlist
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
 [extra]
 Include = /etc/pacman.d/mirrorlist
 
+[community-staging]
+Include = /etc/pacman.d/mirrorlist
+
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
+Include = /etc/pacman.d/mirrorlist
+
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
 #[custom]

config/pacman/testing-x86_64_v3.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -72,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/testing.conf

@@ -36,8 +36,6 @@ NoProgressBar
 #CheckSpace
 VerbosePkgLists
 ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
 
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -72,16 +70,19 @@ LocalFileSigLevel = Optional
 # repo name header and Include lines. You can add preferred servers immediately
 # after the header, and they will be used before the default mirrors.
 
-[core-testing]
+[testing]
 Include = /etc/pacman.d/mirrorlist
 
 [core]
 Include = /etc/pacman.d/mirrorlist
 
-[extra-testing]
+[extra]
 Include = /etc/pacman.d/mirrorlist
 
-[extra]
+[community-testing]
+Include = /etc/pacman.d/mirrorlist
+
+[community]
 Include = /etc/pacman.d/mirrorlist
 
 # An example of a custom package repository.  See the pacman manpage for

config/pacman/universe.conf

@@ -1,114 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[gnome-unstable]
-Include = /etc/pacman.d/mirrorlist
-
-[kde-unstable]
-Include = /etc/pacman.d/mirrorlist
-
-[core-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[core-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[extra-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-# If you want to run 32 bit applications on your x86_64 system,
-# enable the multilib repositories as required here.
-[multilib-staging]
-Include = /etc/pacman.d/mirrorlist
-
-[multilib-testing]
-Include = /etc/pacman.d/mirrorlist
-
-[multilib]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

config/pacman/unstable.conf

@@ -1,85 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-#HookDir     = /etc/pacman.d/hooks/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-NoProgressBar
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-VerbosePkgLists
-ParallelDownloads = 5
-DownloadUser = alpm
-#DisableSandbox
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-[gnome-unstable]
-Include = /etc/pacman.d/mirrorlist
-
-[kde-unstable]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs

contrib/completion/bash/devtools.in

@@ -2,801 +2,89 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/valid-build-install.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-build-install.sh
-# shellcheck source=src/lib/valid-tags.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
-# shellcheck source=src/lib/valid-repos.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
-# shellcheck source=src/lib/valid-inspect.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-inspect.sh
-# shellcheck source=src/lib/valid-search.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-search.sh
-# shellcheck source=src/lib/valid-version.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-version.sh
-# shellcheck source=src/lib/valid-issue.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-issue.sh
+_devtools_compgen() {
+  local i r
+  COMPREPLY=($(compgen -W '$*' -- "$cur"))
+  for ((i=1; i < ${#COMP_WORDS[@]}-1; i++)); do
+    for r in "${!COMPREPLY[@]}"; do
+      if [[ ${COMP_WORDS[i]} = "${COMPREPLY[r]}" ]]; then
+        unset 'COMPREPLY[r]'; break
+      fi
+    done
+  done
+}
 
-_colors=(never always auto)
+_archco_pkg() {
+  _devtools_compgen "$(
+      command pacman "-$1"
+  )"
+}
 
+_archco() {
+  local cur prev 
+  COMPREPLY=()
+  cur=$(_get_cword)
+  prev=${COMP_WORDS[COMP_CWORD-1]}
 
-_makechrootpkg_args=(
-	-h
-	-c
-	-d
-	-D
-	-u
-	-r
-	-I
-	-l
-	-n
-	-t
-	-T
-	-U
-	-x
-)
-_makechrootpkg_args_d_opts() { _filedir -d; }
-_makechrootpkg_args_D_opts() { _filedir -d; }
-_makechrootpkg_args_r_opts() { _filedir -d; }
-_makechrootpkg_args_I_opts() { _filedir '*.pkg.tar.*'; }
-_makechrootpkg_args_l_opts() { _filedir -d; }
-_makechrootpkg_args_t_opts() { _filedir -d; }
-_makechrootpkg_args_U_opts() { :; }
-_makechrootpkg_args_x_opts() { _devtools_completions_inspect; }
-_makechrootpkg() { __devtools_complete _makechrootpkg; }
+  _archco_pkg Slq
+  true
+} &&
+complete -F _archco archco communityco
+
+_makechrootpkg() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
+
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-I -c -h -l -r -u' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
+
+  true
+} &&
 complete -F _makechrootpkg makechrootpkg
 
+_mkarchroot() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
 
-_makerepropkg_args=(
-	-h
-	-d
-	-n
-	-c
-	-M
-)
-_makerepropkg_args_c_opts() { _filedir -d; }
-_makerepropkg_args_M_opts() { _filedir '*.conf'; }
-_makerepropkg_opts() { _filedir '*.pkg.tar.*'; }
-_makerepropkg() { __devtools_complete _makerepropkg; }
-complete -F _makerepropkg makerepropkg
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-C -M -c -h' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
 
-
-_mkarchroot_args=(
-	-U
-	-C
-	-M
-	-c
-	-f
-	-h
-)
-_mkarchroot_args_U_opts() { _filedir '*.pkg.tar.*'; }
-_mkarchroot_args_C_opts() { _filedir '*.conf'; }
-_mkarchroot_args_M_opts() { _filedir '*.conf'; }
-_mkarchroot_args_c_opts() { _filedir -d; }
-_mkarchroot_args_f_opts() { _filedir -d; }
-_mkarchroot_opts() {
-	local args
-	args=$(__pkgctl_word_count_after_subcommand)
-	if (( args == 0 )); then
-		_filedir -d
-	elif (( args >= 1 )); then
-		_devtools_completions_all_packages
-	fi
-}
-_mkarchroot() { __devtools_complete _mkarchroot; }
+  true
+} &&
 complete -F _mkarchroot mkarchroot
 
-
-_arch_nspawn_args=(
-	-C
-	-M
-	-c
-	-f
-	-s
-	-h
-)
-_arch_nspawn_args_C_opts() { _filedir '*.conf'; }
-_arch_nspawn_args_M_opts() { _filedir '*.conf'; }
-_arch_nspawn_args_c_opts() { _filedir -d; }
-_arch_nspawn_args_f_opts() { _filedir; }
-_arch_nspawn_opts() {
-	local args
-	args=$(__pkgctl_word_count_after_subcommand)
-	if (( args == 0 )); then
-		_filedir -d
-	fi
-}
-_arch_nspawn() { __devtools_complete _arch_nspawn; }
-complete -F _arch_nspawn arch-nspawn
-
-
-_sogrep_args=(
-	-v --verbose
-	-r --refresh
-	-h --help
-)
-_sogrep_opts() {
-	local args
-	args=$(__pkgctl_word_count_after_subcommand)
-	if (( args == 0 )); then
-		_devtools_completions_repo all
-	fi
-}
-_sogrep() { __devtools_complete _sogrep; }
-complete -F _sogrep sogrep
-
-
-_offload_build_args=(
-	-r --repo
-	-a --arch
-	-s --server
-	-h --help
-)
-_offload_build_args__repo_opts() { _devtools_completions_build_repo; }
-_offload_build_args_r_opts() { _offload_build_args__repo_opts; }
-_offload_build_args__arch_opts() { _devtools_completions_binary_arch; }
-_offload_build_args_a_opts() { _offload_build_args__arch_opts; }
-_offload_build_args__server_opts() { :; }
-_offload_build_args_s_opts() { _offload_build_args__server_opts; }
-_offload_build() { __devtools_complete _offload_build; }
-complete -F _offload_build offload-build
-
-
-_pkgctl_cmds=(
-	aur
-	auth
-	build
-	db
-	diff
-	issue
-	license
-	release
-	repo
-	search
-	version
-)
-_pkgctl_args=(
-	-V --version
-	-h --help
-)
-
-
-_pkgctl_auth_cmds=(
-	login
-	status
-)
-
-
-_pkgctl_auth_login_args=(
-	-g --gen-access-token
-	-h --help
-)
-
-
-_pkgctl_auth_status_args=(
-	-t --show-token
-	-h --help
-)
-
-
-_pkgctl_build_args=(
-	--arch
-	--repo
-
-	-s --staging
-	-t --testing
-	-o --offload
-	-c --clean
-	-w --worker
-	--inspect
-	-I --install-to-chroot
-	-i --install-to-host
-
-	--pkgver
-	--pkgrel
-	--rebuild
-	--update-checksums
-	-e --edit
-
-	-r --release
-	-m --message
-	-u --db-update
-
-	-h --help
-)
-_pkgctl_build_args__arch_opts() { _devtools_completions_binary_arch; }
-_pkgctl_build_args__repo_opts() { _devtools_completions_repo; }
-_pkgctl_build_args__worker_opts() { :; }
-_pkgctl_build_args_w_opts() { _pkgctl_build_args__worker_opts; }
-_pkgctl_build_args__inspect_opts() { _devtools_completions_inspect; }
-_pkgctl_build_args__pkgver_opts() { :; }
-_pkgctl_build_args__pkgrel_opts() { :; }
-_pkgctl_build_args__install_to_host_opts() { _pkgctl_build_completions_install_mode; }
-_pkgctl_build_args_i_opts() { _pkgctl_build_args__install_to_host_opts; }
-_pkgctl_build_args__install_to_chroot_opts() { _makechrootpkg_args_I_opts; }
-_pkgctl_build_args_I_opts() { _pkgctl_build_args__install_to_chroot_opts; }
-_pkgctl_build_args__message_opts() { :; }
-_pkgctl_build_args_m_opts() { _pkgctl_build_args__message_opts; }
-_pkgctl_build_opts() { _filedir -d; }
-_pkgctl_build_completions_install_mode() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_BUILD_INSTALL[*]}" -- "$cur")
-}
-
-
-_pkgctl_db_cmds=(
-	move
-	remove
-	update
-)
-
-
-_pkgctl_db_move_args=(
-	-h --help
-)
-_pkgctl_db_move_opts() {
-	local subcommand args
-	subcommand=(db move)
-	args=$(__pkgctl_word_count_after_subcommand "${subcommand[@]}")
-
-	if (( args == 0 )); then
-		_devtools_completions_repo
-	elif (( args == 1 )); then
-		_devtools_completions_repo
-	elif (( args >= 2 )); then
-		_devtools_completions_all_packages
-	fi
-}
-
-
-_pkgctl_db_remove_args=(
-	--partial
-	--noconfirm
-	-a --arch
-	-h --help
-)
-_pkgctl_db_remove_args__arch_opts() { _devtools_completions_binary_arch; }
-_pkgctl_db_remove_args_a_opts() { _pkgctl_db_remove_args__arch_opts; }
-_pkgctl_db_remove_opts() {
-	local subcommand args
-	subcommand=(db remove)
-	args=$(__pkgctl_word_count_after_subcommand "${subcommand[@]}")
-
-	if (( args == 0 )); then
-		_devtools_completions_repo
-	elif (( args >= 1 )); then
-		_devtools_completions_all_packages
-	fi
-}
-
-
-_pkgctl_db_update_args=(
-	-h --help
-)
-
-
-_pkgctl_release_args=(
-	-m --message
-	-r --repo
-	-s --staging
-	-t --testing
-	-u --db-update
-	-h --help
-)
-_pkgctl_release_args__message_opts() { :; }
-_pkgctl_release_args_m_opts() { _pkgctl_release_args__message_opts; }
-_pkgctl_release_args__repo_opts() { _devtools_completions_repo; }
-_pkgctl_release_args_r_opts() { _pkgctl_release_args__repo_opts; }
-_pkgctl_release_opts() { _filedir -d; }
-
-_pkgctl_aur_cmds=(
-	drop-from-repo
-)
-
-_pkgctl_aur_drop_from_repo_args=(
-	--no-disown
-	-f --force
-	-h --help
-)
-_pkgctl_aur_drop_from_repo_opts() { _filedir -d; }
-
-
-_pkgctl_repo_cmds=(
-	clean
-	clone
-	configure
-	create
-	switch
-	web
-)
-
-
-_pkgctl_repo_clone_args=(
-	-m --maintainer
-	--protocol
-	--switch
-	-u --unprivileged
-	--universe
-	-j --jobs
-	-h --help
-)
-_pkgctl_repo_clone_args__maintainer_opts() { :; }
-_pkgctl_repo_clone_args_m_opts() { _pkgctl_repo_clone_args__maintainer_opts; }
-_pkgctl_repo_clone_args__protocol_opts() { _devtools_completions_protocol; }
-_pkgctl_repo_clone_args__switch_opts() { :; }
-_pkgctl_repo_clone_args__jobs_opts() { :; }
-_pkgctl_repo_clone_args_j_opts() { _pkgctl_repo_clone_args__jobs_opts; }
-_pkgctl_repo_clone_opts() { _devtools_completions_all_packages; }
-
-_pkgctl_repo_clean_args=(
-	-i --interactive
-	-n --dry-run
-	-h --help
-)
-_pkgctl_repo_clean_opts() { _filedir -d; }
-
-_pkgctl_repo_configure_args=(
-	--protocol
-	-j --jobs
-	-h --help
-)
-_pkgctl_repo_configure_args__protocol_opts() { _devtools_completions_protocol; }
-_pkgctl_repo_configure_args__jobs_opts() { :; }
-_pkgctl_repo_configure_args_j_opts() { _pkgctl_repo_clone_args__jobs_opts; }
-_pkgctl_repo_configure_opts() { _filedir -d; }
-
-
-_pkgctl_repo_create_args=(
-	-c --clone
-	-h --help
-)
-
-_pkgctl_repo_switch_args=(
-	--discard-changes
-	-f --force
-	-h --help
-)
-_pkgctl_repo_switch_opts() {
-	local subcommand args
-	subcommand=(repo switch)
-	args=$(__pkgctl_word_count_after_subcommand "${subcommand[@]}")
-
-	if (( args == 0 )); then
-		:
-	elif (( args >= 1 )); then
-		_filedir -d;
-	fi
-}
-
-_pkgctl_license_cmds=(
-	check
-	setup
-)
-
-_pkgctl_license_check_args=(
-	-h --help
-)
-
-_pkgctl_license_check_opts() { _filedir -d; }
-
-_pkgctl_license_setup_args=(
-	--no-check
-	-f --force
-	-h --help
-)
-
-_pkgctl_license_setup_opts() { _filedir -d; }
-
-_pkgctl_version_cmds=(
-	check
-	setup
-	upgrade
-)
-
-_pkgctl_version_check_args=(
-	-v --verbose
-	-h --help
-	--json
-	-F --format
-)
-
-_pkgctl_version_check_opts() { _filedir -d; }
-_pkgctl_version_check_args__format_opts() { _devtools_completions_version_output_format; }
-_pkgctl_version_check_args_F_opts() { _devtools_completions_version_output_format; }
-
-_pkgctl_version_setup_args=(
-	--prefer-platform-api
-	--url
-	--no-check
-	--no-upstream
-	-f --force
-	-h --help
-)
-
-_pkgctl_version_setup_opts() { _filedir -d; }
-_pkgctl_version_setup_args__url_opts() { :; }
-
-_pkgctl_version_upgrade_args=(
-	--no-update-checksums
-	-v --verbose
-	-h --help
-)
-
-_pkgctl_version_upgrade_opts() { _filedir -d; }
-
-_pkgctl_repo_web_args=(
-	--print
-	-h --help
-)
-_pkgctl_repo_web_opts() { _filedir -d; }
-
-
-_pkgctl_search_args=(
-	--no-default-filter
-	--json
-	-F --format
-	-N --no-line-number
-	-h --help
-)
-_pkgctl_search_opts() { :; }
-_pkgctl_search_args__format_opts() { _devtools_completions_search_format; }
-_pkgctl_search_args_F_opts() { _devtools_completions_search_format; }
-
-
-_pkgctl_diff_args=(
-	-l --list
-	-d --diffoscope
-	-p --pkginfo
-	-b --buildinfo
-	-m --makepkg-config
-	-u -U --unified
-	-y --side-by-side
-	--color
-	-W --width
-	-P --pool
-	-v --verbose
-	-h --help
-)
-_pkgctl_diff_args__makepkg_config_opts() { _filedir '*.conf'; }
-_pkgctl_diff_args_m_opts() { _pkgctl_diff_args__makepkg_config_opts; }
-_pkgctl_diff_args__width_opts() { :; }
-_pkgctl_diff_args_W_opts() { _pkgctl_diff_args__width_opts; }
-_pkgctl_diff_args__color_opts() { _devtools_completions_color; }
-_pkgctl_diff_args__pool_opts() { _filedir -d; }
-_pkgctl_diff_args_P_opts() { _pkgctl_diff_args__pool_opts; }
-_pkgctl_diff_opts() { _devtools_completions_all_packages; }
-
-_pkgctl_issue_cmds=(
-	close
-	comment
-	create
-	edit
-	list
-	move
-	reopen
-	view
-)
-
-_pkgctl_issue_args=(
-	-h --help
-)
-
-_pkgctl_issue_close_args=(
-	-p --package
-	-m --message
-	-e --edit
-	-r --resolution
-	-h --help
-)
-
-_pkgctl_issue_close_opts() { :; }
-_pkgctl_issue_close_args__package_opts() { _devtools_completions_all_packages; }
-_pkgctl_issue_close_args_p_opts() { _pkgctl_issue_close_args__package_opts; }
-_pkgctl_issue_close_args__message_opts() { :; }
-_pkgctl_issue_close_args_m_opts() { _pkgctl_issue_close_args__message_opts; }
-_pkgctl_issue_close_args__resolution_opts() { _devtools_completions_issue_resolution; }
-_pkgctl_issue_close_args_r_opts() { _pkgctl_issue_close_args__resolution_opts; }
-
-_pkgctl_issue_comment_args=(
-	-p --package
-	-m --message
-	-e --edit
-	-h --help
-)
-
-_pkgctl_issue_comment_opts() { :; }
-_pkgctl_issue_comment_args__package_opts() { _devtools_completions_all_packages; }
-_pkgctl_issue_comment_args_p_opts() { _pkgctl_issue_comment_args__package_opts; }
-_pkgctl_issue_comment_args__message_opts() { :; }
-_pkgctl_issue_comment_args_m_opts() { _pkgctl_issue_comment_args__message_opts; }
-
-_pkgctl_issue_create_args=(
-	-p --package
-	-t --title
-	-F --file
-	-e --edit
-	-w --web
-	--recover
-	--confidentiality
-	--priority
-	--scope
-	--severity
-	--status
-	-h --help
-)
-
-_pkgctl_issue_create_opts() { :; }
-_pkgctl_issue_create_args__package_opts() { _devtools_completions_all_packages; }
-_pkgctl_issue_create_args_p_opts() { _pkgctl_issue_create_args__package_opts; }
-_pkgctl_issue_create_args__title_opts() { :; }
-_pkgctl_issue_create_args_t_opts() { _pkgctl_issue_create_args__title_opts; }
-_pkgctl_issue_create_args__confidentiality_opts() { _devtools_completions_issue_confidentiality; }
-_pkgctl_issue_create_args__priority_opts() { _devtools_completions_issue_priority; }
-_pkgctl_issue_create_args__scope_opts() { _devtools_completions_issue_scope; }
-_pkgctl_issue_create_args__severity_opts() { _devtools_completions_issue_severity; }
-_pkgctl_issue_create_args__status_opts() { _devtools_completions_issue_status; }
-
-_pkgctl_issue_edit_args=(
-	-p --package
-	-t --title
-	-e --edit
-	--recover
-	--confidentiality
-	--priority
-	--resolution
-	--scope
-	--severity
-	--status
-	-h --help
-)
-
-_pkgctl_issue_edit_opts() { :; }
-_pkgctl_issue_edit_args__package_opts() { _devtools_completions_all_packages; }
-_pkgctl_issue_edit_args_p_opts() { _pkgctl_issue_edit_args__package_opts; }
-_pkgctl_issue_edit_args__title_opts() { :; }
-_pkgctl_issue_edit_args_t_opts() { _pkgctl_issue_edit_args__title_opts; }
-_pkgctl_issue_edit_args__confidentiality_opts() { _devtools_completions_issue_confidentiality; }
-_pkgctl_issue_edit_args__priority_opts() { _devtools_completions_issue_priority; }
-_pkgctl_issue_edit_args__resolution_opts() { _devtools_completions_issue_resolution; }
-_pkgctl_issue_edit_args__scope_opts() { _devtools_completions_issue_scope; }
-_pkgctl_issue_edit_args__severity_opts() { _devtools_completions_issue_severity; }
-_pkgctl_issue_edit_args__status_opts() { _devtools_completions_issue_status; }
-
-_pkgctl_issue_list_args=(
-	-g --group
-	-w --web
-	-A --all
-	-c --closed
-	-U --unconfirmed
-	--search
-	--in
-	-l --label
-	--confidentiality
-	--priority
-	--resolution
-	--scope
-	--severity
-	--status
-	--assignee
-	--assigned-to-me
-	--author
-	--created-by-me
-	-h --help
-)
-
-_pkgctl_issue_list_opts() { _devtools_completions_all_packages; }
-_pkgctl_issue_list_args__search_opts() { :; }
-_pkgctl_issue_list_args__in_opts() { _devtools_completions_issue_search_location; }
-_pkgctl_issue_list_args__label_opts() { :; }
-_pkgctl_issue_list_args_l_opts() { _pkgctl_issue_list_args__label_opts; }
-_pkgctl_issue_list_args__confidentiality_opts() { _devtools_completions_issue_confidentiality; }
-_pkgctl_issue_list_args__priority_opts() { _devtools_completions_issue_priority; }
-_pkgctl_issue_list_args__resolution_opts() { _devtools_completions_issue_resolution; }
-_pkgctl_issue_list_args__scope_opts() { _devtools_completions_issue_scope; }
-_pkgctl_issue_list_args__severity_opts() { _devtools_completions_issue_severity; }
-_pkgctl_issue_list_args__status_opts() { _devtools_completions_issue_status; }
-_pkgctl_issue_list_args__assignee_opts() { :; }
-_pkgctl_issue_list_args__author_opts() { :; }
-
-_pkgctl_issue_move_args=(
-	-p --package
-	-m --message
-	-e --edit
-	-h --help
-)
-
-_pkgctl_issue_move_opts() {
-	local subcommand args
-	subcommand=(repo switch)
-	args=$(__pkgctl_word_count_after_subcommand "${subcommand[@]}")
-
-	if (( args == 0 )); then
-		:
-	elif (( args >= 1 )); then
-		_devtools_completions_all_packages
-	fi
-}
-_pkgctl_issue_move_args__package_opts() { _devtools_completions_all_packages; }
-_pkgctl_issue_move_args_p_opts() { _pkgctl_issue_move_args__package_opts; }
-_pkgctl_issue_move_args__message_opts() { :; }
-_pkgctl_issue_move_args_m_opts() { _pkgctl_issue_move_args__message_opts; }
-
-_pkgctl_issue_reopen_args=(
-	-p --package
-	-m --message
-	-e --edit
-	-h --help
-)
-
-_pkgctl_issue_reopen_opts() { :; }
-_pkgctl_issue_reopen_args__package_opts() { _devtools_completions_all_packages; }
-_pkgctl_issue_reopen_args_p_opts() { _pkgctl_issue_reopen_args__package_opts; }
-_pkgctl_issue_reopen_args__message_opts() { :; }
-_pkgctl_issue_reopen_args_m_opts() { _pkgctl_issue_reopen_args__message_opts; }
-
-_pkgctl_issue_view_args=(
-	-p --package
-	-c --comments
-	-w --web
-	-h --help
-)
-
-_pkgctl_issue_view_opts() { :; }
-_pkgctl_issue_view_args__package_opts() { _devtools_completions_all_packages; }
-_pkgctl_issue_view_args_p_opts() { _pkgctl_issue_view_args__package_opts; }
-
-
-_pkgctl_version_args=(
-	-h --help
-)
-
-
-_devtools_completions_color() {
-	mapfile -t COMPREPLY < <(compgen -W "${_colors[*]}" -- "$cur")
-}
-_devtools_completions_arch() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ARCHES[*]}" -- "$cur")
-}
-_devtools_completions_binary_arch() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_BINARY_ARCHES[*]}" -- "$cur")
-}
-_devtools_completions_repo() {
-	local optional=${1:-}
-	mapfile -t COMPREPLY < <(compgen -W "${optional} ${DEVTOOLS_VALID_REPOS[*]}" -- "$cur")
-}
-_devtools_completions_build_repo() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_BUILDREPOS[*]}" -- "$cur")
-}
-_devtools_completions_all_packages() {
-	mapfile -t COMPREPLY < <(compgen -W "$(pacman -Sql)" -- "$cur")
-}
-_devtools_completions_protocol() {
-	mapfile -t COMPREPLY < <(compgen -W "https" -- "$cur")
-}
-_devtools_completions_inspect() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_INSPECT_MODES[*]}" -- "$cur")
-}
-_devtools_completions_search_format() {
-	mapfile -t COMPREPLY < <(compgen -W "${valid_search_output_format[*]}" -- "$cur")
-}
-_devtools_completions_version_output_format() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_VERSION_OUTPUT_FORMAT[*]}" -- "$cur")
-}
-_devtools_completions_issue_severity() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ISSUE_SEVERITY[*]}" -- "$cur")
-}
-_devtools_completions_issue_status() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ISSUE_STATUS[*]}" -- "$cur")
-}
-_devtools_completions_issue_scope() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ISSUE_SCOPE[*]}" -- "$cur")
-}
-_devtools_completions_issue_search_location() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ISSUE_SEARCH_LOCATION[*]}" -- "$cur")
-}
-_devtools_completions_issue_resolution() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ISSUE_RESOLUTION[*]}" -- "$cur")
-}
-_devtools_completions_issue_priority() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ISSUE_PRIORITY[*]}" -- "$cur")
-}
-_devtools_completions_issue_confidentiality() {
-	mapfile -t COMPREPLY < <(compgen -W "${DEVTOOLS_VALID_ISSUE_CONFIDENTIALITY[*]}" -- "$cur")
-}
-
-__devtools_complete() {
-	local service=$1
-	local cur prev
-
-	# Don't break words at : and =
-	COMP_WORDBREAKS=${COMP_WORDBREAKS//[:=]}
-
-	cur=$(_get_cword)
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-
-	__pkgctl_handle_subcommands "${service}"
-	return 0
-}
-
-__pkgctl_has_func() {
-	declare -f -- "${1}" &>/dev/null
-}
-
-__pkgctl_has_array() {
-	declare -p -- "${1}" &>/dev/null
-}
-
-__pkgctl_is_subcommand() {
-	__pkgctl_has_array "${1}"_args || \
-		__pkgctl_has_array "${1}"_cmds
-}
-
-__pkgctl_words_after_subcommand() {
-	local subcommand=("$@")
-	local subcommand_idx=0
-	local word prev_word
-	for ((i = 1; i < ${#COMP_WORDS[@]}; ++i)); do
-		word=${COMP_WORDS[i]}
-		prev_word=${COMP_WORDS[i-1]}
-		# skip options and the current typing
-		if [[ ${word} == -* ]] || [[ ${word} == "${cur}" ]]; then
-			continue
-		fi
-		# skip until we resolved the passed subcommand
-		if (( subcommand_idx < ${#subcommand[@]} )); then
-			if [[ $word == "${subcommand[$subcommand_idx]}" ]]; then
-				subcommand_idx=$(( subcommand_idx + 1 ))
-			fi
-			continue
-		fi
-		# skip previous options as they belong to the argument
-		if [[ ${prev_word} == -* ]] && __pkgctl_has_func "${service_name}_args${prev_word//-/_}_opts"; then
-			continue
-		fi
-		printf "%s\n" "${word}"
-	done
-}
-__pkgctl_word_count_after_subcommand() {
-	local subcommand=("$@")
-	mapfile -t words < <(__pkgctl_words_after_subcommand "${subcommand[@]}")
-	echo "${#words[@]}"
-}
-
-__pkgctl_handle_subcommands() {
-	local service_name=${1}
-	local index=${2:-0}
-	local word ref
-
-	# recurse into nested subcommands
-	for ((i = index + 1; i < ${#COMP_WORDS[@]}; ++i)); do
-		word=${COMP_WORDS[i]}
-		if [[ ${word} == -* ]] || [[ ${word} == "${cur}" ]]; then
-			continue
-		fi
-		if __pkgctl_is_subcommand "${service_name}_${word}"; then
-			__pkgctl_handle_subcommands "${service_name}_${word}" "${i}"
-			return
-		fi
-	done
-
-	# dynamic argument options
-	if [[ $prev == -* ]] && word=${prev//-/_} && __pkgctl_has_func "${service_name}_args${word}_opts"; then
-		"${service_name}_args${word}_opts"
-	# dynamic subcommand options
-	elif [[ $cur != -* ]] && __pkgctl_has_func "${service_name}_opts"; then
-		"${service_name}_opts"
-	# subcommand argument array
-	elif ( ! __pkgctl_has_array "${service_name}"_cmds || [[ $cur == -* ]] ) && __pkgctl_has_array "${service_name}_args"; then
-		declare -n ref="${service_name}_args"
-		mapfile -t COMPREPLY < <(compgen -W "${ref[*]}" -- "$cur")
-	# subcommand array
-	elif __pkgctl_has_array "${service_name}"_cmds; then
-		declare -n ref="${service_name}_cmds"
-		mapfile -t COMPREPLY < <(compgen -W "${ref[*]}" -- "$cur")
-	fi
-}
-
-
-_pkgctl() { __devtools_complete _pkgctl; }
-complete -F _pkgctl pkgctl
-# ex:noet ts=4 sw=4 ft=sh
+_arch-nspawn() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur
+
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-C -M -c -h' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac
+
+  true
+} &&
+complete -F _arch-nspawn arch-nspawn
+# ex:et ts=2 sw=2 ft=sh

contrib/completion/zsh/_devtools.in

@@ -1,24 +1,11 @@
-#compdef archbuild arch-nspawn archrelease commitpkg pkgctl diffpkg finddeps makechrootpkg mkarchroot extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild checkpkg sogrep offload-build makerepropkg
+#compdef archbuild archco arch-nspawn archrelease commitpkg diffpkg finddeps makechrootpkg mkarchroot rebuildpkgs extrapkg=commitpkg corepkg=commitpkg testingpkg=commitpkg stagingpkg=commitpkg communitypkg=commitpkg community-testingpkg=commitpkg community-stagingpkg=commitpkg multilibpkg=commitpkg multilib-testingpkg=commitpkg extra-x86_64-build=archbuild testing-x86_64-build=archbuild staging-x86_64-build=archbuild multilib-build=archbuild multilib-testing-build=archbuild multilib-staging-build=archbuild kde-unstable-x86_64-build=archbuild gnome-unstable-x86_64-build=archbuild communityco=archco checkpkg sogrep offload-build makerepropkg
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/valid-build-install.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-build-install.sh
-# shellcheck source=src/lib/valid-tags.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
-# shellcheck source=src/lib/valid-repos.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
-# shellcheck source=src/lib/valid-inspect.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-inspect.sh
-# shellcheck source=src/lib/valid-search.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-search.sh
-# shellcheck source=src/lib/valid-version.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-version.sh
-# shellcheck source=src/lib/valid-issue.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-issue.sh
+m4_include(lib/valid-tags.sh)
+m4_include(lib/valid-repos.sh)
 
-_colors=(never always auto)
+_binary_arch=${_arch[*]:0:-1}
 
 _archbuild_args=(
 	'-c[Recreate the chroot before building]'
@@ -27,268 +14,15 @@ _archbuild_args=(
 	'--[Introduce makechrootpkg options]:*::makechrootpkg options:=  _dispatch makechrootpkg makechrootpkg'
 )
 
-_pkgctl_auth_cmds=(
-	"pkgctl auth command"
-	"login[Authenticate with the GitLab instance]"
-	"status[View authentication status]"
-)
-
-_pkgctl_auth_login_args=(
-	'(-g --gen-access-token)'{-g,--gen-access-token}'[Open the URL to generate a new personal access token]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_auth_status_args=(
-	'(-t --show-token)'{-t,--show-token}'[Display the auth token]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_build_args=(
-	"--arch[Specify architectures to build for (disables auto-detection)]:arch:($DEVTOOLS_VALID_BINARY_ARCHES[*])"
-	"--repo[Specify a target repository (disables auto-detection)]:repo:($DEVTOOLS_VALID_REPOS[*])"
-	'(-s --staging)'{-s,--staging}'[Build against the staging counterpart of the auto-detected repo]'
-	'(-t --testing)'{-t,--testing}'[Build against the testing counterpart of the auto-detected repo]'
-	'(-o --offload)'{-o,--offload}'[Build on a remote server and transfer artifacts afterwards]'
-	'(-c --clean)'{-c,--clean}'[Recreate the chroot before building]'
-	"--inspect[Spawn an interactive shell to inspect the chroot (never, always, failure)]:inspect:($DEVTOOLS_VALID_INSPECT_MODES[*])"
-	'*'{-I,--install-to-chroot}'[Install a package to the working copy of the chroot]:target:_files -g "*.pkg.tar.*(.)"'
-	'*'{-i,--install-to-host}"[Install the built packages to the host system]:mode:($DEVTOOLS_VALID_BUILD_INSTALL[*])"
-	'(-w --worker)'{-w,--worker}'[Name of the worker slot, useful for concurrent builds (disables auto-detection)]:slot:'
-	'--nocheck[Do not run the check() function in the PKGBUILD]'
-	'--pkgver=[Set pkgver, reset pkgrel and update checksums]:pkgver:'
-	'--pkgrel=[Set pkgrel to a given value]:pkgrel:'
-	'--rebuild[Increment the pkgrel variable]'
-	'--update-checksums[Force computation and update of the checksums (disables auto-detection)]'
-	'(-e --edit)'{-e,--edit}'[Edit the PKGBUILD before building]'
-	'(-r --release)'{-r,--release}'[Automatically commit, tag and release after building]'
-	'(-m --message)'{-m,--message}"[Use the given <msg> as the commit message]:message:"
-	'(-u --db-update)'{-u,--db-update}'[Automatically update the pacman database as last action]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_db_cmds=(
-	"pkgctl db command"
-	"move[Move packages between pacman repositories]"
-	"remove[Remove packages from pacman repositories]"
-	"update[Update the pacman database as final release step]"
-)
-
-_pkgctl_db_move_args=(
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:src-repo:($DEVTOOLS_VALID_REPOS[*])"
-	"2:target-repo:($DEVTOOLS_VALID_REPOS[*])"
-	'*:pkgbase:_devtools_completions_all_packages'
-)
-
-_pkgctl_db_remove_args=(
-	'--partial[Remove only partial pkgnames from a split package]'
-	'--noconfirm[Bypass any confirmation messages, should only be used with caution]'
-	'(-a --arch)'{-a,--arch}"[Override the architecture (disables auto-detection)]:arch:($DEVTOOLS_VALID_BINARY_ARCHES[*])"
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:repo:($DEVTOOLS_VALID_REPOS[*])"
-	'*:pkgbase:_devtools_completions_all_packages'
-)
-
-_pkgctl_db_update_args=(
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_issue_cmds=(
-	"pkgctl issue command"
-	"close[Close an issue]"
-	"comment[Comment on an issue]"
-	"create[Create a new issue]"
-	"edit[Edit and modify an issue]"
-	"list[List project or group issues]"
-	"move[Move an issue to another project]"
-	"reopen[Reopen a closed issue]"
-	"view[Display information about an issue]"
-)
-
-_pkgctl_issue_close_args=(
-	'(-p --package)'{-p,--package}'[Interact with <pkgbase> instead of the current directory]:pkgbase:_devtools_completions_all_packages'
-	'(-m --message)'{-m,--message}'[Use the provided message as the comment]:message:'
-	'(-e --edit)'{-e,--edit}'[Edit the comment using an editor]'
-	'(-r --resolution)'{-r,--resolution}"[Set a specific resolution label]:resolution:($DEVTOOLS_VALID_ISSUE_RESOLUTION[*])"
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:issue_iid:"
-)
-
-_pkgctl_issue_comment_args=(
-	'(-p --package)'{-p,--package}'[Interact with <pkgbase> instead of the current directory]:pkgbase:_devtools_completions_all_packages'
-	'(-m --message)'{-m,--message}'[Use the provided message as the comment]:message:'
-	'(-e --edit)'{-e,--edit}'[Edit the comment using an editor]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:issue_iid:"
-)
-
-_pkgctl_issue_create_args=(
-	'(-p --package)'{-p,--package}'[Interact with <pkgbase> instead of the current directory]:pkgbase:_devtools_completions_all_packages'
-	'(-t --title)'{-t,--title}'[Use the provided title for the issue]:title:'
-	'(-F --file)'{-F,--file}'[Take issue description from <file>]:file:_files'
-	'(-e --edit)'{-e,--edit}'[Edit the issue title and description using an editor]'
-	'(-w --web)'{-w,--web}'[Continue issue creation with the web interface]'
-	"--recover[Automatically recover from a failed run]"
-	"--confidentiality[Set the issue confidentiality]:confidential:($DEVTOOLS_VALID_ISSUE_CONFIDENTIALITY[*])"
-	"--priority[Set the priority label]:priority:($DEVTOOLS_VALID_ISSUE_PRIORITY[*])"
-	"--scope[Set the scope label]:scope:($DEVTOOLS_VALID_ISSUE_SCOPE[*])"
-	"--severity[Set the severity label]:severity:($DEVTOOLS_VALID_ISSUE_SEVERITY[*])"
-	"--status[Set the status label]:status:($DEVTOOLS_VALID_ISSUE_STATUS[*])"
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_issue_edit_args=(
-	'(-p --package)'{-p,--package}'[Interact with <pkgbase> instead of the current directory]:pkgbase:_devtools_completions_all_packages'
-	'(-t --title)'{-t,--title}'[Use the provided title for the issue]:title:'
-	'(-e --edit)'{-e,--edit}'[Edit the issue title and description using an editor]'
-	"--recover[Automatically recover from a failed run]"
-	"--confidentiality[Set the issue confidentiality]:confidential:($DEVTOOLS_VALID_ISSUE_CONFIDENTIALITY[*])"
-	"--priority[Set the priority label]:priority:($DEVTOOLS_VALID_ISSUE_PRIORITY[*])"
-	"--resolution[Set the resolution label]:resolution:($DEVTOOLS_VALID_ISSUE_RESOLUTION[*])"
-	"--scope[Set the scope label]:scope:($DEVTOOLS_VALID_ISSUE_SCOPE[*])"
-	"--severity[Set the severity label]:severity:($DEVTOOLS_VALID_ISSUE_SEVERITY[*])"
-	"--status[Set the status label]:status:($DEVTOOLS_VALID_ISSUE_STATUS[*])"
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:issue_iid:"
-)
-
-_pkgctl_issue_list_args=(
-	'(-g --group)'{-g,--group}'[Get issues from the whole packaging subgroup]'
-	'(-w --web)'{-w,--web}'[View results in a browser]'
-	'(-A --all)'{-A,--all}'[Get all issues including closed]'
-	'(-c --closed)'{-c,--closed}'[Get only closed issues]'
-	'(-U --unconfirmed)'{-U,--unconfirmed}'[Shorthand to filter by unconfirmed status label]'
-	'--search[Search in the fields defined by --in]:search:'
-	"--in[Search in title or description]:location:($DEVTOOLS_VALID_ISSUE_SEARCH_LOCATION[*])"
-	"--confidentiality[Filter by confidentiality]:confidential:($DEVTOOLS_VALID_ISSUE_CONFIDENTIALITY[*])"
-	"--priority[Shorthand to filter by priority label]:priority:($DEVTOOLS_VALID_ISSUE_PRIORITY[*])"
-	"--resolution[Shorthand to filter by resolution label]:resolution:($DEVTOOLS_VALID_ISSUE_RESOLUTION[*])"
-	"--scope[Shorthand to filter by scope label]:scope:($DEVTOOLS_VALID_ISSUE_SCOPE[*])"
-	"--severity[Shorthand to filter by severity label]:severity:($DEVTOOLS_VALID_ISSUE_SEVERITY[*])"
-	"--status[Shorthand to filter by status label]:status:($DEVTOOLS_VALID_ISSUE_STATUS[*])"
-	'--assignee[Filter issues assigned to the given username]:username:'
-	'--assigned-to-me[Shorthand to filter issues assigned to you]'
-	'--author[Filter issues authored by the given username]:username:'
-	'--created-by-me[Shorthand to filter issues created by you]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:pkgbase:_devtools_completions_all_packages'
-)
-
-_pkgctl_issue_move_args=(
-	'(-p --package)'{-p,--package}'[Interact with <pkgbase> instead of the current directory]:pkgbase:_devtools_completions_all_packages'
-	'(-m --message)'{-m,--message}'[Use the provided message as the comment]:message:'
-	'(-e --edit)'{-e,--edit}'[Edit the comment using an editor]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:issue_iid:"
-	'1:pkgbase:_devtools_completions_all_packages'
-)
-
-_pkgctl_issue_reopen_args=(
-	'(-p --package)'{-p,--package}'[Interact with <pkgbase> instead of the current directory]:pkgbase:_devtools_completions_all_packages'
-	'(-m --message)'{-m,--message}'[Use the provided message as the comment]:message:'
-	'(-e --edit)'{-e,--edit}'[Edit the comment using an editor]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:issue_iid:"
-)
-
-_pkgctl_issue_view_args=(
-	'(-p --package)'{-p,--package}'[Interact with <pkgbase> instead of the current directory]:pkgbase:_devtools_completions_all_packages'
-	'(-c --comments)'{-c,--comments}'[Show issue comments and activities]'
-	'(-w --web)'{-w,--web}'[View results in a browser]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:issue_iid:"
-)
-
-_pkgctl_release_args=(
-	'(-m --message)'{-m,--message}"[Use the given <msg> as the commit message]:message:"
-	'(-r --repo)'{-r,--repo}"[Specify a target repository for new packages]:repo:($DEVTOOLS_VALID_REPOS[*])"
-	'(-s --staging)'{-s,--staging}'[Release to the staging counterpart of the auto-detected repo]'
-	'(-t --testing)'{-t,--testing}'[Release to the testing counterpart of the auto-detected repo]'
-	'(-u --db-update)'{-u,--db-update}'[Automatically update the pacman database after uploading]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_aur_cmds=(
-	"pkgctl aur command"
-	"drop-from-repo[Drop a package from the official repository to the AUR]"
-)
-
-_pkgctl_aur_drop_from_repo_args=(
-	'(-f --force)'{-f,--force}'[Force push to the AUR overwriting the remote repository]'
-	'--no-disown[Do not disown the package on the AUR]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_repo_cmds=(
-	"pkgctl repo command"
-	"clean[Remove untracked files from the working tree]"
-	"clone[Clone a package repository]"
-	"configure[Configure a clone according to distro specs]"
-	"create[Create a new GitLab package repository]"
-	"switch[Switch a package repository to a specified version]"
-	"web[Open the packaging repository's website]"
-)
-
-_pkgctl_repo_switch_args=(
-	'(-f --force --discard-changes)'{-f,--force,--discard-changes}'[Discard changes if index or working tree is dirty]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'1:version'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_repo_clean_args=(
-	'(-i --interactive)'{-i,--interactive}'[Show what would be done and clean files interactively]'
-	'(-n --dry-run)'{-n,--dry-run}"[Don't remove anything, just show what would be done]"
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_repo_clone_args=(
-	'(-m --maintainer=)'{-m,--maintainer=}'[Clone all packages of the named maintainer]:maintainer:'
-	'--protocol[Clone the repository over https]:proto:(https)'
-	'--switch=[Switch the current working tree to a specified version]'
-	'--universe[Clone all existing packages, useful for cache warming]'
-	'(-j --jobs)'{-j,--jobs}'[Run up to N jobs in parallel (default: number of processing units)]:jobs:'
-	'(-h --help)'{-h,--help}'[Display usage]'
+_archco_args=(
 	'*:packages:_devtools_completions_all_packages'
 )
 
-_pkgctl_repo_configure_args=(
-	'--protocol[Configure remote url to use https]:proto:(https)'
-	'(-j --jobs)'{-j,--jobs}'[Run up to N jobs in parallel (default: number of processing units)]:jobs:'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_repo_create_args=(
-	'(-c --clone)'{-c,--clone}'[Clone the Git repository after creation]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'1:pkgbase'
-)
-
-_pkgctl_repo_web_args=(
-	'--print[Print the url instead of opening it with xdg-open]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_search_args=(
-	'--no-default-filter[Do not apply default filter (like -path:keys/pgp/*.asc)]'
-	'--json[Enable printing results in JSON]'
-	'(-F --format)'{-F,--format}"[Controls the formatting of the results]:format:($valid_search_output_format[*])"
-	'(-N --no-line-number)'{-N,--no-line-number}"[Don't show line numbers when formatting results]"
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'1:query'
-)
-
 _arch_nspawn_args=(
 	'-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"'
 	'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
-	'*-c[Set pacman cache]:pacman_cache:_files -/'
-	'*-f[Copy file from the host to the chroot]:copy_file:_files'
+	'-c[Set pacman cache]:pacman_cache:_files -/'
+	'-f[Copy file from the host to the chroot]:copy_file:_files'
 	'-s[Do not run setarch]'
 	'-h[Display usage]'
 	'1:chroot_dir:_files -/'
@@ -296,14 +30,14 @@ _arch_nspawn_args=(
 
 _archrelease_args=(
 	'-f[Force release without checks]'
-	"*:arch:($DEVTOOLS_VALID_TAGS[*])"
+	"*:arch:($_tags[*])"
 )
 
 _commitpkg_args=(
 	'-f[Force release without checks]'
 	'-s[Target repo server]'
 	'-l[Set bandwidth limit]:limit'
-	"-a[Release to a specific architecture only]:arch:($DEVTOOLS_VALID_ARCHES[*])"
+	"-a[Release to a specific architecture only]:arch:($_arch[*])"
 	'1:commit_msg'
 )
 
@@ -313,11 +47,6 @@ _diffpkg_args=(
 	'(-p --pkginfo)'{-p,--pkginfo}'[.PKGINFO diff mode]'
 	'(-b --buildinfo)'{-b,--buildinfo}'[.BUILDINFO diff mode]'
 	'(-m --makepkg-config)'{-m,--makepkg-config}'[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
-	'(-u -U --unified)'{-u,-U,--unified}'[Output 3 lines of unified context]'
-	'(-y --side-by-side)'{-y,--side-by-side}'[Output in two columns]'
-	'--color=[Color output]:when:($_colors[*])'
-	'(-W --width=)'{-W,--width=}'[Output at most NUM print columns]:num:(auto columns)'
-	'(-P --pool=)'{-P,--pool=}'[pool directory]:dir:_files -/'
 	'(-v --verbose)'{-v,--verbose}'[Provide more detailed/unfiltered output]'
 	'(-h --help)'{-h,--help}'[Display usage]'
 	'*:packages:_devtools_completions_all_packages'
@@ -330,17 +59,15 @@ _finddeps_args=(
 _makechrootpkg_args=(
 	'-h[Display usage]'
 	'-c[Clean the chroot before building]'
-	'*-d[Bind directory into build chroot as read-write]:bind_dir_rw:_files -/'
-	'*-D[Bind directory into build chroot as read-only]:bind_dir_ro:_files -/'
-	'*-t[Mount a tmpfs at directory]:tmpfs_dir:_files -/'
+	'-d[Bind directory into build chroot as read-write]:bind_dir_rw:_files -/'
+	'-D[Bind directory into build chroot as read-only]:bind_dir_ro:_files -/'
 	'-u[Update the working copy of the chroot before building]'
 	'-r[The chroot dir to use]:chroot_dir:_files -/'
-	'*-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
+	'-I[Install a package into the working copy]:target:_files -g "*.pkg.tar.*(.)"'
 	'-l[The directory to use as the working copy]:copy_dir:_files -/'
 	'-n[Run namcap on the package]'
 	'-T[Build in a temporary directory]'
 	'-U[Run makepkg as a specified user]:makepkg_user'
-	"-x[Spawn an interactive shell to inspect the chroot (never, always, failure)]:inspect:($DEVTOOLS_VALID_INSPECT_MODES[*])"
 )
 
 _mkarchroot_args=(
@@ -348,12 +75,16 @@ _mkarchroot_args=(
 	'-C[Location of a pacman config file]:pacman_config:_files -g "*.conf(.)"'
 	'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
 	'-c[Set pacman cache]:pacman_cache:_files -/'
-	'-f[Copy src file from the host to the chroot]:target:_files -/'
 	'-h[Display usage]'
 	'1:working_dir:_files -/'
 	'*:packages:_devtools_completions_all_packages'
 )
 
+_rebuildpkgs_args=(
+	'1:chroot_dir:_files -/'
+	'*:packages:_devtools_completions_all_packages'
+)
+
 _checkpkg_args=(
 	'(-r --rmdir)'{-r,--rmdir}'[Remove the temporary directory]'
 	'(-w --warn)'{-w,--warn}'[Print a warning in case of differences]'
@@ -365,20 +96,19 @@ _sogrep_args=(
 	'(-v --verbose)'{-v,--verbose}'[Show matched links in addition to pkgname]'
 	'(-r --refresh)'{-r,--refresh}'[Refresh the links databases]'
 	'(-h --help)'{-h,--help}'[Display usage]'
-	'1:repo:(all $DEVTOOLS_VALID_REPOS[*])'
+	'1:repo:(all $_repos[*])'
 	'2:libname'
 )
 
 _offload_build_args=(
-	'(-r --repo)'{-r,--repo}'[Build against a specific repository]:repo:($DEVTOOLS_VALID_BUILDREPOS[*])'
-	'(-a --arch)'{-a,--arch}'[Build against a specific architecture]:arch:(${DEVTOOLS_VALID_BINARY_ARCHES[*]})'
+	'(-r --repo)'{-r,--repo}'[Build against a specific repository]:repo:($_build_repos[*])'
+	'(-a --arch)'{-a,--arch}'[Build against a specific architecture]:arch:(${_binary_arch[*]})'
 	'(-s --server)'{-s,--server}'[Offload to a specific Build server]:server:'
 	'(-h --help)'{-h,--help}'[Display usage]'
 )
 
 _makerepropkg_args=(
 	'-d[Run diffoscope if the package is unreproducible]'
-	'-n[Do not run the check() function in the PKGBUILD]'
 	'-c[Set pacman cache]:pacman_cache:_files -/'
 	'-M[Location of a makepkg config file]:makepkg_config:_files -g "*.conf(.)"'
 	'-h[Display usage]'
@@ -391,112 +121,9 @@ _devtools_completions_all_packages() {
 	compadd - "${(@)packages}"
 }
 
-_pkgctl_cmds=(
-	"pkgctl command"
-	"aur[Interact with the Arch User Repository (AUR)]"
-	"auth[Authenticate with services like GitLab]"
-	"build[Build packages inside a clean chroot]"
-	"db[Pacman database modification for package update, move etc]"
-	"diff[Compare package files using different modes]"
-	"issue[Work with GitLab packaging issues]"
-	"license[Check and manage package license compliance]"
-	"release[Release step to commit, tag and upload build artifacts]"
-	"repo[Manage Git packaging repositories and their configuration]"
-	"search[Search for an expression across the GitLab packaging group]"
-	"version[Check and manage package versions against upstream]"
-)
-
-_pkgctl_args=(
-	'(-V --version)'{-V,--version}'[Show pkgctl version information]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_license_cmds=(
-	"pkgctl license command"
-	"check[Checks package licensing compliance using REUSE]"
-	"setup[Automatically detect and setup a basic REUSE config]"
-)
-
-_pkgctl_license_check_args=(
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_license_setup_args=(
-	'(-f --force)'{-f,--force}'[Overwrite existing REUSE config]'
-	'--no-check[Do not run license check after setup]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_version_cmds=(
-	"pkgctl version command"
-	"check[Compares local package versions against upstream versions]"
-	"setup[Automatically detect and setup a basic nvchecker config]"
-	"upgrade[Adjust the PKGBUILD to match the latest upstream version]"
-)
-
-_pkgctl_version_check_args=(
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'(-v --verbose)'{-v,--verbose}'[Display all results including up-to-date versions]'
-	'--json[Enable printing results in JSON]'
-	'(-F --format)'{-F,--format}"[Controls the output format of the results]:format:($DEVTOOLS_VALID_VERSION_OUTPUT_FORMAT[*])"
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_version_setup_args=(
-	'(-f --force)'{-f,--force}'[Do not prompt before overwriting]'
-	'--prefer-platform-api[Prefer platform specific GitHub/GitLab API for complex cases]'
-	'--url[Derive check target from URL instead of source array]:url:'
-	'--no-check[Do not run version check after setup]'
-	'--no-upstream[Setup a blank config for packages without upstream sources]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_version_upgrade_args=(
-	'--no-update-checksums[Disable computation and update of the checksums]'
-	'(-v --verbose)'{-v,--verbose}'[Display results including up-to-date versions]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
-_pkgctl_diff_args=("${_diffpkg_args[@]}")
-
-_handle_subcommands() {
-	local service_name=${1}
-	if typeset -p ${service_name}_cmds &> /dev/null; then
-		_arguments -C \
-			"1: :->cmds" \
-			'*::arg:->args'
-		case $state in
-			cmds)
-				if [[ "${line[-1]}" == -* ]] && typeset -p ${service_name}_args &> /dev/null; then
-					local argname="${service_name}_args[@]"
-					_arguments -s "${(P)argname}"
-				else
-					local service_cmds=${service_name}_cmds[@]
-					_values "${(P)service_cmds}"
-				fi
-				;;
-			args)
-				local service_sub=${service_name}_${line[1]//-/_}
-				if typeset -p ${service_sub}_args &> /dev/null; then
-					local cmd_args=${service_sub}_args[@]
-					_arguments -s "${(P)cmd_args}"
-				elif typeset -p ${service_sub}_cmds &> /dev/null; then
-					_handle_subcommands "${service_sub}"
-				fi
-				;;
-		esac
-	elif typeset -p ${service_name}_args &> /dev/null; then
-		local argname="${service_name}_args[@]"
-		_arguments -s "${(P)argname}"
-	fi
-}
-
 _devtools() {
-	_handle_subcommands _${service//-/_}
+	local argname="_${service//-/_}_args[@]"
+	_arguments -s "${(P)argname}"
 }
 
 _devtools

data/LICENSE

@@ -1,12 +0,0 @@
-Copyright Arch Linux Contributors
-
-Permission to use, copy, modify, and/or distribute this software for
-any purpose with or without fee is hereby granted.
-
-THE SOFTWARE IS PROVIDED “AS IS” AND THE AUTHOR DISCLAIMS ALL
-WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES
-OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE
-FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY
-DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
-AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT
-OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

doc/asciidoc.conf

@@ -0,0 +1,37 @@
+## linkman: macro
+# Inspired by/borrowed from the GIT source tree at Documentation/asciidoc.conf
+#
+# Usage: linkman:command[manpage-section]
+#
+# Note, {0} is the manpage section, while {target} is the command.
+#
+# Show man link as: <command>(<section>); if section is defined, else just show
+# the command.
+
+[macros]
+(?su)[\\]?(?P<name>linkman):(?P<target>\S*?)\[(?P<attrlist>.*?)\]=
+
+[attributes]
+asterisk=&#42;
+plus=&#43;
+caret=&#94;
+startsb=&#91;
+endsb=&#93;
+backslash=&#92;
+tilde=&#126;
+apostrophe=&#39;
+backtick=&#96;
+litdd=&#45;&#45;
+
+ifdef::backend-docbook[]
+[linkman-inlinemacro]
+{0%{target}}
+{0#<citerefentry>}
+{0#<refentrytitle>{target}</refentrytitle><manvolnum>{0}</manvolnum>}
+{0#</citerefentry>}
+endif::backend-docbook[]
+
+ifdef::backend-xhtml11[]
+[linkman-inlinemacro]
+<a href="{target}.{0}.html">{target}{0?({0})}</a>
+endif::backend-xhtml11[]

doc/man/arch-nspawn.1.asciidoc

@@ -23,15 +23,13 @@ Options
 	Location of a pacman config file
 
 *-M* <file>::
-	Location of a makepkg config file. Specific additions (e.g. build flags for
-	additional languages) can be placed in '<file>.d/*.conf'.
+	Location of a makepkg config file
 
 *-c* <dir>::
 	Set pacman cache, if no directory is specified the passed pacman.conf's cachedir is used with a fallback to '/etc/pacman.conf'
 
-*-f* <src>[:<dst>]::
-	Copy file from the host to the chroot.
-	If 'dst' is not provided, it defaults to 'src' inside of the chroot.
+*-f* <file>::
+	Copy file from the host to the chroot
 
 *-s*::
 	Do not run setarch

doc/man/archbuild.1.asciidoc

@@ -23,9 +23,8 @@ Description
 * staging-x86_64-build
 * testing-x86_64-build
 
-The symlink used to run it will be inspected by archbuild, to determine which target you want it to use. It will load the available pacman configuration from 'reponame-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/pacman.conf.d. The makepkg configuration is loaded from 'repo-arch.conf' with a fallback to 'reponame.conf' from {pkgdatadir}/makepkg.conf.d.
+The symlink used to run it will be inspected by archbuild, to determine which target you want it to use. It will load the available pacman configuration from 'pacman-reponame-arch.conf' with a fallback to 'pacman-reponame.conf' from {pkgdatadir}. The makepkg configuration is loaded from 'makepkg-repo-arch.conf' with a fallback to 'makepkg-reponame.conf' from {pkgdatadir}.
 
-It will also load the bind mount configuration from 'mount.d/arch' in {pkgdatadir}. The file format is that each line starting with ro and rw will be used, other lines will be ignored, and the rest of the used line is out/path:in/path preceded by a space as a separator. ro means it is a read-only mount, rw means a read-write mount.
 
 Options
 -------
@@ -43,6 +42,6 @@ Options
 See Also
 --------
 
-devtools(7)
+linkman:devtools[7]
 
 include::include/footer.asciidoc[]

doc/man/checkpkg.1.asciidoc

@@ -38,6 +38,6 @@ Options
 See Also
 --------
 
-find-libprovides(1)
+linkman:find-libprovides[1]
 
 include::include/footer.asciidoc[]

doc/man/devtools.7.asciidoc

@@ -8,60 +8,48 @@ devtools - Developer tools for the Arch Linux distribution
 Description
 -----------
 
-Devtools contains tools for package maintenance in Arch Linux. It comes with a
-unified command-line frontend called 'pkgctl' that aids to conveniently
-interact with all the different tools this collection provides.
-
-The toolset varies from tools for building packages in a clean chroot
-('mkarchroot', 'archbuild', ...), packaging related tools ('sogrep', 'diffpkg',
-'lddd') and tools for repository management such as ('pkgrepo').
+Devtools contains tools for package maintenance in Arch Linux. The toolset
+varies from tools for building packages in a clean chroot ('mkarchroot',...),
+packaging related tools for sonames ('sogrep', 'lddd') and tools for
+repository management such as ('archco', 'extra2community')
 
 Programs
 --------
 The list below gives a short overview; see the respective documentation
 for details.
 
-pkgctl(1)
-	Unified command-line frontend for devtools
-
-archbuild(1)
+linkman:archbuild[1]
 	Build an Arch Linux package inside a clean chroot
 
-arch-nspawn(1)
+linkman:arch-nspawn[1]
 	Run a command or OS in a light-weight namespace container
 
-checkpkg(1)
+linkman:checkpkg[1]
 	Compare the current build package with the repository version
 
-diffpkg(1)
-	Compare package files using different modes
-
-export-pkgbuild-keys(1)
-	Export valid source signing keys from a PKGBUILD
-
-find-libdeps(1)
+linkman:find-libdeps[1]
 	Find soname dependencies for a package
 
-find-libprovides(1)
+linkman:find-libprovides[1]
 	Find soname's which are provided by a package
 
-lddd(1)
+linkman:lddd[1]
 	Find broken library links on your system
 
-mkarchroot(1)
+linkman:mkarchroot[1]
 	Creates an arch chroot in a specified location with a specified set of
 	packages
 
-makechrootpkg(1)
+linkman:makechrootpkg[1]
 	Build a PKGBUILD in a given chroot environment
 
-makerepropkg(1)
+linkman:makerepropkg[1]
 	Rebuild a package to see if it is reproducible
 
-offload-build(1)
+linkman:offload-build[1]
 	Build a PKGBUILD on a remote server using makechrootpkg
 
-sogrep(1)
+linkman:sogrep[1]
 	Find packages using a linked to a given shared library
 
 include::include/footer.asciidoc[]

doc/man/diffpkg.1.asciidoc

@@ -1,5 +1,5 @@
 diffpkg(1)
-==========
+===========
 
 Name
 ----
@@ -21,7 +21,7 @@ When given one package, use it to diff against the locally built one.
 When given two packages, diff both packages against each other.
 
 In either case, a package name will be converted to a filename from the
-cache or pool, and diffpkg will proceed as though this filename was initially
+cache, and diffpkg will proceed as though this filename was initially
 specified.
 
 Options
@@ -30,31 +30,12 @@ Options
 *-M, --makepkg-config*::
 	Set an alternate makepkg configuration file
 
-*-P, --pool*='DIR'::
-	Search diff target in pool dir (default `'/srv/ftp/pool'`)
-
 *-v, --verbose*::
 	Provide more detailed/unfiltered output
 
 *-h, --help*::
 	Show a help text
 
-Output Options
---------------
-
-*--color*[='WHEN']::
-	Color output; 'WHEN' is `'never'`, `'always'`, or `'auto'`; Plain *--color* means *--color='auto'*
-
-*-u, -U, --unified*::
-	Output 3 lines of unified context
-
-*-y, --side-by-side*::
-	Output in two columns
-
-*-W, --width*[='NUM']::
-	Output at most 'NUM' (default `'auto'`) print columns; 'NUM' can be `'auto'`, `'columns'` or a number.
-	`'auto'` will be resolved to the maximum line length of both files, guaranteeing the diff to be uncut.
-
 Modes
 -----
 
@@ -70,4 +51,7 @@ Modes
 *-b, --buildinfo*::
 	Activate .BUILDINFO diff mode
 
+See Also
+--------
+
 include::include/footer.asciidoc[]

doc/man/include/footer.asciidoc

@@ -1,7 +1,27 @@
 
-Homepage
---------
+Bugs
+----
+Bugs can be reported on the project's GitLab bug tracker 'https://gitlab.archlinux.org/archlinux/devtools'
 
-'https://gitlab.archlinux.org/archlinux/devtools'
 
-Please report bugs and feature requests in the issue tracker. Please do your best to provide a reproducible test case for bugs.
+Authors
+-------
+
+Maintainers:
+
+* Aaron Griffin <aaronmgriffin@gmail.com>
+* Allan McRae <allan@archlinux.org>
+* Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
+* Dan McGee <dan@archlinux.org>
+* Dave Reisner <dreisner@archlinux.org>
+* Evangelos Foutras <evangelos@foutrelis.com>
+* Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+* Jelle van der Waa <jelle@archlinux.org>
+* Levente Polyak <anthraxx@archlinux.org>
+* Pierre Schmitz <pierre@archlinux.de>
+* Sébastien Luttringer <seblu@seblu.net>
+* Sven-Hendrik Haase <svenstaro@gmail.com>
+* Thomas Bächler <thomas@archlinux.org>
+
+For additional contributors, use `git shortlog -s` on the devtools.git
+repository.

doc/man/lddd.1.asciidoc

@@ -20,6 +20,6 @@ collected data is written to a temporary directory created by mktemp.
 See Also
 --------
 
-ldd(1)
+linkman:ldd[1]
 
 include::include/footer.asciidoc[]

doc/man/makechrootpkg.1.asciidoc

@@ -45,9 +45,6 @@ Options
 *-D* <dir>::
 	Bind directory into build chroot as read-only
 
-*-t* <dir>[:opts]::
-	Mount a tmpfs at 'dir'. See the '--tmpfs' argument in systemd-nspawn(1) for more details.
-
 *-u*::
 	Update the working copy of the chroot before building
 	This is useful for rebuilds without dirtying the pristine
@@ -76,12 +73,4 @@ Options
 *-U*::
 	Run makepkg as a specified user
 
-*-x* <when>::
-	Inspect chroot after build, possible modes are 'never' (default), 'always' or 'failure'
-
-See Also
---------
-
-systemd-nspawn(1)
-
 include::include/footer.asciidoc[]

doc/man/makerepropkg.1.asciidoc

@@ -1,5 +1,5 @@
 makerepropkg(1)
-===============
+================
 
 Name
 ----
@@ -16,7 +16,7 @@ Given the path to a built pacman package(s), attempt to rebuild it using the
 PKGBUILD in the current directory. The package will be built in an environment
 as closely matching the environment of the initial package as possible, by
 building up a chroot to match the information exposed in the package's
-BUILDINFO(5) manifest. On success, the resulting package will be
+linkman:BUILDINFO[5] manifest. On success, the resulting package will be
 compared to the input package, and makerepropkg will report whether the
 artifacts are identical.
 
@@ -42,15 +42,11 @@ Options
 *-d*::
 	If packages are not reproducible, compare them using diffoscope.
 
-*-n*::
-	Do not run the check() function in the PKGBUILD.
-
 *-c*::
 	Set the pacman cache directory.
 
 *-M* <file>::
-	Location of a makepkg config file. Specific additions (e.g. build flags for
-	additional languages) can be placed in '<file>.d/*.conf'.
+	Location of a makepkg config file.
 
 *-l* <chroot>::
 	The directory name to use as the chroot namespace

doc/man/mkarchroot.1.asciidoc

@@ -1,5 +1,5 @@
 mkarchroot(1)
-=============
+==============
 
 Name
 ----
@@ -32,9 +32,8 @@ Options
 *-c* <dir>::
 	Set pacman cache.
 
-*-f* <src>[:<dst>]::
+*-f* <file>::
 	Copy file from the host to the chroot.
-	If 'dst' is not provided, it defaults to 'src' inside of the chroot.
 
 *-s*::
 	Do not run setarch.
@@ -45,6 +44,6 @@ Options
 See Also
 --------
 
-pacman(1)
+linkman:pacman[1]
 
 include::include/footer.asciidoc[]

doc/man/pkgctl-aur-drop-from-repo.1.asciidoc

@@ -1,41 +0,0 @@
-pkgctl-aur-drop-from-repo(1)
-============================
-
-Name
-----
-pkgctl-aur-drop-from-repo - Drop a package from the official repository to the AUR
-
-Synopsis
---------
-pkgctl aur drop-from-repo [OPTIONS] [PATH]...
-
-Description
------------
-
-Drops a specified package from the official repositories to the Arch User
-Repository.
-
-This command requires a local Git clone of the package repository. It
-reconfigures the repository for AUR compatibility and pushes it to the
-AUR. Afterwards, the package is removed from the official repository.
-
-By default, the package is automatically disowned in the AUR.
-
-Options
--------
-
-*--no-disown*::
-	Do not disown the package on the AUR
-
-*-f, --force*::
-	Force push to the AUR overwriting the remote repository
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-db-remove(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-aur.1.asciidoc

@@ -1,37 +0,0 @@
-pkgctl-aur(1)
-=============
-
-Name
-----
-pkgctl-aur - Interact with the Arch User Repository (AUR)
-
-Synopsis
---------
-pkgctl aur [OPTIONS] [SUBCOMMAND]
-
-Description
------------
-
-Provides a suite of tools designed for managing and interacting with the Arch
-User Repository (AUR). It simplifies various tasks related to AUR, including
-importing repositories, managing packages, and transitioning packages between
-the official repositories and the AUR.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl aur drop-from-repo::
-	Drop a package from the official repository to the AUR
-
-See Also
---------
-
-pkgctl-aur-drop-from-repo(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-auth-login.1.asciidoc

@@ -1,40 +0,0 @@
-pkgctl-auth-login(1)
-====================
-
-Name
-----
-pkgctl-auth-login - Authenticate with the GitLab instance
-
-Synopsis
---------
-pkgctl auth login [OPTIONS]
-
-Description
------------
-
-Interactively authenticate with the GitLab instance.
-
-The minimum required scopes for the token are: 'api', 'write_repository'.
-
-The GitLab API token can either be stored in a plaintext file in
-'$XDG_CONFIG_HOME/devtools/gitlab.conf', or supplied via the
-'DEVTOOLS_GITLAB_TOKEN' environment variable using any command (gpg, vault,
-password manager) by declaring a shell alias:
-
-    $ alias pkgctl='DEVTOOLS_GITLAB_TOKEN="$(command to obtain token)" pkgctl'
-
-Options
--------
-
-*-g, --gen-access-token*::
-	Open the URL to generate a new personal access token
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-auth-status(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-auth-status.1.asciidoc

@@ -1,32 +0,0 @@
-pkgctl-auth-status(1)
-=====================
-
-Name
-----
-pkgctl-auth-status - View authentication status
-
-Synopsis
---------
-pkgctl auth status [OPTIONS]
-
-Description
------------
-
-Verifies and displays information about your authentication state of
-services like the GitLab instance and reports issues if any.
-
-Options
--------
-
-*-t, --show-token*::
-	Display the auth token
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-auth-login(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-auth.1.asciidoc

@@ -1,38 +0,0 @@
-pkgctl-auth(1)
-==============
-
-Name
-----
-pkgctl-auth - Authenticate with serivces like GitLab.
-
-Synopsis
---------
-pkgctl auth [OPTIONS] [SUBCOMMAND]
-
-Description
------------
-
-Manage the authorization for the GitLab instance and show its current status.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl auth login::
-	Authenticate with the GitLab instance
-
-pkgctl auth status::
-	View authentication status
-
-See Also
---------
-
-pkgctl-auth-login(1)
-pkgctl-auth-status(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-build.1.asciidoc

@@ -1,116 +0,0 @@
-pkgctl-build(1)
-===============
-
-Name
-----
-pkgctl-build - Build packages inside a clean chroot
-
-Synopsis
---------
-pkgctl build [OPTIONS] [PATH...]
-
-Description
------------
-
-Build packages in clean chroot environment, offering various options
-and functionalities to customize the package building process.
-
-By default, chroot environments are located in '/var/lib/archbuild/'.
-
-Build Options
--------------
-
-*--arch* 'ARCH'::
-	Specify architectures to build for (disables auto-detection)
-
-*--repo* 'REPO'::
-	Specify target repository for new packages not in any official repo.
-	Fallback to `'extra'` when building packages that are not present in any
-	official repository yet. Using this option is disallowed if the package is
-	already released, as it would circumvent the auto-detection safeguard.
-
-*-s, --staging*::
-	Build against the staging counterpart of the auto-detected repo
-
-*-t, --testing*::
-	Build against the testing counterpart of the auto-detected repo
-
-*-o, --offload*::
-	Build on a remote server and transfer artifacts afterwards
-
-*-c, --clean*::
-	Recreate the chroot before building
-
-*--inspect* 'WHEN'::
-	Spawn an interactive shell to inspect the chroot after building. Useful to ease the debugging of a package build. +
-	Possible values for 'WHEN' are `'never'`, `'always'` or `'failure'`
-
-*-w, --worker* 'SLOT'::
-	Name of the worker slot, useful for concurrent builds. By default the slot
-	is automatically assigned to the current tty pts number. In case the caller
-	is not a tty, choose a random slot between 1 and number of available
-	processing units.
-
-*--nocheck*::
-	Do not run the check() function in the PKGBUILD
-
-Install Options
----------------
-
-*-I, --install-to-chroot* 'FILE'::
-	Install a package to the working copy of the chroot
-
-*-i, --install-to-host* 'MODE'::
-	Install the built packages to the host system. Useful when one wants to verify that the package works as intended.
-	* When 'MODE' is 'all', this installs all built packages
-	* When 'MODE' is 'auto', this installs all built packages which are currently installed
-
-PKGBUILD Options
-----------------
-
-*--pkgver*='PKGVER'::
-	Set pkgver, reset pkgrel and update checksums
-
-*--pkgrel*='PKGREL'::
-	Set pkgrel to a given value
-
-*--rebuild*::
-	Increment the current pkgrel variable
-
-*--update-checksums*::
-	Force computation and update of the checksums by disabling auto-detection. +
-	Should only be used in special circumstances, like when adding new patch
-	files to the source array. During regular packaging operations, checksums
-	are either automatically updated when upgrading a package using `--pkgver`
-	or should remain immutable during rebuilds.
-
-*-e, --edit*::
-	Edit the PKGBUILD before building
-
-Release Options
----------------
-
-*-r, --release*::
-	Automatically commit, tag and release after building +
-	Specifying this option is required when using any of the following options
-	in this section
-
-*-m, --message* 'MSG'::
-	Use the given <msg> as the commit message
-
-*-u, --db-update*::
-	Automatically update the pacman database as last action
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-release(1)
-pkgctl-db-update(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-db-move.1.asciidoc

@@ -1,23 +0,0 @@
-pkgctl-db-move(1)
-=================
-
-Name
-----
-pkgctl-db-move - Move packages between binary repositories.
-
-Synopsis
---------
-pkgctl db move [OPTIONS] [SOURCE_REPO] [TARGET_REPO] [PKGBASE]...
-
-Description
------------
-
-Move packages between binary repositories i.e. from 'extra-testing' to 'extra'.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-db-remove.1.asciidoc

@@ -1,40 +0,0 @@
-pkgctl-db-remove(1)
-===================
-
-Name
-----
-pkgctl-db-remove - Remove packages from binary repositories
-
-Synopsis
---------
-pkgctl db remove [OPTIONS] [REPO] [PKGBASE]...
-
-Description
------------
-
-Remove packages from pacman repositories. By default passing a pkgbase removes
-all split packages, debug packages as well as entries from the state repo for
-all existing architectures.
-
-Beware when using the `--partial` option, as it may most likely lead to
-undesired effects by leaving debug packages behind as well as dangling entries
-in the state repository.
-
-Options
--------
-
-*--partial*::
-	Remove only partial pkgnames from a split package. This leaves debug
-	packages behind and pkgbase entries in the state repo.
-
-*-a, --arch* 'ARCH'::
-	Remove only one specific architecture (disables auto-detection).
-	By default all architectures are removed when this option is not used.
-
-*--noconfirm*::
-	Bypass any confirmation messages, should only be used with caution.
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-db-update.1.asciidoc

@@ -1,24 +0,0 @@
-pkgctl-db-update(1)
-===================
-
-Name
-----
-pkgctl-db-update - Update the binary repository as final release step
-
-Synopsis
---------
-pkgctl db update [OPTIONS]
-
-Description
------------
-
-Update the pacman database as final release step for packages that
-have been transfered and staged on 'repos.archlinux.org'.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-db.1.asciidoc

@@ -1,43 +0,0 @@
-pkgctl-db(1)
-============
-
-NAME
-----
-pkgctl-db - Pacman database modification utility for package updates, moves, and more.
-
-SYNOPSIS
---------
-pkgctl db [OPTIONS] [SUBCOMMAND]
-
-DESCRIPTION
------------
-
-Managing the Pacman database and facilitate the modification of packages and their metadata
-within the database
-
-OPTIONS
--------
-
-*-h, --help*::
-    Display usage information and available options.
-
-Subcommands
------------
-
-pkgctl db update::
-    Update the binary repository as final release step
-
-pkgctl db move::
-    Move packages between binary repositories
-
-pkgctl db remove::
-    Remove packages from binary repositories
-
-SEE ALSO
---------
-
-pkgctl-db-update(1)
-pkgctl-db-move(1)
-pkgctl-db-remove(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-diff.1.asciidoc

@@ -1,73 +0,0 @@
-pkgctl-diff(1)
-==============
-
-Name
-----
-pkgctl-diff - Compare package files using different modes.
-
-Synopsis
---------
-pkgctl diff [OPTIONS] [MODES] [FILE|PKGNAME...]
-
-Description
------------
-
-Searches for a locally built package corresponding to the PKGBUILD, and
-downloads the last version of that package from the Pacman repositories.
-It then compares the package archives using different modes while using
-simple tar content list by default.
-
-When given one package, use it to diff against the locally built one.
-When given two packages, diff both packages against each other.
-
-In either case, a package name will be converted to a filename from the cache
-or pool, and 'pkgctl diff' will proceed as though this filename was initially
-specified.
-
-Options
--------
-
-*-M, --makepkg-config*::
-	Set an alternate makepkg configuration file
-
-*-P, --pool*='DIR'::
-	Search diff target in pool dir (default `'/srv/ftp/pool'`)
-
-*-v, --verbose*::
-	Provide more detailed/unfiltered output
-
-*-h, --help*::
-	Show a help text
-
-Output Options
---------------
-
-*--color*[='WHEN']::
-	Color output; 'WHEN' is `'never'`, `'always'`, or `'auto'`; Plain *--color* means *--color='auto'*
-
-*-u, -U, --unified*::
-	Output 3 lines of unified context
-
-*-y, --side-by-side*::
-	Output in two columns
-
-*-W, --width*[='NUM']::
-	Output at most 'NUM' (default `'auto'`) print columns; 'NUM' can be `'auto'`, `'columns'` or a number.
-	`'auto'` will be resolved to the maximum line length of both files, guaranteeing the diff to be uncut.
-
-Modes
------
-
-*-l, --list*::
-	Activate tar content list diff mode (default)
-
-*-d, --diffoscope*::
-	Activate diffoscope diff mode
-
-*-p, --pkginfo*::
-	Activate .PKGINFO diff mode
-
-*-b, --buildinfo*::
-	Activate .BUILDINFO diff mode
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-issue-close.1.asciidoc

@@ -1,47 +0,0 @@
-pkgctl-issue-close(1)
-=====================
-
-Name
-----
-pkgctl-issue-close - Close an issue
-
-Synopsis
---------
-pkgctl issue close [OPTIONS] [IID]
-
-Description
------------
-
-This command is used to close an issue in Arch Linux packaging projects. It
-finalizes the issue by marking it as resolved and optionally providing a reason
-for its closure.
-
-To edit an issue, users must specify the issue ID (IID). By default, the
-command operates within the current directory, but users have the option to
-specify a different package base.
-
-Users can provide a message directly through the command line to explain the
-reason for closing the issue. For more detailed or precise reasons, users can
-opt to edit the closure message using a text editor before submitting it.
-Additionally, a specific resolution label can be set to categorize the closure
-reason, with the default label being "completed."
-
-Options
--------
-
-*-p, --package* 'PKGBASE'::
-	Interact with `PKGBASE` instead of the current directory
-
-*-m, --message* 'MSG'::
-	Use the provided message as the reason for closing
-
-*-e, --edit*::
-	Edit the reason for closing using an editor
-
-*-r, --resolution* 'REASON'::
-	Set a specific resolution label (default: completed)
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-issue-comment.1.asciidoc

@@ -1,43 +0,0 @@
-pkgctl-issue-comment(1)
-=======================
-
-Name
-----
-pkgctl-issue-comment - Comment on an issue
-
-Synopsis
---------
-pkgctl issue comment [OPTIONS] [IID]
-
-Description
------------
-
-This command allows users to add comments to an issue in Arch Linux packaging
-projects. This command is useful for providing feedback, updates, or any
-additional information related to an issue directly within the project's issue
-tracking system.
-
-By default, the command interacts with the current directory, but users can
-specify a different package base if needed.
-
-Users can provide a comment message directly through the command line, ensuring
-quick and efficient communication. Additionally, for more detailed or formatted
-comments, users have the option to edit their comment using a text editor
-before submitting it.
-
-Options
--------
-
-*-p, --package PKGBASE*::
-	Interact with `PKGBASE` instead of the current directory
-
-*-m, --message MSG*::
-	Use the provided message as the comment
-
-*-e, --edit*::
-	Edit the comment using an editor
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-issue-create.1.asciidoc

@@ -1,77 +0,0 @@
-pkgctl-issue-create(1)
-======================
-
-Name
-----
-pkgctl-issue-create - Create a new issue
-
-Synopsis
---------
-pkgctl issue create [OPTIONS]
-
-Description
------------
-
-The create command is used to create a new issue for an Arch Linux package.
-This command is suitable for reporting bugs, regressions, feature requests, or
-any other issues related to a package. It provides a flexible way to document
-and track new issues within the project's issue tracking system.
-
-By default, the command operates within the current directory, but users can
-specify a different package base if needed.
-
-Users can provide a title for the issue directly through the command line. The
-issue description can be supplied from a file or edited using a text editor.
-Alternatively, users can opt to continue the issue creation process using the
-web interface for a more interactive experience.
-
-The command allows setting various labels and attributes for the issue, such as
-confidentiality, priority, scope, severity, and status. These options help
-categorize and prioritize the issue appropriately within the tracking system.
-
-In case of a failed run, the command can automatically recover to ensure that
-the issue creation process is completed without losing any data.
-
-This command is essential for maintainers, contributors, and users who need to
-report new issues related to Arch Linux packages.
-
-Options
--------
-
-*-p, --package* 'PKGBASE'::
-	Interact with `PKGBASE` instead of the current directory
-
-*-t, --title* 'TITLE'::
-	Use the provided title for the issue
-
-*-F, --file* 'FILE'::
-	Take issue description from <file>
-
-*-e, --edit*::
-	Edit the issue description using an editor
-
-*-w, --web*::
-	Continue issue creation with the web interface
-
-*--recover*::
-	Automatically recover from a failed run
-
-*--confidentiality* 'TYPE'::
-	Set the issue confidentiality
-
-*--priority* 'PRIORITY'::
-	Set the priority label
-
-*--scope* 'SCOPE'::
-	Set the scope label
-
-*--severity* 'SEVERITY'::
-	Set the severity label
-
-*--status* 'STATUS'::
-	Set the status label
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-issue-edit.1.asciidoc

@@ -1,75 +0,0 @@
-pkgctl-issue-edit(1)
-====================
-
-Name
-----
-pkgctl-issue-edit - Edit and modify an issue
-
-Synopsis
---------
-pkgctl issue edit [OPTIONS] [IID]
-
-Description
------------
-
-The pkgctl issue edit command is used to modify an existing issue in Arch Linux
-packaging projects. This command allows users to update the issue's title,
-description, and various attributes, ensuring that the issue information
-remains accurate and up-to-date. It also provides a streamlined facility
-for bug wranglers to categorize and prioritize issues efficiently.
-
-To edit an issue, users must specify the issue ID (IID). By default, the
-command operates within the current directory, but users can specify a
-different package base if needed.
-
-The command allows for direct updates to the issue title and description. For
-more extensive changes, users can edit these details using a text editor. The
-command provides various options to set or update labels and attributes such as
-confidentiality, priority, resolution, scope, severity, and status. These
-options help maintain clear and organized issue management.
-
-In case of a failed run, the command can automatically recover to ensure that
-the editing process is completed without losing any data.
-
-This command is particularly useful for maintainers and contributors who need
-to update the details of an issue to reflect new information or changes in
-status. It ensures that all issue details are accurately maintained,
-facilitating efficient tracking and resolution.
-
-Options
--------
-
-*-p, --package* 'PKGBASE'::
-	Interact with `PKGBASE` instead of the current directory
-
-*-t, --title* 'TITLE'::
-	Use the provided title for the issue
-
-*-e, --edit*::
-	Edit the issue title and description using an editor
-
-*--recover*::
-	Automatically recover from a failed run
-
-*--confidentiality* 'TYPE'::
-	Set the issue confidentiality
-
-*--priority* 'PRIORITY'::
-	Set the priority label
-
-*--resolution* 'REASON'::
-	Set the resolution label
-
-*--scope* 'SCOPE'::
-	Set the scope label
-
-*--severity* 'SEVERITY'::
-	Set the severity label
-
-*--status* 'STATUS'::
-	Set the status label
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-issue-list.1.asciidoc

@@ -1,100 +0,0 @@
-pkgctl-issue-list(1)
-====================
-
-Name
-----
-pkgctl-issue-list - List project or group issues
-
-Synopsis
---------
-pkgctl issue list [OPTIONS] [PKGBASE]
-
-Description
------------
-
-The pkgctl issue list command is used to list issues associated with a specific
-packaging project or the entire packaging subgroup in Arch Linux. This command
-facilitates efficient issue management by allowing users to list and filter
-issues based on various criteria.
-
-Results can also be displayed directly in a web browser for easier navigation
-and review.
-
-The command offers filtering options to refine the results. Users can include
-closed issues, filter exclusively for unconfirmed issues, or focus on issues
-with specific labels such as priority, confidentiality, resolution, scope,
-severity, and status.
-
-Additionally, users can search within issue titles or descriptions and filter
-issues by the assignee or author. There are also convenient shortcuts to filter
-issues assigned to or created by the current user.
-
-This command is particularly useful for package maintainers and contributors in
-the Arch Linux community who need to track and manage issues efficiently. It
-provides a comprehensive view of the project's or group's issue landscape,
-enabling maintainers to address and prioritize issues effectively.
-
-Options
--------
-
-*-g, --group*::
-	Get issues from the whole packaging subgroup
-
-*-w, --web*::
-	View results in a browser
-
-*-h, --help*::
-	Show a help text
-
-Filter Options
---------------
-
-*-A, --all*::
-	Get all issues including closed
-
-*-c, --closed*::
-	Get only closed issues
-
-*-U, --unconfirmed*::
-	Shorthand to filter by unconfirmed status label
-
-*--search* 'SEARCH'::
-	Search <string> in the fields defined by --in
-
-*--in* 'LOCATION'::
-	Search in title or description (default: all)
-
-*-l, --label* 'NAME'::
-	Filter issue by label <name>
-
-*--confidentiality* 'TYPE'::
-	Filter by confidentiality
-
-*--priority* 'PRIORITY'::
-	Shorthand to filter by priority label
-
-*--resolution* 'REASON'::
-	Shorthand to filter by resolution label
-
-*--scope* 'SCOPE'::
-	Shorthand to filter by scope label
-
-*--severity* 'SEVERITY'::
-	Shorthand to filter by severity label
-
-*--status* 'STATUS'::
-	Shorthand to filter by status label
-
-*--assignee* 'USERNAME'::
-	Filter issues assigned to the given username
-
-*--assigned-to-me*::
-	Shorthand to filter issues assigned to you
-
-*--author* 'USERNAME'::
-	Filter issues authored by the given username
-
-*--created-by-me*::
-	Shorthand to filter issues created by you
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-issue-move.1.asciidoc

@@ -1,43 +0,0 @@
-pkgctl-issue-move(1)
-====================
-
-Name
-----
-pkgctl-issue-move - Move an issue to another project
-
-Synopsis
---------
-pkgctl issue move [OPTIONS] [IID] [DESTINATION_PACKAGE]
-
-Description
------------
-
-The move command allows users to transfer an issue from one project to another
-within the Arch Linux packaging group. This is useful when an issue is
-identified to be more relevant or better handled in a different project.
-
-By default, the command operates within the current directory, but users can
-specify a different package base from which to move the issue.
-
-Users must specify the issue ID (IID) and the destination package to which the
-issue should be moved. A comment message explaining the reason for the move can
-be provided directly through the command line. For more detailed explanations
-or additional context, users have the option to edit the move comment using a
-text editor before submitting it.
-
-Options
--------
-
-*-p, --package* 'PKGBASE'::
-	Move from `PKGBASE` instead of the current directory
-
-*-m, --message* 'MSG'::
-	Use the provided message as the comment
-
-*-e, --edit*::
-	Edit the comment using an editor
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-issue-reopen.1.asciidoc

@@ -1,43 +0,0 @@
-pkgctl-issue-reopen(1)
-======================
-
-Name
-----
-pkgctl-issue-reopen - Reopen a closed issue
-
-Synopsis
---------
-pkgctl issue reopen [OPTIONS] [IID]
-
-Description
------------
-
-The reopen command is used to reopen a previously closed issue in Arch Linux
-packaging projects. This command is useful when an issue needs to be revisited
-or additional work is required after it was initially closed.
-
-To edit an issue, users must specify the issue ID (IID). By default, the
-command operates within the current directory, but users can specify a
-different package base if needed.
-
-Users can provide a message directly through the command line to explain the
-reason for reopening the issue. For more detailed explanations or to provide
-additional context, users have the option to edit the reopening comment using a
-text editor before submitting it.
-
-Options
--------
-
-*-p, --package* 'PKGBASE'::
-	Interact with `PKGBASE` instead of the current directory
-
-*-m, --message* 'MSG'::
-	Use the provided message as the comment
-
-*-e, --edit*::
-	Edit the comment using an editor
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-issue-view.1.asciidoc

@@ -1,43 +0,0 @@
-pkgctl-issue-view(1)
-====================
-
-Name
-----
-pkgctl-issue-view - Display information about an issue
-
-Synopsis
---------
-pkgctl issue view [OPTIONS]
-
-Description
------------
-
-This command is designed to display detailed information about a specific issue
-in Arch Linux packaging projects. It gathers and pretty prints all relevant
-data about the issue, providing a comprehensive view that includes the issue's
-description, status as well as labels and creation date.
-
-By default, the command operates within the current directory, but users have
-the option to specify a different package base. Additionally, users can choose
-to view the issue in a web browser for a more interactive experience.
-
-For those requiring deeper insights, the command can also display all comments
-and activities related to the issue, providing a full historical context and
-ongoing discussions.
-
-Options
--------
-
-*-p, --package* 'PKGBASE'::
-	Interact with `PKGBASE` instead of the current directory
-
-*-c, --comments*::
-	Show issue comments and activities
-
-*-w, --web*::
-	Open issue in a browser
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-issue.1.asciidoc

@@ -1,62 +0,0 @@
-pkgctl-issue(1)
-===============
-
-Name
-----
-pkgctl-issue - Work with GitLab packaging issues
-
-Synopsis
---------
-pkgctl issue [SUBCOMMAND] [OPTIONS]
-
-Description
------------
-
-Work with GitLab packaging issues.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl issue close::
-	Close an issue
-
-pkgctl issue comment::
-	Comment on an issue
-
-pkgctl issue create::
-	Create a new issue
-
-pkgctl issue edit::
-	Edit and modify an issue
-
-pkgctl issue list::
-	List project or group issues
-
-pkgctl issue move::
-	Move an issue to another project
-
-pkgctl issue reopen::
-	Reopen a closed issue
-
-pkgctl issue view::
-	Display information about an issue
-
-See Also
---------
-
-pkgctl-issue-close(1)
-pkgctl-issue-comment(1)
-pkgctl-issue-create(1)
-pkgctl-issue-edit(1)
-pkgctl-issue-list(1)
-pkgctl-issue-move(1)
-pkgctl-issue-reopen(1)
-pkgctl-issue-view(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-license-check.1.asciidoc

@@ -1,54 +0,0 @@
-pkgctl-license-check(1)
-=======================
-
-Name
-----
-pkgctl-license-check - Checks package licensing compliance using REUSE
-
-Synopsis
---------
-pkgctl license check [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-Checks package licensing compliance using REUSE and also verifies whether
-a LICENSE file with the expected Arch Linux-specific 0BSD license text exists.
-
-Configuration
--------------
-
-Uses reuse(1) and a `REUSE.toml` file located alongside the PKGBUILD(5). Refer
-to the configuration section in pkgctl-license(1).
-
-If no `PKGBASE` is specified, the command defaults to using the current working
-directory.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Exit Codes
-----------
-
-On exit, return one of the following codes:
-
-*0*::
-	Normal exit condition, all checked packages are compliant
-
-*1*::
-	Unknown cause of failure
-
-*2*::
-	Normal exit condition, but some packages are not compliant
-
-See Also
---------
-
-pkgctl-license(1)
-reuse(1)
-PKGBUILD(5)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-license-setup.1.asciidoc

@@ -1,55 +0,0 @@
-pkgctl-license-setup(1)
-=======================
-
-Name
-----
-pkgctl-license-setup - Automatically detect and setup a basic REUSE
-configuration
-
-Synopsis
---------
-pkgctl license setup [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-This subcommand automates the creation of the Arch Linux 0BSD package license
-file as well as a basic reuse(1) configuration by applying simple heuristics.
-It comes in especially handy when initially setting up licensing for a package
-without the need to manually write a `REUSE.toml` file.
-
-If any `.patch` files are detected and the PKGBUILD(5) has only a single entry
-in the `license=()` array, this subcommand assumes the patches are licensed
-under that license and generates annotations for them.
-
-In case there are no patches, no additional annotations are generated.
-
-Manual annotations are necessary in case the subcommand can't generate a
-configuration that accounts for all files. In this case, `reuse lint` will fail
-with a descriptive error of which files are missing an annotation.
-
-If no `PKGBASE` is specified, the command defaults to using the current working
-directory.
-
-Options
--------
-
-*-f, --force*::
-	Overwrite existing reuse(1) configuration
-
-*--no-check*::
-	Do not run pkgctl-license-check(1) after setup
-
-*-h, --help*::
-	Show a help text
-
-
-See Also
---------
-
-pkgctl-license(1)
-pkgctl-license-check(1)
-reuse(1)
-PKGBUILD(5)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-license.1.asciidoc

@@ -1,54 +0,0 @@
-pkgctl-license(1)
-=================
-
-Name
-----
-pkgctl-license - Check and manage package license compliance
-
-Synopsis
---------
-pkgctl license [OPTIONS] [SUBCOMMAND]
-
-Description
------------
-
-Commands related to package licenses, including checks for compliance.
-
-Uses reuse(1) and a `REUSE.toml` file located alongside the PKGBUILD(5).
-
-Configuration
--------------
-
-The `REUSE.toml` file must contain annotations for all regular files expected
-to be present in an Arch Linux package repository.
-
-Use pkgctl-license-setup(1) to automatically detect and setup a basic REUSE
-config file based on the files in the package repository.
-
-For detailed information on the various configuration options available for the
-`REUSE.toml` file, refer to the REUSE Specification (https://reuse.software/spec).
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl license check::
-	Checks package licensing compliance using REUSE
-
-pkgctl license setup::
-	Automatically detect and setup a basic REUSE config
-
-See Also
---------
-
-pkgctl-license-check(1)
-pkgctl-license-setup(1)
-reuse(1)
-PKGBUILD(5)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-release.1.asciidoc

@@ -1,51 +0,0 @@
-pkgctl-release(1)
-=================
-
-Name
-----
-pkgctl-release - Release step to commit, tag and upload build artifacts
-
-Synopsis
---------
-pkgctl release [OPTIONS] [PATH...]
-
-Description
------------
-
-Modified version controlled files will first be staged for commit,
-afterwards a Git tag matching the pkgver will be created and finally
-all build artifacts will be uploaded.
-
-By default the target pacman repository will be auto-detected by querying
-the repo it is currently released in. When initially adding a new package
-to the repositories, the target repo must be specified manually.
-
-Options
--------
-
-*-m, --message* 'MSG'::
-	Use the given <msg> as the commit message
-
-*-r, --repo* 'REPO'::
-	Specify target repository for new packages not in any official repo.
-	Using this option is disallowed if the package is already released, as it
-	would circumvent the auto-detection safeguard.
-
-*-s, --staging*::
-	Build against the staging counterpart of the auto-detected repo
-
-*-t, --testing*::
-	Build against the testing counterpart of the auto-detected repo
-
-*-u, --db-update*::
-	Automatically update the pacman database after uploading
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-db-update(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-repo-clean.1.asciidoc

@@ -1,40 +0,0 @@
-pkgctl-repo-clean(1)
-====================
-
-Name
-----
-
-pkgctl-repo-clean - Remove untracked files from the working tree
-
-Synopsis
---------
-
-pkgctl repo clean [OPTION] [PATH]...
-
-Description
------------
-
-Cleans the working tree by recursively removing files that are not under
-version control, starting from the current directory.
-
-Files unknown to Git as well as ignored files are removed. This can, for
-example, be useful to remove all build products.
-
-Options
--------
-
-*-i, --interactive*::
-	Show what would be done and clean files interactively
-
-*-n, --dry-run*::
-	Don't actually remove anything, just show what would be done
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-git-clean(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-repo-clone.1.asciidoc

@@ -1,52 +0,0 @@
-pkgctl-repo-clone(1)
-====================
-
-Name
-----
-pkgctl-repo-clone - Clone a package repository
-
-Synopsis
---------
-pkgctl repo clone [OPTIONS] [PKGNAME...]
-
-Description
------------
-
-Clone Git packaging repositories from the canonical namespace.
-
-The configure command is subsequently invoked to synchronize the distro
-specs and makepkg.conf settings. The unprivileged option can be used
-for cloning packaging repositories without SSH access using read-only
-HTTPS.
-
-Options
--------
-
-*-m, --maintainer* 'NAME'::
-	Clone all packages of the named maintainer
-
-*--protocol* 'https'::
-	Clone the repository over https
-
-*--universe*::
-	Clone all existing packages, useful for cache warming
-
-*--switch* 'VERSION'::
-	Switch to a specified version. The working tree and the index are updated to
-	match the version.
-
-*-j, --jobs* 'N'::
-	Run up to N jobs in parallel. By default the number of jobs is equal to the
-	number of available processing units. For sequential processing this option
-	needs to be passed with 1.
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-repo-configure(1)
-pkgctl-repo-switch(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-repo-configure.1.asciidoc

@@ -1,41 +0,0 @@
-pkgctl-repo-configure(1)
-========================
-
-Name
-----
-pkgctl-repo-configure - Configure a clone according to distro specs
-
-Synopsis
---------
-pkgctl repo configure [OPTIONS] [PATH...]
-
-Description
------------
-
-Configure Git packaging repositories according to distro specs and
-'makepkg.conf' settings.
-
-Git author information and the used signing key is set up from
-'makepkg.conf' read from any valid location like '/etc' or 'XDG_CONFIG_HOME'.
-
-The remote protocol is automatically determined from the author email
-address by choosing SSH for all official packager identities and
-read-only HTTPS otherwise.
-
-Git default excludes and hooks are applied to the configured repo.
-
-Options
--------
-
-*--protocol* 'https'::
-	Configure remote url to use https
-
-*-j, --jobs* 'N'::
-	Run up to N jobs in parallel. By default the number of jobs is equal to the
-	number of available processing units. For sequential processing this option
-	needs to be passed with 1.
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-repo-create.1.asciidoc

@@ -1,40 +0,0 @@
-pkgctl-repo-create(1)
-=====================
-
-Name
-----
-pkgctl-repo-create - Create a new GitLab package repository
-
-Synopsis
---------
-pkgctl repo create [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-Create a new Git packaging repository in the canonical GitLab namespace.
-
-This command requires a valid GitLab API authentication. To setup a new
-GitLab token or check the currently configured one please consult the
-'auth' subcommand for further instructions.
-
-If invoked without a parameter, try to create a packaging repository
-based on the 'PKGBUILD' from the current working directory.
-
-Options
--------
-
-*-c, --clone*::
-	Clone the Git repository after creation
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-auth(1)
-pkgctl-repo-clone(1)
-pkgctl-repo-configure(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-repo-switch.1.asciidoc

@@ -1,36 +0,0 @@
-pkgctl-repo-switch(1)
-=====================
-
-Name
-----
-pkgctl-repo-switch - Switch a package repository to a specified version
-
-Synopsis
---------
-pkgctl repo switch [OPTIONS] [VERSION] [PKGBASE]...
-
-Description
------------
-
-Switch a package source repository to a specified version, tag or branch.
-The working tree and the index are updated to match the specified ref.
-
-If a version identifier is specified in the pacman version format, that
-identifier is automatically translated to the Git tag name accordingly.
-
-The current working directory is used if no PKGBASE is specified.
-
-Options
--------
-
-*--discard-changes*::
-	Proceed even if the index or the working tree differs from HEAD. Both the
-	index and working tree are restored to match the switching target.
-
-*-f, --force*::
-	An alias for '--discard-changes'.
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-repo-web.1.asciidoc

@@ -1,27 +0,0 @@
-pkgctl-repo-web(1)
-==================
-
-Name
-----
-pkgctl-repo-web - Open the packaging repository's website
-
-Synopsis
---------
-pkgctl repo web [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-Open the packaging repository's website via xdg-open. If called with
-no arguments, open the package cloned in the current working directory.
-
-Options
--------
-
-*--print*::
-	Print the url instead of opening it with xdg-open
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-repo.1.asciidoc

@@ -1,63 +0,0 @@
-pkgctl-repo(1)
-==============
-
-Name
-----
-pkgctl-repo - Manage Git packaging repositories and their configuration
-
-Synopsis
---------
-pkgctl repo [OPTIONS] [SUBCOMMAND]
-
-Description
------------
-
-Manage Git packaging repositories and helps with their configuration
-according to distro specs.
-
-Git author information and the used signing key is set up from
-'makepkg.conf' read from any valid location like '/etc' or 'XDG_CONFIG_HOME'.
-The configure command can be used to synchronize the distro specs and
-makepkg.conf settings for previously cloned repositories.
-
-The unprivileged option can be used for cloning packaging repositories
-without SSH access using read-only HTTPS.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl repo clean::
-	Remove untracked files from the working tree
-
-pkgctl repo clone::
-	Clone a package repository
-
-pkgctl repo configure::
-	Configure a clone according to distro specs
-
-pkgctl repo create::
-	Create a new GitLab package repository
-
-pkgctl repo switch::
-	Switch a package repository to a specified version
-
-pkgctl repo web::
-	Open the packaging repository's website
-
-See Also
---------
-
-pkgctl-repo-clean(1)
-pkgctl-repo-clone(1)
-pkgctl-repo-configure(1)
-pkgctl-repo-create(1)
-pkgctl-repo-switch(1)
-pkgctl-repo-web(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-search.1.asciidoc

@@ -1,71 +0,0 @@
-pkgctl-search(1)
-================
-
-Name
-----
-pkgctl-search - Search for an expression across the GitLab packaging group
-
-Synopsis
---------
-pkgctl search [OPTIONS] QUERY
-
-Description
------------
-
-Search for an expression across the GitLab packaging group.
-
-To use a filter, include it in your query. You may use wildcards (*) to
-use glob matching.
-
-Available filters for the blobs scope: path, extension
-
-Every usage of the search command must be authenticated. Consult the
-`'pkgctl auth'` command to authenticate with GitLab or view the authentication
-status.
-
-Search Tips
------------
-
-	Syntax  Description    Example
-	───────────────────────────────────────
-	"       Exact search   "gem sidekiq"
-	~       Fuzzy search   J~ Doe
-	|       Or             display | banner
-	+       And            display +banner
-	-       Exclude        display -banner
-	*       Partial        bug error 50*
-	\       Escape         \*md
-	#       Issue ID       #23456
-	!       Merge request  !23456
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Filter Options
---------------
-
-*--no-default-filter*::
-	Do not apply default filter (like -path:keys/pgp/*.asc)
-
-Output Options
---------------
-
-*--json*::
-	Enable printing in JSON; Shorthand for `'--format json'`
-
-*-F, --format* 'FORMAT'::
-	Controls the formatting of the results; `FORMAT` is `'pretty'`, `'plain'`,
-	or `'json'` (default `pretty`)
-
-*-N, --no-line-number*::
-	Don't show line numbers when formatting results
-
-See Also
---------
-
-pkgctl-auth(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-version-check.1.asciidoc

@@ -1,79 +0,0 @@
-pkgctl-version-check(1)
-=======================
-
-Name
-----
-pkgctl-version-check - Compares local package versions against upstream
-
-Synopsis
---------
-pkgctl version check [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-Compares the versions of packages in the local packaging repository against
-their latest upstream versions.
-
-Upon execution, it generates a grouped list that provides detailed insights
-into each package's status. For each package, it displays the current local
-version alongside the latest version available upstream.
-
-Outputs a summary of up-to-date packages, out-of-date packages, and any check
-failures.
-
-This simplifies the maintenance of PKGBUILD files, reducing the manual effort
-required to track version changes from upstream sources.
-
-Configuration
--------------
-
-Uses nvchecker(1) and a `.nvchecker.toml` file located alongside the
-PKGBUILD. Refer to the configuration section in pkgctl-version(1).
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Filter Options
---------------
-
-*-v, --verbose*::
-	Display all results including up-to-date versions
-
-Output Options
---------------
-
-*--json*::
-	Enable printing in JSON; Shorthand for `'--format json'`
-
-*-F, --format* 'FORMAT'::
-	Controls the output format of the results; `FORMAT` is `'pretty'`,
-	or `'json'` (default `pretty`)
-
-Exit Codes
-----------
-
-On exit, return one of the following codes:
-
-*0*::
-	Normal exit condition, all checked versions are up-to-date
-
-*1*::
-	Unknown cause of failure
-
-*2*::
-	Normal exit condition, but there are out-of-date versions
-
-*3*::
-	Failed to run some version checks
-
-See Also
---------
-
-pkgctl-version(1)
-nvchecker(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-version-setup.1.asciidoc

@@ -1,125 +0,0 @@
-pkgctl-version-setup(1)
-=======================
-
-Name
-----
-pkgctl-version-setup - Automatically detect and setup a basic nvchecker config
-
-Synopsis
---------
-pkgctl version setup [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-This subcommand automates the creation of a basic nvchecker(1) configuration
-file by analyzing the source array specified in the PKGBUILD(1) file of a
-package. This command intelligently detects various platforms and APIs (e.g.,
-GitHub, GitLab, PyPI) used by the package sources and generates a corresponding
-`.nvchecker.toml` configuration based on its best guess.
-
-This is particularly useful for initializing nvchecker(1) settings for a
-package without manually crafting the `.nvchecker.toml` file. It simplifies the
-process of setting up version checks, especially when transitioning a package's
-monitoring from one source platform to another or starting version checks for a
-new package.
-
-If no `PKGBASE` is specified, the command defaults to using the current working
-directory.
-
-To obtain a list of supported sources and their expected URL formats, please
-consult the sources section.
-
-Options
--------
-
-*-f, --force*::
-	Overwrite existing nvchecker(1) configuration
-
-*--prefer-platform-api*::
-	Prefer platform specific GitHub/GitLab API over git for complex cases
-
-*--url* 'URL'::
-	Derive check target from the given URL instead of the source array entries
-
-*--no-check*::
-	Do not run pkgctl-version-check(1) after setup
-
-*--no-upstream*::
-	Setup a blank config for packages without upstream sources, like meta
-	packages. This must only be used for cases without an upstream, please
-	reach out to the developer team for guidance regarding upstream sources
-	that are hard to configure.
-
-*-h, --help*::
-	Show a help text
-
-Sources
--------
-
-Here are the currently supported platforms and sources, along with examples of
-URL formats that enable their automatic detection as specific source types:
-
-*Git*::
-	* https://github.com/example/project
-	* https://gitlab.com/example/group/project
-	* git://git.foobar.org/example
-	* git+https://git.foobar.org/example
-
-*GitHub*::
-	* https://github.com/example/project
-	* https://github.com/example/project/archive/v1.0/project-v1.0.tar.gz
-
-*GitLab*::
-	* https://gitlab.com/example/group/project
-	* https://gitlab.archlinux.org/archlinux/devtools.git
-	* https://gitlab.archlinux.org/archlinux/devtools/-/releases/v1.1.0/downloads/devtools-v1.1.0.tar.gz
-
-*Hackage*::
-	* https://hackage.haskell.org/package/xmonad
-	* https://hackage.haskell.org/package/xmonad-0.18.0/xmonad-0.18.0.tar.gz
-	* https://hackage.haskell.org/packages/archive/xmonad/0.18.0/xmonad-0.18.0.tar.gz
-
-*NPM*::
-	* https://registry.npmjs.org/node-gyp/-/node-gyp-10.0.1.tgz
-	* https://www.npmjs.com/package/node-gyp
-
-*PyPI*::
-	* https://pypi.io/packages/source/p/pyflakes
-	* https://pypi.org/packages/source/b/bleach
-	* https://files.pythonhosted.org/packages/source/p/pyflakes
-	* https://pypi.org/project/SQLAlchemy/
-
-*RubyGems*::
-	* https://rubygems.org/downloads/diff-lcs-1.5.1.gem
-	* https://rubygems.org/gems/diff-lcs
-
-*CPAN*::
-	* https://search.cpan.org/CPAN/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz
-	* https://cpan.metacpan.org/authors/id/C/CO/COSIMO/Locale-PO-0.27.tar.gz
-
-*crates.io*::
-	* https://static.crates.io/crates/shotgun/shotgun-1.0.crate
-	* https://crates.io/api/v1/crates/shotgun/1.0/download
-	* https://crates.io/crates/git-smash
-
-Examples
---------
-
-*pkgctl version setup*::
-	Detects the source from the current directory's PKGBUILD(1) and
-	sets up a basic `.nvchecker.toml`.
-
-*pkgctl version setup --url https://github.com/example/project*::
-	Generates an `.nvchecker.toml` for the current PKGBUILD(1) but
-	overrides the source URL with the specified GitHub project.
-
-See Also
---------
-
-pkgctl-version(1)
-pkgctl-version-check(1)
-nvchecker(1)
-PKGBUILD(5)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-version-upgrade.1.asciidoc

@@ -1,53 +0,0 @@
-pkgctl-version-upgrade(1)
-=========================
-
-Name
-----
-pkgctl-version-upgrade - Adjust the PKGBUILD to match the latest upstream version
-
-Synopsis
---------
-pkgctl version upgrade [OPTIONS] [PKGBASE...]
-
-Description
------------
-
-Streamlines the process of keeping PKGBUILD files up-to-date with the latest
-upstream versions.
-
-Upon execution, it automatically adjusts the PKGBUILD file, ensuring that the
-pkgver field is set to match the latest version available from the upstream
-source. In addition to updating the pkgver, this command also resets the pkgrel
-to 1 and updates checksums.
-
-Outputs a summary of upgraded packages, up-to-date packages, and any check
-failures.
-
-This simplifies the maintenance of PKGBUILD files, reducing the manual effort
-required to track and implement version changes from upstream sources.
-
-Configuration
--------------
-
-Uses nvchecker(1) and a `.nvchecker.toml` file located alongside the
-PKGBUILD. Refer to the configuration section in pkgctl-version(1).
-
-Options
--------
-
-*--no-update-checksums*::
-	Disable computation and update of the checksums
-
-*-v, --verbose*::
-	Display results including up-to-date versions
-
-*-h, --help*::
-	Show a help text
-
-See Also
---------
-
-pkgctl-version(1)
-nvchecker(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl-version.1.asciidoc

@@ -1,67 +0,0 @@
-pkgctl-version(1)
-=================
-
-Name
-----
-pkgctl-version - Check and manage package versions against upstream
-
-
-Synopsis
---------
-pkgctl version [OPTIONS] [SUBCOMMAND]
-
-Description
------------
-
-Commands related to package versions, including checks for outdated packages.
-
-Uses nvchecker(1) and a `.nvchecker.toml` file located alongside the
-PKGBUILD.
-
-Configuration
--------------
-
-The `.nvchecker.toml` file must contain a section that matches the
-package's pkgbase. The pkgbase section within the `.nvchecker.toml` file
-specifies the source and method for checking the latest version of the
-corresponding package.
-
-Use pkgctl-version-setup(1) to automatically detect and setup a basic nvchecker
-config based on the source array of the package PKGBUILD.
-
-For detailed information on the various configuration options available for the
-`.nvchecker.toml` file, refer to the configuration files section in
-nvchecker(1). This documentation provides insights into the possible
-options that can be utilized to customize the version checking process.
-
-To supply GitHub or GitLab tokens to nvchecker, a `keyfile.toml` should be
-placed in the `$XDG_CONFIG_HOME`/nvchecker` directory. This keyfile is
-used for providing the necessary authentication tokens required for
-accessing the GitHub or GitLab API.
-
-Options
--------
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl version check::
-	Compares local package versions against upstream
-
-pkgctl version setup::
-	Automatically detect and setup a basic nvchecker config
-
-pkgctl version upgrade::
-	Adjust the PKGBUILD to match the latest upstream version
-
-See Also
---------
-
-pkgctl-version-check(1)
-pkgctl-version-setup(1)
-pkgctl-version-upgrade(1)
-
-include::include/footer.asciidoc[]

doc/man/pkgctl.1.asciidoc

@@ -1,78 +0,0 @@
-pkgctl(1)
-=========
-
-Name
-----
-pkgctl - Unified command-line frontend for devtools
-
-Synopsis
---------
-pkgctl [SUBCOMMAND] [OPTIONS]
-
-Description
------------
-
-Command-line utility serving as a unified interface for multiple development tools.
-This tool aims to simplify and optimize interactions with devtools by offering
-various subcommands for executing tasks related to package management, repository management,
-version control, among others.
-
-Utilizing pkgctl enables users to efficiently administer their development workflows.
-
-Options
--------
-
-*-V, --version*::
-	Show pkgctl version information
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
------------
-
-pkgctl aur::
-	Interact with the Arch User Repository
-
-pkgctl auth::
-	Authenticate with services like GitLab
-
-pkgctl build::
-	Build packages inside a clean chroot
-
-pkgctl db::
-	Pacman database modification for package update, move etc
-
-pkgctl diff::
-	Compare package files using different modes
-
-pkgctl issue::
-	Work with GitLab packaging issues
-
-pkgctl release::
-	Release step to commit, tag and upload build artifacts
-
-pkgctl repo::
-	Manage Git packaging repositories and their configuration
-
-pkgctl search::
-	Search for an expression across the GitLab packaging group
-
-pkgctl version::
-	Check and manage package versions against upstream
-
-See Also
---------
-
-pkgctl-aur(1)
-pkgctl-auth(1)
-pkgctl-build(1)
-pkgctl-db(1)
-pkgctl-diff(1)
-pkgctl-issue(1)
-pkgctl-release(1)
-pkgctl-repo(1)
-pkgctl-search(1)
-pkgctl-version(1)
-
-include::include/footer.asciidoc[]

lib/archroot.sh

@@ -4,19 +4,18 @@
 :
 
 # shellcheck disable=2034
-CHROOT_VERSION='v6'
+CHROOT_VERSION='v4'
 
 ##
 #  usage : check_root $keepenv
 ##
+orig_argv=("${BASH_SOURCE[0]}" "$@")
 check_root() {
 	local keepenv=$1
-	shift
-	local orig_argv=("$@")
 
 	(( EUID == 0 )) && return
 	if type -P sudo >/dev/null; then
-		exec sudo --preserve-env="${keepenv}" -- "${orig_argv[@]}"
+		exec sudo --preserve-env=$keepenv -- "${orig_argv[@]}"
 	else
 		exec su root -c "$(printf ' %q' "${orig_argv[@]}")"
 	fi

lib/common.sh

@@ -4,86 +4,29 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-[[ -z ${DEVTOOLS_INCLUDE_COMMON_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_COMMON_SH="$(set +o|grep nounset)"
+[[ -z ${_INCLUDE_COMMON_SH:-} ]] || return 0
+_INCLUDE_COMMON_SH="$(set +o|grep nounset)"
 
 set +u +o posix
 # shellcheck disable=1091
 . /usr/share/makepkg/util.sh
-$DEVTOOLS_INCLUDE_COMMON_SH
+$_INCLUDE_COMMON_SH
 
 # Avoid any encoding problems
-export LANG=C.UTF-8
-
-# Avoid systemd trying to color the terminal on systemd-nspawn
-export SYSTEMD_TINT_BACKGROUND=no
-
-# Avoid diffoscope looking at remote debug info through readelf
-unset DEBUGINFOD_URLS
+export LANG=C
 
 # Set buildtool properties
 export BUILDTOOL=devtools
-export BUILDTOOLVER=@buildtoolver@
+export BUILDTOOLVER=m4_devtools_version
 
-# Set common properties
-export PACMAN_KEYRING_DIR=/etc/pacman.d/gnupg
-export GITLAB_HOST=gitlab.archlinux.org
-export GIT_REPO_SPEC_VERSION=2
-export GIT_PACKAGING_NAMESPACE=archlinux/packaging/packages
-export GIT_PACKAGING_NAMESPACE_ID=11323
-export GIT_PACKAGING_URL_SSH="git@${GITLAB_HOST}:${GIT_PACKAGING_NAMESPACE}"
-export GIT_PACKAGING_URL_HTTPS="https://${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
-export PACKAGING_REPO_RELEASE_HOST=repos.archlinux.org
-export PKGBASE_MAINTAINER_URL=https://archlinux.org/packages/pkgbase-maintainer
-export AUR_URL_SSH=aur@aur.archlinux.org
-
-# Create or reuse a shared SSH control socket with ControlMaster=auto. The
-# connection is initialized on the first use and persisted for some time, so
-# multiple invokations of devtools can share it.
-# shellcheck disable=SC2016
-export SSH_OPTS=(
-  -o ControlMaster=auto
-  -o ControlPersist=60s
-  -o ControlPath='${XDG_RUNTIME_DIR}/devtools-%r@%h:%p'
-)
-
-export RSYNC_OPTS=(
-  --rsh="ssh ${SSH_OPTS[*]}"
-  --checksum
-  --copy-links
-  --human-readable
-  --progress
-  --partial
-  --partial-dir=.partial
-  --delay-updates
-)
-
-# ensure TERM is set with a fallback to dumb
-export TERM=${TERM:-dumb}
+shopt -s extglob
 
 # check if messages are to be printed using color
-if [[ -t 2 && "$TERM" != dumb ]] || [[ ${DEVTOOLS_COLOR} == always ]]; then
+if [[ -t 2 && "$TERM" != dumb ]]; then
 	colorize
-	if tput setaf 0 &>/dev/null; then
-		PURPLE="$(tput setaf 5)"
-		DARK_GREEN="$(tput setaf 2)"
-		DARK_RED="$(tput setaf 1)"
-		DARK_BLUE="$(tput setaf 4)"
-		DARK_YELLOW="$(tput setaf 3)"
-		UNDERLINE="$(tput smul)"
-		GRAY=$(tput setaf 242)
-	else
-		PURPLE="\e[35m"
-		DARK_GREEN="\e[32m"
-		DARK_RED="\e[31m"
-		DARK_BLUE="\e[34m"
-		DARK_YELLOW="\e[33m"
-		UNDERLINE="\e[4m"
-		GRAY=""
-	fi
 else
 	# shellcheck disable=2034
-	declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW='' PURPLE='' DARK_RED='' DARK_GREEN='' DARK_BLUE='' DARK_YELLOW='' UNDERLINE='' GRAY=''
+	declare -gr ALL_OFF='' BOLD='' BLUE='' GREEN='' RED='' YELLOW=''
 fi
 
 stat_busy() {
@@ -92,57 +35,12 @@ stat_busy() {
 	printf "${GREEN}==>${ALL_OFF}${BOLD} ${mesg}...${ALL_OFF}" "$@" >&2
 }
 
-stat_progress() {
-	# shellcheck disable=2059
-	printf "${BOLD}.${ALL_OFF}" >&2
-}
-
 stat_done() {
 	# shellcheck disable=2059
 	printf "${BOLD}done${ALL_OFF}\n" >&2
 }
 
-stat_failed() {
-	# shellcheck disable=2059
-	printf "${BOLD}${RED}failed${ALL_OFF}\n" >&2
-}
-
-msg_success() {
-	local msg=$1
-	local padding
-	padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
-	msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
-	printf "%s %s\n" "${padding}${GREEN}✓${ALL_OFF}" "${msg}" >&2
-}
-
-msg_error() {
-	local msg=$1
-	local padding
-	padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
-	msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
-	printf "%s %s\n" "${padding}${RED}x${ALL_OFF}" "${msg}" >&2
-}
-
-msg_warn() {
-	local msg=$1
-	local padding
-	padding=$(echo "${msg}"|sed -E 's/( *).*/\1/')
-	msg=$(echo "${msg}"|sed -E 's/ *(.*)/\1/')
-	printf "%s %s\n" "${padding}${YELLOW}!${ALL_OFF}" "${msg}" >&2
-}
-
-print_workdir_error() {
-	if [[ ! -f "${WORKDIR}"/error ]]; then
-		return
-	fi
-	while read -r LINE; do
-		error '%s' "${LINE}"
-	done < "${WORKDIR}/error"
-}
-
 _setup_workdir=false
-# Ensure that there is no outside value for WORKDIR leaking in
-unset WORKDIR
 setup_workdir() {
 	[[ -z ${WORKDIR:-} ]] && WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX")
 	_setup_workdir=true
@@ -154,9 +52,6 @@ cleanup() {
 	if [[ -n ${WORKDIR:-} ]] && $_setup_workdir; then
 		rm -rf "$WORKDIR"
 	fi
-	if tput setaf 0 &>/dev/null; then
-		tput cnorm >&2
-	fi
 	exit "${1:-0}"
 }
 
@@ -188,7 +83,7 @@ lock() {
 	# Only reopen the FD if it wasn't handed to us
 	if ! [[ "/dev/fd/$1" -ef "$2" ]]; then
 		mkdir -p -- "$(dirname -- "$2")"
-		eval "exec $1>>"'"$2"'
+		eval "exec $1>"'"$2"'
 	fi
 
 	if ! flock -n "$1"; then
@@ -244,20 +139,15 @@ pkgver_equal() {
 #    $pkgver can be supplied with or without a pkgrel appended.
 #    If not supplied, any pkgrel will be matched.
 ##
-shopt -s extglob
 find_cached_package() {
 	local searchdirs=("$PWD" "$PKGDEST") results=()
 	local targetname=$1 targetver=$2 targetarch=$3
-	local dir pkg packages pkgbasename name ver rel arch r results
+	local dir pkg pkgbasename name ver rel arch r results
 
 	for dir in "${searchdirs[@]}"; do
 		[[ -d $dir ]] || continue
 
-		shopt -s extglob nullglob
-		mapfile -t packages < <(printf "%s\n" "$dir"/"${targetname}"-"${targetver}"-*"${targetarch}".pkg.tar?(.!(sig|*.*)))
-		shopt -u extglob nullglob
-
-		for pkg in "${packages[@]}"; do
+		for pkg in "$dir"/*.pkg.tar?(.!(sig|*.*)); do
 			[[ -f $pkg ]] || continue
 
 			# avoid adding duplicates of the same inode
@@ -299,7 +189,7 @@ find_cached_package() {
 			return 1
 	esac
 }
-shopt -u extglob
+
 
 check_package_validity(){
 	local pkgfile=$1
@@ -362,16 +252,6 @@ getpkgdesc() {
 }
 
 
-get_tag_from_pkgver() {
-	local pkgver=$1
-	local tag=${pkgver}
-
-	tag=${tag/:/-}
-	tag=${tag//~/.}
-	echo "${tag}"
-}
-
-
 is_debug_package() {
 	local pkgfile=${1} pkgbase pkgname pkgdesc
 	pkgbase="$(getpkgbase "${pkgfile}")"
@@ -379,65 +259,3 @@ is_debug_package() {
 	pkgdesc="$(getpkgdesc "${pkgfile}")"
 	[[ ${pkgdesc} == "Detached debugging symbols for "* && ${pkgbase}-debug = "${pkgname}" ]]
 }
-
-# Proxy function to check if a file exists. Using [[ -f ... ]] directly is not
-# always wanted because we might want to expand bash globs first. This way we
-# can pass unquoted globs to is_globfile() and have them expanded as function
-# arguments before being checked.
-is_globfile() {
-	[[ -f $1 ]]
-}
-
-join_by() {
-	local IFS="	"
-	local sep=$1
-	local split
-	shift
-	split=$(printf "%s" "$*")
-	echo "${split//${IFS}/"${sep}"}"
-}
-
-trim_string() {
-	local max_length=$1
-	local string=$2
-
-	if (( ${#string} > max_length )); then
-		# Subtract 3 from max_length to accommodate "..."
-		max_length=$((max_length - 3))
-		string="${string:0:max_length}..."
-	fi
-
-	printf "%s" "${string}"
-}
-
-relative_date_unit() {
-	local target_date=$1
-	local now diff value units unit names
-
-	target_date=$(date -d "$1" +%s)
-	now=$(date +%s)
-	diff=$((now - target_date))
-
-	local names=(year month week day hour minute second)
-	declare -A units=(
-		[year]=$((60 * 60 * 24 * 365))
-		[month]=$((60 * 60 * 24 * 30))
-		[week]=$((60 * 60 * 24 * 7))
-		[day]=$((60 * 60 * 24))
-		[hour]=$((60 * 60))
-		[minute]=60
-		[second]=1
-	)
-
-	for unit in "${names[@]}"; do
-		local value=$((diff / ${units[${unit}]}))
-		if (( value > 1 )); then
-			printf "%s %ss" "${value}" "${unit}"
-			return
-		elif (( value == 1 )); then
-			printf "%s %s" "${value}" "${unit}"
-			return
-		fi
-	done
-	printf "1 second"
-}

lib/valid-repos.sh

@@ -0,0 +1,32 @@
+#!/hint/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+:
+
+# shellcheck disable=2034
+_repos=(
+	staging
+	testing
+	core
+	extra
+	community-staging
+	community-testing
+	community
+	multilib-staging
+	multilib-testing
+	multilib
+	gnome-unstable
+	kde-unstable
+)
+
+# shellcheck disable=2034
+_build_repos=(
+	staging
+	testing
+	extra
+	multilib-staging
+	multilib-testing
+	multilib
+	gnome-unstable
+	kde-unstable
+)

lib/valid-tags.sh

@@ -4,27 +4,23 @@
 :
 
 # shellcheck disable=2034
-DEVTOOLS_VALID_BINARY_ARCHES=(
+_arch=(
 	x86_64
-)
-
-# shellcheck disable=2034
-DEVTOOLS_VALID_ARCHES=(
-	"${DEVTOOLS_VALID_BINARY_ARCHES[@]}"
 	any
 )
 
 # shellcheck disable=2034
-DEVTOOLS_VALID_TAGS=(
+_tags=(
 	core-x86_64 core-any
-	core-staging-x86_64 core-staging-any
-	core-testing-x86_64 core-testing-any
 	extra-x86_64 extra-any
-	extra-staging-x86_64 extra-staging-any
-	extra-testing-x86_64 extra-testing-any
 	multilib-x86_64
+	staging-x86_64 staging-any
+	testing-x86_64 testing-any
 	multilib-testing-x86_64
 	multilib-staging-x86_64
+	community-x86_64 community-any
+	community-staging-x86_64 community-staging-any
+	community-testing-x86_64 community-testing-any
 	kde-unstable-x86_64 kde-unstable-any
 	gnome-unstable-x86_64 gnome-unstable-any
 )

src/arch-nspawn.in

@@ -2,12 +2,8 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/archroot.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/archroot.sh
-
+m4_include(lib/common.sh)
+m4_include(lib/archroot.sh)
 
 # umask might have been changed in /etc/profile
 # ensure that sane default is set again
@@ -16,25 +12,22 @@ umask 0022
 working_dir=''
 
 files=()
+mount_args=()
 
 usage() {
 	echo "Usage: ${0##*/} [options] working-dir [systemd-nspawn arguments]"
 	echo "A wrapper around systemd-nspawn. Provides support for pacman."
 	echo
 	echo ' options:'
-	echo '    -C <file>           Location of a pacman config file'
-	echo '    -M <file>           Location of a makepkg config file'
-	echo '    -c <dir>            Set pacman cache'
-	echo '    -f <src>[:<dst>]    Copy src file from the host to the chroot.'
-	echo '                        If dst file is not provided, it defaults to src'
-	echo '    -s                  Do not run setarch'
-	echo '    -h                  This message'
+	echo '    -C <file>     Location of a pacman config file'
+	echo '    -M <file>     Location of a makepkg config file'
+	echo '    -c <dir>      Set pacman cache'
+	echo '    -f <file>     Copy file from the host to the chroot'
+	echo '    -s            Do not run setarch'
+	echo '    -h            This message'
 	exit 1
 }
 
-# save all args for check_root
-orig_args=("$@")
-
 while getopts 'hC:M:c:f:s' arg; do
 	case "$arg" in
 		C) pac_conf="$OPTARG" ;;
@@ -49,32 +42,19 @@ done
 shift $((OPTIND - 1))
 
 (( $# < 1 )) && die 'You must specify a directory.'
-check_root "" "${BASH_SOURCE[0]}" "${orig_args[@]}"
+check_root
 
 working_dir=$(readlink -f "$1")
 shift 1
 
 [[ -z $working_dir ]] && die 'Please specify a working directory.'
 
-nspawn_args=(
-	--quiet
-	--directory="$working_dir"
-	--setenv="PATH=/usr/local/sbin:/usr/local/bin:/usr/bin"
-	--register=no
-	--slice="devtools-$(systemd-escape "${SUDO_USER:-$USER}")"
-	--machine="arch-nspawn-$$"
-	--as-pid2
-	--console=autopipe
-	--timezone=off
-)
-
 if (( ${#cache_dirs[@]} == 0 )); then
 	mapfile -t cache_dirs < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" CacheDir)
 fi
 
 # shellcheck disable=2016
 host_mirrors=($(pacman-conf --repo extra Server 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
-host_cachemirrors=($(pacman-conf --repo extra CacheServer 2> /dev/null | sed -r 's#(.*/)extra/os/.*#\1$repo/os/$arch#'))
 
 for host_mirror in "${host_mirrors[@]}"; do
 	if [[ $host_mirror == *file://* ]]; then
@@ -96,10 +76,10 @@ while read -r line; do
 	done
 done < <(pacman-conf --config "${pac_conf:-$working_dir/etc/pacman.conf}" --repo-list)
 
-nspawn_args+=(--bind="${cache_dirs[0]//:/\\:}")
+mount_args+=("--bind=${cache_dirs[0]//:/\\:}")
 
 for cache_dir in "${cache_dirs[@]:1}"; do
-	nspawn_args+=(--bind-ro="${cache_dir//:/\\:}")
+	mount_args+=("--bind-ro=${cache_dir//:/\\:}")
 done
 
 # {{{ functions
@@ -109,23 +89,13 @@ copy_hostconf () {
 
 	printf 'Server = %s\n' "${host_mirrors[@]}" >"$working_dir/etc/pacman.d/mirrorlist"
 
-	[[ -n $host_cachemirrors ]] && printf 'CacheServer = %s\n' "${host_cachemirrors[@]}" >>"$working_dir/etc/pacman.d/mirrorlist"
-
 	[[ -n $pac_conf ]] && cp "$pac_conf" "$working_dir/etc/pacman.conf"
-	if [[ -n $makepkg_conf ]]; then
-		cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
-		if [[ -d "${makepkg_conf}.d" ]] && is_globfile "${makepkg_conf}.d"/*.conf; then
-			mkdir --parents "$working_dir/etc/makepkg.conf.d/"
-			cp "${makepkg_conf}.d/"*.conf "$working_dir/etc/makepkg.conf.d/"
-		fi
-	fi
+	[[ -n $makepkg_conf ]] && cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
 
 	local file
 	for file in "${files[@]}"; do
-		src="${file%%:*}"
-		dst="${file#*:}"
-		mkdir -p "$(dirname "$working_dir$dst")"
-		cp -T "$src" "$working_dir$dst"
+		mkdir -p "$(dirname "$working_dir$file")"
+		cp -T "$file" "$working_dir$file"
 	done
 
 	sed -r "s|^#?\\s*CacheDir.+|CacheDir = ${cache_dirs[*]}|g" -i "$working_dir/etc/pacman.conf"
@@ -152,4 +122,9 @@ else
 	set_arch="${CARCH}"
 fi
 
-exec ${CARCH:+setarch "$set_arch"} systemd-nspawn "${nspawn_args[@]}" "$@"
+exec ${CARCH:+setarch "$set_arch"} systemd-nspawn -q \
+	-D "$working_dir" \
+	-E "PATH=/usr/local/sbin:/usr/local/bin:/usr/bin" \
+	--register=no --keep-unit --as-pid2 \
+	"${mount_args[@]}" \
+	"$@"