Adding metadata

21 files changed, 289 insertions, 536 deletions

diff --git a/app-portage/cargolock2crates/Manifest b/app-portage/cargolock2crates/Manifest
deleted file mode 100644
index 246fc50d0bc6..000000000000
--- a/app-portage/cargolock2crates/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST cargolock2crates-0.1.3.tar.gz 164318 BLAKE2B dbbf42ca965e4d3c0683758aea9602f30264dd7f2d1bac7db081f0acf36acd7f40bed2bb5c1eae8383feb0262d9fff230190b3785399c8d1d9b9b08cc9b20008 SHA512 79ba77affca4ceffa41322ef7ddcab4d60bcf2fbfe08c469a1829e228c1edf225c53905ec4633195b73b814f36bbc13f6b0e571b680ca117af74e25e48a994b4
-DIST cargolock2crates-0.1.4.tar.gz 186539 BLAKE2B ea76409879caadbc3902cb7c1c4fe3eee707b91c6a0e930e00a06418dfb2f579307497a6a1c94095edb528d891745d202e9fb3d9515663d56b7eca0953864c92 SHA512 73ae3869cca9bf4e67dfa42d3eed675333d637736ce75166ea7017e683c43a51ed76c5afa6c31e68ee643a2805c74c07d951084b7645e1536be4a75f57a0273d
diff --git a/app-portage/cargolock2crates/cargolock2crates-0.1.3.ebuild b/app-portage/cargolock2crates/cargolock2crates-0.1.3.ebuild
deleted file mode 100644
index 730844e5fd1b..000000000000
--- a/app-portage/cargolock2crates/cargolock2crates-0.1.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2026 LiGurOs Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DESCRIPTION="Small tool to create CRATES entries for gentoo ebuilds from a Cargo.lock file."
-HOMEPAGE="https://codeberg.org/bluebottle/cargolock2crates"
-SRC_URI="https://codeberg.org/bluebottle/cargolock2crates/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-inherit go-module
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-
-BDEPEND="dev-lang/go"
-
-DOCS=( README.md )
-
-S=${WORKDIR}/${PN}
-
-program_make() {
-	local my_tags=(
-		prod
-	)
-	local my_makeopt=(
-		TAGS="${my_tags[@]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\""
-	)
-	emake "${my_makeopt[@]}" "$@"
-}
-
-src_compile() {
-	program_make build
-}
-
-src_install() {
-	# Install binary
-	dobin ${PN}
-
-	# Install docs
-	einstalldocs
-}
diff --git a/app-portage/cargolock2crates/cargolock2crates-0.1.4.ebuild b/app-portage/cargolock2crates/cargolock2crates-0.1.4.ebuild
deleted file mode 100644
index 730844e5fd1b..000000000000
--- a/app-portage/cargolock2crates/cargolock2crates-0.1.4.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021-2026 LiGurOs Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DESCRIPTION="Small tool to create CRATES entries for gentoo ebuilds from a Cargo.lock file."
-HOMEPAGE="https://codeberg.org/bluebottle/cargolock2crates"
-SRC_URI="https://codeberg.org/bluebottle/cargolock2crates/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-inherit go-module
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="*"
-
-BDEPEND="dev-lang/go"
-
-DOCS=( README.md )
-
-S=${WORKDIR}/${PN}
-
-program_make() {
-	local my_tags=(
-		prod
-	)
-	local my_makeopt=(
-		TAGS="${my_tags[@]}"
-		LDFLAGS="-extldflags \"${LDFLAGS}\""
-	)
-	emake "${my_makeopt[@]}" "$@"
-}
-
-src_compile() {
-	program_make build
-}
-
-src_install() {
-	# Install binary
-	dobin ${PN}
-
-	# Install docs
-	einstalldocs
-}
diff --git a/app-portage/cargolock2crates/metadata.xml b/app-portage/cargolock2crates/metadata.xml
deleted file mode 100644
index 1ce696999133..000000000000
--- a/app-portage/cargolock2crates/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
-  <longdescription lang="en">
-		Small tool to create CRATES entries for gentoo ebuilds from a Cargo.lock file.
-	</longdescription>
-  <origin>baldeagleos-repo</origin>
-</pkgmetadata>
diff --git a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
index 87390c6c4829..53603d63c761 100644
--- a/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
+++ b/app-portage/conf-update/conf-update-1.0.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,14 +12,14 @@ SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-IUSE="colordiff "
+IUSE="colordiff"
 
 RDEPEND="
 	dev-libs/glib
 	sys-libs/ncurses:0
 	colordiff? ( app-misc/colordiff )
 	dev-libs/openssl:0=
