commit: be91bc544ea21214b752fc9e052ad97e08b704ac Author: Stefan Cristian B. <stefan.cristian+git <AT> rogentos <DOT> ro> AuthorDate: Thu Feb 12 04:32:52 2026 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Mon Feb 23 07:57:39 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be91bc54
app-admin/calamares: revbump 3.3.14-r7 * fixed luks2 and added as default, replacing luks1 * corrected mediums that previously were not able to install * corrected logical errors in downloadstage3, gentoopkg, dracut_gentoo modules * expanded functionality to all the mediums which contain and can successfully install gentoo-kernel-bin with installkernel dracut * added grub.d gentoo specific configuration, for encryption functionalities, and predictable grub and kernel upgrades * corrected livecd option to install encrypted as well Signed-off-by: Stefan Cristian B. <stefan.cristian+git <AT> rogentos.ro> Part-of: https://github.com/gentoo/gentoo/pull/45775 Closes: https://github.com/gentoo/gentoo/pull/45775 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> app-admin/calamares/Manifest | 1 + app-admin/calamares/calamares-3.3.14-r7.ebuild | 117 +++++++++++++++++++++++++ 2 files changed, 118 insertions(+) diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index a1435f0803e0..125f275f7eb5 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -2,3 +2,4 @@ DIST calamares-3.3.14.tar.gz 4820523 BLAKE2B cdeaf82fbaf33b504e65b43a60f80fc0bcd DIST calamares-3.3.14a-gentoo-patches.patch 70314 BLAKE2B 431efc99b2321fe3faa6836cdc3e02eece18a672e52c5d24b9f2fdcd6b952e39e7ed8bd0f1005cdbf98e0b0057f59d9f7ad48e1cfbd3bf8fb72f80aee39b6065 SHA512 46e56834e3b3081811ef16045d98e7eb9574601ff6470b73b4d45bb555e1d7d34f56298ae5239790ee53e78e89dcfa85c9f42137d236cff2d5560f956a9f5778 DIST calamares-3.3.14b-gentoo-patches.patch 70364 BLAKE2B c7549336c7935cf7b4570d05587c0be725dbef2e8a2c6804b42a40b6de96526e8fa23a56df34d3f230f3d95ff17e8b02ae45c1310a8d77122c021ef06c7a8e51 SHA512 3f86db778d4f74c7f0c9258123ce830da200332cac7da41682b5e305f5bad2d2435db6281b2136e3229e839ac39032b765fe0b9e4e7fe534510a1d5f7904b5a2 DIST calamares-3.3.14d-gentoo-patches.patch 85898 BLAKE2B f0fa62ca2c287ef6a4c63a2c5272787fe17379302fd844c40cd641896210205fee9f8a46fc485194f2ffaefb3fa797d0387513a21fd857221aa60438ecb9a711 SHA512 938f6ea6d8d0028365ec487ce9b191e902afe48b0fed9d3ca00fe917051340049d5ac38310c15eab8e09c7b2f69fcd9d499aa5da8ce0b1c50d9e3b31cdff8fb3 +DIST calamares-3.3.14e-gentoo-patches.patch 87989 BLAKE2B 39b10a5b9179b13bf45c1974d9424466aeafda3666647b4c2508b28f8220750120bcc16a4b37b91575e4abb3999d0c54ca738789d824b3dbafef21644338e5c8 SHA512 9290dcb20a41faad764f4ff1a267e758bad4b5641c4724ba1a0c5b0811456b5ae99146dbce856c29b861073190315e94cd5cc47ad8d374ddcdb8ff9625285e58 diff --git a/app-admin/calamares/calamares-3.3.14-r7.ebuild b/app-admin/calamares/calamares-3.3.14-r7.ebuild new file mode 100644 index 000000000000..f33bd365d2d2 --- /dev/null +++ b/app-admin/calamares/calamares-3.3.14-r7.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2026 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}e" + +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.14e.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 + livecd? ( app-portage/gemato ) +" +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 +}
