gentoo auto-resync : 26:02:2024 - 11:40:32

7 files changed, 4 insertions, 176 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 678ebf954b41..eb7fa939db02 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/mkosi/Manifest b/app-admin/mkosi/Manifest
index 25a82edc10de..720ecff1b9b1 100644
--- a/app-admin/mkosi/Manifest
+++ b/app-admin/mkosi/Manifest
@@ -1,11 +1,3 @@
-DIST mkosi-15.1.tar.gz 120606 BLAKE2B 36171c08c18dd3ba3c2e54c8a3374fad2a9b008f8253e6cd57cedf7b7e8216b6610b30f9f46aa634de62ebf257d1e8eff94a83b07c027708e4875e24bc0a8305 SHA512 3b65c6b964aa2bde12117b7b2c3e4be0ac72036a92a115f1e93e7be0b3b0aa0bd3adb753ee49865723a9bc677bc4492416caafff4fec3ffd942de78357c11608
-DIST mkosi-17.1.tar.gz 133505 BLAKE2B 96824568dd53cd83a1f8b95072c750e1a0bbd06356df19c62ea9799a5d8f1b2e55f108a3ec3cf171f5dfdefcc1ac5bc86785a60d80def38a5e1817b91f1d9486 SHA512 59988a6a81c0456df6fa9673032d1e25c5cc382b45fd0299c974559d573279c4c38f5600b4e14a71ecdaa013d9b97b90cc815b3b601a7dd061924519cd8b76bf
-DIST mkosi-19.tar.gz 163864 BLAKE2B c97a0a2139c036b727d0cdd6686a7fa5393f62357d87b988f0a1a473367eb552de1ed6f82c1ca99c697ef72acb2fdf6aef7981bfa8dd5c6230b82ba84cbcfb7e SHA512 8eb4e4af823299fdd6e9a077ec27be029656974ba0414b08ef226b5ccf7cd0a92d8bef4e475cdf05b86c3a0027c43be0f895af56a87df22502d2904cb0246ef4
-DIST mkosi-20.1.tar.gz 195875 BLAKE2B 55a508849ef5c1ef60681635e8e4d396587c11d735c23ba8f1b3367c30d8cf8a9cc479959ec2c43d1697fe9d34da281b574a6cf11c786e6c7926e60537aab5d2 SHA512 5d5631bb062fc11593c450a9f5e4ece51a87daf37948b24410d6fdf8bf9e9366b7510c3512ba55ec72b280e8c92b2b36bf7d7f30e9357f7427cd9126fcec566f
 DIST mkosi-20.2.tar.gz 198966 BLAKE2B 1ab2332427d205871adea24ddd50c41e716801dd320f17167dc2e990d449084d59fc58efb20de01a80d438ce85b900f9752f9acc2372a5d5e8ccead0d371b9ed SHA512 62095d81f21d18a1b7f25c73ea2989f9f5b8fe1e335185b3ce6774af2739df9124ca8f5860514a8f570d565ffbf07edf3abc53a0622059127f5c35ed23bd8f65
-EBUILD mkosi-15.1.ebuild 812 BLAKE2B fefc2c83f3d08049c09662b065768b0cb425593710e10a5a0bdd8cafa63f542481c4ea9d9b290036276ca3f0bc9ff9326dc5d11cc576ecac9729558f293fc641 SHA512 c1b6fadb5fd335d3b8525034dc5f417cb86cadbb9421d25961765f6ab9e922b18b9f851bf41b38cb3bad4cfd1069a2f880cecc63acc1b37f5ac2df4f527f3478
-EBUILD mkosi-17.1-r1.ebuild 818 BLAKE2B 54acb5f1829076770e02c46232bd80bd6a8f9d9d8ca22aec06018282a613eb2c643b029c4abe1a1d8748efbe52704ed5136c0b2129717caed540966456b02a4b SHA512 cfa1835e40a9fce04c251cb043c1f1a5ff1bc201b9266b7ca116df9d812c14c18d9286dcea01484f875670184afbecbf2384000d307a2ef810b0fea1861d6355
-EBUILD mkosi-19.ebuild 818 BLAKE2B 54acb5f1829076770e02c46232bd80bd6a8f9d9d8ca22aec06018282a613eb2c643b029c4abe1a1d8748efbe52704ed5136c0b2129717caed540966456b02a4b SHA512 cfa1835e40a9fce04c251cb043c1f1a5ff1bc201b9266b7ca116df9d812c14c18d9286dcea01484f875670184afbecbf2384000d307a2ef810b0fea1861d6355
-EBUILD mkosi-20.1.ebuild 818 BLAKE2B 424c0405820593ab1ee070d79a2db81cee873b6402be29a98cd9eae188ad4cc8822c1232865901bb81589af4f3a469842de2295a0278ef3c77fa2873de11f4d4 SHA512 5de096f5f6239d81c58106bae35937d7f2d543b1327bd1a931bad7bae8a8d0dd53e08ea9f8720123bad1baf04e3eb09f327b597d7016fbbdc0dda9d62ff5e51e
-EBUILD mkosi-20.2.ebuild 818 BLAKE2B 424c0405820593ab1ee070d79a2db81cee873b6402be29a98cd9eae188ad4cc8822c1232865901bb81589af4f3a469842de2295a0278ef3c77fa2873de11f4d4 SHA512 5de096f5f6239d81c58106bae35937d7f2d543b1327bd1a931bad7bae8a8d0dd53e08ea9f8720123bad1baf04e3eb09f327b597d7016fbbdc0dda9d62ff5e51e
+EBUILD mkosi-20.2-r1.ebuild 847 BLAKE2B affc94fb2baeb060f1143230ffc53654cc0f5b02acd7b944a6fa1fa07055ed968792a52ebf389648d2d56f16795a636655d479f94d49a63d217b322b8d70da8d SHA512 81385d5c6b7c907b8c95fc3be950ea2e0ab639499e01f778d2ad05d4476001a1618233be08db806ef2e2c5040f59ec5291586fa51ff003d0a1382a32b8d5f35d
 MISC metadata.xml 479 BLAKE2B 3921ab722bcee7cc126528e3b204251ef5fddb5abb333ef3317e8e5fb0a596eced1619ce8bb3670aa8c78f60987d59fc7f6992dc5b14c407f2be3b16581389de SHA512 d02e7a8f4e9295ea13e9bd8a451f1b87463c7d15cb49529e348aa483350fb0553b5a4485999abd876d40a658b457b4de46d3e7561ff3b512f9c1865b1b901e35