-"
+	"
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
diff --git a/app-portage/conf-update/metadata.xml b/app-portage/conf-update/metadata.xml
index 351d5a30875e..f9ce93254f3e 100644
--- a/app-portage/conf-update/metadata.xml
+++ b/app-portage/conf-update/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
   <use>
     <flag name="colordiff">Use colors when displaying diffs (<pkg>app-misc/colordiff</pkg>)</flag>
   </use>
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 75578f26a4ae..68f025f31ed7 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,2 +1 @@
-DIST eix-0.36.7.tar.xz 639832 BLAKE2B 37202ae78378688ede95b410fe2e6325d63a9553dc082e4e09dc5bcd261f4e7bf49f349a92c286743c30a54cdc5bc1733fedebae33c37d601e6f5db1faf499e7 SHA512 5f5d059b502633be22c8a18fca410e2319061989bbc65b23592c87a9a109b93e615a5b5a7ca92a500999e3cc791e331b12e32a10700cc104040b1980f7f7a0f9
 DIST eix-0.36.9.tar.xz 642764 BLAKE2B 08f3a76283e540d57d667123f3787a57f08d746b5e8d9c24d541c72dd3c3b225cbfe9130764b5b6457735907b05ba37d415a807cbe37986fa78a366632ecf934 SHA512 7d9a1f7513678a64103e38340e456168d1530edb1fbb2c3379362f79f74737d2fac03340801c67cf186505c2d569e1337cedfe186b22f5ad546ac9bcc542d32c
diff --git a/app-portage/eix/eix-0.36.7-r1.ebuild b/app-portage/eix/eix-0.36.7-r1.ebuild
deleted file mode 100644
index 83de23a18f87..000000000000
--- a/app-portage/eix/eix-0.36.7-r1.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 2021-2024 BaldEagleOS Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-RESTRICT="mirror" # do not access gentoo mirror until it actually is there
-MESON_AUTO_DEPEND=no
-inherit bash-completion-r1 meson tmpfiles
-
-DESCRIPTION="Search and query ebuilds"
-HOMEPAGE="https://github.com/vaeth/eix/"
-SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse2 debug +dep doc +jumbo-build +meson nls optimization +protobuf +required-use security +src-uri strong-optimization strong-security sqlite swap-remote tools usr-portage"
-
-PLOCALES="de ru"
-for i in ${PLOCALES}; do
-	IUSE+=" l10n_${i}"
-done
-
-DEPEND="nls? ( virtual/libintl )
-	sqlite? ( >=dev-db/sqlite-3:= )"
-RDEPEND="${DEPEND}
-	>=app-shells/push-3.1
-	>=app-shells/quoter-4.1"
-BDEPEND="meson? (
-		>=dev-build/meson-0.41.0
-		>=dev-build/ninja-1.7.2
-		strong-optimization? ( >=sys-devel/gcc-config-1.9.1 )
-	)
-	protobuf? ( dev-libs/protobuf:= )
-	app-arch/xz-utils
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-
-pkg_setup() {
-	# remove stale cache file to prevent collisions
-	local old_cache=${EROOT}/var/cache/${PN}
-	if [[ -f ${old_cache} ]]; then
-		rm "${old_cache}" || die
-	fi
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/:${EPREFIX}/:" tmpfiles.d/eix.conf || die
-
-	sed -e "/eixf_source=/s:push.sh:cat \"${EPREFIX}/usr/share/push/push.sh\":" \
-		-e "/eixf_source=/s:quoter_pipe.sh:cat \"${EPREFIX}/usr/share/quoter/quoter_pipe.sh\":" \
-		-i src/eix-functions.sh.in || die
-	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
-		-i src/Makefile.am || die
-
-	eapply "${FILESDIR}"/ego-sync.patch
-}
-
-src_configure() {
-	local i
-	export LINGUAS=
-	for i in ${PLOCALES}; do
-		use l10n_${i} && LINGUAS+=${LINGUAS:+ }${i}
-	done
-
-	if use meson; then
-		local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${P}"
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
-		$(meson_use jumbo-build)
-		$(meson_use sqlite)
-		$(meson_use protobuf)
-		$(meson_use doc extra-doc)
-		$(meson_use nls)
-		$(meson_use tools separate-tools)
-		$(meson_use security)
-		$(meson_use optimization normal-optimization)
-		$(meson_use strong-security)
-		$(meson_use strong-optimization)
-		$(meson_use debug debugging)
-		$(meson_use swap-remote)
-		$(meson_use prefix always-accept-keywords)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		$(meson_use dep dep-default)
-		$(meson_use required-use required-use-default)
-		$(meson_use src-uri src-uri-default)
-		$(usex usr-portage -Dportdir-default=/usr/portage '')
-		-Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions"
-		-Dportage-rootpath="${ROOTPATH}"
-		-Deprefix-default="${EPREFIX}"
-		)
-		if use prefix; then
-			emesonarge+=(
-				-Deix-user=
-				-Deix-uid=-1
-			)
-		fi
-		meson_src_configure
-	else
-		local myconf=(
-		$(use_enable jumbo-build)
-		$(use_with sqlite)
-		$(use_with protobuf)
-		$(use_with doc extra-doc)
-		$(use_enable nls)
-		$(use_enable tools separate-tools)
-		$(use_enable security)
-		$(use_enable optimization)
-		$(use_enable strong-security)
-		$(use_enable strong-optimization)
-		$(use_enable debug debugging)
-		$(use_enable swap-remote)
-		$(use_with prefix always-accept-keywords)
-		$(use_with cpu_flags_x86_sse2 sse2)
-		$(use_with dep dep-default)
-		$(use_with required-use required-use-default)
-		$(use_with src-uri src-uri-default)
-		$(use_with usr-portage portdir-default /usr/portage)
-		--with-zsh-completion
-		--with-portage-rootpath="${ROOTPATH}"
-		--with-eprefix-default="${EPREFIX}"
-		)
-		if use prefix; then
-			myconf+=(
-				--with-eix-user=
-				--with-eix-uid=-1
-			)
-		fi
-		econf "${myconf[@]}"
-	fi
-}
-
-src_compile() {
-	if use meson; then
-		meson_src_compile
-	else
-		default
-	fi
-}
-
-src_test() {
-	if use meson; then
-		meson_src_test
-	else
-		default
-	fi
-}
-
-src_install() {
-	if use meson; then
-		meson_src_install
-	else
-		default
-	fi
-
-	dobashcomp bash/eix
-	dotmpfiles tmpfiles.d/eix.conf
-	use doc && dodoc src/output/eix.proto
-}
-
-pkg_postinst() {
-	local obs="${EROOT}var/cache/eix.previous"
-	if test -f "${obs}"; then
-		ewarn "Found obsolete ${obs}, please remove it"
-	fi
-	tmpfiles_process eix.conf
-}
-
-pkg_postrm() {
-	if [[ ! -n ${REPLACED_BY_VERSION} ]]; then
-		rm -rf "${EROOT}/var/cache/${PN}" || die
-	fi
-}
diff --git a/app-portage/eix/eix-0.36.9.ebuild b/app-portage/eix/eix-0.36.9.ebuild
index 83de23a18f87..1ca6a29a17ce 100644
--- a/app-portage/eix/eix-0.36.9.ebuild
+++ b/app-portage/eix/eix-0.36.9.ebuild
@@ -1,35 +1,26 @@
-# Copyright 2021-2024 BaldEagleOS Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
-RESTRICT="mirror" # do not access gentoo mirror until it actually is there
-MESON_AUTO_DEPEND=no
-inherit bash-completion-r1 meson tmpfiles
+inherit autotools bash-completion-r1 tmpfiles
 
 DESCRIPTION="Search and query ebuilds"
 HOMEPAGE="https://github.com/vaeth/eix/"
 SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
