commit: ec9d28b8a5b335eb7dc52c4939603020a169d225 Author: Stefan Cristian B. <stefan.cristian+git <AT> rogentos <DOT> ro> AuthorDate: Wed Oct 8 15:06:12 2025 +0000 Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org> CommitDate: Thu Oct 9 06:23:13 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec9d28b8
app-admin/calamares: bump 3.3.14-r4 * Added networkmanager and iwd as agreed on gentoo-releng Signed-off-by: Stefan Cristian B. <stefan.cristian+git <AT> rogentos.ro> Part-of: https://github.com/gentoo/gentoo/pull/44096 Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org> app-admin/calamares/Manifest | 1 + app-admin/calamares/calamares-3.3.14-r4.ebuild | 116 +++++++++++++++++++++++++ 2 files changed, 117 insertions(+) diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 37aebae1fe27..e186d28c47a9 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,4 +1,5 @@ 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.14b-gentoo-patches.patch 70364 BLAKE2B c7549336c7935cf7b4570d05587c0be725dbef2e8a2c6804b42a40b6de96526e8fa23a56df34d3f230f3d95ff17e8b02ae45c1310a8d77122c021ef06c7a8e51 SHA512 3f86db778d4f74c7f0c9258123ce830da200332cac7da41682b5e305f5bad2d2435db6281b2136e3229e839ac39032b765fe0b9e4e7fe534510a1d5f7904b5a2 DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6 diff --git a/app-admin/calamares/calamares-3.3.14-r4.ebuild b/app-admin/calamares/calamares-3.3.14-r4.ebuild new file mode 100644 index 000000000000..f5ca055aa6d4 --- /dev/null +++ b/app-admin/calamares/calamares-3.3.14-r4.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}b" + +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.14b.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 +}
