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.
2025-09-14 02:16:18 +02:00 · 2022-08-23 20:41:49 +02:00
67 changed files with 588 additions and 3949 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
 *~
 devtools-*.tar.gz*
-/build/
+build/
--- a/93
+++ b/93
@@ -1,30 +1,23 @@
-SHELL=/bin/bash
-
-V=20230307
+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/*)
 SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
 MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc)))

 COMMITPKG_LINKS = \
-	core-testingpkg \
-	core-stagingpkg \
 	extrapkg \
-	extra-testingpkg \
-	extra-stagingpkg \
+	testingpkg \
+	stagingpkg \
+	communitypkg \
+	community-testingpkg \
+	community-stagingpkg \
 	multilibpkg \
 	multilib-testingpkg \
 	multilib-stagingpkg \
@@ -44,12 +37,18 @@ ARCHBUILD_LINKS = \
 	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


-all: binprogs library conf completion man
+all: binprogs completion man
 binprogs: $(BINPROGS)
-library: $(LIBRARY)
 completion: $(COMPLETIONS)
 man: $(MANS)

@@ -68,76 +67,64 @@ 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/asciidoc.conf doc/man/include/footer.asciidoc
 	$(GEN_MSG)
 	@mkdir -p $(BUILDDIR)/doc/man
-	@a2x --no-xmllint --asciidoc-opts="-f doc/asciidoc.conf" -d manpage -f manpage --destination-dir=$(BUILDDIR)/doc/man -a pkgdatadir=$(DATADIR) $<
-
-conf:
-	@install -d $(BUILDDIR)/makepkg.conf.d $(BUILDDIR)/pacman.conf.d
-	@cp -a $(MAKEPKG_CONFIGS) $(BUILDDIR)/makepkg.conf.d
-	@cp -a $(PACMAN_CONFIGS) $(BUILDDIR)/pacman.conf.d
+	@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
-	cp -ra $(BUILDDIR)/lib/* $(DESTDIR)$(DATADIR)/lib
-	for conf in $(notdir $(MAKEPKG_CONFIGS)); do install -Dm0644 $(BUILDDIR)/makepkg.conf.d/$$conf $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
-	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 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
-	for conf in $(notdir $(MAKEPKG_CONFIGS)); do rm -f $(DESTDIR)$(DATADIR)/makepkg.conf.d/$${conf##*/}; done
-	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
-	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)/makepkg.conf.d \
-		$(DESTDIR)$(DATADIR)/pacman.conf.d \
-		$(DESTDIR)$(DATADIR)/lib \
-		$(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:
@@ -152,8 +139,8 @@ dist:
 upload:
 	scp devtools-$(V).tar.gz devtools-$(V).tar.gz.sig repos.archlinux.org:/srv/ftp/other/devtools/

-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 clean install uninstall tag dist upload check
+.PHONY: all completion man clean install uninstall dist upload check tag
 .DELETE_ON_ERROR:
--- a/README.md
+++ b/README.md
@@ -14,15 +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
-```
-
 ## Releasing

 1. bump the version in the Makefile
@@ -32,36 +23,6 @@ will automatically build the project and proxy all calls to the local build dire
 5. Upload the source tarball with ```make dist upload```
 6. Update the package

-## Dependencies
-
-### Runtime
-
- arch-install-scripts
- awk
- bash
- binutils
- coreutils
- diffutils
- findutils
- grep
- jq
- openssh
- parallel
- rsync
- sed
- util-linux
-
- bzr
- git
- mercurial
- subversion
-
-### Development
-
- asciidoc
- make
- shellcheck
-
 ## License

 Devtools is licensed under the terms of the **GPL-3.0-or-later** (see [LICENSE](LICENSE)).
--- a/config/makepkg/x86_64.conf
+++ b/config/makepkg/x86_64.conf
@@ -46,13 +46,13 @@ CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"
-RUSTFLAGS=""
+#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"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"

 #########################################################################
 # BUILD ENVIRONMENT
@@ -94,7 +94,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
 #
-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)
--- a/config/makepkg/x86_64_v3.conf
+++ b/config/makepkg/x86_64_v3.conf
@@ -46,13 +46,13 @@ CFLAGS="-march=x86-64-v3 -mtune=generic -O2 -pipe -fno-plt -fexceptions \
 CXXFLAGS="$CFLAGS -Wp,-D_GLIBCXX_ASSERTIONS"
 LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now"
 LTOFLAGS="-flto=auto"
-RUSTFLAGS=""
+#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"
+#DEBUG_RUSTFLAGS="-C debuginfo=2"

 #########################################################################
 # BUILD ENVIRONMENT
@@ -94,7 +94,7 @@ BUILDENV=(!distcc color !ccache check !sign)
 #-- debug:      Add debugging flags as specified in DEBUG_* variables
 #-- lto:        Add compile flags for building with link time optimization
 #
-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)
--- a/contrib/completion/bash/devtools.in
+++ b/contrib/completion/bash/devtools.in
@@ -2,431 +2,89 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later

-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# 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
+_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
+}

-_binary_arch=${_arch[*]:0:-1}
-_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
-	-U
-)
-_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_U_opts() { :; }
-_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
-	-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
-	-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_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() {
+  local cur
+  COMPREPLY=()
+  _get_comp_words_by_ref cur

-_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
+  case $cur in
+    -*)
+       COMPREPLY=( $( compgen -W '-C -M -c -h' -- "$cur" ) )
+       ;;
+    *)
+      _filedir
+      return 0
+      ;;
+  esac

-
-_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_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=(
-	auth
-	build
-	db
-	diff
-	release
-	repo
-	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
-
-	--pkgver
-	--pkgrel
-	--rebuild
-	-e --edit
-
-	-r --release
-	-m --message
-	-u --db-update
-
-	-h --help
-)
-_pkgctl_build_args__arch_opts() { _devtools_completions_arch; }
-_pkgctl_build_args__repo_opts() { _devtools_completions_repo; }
-_pkgctl_build_args__pkgver_opts() { :; }
-_pkgctl_build_args__pkgrel_opts() { :; }
-_pkgctl_build_args__message_opts() { :; }
-_pkgctl_build_args_m_opts() { _pkgctl_build_args__message_opts; }
-_pkgctl_build_opts() { _filedir -d; }
-
-
-_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=(
-	-a --arch
-	-h --help
-)
-_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_repo_cmds=(
-	clone
-	configure
-	create
-	web
-)
-
-
-_pkgctl_repo_clone_args=(
-	-m --maintainer
-	-u --unprivileged
-	--universe
-	-h --help
-)
-_pkgctl_repo_clone_args__maintainer_opts() { :; }
-_pkgctl_repo_clone_args_m_opts() { _pkgctl_repo_clone_args__maintainer_opts; }
-_pkgctl_repo_clone_opts() { _devtools_completions_all_packages; }
-
-
-_pkgctl_repo_configure_args=(
-	-h --help
-)
-_pkgctl_repo_configure_opts() { _filedir -d; }
-
-
-_pkgctl_repo_create_args=(
-	-c --clone
-	-h --help
-)
-
-
-_pkgctl_repo_web_args=(
-	-h --help
-)
-_pkgctl_repo_web_opts() { _filedir -d; }
-
-
-_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_version_args=(
-	-h --help
-)
-
-
-_devtools_completions_color() {
-	mapfile -t COMPREPLY < <(compgen -W "${_colors[*]}" -- "$cur")
-}
-_devtools_completions_arch() {
-	mapfile -t COMPREPLY < <(compgen -W "${_arch[*]}" -- "$cur")
-}
-_devtools_completions_repo() {
-	local optional=${1:-}
-	mapfile -t COMPREPLY < <(compgen -W "${optional} ${_repos[*]}" -- "$cur")
-}
-_devtools_completions_build_repo() {
-	mapfile -t COMPREPLY < <(compgen -W "${_build_repos[*]}" -- "$cur")
-}
-_devtools_completions_all_packages() {
-	mapfile -t COMPREPLY < <(compgen -W "$(pacman -Sql)" -- "$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
+  true
+} &&
+complete -F _arch-nspawn arch-nspawn
+# ex:et ts=2 sw=2 ft=sh
--- a/contrib/completion/zsh/_devtools.in
+++ b/contrib/completion/zsh/_devtools.in
@@ -1,15 +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-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
+m4_include(lib/valid-tags.sh)
+m4_include(lib/valid-repos.sh)

 _binary_arch=${_arch[*]:0:-1}
-_colors=(never always auto)

 _archbuild_args=(
 	'-c[Recreate the chroot before building]'
@@ -18,108 +14,10 @@ _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:($_arch[*])"
-	"--repo=[Specify a target repository (disables auto-detection)]:repo:($_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]'
-	'(-I --install)'{-I,--install}'[Install a package into the working copy of the chroot]:target:_files -g "*.pkg.tar.*(.)"'
-	'--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]'
-	'(-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:($_repos[*])"
-	"2:target-repo:($_repos[*])"
-	'*:pkgbase:_devtools_completions_all_packages'
-)
-
-_pkgctl_db_remove_args=(
-	'(-a --arch=)'{-a,--arch=}"[Override the architecture (disables auto-detection)]:arch:($_arch[*])"
-	'(-h --help)'{-h,--help}'[Display usage]'
-	"1:repo:($_repos[*])"
-	'*:pkgbase:_devtools_completions_all_packages'
-)
-
-_pkgctl_db_update_args=(
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_release_args=(
-	'(-m --message=)'{-m,--message=}"[Use the given <msg> as the commit message]:message:"
-	'(-r --repo=)'{-r,--repo=}"[Specify a target repository (disables auto-detection)]:repo:($_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_repo_cmds=(
-	"pkgctl repo command"
-	"clone[Clone a package repository]"
-	"configure[Configure a clone according to distro specs]"
-	"create[Create a new GitLab package repository]"
-	"web[Open the packaging repository's website]"
-)
-
-_pkgctl_repo_clone_args=(
-	'(-m --maintainer=)'{-m,--maintainer=}'[Clone all packages of the named maintainer]:maintainer:'
-	'--universe[Clone all existing packages, useful for cache warming]'
-	'(-h --help)'{-h,--help}'[Display usage]'
+_archco_args=(
 	'*:packages:_devtools_completions_all_packages'
 )

-_pkgctl_repo_configure_args=(
-	'(-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=(
-	'(-h --help)'{-h,--help}'[Display usage]'
-	'*:git_dir:_files -/'
-)
-
 _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(.)"'
@@ -149,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'
@@ -187,6 +80,11 @@ _mkarchroot_args=(
 	'*: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]'
@@ -223,62 +121,9 @@ _devtools_completions_all_packages() {
 	compadd - "${(@)packages}"
 }

-_pkgctl_cmds=(
-	"pkgctl command"
-	"auth[Authenticate with services like GitLab]"
-	"build[Build packages inside a clean chroot]"
-	"db[Pacman database modification for packge update, move etc]"
-	"diff[Compare package files using different modes]"
-	"release[Release step to commit, tag and upload build artifacts]"
-	"repo[Manage Git packaging repositories and their configuration]"
-	"version[Show pkgctl version information]"
-)
-
-_pkgctl_args=(
-	'(-V --version)'{-V,--version}'[Show pkgctl version information]'
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_pkgctl_version_args=(
-	'(-h --help)'{-h,--help}'[Display usage]'
-)
-
-_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
--- a/doc/man/archbuild.1.asciidoc
+++ b/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
 -------
--- a/doc/man/devtools.7.asciidoc
+++ b/doc/man/devtools.7.asciidoc
@@ -8,22 +8,16 @@ 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.

-linkman:pkgctl[1]
-	Unified command-line frontend for devtools
-
 linkman:archbuild[1]
 	Build an Arch Linux package inside a clean chroot

@@ -33,12 +27,6 @@ linkman:arch-nspawn[1]
 linkman:checkpkg[1]
 	Compare the current build package with the repository version

-linkman:diffpkg[1]
-	Compare package files using different modes
-
-linkman:export-pkgbuild-keys[1]
-	Export valid source signing keys from a PKGBUILD
-
 linkman:find-libdeps[1]
 	Find soname dependencies for a package

--- a/doc/man/diffpkg.1.asciidoc
+++ b/doc/man/diffpkg.1.asciidoc
@@ -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[]
--- a/doc/man/include/footer.asciidoc
+++ b/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.
--- a/doc/man/pkgctl-build.1.asciidoc
+++ b/doc/man/pkgctl-build.1.asciidoc
@@ -1,83 +0,0 @@
-pkgctl-build(1)
-===============
-
-Name
----
-pkgctl-build - Build packages inside a clean chroot
-
-Synopsis
--------
-pkgctl build [OPTIONS] [PATH...]
-
-Description
-----------
-
-TODO
-
-Build Options
-------------
-
-*--arch* 'ARCH'::
-	Specify architectures to build for (disables auto-detection)
-
-*--repo* 'REPO'::
-	Specify a target repository (disables auto-detection)
-
-*-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
-
-*-I, --install* 'FILE'::
-	Install a package into the working copy of the chroot
-
-*--nocheck*::
-	Do not run the check() function in the PKGBUILD
-
-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
-
-*-e, --edit*::
-	Edit the PKGBUILD before building
-
-Release Options
---------------
-
-*-r, --release*::
-	Automatically commit, tag and release after building
-
-*-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
--------
-
-linkman:pkgctl-release[1]
-linkman:pkgctl-db-update[1]
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl-db-move.1.asciidoc
+++ b/doc/man/pkgctl-db-move.1.asciidoc
@@ -1,24 +0,0 @@
-pkgctl-db-move(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[]
--- a/doc/man/pkgctl-db-remove.1.asciidoc
+++ b/doc/man/pkgctl-db-remove.1.asciidoc
@@ -1,26 +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.
-
-Options
-------
-
-*-a, --arch* 'ARCH'::
-	Override the architecture (disables auto-detection)
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl-db-update.1.asciidoc
+++ b/doc/man/pkgctl-db-update.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 pacman repositories.
-
-Options
-------
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl-diff.1.asciidoc
+++ b/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[]
--- a/doc/man/pkgctl-release.1.asciidoc
+++ b/doc/man/pkgctl-release.1.asciidoc
@@ -1,49 +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 a target repository (disables auto-detection)
-
-*-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
--------
-
-linkman:pkgctl-db-update[1]
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl-repo-clone.1.asciidoc
+++ b/doc/man/pkgctl-repo-clone.1.asciidoc
@@ -1,39 +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
-
-*--universe*::
-	Clone all existing packages, useful for cache warming
-
-*-h, --help*::
-	Show a help text
-
-See Also
--------
-
-linkman:pkgctl-repo-configure[1]
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl-repo-configure.1.asciidoc
+++ b/doc/man/pkgctl-repo-configure.1.asciidoc
@@ -1,31 +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.
-
-Options
-------
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl-repo-create.1.asciidoc
+++ b/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
--------
-
-linkman:pkgctl-auth[1]
-linkman:pkgctl-repo-clone[1]
-linkman:pkgctl-repo-configure[1]
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl-repo-web.1.asciidoc
+++ b/doc/man/pkgctl-repo-web.1.asciidoc
@@ -1,24 +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
-------
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl-repo.1.asciidoc
+++ b/doc/man/pkgctl-repo.1.asciidoc
@@ -1,55 +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 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 web::
-	Open the packaging repository's website
-
-See Also
--------
-
-linkman:pkgctl-repo-clone[1]
-linkman:pkgctl-repo-configure[1]
-linkman:pkgctl-repo-create[1]
-linkman:pkgctl-repo-web[1]
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl-version.1.asciidoc
+++ b/doc/man/pkgctl-version.1.asciidoc
@@ -1,23 +0,0 @@
-pkgctl-version(1)
-=================
-
-Name
----
-pkgctl-version - Show pkgctl version information
-
-Synopsis
--------
-pkgctl version [OPTIONS]
-
-Description
-----------
-
-Shows the current version information of pkgctl.
-
-Options
-------
-
-*-h, --help*::
-	Show a help text
-
-include::include/footer.asciidoc[]
--- a/doc/man/pkgctl.1.asciidoc
+++ b/doc/man/pkgctl.1.asciidoc
@@ -1,61 +0,0 @@
-pkgctl(1)
-=========
-
-Name
----
-pkgctl - Unified command-line frontend for devtools
-
-Synopsis
--------
-pkgctl [SUBCOMMAND] [OPTIONS]
-
-Description
-----------
-
-TODO
-
-Options
-------
-
-*-V, --version*::
-	Show pkgctl version information
-
-*-h, --help*::
-	Show a help text
-
-Subcommands
-----------
-
-pkgctl auth::
-	Authenticate with services like GitLab
-
-pkgctl build::
-	Build packages inside a clean chroot
-
-pkgctl db::
-	Pacman database modification for packge update, move etc
-
-pkgctl diff::
-	Compare package files using different modes
-
-pkgctl release::
-	Release step to commit, tag and upload build artifacts
-
-pkgctl repo::
-	Manage Git packaging repositories and their configuration
-
-pkgctl version::
-	Show pkgctl version information
-
-See Also
--------
-
-linkman:pkgctl-auth[1]
-linkman:pkgctl-build[1]
-linkman:pkgctl-db[1]
-linkman:pkgctl-diff[1]
-linkman:pkgctl-release[1]
-linkman:pkgctl-repo[1]
-linkman:pkgctl-version[1]
-
-include::include/footer.asciidoc[]
--- a/src/lib/archroot.sh
+++ b/src/lib/archroot.sh
--- a/src/lib/common.sh
+++ b/src/lib/common.sh
@@ -4,30 +4,22 @@
 #
 # 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

 # 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=0
-export GIT_PACKAGING_NAMESPACE=bot-test/packages
-export GIT_PACKAGING_NAMESPACE_ID=11233
-export GIT_PACKAGING_URL_SSH="ssh://git@${GITLAB_HOST}:222/${GIT_PACKAGING_NAMESPACE}"
-export GIT_PACKAGING_URL_HTTPS="https://${GITLAB_HOST}/${GIT_PACKAGING_NAMESPACE}"
-export PACKAGING_REPO_RELEASE_HOST=repos.sandbox.archlinux.org
+shopt -s extglob

 # check if messages are to be printed using color
 if [[ -t 2 && "$TERM" != dumb ]]; then
@@ -43,40 +35,11 @@ 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
 }

-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
-}
-
 _setup_workdir=false
 setup_workdir() {
 	[[ -z ${WORKDIR:-} ]] && WORKDIR=$(mktemp -d --tmpdir "${0##*/}.XXXXXXXXXX")
@@ -176,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
@@ -231,7 +189,7 @@ find_cached_package() {
 			return 1
 	esac
 }
-shopt -u extglob
+

 check_package_validity(){
 	local pkgfile=$1
@@ -294,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}")"
--- a/src/lib/valid-repos.sh
+++ b/src/lib/valid-repos.sh
@@ -5,17 +5,28 @@

 # shellcheck disable=2034
 _repos=(
-	core core-staging core-testing
-	extra extra-staging extra-testing
-	multilib multilib-staging multilib-testing
+	staging
+	testing
+	core
+	extra
+	community-staging
+	community-testing
+	community
+	multilib-staging
+	multilib-testing
+	multilib
 	gnome-unstable
 	kde-unstable
 )

 # shellcheck disable=2034
 _build_repos=(
-	extra staging testing
-	multilib multilib-staging multilib-testing
+	staging
+	testing
+	extra
+	multilib-staging
+	multilib-testing
+	multilib
 	gnome-unstable
 	kde-unstable
 )
--- a/src/lib/valid-tags.sh
+++ b/src/lib/valid-tags.sh
@@ -12,14 +12,15 @@ _arch=(
 # shellcheck disable=2034
 _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
 )
--- a/opts.sh
+++ b/opts.sh
@@ -1,46 +0,0 @@
-#!/bin/bash
-
-# NOTE: This requires GNU getopt
-if ! ARGS=$(getopt --options vdm:D: \
-		--long verbose,debug,memory:,debugfile: \
-		--name 'pkgctl foo' -- "$@"); then
-	exit 1
-fi
-
-eval set -- "$ARGS"
-
-echo "${ARGS}"
-
-while (( $# )); do
-  case "$1" in
-    -v | --verbose ) echo verbose; shift ;;
-    -d | --debug ) echo debug; shift ;;
-    -m | --memory ) echo "memory=$2"; shift 2 ;;
-    -D | --debugfile ) echo "debugfile=$2"; shift 2 ;;
-	--)
-		echo --
-		shift
-		break
-		;;
-	-*)
-		echo "invalid argument: %s" "$1"
-		exit 1
-		;;
-	*)
-		echo STAR "$1"
-		shift
-		;;
-  esac
-done
-
-echo main
-
-if (( ! $# )); then
-	echo missing positional param: version
-	exit 1
-fi
-version=$1
-shift
-
-echo "version $version"
-echo "$@"
--- a/src/arch-nspawn.in
+++ b/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
--- a/src/archbuild.in
+++ b/src/archbuild.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)

 base_packages=(base-devel)
 makechrootpkg_args=(-c -n -C)
@@ -27,32 +23,16 @@ if [[ -f "@pkgdatadir@/setarch-aliases.d/${arch}" ]]; then
 else
 	set_arch="${arch}"
 fi
-
-# Architecture-specific Mount
-arch_mounts=()
-if [[ -f "@pkgdatadir@/mount.d/${arch}" ]]; then
-	mapfile -t arch_mounts < "@pkgdatadir@/mount.d/${arch}"
-fi
-for arch_mount in "${arch_mounts[@]}"; do
-	if [[ $arch_mount = rw* ]]; then
-		arch_mount=${arch_mount#rw }
-		in_array "$arch_mount" "${makechrootpkg_args[@]}" || makechrootpkg_args+=("-d" "$arch_mount")
-	elif [[ $arch_mount = ro* ]]; then
-		arch_mount=${arch_mount#ro }
-		in_array "$arch_mount" "${makechrootpkg_args[@]}" || makechrootpkg_args+=("-D" "$arch_mount")
-	fi
-done
-
 chroots='/var/lib/archbuild'
 clean_first=false

-pacman_config="@pkgdatadir@/pacman.conf.d/${repo}.conf"
-if [[ -f @pkgdatadir@/pacman.conf.d/${repo}-${arch}.conf ]]; then
-    pacman_config="@pkgdatadir@/pacman.conf.d/${repo}-${arch}.conf"
+pacman_config="@pkgdatadir@/pacman-${repo}.conf"
+if [[ -f @pkgdatadir@/pacman-${repo}-${arch}.conf ]]; then
+    pacman_config="@pkgdatadir@/pacman-${repo}-${arch}.conf"
 fi
-makepkg_config="@pkgdatadir@/makepkg.conf.d${arch}.conf"
-if [[ -f @pkgdatadir@/makepkg.conf.d/${repo}-${arch}.conf ]]; then
-    makepkg_config="@pkgdatadir@/makepkg.conf.d/${repo}-${arch}.conf"
+makepkg_config="@pkgdatadir@/makepkg-${arch}.conf"
+if [[ -f @pkgdatadir@/makepkg-${repo}-${arch}.conf ]]; then
+    makepkg_config="@pkgdatadir@/makepkg-${repo}-${arch}.conf"
 fi

 usage() {
--- a/src/archco.in
+++ b/src/archco.in
@@ -0,0 +1,26 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+m4_include(lib/common.sh)
+
+scriptname=${0##*/}
+
+if [[ -z $1 ]]; then
+	printf 'Usage: %s <package name>...\n' "$scriptname"
+	exit 1
+fi
+
+case $scriptname in
+	archco)
+		SVNURL="svn+ssh://svn-packages@repos.archlinux.org/srv/repos/svn-packages/svn";;
+	communityco)
+		SVNURL="svn+ssh://svn-community@repos.archlinux.org/srv/repos/svn-community/svn";;
+	*)
+		die "Couldn't find svn url for %s" "$scriptname"
+		;;
+esac
+
+for i in "$@"; do
+	svn co "$SVNURL/$i"
+done
--- a/src/archrelease.in
+++ b/src/archrelease.in
@@ -2,19 +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/valid-tags.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
-
-set -e
-
-
-# Deprecation warning
-if [[ -z $_DEVTOOLS_COMMAND ]]; then
-	warning "${0##*/} is deprecated and will be removed. Use 'pkgctl release' instead"
-fi
+m4_include(lib/common.sh)
+m4_include(lib/valid-tags.sh)

 # parse command line options
 FORCE=
@@ -45,51 +34,54 @@ if [[ ! -f PKGBUILD ]]; then
 	die 'archrelease: PKGBUILD not found'
 fi

-# shellcheck source=contrib/makepkg/PKGBUILD.proto
-. ./PKGBUILD
-pkgbase=${pkgbase:-$pkgname}
-pkgver=$(get_full_version "$pkgbase")
-gittag=$(get_tag_from_pkgver "$pkgver")
+trunk=${PWD##*/}

-# Check if releasing from a branch
-if ! branchname=$(git symbolic-ref --short HEAD); then
-	die 'not on any branch'
+# Normally this should be trunk, but it may be something
+# such as 'gnome-unstable'
+IFS='/' read -r -d '' -a parts <<< "$PWD"
+if [[ "${parts[*]:(-2):1}" == "repos" ]]; then
+	die 'archrelease: Should not be in repos dir (try from trunk/)'
 fi
-if [[ "${branchname}" != main ]]; then
-	die 'must be run from the main branch'
+unset parts
+
+if [[ $(svn status -q) ]]; then
+	die 'archrelease: You have not committed your changes yet!'
 fi

-# Check if remote origin is setup properly
-if ! giturl=$(git remote get-url origin) || [[ ${giturl} != *${GIT_PACKAGING_URL_SSH}* ]]; then
-	die "remote origin is not configured, run 'pkgctl repo configure'"
-fi
-if ! git ls-remote origin >/dev/null; then
-	die "configured remote origin may not exist, run 'pkgctl repo create ${pkgbase}' to create it"
-fi
+pushd .. >/dev/null
+mapfile -t known_files < <(svn ls -r HEAD "$trunk")
+wait $! || die "failed to discover committed files"

-msg 'Fetching remote changes'
-git fetch --prune --prune-tags origin || die 'failed to fetch remote changes'
+# gracefully handle files containing an "@" character
+known_files=("${known_files[@]/%/@}")

-# Check if local branch is up to date and contains the latest origin commit
-if remoteref=$(git rev-parse "origin/${branchname}" 2>/dev/null); then
-	if [[ $(git branch "${branchname}" --contains "${remoteref}" --format '%(refname:short)') != "${branchname}" ]]; then
-		die "local branch is out of date, run 'git pull --rebase'"
+# update repo directory first to avoid a commit failure
+svn up repos
+
+for tag in "$@"; do
+	stat_busy "Copying %s to %s" "${trunk}" "${tag}"
+
+	if [[ -d repos/$tag ]]; then
+		mapfile -t trash < <(svn ls --recursive "repos/$tag")
+		wait $! || die "failed to discover existing files"
+		if (( ${#trash[@]} )); then
+			trash=("${trash[@]/#/repos/$tag/}")
+			svn rm -q "${trash[@]/%/@}"
+		fi
+	else
+		mkdir -p "repos/$tag"
+		svn add --parents -q "repos/$tag"
 	fi
-fi

-# If the tag exists we check if it's properly signed and that it
-# matches the working directory PKGBUILD.
-if git tag --verify "$gittag" &> /dev/null; then
-	cwd_checksum=$(sha256sum PKGBUILD|cut -d' ' -f1)
-	tag_checksum=$(git show "${gittag}:PKGBUILD" | sha256sum |cut -d' ' -f1)
-	if [[ "$cwd_checksum" != "$tag_checksum" ]]; then
-		die "tagged PKGBUILD is not the same as the working dir PKGBUILD"
-	fi
-	git push --tags --set-upstream origin main || abort
-	exit 0
-fi
+	# copy all files at once from trunk to the subdirectory in repos/
+	svn copy -q -r HEAD "${known_files[@]/#/$trunk/}" "repos/$tag/"
+
+	stat_done
+done

 stat_busy "Releasing package"
-git tag --sign --message="Package release ${pkgver}" "$gittag" || abort
-git push --tags --set-upstream origin main || abort
+printf -v tag_list ", %s" "$@"; tag_list="${tag_list#, }"
+svn commit -q -m "archrelease: copy ${trunk} to $tag_list" || abort
 stat_done
+
+popd >/dev/null
--- a/src/checkpkg.in
+++ b/src/checkpkg.in
@@ -2,10 +2,9 @@
 #
 # 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
+shopt -s extglob

+m4_include(lib/common.sh)

 usage() {
    cat <<- _EOF_
@@ -53,7 +52,7 @@ while (( $# )); do
 			shift
 			break
 			;;
-		-*|--*)
+		-*,--*)
 			die "invalid argument: %s" "$1"
 			;;
 		*)
--- a/src/commitpkg.in
+++ b/src/commitpkg.in
@@ -2,39 +2,7 @@
 #
 # 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
-
-source /usr/share/makepkg/util/util.sh
-
-
-check_pkgbuild_validity() {
-	# shellcheck source=contrib/makepkg/PKGBUILD.proto
-	. ./PKGBUILD
-
-	# skip when there are no sources available
-	if (( ! ${#source[@]} )); then
-		return
-	fi
-
-	# validate sources hash algo is at least > sha1
-	local bad_algos=("cksums" "md5sums" "sha1sums")
-	local good_hash_algo=false
-
-	# from makepkg libmakepkg/util/schema.sh
-	for integ in "${known_hash_algos[@]}"; do
-		local sumname="${integ}sums"
-		if [[ -n ${!sumname} ]] && ! in_array "${sumname}" "${bad_algos[@]}"; then
-			good_hash_algo=true
-			break
-		fi
-	done
-
-	if ! $good_hash_algo; then
-		die "PKGBUILD lacks a secure cryptographic checksum, insecure algorithms: ${bad_algos[*]}"
-	fi
-}
+m4_include(lib/common.sh)

 # Source makepkg.conf; fail if it is not found
 if [[ -r '/etc/makepkg.conf' ]]; then
@@ -54,31 +22,8 @@ elif [[ -r "$HOME/.makepkg.conf" ]]; then
 fi

 cmd=${0##*/}
-
-# Deprecation warning
-if [[ -z $_DEVTOOLS_COMMAND ]]; then
-	warning "${cmd} is deprecated and will be removed. Use 'pkgctl release' instead"
-fi
-
-if [[ ! -f PKGBUILD ]]; then
-	die 'No PKGBUILD file'
-fi
-
-if ! repo_spec=$(git config --local devtools.version) || [[ ${repo_spec} != "${GIT_REPO_SPEC_VERSION}" ]]; then
-	error "repository specs are out of date, try:"
-	msg2 'pkgctl repo configure'
-	exit 1
-fi
-
-if [[ "$(git symbolic-ref --short HEAD)" != main ]]; then
-	die 'must be run from the main branch'
-fi
-
-source=()
-# shellcheck source=contrib/makepkg/PKGBUILD.proto
-. ./PKGBUILD
-pkgbase=${pkgbase:-$pkgname}
-
+rsyncopts=(-e ssh -p '--chmod=ug=rw,o=r' -c -h -L --progress --partial -y)
+archreleaseopts=()
 case "$cmd" in
 	commitpkg)
 		if (( $# == 0 )); then
@@ -94,7 +39,26 @@ case "$cmd" in
 		die 'Usage: commitpkg <reponame> [-f] [-s server] [-l limit] [-a arch] [commit message]'
 		;;
 esac
+while getopts ':l:a:s:f' flag; do
+	case $flag in
+		f) archreleaseopts+=('-f') ;;
+		s) server=$OPTARG ;;
+		l) rsyncopts+=("--bwlimit=$OPTARG") ;;
+		a) commit_arch=$OPTARG ;;
+		:) die "Option requires an argument -- '%s'" "$OPTARG" ;;
+		\?) die "Invalid option -- '%s'" "$OPTARG" ;;
+	esac
+done
+shift $(( OPTIND - 1 ))

+if [[ ! -f PKGBUILD ]]; then
+	die 'No PKGBUILD file'
+fi
+
+source=()
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
+. ./PKGBUILD
+pkgbase=${pkgbase:-$pkgname}

 if (( ${#validpgpkeys[@]} != 0 )); then
 	if [[ -d keys ]]; then
@@ -107,7 +71,7 @@ if (( ${#validpgpkeys[@]} != 0 )); then
 		export-pkgbuild-keys || die 'Failed to export valid PGP keys for source files'
 	fi

-	git add --force -- keys/pgp/*
+	svn add --parents --force keys/pgp/*
 fi

 # find files which should be under source control
@@ -126,31 +90,15 @@ for key in "${validpgpkeys[@]}"; do
 	needsversioning+=("keys/pgp/$key.asc")
 done

-# assert that they really are controlled by git
+# assert that they really are controlled by SVN
 if (( ${#needsversioning[*]} )); then
-	for file in "${needsversioning[@]}"; do
-		if ! git ls-files --error-unmatch "$file"; then
-			die "%s is not under version control" "$file"
-		fi
-	done
+	# svn status's output is only two columns when the status is unknown
+	while read -r status filename; do
+		[[ $status = '?' ]] && unversioned+=("$filename")
+	done < <(svn status -v "${needsversioning[@]}")
+	(( ${#unversioned[*]} )) && die "%s is not under version control" "${unversioned[@]}"
 fi

-
-server=${PACKAGING_REPO_RELEASE_HOST}
-rsyncopts=(-e ssh -p '--chmod=ug=rw,o=r' -c -h -L --progress --partial -y)
-archreleaseopts=()
-while getopts ':l:a:s:f' flag; do
-	case $flag in
-		f) archreleaseopts+=('-f') ;;
-		s) server=$OPTARG ;;
-		l) rsyncopts+=("--bwlimit=$OPTARG") ;;
-		a) commit_arch=$OPTARG ;;
-		:) die "Option requires an argument -- '%s'" "$OPTARG" ;;
-		\?) die "Invalid option -- '%s'" "$OPTARG" ;;
-	esac
-done
-shift $(( OPTIND - 1 ))
-
 # check packages for validity
 for _arch in "${arch[@]}"; do
 	if [[ -n $commit_arch && ${_arch} != "$commit_arch" ]]; then
@@ -170,42 +118,31 @@ for _arch in "${arch[@]}"; do
 	fi
 done

-# check for PKGBUILD standards
-check_pkgbuild_validity
+if [[ -z $server ]]; then
+	server='repos.archlinux.org'
+fi

-if [[ -n $(git status --short --untracked-files=no) ]]; then
-	stat_busy 'Staging files'
-	for f in $(git ls-files --modified); do
-		git add "$f"
-	done
-	for f in $(git ls-files --deleted); do
-		git rm "$f"
-	done
-	stat_done
-
-	msgtemplate="upgpkg: $(get_full_version)"
+if [[ -n $(svn status -q) ]]; then
+	msgtemplate="upgpkg: $pkgbase $(get_full_version)"
 	if [[ -n $1 ]]; then
-		stat_busy 'Committing changes'
-		git commit -q -m "${msgtemplate}: ${1}" || die
+		stat_busy 'Committing changes to trunk'
+		svn commit -q -m "${msgtemplate}: ${1}" || die
 		stat_done
 	else
-		[[ -z ${WORKDIR:-} ]] && setup_workdir
-		msgfile=$(mktemp --tmpdir="${WORKDIR}" commitpkg.XXXXXXXXXX)
+		msgfile="$(mktemp)"
 		echo "$msgtemplate" > "$msgfile"
-		if [[ -n $GIT_EDITOR ]]; then
-			$GIT_EDITOR "$msgfile" || die
+		if [[ -n $SVN_EDITOR ]]; then
+			$SVN_EDITOR "$msgfile"
 		elif [[ -n $VISUAL ]]; then
-			$VISUAL "$msgfile" || die
+			$VISUAL "$msgfile"
 		elif [[ -n $EDITOR ]]; then
-			$EDITOR "$msgfile" || die
-		elif giteditor=$(git config --get core.editor); then
-			$giteditor "$msgfile" || die
+			$EDITOR "$msgfile"
 		else
-			die "No usable editor found (tried \$GIT_EDITOR, \$VISUAL, \$EDITOR, git config [core.editor])."
+			vi "$msgfile"
 		fi
 		[[ -s $msgfile ]] || die
-		stat_busy 'Committing changes'
-		git commit -v -q -F "$msgfile" || die
+		stat_busy 'Committing changes to trunk'
+		svn commit -q -F "$msgfile" || die
 		unlink "$msgfile"
 		stat_done
 	fi
@@ -279,3 +216,23 @@ if [[ ${#uploads[*]} -gt 0 ]]; then
 	msg 'Uploading all package and signature files'
 	rsync "${rsyncopts[@]}" "${uploads[@]}" "$server:staging/$repo/" || die
 fi
+
+if [[ "${arch[*]}" == 'any' ]]; then
+	if [[ -d ../repos/$repo-x86_64 ]]; then
+		pushd ../repos/ >/dev/null
+		stat_busy "Removing %s" "$repo-x86_64"
+		svn rm -q "$repo-x86_64"
+		svn commit -q -m "Removed $repo-x86_64 for $pkgname"
+		stat_done
+		popd >/dev/null
+	fi
+else
+	if [[ -d ../repos/$repo-any ]]; then
+		pushd ../repos/ >/dev/null
+		stat_busy "Removing %s" "$repo-any"
+		svn rm -q "$repo-any"
+		svn commit -q -m "Removed $repo-any for $pkgname"
+		stat_done
+		popd >/dev/null
+	fi
+fi
--- a/src/crossrepomove.in
+++ b/src/crossrepomove.in
@@ -0,0 +1,86 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+m4_include(lib/common.sh)
+
+scriptname=${0##*/}
+
+if [[ -z $1 ]]; then
+	printf 'Usage: %s [pkgbase]\n' "$scriptname"
+	exit 1
+fi
+
+pkgbase="${1}"
+
+case $scriptname in
+	extra2community)
+		source_name='packages'
+		target_name='community'
+		source_repo='extra'
+		target_repo='community'
+		;;
+	community2extra)
+		source_name='community'
+		target_name='packages'
+		source_repo='community'
+		target_repo='extra'
+		;;
+	*)
+		die "Couldn't find configuration for %s" "$scriptname"
+		;;
+esac
+
+server='repos.archlinux.org'
+source_svn="svn+ssh://svn-${source_name}@${server}/srv/repos/svn-${source_name}/svn"
+target_svn="svn+ssh://svn-${target_name}@${server}/srv/repos/svn-${target_name}/svn"
+source_dbscripts="/srv/repos/svn-${source_name}/dbscripts"
+target_dbscripts="/srv/repos/svn-${target_name}/dbscripts"
+
+setup_workdir
+
+pushd "$WORKDIR" >/dev/null
+
+msg "Downloading sources for %s" "${pkgbase}"
+svn -q checkout -N "${target_svn}" target_checkout
+mkdir -p "target_checkout/${pkgbase}/repos"
+svn -q export "${source_svn}/${pkgbase}/trunk" "target_checkout/${pkgbase}/trunk" || die
+# shellcheck source=contrib/makepkg/PKGBUILD.proto
+. "target_checkout/${pkgbase}/trunk/PKGBUILD"
+
+msg "Downloading packages for %s" "${pkgbase}"
+for _arch in "${arch[@]}"; do
+	if [[ "${_arch[*]}" == 'any' ]]; then
+		repo_arch='x86_64'
+	else
+		repo_arch=${_arch}
+	fi
+	for _pkgname in "${pkgname[@]}"; do
+		fullver=$(get_full_version "$_pkgname")
+		pkgpath="/srv/ftp/$source_repo/os/$repo_arch/$_pkgname-$fullver-${_arch}.pkg.tar.*"
+		# shellcheck disable=2029
+		ssh "$server" "cp $pkgpath staging/$target_repo" || die
+	done
+done
+
+msg "Adding %s to %s" "${pkgbase}" "${target_repo}"
+svn -q add "target_checkout/${pkgbase}"
+svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${target_repo}" target_checkout
+pushd "target_checkout/${pkgbase}/trunk" >/dev/null
+archrelease "${arch[@]/#/$target_repo-}" || die
+popd >/dev/null
+
+# shellcheck disable=2029
+ssh "${server}" "${target_dbscripts}/db-update" || die
+
+msg "Removing %s from %s" "${pkgbase}" "${source_repo}"
+for _arch in "${arch[@]}"; do
+	# shellcheck disable=2029
+	ssh "${server}" "${source_dbscripts}/db-remove ${source_repo} ${_arch} ${pkgbase}"
+done
+svn -q checkout -N "${source_svn}" source_checkout
+svn -q up "source_checkout/${pkgbase}"
+svn -q rm "source_checkout/${pkgbase}"
+svn -q commit -m"${scriptname}: Moving ${pkgbase} from ${source_repo} to ${target_repo}" source_checkout
+
+popd >/dev/null
--- a/src/diffpkg.in
+++ b/src/diffpkg.in
@@ -2,15 +2,13 @@
 #
 # 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
+shopt -s extglob

+m4_include(lib/common.sh)

 usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [MODES] [FILE|PKGNAME...]
+    cat <<- _EOF_
+		Usage: ${BASH_SOURCE[0]##*/} [OPTIONS] [MODES] [FILE|PKGNAME...]

 		Searches for a locally built package corresponding to the PKGBUILD, and
 		downloads the last version of that package from the Pacman repositories.
@@ -21,23 +19,14 @@ usage() {
 		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, and '${COMMAND}' will proceed as though this filename was
-		initially specified.
+		cache, and diffpkg 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 this 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
-
 		MODES
 		    -l, --list           Activate content list diff mode (default)
 		    -d, --diffoscope     Activate diffoscope diff mode
@@ -47,19 +36,12 @@ _EOF_
 }

 MAKEPKG_CONF=/etc/makepkg.conf
-POOLDIR=/srv/ftp/pool
-
 VERBOSE=0
 TARLIST=0
 DIFFOSCOPE=0
 PKGINFO=0
 BUILDINFO=0

-DIFFMODE=--side-by-side
-DIFFCOLOR=--color=auto
-DIFFWIDTH=--width=auto
-DIFFOPTIONS=(--expand-tabs)
-
 # option checking
 while (( $# )); do
 	case $1 in
@@ -68,7 +50,6 @@ while (( $# )); do
 			exit 0
 			;;
 		-M|--makepkg-config)
-			(( $# <= 1 )) && die "missing argument for %s" "$1"
 			MAKEPKG_CONF="$2"
 			shift 2
 			;;
@@ -92,50 +73,11 @@ while (( $# )); do
 			VERBOSE=1
 			shift
 			;;
-		-u|-U|--unified)
-			DIFFMODE=--unified
-			shift
-			;;
-		-y|--side-by-side)
-			DIFFMODE=--side-by-side
-			shift
-			;;
-		--color|--color=*)
-			if [[ $2 == never || $2 == always || $2 == auto ]]; then
-				DIFFCOLOR="--color=$2"
-				shift 2
-				continue
-			fi
-			if [[ $1 == --color ]]; then
-				DIFFCOLOR="--color=auto"
-			else
-				DIFFCOLOR="$1"
-			fi
-			shift
-			;;
-		-W|--width)
-			(( $# <= 1 )) && die "missing argument for %s" "$1"
-			DIFFWIDTH="--width=$2"
-			shift 2
-			;;
-		--width=*)
-			DIFFWIDTH="$1"
-			shift
-			;;
-		-P|--pool)
-			(( $# <= 1 )) && die "missing argument for %s" "$1"
-			POOLDIR="$2"
-			shift 2
-			;;
-		--pool=*)
-			POOLDIR="${1#*=}"
-			shift
-			;;
 		--)
 			shift
 			break
 			;;
-		-*|--*)
+		-*,--*)
 			die "invalid argument: %s" "$1"
 			;;
 		*)
@@ -144,22 +86,6 @@ while (( $# )); do
 	esac
 done

-# Set options based on flags or magic values
-if (( VERBOSE )); then
-	if [[ $DIFFMODE == --unified ]]; then
-		DIFFMODE="--unified=99999"
-	fi
-else
-	DIFFOPTIONS+=(--suppress-common-lines)
-fi
-if [[ $DIFFWIDTH == --width=columns ]]; then
-	DIFFWIDTH="--width=${COLUMNS:-130}"
-fi
-if [[ $DIFFWIDTH != --width=auto ]]; then
-	DIFFOPTIONS+=("${DIFFWIDTH}")
-fi
-DIFFOPTIONS+=("${DIFFMODE}" "${DIFFCOLOR}")
-
 if ! (( DIFFOSCOPE || TARLIST || PKGINFO || BUILDINFO )); then
 	TARLIST=1
 fi
@@ -194,19 +120,6 @@ tar_list() {
 	fi | sort
 }

-file_line_length() {
-	path="$1"
-	wc -L "${path}" | tail -n1 | sed -E 's/^ +//g' | cut -d' ' -f1
-}
-
-file_diff_columns() {
-	file1="$1"
-	file2="$2"
-	file1_length=$(file_line_length "$file1")
-	file2_length=$(file_line_length "$file2")
-	echo $(( file1_length + file2_length + 3 ))
-}
-
 diff_pkgs() {
 	local oldpkg newpkg
 	oldpkg=$(readlink -m "$1")
@@ -215,44 +128,32 @@ diff_pkgs() {
 	[[ -f $oldpkg ]] || die "No such file: %s" "${oldpkg}"
 	[[ -f $newpkg ]] || die "No such file: %s" "${newpkg}"

-	DIFFOPTIONS+=(--label "${oldpkg}" --label "${newpkg}")
-
 	if (( TARLIST )); then
-		tar_list "$oldpkg" > "$TMPDIR/old"
-		tar_list "$newpkg" > "$TMPDIR/new"
+		tar_list "$oldpkg" > "$TMPDIR/filelist-old"
+		tar_list "$newpkg" > "$TMPDIR/filelist"
+
+		sdiff -s "$TMPDIR/filelist-old" "$TMPDIR/filelist"
 	fi

 	if (( PKGINFO )); then
-		bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/old"
-		bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/new"
+		bsdtar xOqf "$oldpkg" .PKGINFO > "$TMPDIR/pkginfo-old"
+		bsdtar xOqf "$newpkg" .PKGINFO > "$TMPDIR/pkginfo"
+
+		sdiff -s "$TMPDIR/pkginfo-old" "$TMPDIR/pkginfo"
 	fi

 	if (( BUILDINFO )); then
-		bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/old"
-		bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/new"
-	fi
+		bsdtar xOqf "$oldpkg" .BUILDINFO > "$TMPDIR/buildinfo-old"
+		bsdtar xOqf "$newpkg" .BUILDINFO > "$TMPDIR/buildinfo"

-	if (( TARLIST || PKGINFO || BUILDINFO )); then
-		# Resolve dynamic auto width one we know the content to diff
-		if [[ $DIFFWIDTH == --width=auto ]]; then
-			AUTOLENGTH=$(file_diff_columns "$TMPDIR/old" "$TMPDIR/new")
-			DIFFOPTIONS+=("--width=${AUTOLENGTH}")
-		fi
-
-		# Print a header for side-by-side view as it lacks labels
-		if [[ $DIFFMODE == --side-by-side ]]; then
-			printf -- "--- %s\n+++ %s\n" "${oldpkg}" "${newpkg}"
-		fi
-
-		diff "${DIFFOPTIONS[@]}" "$TMPDIR/old" "$TMPDIR/new"
+		sdiff -s "$TMPDIR/buildinfo-old" "$TMPDIR/buildinfo"
 	fi

 	if (( DIFFOSCOPE )); then
-		diffoscope "${DIFFCOLOR/--color/--text-color}" "$oldpkg" "$newpkg"
+		diffoscope "$oldpkg" "$newpkg"
 	fi
 }

-shopt -s extglob
 fetch_pkg() {
 	local pkg pkgdest pkgurl
 	case $1 in
@@ -268,19 +169,8 @@ fetch_pkg() {
 			pkg=$1 ;;
 	esac

-	if [[ -z ${pkgurl} ]]; then
-		# Try to find latest package in pool dir
-		if [[ -d ${POOLDIR} ]]; then
-			shopt -s extglob nullglob
-			pkgurl=$(printf "%s\n" "${POOLDIR}"/*/"${_pkgname}"-!(*-*)-!(*-*)-!(*-*).pkg.tar!(*.sig)|sort -Vr|head -1)
-			shopt -u extglob nullglob
-		fi
-		# Search via pacman database if no pool file exists
-		if [[ ! -f ${pkgurl} ]]; then
-			pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
-				die "Couldn't download previous package for %s." "$pkg"
-		fi
-	fi
+	[[ -n $pkgurl ]] || pkgurl=$(pacman -Spdd --print-format '%l' --noconfirm "$pkg") ||
+		die "Couldn't download previous package for %s." "$pkg"

 	pkg=${pkgurl##*/}
 	pkgdest=$(mktemp -t -d "${pkg}-XXXXXX")/${pkg}
@@ -300,11 +190,10 @@ fetch_pkg() {

 	echo "$pkgdest"
 }
-shopt -u extglob

 if (( $# < 2 )); then
 	if [[ ! -f PKGBUILD ]]; then
-		die "This must be run in the directory of a built package.\nTry '${COMMAND} --help' for more information."
+		die "This must be run in the directory of a built package.\nTry '$(basename "$0") --help' for more information."
 	fi

 	# shellcheck source=contrib/makepkg/PKGBUILD.proto
--- a/src/export-pkgbuild-keys.in
+++ b/src/export-pkgbuild-keys.in
@@ -2,10 +2,7 @@
 #
 # 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
-
+m4_include(lib/common.sh)

 usage() {
 	cat <<- _EOF_
@@ -38,7 +35,7 @@ if [[ ! -f PKGBUILD ]]; then
 fi

 mapfile -t validpgpkeys < <(
-	# shellcheck source=contrib/makepkg/PKGBUILD.proto
+	# shellcheck source=PKGBUILD.proto
 	. ./PKGBUILD
 	if (( ${#validpgpkeys[@]} )); then
 		printf "%s\n" "${validpgpkeys[@]}"
--- a/src/find-libdeps.in
+++ b/src/find-libdeps.in
@@ -2,12 +2,10 @@
 #
 # 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
-
+m4_include(lib/common.sh)

 set -e
+shopt -s extglob

 IGNORE_INTERNAL=0

@@ -43,12 +41,9 @@ else
 	pushd "$WORKDIR" >/dev/null
 fi

-shopt -s extglob
 process_sofile() {
 	# extract the library name: libfoo.so
-	shopt -s extglob nullglob
 	soname="${sofile%.so?(+(.+([0-9])))}".so
-	shopt -u extglob nullglob
 	# extract the major version: 1
 	soversion="${sofile##*\.so\.}"
 	if [[ "$soversion" = "$sofile" ]] && ((IGNORE_INTERNAL)); then
@@ -60,7 +55,6 @@ process_sofile() {
 		soobjects+=("${soname}=${soversion}-${soarch}")
 	fi
 }
-shopt -u extglob

 case $script_mode in
 	deps) find_args=(-perm -u+x);;
--- a/src/finddeps.in
+++ b/src/finddeps.in
@@ -4,10 +4,7 @@
 #
 # 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
-
+m4_include(lib/common.sh)

 match=$1

--- a/src/lddd.in
+++ b/src/lddd.in
@@ -4,10 +4,7 @@
 #
 # 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
-
+m4_include(lib/common.sh)

 ifs=$IFS
 IFS="${IFS}:"
--- a/src/lib/api/gitlab.sh
+++ b/src/lib/api/gitlab.sh
@@ -1,122 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_API_GITLAB_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_API_GITLAB_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/config.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/config.sh
-
-set -e
-
-
-gitlab_api_call() {
-	local outfile=$1
-	local request=$2
-	local endpoint=$3
-	local data=${4:-}
-	local error
-
-	# empty token
-	if [[ -z "${GITLAB_TOKEN}" ]]; then
-		msg_error "  api call failed: No token provided"
-		return 1
-	fi
-
-	if ! curl --request "${request}" \
-			--url "https://${GITLAB_HOST}/api/v4/${endpoint}" \
-			--header "PRIVATE-TOKEN: ${GITLAB_TOKEN}" \
-			--header "Content-Type: application/json" \
-			--data "${data}" \
-			--output "${outfile}" \
-			--silent; then
-		msg_error "  api call failed: $(cat "${outfile}")"
-		return 1
-	fi
-
-	# check for general purpose api error
-	if error=$(jq --raw-output --exit-status '.error' < "${outfile}"); then
-		msg_error "  api call failed: ${error}"
-		return 1
-	fi
-
-	# check for api specific error messages
-	if ! jq --raw-output --exit-status '.id' < "${outfile}" >/dev/null; then
-		if jq --raw-output --exit-status '.message | keys[]' < "${outfile}" &>/dev/null; then
-			while read -r error; do
-				msg_error "  api call failed: ${error}"
-			done < <(jq --raw-output --exit-status '.message|to_entries|map("\(.key) \(.value[])")[]' < "${outfile}")
-		elif error=$(jq --raw-output --exit-status '.message' < "${outfile}"); then
-			msg_error "  api call failed: ${error}"
-		fi
-		return 1
-	fi
-
-	return 0
-}
-
-gitlab_api_get_user() {
-	local outfile username
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	outfile=$(mktemp --tmpdir="${WORKDIR}" pkgctl-gitlab-api.XXXXXXXXXX)
-
-	# query user details
-	if ! gitlab_api_call "${outfile}" GET "user/"; then
-		msg_warn "  Invalid token provided?"
-		exit 1
-	fi
-
-	# extract username from details
-	if ! username=$(jq --raw-output --exit-status '.username' < "${outfile}"); then
-		msg_error "  failed to query username: $(cat "${outfile}")"
-		return 1
-	fi
-
-	printf "%s" "${username}"
-	return 0
-}
-
-# 1. replace single '+' between word boundaries with '-'
-# 2. replace any other '+' with literal 'plus'
-# 3. replace any special chars other than '_', '-' and '.' with '-'
-gitlab_project_name_to_path() {
-	local name=$1
-	printf "%s" "${name}" \
-		| sed -E 's/([a-zA-Z0-9]+)\+([a-zA-Z]+)/\1-\2/g' \
-		| sed -E 's/\+/plus/g' \
-		| sed -E 's/[^a-zA-Z0-9_\-\.]/-/g'
-}
-
-gitlab_api_create_project() {
-	local pkgbase=$1
-	local outfile data path project_path
-
-	[[ -z ${WORKDIR:-} ]] && setup_workdir
-	outfile=$(mktemp --tmpdir="${WORKDIR}" pkgctl-gitlab-api.XXXXXXXXXX)
-
-	project_path=$(gitlab_project_name_to_path "${pkgbase}")
-
-	# create GitLab project
-	data='{
-		"name": "'"${pkgbase}"'",
-		"path": "'"${project_path}"'",
-		"namespace_id": "'"${GIT_PACKAGING_NAMESPACE_ID}"'",
-		"request_access_enabled": "false"
-	}'
-	if ! gitlab_api_call "${outfile}" POST "projects/" "${data}"; then
-		return 1
-	fi
-
-	if ! path=$(jq --raw-output --exit-status '.path' < "${outfile}"); then
-		msg_error "  failed to query path: $(cat "${outfile}")"
-		return 1
-	fi
-
-	printf "%s" "${path}"
-	return 0
-}
--- a/src/lib/auth.sh
+++ b/src/lib/auth.sh
@@ -1,72 +0,0 @@
-#!/hint/bash
-#
-# This may be included with or without `set -euE`
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_AUTH_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_AUTH_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-set -e
-
-
-pkgctl_auth_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [COMMAND] [OPTIONS]
-
-		Authenticate with services like GitLab.
-
-		COMMANDS
-		    login    Authenticate with the GitLab instance
-		    status   View authentication status
-
-		OPTIONS
-		    -h, --help     Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} login --gen-access-token
-		    $ ${COMMAND} status
-_EOF_
-}
-
-pkgctl_auth() {
-	if (( $# < 1 )); then
-		pkgctl_auth_usage
-		exit 0
-	fi
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_auth_usage
-				exit 0
-				;;
-			login)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/auth/login.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/auth/login.sh
-				pkgctl_auth_login "$@"
-				exit 0
-				;;
-			status)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/auth/status.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/auth/status.sh
-				pkgctl_auth_status "$@"
-				exit 0
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				die "invalid command: %s" "$1"
-				;;
-		esac
-	done
-}
--- a/src/lib/auth/login.sh
+++ b/src/lib/auth/login.sh
@@ -1,93 +0,0 @@
-#!/hint/bash
-#
-# This may be included with or without `set -euE`
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_AUTH_LOGIN_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_AUTH_LOGIN_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/config.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/config.sh
-# shellcheck source=src/lib/api/gitlab.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-
-set -e
-
-
-pkgctl_auth_login_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS]
-
-		Authenticate with the GitLab instance.
-
-		The minimum required scopes for the token are: "api", "write_repository".
-
-		OPTIONS
-		    -g, --gen-access-token   Open the URL to generate a new personal access token
-		    -h, --help               Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND}
-		    $ ${COMMAND} --gen-access-token
-_EOF_
-}
-
-
-pkgctl_auth_login() {
-	local token personal_access_token_url
-	local GEN_ACESS_TOKEN=0
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_auth_login_usage
-				exit 0
-				;;
-			-g|--gen-access-token)
-				GEN_ACESS_TOKEN=1
-				shift
-				;;
-			*)
-				die "invalid argument: %s" "$1"
-				;;
-		esac
-	done
-
-	personal_access_token_url="https://${GITLAB_HOST}/-/profile/personal_access_tokens"
-
-    cat <<- _EOF_
-	Logging into ${BOLD}${GITLAB_HOST}${ALL_OFF}
-
-	Tip: you can generate a Personal Access Token here ${personal_access_token_url}
-	The minimum required scopes are 'api' and 'write_repository'.
-_EOF_
-
-	if (( GEN_ACESS_TOKEN )); then
-		xdg-open "${personal_access_token_url}" 2>/dev/null
-	fi
-
-	# read token from stdin
-	read -s -r -p "${GREEN}?${ALL_OFF} ${BOLD}Paste your authentication token:${ALL_OFF} " token
-	echo
-
-	if [[ -z ${token} ]]; then
-		msg_error "  No token provided"
-		exit 1
-	fi
-
-	# check if the passed token works
-	GITLAB_TOKEN="${token}"
-	if ! result=$(gitlab_api_get_user); then
-		printf "%s\n" "$result"
-		exit 1
-	fi
-
-	msg_success "  Logged in as ${BOLD}${result}${ALL_OFF}"
-	save_devtools_config
-}
--- a/src/lib/auth/status.sh
+++ b/src/lib/auth/status.sh
@@ -1,69 +0,0 @@
-#!/hint/bash
-#
-# This may be included with or without `set -euE`
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_AUTH_STATUS_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_AUTH_STATUS_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/api/gitlab.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-
-set -e
-
-
-pkgctl_auth_status_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS]
-
-		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 this help text
-
-		EXAMPLES
-		    $ ${COMMAND}
-		    $ ${COMMAND} --show-token
-_EOF_
-}
-
-pkgctl_auth_status() {
-	local SHOW_TOKEN=0
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_auth_status_usage
-				exit 0
-				;;
-			-t|--show-token)
-				SHOW_TOKEN=1
-				shift
-				;;
-			*)
-				die "invalid argument: %s" "$1"
-				;;
-		esac
-	done
-
-	printf "%s\n" "${BOLD}${GITLAB_HOST}${ALL_OFF}"
-	# shellcheck disable=2119
-	if ! username=$(gitlab_api_get_user); then
-		printf "%s\n" "${username}"
-		exit 1
-	fi
-
-	msg_success "  Logged in as ${BOLD}${username}${ALL_OFF}"
-	if (( SHOW_TOKEN )); then
-		msg_success "  Token: ${GITLAB_TOKEN}"
-	else
-		msg_success "  Token: **************************"
-	fi
-}
--- a/src/lib/build/build.sh
+++ b/src/lib/build/build.sh
@@ -1,412 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_BUILD_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_BUILD_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/db/update.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
-# shellcheck source=src/lib/release.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
-# shellcheck source=src/lib/util/git.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
-# shellcheck source=src/lib/util/pacman.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/pacman.sh
-# shellcheck source=src/lib/valid-repos.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
-# shellcheck source=src/lib/valid-tags.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-tags.sh
-
-source /usr/share/makepkg/util/config.sh
-source /usr/share/makepkg/util/message.sh
-
-set -e
-
-
-pkgctl_build_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [PATH]...
-
-		Build packages inside a clean chroot
-
-		When a new pkgver is set using the appropriate PKGBUILD options the
-		checksums are automatically updated.
-
-		TODO
-
-		BUILD OPTIONS
-		    --arch ARCH          Specify architectures to build for (disables auto-detection)
-		    --repo REPO          Specify a target repository (disables auto-detection)
-		    -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
-		    -I, --install FILE   Install a package into the working copy of the chroot
-		    --nocheck            Do not run the check() function in the PKGBUILD
-
-		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
-		    -e, --edit           Edit the PKGBUILD before building
-
-		RELEASE OPTIONS
-		    -r, --release        Automatically commit, tag and release after building
-		    -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 this help text
-
-		EXAMPLES
-		    $ ${COMMAND}
-		    $ ${COMMAND} --rebuild --staging --message 'libyay 0.42 rebuild' libfoo libbar
-		    $ ${COMMAND} --pkgver 1.42 --release --db-update
-_EOF_
-}
-
-pkgctl_build_check_option_group_repo() {
-	local option=$1
-	local repo=$2
-	local testing=$3
-	local staging=$4
-	if ( (( testing )) && (( staging )) ) ||
-		( [[ $repo =~ ^.*-(staging|testing)$ ]] && ( (( testing )) || (( staging )) )); then
-		die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
-		exit 1
-	fi
-	return 0
-}
-
-pkgctl_build_check_option_group_ver() {
-	local option=$1
-	local pkgver=$2
-	local pkgrel=$3
-	local rebuild=$4
-	if [[ -n "${pkgver}" ]] || [[ -n "${pkgrel}" ]] || (( rebuild )); then
-		die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
-		exit 1
-	fi
-	return 0
-}
-
-# TODO: import pgp keys
-pkgctl_build() {
-	if (( $# < 1 )) && [[ ! -f PKGBUILD ]]; then
-		pkgctl_build_usage
-		exit 1
-	fi
-
-	local UPDPKGSUMS=0
-	local EDIT=0
-	local REBUILD=0
-	local OFFLOAD=0
-	local STAGING=0
-	local TESTING=0
-	local RELEASE=0
-	local DB_UPDATE=0
-
-	local REPO=
-	local PKGVER=
-	local PKGREL=
-	local MESSAGE=
-
-	local paths=()
-	local BUILD_ARCH=()
-	local BUILD_OPTIONS=()
-	local MAKECHROOT_OPTIONS=()
-	local RELEASE_OPTIONS=()
-	local MAKEPKG_OPTIONS=()
-
-	local PTS
-	PTS="$(tty | sed 's|/dev/pts/||')"
-	local WORKER="${USER}-${PTS}"
-
-	# variables
-	local path pkgbase pkgrepo source
-
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_build_usage
-				exit 0
-				;;
-			--repo)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				REPO="${2}"
-				pkgctl_build_check_option_group_repo '--repo' "${REPO}" "${TESTING}" "${STAGING}"
-				shift 2
-				;;
-			--arch)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				if [[ ${2} == all ]]; then
-					BUILD_ARCH=("${_arch[@]::${#_arch[@]}-1}")
-				elif [[ ${2} == any ]]; then
-					BUILD_ARCH=("${_arch[0]}")
-				elif ! in_array "${2}" "${BUILD_ARCH[@]}"; then
-					if ! in_array "${2}" "${_arch[@]}"; then
-						die 'invalid architecture: %s' "${2}"
-					fi
-					BUILD_ARCH+=("${2}")
-				fi
-				shift 2
-				;;
-			--pkgver=*)
-				pkgctl_build_check_option_group_ver '--pkgver' "${PKGVER}" "${PKGREL}" "${REBUILD}"
-				PKGVER="${1#*=}"
-				PKGREL=1
-				UPDPKGSUMS=1
-				shift
-				;;
-			--pkgrel=*)
-				pkgctl_build_check_option_group_ver '--pkgrel' "${PKGVER}" "${PKGREL}" "${REBUILD}"
-				PKGREL="${1#*=}"
-				shift
-				;;
-			--rebuild)
-				# shellcheck source=src/lib/util/git.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/git.sh
-				pkgctl_build_check_option_group_ver '--rebuild' "${PKGVER}" "${PKGREL}" "${REBUILD}"
-				REBUILD=1
-				shift
-				;;
-			-e|--edit)
-				EDIT=1
-				shift
-				;;
-			-o|--offload)
-				OFFLOAD=1
-				shift
-				;;
-			-s|--staging)
-				STAGING=1
-				pkgctl_build_check_option_group_repo '--staging' "${REPO}" "${TESTING}" "${STAGING}"
-				shift
-				;;
-			-t|--testing)
-				TESTING=1
-				pkgctl_build_check_option_group_repo '--testing' "${REPO}" "${TESTING}" "${STAGING}"
-				shift
-				;;
-			-c|--clean)
-				BUILD_OPTIONS+=("-c")
-				shift
-				;;
-			-I|--install)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				MAKECHROOT_OPTIONS+=("-I" "$2")
-				warning 'installing packages into the chroot may break reproducible builds, use with caution!'
-				shift 2
-				;;
-			--nocheck)
-				MAKEPKG_OPTIONS+=("--nocheck")
-				warning 'not running checks is disallowed for official packages, except for bootstrapping. Please rebuild after bootstrapping is completed!'
-				shift
-				;;
-			-r|--release)
-				# shellcheck source=src/lib/release.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
-				RELEASE=1
-				shift
-				;;
-			-m|--message)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				MESSAGE=$2
-				RELEASE_OPTIONS+=("--message" "${MESSAGE}")
-				shift 2
-				;;
-			-u|--db-update)
-				DB_UPDATE=1
-				shift
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				paths=("$@")
-				break
-				;;
-		esac
-	done
-
-	# check if invoked without any path from within a packaging repo
-	if (( ${#paths[@]} == 0 )); then
-		if [[ -f PKGBUILD ]]; then
-			paths=(".")
-		else
-			pkgctl_build_usage
-			exit 1
-		fi
-	fi
-
-	# Update pacman cache for auto-detection
-	if [[ -z ${REPO} ]]; then
-		update_pacman_repo_cache
-	# Check valid repos if not resolved dynamically
-	elif ! in_array "${REPO}" "${_repos[@]}"; then
-		die "Invalid repository target: %s" "${REPO}"
-	fi
-
-	for path in "${paths[@]}"; do
-		pushd "${path}" >/dev/null
-
-		if [[ ! -f PKGBUILD ]]; then
-			die 'PKGBUILD not found in %s' "${path}"
-		fi
-
-		source=()
-		# shellcheck source=contrib/makepkg/PKGBUILD.proto
-		. ./PKGBUILD
-		pkgbase=${pkgbase:-$pkgname}
-		pkgrepo=${REPO}
-		msg "Building ${pkgbase}"
-
-		# auto-detection of build target
-		if [[ -z ${pkgrepo} ]]; then
-			if ! pkgrepo=$(get_pacman_repo_from_pkgbuild PKGBUILD); then
-				die 'failed to get pacman repo'
-			fi
-			if [[ -z "${pkgrepo}" ]]; then
-				die 'unknown repo, please specify --repo for new packages'
-			fi
-		fi
-
-		# TODO: REMOVE AFTER POC
-		if [[ ${pkgrepo} == community ]]; then
-			pkgrepo=extra
-		fi
-
-		# special cases to resolve final build target
-		if (( TESTING )); then
-			pkgrepo="${pkgrepo}-testing"
-		elif (( STAGING )); then
-			pkgrepo="${pkgrepo}-staging"
-		elif [[ $pkgrepo == core ]]; then
-			pkgrepo="${pkgrepo}-testing"
-		fi
-
-		# auto-detection of build architecture
-		if [[ $pkgrepo = multilib* ]]; then
-			BUILD_ARCH=("")
-		elif (( ${#BUILD_ARCH[@]} == 0 )); then
-			if in_array any "${arch[@]}"; then
-				BUILD_ARCH=("${_arch[0]}")
-			else
-				BUILD_ARCH+=("${arch[@]}")
-			fi
-		fi
-
-		# print gathered build modes
-		msg2 "repo: ${pkgrepo}"
-		msg2 "arch: ${BUILD_ARCH[*]}"
-
-		# increment pkgrel on rebuild
-		if (( REBUILD )); then
-			# try to figure out of pkgrel has been changed
-			if ! old_pkgrel=$(git_diff_tree HEAD PKGBUILD | grep --perl-regexp --only-matching --max-count=1 '^-pkgrel=\K\w+'); then
-				old_pkgrel=${pkgrel}
-			fi
-			# check if pkgrel conforms expectations
-			[[ ${pkgrel/.*} =~ ^[0-9]+$ ]] || die "Non-standard pkgrel declaration"
-			[[ ${old_pkgrel/.*} =~ ^[0-9]+$ ]] || die "Non-standard pkgrel declaration"
-			# increment pkgrel if it hasn't been changed yet
-			if [[ ${pkgrel} = "${old_pkgrel}" ]]; then
-				PKGREL=$((${pkgrel/.*}+1))
-			else
-				warning 'ignoring --rebuild as pkgrel has already been incremented from %s to %s' "${old_pkgrel}" "${pkgrel}"
-			fi
-		fi
-
-		# update pkgver
-		if [[ -n ${PKGVER} ]]; then
-			if [[ $(type -t pkgver) == function ]]; then
-				# TODO: check if die or warn, if we provide _commit _gitcommit setter maybe?
-				warning 'setting pkgver variable has no effect if the PKGBUILD has a pkgver() function'
-			fi
-			msg "Bumping pkgver to ${PKGVER}"
-			grep --extended-regexp --quiet --max-count=1 "^pkgver=${pkgver}$" PKGBUILD || die "Non-standard pkgver declaration"
-			sed --regexp-extended "s|^(pkgver=)${pkgver}$|\1${PKGVER}|g" -i PKGBUILD
-		fi
-
-		# update pkgrel
-		if [[ -n ${PKGREL} ]]; then
-			msg "Bumping pkgrel to ${PKGREL}"
-			grep --extended-regexp --quiet --max-count=1 "^pkgrel=${pkgrel}$" PKGBUILD || die "Non-standard pkgrel declaration"
-			sed --regexp-extended "s|^(pkgrel=)${pkgrel}$|\1${PKGREL}|g" -i PKGBUILD
-		fi
-
-		# edit PKGBUILD
-		if (( EDIT )); then
-			stat_busy 'Editing PKGBUILD'
-			if [[ -n $GIT_EDITOR ]]; then
-				$GIT_EDITOR PKGBUILD || die
-			elif [[ -n $VISUAL ]]; then
-				$VISUAL PKGBUILD || die
-			elif [[ -n $EDITOR ]]; then
-				$EDITOR PKGBUILD || die
-			elif giteditor=$(git config --get core.editor); then
-				$giteditor PKGBUILD || die
-			else
-				die "No usable editor found (tried \$GIT_EDITOR, \$VISUAL, \$EDITOR, git config [core.editor])."
-			fi
-			stat_done
-		fi
-
-
-		# update checksums if any sources are declared
-		if (( UPDPKGSUMS )) && (( ${#source[@]} >= 1 )); then
-			updpkgsums
-		fi
-
-		# execute build
-		for arch in "${BUILD_ARCH[@]}"; do
-			if [[ -n $arch ]]; then
-				msg "Building ${pkgbase} for [${pkgrepo}] (${arch})"
-				BUILDTOOL="${pkgrepo}-${arch}-build"
-			else
-				msg "Building ${pkgbase} for [${pkgrepo}]"
-				BUILDTOOL="${pkgrepo}-build"
-			fi
-
-			# TODO: REMOVE AFTER POC
-			offload_tool=${pkgrepo}
-			if [[ ${pkgrepo} == core-* ]]; then
-				BUILDTOOL=${BUILDTOOL/core-/}
-				offload_tool=${offload_tool/core-/}
-			elif [[ ${pkgrepo} == extra-* ]]; then
-				BUILDTOOL=${BUILDTOOL/extra-/}
-				offload_tool=${offload_tool/extra-/}
-			fi
-
-			if (( OFFLOAD )); then
-				offload-build --repo "${offload_tool}" -- "${BUILD_OPTIONS[@]}" -- "${MAKECHROOT_OPTIONS[@]}" -l "${WORKER}" -- "${MAKEPKG_OPTIONS[@]}"
-			else
-				"${BUILDTOOL}" "${BUILD_OPTIONS[@]}" -- "${MAKECHROOT_OPTIONS[@]}" -l "${WORKER}" -- "${MAKEPKG_OPTIONS[@]}"
-			fi
-		done
-
-		# release the build
-		if (( RELEASE )); then
-			pkgctl_release --repo "${pkgrepo}" "${RELEASE_OPTIONS[@]}"
-		fi
-
-		# reset common PKGBUILD variables
-		unset pkgbase pkgname arch pkgrepo source pkgver pkgrel validpgpkeys
-		popd >/dev/null
-	done
-
-	# update the binary package repo db as last action
-	if (( RELEASE )) && (( DB_UPDATE )); then
-		# shellcheck disable=2119
-		pkgctl_db_update
-	fi
-}
--- a/src/lib/config.sh
+++ b/src/lib/config.sh
@@ -1,44 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_CONFIG_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_CONFIG_SH=1
-
-set -e
-
-readonly XDG_DEVTOOLS_DIR="${XDG_CONFIG_HOME:-$HOME/.config}/devtools"
-readonly XDG_DEVTOOLS_GITLAB_CONFIG="${XDG_DEVTOOLS_DIR}/gitlab.conf"
-
-# default config variables
-export GITLAB_TOKEN=""
-
-load_devtools_config() {
-	# temporary permission fixup
-	if [[ -d "${XDG_DEVTOOLS_DIR}" ]]; then
-		chmod 700 "${XDG_DEVTOOLS_DIR}"
-	fi
-	if [[ -f "${XDG_DEVTOOLS_GITLAB_CONFIG}" ]]; then
-		chmod 600 "${XDG_DEVTOOLS_GITLAB_CONFIG}"
-	fi
-	if [[ -n "${DEVTOOLS_GITLAB_TOKEN}" ]]; then
-		GITLAB_TOKEN="${DEVTOOLS_GITLAB_TOKEN}"
-		return
-	fi
-	if [[ -f "${XDG_DEVTOOLS_GITLAB_CONFIG}" ]]; then
-		GITLAB_TOKEN=$(grep GITLAB_TOKEN "${XDG_DEVTOOLS_GITLAB_CONFIG}"|cut -d= -f2|cut -d\" -f2)
-		return
-	fi
-	GITLAB_TOKEN=""
-}
-
-save_devtools_config() {
-	# temporary permission fixup
-	chmod 700 "${XDG_DEVTOOLS_DIR}"
-	chmod 600 "${XDG_DEVTOOLS_GITLAB_CONFIG}"
-	(
-		umask 0077
-		mkdir -p "${XDG_DEVTOOLS_DIR}"
-		printf 'GITLAB_TOKEN="%s"\n' "${GITLAB_TOKEN}" > "${XDG_DEVTOOLS_GITLAB_CONFIG}"
-	)
-}
--- a/src/lib/db.sh
+++ b/src/lib/db.sh
@@ -1,80 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_DB_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_DB_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-set -e
-
-
-pkgctl_db_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [COMMAND] [OPTIONS]
-
-		Pacman database modification for packge update, move etc
-
-		COMMANDS
-		    move      Move packages between pacman repositories
-		    remove    Remove packages from pacman repositories
-		    update    Update the pacman database as final release step
-
-		OPTIONS
-		    -h, --help    Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} move extra-staging extra-testing libfoo libbar
-		    $ ${COMMAND} remove core-testing libfoo libbar
-		    $ ${COMMAND} update
-_EOF_
-}
-
-pkgctl_db() {
-	if (( $# < 1 )); then
-		pkgctl_db_usage
-		exit 0
-	fi
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_db_usage
-				exit 0
-				;;
-			move)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/db/move.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/move.sh
-				pkgctl_db_move "$@"
-				exit 0
-				;;
-			remove)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/db/remove.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/remove.sh
-				pkgctl_db_remove "$@"
-				exit 0
-				;;
-			update)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/db/update.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
-				pkgctl_db_update "$@"
-				exit 0
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				die "invalid command: %s" "$1"
-				;;
-		esac
-	done
-}
--- a/src/lib/db/move.sh
+++ b/src/lib/db/move.sh
@@ -1,64 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_DB_MOVE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_DB_MOVE_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-set -e
-
-
-pkgctl_db_move_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [SOURCE_REPO] [TARGET_REPO] [PKGBASE]...
-
-		Move packages between binary repositories.
-
-		OPTIONS
-		    -h, --help         Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} extra-staging extra-testing libfoo libbar
-		    $ ${COMMAND} extra core libfoo libbar
-_EOF_
-}
-
-pkgctl_db_move() {
-	local SOURCE_REPO=""
-	local TARGET_REPO=""
-	local PKGBASES=()
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_db_move_usage
-				exit 0
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				break
-				;;
-		esac
-	done
-
-	if (( $# < 3 )); then
-		pkgctl_db_move_usage
-		exit 1
-	fi
-
-	SOURCE_REPO=$1
-	TARGET_REPO=$2
-	shift 2
-	PKGBASES+=("$@")
-
-	# shellcheck disable=SC2029
-	ssh "${PACKAGING_REPO_RELEASE_HOST}" db-move "${SOURCE_REPO}" "${TARGET_REPO}" "${PKGBASES[@]}"
-}
--- a/src/lib/db/remove.sh
+++ b/src/lib/db/remove.sh
@@ -1,69 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_DB_REMOVE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_DB_REMOVE_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-set -e
-
-
-pkgctl_db_remove_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [REPO] [PKGBASE]...
-
-		Remove packages from binary repositories.
-
-		OPTIONS
-		    -a, --arch    Override the architecture (disables auto-detection)
-		    -h, --help    Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} core-testing libfoo libbar
-		    $ ${COMMAND} core --arch x86_64 libyay
-_EOF_
-}
-
-pkgctl_db_remove() {
-	local REPO=""
-	local ARCH=any
-	local PKGBASES=()
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_db_remove_usage
-				exit 0
-				;;
-			-a|--arch)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				ARCH=$2
-				shift 2
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				break
-				;;
-		esac
-	done
-
-	if (( $# < 2 )); then
-		pkgctl_db_remove_usage
-		exit 1
-	fi
-
-	REPO=$1
-	shift
-	PKGBASES+=("$@")
-
-	# shellcheck disable=SC2029
-	ssh "${PACKAGING_REPO_RELEASE_HOST}" db-remove "${REPO}" "${ARCH}" "${PKGBASES[@]}"
-}
--- a/src/lib/db/update.sh
+++ b/src/lib/db/update.sh
@@ -1,46 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_DB_UPDATE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_DB_UPDATE_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-set -e
-
-
-pkgctl_db_update_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS]
-
-		Update the binary repository as final release step for packages that
-		have been transfered and staged on ${PACKAGING_REPO_RELEASE_HOST}.
-
-		OPTIONS
-		    -h, --help    Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND}
-_EOF_
-}
-
-pkgctl_db_update() {
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_db_update_usage
-				exit 0
-				;;
-			*)
-				die "invalid argument: %s" "$1"
-				;;
-		esac
-	done
-
-	ssh "${PACKAGING_REPO_RELEASE_HOST}" db-update
-}
--- a/src/lib/release.sh
+++ b/src/lib/release.sh
@@ -1,172 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_RELEASE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_RELEASE_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/db/update.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db/update.sh
-# shellcheck source=src/lib/util/pacman.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/util/pacman.sh
-# shellcheck source=src/lib/valid-repos.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
-
-source /usr/share/makepkg/util/util.sh
-
-set -e
-
-
-pkgctl_release_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [PATH]...
-
-		Release step to commit, tag and upload build artifacts
-
-		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 a target repository (disables auto-detection)
-		    -s, --staging       Release to the staging counterpart of the auto-detected repo
-		    -t, --testing       Release to the testing counterpart of the auto-detected repo
-		    -u, --db-update     Automatically update the pacman database after uploading
-		    -h, --help          Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND}
-		    $ ${COMMAND} --repo core-testing --message 'libyay 0.42 rebuild' libfoo libbar
-		    $ ${COMMAND} --staging --db-update libfoo
-_EOF_
-}
-
-pkgctl_release_check_option_group() {
-	local option=$1
-	local repo=$2
-	local testing=$3
-	local staging=$4
-	if [[ -n "${repo}" ]] || (( testing )) || (( staging )); then
-		die "The argument '%s' cannot be used with one or more of the other specified arguments" "${option}"
-		exit 1
-	fi
-	return 0
-}
-
-pkgctl_release() {
-	if (( $# < 1 )) && [[ ! -f PKGBUILD ]]; then
-		pkgctl_release_usage
-		exit 1
-	fi
-
-	local MESSAGE=""
-	local PKGBASES=()
-	local REPO=""
-	local TESTING=0
-	local STAGING=0
-	local DB_UPDATE=0
-
-	local path pkgbase pkgnames repo repos
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_release_usage
-				exit 0
-				;;
-			-m|--message)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				MESSAGE=$2
-				shift 2
-				;;
-			-r|--repo)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				pkgctl_release_check_option_group '--repo' "${REPO}" "${TESTING}" "${STAGING}"
-				REPO=$2
-				shift 2
-				;;
-			-s|--staging)
-				pkgctl_release_check_option_group '--staging' "${REPO}" "${TESTING}" "${STAGING}"
-				STAGING=1
-				shift
-				;;
-			-t|--testing)
-				pkgctl_release_check_option_group '--testing' "${REPO}" "${TESTING}" "${STAGING}"
-				TESTING=1
-				shift
-				;;
-			-u|--db-update)
-				DB_UPDATE=1
-				shift
-				;;
-			-*)
-				die "invalid option: %s" "$1"
-				;;
-			*)
-				PKGBASES+=("$@")
-				break
-				;;
-		esac
-	done
-
-	# Resolve package from current working directory
-	if (( 0 == ${#PKGBASES[@]} )); then
-		PKGBASES=("$PWD")
-	fi
-
-	# Update pacman cache for auto-detection
-	if [[ -z ${REPO} ]]; then
-		update_pacman_repo_cache
-	# Check valid repos if not resolved dynamically
-	elif ! in_array "${REPO}" "${_repos[@]}"; then
-		die "Invalid repository target: %s" "${REPO}"
-	fi
-
-	for path in "${PKGBASES[@]}"; do
-		pushd "${path}" >/dev/null
-		pkgbase=$(basename "${path}")
-
-		if [[ -n ${REPO} ]]; then
-			repo=${REPO}
-		else
-			if ! repo=$(get_pacman_repo_from_pkgbuild PKGBUILD); then
-				die 'Failed to get pacman repo'
-			fi
-			if [[ -z "${repo}" ]]; then
-				die 'Unknown repo, please specify --repo for new packages'
-			fi
-		fi
-
-		# TODO: REMOVE AFTER POC
-		if [[ ${repo} == community ]]; then
-			repo=extra
-		fi
-
-		if (( TESTING )); then
-			repo="${repo}-testing"
-		elif (( STAGING )); then
-			repo="${repo}-staging"
-		elif [[ $repo == core ]]; then
-			repo="${repo}-testing"
-		fi
-
-		msg "Releasing ${pkgbase} to ${repo}"
-		commitpkg "${repo}" "${MESSAGE}"
-
-		unset repo
-		popd >/dev/null
-	done
-
-	if (( DB_UPDATE )); then
-		# shellcheck disable=2119
-		pkgctl_db_update
-	fi
-}
--- a/src/lib/repo.sh
+++ b/src/lib/repo.sh
@@ -1,100 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_REPO_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_REPO_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-set -e
-
-
-pkgctl_repo_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [COMMAND] [OPTIONS]
-
-		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.
-
-		COMMANDS
-		    clone          Clone a package repository
-		    configure      Configure a clone according to distro specs
-		    create         Create a new GitLab package repository
-		    web            Open the packaging repository's website
-
-		OPTIONS
-		    -h, --help     Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} clone libfoo linux libbar
-		    $ ${COMMAND} clone --maintainer mynickname
-		    $ ${COMMAND} configure *
-		    $ ${COMMAND} create libfoo
-		    $ ${COMMAND} web linux
-_EOF_
-}
-
-pkgctl_repo() {
-	if (( $# < 1 )); then
-		pkgctl_repo_usage
-		exit 0
-	fi
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_repo_usage
-				exit 0
-				;;
-			clone)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/repo/clone.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/clone.sh
-				pkgctl_repo_clone "$@"
-				exit 0
-				;;
-			configure)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/repo/configure.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/configure.sh
-				pkgctl_repo_configure "$@"
-				exit 0
-				;;
-			create)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/repo/create.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/create.sh
-				pkgctl_repo_create "$@"
-				exit 0
-				;;
-			web)
-				_DEVTOOLS_COMMAND+=" $1"
-				shift
-				# shellcheck source=src/lib/repo/web.sh
-				source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/web.sh
-				pkgctl_repo_web "$@"
-				exit 0
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				die "invalid command: %s" "$1"
-				;;
-		esac
-	done
-}
--- a/src/lib/repo/clone.sh
+++ b/src/lib/repo/clone.sh
@@ -1,141 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_REPO_CLONE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_REPO_CLONE_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/api/gitlab.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-# shellcheck source=src/lib/repo/configure.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/configure.sh
-
-source /usr/share/makepkg/util/message.sh
-
-set -e
-
-
-pkgctl_repo_clone_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
-
-		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
-		    --universe             Clone all existing packages, useful for cache warming
-		    -h, --help             Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} libfoo linux libbar
-		    $ ${COMMAND} --maintainer mynickname
-_EOF_
-}
-
-pkgctl_repo_clone() {
-	if (( $# < 1 )); then
-		pkgctl_repo_clone_usage
-		exit 0
-	fi
-
-	# options
-	local GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
-	local CLONE_ALL=0
-	local MAINTAINER=
-	local CONFIGURE_OPTIONS=()
-	local pkgbases
-
-	# variables
-	local project_path
-
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_repo_clone_usage
-				exit 0
-				;;
-			-u|--unprivileged)
-				GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
-				CONFIGURE_OPTIONS+=("$1")
-				shift
-				;;
-			-m|--maintainer)
-				(( $# <= 1 )) && die "missing argument for %s" "$1"
-				MAINTAINER="$2"
-				shift 2
-				;;
-			--maintainer=*)
-				MAINTAINER="${1#*=}"
-				shift
-				;;
-			--universe)
-				CLONE_ALL=1
-				shift
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				pkgbases=("$@")
-				break
-				;;
-		esac
-	done
-
-	# Query packages of a maintainer
-	if [[ -n ${MAINTAINER} ]]; then
-		stat_busy "Query packages"
-		max_pages=$(curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name&maintainer=${MAINTAINER}" | jq -r '.num_pages')
-		if [[ ! ${max_pages} =~ ([[:digit:]]) ]]; then
-			stat_done
-			warning "found no packages for maintainer ${MAINTAINER}"
-			exit 0
-		fi
-		mapfile -t pkgbases < <(for page in $(seq "${max_pages}"); do
-			curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name&maintainer=${MAINTAINER}&page=${page}" | jq -r '.results[].pkgbase'
-			stat_progress
-		done | sort --unique)
-		stat_done
-	fi
-
-	# Query all released packages
-	if (( CLONE_ALL )); then
-		stat_busy "Query all released packages"
-		max_pages=$(curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name" | jq -r '.num_pages')
-		if [[ ! ${max_pages} =~ ([[:digit:]]) ]]; then
-			stat_done
-			die "failed to query packages"
-		fi
-		mapfile -t pkgbases < <(for page in $(seq "${max_pages}"); do
-			curl --silent --location --fail --retry 3 --retry-delay 3 "https://archlinux.org/packages/search/json/?sort=name&page=${page}" | jq -r '.results[].pkgbase'
-			stat_progress
-		done | sort --unique)
-		stat_done
-	fi
-
-	for pkgbase in "${pkgbases[@]}"; do
-		if [[ ! -d ${pkgbase} ]]; then
-			msg "Cloning ${pkgbase} ..."
-			project_path=$(gitlab_project_name_to_path "${pkgbase}")
-			remote_url="${GIT_REPO_BASE_URL}/${project_path}.git"
-			git clone --origin origin "${remote_url}" "${pkgbase}"
-		else
-			warning "Skip cloning ${pkgbase}: Directory exists"
-		fi
-
-		pkgctl_repo_configure "${CONFIGURE_OPTIONS[@]}" "${pkgbase}"
-	done
-}
--- a/src/lib/repo/configure.sh
+++ b/src/lib/repo/configure.sh
@@ -1,223 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_REPO_CONFIGURE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_REPO_CONFIGURE_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/api/gitlab.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-
-source /usr/share/makepkg/util/config.sh
-source /usr/share/makepkg/util/message.sh
-
-set -e
-
-
-pkgctl_repo_configure_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [PATH]...
-
-		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.
-
-		OPTIONS
-		    -h, --help           Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} configure *
-_EOF_
-}
-
-get_packager_name() {
-	local packager=$1
-	local packager_pattern="(.+) <(.+@.+)>"
-	local name
-
-	if [[ ! $packager =~ $packager_pattern ]]; then
-		return 1
-	fi
-
-	name=$(echo "${packager}"|sed -E "s/${packager_pattern}/\1/")
-	printf "%s" "${name}"
-}
-
-get_packager_email() {
-	local packager=$1
-	local packager_pattern="(.+) <(.+@.+)>"
-	local email
-
-	if [[ ! $packager =~ $packager_pattern ]]; then
-		return 1
-	fi
-
-	email=$(echo "${packager}"|sed -E "s/${packager_pattern}/\2/")
-	printf "%s" "${email}"
-}
-
-is_packager_name_valid() {
-	local packager_name=$1
-	if [[ -z ${packager_name} ]]; then
-		return 1
-	elif [[ ${packager_name} == "John Doe" ]]; then
-		return 1
-	elif [[ ${packager_name} == "Unknown Packager" ]]; then
-		return 1
-	fi
-	return 0
-}
-
-is_packager_email_official() {
-	local packager_email=$1
-	if [[ -z ${packager_email} ]]; then
-		return 1
-	elif [[ $packager_email =~ .+@archlinux.org ]]; then
-		return 0
-	fi
-	return 1
-}
-
-pkgctl_repo_configure() {
-	# options
-	local GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_HTTPS}
-	local official=0
-	local proto=https
-	local paths=()
-
-	# variables
-	local path realpath pkgbase remote_url project_path
-	local PACKAGER GPGKEY packager_name packager_email
-
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_repo_configure_usage
-				exit 0
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				paths=("$@")
-				break
-				;;
-		esac
-	done
-
-	# check if invoked without any path from within a packaging repo
-	if (( ${#paths[@]} == 0 )); then
-		if [[ -f PKGBUILD ]]; then
-			paths=(".")
-		else
-			pkgctl_repo_configure_usage
-			exit 1
-		fi
-	fi
-
-	# Load makepkg.conf variables to be available for packager identity
-	msg "Collecting packager identity from makepkg.conf"
-	# shellcheck disable=2119
-	load_makepkg_config
-	if [[ -n ${PACKAGER} ]]; then
-		if ! packager_name=$(get_packager_name "${PACKAGER}") || \
-		   ! packager_email=$(get_packager_email "${PACKAGER}"); then
-			die "invalid PACKAGER format '${PACKAGER}' in makepkg.conf"
-		fi
-		if ! is_packager_name_valid "${packager_name}"; then
-			die "invalid PACKAGER '${PACKAGER}' in makepkg.conf"
-		fi
-		if is_packager_email_official "${packager_email}"; then
-			official=1
-			proto=ssh
-			GIT_REPO_BASE_URL=${GIT_PACKAGING_URL_SSH}
-		fi
-	fi
-
-	msg2 "name    : ${packager_name:-${YELLOW}undefined${ALL_OFF}}"
-	msg2 "email   : ${packager_email:-${YELLOW}undefined${ALL_OFF}}"
-	msg2 "gpg-key : ${GPGKEY:-${YELLOW}undefined${ALL_OFF}}"
-	if [[ ${proto} == ssh ]]; then
-		msg2 "protocol: ${GREEN}${proto}${ALL_OFF}"
-	else
-		msg2 "protocol: ${YELLOW}${proto}${ALL_OFF}"
-	fi
-
-	for path in "${paths[@]}"; do
-		if ! realpath=$(realpath -e "${path}"); then
-			error "No such directory: ${path}"
-			continue
-		fi
-
-		pkgbase=$(basename "${realpath}")
-		pkgbase=${pkgbase%.git}
-		msg "Configuring ${pkgbase}"
-
-		if [[ ! -d "${path}/.git" ]]; then
-			error "Not a Git repository: ${path}"
-			continue
-		fi
-
-		pushd "${path}" >/dev/null
-
-		project_path=$(gitlab_project_name_to_path "${pkgbase}")
-		remote_url="${GIT_REPO_BASE_URL}/${project_path}.git"
-		if ! git remote add origin "${remote_url}" &>/dev/null; then
-			git remote set-url origin "${remote_url}"
-		fi
-
-		# move the master branch to main
-		if [[ $(git symbolic-ref --short HEAD) == master ]]; then
-			git branch --move main
-			git config branch.main.merge refs/heads/main
-		fi
-
-		git config devtools.version "${GIT_REPO_SPEC_VERSION}"
-		git config pull.rebase true
-		git config branch.autoSetupRebase always
-		git config branch.main.remote origin
-		git config branch.main.rebase true
-
-		git config transfer.fsckobjects true
-		git config fetch.fsckobjects true
-		git config receive.fsckobjects true
-
-		# setup author identity
-		if [[ -n ${packager_name} ]]; then
-			git config user.name "${packager_name}"
-			git config user.email "${packager_email}"
-		fi
-
-		# force gpg for official packagers
-		if (( official )); then
-			git config commit.gpgsign true
-		fi
-
-		# set custom pgp key from makepkg.conf
-		if [[ -n $GPGKEY ]]; then
-			git config commit.gpgsign true
-			git config user.signingKey "${GPGKEY}"
-		fi
-
-		if ! git ls-remote origin &>/dev/null; then
-			warning "configured remote origin may not exist, run:"
-			msg2 "pkgctl repo create ${pkgbase}"
-		fi
-
-		popd >/dev/null
-	done
-}
--- a/src/lib/repo/create.sh
+++ b/src/lib/repo/create.sh
@@ -1,113 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_REPO_CREATE_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_REPO_CREATE_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/api/gitlab.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-# shellcheck source=src/lib/repo/clone.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/clone.sh
-# shellcheck source=src/lib/repo/configure.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo/configure.sh
-
-set -e
-
-
-pkgctl_repo_create_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
-
-		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 and configure
-		the local repository afterwards.
-
-		OPTIONS
-		    -c, --clone   Clone the Git repository after creation
-		    -h, --help    Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} libfoo
-_EOF_
-}
-
-pkgctl_repo_create() {
-	# options
-	local pkgbases=()
-	local pkgbase
-	local clone=0
-	local configure=0
-
-	# variables
-	local path
-
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_repo_create_usage
-				exit 0
-				;;
-			-c|--clone)
-				clone=1
-				shift
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				pkgbases=("$@")
-				break
-				;;
-		esac
-	done
-
-	# check if invoked without any path from within a packaging repo
-	if (( ${#pkgbases[@]} == 0 )); then
-		if [[ -f PKGBUILD ]]; then
-			if ! path=$(realpath -e .); then
-				die "failed to read path from current directory"
-			fi
-			pkgbases=("$(basename "${path}")")
-			clone=0
-			configure=1
-		else
-			pkgctl_repo_create_usage
-			exit 1
-		fi
-	fi
-
-	# create projects
-	for pkgbase in "${pkgbases[@]}"; do
-		if ! gitlab_api_create_project "${pkgbase}" >/dev/null; then
-			die "failed to create project: ${pkgbase}"
-		fi
-		msg_success "Successfully created ${pkgbase}"
-		if (( clone )); then
-			pkgctl_repo_clone "${pkgbase}"
-		elif (( configure )); then
-			pkgctl_repo_configure
-		fi
-	done
-
-	# some convenience hints if not in auto clone/configure mode
-	if (( ! clone )) && (( ! configure )); then
-		cat <<- _EOF_
-
-		For new clones:
-			$(msg2 "pkgctl repo clone ${pkgbases[*]}")
-		For existing clones:
-			$(msg2 "pkgctl repo configure ${pkgbases[*]}")
-		_EOF_
-	fi
-}
--- a/src/lib/repo/web.sh
+++ b/src/lib/repo/web.sh
@@ -1,83 +0,0 @@
-#!/bin/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_REPO_WEB_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_REPO_WEB_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-# shellcheck source=src/lib/api/gitlab.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/api/gitlab.sh
-
-set -e
-
-
-pkgctl_repo_web_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS] [PKGBASE]...
-
-		Open the packaging repository's website via xdg-open. If called with
-		no arguments, open the package cloned in the current working directory.
-
-		OPTIONS
-		    -h, --help    Show this help text
-
-		EXAMPLES
-		    $ ${COMMAND} web linux
-_EOF_
-}
-
-pkgctl_repo_web() {
-	local pkgbases=()
-	local path giturl pkgbase
-
-	# option checking
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_repo_web_usage
-				exit 0
-				;;
-			--)
-				shift
-				break
-				;;
-			-*)
-				die "invalid argument: %s" "$1"
-				;;
-			*)
-				pkgbases=("$@")
-				break
-				;;
-		esac
-	done
-
-	# Check if web mode has xdg-open
-	if ! command -v xdg-open &>/dev/null; then
-		die "The web command requires 'xdg-open'"
-	fi
-
-	# Check if used without pkgnames in a packaging directory
-	if (( ! $# )); then
-		path=${PWD}
-		if [[ ! -d "${path}/.git" ]]; then
-			die "Not a Git repository: ${path}"
-		fi
-
-		giturl=$(git -C "${path}" remote get-url origin)
-		if [[ ${giturl} != *${GIT_PACKAGING_NAMESPACE}* ]]; then
-			die "Not a packaging repository: ${path}"
-		fi
-
-		pkgbase=$(basename "${giturl}")
-		pkgbase=${pkgbase%.git}
-		pkgbases=("${pkgbase}")
-	fi
-
-	for pkgbase in "${pkgbases[@]}"; do
-		xdg-open "${GIT_PACKAGING_URL_HTTPS}/${pkgbase}"
-	done
-}
--- a/src/lib/util/git.sh
+++ b/src/lib/util/git.sh
@@ -1,24 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_UTIL_GIT_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_UTIL_GIT_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-
-git_diff_tree() {
-	local commit=$1
-	local path=$2
-	git \
-		--no-pager \
-		diff \
-		--color=never \
-		--color-moved=no \
-		--unified=0 \
-		--no-prefix \
-		--no-ext-diff \
-		"${commit}" \
-		-- "${path}"
-}
--- a/src/lib/util/pacman.sh
+++ b/src/lib/util/pacman.sh
@@ -1,52 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_UTIL_PACMAN_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_UTIL_PACMAN_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-# shellcheck source=src/lib/common.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/common.sh
-
-set -e
-
-
-readonly _DEVTOOLS_PACMAN_CACHE_DIR=${XDG_CACHE_DIR:-$HOME/.cache}/devtools/pacman/db
-readonly _DEVTOOLS_PACMAN_CONF_DIR=${_DEVTOOLS_LIBRARY_DIR}/pacman.conf.d
-readonly _DEVTOOLS_MAKEPKG_CONF_DIR=${_DEVTOOLS_LIBRARY_DIR}/makepkg.conf.d
-
-
-update_pacman_repo_cache() {
-	mkdir -p "${_DEVTOOLS_PACMAN_CACHE_DIR}"
-	msg "Updating pacman database cache"
-	lock 10 "${_DEVTOOLS_PACMAN_CACHE_DIR}.lock" "Locking pacman database cache"
-	fakeroot -- pacman --config "${_DEVTOOLS_PACMAN_CONF_DIR}/multilib.conf" \
-		--dbpath "${_DEVTOOLS_PACMAN_CACHE_DIR}" \
-		-Sy
-	lock_close 10
-}
-
-get_pacman_repo_from_pkgbuild() {
-	local path=${1:-PKGBUILD}
-
-	# shellcheck source=contrib/makepkg/PKGBUILD.proto
-	mapfile -t pkgnames < <(source "${path}"; printf "%s\n" "${pkgname[@]}")
-
-	if (( ${#pkgnames[@]} == 0 )); then
-		die 'Failed to get pkgname from %s' "${path}"
-		return
-	fi
-
-	slock 10 "${_DEVTOOLS_PACMAN_CACHE_DIR}.lock" "Locking pacman database cache"
-	mapfile -t repos < <(pacman --config "${_DEVTOOLS_PACMAN_CONF_DIR}/multilib.conf" \
-		--dbpath "${_DEVTOOLS_PACMAN_CACHE_DIR}" \
-		-S \
-		--print \
-		--print-format '%n %r' \
-		"${pkgnames[0]}" | grep -E "^${pkgnames[0]} " | awk '{print $2}'
-	)
-	lock_close 10
-
-	printf "%s" "${repos[0]}"
-}
--- a/src/lib/version/version.sh
+++ b/src/lib/version/version.sh
@@ -1,47 +0,0 @@
-#!/hint/bash
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-
-[[ -z ${DEVTOOLS_INCLUDE_VERSION_SH:-} ]] || return 0
-DEVTOOLS_INCLUDE_VERSION_SH=1
-
-_DEVTOOLS_LIBRARY_DIR=${_DEVTOOLS_LIBRARY_DIR:-@pkgdatadir@}
-
-source /usr/share/makepkg/util/message.sh
-
-set -e
-
-
-pkgctl_version_usage() {
-	local -r COMMAND=${_DEVTOOLS_COMMAND:-${BASH_SOURCE[0]##*/}}
-    cat <<- _EOF_
-		Usage: ${COMMAND} [OPTIONS]
-
-		Shows the current version information of pkgctl
-
-		OPTIONS
-		    -h, --help    Show this help text
-_EOF_
-}
-
-pkgctl_version_print() {
-	cat <<- _EOF_
-		pkgctl @buildtoolver@
-_EOF_
-}
-
-pkgctl_version() {
-	while (( $# )); do
-		case $1 in
-			-h|--help)
-				pkgctl_version_usage
-				exit 0
-				;;
-			*)
-				die "invalid argument: %s" "$1"
-				;;
-		esac
-	done
-
-	pkgctl_version_print
-}
--- a/src/makechrootpkg.in
+++ b/src/makechrootpkg.in
@@ -2,13 +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)

 source /usr/share/makepkg/util/config.sh

@@ -29,7 +24,6 @@ clean_first=0
 run_namcap=0
 run_checkpkg=0
 temp_chroot=0
-tmp_opts="nosuid,nodev,size=50%,nr_inodes=2m"

 bindmounts_ro=()
 bindmounts_rw=()
@@ -317,14 +311,13 @@ fi
 # Pass all arguments after -- right to makepkg
 makepkg_args+=("${@:$OPTIND}")

-# See if -R, -e or -A was passed to makepkg
+# See if -R or -e was passed to makepkg
 for arg in "${@:$OPTIND}"; do
 	case ${arg%%=*} in
-		--skip*|--holdver|--ignorearch) verifysource_args+=("$arg") ;;
+		--skip*|--holdver) verifysource_args+=("$arg") ;;
 		--repackage|--noextract) keepbuilddir=1 ;;
 		--*) ;;
-		-*A*) verifysource_args+=(-A) ;;&
-		-*R*|-*e*) keepbuilddir=1 ;;&
+		-*R*|-*e*) keepbuilddir=1 ;;
 	esac
 done

@@ -371,7 +364,6 @@ prepare_chroot
 if arch-nspawn "$copydir" \
 	--bind="${PWD//:/\\:}:/startdir" \
 	--bind="${SRCDEST//:/\\:}:/srcdest" \
-	--tmpfs="/tmp:${tmp_opts}" \
 	"${bindmounts_ro[@]}" "${bindmounts_rw[@]}" \
 	/chrootbuild "${makepkg_args[@]}"
 then
--- a/src/makerepropkg.in
+++ b/src/makerepropkg.in
@@ -6,12 +6,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)

 source /usr/share/makepkg/util/config.sh
 source /usr/share/makepkg/util/message.sh
@@ -90,16 +86,13 @@ get_pkgfile() {

 get_makepkg_conf() {
    local fname=${1}
-    local arch="${2}"
-    local makepkg_conf="${3}"
+    local makepkg_conf="${2}"
    if ! buildtool_file=$(get_pkgfile "${fname}"); then
        error "failed to retrieve ${fname}"
        return 1
    fi
    msg2 "using makepkg.conf from ${fname}"
-	if ! bsdtar xOqf "${buildtool_file/file:\/\//}" "usr/share/devtools/makepkg.conf.d/${arch}.conf" > "${makepkg_conf}"; then
-		bsdtar xOqf "${buildtool_file/file:\/\//}" "usr/share/devtools/makepkg-${arch}.conf" > "${makepkg_conf}"
-	fi
+    bsdtar xOqf "${buildtool_file/file:\/\//}" usr/share/devtools/makepkg-x86_64.conf > "${makepkg_conf}"
    return 0
 }

@@ -220,17 +213,17 @@ TEMPDIR=$(mktemp -d --tmpdir makerepropkg.XXXXXXXXXX)
 makepkg_conf="${TEMPDIR}/makepkg.conf"
 # anything before buildtool support is pinned to the last none buildtool aware release
 if [[ -z "${BUILDTOOL}" ]]; then
-    get_makepkg_conf "devtools-20210202-3-any" "${CARCH}" "${makepkg_conf}" || exit 1
+    get_makepkg_conf "devtools-20210202-3-any" "${makepkg_conf}" || exit 1
 # prefere to assume devtools up until matching makepkg version so repository packages remain reproducible
 elif [[ "${BUILDTOOL}" = makepkg ]] && (( $(vercmp "${BUILDTOOLVER}" 6.0.1) <= 0 )); then
-    get_makepkg_conf "devtools-20210202-3-any" "${CARCH}" "${makepkg_conf}" || exit 1
+    get_makepkg_conf "devtools-20210202-3-any" "${makepkg_conf}" || exit 1
 # all devtools builds
-elif [[ "${BUILDTOOL}" = devtools ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${CARCH}" "${makepkg_conf}"; then
+elif [[ "${BUILDTOOL}" = devtools ]] && get_makepkg_conf "${BUILDTOOL}-${BUILDTOOLVER}" "${makepkg_conf}"; then
    true
 # fallback to current makepkg.conf
 else
    warning "Unknown buildtool (${BUILDTOOL}-${BUILDTOOLVER}), using fallback"
-    makepkg_conf=@pkgdatadir@/makepkg.conf.d/${CARCH}.conf
+    makepkg_conf=@pkgdatadir@/makepkg-x86_64.conf
 fi
 printf '%s\n' "${allpkgfiles[@]}" | mkarchroot -M "${makepkg_conf}" -U "${archroot_args[@]}" "${namespace}/root" - || exit 1

--- a/src/mkarchroot.in
+++ b/src/mkarchroot.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
@@ -85,10 +81,10 @@ for file in "${files[@]}"; do
 	cp "$file" "$working_dir$file"
 done

-unshare --mount pacstrap -${umode}Mc ${pac_conf:+-C "$pac_conf"} "$working_dir" \
+unshare --mount pacstrap -${umode}Mcd ${pac_conf:+-C "$pac_conf"} "$working_dir" \
 	"${cache_dirs[@]/#/--cachedir=}" "$@" || die 'Failed to install all packages'

-printf '%s.UTF-8 UTF-8\n' en_US de_DE > "$working_dir/etc/locale.gen"
+printf '%s.UTF-8 UTF-8\n' C en_US de_DE > "$working_dir/etc/locale.gen"
 echo 'LANG=C.UTF-8' > "$working_dir/etc/locale.conf"
 echo "$CHROOT_VERSION" > "$working_dir/.arch-chroot"

--- a/src/pkgctl.in
+++ b/src/pkgctl.in
@@ -1,109 +0,0 @@
-#!/bin/bash
-#
-# 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/config.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/config.sh
-
-set -e
-
-
-usage() {
-	local -r COMMAND=${BASH_SOURCE[0]##*/}
-	cat <<- _EOF_
-		Usage: ${COMMAND} [COMMAND] [OPTIONS]
-
-		Unified command-line frontend for devtools.
-
-		COMMANDS
-		    auth    Authenticate with services like GitLab
-		    build   Build packages inside a clean chroot
-		    db      Pacman database modification for packge update, move etc
-		    diff    Compare package files using different modes
-		    release Release step to commit, tag and upload build artifacts
-		    repo    Manage Git packaging repositories and their configuration
-		    version Show pkgctl version information
-
-		OPTIONS
-		    -h, --help     Show this help text
-_EOF_
-}
-
-if (( $# < 1 )); then
-	usage
-	exit 1
-fi
-
-export _DEVTOOLS_COMMAND='pkgctl'
-
-load_devtools_config
-
-# command checking
-while (( $# )); do
-	case $1 in
-		-h|--help)
-			usage
-			exit 0
-			;;
-		build)
-			_DEVTOOLS_COMMAND+=" $1"
-			shift
-			# shellcheck source=src/lib/build/build.sh
-			source "${_DEVTOOLS_LIBRARY_DIR}"/lib/build/build.sh
-			pkgctl_build "$@"
-			exit 0
-			;;
-		repo)
-			_DEVTOOLS_COMMAND+=" $1"
-			shift
-			# shellcheck source=src/lib/repo.sh
-			source "${_DEVTOOLS_LIBRARY_DIR}"/lib/repo.sh
-			pkgctl_repo "$@"
-			exit 0
-			;;
-		auth)
-			_DEVTOOLS_COMMAND+=" $1"
-			shift
-			# shellcheck source=src/lib/auth.sh
-			source "${_DEVTOOLS_LIBRARY_DIR}"/lib/auth.sh
-			pkgctl_auth "$@"
-			exit 0
-			;;
-		db)
-			_DEVTOOLS_COMMAND+=" $1"
-			shift
-			# shellcheck source=src/lib/auth.sh
-			source "${_DEVTOOLS_LIBRARY_DIR}"/lib/db.sh
-			pkgctl_db "$@"
-			exit 0
-			;;
-		diff)
-			_DEVTOOLS_COMMAND+=" $1"
-			shift
-			diffpkg "$@"
-			exit 0
-			;;
-		release)
-			_DEVTOOLS_COMMAND+=" $1"
-			shift
-			# shellcheck source=src/lib/repo.sh
-			source "${_DEVTOOLS_LIBRARY_DIR}"/lib/release.sh
-			pkgctl_release "$@"
-			exit 0
-			;;
-		version|--version|-V)
-			_DEVTOOLS_COMMAND+=" $1"
-			shift
-			# shellcheck source=src/lib/version/version.sh
-			source "${_DEVTOOLS_LIBRARY_DIR}"/lib/version/version.sh
-			pkgctl_version "$@"
-			exit 0
-			;;
-		*)
-			die "invalid command: %s" "$1"
-			;;
-	esac
-done
--- a/src/rebuildpkgs.in
+++ b/src/rebuildpkgs.in
@@ -0,0 +1,111 @@
+#!/bin/bash
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# This script rebuilds a list of packages in order
+# and reports anything that fails
+#
+# Due to sudo usage, it is recommended to allow makechrootpkg
+# to be run with NOPASSWD in your sudoers file
+#
+# FIXME
+# Currently uses $(pwd)/rebuilds as the directory for rebuilding...
+# TODO make this work for community too
+
+m4_include(lib/common.sh)
+
+if (( $# < 1 )); then
+	printf 'Usage: %s <chrootdir> <packages to rebuild>\n' "$(basename "${BASH_SOURCE[0]}")"
+	printf '  example: %s ~/chroot readline bash foo bar baz\n' "$(basename "${BASH_SOURCE[0]}")"
+	exit 1
+fi
+
+# Source makepkg.conf; fail if it is not found
+if [[ -r '/etc/makepkg.conf' ]]; then
+	# shellcheck source=config/makepkg/x86_64.conf
+	source '/etc/makepkg.conf'
+else
+	die '/etc/makepkg.conf not found!'
+fi
+
+# Source user-specific makepkg.conf overrides
+if [[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf" ]]; then
+	# shellcheck source=/dev/null
+	source "${XDG_CONFIG_HOME:-$HOME/.config}/pacman/makepkg.conf"
+elif [[ -r "$HOME/.makepkg.conf" ]]; then
+	# shellcheck source=/dev/null
+	source "$HOME/.makepkg.conf"
+fi
+
+bump_pkgrel() {
+	# Get the current pkgrel from SVN and update the working copy with it
+	# This prevents us from incrementing out of control :)
+	pbuild='.svn/text-base/PKGBUILD.svn-base'
+	oldrel=$(grep 'pkgrel=' $pbuild | cut -d= -f2)
+
+	#remove decimals
+	rel=${oldrel%%.*}
+
+	newrel=$((rel + 1))
+
+	sed -i "s/pkgrel=$oldrel/pkgrel=$newrel/" PKGBUILD
+}
+
+pkg_from_pkgbuild() {
+	# we want the sourcing to be done in a subshell so we don't pollute our current namespace
+	export CARCH PKGEXT
+	# shellcheck source=contrib/makepkg/PKGBUILD.proto
+	(source PKGBUILD; echo "$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT")
+}
+
+chrootdir="$1"; shift
+pkgs=("$@")
+
+SVNPATH='svn+ssh://repos.archlinux.org/srv/repos/svn-packages/svn'
+
+msg "Work will be done in %s" "$(pwd)/rebuilds"
+
+REBUILD_ROOT="$(pwd)/rebuilds"
+mkdir -p "$REBUILD_ROOT"
+cd "$REBUILD_ROOT"
+
+/usr/bin/svn co -N $SVNPATH
+
+FAILED=""
+for pkg in "${pkgs[@]}"; do
+	cd "$REBUILD_ROOT/svn-packages"
+
+	msg2 "Building '%s'" "$pkg"
+	/usr/bin/svn update "$pkg"
+	if [[ ! -d "$pkg/trunk" ]]; then
+		FAILED="$FAILED $pkg"
+		warning "%s does not exist in SVN" "$pkg"
+		continue
+	fi
+	cd "$pkg/trunk/"
+
+	bump_pkgrel
+
+	if ! sudo makechrootpkg -u -d -r "$chrootdir" -- --noconfirm; then
+		FAILED="$FAILED $pkg"
+		error "%s Failed!" "$pkg"
+	else
+		pkgfile=$(pkg_from_pkgbuild)
+		if [[ -e $pkgfile ]]; then
+			msg2 "%s Complete" "$pkg"
+		else
+			FAILED="$FAILED $pkg"
+			error "%s Failed, no package built!" "$pkg"
+		fi
+	fi
+done
+
+cd "$REBUILD_ROOT"
+if [[ -n $FAILED ]]; then
+	msg 'Packages failed:'
+	for pkg in $FAILED; do
+		msg2 "%s" "$pkg"
+	done
+fi
+
+msg 'SVN pkgbumps in svn-packages/ - commit when ready'
--- a/src/sogrep.in
+++ b/src/sogrep.in
@@ -6,17 +6,13 @@
 #
 # 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/valid-repos.sh
-source "${_DEVTOOLS_LIBRARY_DIR}"/lib/valid-repos.sh
-
+m4_include(lib/common.sh)

 # globals
-fallback_mirror='https://geo.mirror.pkgbuild.com'
+: ${SOLINKS_MIRROR:="https://mirror.pkgbuild.com"}
 : ${SOCACHE_DIR:="${XDG_CACHE_HOME:-${HOME}/.cache}/sogrep"}

+m4_include(lib/valid-repos.sh)
 arches=('x86_64')

 # options
@@ -27,16 +23,11 @@ source /usr/share/makepkg/util/parseopts.sh
 source /usr/share/makepkg/util/util.sh

 recache() {
-    local repo arch fallback_linksdburl linksdburl mirror verbosity=-s
+    local repo arch verbosity=-s

    (( VERBOSE )) && verbosity=--progress-bar

    for repo in "${_repos[@]}"; do
-        if [[ -n "$SOLINKS_MIRROR" ]]; then
-            mirror="$SOLINKS_MIRROR"
-        elif ! mirror="$(set -o pipefail; pacman-conf --repo "$repo" Server 2>/dev/null | head -n1)"; then
-            mirror="$fallback_mirror"
-        fi
        for arch in "${arches[@]}"; do
            # delete extracted tarballs from previous sogrep versions
            rm -rf "${SOCACHE_DIR}/${arch}/${repo}"
@@ -45,20 +36,8 @@ recache() {
            local dbpath=${SOCACHE_DIR}/${arch}/${repo}.links.tar.gz
            mkdir -p "${dbpath%/*}"
            (( VERBOSE )) && echo "Fetching ${repo}.links.tar.gz..."
-
-            if [[ "$mirror" == *"/${repo}/os/${arch}" ]]; then
-                linksdburl="${mirror}/${repo}.links.tar.gz"
-            else
-                linksdburl="${mirror}/${repo}/os/${arch}/${repo}.links.tar.gz"
-            fi
-            fallback_linksdburl="${fallback_mirror}/${repo}/os/${arch}/${repo}.links.tar.gz"
-
-            if curl -fLR "${verbosity}" -o "${dbpath}" -z "${dbpath}" "$linksdburl"; then
-                :
-            elif [[ "$linksdburl" != "$fallback_linksdburl" ]] \
-                && curl -fLR "${verbosity}" -o "${dbpath}" -z "${dbpath}" "$fallback_linksdburl"; then
-                :
-            else
+            if ! curl -fLR "${verbosity}" -o "${dbpath}" -z "${dbpath}" \
+                    "${SOLINKS_MIRROR}/${repo}/os/${arch}/${repo}.links.tar.gz"; then
                echo "error: failed to download links database for repo ${repo}"
                exit 1
            fi
--- a/test/bin/pkgctl
+++ b/test/bin/pkgctl
@@ -1,12 +0,0 @@
-#!/usr/bin/bash
-set -e
-
-root="$(dirname -- "$(readlink -f -- "$0")")/../.."
-
-# always build everything so we use an up-to-date state
-make -C "${root}" -j --no-print-directory --silent
-
-# run pkgctl from the build directory
-export PATH="${root}/build/bin:${PATH}"
-export _DEVTOOLS_LIBRARY_DIR="${root}/build"
-"${root}/build/bin/pkgctl" "$@"