From 248e8cd3758fa0653a40fe99a2300ac8a888fc33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20F=C3=A6rch=20Mikkelsen?= <kasper.faerch@gmail.com>
Date: Sun, 4 Feb 2024 00:30:58 +0100
Subject: [PATCH 1/2] Added support for binary portage packages

---
 configure           | 13 +++++++++++++
 gentoo.conf.example |  3 +++
 scripts/main.sh     |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/configure b/configure
index e7482a1..004581e 100755
--- a/configure
+++ b/configure
@@ -437,7 +437,9 @@ function load_default_config() {
 
 	ADDITIONAL_PACKAGES=()
 	ENABLE_SSHD=true
+	ENABLE_BINPKG=false
 	ROOT_SSH_AUTHORIZED_KEYS=""
+	
 
 	# All settings are unsaved.
 	UNSAVED_CHANGES=true
@@ -894,6 +896,7 @@ MENU_ITEMS=(
 	"SELECT_MIRRORS_LARGE_FILE"
 	"--------"
 	"ENABLE_SSHD"
+	"ENABLE_BINPKG"
 	"ROOT_SSH_AUTHORIZED_KEYS"
 	"ADDITIONAL_PACKAGES"
 )
@@ -1517,6 +1520,15 @@ function ENABLE_SSHD_menu()  {
 	UNSAVED_CHANGES=true
 }
 
+function ENABLE_BINPKG_tag()   { echo "Enable binary packages"; }
+function ENABLE_BINPKG_label() { on_off_label "$ENABLE_BINPKG"; }
+function ENABLE_BINPKG_show()  { return 0; }
+function ENABLE_BINPKG_help()  { echo "Use binary packages if available."; }
+function ENABLE_BINPKG_menu()  {
+	on_off_toggle "ENABLE_BINPKG"
+	UNSAVED_CHANGES=true
+}
+
 function ROOT_SSH_AUTHORIZED_KEYS_tag()   { echo "Authorized keys (root)"; }
 function ROOT_SSH_AUTHORIZED_KEYS_label() { echo "$(sed '/^\s*#/d;/^\s*$/d' <<< "$ROOT_SSH_AUTHORIZED_KEYS" | wc -l) keys"; }
 function ROOT_SSH_AUTHORIZED_KEYS_show()  { return 0; }
@@ -1621,6 +1633,7 @@ MUSL=\$([[ \$STAGE3_VARIANT == *musl* ]] && echo "true" || echo "false")
 
 ADDITIONAL_PACKAGES=(${ADDITIONAL_PACKAGES[@]@Q})
 ENABLE_SSHD=${ENABLE_SSHD@Q}
+ENABLE_BINPKG=${ENABLE_BINPKG@Q}
 ROOT_SSH_AUTHORIZED_KEYS=${ROOT_SSH_AUTHORIZED_KEYS@Q}
 
 
diff --git a/gentoo.conf.example b/gentoo.conf.example
index 67736e2..73c87b8 100644
--- a/gentoo.conf.example
+++ b/gentoo.conf.example
@@ -294,6 +294,9 @@ ADDITIONAL_PACKAGES=()
 # only allows the use of ed25519 keys, and requires pubkey authentication)
 ENABLE_SSHD=true
 
+# Enable binary portage packages where available
+ENABLE_BINPKG=false
+
 # An ssh key to add to the authorized_keys file for the root user.
 # This variable will become the content of the authorized_keys file,
 # so you may specify one key per line (include the newlines in the variable).
diff --git a/scripts/main.sh b/scripts/main.sh
index 797dfaa..82158c3 100644
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -104,6 +104,10 @@ function configure_portage() {
 		try mirrorselect "${mirrorselect_params[@]}"
 	fi
 
+	if [[ $ENABLE_BINPKG == "true" ]]; then
+		echo 'FEATURES="getbinpkg"' >> /etc/portage/make.conf
+	fi
+
 	chmod 644 /etc/portage/make.conf \
 		|| die "Could not chmod 644 /etc/portage/make.conf"
 }

From 87d508455dc6c425de018cb8a423c465d34e1538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20F=C3=A6rch=20Mikkelsen?= <kasper.faerch@gmail.com>
Date: Sun, 4 Feb 2024 01:09:42 +0100
Subject: [PATCH 2/2] Update main.sh

Fixed gnupg key file not readable by portage
---
 scripts/main.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/main.sh b/scripts/main.sh
index 82158c3..e2c7f43 100644
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -106,6 +106,8 @@ function configure_portage() {
 
 	if [[ $ENABLE_BINPKG == "true" ]]; then
 		echo 'FEATURES="getbinpkg"' >> /etc/portage/make.conf
+  		getuto
+    		chmod 644 /etc/portage/gnupg/pubring.kbx
 	fi
 
 	chmod 644 /etc/portage/make.conf \