10 files changed, 108 insertions, 11 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d5f1de52cdf6..53ba63a0057b 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/imediff2/Manifest b/dev-util/imediff2/Manifest
index 499f71e27ea7..09e77267183e 100644
--- a/dev-util/imediff2/Manifest
+++ b/dev-util/imediff2/Manifest
@@ -1,4 +1,4 @@
 AUX 1.1.2.1-python-3.patch 5273 BLAKE2B cb2be2f11021d61f998d228d26cfad956ec3c6d18aeafb7ece82d5f3de1e624776033746a51542b601d3ab94db2d57aece68315f772d8299f22b2010d2151905 SHA512 212cb76362c8243824d16f514a2dafc0c746467454c463e34f1840022d4a988874878e544ee944726947a287e5db27a78d2b99b790a78f4188d10ed9e2eaaea5
 DIST imediff2_1.1.2.1.orig.tar.gz 20393 BLAKE2B 560eef8600bac8ad302907563bd8520ef7881009c8a35c74427d0d5d9e8d4303446f1eb39c01fec201c798f286023765776a84b1e1aaa9e2d585a45870375f16 SHA512 ad0e22f5f2f16efb976a0d6d16c34798cc8aace4251a99cb7764df6841f93c2a6bb9dc8cbb59d8f3ae5a5ad7c161a05b9c3c7b36cc7bdf98eac3ef3b735ef6c4
-EBUILD imediff2-1.1.2.1.ebuild 800 BLAKE2B d002779a2c3b165d7037bd9eb60fa1cf46b59f1e0aabb1c1e2eddd4d4310ea2991eef14dfef7d007e7c42534b206a153914a4c60a21db8eae342576a80444598 SHA512 143388bce4a0cad17625ab23d2f6ffb46005f1e68858ddaa4f5ace15be95e5e691b2c42ef3ac754485513216d262c3a148122034b50b9bdd38cecf61e99017d8
-MISC metadata.xml 271 BLAKE2B 983ccea5d0b9dd2d76ff127b68427cf54f9bae021ec3147ad5a684a92d6b4a4d686b2fdbec03e443def9c7ac9c7477c20cf2d1d6b62bb89c495f1583190a4dd1 SHA512 396312feb257eae8b3327ac774dac7b25f2cfec9ac6ea90b52704dbcb01b124e5b4c5a2ae12e695c2821ae3d6f76b5971c5a626900f7a99a024063d435a1725f
+EBUILD imediff2-1.1.2.1.ebuild 802 BLAKE2B c00c79808ebef2c15452d087608a7f8f1bffc90785dea6d8d5b07ea0766ce5bb292de031b612d22b4da8ecd598d67ee5bbedac8f43e9fe9055d6d3e804cbe90e SHA512 83bcc284648f9a716c257b1317c3d5f59225a3574a1da4bfe833c1ac19e59f57f5149f38bfa40e98e27864e4e4c6814c21809325722cd0c5f434f52aa99c6ddd
+MISC metadata.xml 353 BLAKE2B 321cde0ea4c10fc1f84fa2c099eb2ed01edef4aa3e95404aa4e7d97c1bf8f1d68fac74e6e1ee8fc693c1a582c00d399d40c1723aaceffbf129cd5a80f57bb1c6 SHA512 36a16da5b046e40a974c50eb1e45cfca382f39bf6b4bf8fb768ca1ab00faca1ec3de42e23ad8cd92abe6a1f6596255a3ca5893d052f82e45506e099f9783999d
diff --git a/dev-util/imediff2/imediff2-1.1.2.1.ebuild b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
index 3efa6758d2a3..c1519e6bfc83 100644
--- a/dev-util/imediff2/imediff2-1.1.2.1.ebuild
+++ b/dev-util/imediff2/imediff2-1.1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9,10} )
+PYTHON_COMPAT=( python3_{9..11} )
 PYTHON_REQ_USE="ncurses"
 
 inherit python-single-r1
@@ -11,7 +11,7 @@ inherit python-single-r1
 MY_P="${PN}_${PV}"
 
 DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode"
-HOMEPAGE="https://elonen.iki.fi/code/imediff/"
+HOMEPAGE="https://github.com/osamuaoki/imediff"
 SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/dev-util/imediff2/metadata.xml b/dev-util/imediff2/metadata.xml
index 898553d0c3fb..3ee8eee9efef 100644
--- a/dev-util/imediff2/metadata.xml
+++ b/dev-util/imediff2/metadata.xml
@@ -5,5 +5,8 @@
 		<email>grknight@gentoo.org</email>
 		<name>Brian Evans</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">osamuaoki/imediff</remote-id>
+	</upstream>
 	<stabilize-allarches/>
 </pkgmetadata>
