From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AF2EB158200 for ; Tue, 16 Sep 2025 05:04:09 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 9A00434206B for ; Tue, 16 Sep 2025 05:04:09 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id EDDB4110575; Tue, 16 Sep 2025 05:04:00 +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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id E37A1110575 for ; Tue, 16 Sep 2025 05:04:00 +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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C4B2341F19 for ; Tue, 16 Sep 2025 05:04:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0BB8F3955 for ; Tue, 16 Sep 2025 05:03:59 +0000 (UTC) From: "Viorel Munteanu" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" Message-ID: <1757998717.1501a2adb2ad82c000530d5d35d64cfebf86d0e6.ceamac@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.14-r3.ebuild X-VCS-Directories: app-admin/calamares/ X-VCS-Committer: ceamac X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 1501a2adb2ad82c000530d5d35d64cfebf86d0e6 X-VCS-Branch: master Date: Tue, 16 Sep 2025 05:03:59 +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: 00808bc2-66d1-4a88-8c60-aba994e844b3 X-Archives-Hash: b71fb0fe542ecb31872938eeb41ea4b5 commit: 1501a2adb2ad82c000530d5d35d64cfebf86d0e6 Author: Stefan Cristian B. rogentos ro> AuthorDate: Mon Sep 15 12:32:10 2025 +0000 Commit: Viorel Munteanu gentoo org> CommitDate: Tue Sep 16 04:58:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1501a2ad app-admin/calamares: bump 3.3.14-r3 * Bumped -r3 * Added missing python libraries in calamares Signed-off-by: Stefan Cristian B. rogentos.ro> Part-of: https://github.com/gentoo/gentoo/pull/43790 Signed-off-by: Viorel Munteanu gentoo.org> app-admin/calamares/Manifest | 1 + app-admin/calamares/calamares-3.3.14-r3.ebuild | 116 +++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index b2b24a4cc13f..37aebae1fe27 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,3 +1,4 @@ DIST calamares-3.3.13.tar.gz 4819478 BLAKE2B 627a6c95cf409b281a782e1ebd106fdb9cbb69eb73b8b673c5854f6c8fe49868463c7a71ee096e49f994711b6d4a93a387e7d1e22be32021b96835eda3309661 SHA512 9b8395ac43c7dcd1a9a92385bef61b0dfa74936f8aef418d061522d8600d1dddf2f5f28f6052d3a0eee46bb1fc8b1eb502e8d455ea1ed72846ad7db3c9b8c1b4 DIST calamares-3.3.14.tar.gz 4820523 BLAKE2B cdeaf82fbaf33b504e65b43a60f80fc0bcd6d57b7106b268ff7af7c06108708158243f8e80c9f7cfb5694760c01a4fa8eedc57b19852dda09ed027647d1634b1 SHA512 b402a450c6af04632738c4aaa871644f72e848bd49a1214cf0c9fa7d7f9b07ebf00b98a39cd009b422970633ef2f02b5f7abeccfdda22a343b70c251083ad0c8 +DIST calamares-3.3.14a-gentoo-patches.patch 70314 BLAKE2B 431efc99b2321fe3faa6836cdc3e02eece18a672e52c5d24b9f2fdcd6b952e39e7ed8bd0f1005cdbf98e0b0057f59d9f7ad48e1cfbd3bf8fb72f80aee39b6065 SHA512 46e56834e3b3081811ef16045d98e7eb9574601ff6470b73b4d45bb555e1d7d34f56298ae5239790ee53e78e89dcfa85c9f42137d236cff2d5560f956a9f5778 DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6 diff --git a/app-admin/calamares/calamares-3.3.14-r3.ebuild b/app-admin/calamares/calamares-3.3.14-r3.ebuild new file mode 100644 index 000000000000..519d7515e937 --- /dev/null +++ b/app-admin/calamares/calamares-3.3.14-r3.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PYTHON_COMPAT=( python3_{11..13} ) + +QTMIN="6.7.1" +KFMIN="6.9.0" +LIVEPATCH="${P}a" + +inherit ecm python-single-r1 xdg + +DESCRIPTION="Distribution-independent installer framework" +HOMEPAGE="https://calamares.io https://github.com/tableflipper9/calamares" +SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz + livecd? ( + https://github.com/calamares/calamares/compare/95aa33f...TableFlipper9:calamares:gentoo-patches-3.3.14a.patch \ + -> ${LIVEPATCH}-gentoo-patches.patch + ) +" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" +IUSE="livecd" + +DEPEND="${PYTHON_DEPS} + dev-cpp/yaml-cpp:= + dev-libs/icu:= + $(python_gen_cond_dep ' + >=dev-libs/boost-1.72.0:=[python,${PYTHON_USEDEP}] + dev-libs/libpwquality[python,${PYTHON_USEDEP}] + ') + >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus,gui,network,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/kpackage-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + sys-apps/dmidecode + >=sys-libs/kpmcore-24.01.75:6= + virtual/libcrypt:= +" +RDEPEND="${DEPEND} + app-admin/sudo + net-misc/rsync + sys-boot/grub:2 + sys-boot/os-prober + sys-fs/squashfs-tools + sys-libs/timezone-data +" +BDEPEND=">=dev-qt/qttools-${QTMIN}:6[linguist]" + +src_prepare() { + eapply "${FILESDIR}"/${P}-boost-python-fix.patch + if use "livecd" ; then + cp "${DISTDIR}/${LIVEPATCH}-gentoo-patches.patch" "${LIVEPATCH}-gentoo-patches.patch" || die + eapply "${LIVEPATCH}-gentoo-patches.patch" + fi + + 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)" +} + +src_configure() { + # get the selected Python version from EPYTHON variable + local python_version="${EPYTHON#python}" + local boost_python_component="${python_version/./}" + + local mycmakeargs=( + -DINSTALL_CONFIG=ON + -DINSTALL_COMPLETION=ON + -DINSTALL_POLKIT=ON + -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON + -DWITH_PYTHON=ON + -DWITH_PYBIND11=OFF + -DBUILD_APPDATA=ON + -DWITH_QT6=ON + # explicitly set Python version and paths + -DPYTHONLIBS_VERSION="${python_version}" + -DBOOSTPYTHON_COMPONENT="python${boost_python_component}" + ) + + ecm_src_configure +} + +src_test() { + local myctestargs=( + # Skipped tests: + # packagechoosertest (file exists returned false) + # partitiondevicestest for trying to access host + # usershostnametest for changing hostname + # displaymanager for testing access on host DMs + # + # Requires network + # libcalamaresnetworktest + # test_libcalamaresuipaste + # + # E1101 + # lint-dummypython + # + # E0606 + # lint-mount + -E "(lint-displaymanager|lint-dummypython|lint-mount|validate-unpackfsc-unpackfsc|displaymanager|validate-unpackfsc-1|packagechoosertest|load-dummypython|load-dummypython-1|libcalamaresnetworktest|partitiondevicestest|usershostnametest|test_libcalamaresuipaste)" + ) + + cmake_src_test +}