Merge branch 'fix/clean-makepkg.conf.d' into 'master'

Draft: fix(arch-nspawn): clean all existing makepkg conf.d files before overriding

See merge request archlinux/devtools!308

contrib/completion/bash/devtools.in

@@ -150,7 +150,6 @@ _pkgctl_cmds=(
 	db
 	diff
 	issue
-	license
 	release
 	repo
 	search

src/arch-nspawn.in

@@ -116,6 +116,9 @@ copy_hostconf () {
 		cp "$makepkg_conf" "$working_dir/etc/makepkg.conf"
 		if [[ -d "${makepkg_conf}.d" ]] && is_globfile "${makepkg_conf}.d"/*.conf; then
 			mkdir --parents "$working_dir/etc/makepkg.conf.d/"
+			if is_globfile "$working_dir/etc/makepkg.conf.d"/*.conf; then
+				rm --force "$working_dir/etc/makepkg.conf.d"/*.conf
+			fi
 			cp "${makepkg_conf}.d/"*.conf "$working_dir/etc/makepkg.conf.d/"
 		fi
 	fi

src/lib/license/setup.sh

@@ -188,7 +188,6 @@ path = [
     "README.md",
     "keys/**",
     ".SRCINFO",
-    ".gitignore",
     ".nvchecker.toml",
     "*.install",
     "*.sysusers",