diff --git a/dev-util/rgbds/Manifest b/dev-util/rgbds/Manifest
new file mode 100644
index 000000000000..1f611637c191
--- /dev/null
+++ b/dev-util/rgbds/Manifest
@@ -0,0 +1,4 @@
+DIST rgbds-0.6.1.tar.gz 8041890 BLAKE2B cd5483e6fa5e2ca3bc9a6e3de44fdf7dc92289d558ac72d8922c0cf21b9dc576b878bfd7610cb41f791ad16cc415e446c925ee0dbc77ec4370d6ef4549935681 SHA512 b4a111e3d98a190d3c9b500dc59585fe68a8e6febc79b6716b406b96714e401bac427336388409ae456ee0f1e5a2c285bfe7b4bfa10e0d148ffc161adefe435b
+EBUILD rgbds-0.6.1.ebuild 763 BLAKE2B 582760a267fe0e18ce45e66621816e54ba63ad9f0884c951da6a93adb30d84aa0933c67abe36ff6948dd30e6a0d2642a9e8a6fcd8c1e970eb09fe62d477083cc SHA512 1e009705c83e017bf11280ddb2ce07e11292258d2feb18924f01a69af37c27d5a4b45650b126971dfd436c3faebb9af54919047a6d52f641b286914020dca869
+EBUILD rgbds-9999.ebuild 763 BLAKE2B 582760a267fe0e18ce45e66621816e54ba63ad9f0884c951da6a93adb30d84aa0933c67abe36ff6948dd30e6a0d2642a9e8a6fcd8c1e970eb09fe62d477083cc SHA512 1e009705c83e017bf11280ddb2ce07e11292258d2feb18924f01a69af37c27d5a4b45650b126971dfd436c3faebb9af54919047a6d52f641b286914020dca869
+MISC metadata.xml 682 BLAKE2B cf9153f0ca5faaefa518fd7300d4107d3eb4770f8471ccbaf90bfb8ca6397c3387b970b4ed97a8c5ea78695f168be3265d6e3bf84fa67dcef4ba214cd7f7bd3e SHA512 b4810cc1b6c4b9b557a11e0b172520bf0d74fd2874c6557726e51a85e946ec9e60ba4952e2746f19de25f98b97918aab1fef7c7278956ab0d0f2f551d709e20f
diff --git a/dev-util/rgbds/metadata.xml b/dev-util/rgbds/metadata.xml
new file mode 100644
index 000000000000..d3ec151f4b91
--- /dev/null
+++ b/dev-util/rgbds/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM 'https://www.gentoo.org/dtd/metadata.dtd'>
+<pkgmetadata>
+	<maintainer type="person" proxied="yes">
+		<email>orbea@riseup.net</email>
+		<name>orbea</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+		RGBDS (Rednex Game Boy Development System) is a free assembler
+		and linker package for the Game Boy and Game Boy Color.
+	</longdescription>
+	<upstream>
+		<bugs-to>https://github.com/gbdev/rgbds/issues</bugs-to>
+		<remote-id type="github">gbdev/rgbds</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-util/rgbds/rgbds-0.6.1.ebuild b/dev-util/rgbds/rgbds-0.6.1.ebuild
new file mode 100644
index 000000000000..9245f4deb4f2
--- /dev/null
+++ b/dev-util/rgbds/rgbds-0.6.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Rednex Game Boy Development System"
+HOMEPAGE="https://rgbds.gbdev.io/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gbdev/${PN}.git"
+else
+	SRC_URI="https://github.com/gbdev/${PN}/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="media-libs/libpng"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	append-flags -DNDEBUG
+
+	emake Q= \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr Q= STRIP= install
+	dodoc README.rst
+}
diff --git a/dev-util/rgbds/rgbds-9999.ebuild b/dev-util/rgbds/rgbds-9999.ebuild
new file mode 100644
index 000000000000..9245f4deb4f2
--- /dev/null
+++ b/dev-util/rgbds/rgbds-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="Rednex Game Boy Development System"
+HOMEPAGE="https://rgbds.gbdev.io/"
+if [[ "${PV}" == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gbdev/${PN}.git"
+else
+	SRC_URI="https://github.com/gbdev/${PN}/archive/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64"
+fi
+
+LICENSE="ZLIB"
+SLOT="0"
+
+DEPEND="media-libs/libpng"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_compile() {
+	append-flags -DNDEBUG
+
+	emake Q= \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)"
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}"/usr Q= STRIP= install
+	dodoc README.rst
+}
diff --git a/dev-util/schroot/Manifest b/dev-util/schroot/Manifest
index 11e08b6313aa..67fc8c4cf3ac 100644
--- a/dev-util/schroot/Manifest
+++ b/dev-util/schroot/Manifest
@@ -1,6 +1,6 @@
 AUX 06zfscloneopts 1467 BLAKE2B e515b70b7d105470a8b32ecd8f2d88446f039424a132215bb149e7716429efc7b726630de9bda9ff0cf197a8ba777ce2f0e14da1709fd89a9f50e88713dc3b1d SHA512 4026af077ebbb2aa4e123af1cffa5125e5b420ac79a13f7c1a510bd6d57dc4e5c439470396ffdf0701ce7a4009044a415bed6a460cf829364b3c48cd71edd37f
 AUX 11gentoo 1992 BLAKE2B 61e4396196b7c6b4695567f74c6f17fe24ab0152a8e57da136ecefa16d30e3127b94c701bc9ba0b923fa0d3aa5ab87811aed64c656d0aa475a37dbb884082749 SHA512 98f549edae1326840f04058442c07fc8e2af70811393c106bea84426c51eea36378b6a863352cc0b2aab8efd8e81b0e70c4d10bdaeda5f2a17f51fbb3ca9abf3
