[gentoo-commits] repo/gentoo:master commit in: app-admin/mkosi/

["Mike Gilbert" <floppym@gentoo.org>]

commit:     915375fcf29c62a9e343bba44d226ae492c99d50
Author:     Paymon MARANDI <darwinskernel <AT> gmail <DOT> com>
AuthorDate: Tue Mar 28 15:42:00 2023 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 15:43:41 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=915375fc

app-admin/mkosi: bump to 14_p20230313

this is the version of mkosi with usrmerge-profile[1] and rootless[2]
support.
[1] https://github.com/systemd/mkosi/commit/d1f5db41929afd8e41622ce89250c93302dd23b7
[2] https://github.com/systemd/mkosi/commit/fdecbf74e9d8a9b1e1c32e4c16b15d7be07fdf5a

Closes: https://bugs.gentoo.org/896472
Signed-off-by: Paymon MARANDI <darwinskernel <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29809
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 app-admin/mkosi/Manifest                                       |  2 +-
 app-admin/mkosi/metadata.xml                                   |  3 +++
 .../mkosi/{mkosi-12-r1.ebuild => mkosi-14_p20230313.ebuild}    | 10 +++++++---
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app-admin/mkosi/Manifest b/app-admin/mkosi/Manifest
index 90977acf8eff..d50a22a1196f 100644
--- a/app-admin/mkosi/Manifest
+++ b/app-admin/mkosi/Manifest
@@ -1 +1 @@
-DIST mkosi-12.tar.gz 164750 BLAKE2B b4b43e3cd64bc75eaa1993504baa02cc7f35c77fc76d24a88ccc06d4ab566477aa9febca58ac1c397cd32057aa2da8545480e89a1c9b4bd4d4fa516d812237b0 SHA512 ae59789e3b4855400d130714fac0b3b599b3e69631bc6a5267916697d0722c05a6c788cd70d224917261c931fe93fa287d3d23f6f00849cb80ff9794a13dc04e
+DIST mkosi-14_p20230313.tar.gz 129298 BLAKE2B eae4f3c10c7118fa939d56cd043b3f24deb457465265c2ca8b30577193fa7f35a84d6826962a273a6e33e6f32d0aa5101db4df508da97219a8081f2e9550269b SHA512 27edfa7a7f2ebb70364ce3bdece75629e9f20060e59c2fd3bff0be6950a0042ec04fd4d09285e1080b9cf0d0b2cc8bfa66787b86be18dbb473f14cf019fc5be4

diff --git a/app-admin/mkosi/metadata.xml b/app-admin/mkosi/metadata.xml
index 4d83ae8b4b54..4c486f7537ae 100644
--- a/app-admin/mkosi/metadata.xml
+++ b/app-admin/mkosi/metadata.xml
@@ -9,4 +9,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<upstream>
+		<remote-id type="github">webcamoid/webcamoid</remote-id>
+	</upstream>
 </pkgmetadata>

diff --git a/app-admin/mkosi/mkosi-12-r1.ebuild b/app-admin/mkosi/mkosi-14_p20230313.ebuild
similarity index 65%
rename from app-admin/mkosi/mkosi-12-r1.ebuild
rename to app-admin/mkosi/mkosi-14_p20230313.ebuild
index 42cff127c935..815dd1509bbe 100644
--- a/app-admin/mkosi/mkosi-12-r1.ebuild
+++ b/app-admin/mkosi/mkosi-14_p20230313.ebuild
@@ -3,22 +3,26 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} )
+COMMIT='33a33967819443ee03137459eec85cd5db6c4bad'
 
 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"
+SRC_URI="https://github.com/systemd/mkosi/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${PN}-${COMMIT}"
 
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~amd64"
 RDEPEND="
+	app-emulation/qemu
 	dev-vcs/git
+	sys-apps/bubblewrap
 	sys-apps/portage
 	sys-apps/systemd
-	app-emulation/qemu
 	sys-firmware/edk2-ovmf"
 
 distutils_enable_tests pytest