Re: [PR PATCH] [Updated] [RFC] move chroot/bootstrap packages to bootstrap repository

[classabbyamp <classabbyamp@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 508 bytes --]

There is an updated pull request by classabbyamp against master on the void-packages repository

https://github.com/classabbyamp/void-packages bootstrap-repo
https://github.com/void-linux/void-packages/pull/39868

[RFC] move chroot/bootstrap packages to bootstrap repository
closes #39166

#### Testing the changes
- I tested the changes in this PR: **NO**
    - have not tested this yet, will do so soon

[ci skip]


A patch file from https://github.com/void-linux/void-packages/pull/39868.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-bootstrap-repo-39868.patch --]
[-- Type: text/x-diff, Size: 25144 bytes --]

From d2873ff5dc00785f477d40925aba49743eb074c6 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:14:51 -0400
Subject: [PATCH 01/24] etc/xbps.d/repos-*.conf: add bootstrap repo

---
 etc/xbps.d/repos-local-x86_64-multilib.conf  | 1 +
 etc/xbps.d/repos-local.conf                  | 1 +
 etc/xbps.d/repos-remote-aarch64-musl.conf    | 1 +
 etc/xbps.d/repos-remote-aarch64.conf         | 1 +
 etc/xbps.d/repos-remote-musl.conf            | 1 +
 etc/xbps.d/repos-remote-x86_64-multilib.conf | 1 +
 etc/xbps.d/repos-remote.conf                 | 1 +
 7 files changed, 7 insertions(+)

diff --git a/etc/xbps.d/repos-local-x86_64-multilib.conf b/etc/xbps.d/repos-local-x86_64-multilib.conf
index 3c531e4f9c07..f54ce4a01e5c 100644
--- a/etc/xbps.d/repos-local-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-local-x86_64-multilib.conf
@@ -2,3 +2,4 @@
 # x86_64/glibc local repositories
 repository=/host/binpkgs/multilib
 repository=/host/binpkgs/multilib/nonfree
+repository=/host/binpkgs/multilib/bootstrap
diff --git a/etc/xbps.d/repos-local.conf b/etc/xbps.d/repos-local.conf
index 916c3b750d3f..d1ac2b86ebdc 100644
--- a/etc/xbps.d/repos-local.conf
+++ b/etc/xbps.d/repos-local.conf
@@ -3,3 +3,4 @@
 repository=/host/binpkgs
 repository=/host/binpkgs/nonfree
 repository=/host/binpkgs/debug
+repository=/host/binpkgs/bootstrap
diff --git a/etc/xbps.d/repos-remote-aarch64-musl.conf b/etc/xbps.d/repos-remote-aarch64-musl.conf
index a625c5a9768f..c31896136289 100644
--- a/etc/xbps.d/repos-remote-aarch64-musl.conf
+++ b/etc/xbps.d/repos-remote-aarch64-musl.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
diff --git a/etc/xbps.d/repos-remote-aarch64.conf b/etc/xbps.d/repos-remote-aarch64.conf
index a625c5a9768f..c31896136289 100644
--- a/etc/xbps.d/repos-remote-aarch64.conf
+++ b/etc/xbps.d/repos-remote-aarch64.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current/aarch64
 repository=https://repo-default.voidlinux.org/current/aarch64/nonfree
 repository=https://repo-default.voidlinux.org/current/aarch64/debug
+repository=https://repo-default.voidlinux.org/current/aarch64/bootstrap
diff --git a/etc/xbps.d/repos-remote-musl.conf b/etc/xbps.d/repos-remote-musl.conf
index 4a25e4f0a2a6..a26ee1721ced 100644
--- a/etc/xbps.d/repos-remote-musl.conf
+++ b/etc/xbps.d/repos-remote-musl.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current/musl
 repository=https://repo-default.voidlinux.org/current/musl/nonfree
 repository=https://repo-default.voidlinux.org/current/musl/debug
+repository=https://repo-default.voidlinux.org/current/musl/bootstrap
diff --git a/etc/xbps.d/repos-remote-x86_64-multilib.conf b/etc/xbps.d/repos-remote-x86_64-multilib.conf
index f90208afeb43..3cf76ab915fc 100644
--- a/etc/xbps.d/repos-remote-x86_64-multilib.conf
+++ b/etc/xbps.d/repos-remote-x86_64-multilib.conf
@@ -1,3 +1,4 @@
 # voidlinux remote repositories (x86_64/glibc)
 repository=https://repo-default.voidlinux.org/current/multilib
 repository=https://repo-default.voidlinux.org/current/multilib/nonfree
