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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D70711581E7 for ; Mon, 29 Apr 2024 19:16:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B8380E29AC; Mon, 29 Apr 2024 19:16:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 9299EE29AC for ; Mon, 29 Apr 2024 19:16:30 +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 BE42534305D for ; Mon, 29 Apr 2024 19:16:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06C80177C for ; Mon, 29 Apr 2024 19:16:28 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1714418175.20803aadad124cc58f9ffb2f74a6bcd09e74e63c.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/calamares/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/calamares/Manifest app-admin/calamares/calamares-3.3.6.ebuild X-VCS-Directories: app-admin/calamares/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: 20803aadad124cc58f9ffb2f74a6bcd09e74e63c X-VCS-Branch: master Date: Mon, 29 Apr 2024 19:16:28 +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: cff65b71-2e0f-477b-8874-d3a211d6f2f2 X-Archives-Hash: 8e692df0a59f0f4eed9b2fe58449a285 commit: 20803aadad124cc58f9ffb2f74a6bcd09e74e63c Author: Andrew Ammerlaan gentoo org> AuthorDate: Mon Apr 29 19:15:57 2024 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Mon Apr 29 19:16:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20803aad app-admin/calamares: add 3.3.6 Signed-off-by: Andrew Ammerlaan gentoo.org> app-admin/calamares/Manifest | 1 + app-admin/calamares/calamares-3.3.6.ebuild | 157 +++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 30eda62874ab..c13fb1de9f0c 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,2 +1,3 @@ DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f DIST calamares-3.3.5.tar.gz 4722988 BLAKE2B bc3270fbc2f804c46008f1f0a106719b779a07d7d5d3cc9f1ab17da7597ebb5dfebc8793036e19570b0048afb667df4b9fed55e813374d7465513ea048e00ffc SHA512 6846e13455e4fa38bd4d5061eece1baf5a972700f489dc1e35d988cfb5359650c63f79f9453431f1aff722af696260504c27f0c000490d781ab5fe03a5c46cf2 +DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6 diff --git a/app-admin/calamares/calamares-3.3.6.ebuild b/app-admin/calamares/calamares-3.3.6.ebuild new file mode 100644 index 000000000000..add03ed16ed6 --- /dev/null +++ b/app-admin/calamares/calamares-3.3.6.ebuild @@ -0,0 +1,157 @@ +# 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} ) + +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 qt6 +upower" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +QT5_MIN="5.15.0" +KF_QT5_MIN="5.78" +QT6_MIN="6.5.0" +KF_QT6_MIN="5.240" + +BDEPEND=" + qt6? ( + >=dev-qt/qttools-${QT6_MIN}:6[linguist] + >=kde-frameworks/extra-cmake-modules-${KF_QT6_MIN} + ) + !qt6? ( + >=dev-qt/linguist-tools-${QT5_MIN}:5 + >=kde-frameworks/extra-cmake-modules-${KF_QT5_MIN} + ) +" +COMMON_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}] + ') + qt6? ( + >=dev-qt/qtbase-${QT6_MIN}:6[concurrent,dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QT6_MIN}:6 + >=dev-qt/qtsvg-${QT6_MIN}:6 + >=dev-qt/qtwebengine-${QT6_MIN}:6[widgets] + dev-qt/kdsingleapplication[qt6] + >=kde-frameworks/kconfig-${KF_QT6_MIN}:6 + >=kde-frameworks/kcoreaddons-${KF_QT6_MIN}:6 + >=kde-frameworks/kcrash-${KF_QT6_MIN}:6 + >=kde-frameworks/ki18n-${KF_QT6_MIN}:6 + >=kde-frameworks/kpackage-${KF_QT6_MIN}:6 + >=kde-frameworks/kparts-${KF_QT6_MIN}:6 + >=kde-frameworks/kservice-${KF_QT6_MIN}:6 + >=kde-frameworks/kwidgetsaddons-${KF_QT6_MIN}:6 + sys-auth/polkit-qt[qt6(-)] + >=sys-libs/kpmcore-24.01.75:6= + ) + !qt6? ( + >=dev-qt/qtconcurrent-${QT5_MIN}:5 + >=dev-qt/qtdbus-${QT5_MIN}:5 + >=dev-qt/qtdeclarative-${QT5_MIN}:5 + >=dev-qt/qtgui-${QT5_MIN}:5 + >=dev-qt/qtnetwork-${QT5_MIN}:5 + >=dev-qt/qtsvg-${QT5_MIN}:5 + >=dev-qt/qtwebengine-${QT5_MIN}:5[widgets] + >=dev-qt/qtwidgets-${QT5_MIN}:5 + >=dev-qt/qtxml-${QT5_MIN}:5 + dev-qt/kdsingleapplication[-qt6] + >=kde-frameworks/kconfig-${KF_QT5_MIN}:5 + >=kde-frameworks/kcoreaddons-${KF_QT5_MIN}:5 + >=kde-frameworks/kcrash-${KF_QT5_MIN}:5 + >=kde-frameworks/ki18n-${KF_QT5_MIN}:5 + >=kde-frameworks/kpackage-${KF_QT5_MIN}:5 + >=kde-frameworks/kparts-${KF_QT5_MIN}:5 + >=kde-frameworks/kservice-${KF_QT5_MIN}:5 + >=kde-frameworks/kwidgetsaddons-${KF_QT5_MIN}:5 + sys-auth/polkit-qt[qt5(+)] + >=sys-libs/kpmcore-20.04.0:5= + ) + sys-apps/dbus + sys-apps/dmidecode + virtual/libcrypt:= +" +DEPEND="${COMMON_DEPEND} + test? ( + !qt6? ( dev-qt/qttest:5 ) + ) +" +RDEPEND="${COMMON_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 ) +" + +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="$(usex qt6)" + ) + + 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 +}