From eb2a14416eca0aa2b5d7f70c3b85274419374fba Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Apr 28 2022 12:44:52 +0000
Subject: [pacman]: revert previous WIP change


---

diff --git a/libre/pacman/PKGBUILD b/libre/pacman/PKGBUILD
index e0d1db8..17eb6e4 100644
--- a/libre/pacman/PKGBUILD
+++ b/libre/pacman/PKGBUILD
@@ -46,9 +46,9 @@ sha256sums=('004448085a7747bdc7a0a4dd5d1fb7556c6b890111a06e029ab088f9905d4808'
             'SKIP'
             'fe7e037e1b84bfa5bc401650d148c2a2e87d827705a6ec18a596ff5eea3cc0fd'
             'a51b57dd47818d97e29ac0b8604b4b409916bbe6029adfbb03ac7e7c2b2a0819'
-            '29815f65c9dc402cd22651ae1b24def9a6b1525554b348b28a398530a79a1092'
-            '4a4198d6269a8a6b76edf66df4185c599f0b12e143fb7cc9a3497cc78f5e33f8'
-            'a7bc662bda8e5707eddc2b8891fd756afed4aeea76e5a0145ecba128a8210d7f'
+            'c974c1cc256f77238be31562344170e1ed2ee715d7beb0ce309d6adccda8de85'
+            '04e4ab5d45444f405d94aeb5dc65037e40b1e934ce0aa34b5f92b698805dd85a'
+            '003c557bda471e6b567f58e6509a3df26b7f408a29117ccac172e64a4965102b'
             '20e9de1b612c3f24736e76a753cd38b7ea0f80160185012a538a77297acfb31f'
             '220f1b25a64727041dc6fa3fd486b0a043f735a3f6cecedc4e2f7c47ec6ce66d'
             '2a857061f032ff5485f5c75ab74e6f6532621e08963ef48640a792cca16cacd6'
@@ -146,12 +146,6 @@ package() {
   for carch in "${arch[@]}"; do
     install -m644 "$srcdir/pacman.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"
     install -m644 "$srcdir/makepkg.conf.$carch" "$pkgdir/usr/share/pacman/defaults/"
-
-    # fix defaults 'Architecture' to one arch (allows pacstrap to create cross-arch chroots)
-    local pacman_conf="$pkgdir/usr/share/pacman/defaults/pacman.conf.$carch"
-    local err_msg="could not apply 'Architecture' patch to ${pacman_conf}"
-    sed -i "s|^Architecture = .*|Architecture = ${carch}|" "${pacman_conf}"
-    grep -E "^Architecture = ${carch}$" "${pacman_conf}" || ! echo "${err_msg}"
   done
 
   # Parabola's pacman began shipping a weekly job for this back in
diff --git a/libre/pacman/pacman.conf.i686 b/libre/pacman/pacman.conf.i686
index 2282210..c8a23cb 100644
--- a/libre/pacman/pacman.conf.i686
+++ b/libre/pacman/pacman.conf.i686
@@ -19,7 +19,7 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-Architecture = auto
+Architecture = i686
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =
diff --git a/libre/pacman/pacman.conf.x86_64 b/libre/pacman/pacman.conf.x86_64
index 6fe6ce1..5613046 100644
--- a/libre/pacman/pacman.conf.x86_64
+++ b/libre/pacman/pacman.conf.x86_64
@@ -19,7 +19,7 @@ HoldPkg     = pacman glibc
 #XferCommand = /usr/bin/curl -L -C - -f -o %o %u
 #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
 #CleanMethod = KeepInstalled
-Architecture = auto
+Architecture = x86_64
 
 # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
 #IgnorePkg   =