+repository=https://repo-default.voidlinux.org/current/multilib/bootstrap
diff --git a/etc/xbps.d/repos-remote.conf b/etc/xbps.d/repos-remote.conf
index 07be9e9fcc4a..55929049e86c 100644
--- a/etc/xbps.d/repos-remote.conf
+++ b/etc/xbps.d/repos-remote.conf
@@ -2,3 +2,4 @@
 repository=https://repo-default.voidlinux.org/current
 repository=https://repo-default.voidlinux.org/current/nonfree
 repository=https://repo-default.voidlinux.org/current/debug
+repository=https://repo-default.voidlinux.org/current/bootstrap

From 73e2a7ba89dc6a6fe2ac71f2fb317c9ca770878a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:21:06 -0400
Subject: [PATCH 02/24] common/xbps-src/shutils/: add bootstrap repo

---
 common/xbps-src/shutils/bulk.sh   | 4 ++--
 common/xbps-src/shutils/chroot.sh | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/xbps-src/shutils/bulk.sh b/common/xbps-src/shutils/bulk.sh
index b0c39b2b7398..2e6beedf549a 100644
--- a/common/xbps-src/shutils/bulk.sh
+++ b/common/xbps-src/shutils/bulk.sh
@@ -73,7 +73,7 @@ bulk_build() {
         return $?
         ;;
     local)
-        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -D "$XBPS_DISTDIR")
+        bulk_sortdeps $(xbps-checkvers -f '%n' -i -R "${XBPS_REPOSITORY}" -R "${XBPS_REPOSITORY}/nonfree" -R "${XBPS_REPOSITORY}/bootstrap" -D "$XBPS_DISTDIR")
         return $?
         ;;
     esac
@@ -122,6 +122,6 @@ bulk_update() {
     if [ -n "$pkgs" -a "$cmd" == installed ]; then
         echo
         msg_normal "xbps-src: updating your system, confirm to proceed...\n"
-        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree -u ${pkgs//[$'\n']/ }" || return 1
+        ${XBPS_SUCMD} "xbps-install --repository=$XBPS_REPOSITORY --repository=$XBPS_REPOSITORY/nonfree --repository=$XBPS_REPOSITORY/bootstrap -u ${pkgs//[$'\n']/ }" || return 1
     fi
 }
diff --git a/common/xbps-src/shutils/chroot.sh b/common/xbps-src/shutils/chroot.sh
index a7100d4ea56f..b898955cc414 100644
--- a/common/xbps-src/shutils/chroot.sh
+++ b/common/xbps-src/shutils/chroot.sh
@@ -213,11 +213,13 @@ chroot_sync_repodata() {
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}"; \
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/nonfree"; \
             echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/debug"; \
+            echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/bootstrap"; \
             ) > $confdir/00-repository-alt-local.conf
         if [ "$XBPS_MACHINE" = "x86_64" ]; then
             ( \
                 echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib"; \
                 echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/nonfree"; \
+                echo "repository=$hostdir/binpkgs/${XBPS_ALT_REPOSITORY}/multilib/bootstrap"; \
             ) >> $confdir/00-repository-alt-local.conf
         fi
     else

From 40996f23c333d438ceab8700c2df41ae5b38e58a Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:18:16 -0400
Subject: [PATCH 03/24] common/scripts/lint-conflicts: add bootstrap repo

---
 common/scripts/lint-conflicts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/scripts/lint-conflicts b/common/scripts/lint-conflicts
index 2917f72a89a6..70309af4a3fe 100755
--- a/common/scripts/lint-conflicts
+++ b/common/scripts/lint-conflicts
@@ -25,7 +25,7 @@ else
 fi
 
 declare -A newly_built conflicts_cache providers_cache pairs owners
-repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree")
+repositories=("--repository=${binpkgs}" "--repository=${binpkgs}/nonfree" "--repository=${binpkgs}/bootstrap")
 rv=0
 
 template_exists() {

From c8c13f375b9a768e6fe0a356eea99f60fa605591 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:17:05 -0400
Subject: [PATCH 04/24] common/travis/: add bootstrap repo to CI scripts

---
 common/travis/check-install.sh | 4 +++-
 common/travis/show_files.sh    | 1 +
 common/travis/xpkgdiff.sh      | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/travis/check-install.sh b/common/travis/check-install.sh
index d97256700024..e7319b8d441a 100755
--- a/common/travis/check-install.sh
+++ b/common/travis/check-install.sh
@@ -9,7 +9,9 @@ if [ "$1" != "$XBPS_TARGET_ARCH" ]; then
 	ROOTDIR="-r /usr/$triplet"
 fi
 
-ADDREPO="--repository=$HOME/hostdir/binpkgs --repository=$HOME/hostdir/binpkgs/nonfree"
+ADDREPO="--repository=$HOME/hostdir/binpkgs
+ --repository=$HOME/hostdir/binpkgs/nonfree
+ --repository=$HOME/hostdir/binpkgs/bootstrap"
 
 while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
diff --git a/common/travis/show_files.sh b/common/travis/show_files.sh
index 8799ed52e1e1..2fbae7e94006 100755
--- a/common/travis/show_files.sh
+++ b/common/travis/show_files.sh
@@ -9,6 +9,7 @@ while read -r pkg; do
 		/bin/echo -e "\x1b[32mFiles of $subpkg:\x1b[0m"
 		xbps-query --repository=$HOME/hostdir/binpkgs \
 				   --repository=$HOME/hostdir/binpkgs/nonfree \
+				   --repository=$HOME/hostdir/binpkgs/bootstrap \
 				   -i -f "$subpkg" ||
 					/bin/echo -e "\x1b[33m    $subpkg wasn't found\x1b[0m"
 	done
diff --git a/common/travis/xpkgdiff.sh b/common/travis/xpkgdiff.sh
index 7caabe4b0b71..a2eb9b7b166c 100755
--- a/common/travis/xpkgdiff.sh
+++ b/common/travis/xpkgdiff.sh
@@ -11,6 +11,7 @@ while read -r pkg; do
 	for subpkg in $(xsubpkg $pkg); do
 		if xbps-query --repository=$HOME/hostdir/binpkgs \
 					  --repository=$HOME/hostdir/binpkgs/nonfree \
+					  --repository=$HOME/hostdir/binpkgs/bootstrap \
 					  -i "$subpkg" >&/dev/null; then
 			/bin/echo -e "\x1b[34mFile Diff of $subpkg:\x1b[0m"
 			xpkgdiff $ARGS -f $subpkg

From 9500ee7871b0f130e15dffd02d3a63c10d4aa7ff Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:37 -0400
Subject: [PATCH 05/24] chroot-bash: move to bootstrap repo

---
 srcpkgs/chroot-bash/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-bash/template b/srcpkgs/chroot-bash/template
index e122099fabcb..bd7d385d426c 100644
--- a/srcpkgs/chroot-bash/template
+++ b/srcpkgs/chroot-bash/template
@@ -16,6 +16,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="http://www.gnu.org/software/bash/bash.html"
 distfiles="${GNU_SITE}/bash/bash-${_bash_distver}.tar.gz"
+repository=bootstrap
 
 _url="${GNU_SITE}/bash/bash-${_bash_distver}-patches"
 for _p in $(seq -w 001 ${_bash_patchlevel}); do

From 3ea97ce18ad5be84b9d4b14c8ed2fe94d8655731 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:44 -0400
Subject: [PATCH 06/24] chroot-distcc: move to bootstrap repo

---
 srcpkgs/chroot-distcc/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-distcc/template b/srcpkgs/chroot-distcc/template
index bb4e61983990..f07bdbc85fd7 100644
--- a/srcpkgs/chroot-distcc/template
+++ b/srcpkgs/chroot-distcc/template
@@ -14,6 +14,7 @@ license="GPL-2.0-or-later"
 homepage="https://distcc.github.io"
 distfiles="https://github.com/distcc/distcc/releases/download/v${version}/distcc-${version}.tar.gz"
 checksum=bead25471d5a53ecfdf8f065a6fe48901c14d5008956c318c700e56bc87bf0bc
+repository=bootstrap
 
 conflicts="distcc>=0"
 CFLAGS="-fcommon"

From a371a2e51b79a8ce2c9114fd1be4b9a522641c8c Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 07/24] chroot-gawk: move to bootstrap repo

---
 srcpkgs/chroot-gawk/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-gawk/template b/srcpkgs/chroot-gawk/template
index c6d5e7441b5d..5f8d18eead92 100644
--- a/srcpkgs/chroot-gawk/template
+++ b/srcpkgs/chroot-gawk/template
@@ -11,6 +11,7 @@ license="GPL-3.0-or-later"
 homepage="https://directory.fsf.org/wiki/Gawk"
 distfiles="${GNU_SITE}/gawk/gawk-${version}.tar.xz"
 checksum=8e4e86f04ed789648b66f757329743a0d6dfb5294c3b91b756a474f1ce05a794
