From c8df79b8892672d27e1ee61fd3d7666755a67a3c Mon Sep 17 00:00:00 2001
From: Luke Shumaker <lukeshu@parabola.nu>
Date: Tue, 2 Jan 2018 23:38:04 -0500
Subject: Revert "Remove i686 support"

This reverts commit 7259e7def07a5f6ee04a34db61a87361ad0b5ac7, except for commitpkg.in
---
 Makefile          | 13 ++++++++++++-
 lib/valid-tags.sh | 19 ++++++++++---------
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 0229c5c..f0332f4 100644
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,8 @@ GENERATED_CONFIGS = \
 	pacman-testing-i686.conf \
 	pacman-staging-i686.conf \
 	pacman-kde-unstable-i686.conf \
-	pacman-gnome-unstable-i686.conf
+	pacman-gnome-unstable-i686.conf \
+	makepkg-i686.conf
 GENERATED_CONFIGS := $(addprefix $(BUILDDIR)/config/,$(GENERATED_CONFIGS))
 
 COMMITPKG_LINKS = \
@@ -34,16 +35,21 @@ COMMITPKG_LINKS = \
 	gnome-unstablepkg
 
 ARCHBUILD_LINKS = \
+	extra-i686-build \
 	extra-x86_64-build \
 	extra-x86_64_v3-build \
+	testing-i686-build \
 	testing-x86_64-build \
 	testing-x86_64_v3-build \
+	staging-i686-build \
 	staging-x86_64-build \
 	staging-x86_64_v3-build \
 	multilib-build \
 	multilib-testing-build \
 	multilib-staging-build \
+	kde-unstable-i686-build \
 	kde-unstable-x86_64-build \
+	gnome-unstable-i686-build \
 	gnome-unstable-x86_64-build
 
 CROSSREPOMOVE_LINKS = \
@@ -80,6 +86,11 @@ endif
 edit = sed -e "s|@pkgdatadir[@]|$(PREFIX)/share/devtools|g"
 GEN_MSG = @echo "GEN $(patsubst $(BUILDDIR)/%,%,$@)"
 
+$(BUILDDIR)/config/makepkg-i686.conf: config/makepkg/x86_64.conf
+	@echo "GEN $(notdir $@)"
+	@mkdir -p $(dir $@)
+	@sed 's,\(["=]\)x86[-_]64\([-" ]\),\1i686\2,g' "$<" > "$@"
+
 $(BUILDDIR)/config/pacman-%-i686.conf: config/pacman/%.conf
 	@echo "GEN $(notdir $@)"
 	@mkdir -p $(dir $@)
diff --git a/lib/valid-tags.sh b/lib/valid-tags.sh
index d628fd1..0e8366e 100644
--- a/lib/valid-tags.sh
+++ b/lib/valid-tags.sh
@@ -5,22 +5,23 @@
 
 # shellcheck disable=2034
 _arch=(
+	i686
 	x86_64
 	any
 )
 
 # shellcheck disable=2034
 _tags=(
-	core-x86_64 core-any
-	extra-x86_64 extra-any
+	core-i686 core-x86_64 core-any
+	extra-i686 extra-x86_64 extra-any
 	multilib-x86_64
-	staging-x86_64 staging-any
-	testing-x86_64 testing-any
+	staging-i686 staging-x86_64 staging-any
+	testing-i686 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
+	community-i686 community-x86_64 community-any
+	community-staging-i686 community-staging-x86_64 community-staging-any
+	community-testing-i686 community-testing-x86_64 community-testing-any
+	kde-unstable-i686 kde-unstable-x86_64 kde-unstable-any
+	gnome-unstable-i686 gnome-unstable-x86_64 gnome-unstable-any
 )
-- 
cgit v1.2.3-54-g00ecf