diff --git a/app-admin/mkosi/mkosi-15.1.ebuild b/app-admin/mkosi/mkosi-15.1.ebuild
deleted file mode 100644
index 16874bb99315..000000000000
--- a/app-admin/mkosi/mkosi-15.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Build Bespoke OS Images"
-HOMEPAGE="https://github.com/systemd/mkosi"
-SRC_URI="https://github.com/systemd/mkosi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-RDEPEND="
-	app-emulation/qemu
-	sys-apps/bubblewrap
-	sys-apps/systemd
-	sys-firmware/edk2-ovmf"
-BDEPEND="virtual/pandoc"
-
-distutils_enable_tests pytest
-
-src_compile() {
-	distutils-r1_src_compile
-
-	./tools/make-man-page.sh || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman mkosi/resources/mkosi.1
-}
-
-pkg_postinst() {
-	optfeature "For debian support: " dev-util/debootstrap
-}
diff --git a/app-admin/mkosi/mkosi-17.1-r1.ebuild b/app-admin/mkosi/mkosi-17.1-r1.ebuild
deleted file mode 100644
index a01776550dcf..000000000000
--- a/app-admin/mkosi/mkosi-17.1-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Build Bespoke OS Images"
-HOMEPAGE="https://github.com/systemd/mkosi"
-SRC_URI="https://github.com/systemd/mkosi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-RDEPEND="
-	app-emulation/qemu
-	sys-apps/bubblewrap
-	>=sys-apps/systemd-254
-	sys-firmware/edk2-ovmf"
-BDEPEND="virtual/pandoc"
-
-distutils_enable_tests pytest
-
-src_compile() {
-	distutils-r1_src_compile
-
-	./tools/make-man-page.sh || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman mkosi/resources/mkosi.1
-}
-
-pkg_postinst() {
-	optfeature "For debian support: " dev-util/debootstrap
-}
diff --git a/app-admin/mkosi/mkosi-19.ebuild b/app-admin/mkosi/mkosi-19.ebuild
deleted file mode 100644
index a01776550dcf..000000000000
--- a/app-admin/mkosi/mkosi-19.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Build Bespoke OS Images"
-HOMEPAGE="https://github.com/systemd/mkosi"
-SRC_URI="https://github.com/systemd/mkosi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-RDEPEND="
-	app-emulation/qemu
-	sys-apps/bubblewrap
-	>=sys-apps/systemd-254
-	sys-firmware/edk2-ovmf"
-BDEPEND="virtual/pandoc"
-
-distutils_enable_tests pytest
-
-src_compile() {
-	distutils-r1_src_compile
-
-	./tools/make-man-page.sh || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman mkosi/resources/mkosi.1
-}
-
-pkg_postinst() {
-	optfeature "For debian support: " dev-util/debootstrap
-}
diff --git a/app-admin/mkosi/mkosi-20.1.ebuild b/app-admin/mkosi/mkosi-20.1.ebuild
deleted file mode 100644
index 1574760425a0..000000000000
--- a/app-admin/mkosi/mkosi-20.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-
-inherit distutils-r1 optfeature
-
-DESCRIPTION="Build Bespoke OS Images"
-HOMEPAGE="https://github.com/systemd/mkosi"
-SRC_URI="https://github.com/systemd/mkosi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64"
-RDEPEND="
-	app-emulation/qemu
-	sys-apps/bubblewrap
-	>=sys-apps/systemd-254
-	sys-firmware/edk2-ovmf"
-BDEPEND="virtual/pandoc"
-
-distutils_enable_tests pytest
-
-src_compile() {
-	distutils-r1_src_compile
-
-	./tools/make-man-page.sh || die
-}
-
-src_install() {
-	distutils-r1_src_install
-
-	doman mkosi/resources/mkosi.1
-}
-
-pkg_postinst() {
-	optfeature "For debian support: " dev-util/debootstrap
-}
diff --git a/app-admin/mkosi/mkosi-20.2.ebuild b/app-admin/mkosi/mkosi-20.2-r1.ebuild
index 1574760425a0..eeac67318dcb 100644
--- a/app-admin/mkosi/mkosi-20.2.ebuild
+++ b/app-admin/mkosi/mkosi-20.2-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{11..12} )
 
 inherit distutils-r1 optfeature
 
@@ -18,8 +18,8 @@ KEYWORDS="~amd64"
 RDEPEND="
 	app-emulation/qemu
 	sys-apps/bubblewrap
-	>=sys-apps/systemd-254
-	sys-firmware/edk2-ovmf"
+	sys-apps/systemd
+	|| ( sys-firmware/edk2-ovmf-bin sys-firmware/edk2-ovmf )"
 BDEPEND="virtual/pandoc"
 
 distutils_enable_tests pytest