+repository=bootstrap
 
 bootstrap=yes
 provides="awk-0_1"

From 34fc10e833eda9474fe7ef7698664b196244c37e Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:45 -0400
Subject: [PATCH 08/24] chroot-git: move to bootstrap repo

---
 srcpkgs/chroot-git/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-git/template b/srcpkgs/chroot-git/template
index 854ec7c2a168..35682f4e9d7f 100644
--- a/srcpkgs/chroot-git/template
+++ b/srcpkgs/chroot-git/template
@@ -11,6 +11,7 @@ license="GPL-2.0-only"
 homepage="https://git-scm.com/"
 distfiles="https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"
 checksum=923eade26b1814de78d06bda8e0a9f5da8b7c4b304b3f9050ffb464f0310320a
+repository=bootstrap
 
 if [ "$CHROOT_READY" ]; then
 	checkdepends="perl gnupg"

From e7133dfd00bb09c25dc2e377c81914f47dd5df88 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:46 -0400
Subject: [PATCH 09/24] chroot-grep: move to bootstrap repo

---
 srcpkgs/chroot-grep/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-grep/template b/srcpkgs/chroot-grep/template
index 468249d87ebc..83997aacf3de 100644
--- a/srcpkgs/chroot-grep/template
+++ b/srcpkgs/chroot-grep/template
@@ -15,6 +15,7 @@ checksum=5c10da312460aec721984d5d83246d24520ec438dd48d7ab5a05dbc0d6d6823c
 conflicts="grep>=0"
 provides="grep-${version}_${revision}"
 make_check=no # Infinate loop in hash-collision-perf without perl
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = musl ]; then
 	export ac_cv_lib_error_at_line=no

From c1170ae4feae0b07d57827bddbe0e624d92128c2 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:09:47 -0400
Subject: [PATCH 10/24] chroot-util-linux: move to bootstrap repo

---
 srcpkgs/chroot-util-linux/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/chroot-util-linux/template b/srcpkgs/chroot-util-linux/template
index a4ff6337ba1a..247ac4ea1e22 100644
--- a/srcpkgs/chroot-util-linux/template
+++ b/srcpkgs/chroot-util-linux/template
@@ -21,6 +21,7 @@ distfiles="${KERNEL_SITE}/utils/util-linux/v${version%.*}/util-linux-${version}.
 checksum=86e6707a379c7ff5489c218cfaf1e3464b0b95acf7817db0bc5f179e356a67b2
 conflicts="util-linux>=0"
 provides="util-linux-${version}_${revision}"
+repository=bootstrap
 
 if [ -z "$CHROOT_READY" ]; then
 	CFLAGS+=" -I${XBPS_MASTERDIR}/usr/include"

From 1ef5753813da175b418cc2fba5aa6a07b61db6db Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:10:08 -0400
Subject: [PATCH 11/24] curl: move chroot- subpkg to bootstrap repo

---
 srcpkgs/curl/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/curl/template b/srcpkgs/curl/template
