From b9db6160a2547a57d19308776a25223eb2130b6b Mon Sep 17 00:00:00 2001
From: Levente Polyak <anthraxx@archlinux.org>
Date: Tue, 13 Dec 2022 20:41:37 +0100
Subject: git: convert repos and tags config to new repo layout

---
 Makefile               |  9 ++++-----
 src/lib/valid-repos.sh | 21 +++++----------------
 src/lib/valid-tags.sh  |  9 ++++-----
 3 files changed, 13 insertions(+), 26 deletions(-)

diff --git a/Makefile b/Makefile
index f59ca26..89251f4 100644
--- a/Makefile
+++ b/Makefile
@@ -20,12 +20,11 @@ SETARCH_ALIASES = $(wildcard config/setarch-aliases.d/*)
 MANS = $(addprefix $(BUILDDIR)/,$(patsubst %.asciidoc,%,$(wildcard doc/man/*.asciidoc)))
 
 COMMITPKG_LINKS = \
+	core-testingpkg \
+	core-stagingpkg \
 	extrapkg \
-	testingpkg \
-	stagingpkg \
-	communitypkg \
-	community-testingpkg \
-	community-stagingpkg \
+	extra-testingpkg \
+	extra-stagingpkg \
 	multilibpkg \
 	multilib-testingpkg \
 	multilib-stagingpkg \
diff --git a/src/lib/valid-repos.sh b/src/lib/valid-repos.sh
index 9ac9639..1f823f4 100644
--- a/src/lib/valid-repos.sh
+++ b/src/lib/valid-repos.sh
@@ -5,28 +5,17 @@
 
 # shellcheck disable=2034
 _repos=(
-	staging
-	testing
-	core
-	extra
-	community-staging
-	community-testing
-	community
-	multilib-staging
-	multilib-testing
-	multilib
+	core core-staging core-testing
+	extra extra-staging extra-testing
+	multilib multilib-staging multilib-testing
 	gnome-unstable
 	kde-unstable
 )
 
 # shellcheck disable=2034
 _build_repos=(
-	staging
-	testing
-	extra
-	multilib-staging
-	multilib-testing
-	multilib
+	extra staging testing
+	multilib multilib-staging multilib-testing
 	gnome-unstable
 	kde-unstable
 )
diff --git a/src/lib/valid-tags.sh b/src/lib/valid-tags.sh
index d628fd1..ca8d7d7 100644
--- a/src/lib/valid-tags.sh
+++ b/src/lib/valid-tags.sh
@@ -12,15 +12,14 @@ _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
 )
-- 
cgit v1.2.3-70-g09d2