From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14C3E158083 for ; Sat, 7 Sep 2024 21:26:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D0B0E2A05; Sat, 7 Sep 2024 21:26:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 30649E2A05 for ; Sat, 7 Sep 2024 21:26:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 379FB343022 for ; Sat, 7 Sep 2024 21:26:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 715C714CA for ; Sat, 7 Sep 2024 21:26:33 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1725740741.3b42ef3569f34544aa893885ccd741cd9eade917.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/calamares/calamares-3.3.6-r2.ebuild X-VCS-Directories: app-admin/calamares/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 3b42ef3569f34544aa893885ccd741cd9eade917 X-VCS-Branch: master Date: Sat, 7 Sep 2024 21:26:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e98fdb26-c573-4567-bf71-07581be264d6 X-Archives-Hash: 699aa2b5ad4142a8358950e79e719628 commit: 3b42ef3569f34544aa893885ccd741cd9eade917 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 7 16:21:20 2024 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 7 20:25:41 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b42ef35 app-admin/calamares: Drop IUSE qt6 (Qt5 option cleanup) Signed-off-by: Andreas Sturmlechner gentoo.org> app-admin/calamares/calamares-3.3.6-r2.ebuild | 115 ++++++++++++++++++++++++++ 1 file changed, 115 insertions(+) diff --git a/app-admin/calamares/calamares-3.3.6-r2.ebuild b/app-admin/calamares/calamares-3.3.6-r2.ebuild new file mode 100644 index 000000000000..a5d4f885a03d --- /dev/null +++ b/app-admin/calamares/calamares-3.3.6-r2.ebuild @@ -0,0 +1,115 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PYTHON_COMPAT=( python3_{10..12} ) + +QTMIN="6.7.1" +KFMIN="6.0.0" +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}" + +DEPEND="${PYTHON_DEPS} + dev-cpp/yaml-cpp:= + $(python_gen_cond_dep ' + >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}] + dev-libs/libpwquality[${PYTHON_USEDEP}] + ') + >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=dev-qt/qtwebengine-${QTMIN}:6[widgets] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/kservice-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + sys-auth/polkit-qt[qt6(-)] + >=sys-libs/kpmcore-24.01.75:6= + sys-apps/dbus + sys-apps/dmidecode + virtual/libcrypt:= +" +RDEPEND="${DEPEND} + app-admin/sudo + dev-libs/libatasmart + net-misc/rsync + || ( + sys-boot/grub:2 + sys-apps/systemd[boot(-)] + sys-apps/systemd-utils[boot] + ) + sys-boot/os-prober + sys-fs/squashfs-tools + sys-libs/timezone-data + virtual/udev + networkmanager? ( net-misc/networkmanager ) + upower? ( sys-power/upower ) +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +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)" + + cp "${FILESDIR}/calamares-gentoo-branding.desc" src/branding/default/branding.desc || die "Failed to overwrite branding file" +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_CONFIG=ON + -DINSTALL_COMPLETION=ON + -DINSTALL_POLKIT=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON + -DWITH_PYTHON=ON + # Use system instead + -DWITH_PYBIND11=OFF + -DBUILD_APPDATA=ON + -DWITH_QT6=ON + ) + + 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 + # + # Requires removed dev-python/toml + # lint-displaymanager + # + # E1101 + # lint-dummypython + -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest|lint-displaymanager|lint-dummypython)" + ) + + cmake_src_test +}