index eb8c4204a6cd..89ed03a2c63b 100644
--- a/srcpkgs/curl/template
+++ b/srcpkgs/curl/template
@@ -87,6 +87,7 @@ libcurl-devel_package() {
 
 chroot-curl_package() {
 	short_desc+=" - for build infra use"
+	repository=bootstrap
 	pkg_install() {
 		vbin $DESTDIR/usr/bin/curl chroot-curl
 	}

From eac66a56a9008958ec9e2ef7853e2d2c7996acc3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:51 -0400
Subject: [PATCH 12/24] cargo-bootstrap: move to bootstrap repo

---
 srcpkgs/cargo-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/cargo-bootstrap/template b/srcpkgs/cargo-bootstrap/template
index 43d0b0049b5a..4d61cbd58340 100644
--- a/srcpkgs/cargo-bootstrap/template
+++ b/srcpkgs/cargo-bootstrap/template
@@ -9,6 +9,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="cargo>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 _bootstrap_url="https://static.rust-lang.org/dist"
 

From 09eb4e93b6a9a974b414bfe4b52994ce0791cb13 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 13/24] dmd-bootstrap: move to bootstrap repo

---
 srcpkgs/dmd-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/dmd-bootstrap/template b/srcpkgs/dmd-bootstrap/template
index 029b0024faea..0448c834e707 100644
--- a/srcpkgs/dmd-bootstrap/template
+++ b/srcpkgs/dmd-bootstrap/template
@@ -21,6 +21,7 @@ checksum="
  7f4d84f2b5252c0cc33bffbb4de8aab9321df844b8512e27e90267cbb9bc7422
  57306f80a63b83b755043d05e85e83cf3178701c92d295c97d1a5a8be8ffce19"
 provides="d-compiler-${version}_${revision}"
+repository=bootstrap
 
 post_extract() {
 	rm -rf dmd druntime phobos

From 2d267fd6b99747095f19019cc811739b2b9f25c7 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:53 -0400
Subject: [PATCH 14/24] go1.12-bootstrap: move to bootstrap repo

---
 srcpkgs/go1.12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/go1.12-bootstrap/template b/srcpkgs/go1.12-bootstrap/template
index 977357eaf312..c6b171f7e7b7 100644
--- a/srcpkgs/go1.12-bootstrap/template
+++ b/srcpkgs/go1.12-bootstrap/template
@@ -12,6 +12,7 @@ nostrip=yes
 noverifyrdeps=yes
 nocross=yes
 lib32disabled=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends+=" gcompat"

From aa2b52cf59ea1c48cc56eb4b866d7b43882aba90 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:54 -0400
Subject: [PATCH 15/24] musl-bootstrap: move to bootstrap repo

---
 srcpkgs/musl-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/musl-bootstrap/template b/srcpkgs/musl-bootstrap/template
index 1d72d76c7a0d..393d01d3a876 100644
--- a/srcpkgs/musl-bootstrap/template
+++ b/srcpkgs/musl-bootstrap/template
@@ -15,6 +15,7 @@ homepage="http://www.musl-libc.org/"
 distfiles="http://www.musl-libc.org/releases/musl-${version}.tar.gz"
 checksum=1370c9a812b2cf2a7d92802510cca0058cc37e66a7bedd70051f0a34015022a3
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc*) CFLAGS="-mlong-double-64";;

From c7f2ff52c90e24d86395e5ee5f38db30d2bf1e95 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 16/24] rust-bootstrap: move to bootstrap repo

---
 srcpkgs/rust-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/rust-bootstrap/template b/srcpkgs/rust-bootstrap/template
index 5e0ea14048f4..ca88a7eeb55e 100644
--- a/srcpkgs/rust-bootstrap/template
+++ b/srcpkgs/rust-bootstrap/template
@@ -10,6 +10,7 @@ homepage="https://www.rust-lang.org/"
 conflicts="rust>=0"
 lib32disabled=yes
 nostrip=yes
+repository=bootstrap
 
 if [ "$XBPS_TARGET_LIBC" = "musl" ]; then
 	depends="libexecinfo-devel"

From c240e7637d6c847b8dbb6d1f4d01b54ccaf41538 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:55 -0400
Subject: [PATCH 17/24] openjdk7-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk7-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk7-bootstrap/template b/srcpkgs/openjdk7-bootstrap/template
index ed268cb80004..ef3fec3cba8a 100644
--- a/srcpkgs/openjdk7-bootstrap/template
+++ b/srcpkgs/openjdk7-bootstrap/template
@@ -31,6 +31,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-2.0-only WITH Classpath-exception-2.0"
 homepage="https://icedtea.classpath.org/"
 lib32disabled=yes
+repository=bootstrap
 
 if [ -n "$XBPS_DEBUG_PKGS" ]; then
 	configure_args+=" --enable-native-debuginfo"

From af9f2d5a393590cccaab9bd47ba4b6c4a323052d Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 18/24] openjdk9-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk9-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk9-bootstrap/template b/srcpkgs/openjdk9-bootstrap/template
index 801f49142621..96c5a71831b0 100644
--- a/srcpkgs/openjdk9-bootstrap/template
+++ b/srcpkgs/openjdk9-bootstrap/template
@@ -41,6 +41,7 @@ distfiles="
  http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-jdk.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-langtools.tar.bz2
  http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn/archive/jdk-${_repo_ver}.tar.bz2>jdk-${_repo_ver}-nashorn.tar.bz2"
+repository=bootstrap
 
 checksum="914183a7eac6a1dfdfa70a98ceb4262244c77ab904c4570bb34c609ecb5f0986
  3807400280a3b92e9dd23fcdd76482162ce54af6fbbaa0777cb6235ad6a66fea

