gentoo auto-resync : 15:06:2023 - 13:38:09

3 files changed, 2 insertions, 121 deletions

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index bf7adffec8ae..731e15beed8f 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,6 +1,5 @@
 AUX calamares-3.2.60-ldflags.patch 661 BLAKE2B ebeea9a8dbb067ebf3f862d425342338e4830bf75771c240aea22eb19cf44f5c64ca3560198dd4a43c0ab8b13dab98c5118921c7096ae24ab1f7c4b03467bab6 SHA512 9b12576d687b518e4652cd1c2f67248ed11fed3ed443ae8d1ba0b7ee4e8d312dca423a6ea87c3e5cd25ad079d732f45a059e735d2df24a71f93f4f04cba3dbc1
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
 DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
-EBUILD calamares-3.2.60-r1.ebuild 2746 BLAKE2B 83d77f143b7950cb18bbb887defdda57207218cccdf8dd202adb20dcadfd79ee07e83c1aa2a4e562bbc2b19d42ac68440c7c6b7dd47e6273ffd4ee527d661947 SHA512 1b40f33931dfe7b7a421f972ab1d9b647877700edb26ca9bcd4a9861dc00a846cc924c6fc33080dccb4a0da371af83e136053489662b6cde1dd74df5cde539fc
-EBUILD calamares-3.2.60-r2.ebuild 2746 BLAKE2B 5c87dc66fa3dc81bd28397f7189525421aef3f08fdc729ecec87bd4df41ea7e24489def4a6ccd3ed182219160d35124e89475926c7eaa81ff42e8b907d8ce6ef SHA512 ae010e3422eb2a370512dc2c379809d2a45a0219f07b71ee65c4c7f810eb8c1738afef13b268a8f06ad877b90295180bb5b794d02d7dbae94158a6d30f19de33
+EBUILD calamares-3.2.60-r3.ebuild 2770 BLAKE2B 337ce2408e93ff50da6442aca9512d09f6040c2940903d0698231170f66c59fe7e63b32c9100932c04da9bc07f439ece817a14a44652365a0d9ab7433fdcd820 SHA512 9c65191e8bdb39cb9c6fc5dd01bb9eaff21a1b8740d65899d3a0fd7154d1fc4d0024bcd3209155ef9c62a0af85aba8de6319fe2143a0161ec9753397ff19ccbc
 MISC metadata.xml 781 BLAKE2B 56d64535b539de398557b26f7705e6aa222d7073a0c31a38069d45deec697e488891c95850324a7610ee1faf8f4ce2e04d0d0a9fd29300afa5e5bf42804e6942 SHA512 156cd07700dfab61f78bbdd4c626a098ce111428cebbbc6ab541f60f12e347f62236ad21d2fd8031babfc0be87ad4b246ad2afb3e453005588f87bc500c78c72
diff --git a/app-admin/calamares/calamares-3.2.60-r1.ebuild b/app-admin/calamares/calamares-3.2.60-r1.ebuild
deleted file mode 100644
index 0a569c256030..000000000000
--- a/app-admin/calamares/calamares-3.2.60-r1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit ecm python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="5"
-KEYWORDS="~amd64"
-IUSE="+networkmanager +upower"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	dev-cpp/yaml-cpp:=
-	$(python_gen_cond_dep '
-		dev-libs/boost:=[python,${PYTHON_USEDEP}]
-		dev-libs/libpwquality[${PYTHON_USEDEP}]
-	')
-	dev-qt/qtconcurrent:5
-	dev-qt/qtdbus:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwebengine:5[widgets]
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
-	kde-frameworks/kconfig:5
-	kde-frameworks/kcoreaddons:5
-	kde-frameworks/kcrash:5
-	kde-frameworks/kpackage:5
-	kde-frameworks/kparts:5
-	kde-frameworks/kservice:5
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt
-	>=sys-libs/kpmcore-4.0.0:5=
-	virtual/libcrypt:=
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( dev-qt/qttest:5 )
-"
-RDEPEND="${COMMON_DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	sys-libs/timezone-data
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-PATCHES=(
-	"${FILESDIR}/${P}-ldflags.patch"
-)
-
-src_prepare() {
-	ecm_src_prepare
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-			PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-			PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-			PYTHON_LIBS="$(python_get_LIBS)"
-
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \
-		calamares.desktop || die
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \
-		calamares.desktop || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DINSTALL_CONFIG=ON
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-		-DWITH_PYTHONQT=OFF
-	)
-
-	ecm_src_configure
-}
-
-src_test() {
-	local myctestargs=(
-		# Skipped tests:
-		# load-dracut: tries and fails to find Dracut config
-		# libcalamaresnetworktest: needs network
-		# libcalamaresutilstest: inspects /tmp (expects namespace?)
-		#
-		# Need investigation:
-		# test_libcalamaresuipaste
-		# validate-netinstall
-		# validate-services-systemd
-		# localetest
-		# machineidtest
-		# packagechoosertest
-		-E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	ecm_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/calamares/calamares-3.2.60-r2.ebuild b/app-admin/calamares/calamares-3.2.60-r3.ebuild
index 138ba7e10169..516017469b80 100644
--- a/app-admin/calamares/calamares-3.2.60-r2.ebuild
+++ b/app-admin/calamares/calamares-3.2.60-r3.ebuild
@@ -55,7 +55,7 @@ RDEPEND="${COMMON_DEPEND}
 	app-admin/sudo
 	dev-libs/libatasmart
 	net-misc/rsync
-	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
+	|| ( sys-boot/grub:2 sys-apps/systemd sys-apps/systemd-utils[boot] )
 	sys-boot/os-prober
 	sys-fs/squashfs-tools
 	sys-libs/timezone-data