+
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse2 debug +dep doc +jumbo-build +meson nls optimization +protobuf +required-use security +src-uri strong-optimization strong-security sqlite swap-remote tools usr-portage"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos ~x64-solaris"
+IUSE="debug doc nls sqlite"
 
-PLOCALES="de ru"
-for i in ${PLOCALES}; do
-	IUSE+=" l10n_${i}"
-done
-
-DEPEND="nls? ( virtual/libintl )
+DEPEND="
+	nls? ( virtual/libintl )
 	sqlite? ( >=dev-db/sqlite-3:= )"
 RDEPEND="${DEPEND}
-	>=app-shells/push-3.1
-	>=app-shells/quoter-4.1"
-BDEPEND="meson? (
-		>=dev-build/meson-0.41.0
-		>=dev-build/ninja-1.7.2
-		strong-optimization? ( >=sys-devel/gcc-config-1.9.1 )
-	)
-	protobuf? ( dev-libs/protobuf:= )
+	>=app-shells/push-2.0-r1
+	>=app-shells/quoter-3.0_p2-r1"
+BDEPEND="
 	app-arch/xz-utils
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )"
@@ -52,117 +43,61 @@ src_prepare() {
 	sed -e "s:'\$(bindir)/eix-functions.sh':cat \\\\\"${EPREFIX}/usr/share/eix/eix-functions\\\\\":" \
 		-i src/Makefile.am || die
 
-	eapply "${FILESDIR}"/ego-sync.patch
+	eautoreconf
 }
 
 src_configure() {
-	local i
-	export LINGUAS=
-	for i in ${PLOCALES}; do
-		use l10n_${i} && LINGUAS+=${LINGUAS:+ }${i}
-	done
-
-	if use meson; then
-		local emesonargs=(
-		-Ddocdir="${EPREFIX}/usr/share/doc/${P}"
-		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html"
-		$(meson_use jumbo-build)
-		$(meson_use sqlite)
-		$(meson_use protobuf)
-		$(meson_use doc extra-doc)
-		$(meson_use nls)
-		$(meson_use tools separate-tools)
-		$(meson_use security)
-		$(meson_use optimization normal-optimization)
-		$(meson_use strong-security)
-		$(meson_use strong-optimization)
-		$(meson_use debug debugging)
-		$(meson_use swap-remote)
-		$(meson_use prefix always-accept-keywords)
-		$(meson_use cpu_flags_x86_sse2 sse2)
-		$(meson_use dep dep-default)
-		$(meson_use required-use required-use-default)
-		$(meson_use src-uri src-uri-default)
-		$(usex usr-portage -Dportdir-default=/usr/portage '')
-		-Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions"
-		-Dportage-rootpath="${ROOTPATH}"
-		-Deprefix-default="${EPREFIX}"
-		)
-		if use prefix; then
-			emesonarge+=(
-				-Deix-user=
-				-Deix-uid=-1
-			)
-		fi
-		meson_src_configure
-	else
-		local myconf=(
-		$(use_enable jumbo-build)
-		$(use_with sqlite)
-		$(use_with protobuf)
-		$(use_with doc extra-doc)
+	local myconf=(
+		$(use_enable debug paranoic-asserts)
 		$(use_enable nls)
-		$(use_enable tools separate-tools)
-		$(use_enable security)
-		$(use_enable optimization)
-		$(use_enable strong-security)
-		$(use_enable strong-optimization)
-		$(use_enable debug debugging)
-		$(use_enable swap-remote)
+		$(use_with doc extra-doc)
+		$(use_with sqlite)
+		--without-protobuf
+
+		# default configuration
 		$(use_with prefix always-accept-keywords)
-		$(use_with cpu_flags_x86_sse2 sse2)
-		$(use_with dep dep-default)
-		$(use_with required-use required-use-default)
-		$(use_with src-uri src-uri-default)
-		$(use_with usr-portage portdir-default /usr/portage)
-		--with-zsh-completion
+		--with-dep-default
+		--with-required-use-default
+
+		# paths
 		--with-portage-rootpath="${ROOTPATH}"
 		--with-eprefix-default="${EPREFIX}"
-		)
-		if use prefix; then
-			myconf+=(
-				--with-eix-user=
-				--with-eix-uid=-1
-			)
-		fi
-		econf "${myconf[@]}"
-	fi
-}
+		--with-sh-shebang="${EPREFIX}/bin/sh"
 
-src_compile() {
-	if use meson; then
-		meson_src_compile
-	else
-		default
-	fi
-}
+		# build a single executable with symlinks
+		--disable-separate-binaries
+		--disable-separate-tools
 
-src_test() {
-	if use meson; then
-		meson_src_test
-	else
-		default
-	fi
+		# used purely to control/disrespect *FLAGS
+		--disable-debugging
+		--disable-new_dialect
+		--disable-optimization
+		--disable-strong-optimization
+		--disable-security
+		--disable-nopie-security
+		--disable-strong-security
+	)
+
+	econf "${myconf[@]}"
 }
 
 src_install() {
-	if use meson; then
-		meson_src_install
-	else
-		default
-	fi
-
+	default
 	dobashcomp bash/eix
 	dotmpfiles tmpfiles.d/eix.conf
-	use doc && dodoc src/output/eix.proto
+
+	dosym -r /usr/bin/eix-postsync /etc/portage/postsync.d/50-eix-postsync
+
+	rm -r "${ED}"/usr/bin/eix-functions.sh || die
 }
 
 pkg_postinst() {
-	local obs="${EROOT}var/cache/eix.previous"
-	if test -f "${obs}"; then
+	tmpfiles_process eix.conf
+
+	local obs=${EROOT}/var/cache/eix.previous
+	if [[ -f ${obs} ]]; then
 		ewarn "Found obsolete ${obs}, please remove it"
 	fi
-	tmpfiles_process eix.conf
 }
 
 pkg_postrm() {
diff --git a/app-portage/eix/files/ego-sync.patch b/app-portage/eix/files/ego-sync.patch
deleted file mode 100644
index 42bc6eb30946..000000000000
--- a/app-portage/eix/files/ego-sync.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar eix-0.33.2/src/eix-sync.sh.in eix-0.33.2-fixed/src/eix-sync.sh.in
---- eix-0.33.2/src/eix-sync.sh.in	2017-01-20 21:44:53.000000000 +0200
-+++ eix-0.33.2-fixed/src/eix-sync.sh.in	2017-09-22 20:08:42.317653399 +0300
-@@ -277,7 +277,7 @@
- # Get options from cli
- 
- DefaultOpts() {
--	Push -c emergecmd 'emerge' '--sync'
-+	Push -c emergecmd 'ego' 'sync'
- 	Push -c updatecmd 'eix-update'
- 	Push -c layman_opt
- 	have_changed=false
diff --git a/app-portage/eix/metadata.xml b/app-portage/eix/metadata.xml
index 494855dfceb0..2fcfcf69eb27 100644
--- a/app-portage/eix/metadata.xml
+++ b/app-portage/eix/metadata.xml
@@ -1,34 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@baldeagleos.com</email>
-    <name>Development</name>
-  </maintainer>
   <maintainer type="person">
+    <email>mgorny@gentoo.org</email>
+    <name>Michał Górny</name>
+  </maintainer>
+  <maintainer type="person" proxied="yes">
     <email>martin@mvath.de</email>
     <name>Martin Väth</name>
+    <description>Upstream developer, CC on bugs, do not copy ebuilds
+      from his overlay</description>
   </maintainer>
-  <upstream>
-    <bugs-to>mailto:martin@mvath.de</bugs-to>
-  </upstream>
   <use>
     <flag name="debug">Build with upstream's CXXFLAGS/LDFLAGS for debugging support; not recommended for normal use.</flag>
-    <flag name="dep">Make DEP=true the default which enables support for {,R,P,B}DEPEND but requires roughly double disk and memory.</flag>
     <flag name="doc">Create description of the eix cache file additionally in html format</flag>
-    <flag name="jumbo-build">Compile faster and produce better binary. Recommended unless compiling on a quite memory-restricted system.</flag>
-    <flag name="meson">Build with meson instead of autotools. Faster but less compatible</flag>
-    <flag name="optimization">Accept upstream's choices for CXXFLAGS/LDFLAGS for optimization. Absense of this USE flag does not strip user's *FLAGS</flag>
-    <flag name="protobuf">Use dev-libs/protobuf to suport proto output with --proto</flag>
-    <flag name="required-use">Make REQUIRED_USE=true the default which enables support for REQUIRED_USE but requires more disk and memory.</flag>
-    <flag name="security">This adds some checks which can prevent certain exploits if e.g. the eix code has a bug. If you use the hardened toolchain, using this flag does not increase security and can even lead to problems.</flag>
     <flag name="sqlite">Compile in support for portage's sqlite backend; to actually use it you need additional configuration of portage and eix</flag>
-    <flag name="src-uri">Make SRC_URI=true the default which enables support for SRC_URI but requires roughly double disk and memory.</flag>
-    <flag name="strong-optimization">Adds several more agressive CXXFLAGS/LDFLAGS for optimization like graphite (if available). May cause trouble with some buggy compiler versions. Absense of this USE flag does not strip user's *FLAGS</flag>
-    <flag name="strong-security">Add many checks to prevent exploits if eix code has a bug. This will slow down eix considerably. Use only if you are paranoid or have reasons to suspect a bug.</flag>
-    <flag name="swap-remote">Swap role of remote addresses in eix-remote, making the data from gpo.zugaina.org the first choice.</flag>
-    <flag name="tools">Create separate binary for script helper tools; useful if they are called extremely often</flag>
-    <flag name="usr-portage">Set last PORTDIR fallback to /usr/portage instead of /var/db/repos/gentoo</flag>
   </use>
   <origin>baldeagleos-repo</origin>
 </pkgmetadata>
diff --git a/app-portage/find_cruft/Manifest b/app-portage/find_cruft/Manifest
deleted file mode 100644
index 09bcc5b3c1f7..000000000000
--- a/app-portage/find_cruft/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST find_cruft-5.2.tar.gz 11458 BLAKE2B 9a8a596475bd590e5e6e70c7f489ec6fd58d7e17d9e7ff1f84c1eb128f31c7cfb90cc6e30845e50376391ef5445d647925732719adb10f61cf8ceae38b8ed26c SHA512 fdfe0c4dd4700395b6f109ae520cd5fbf6f086353a4f4b769ea50017b81a934c99ec3093d11610970276dc4ce311b3584e2e06ce7e605fa995a13abe5683c910
diff --git a/app-portage/find_cruft/find_cruft-5.2-r1.ebuild b/app-portage/find_cruft/find_cruft-5.2-r1.ebuild
deleted file mode 100644
index e7318f37abde..000000000000
--- a/app-portage/find_cruft/find_cruft-5.2-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2021-2023 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-RESTRICT="mirror"
-
-DESCRIPTION="find cruft files not managed by portage"
-HOMEPAGE="https://github.com/vaeth/find_cruft/"
-SRC_URI="https://github.com/vaeth/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-lang/perl-5.8"
-
-src_prepare() {
-	default
-	use prefix || sed -i \
-		-e '1s"^#!/usr/bin/env perl$"#!'"${EPREFIX}/usr/bin/perl"'"' \
-		-- bin/* || die
-}
-
-src_install() {
-	dobin bin/*
-	dodoc README.md
-	insinto /etc
-	doins -r etc/*
-	insinto /usr/share/zsh/site-functions
-	doins zsh/_*
-}
-
-pkg_postinst() {
-	optfeature "faster execution" 'app-portage/eix'
-}
diff --git a/app-portage/find_cruft/metadata.xml b/app-portage/find_cruft/metadata.xml
deleted file mode 100644
index c8d1ebfb1f93..000000000000
--- a/app-portage/find_cruft/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
-  <maintainer type="person">
-    <email>martin@mvath.de</email>
-    <name>Martin Väth</name>
-  </maintainer>
-  <upstream>
-    <bugs-to>mailto:martin@mvath.de</bugs-to>
-  </upstream>
-  <origin>baldeagleos-repo</origin>
-</pkgmetadata>
diff --git a/app-portage/getuto/Manifest b/app-portage/getuto/Manifest
index 83317df8af00..ce466a0284d4 100644
--- a/app-portage/getuto/Manifest
+++ b/app-portage/getuto/Manifest
@@ -1,3 +1,4 @@
-DIST getuto-1.17.tar.gz 11066 BLAKE2B 57da720aea6cff6303ee277e3cd695079e44e54c5cfe08f482adccf6b2b0a4b392687ebbf038181e04df23dc16858bda5cd69024da7e805ba2b932b7af96396b SHA512 db191d04a0104179d05a25d52dfc14db66cc38d9053efbc7e2a3e64baa9fa8e56afd430d76b9c96d55b41dce90cbf1b8063dd63c013fe52a7c9058d71769b51a
+DIST getuto-1.18.tar.gz 11096 BLAKE2B dc0bf33459f3fab1894cd40fb5dcd749d38790a65e5a5476460903229a373284e6246bae4ad13f2fca44cd9d545e11d70554c4635e07bf95941a3182e73b2944 SHA512 1886dad9ff361377e9f1fc392569e2227c71af9636b1bc333f4f1c7e322328e6dda8384508f129c79e0e6588180d0d25015c3df03e2749d63b5009adc6eb1a30
 DIST getuto-1.19.1.tar.gz 11149 BLAKE2B 8f3ea5378ae1741b7608457f7451d6a5b18b2752842a62d728690d33212746df81c595a068ddc1aad6f346f30497018a6aec09876563940333965c3fd4757505 SHA512 86dd4c53dffcb079825c51783a593d0fbed76134446fdd674fc98ab5f1beef3429c05ed2003b926efcaed29f93e0237a621648a738d64bce6b97f579eacf3229
-DIST libc-1-r1-1.gpkg.tar 20480 BLAKE2B b2c184e20c1a29ff66240e992f9f81219285f525eb63cea081372685cf03a2e231a2edb528259617e74c655fbe61b6e0d8fc0bbdbd8452b6098de58432f019d7 SHA512 ce52f398ea8979ec16161381803740d49a4294c77303880f54090c379ba5eb8e545a3d3550f229cacc18c7763dc3adf7936561ba1c64b43c87692ec66084e4e6
+DIST getuto-2.0.tar.gz 11207 BLAKE2B 520a1f8ee7d38d5613654aee143a374660575dc25d7e2dea247108e66a4e562eda8ac41ebb0945e4386f1931fc296f506bc312cab92de89cf7978bcae6347fff SHA512 001c19870e51e13f3acded0cd421236b114e30e67ae82748c9281a65bd3062cf4d448aac61ebb0708b8fe9860c949f5ac29e9fb43c4035216f2af46a40e6f273
+DIST getuto-23.0-libc-1-r1-1.gpkg.tar 20480 BLAKE2B a6f9284131690c39ff63a6046b19478a9f460d4115b1bd306d2996b631026fe9c4c4b2e3be23f30d2668794302d2a1686680738dd052a53e2d4c3ecb2a513070 SHA512 a692817ea63fb69c7cbb5e32fcba21e78bd87dd4e670d4c1ac9105e390ef63ea0f3660464e573adb28320b0a9cb0a78c52fe895ecdfd62a24986b1d79d2c692e
diff --git a/app-portage/getuto/getuto-1.17.ebuild b/app-portage/getuto/getuto-1.17.ebuild
deleted file mode 100644
index 547bea95e621..000000000000
--- a/app-portage/getuto/getuto-1.17.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2023-2026 Liguros Authors
-# Distributed under the terms of the GNU General Public License v2
-EAPI=8
-
-DESCRIPTION="Stand-alone gentoo install trust anchor generation tool"
-HOMEPAGE="https://github.com/projg2/getuto"
-
-SRC_URI="
-	https://github.com/projg2/getuto/archive/refs/tags/${P}.tar.gz
-"
-S=${WORKDIR}/${PN}-${P}
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-
-SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/17.1/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar )"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=" test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	app-crypt/gnupg
-	dev-libs/openssl
-
-	sec-keys/openpgp-keys-gentoo-release
-	sys-apps/gentoo-functions
-"
-
-src_unpack() {
-	# Don't mangle test data
-	unpack ${P}.tar.gz
-
-	if use test ; then
-		cp "${DISTDIR}"/libc-1-r1-1.gpkg.tar "${S}" || die
-	fi
-}
-
-src_install() {
-	dobin getuto
-}
diff --git a/app-portage/getuto/getuto-1.18.ebuild b/app-portage/getuto/getuto-1.18.ebuild
new file mode 100644
index 000000000000..c806519f7612
--- /dev/null
+++ b/app-portage/getuto/getuto-1.18.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Standalone Gentoo gpg trust anchor generation tool for binpkgs"
+HOMEPAGE="https://github.com/projg2/getuto"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projg2/getuto"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/projg2/getuto/archive/refs/tags/${P}.tar.gz
+	"
+	S=${WORKDIR}/${PN}-${P}
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+fi
+
+SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/23.0/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar -> ${PN}-23.0-libc-1-r1-1.gpkg.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# gpg[sequoia] fails w/ 0.13.1 because of missing --lsign-key
+# https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/work_items/152
+RDEPEND="
+	|| (
+		app-alternatives/gpg[reference]
+		app-alternatives/gpg[freepg(-)]
+	)
+	dev-libs/openssl
+	sec-keys/openpgp-keys-gentoo-release
+	sys-apps/gentoo-functions
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		# Don't mangle test data
+		unpack ${P}.tar.gz
+	fi
+
+	if use test ; then
+		cp "${DISTDIR}"/${PN}-23.0-libc-1-r1-1.gpkg.tar "${S}/libc-1-r1-1.gpkg.tar" || die
+	fi
+}
+
+src_test() {
+	# The default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR
+	TMPDIR="$(mktemp -d --tmpdir=/tmp ${PF}-XXX || die)"
+
+	default
+}
+
+src_install() {
+	dobin getuto
+}
diff --git a/app-portage/getuto/getuto-1.19.1.ebuild b/app-portage/getuto/getuto-1.19.1.ebuild
index 547bea95e621..c806519f7612 100644
--- a/app-portage/getuto/getuto-1.19.1.ebuild
+++ b/app-portage/getuto/getuto-1.19.1.ebuild
@@ -1,41 +1,63 @@
-# Copyright 2023-2026 Liguros Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
+
 EAPI=8
 
-DESCRIPTION="Stand-alone gentoo install trust anchor generation tool"
+DESCRIPTION="Standalone Gentoo gpg trust anchor generation tool for binpkgs"
 HOMEPAGE="https://github.com/projg2/getuto"
 
-SRC_URI="
-	https://github.com/projg2/getuto/archive/refs/tags/${P}.tar.gz
-"
-S=${WORKDIR}/${PN}-${P}
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projg2/getuto"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/projg2/getuto/archive/refs/tags/${P}.tar.gz
+	"
+	S=${WORKDIR}/${PN}-${P}
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+fi
 
-SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/17.1/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar )"
+SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/23.0/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar -> ${PN}-23.0-libc-1-r1-1.gpkg.tar )"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE=" test"
+IUSE="test"
 RESTRICT="!test? ( test )"
 
+# gpg[sequoia] fails w/ 0.13.1 because of missing --lsign-key
+# https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/work_items/152
 RDEPEND="
-	app-crypt/gnupg
+	|| (
+		app-alternatives/gpg[reference]
+		app-alternatives/gpg[freepg(-)]
+	)
 	dev-libs/openssl
-
 	sec-keys/openpgp-keys-gentoo-release
 	sys-apps/gentoo-functions
 "
 
 src_unpack() {
-	# Don't mangle test data
-	unpack ${P}.tar.gz
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		# Don't mangle test data
+		unpack ${P}.tar.gz
+	fi
 
 	if use test ; then
-		cp "${DISTDIR}"/libc-1-r1-1.gpkg.tar "${S}" || die
+		cp "${DISTDIR}"/${PN}-23.0-libc-1-r1-1.gpkg.tar "${S}/libc-1-r1-1.gpkg.tar" || die
 	fi
 }
 
+src_test() {
+	# The default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR
+	TMPDIR="$(mktemp -d --tmpdir=/tmp ${PF}-XXX || die)"
+
+	default
+}
+
 src_install() {
 	dobin getuto
 }
diff --git a/app-portage/getuto/getuto-2.0.ebuild b/app-portage/getuto/getuto-2.0.ebuild
new file mode 100644
index 000000000000..c806519f7612
--- /dev/null
+++ b/app-portage/getuto/getuto-2.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Standalone Gentoo gpg trust anchor generation tool for binpkgs"
+HOMEPAGE="https://github.com/projg2/getuto"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projg2/getuto"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/projg2/getuto/archive/refs/tags/${P}.tar.gz
+	"
+	S=${WORKDIR}/${PN}-${P}
+
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
+fi
+
+SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/23.0/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar -> ${PN}-23.0-libc-1-r1-1.gpkg.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# gpg[sequoia] fails w/ 0.13.1 because of missing --lsign-key
+# https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/work_items/152
+RDEPEND="
+	|| (
+		app-alternatives/gpg[reference]
+		app-alternatives/gpg[freepg(-)]
+	)
+	dev-libs/openssl
+	sec-keys/openpgp-keys-gentoo-release
+	sys-apps/gentoo-functions
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		# Don't mangle test data
+		unpack ${P}.tar.gz
+	fi
+
+	if use test ; then
+		cp "${DISTDIR}"/${PN}-23.0-libc-1-r1-1.gpkg.tar "${S}/libc-1-r1-1.gpkg.tar" || die
+	fi
+}
+
+src_test() {
+	# The default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR
+	TMPDIR="$(mktemp -d --tmpdir=/tmp ${PF}-XXX || die)"
+
+	default
+}
+
+src_install() {
+	dobin getuto
+}
diff --git a/app-portage/getuto/getuto-9999.ebuild b/app-portage/getuto/getuto-9999.ebuild
new file mode 100644
index 000000000000..d3a88caccdff
--- /dev/null
+++ b/app-portage/getuto/getuto-9999.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Standalone Gentoo gpg trust anchor generation tool for binpkgs"
+HOMEPAGE="https://github.com/projg2/getuto"
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/projg2/getuto"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/projg2/getuto/archive/refs/tags/${P}.tar.gz
+	"
+	S=${WORKDIR}/${PN}-${P}
+
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+SRC_URI+=" test? ( https://mirror.bytemark.co.uk/gentoo/releases/amd64/binpackages/23.0/x86-64/virtual/libc/libc-1-r1-1.gpkg.tar -> ${PN}-23.0-libc-1-r1-1.gpkg.tar )"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# gpg[sequoia] fails w/ 0.13.1 because of missing --lsign-key
+# https://gitlab.com/sequoia-pgp/sequoia-chameleon-gnupg/-/work_items/152
+RDEPEND="
+	|| (
+		app-alternatives/gpg[reference]
+		app-alternatives/gpg[freepg(-)]
+	)
+	dev-libs/openssl
+	sec-keys/openpgp-keys-gentoo-release
+	sys-apps/gentoo-functions
+"
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]] ; then
+		git-r3_src_unpack
+	else
+		# Don't mangle test data
+		unpack ${P}.tar.gz
+	fi
+
+	if use test ; then
+		cp "${DISTDIR}"/${PN}-23.0-libc-1-r1-1.gpkg.tar "${S}/libc-1-r1-1.gpkg.tar" || die
+	fi
+}
+
+src_test() {
+	# The default portage tempdir is too long for AF_UNIX sockets
+	local -x TMPDIR
+	TMPDIR="$(mktemp -d --tmpdir=/tmp ${PF}-XXX || die)"
+
+	default
+}
+
+src_install() {
+	dobin getuto
+}
diff --git a/app-portage/getuto/metadata.xml b/app-portage/getuto/metadata.xml
index 19613da9e1fd..23840236cc8c 100644
--- a/app-portage/getuto/metadata.xml
+++ b/app-portage/getuto/metadata.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://docs.baldeagleos.com/dtd/metadata.dtd">
 <pkgmetadata>
-  <maintainer type="project">
-    <email>dev@liguros.net</email>
-    <name>Development</name>
-  </maintainer>
   <maintainer type="person">
     <email>dilfridge@gentoo.org</email>
     <name>Andreas K. Hüttel</name>
   </maintainer>
+  <maintainer type="project">
+    <email>binhost@gentoo.org</email>
+    <name>Binhost</name>
+  </maintainer>
+  <stabilize-allarches />
   <upstream>
     <bugs-to>https://github.com/projg2/getuto/issues/</bugs-to>
   </upstream>
   <origin>baldeagleos-repo</origin>
-  <stabilize-allarches />
 </pkgmetadata>