From 8a50e80a7b565e172fd8ed238b9a1b297d95f6f3 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:56 -0400
Subject: [PATCH 19/24] openjdk10-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk10-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk10-bootstrap/template b/srcpkgs/openjdk10-bootstrap/template
index c61d33c697e8..7b4b24b7fe99 100644
--- a/srcpkgs/openjdk10-bootstrap/template
+++ b/srcpkgs/openjdk10-bootstrap/template
@@ -35,6 +35,7 @@ homepage="http://openjdk.java.net/"
 distfiles="http://hg.openjdk.java.net/jdk-updates/jdk10u/archive/jdk-${_repo_ver}.tar.bz2"
 checksum="374f7ae35f0a7439a40bd2c765d1f410607c75c6c1e788f1a344a42e59431f51"
 lib32disabled=yes
+repository=bootstrap
 
 case "$XBPS_TARGET_MACHINE" in
 	ppc64*) ;;

From 40c4f5436460aa072f99f0faba49bc26d0d5dd8f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 20/24] openjdk12-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk12-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk12-bootstrap/template b/srcpkgs/openjdk12-bootstrap/template
index 30c642e56e8d..9ffaa00bb573 100644
--- a/srcpkgs/openjdk12-bootstrap/template
+++ b/srcpkgs/openjdk12-bootstrap/template
@@ -44,6 +44,7 @@ checksum=b2bcad35656b00928683416f3480ad00363b00993eb711c3e1886e4fe77eefeb
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From badfc87aee51bc3ed4c923f97e27788081f66967 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:57 -0400
Subject: [PATCH 21/24] openjdk13-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk13-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk13-bootstrap/template b/srcpkgs/openjdk13-bootstrap/template
index c1b211db7a39..80fbbb260263 100644
--- a/srcpkgs/openjdk13-bootstrap/template
+++ b/srcpkgs/openjdk13-bootstrap/template
@@ -44,6 +44,7 @@ checksum=d38fb17795782dffe84e98f21f1d6293b0a45ea8f1e9c81e99cd71acac03a4e0
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 lib32disabled=yes
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 92b675b5328c5e4e0b4ec1be73803a8ec1395c17 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 22/24] openjdk14-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk14-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk14-bootstrap/template b/srcpkgs/openjdk14-bootstrap/template
index 9c66619f38e6..2c3da2b23423 100644
--- a/srcpkgs/openjdk14-bootstrap/template
+++ b/srcpkgs/openjdk14-bootstrap/template
@@ -43,6 +43,7 @@ distfiles="https://hg.openjdk.java.net/jdk-updates/jdk${_java_ver}u/archive/jdk-
 checksum=dfb3607f1b675458f29a185a40f1dbbf896439cf33b3aa0f3d89df297e604935
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 18175bec9b224249c1f4b6abae2840b13a1b565f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:58 -0400
Subject: [PATCH 23/24] openjdk15-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk15-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk15-bootstrap/template b/srcpkgs/openjdk15-bootstrap/template
index c1ce79ae2696..74fe03b5760f 100644
--- a/srcpkgs/openjdk15-bootstrap/template
+++ b/srcpkgs/openjdk15-bootstrap/template
@@ -46,6 +46,7 @@ checksum="4bbd7a73354a2d244c7a075406339aa0ce4c5fc6be91a795af931f6dc95d067c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes

From 3c9a7ef2e39ad0f6742b43b8a7fc33f4fa426065 Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Mon, 10 Oct 2022 14:11:59 -0400
Subject: [PATCH 24/24] openjdk16-bootstrap: move to bootstrap repo

---
 srcpkgs/openjdk16-bootstrap/template | 1 +
 1 file changed, 1 insertion(+)

diff --git a/srcpkgs/openjdk16-bootstrap/template b/srcpkgs/openjdk16-bootstrap/template
index 011612e0a966..dd419c954044 100644
--- a/srcpkgs/openjdk16-bootstrap/template
+++ b/srcpkgs/openjdk16-bootstrap/template
@@ -46,6 +46,7 @@ checksum="b4a0e71e41a11175e8a7c1dba86ed5b0aa878413158c8d48813db1b64ac9536c
  9bf1fe5182a604b4135edc1a425ae356c9ad15e9b23f9f12a02e80184c3a249c"
 provides="java-environment-${version}_1 java-runtime-${version}_1"
 nocross=yes
+repository=bootstrap
 
 # Build is still parallel, but don't use -jN.
 disable_parallel_build=yes