-AUX schroot-1.6.13-resize-reserve.patch 2766 BLAKE2B 3bd967cb362091310dfae0c593f4f9e2a86ff80e36a2b6cd99e342ede2b086f73066551b401e8e438bdf3179ee00a52e881d5d1f37ef1ceaf08c3179dc17a5f4 SHA512 557d0d7582794c7c9bd96df5c24e3f22c8656fef2e43a116538ba204e33f64400d08802e1e4f85d9308f51bdea4435fe83392f105018c60612de7726d34c93af
+AUX schroot-1.6.13-resize-reserve.patch 2614 BLAKE2B c97507a3af3fae5173d63a31b3e01bf62c20704118844925b9ba046509b360a6dbd6a1230bc7e241d613798ad68face0e426c011a48ceb0e5641879059618a7a SHA512 fa5803db47f9a62c8b44c1df1655fe23bd67cc6f3326502350108cafc5b585fc611ca9b99810b128d41fae2119c7f972b4c3c658fb388d2e7ef022e26e5dd376
 AUX schroot-1.6.13_p2-build-fixes.patch 3505 BLAKE2B cd5aaf9cab438e0c42999cf49f65a99d4edd2fc8832d8875ded58b44c037972a67d061a01122409bbd25ae3cd1fd52deb8f2ea0a68e64941cd23e6393be358ba SHA512 1c1dc159ee088633b0b98ba6a271de76937a08e7dd2e665e4a43016b05cc009c764c01a783672383205a93efebac189b8d43614b94267d57588af5cf53393494
 AUX schroot.confd 371 BLAKE2B efb68aa9818ddf23fa88087c656f8abe8ee3c549714fa16b2be6d0cc0aa3e5dfae6dcd4eefc2e152eab60611e2369db6159a444344adcff6954fd8c1e828f698 SHA512 b86944ee7fb2622ef0bd9c9252a51724916427c6bffa1dc0623a40190e4866ffda48f8999790365f4a589ea647e3695077b6cd7ec8a1d1ab6bd026a5c7480c98
 AUX schroot.initd 706 BLAKE2B 344eb8296714d2d40b451a07fd6e498c6134122da2d115cfc4bf6e7285278ce5c97fb05be7303f8636d30b455323f32594387c87fa96ef1b5a99117b41c2e3cb SHA512 8ce31a67cb4a6064875eed2d5cf3f11ce13f322b19df6b51dc08df2de42447f09124d725d70b1c4ff906644ef52a1f1b5b295575f795a96438bad3dea52f3d15
diff --git a/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
index da798f3b4761..066894a16ecc 100644
--- a/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
+++ b/dev-util/schroot/files/schroot-1.6.13-resize-reserve.patch
@@ -1,3 +1,5 @@
+https://codeberg.org/shelter/reschroot/pulls/6
+
 From 6d7a762d6d630548ed558e0de8ddf04f3b0a69fc Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
 Date: Sat, 14 Jan 2023 22:53:20 +0100
@@ -6,12 +8,6 @@ Subject: [PATCH] sbuild-util: use resize instead of reserve
 Using reserved but uninitialized space is invalid, and, additionally,
 reserve is not required to allocate memory or change the buffer size at
 all.
----
- sbuild/sbuild-util.cc | 24 ++++++++++++------------
- 1 file changed, 12 insertions(+), 12 deletions(-)
-
-diff --git a/sbuild/sbuild-util.cc b/sbuild/sbuild-util.cc
-index b89068a7..b6af7e89 100644
 --- a/sbuild/sbuild-util.cc
 +++ b/sbuild/sbuild-util.cc
 @@ -624,17 +624,17 @@ void