From 8e49340ce0aaf205556648d8fa27dd30e8cf4435 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 8 Sep 2024 12:29:28 +0100 Subject: gentoo auto-resync : 08:09:2024 - 12:29:27 --- app-admin/calamares/Manifest | 2 +- app-admin/calamares/calamares-3.3.6-r1.ebuild | 155 -------------------------- app-admin/calamares/calamares-3.3.6-r2.ebuild | 115 +++++++++++++++++++ 3 files changed, 116 insertions(+), 156 deletions(-) delete mode 100644 app-admin/calamares/calamares-3.3.6-r1.ebuild create mode 100644 app-admin/calamares/calamares-3.3.6-r2.ebuild (limited to 'app-admin/calamares') diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 17403847123a..79b949eb1a1d 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,4 +1,4 @@ AUX calamares-gentoo-branding.desc 10382 BLAKE2B 1a8f68c54d1e7d4392f4545b4d5cb3bebfb16c2d15320be3b0b63382ed255ebf79ac6286f6111b8b357603abde5b58f12da9ad2713bbfdf7445f7a135ba37637 SHA512 b2136662e2d580679dd13c4e642364329231c5636421911a0012f6763fe602959b54616323bb81f857b78fa12187f0331fb290611c720a45ec3c122b4e6e65f8 DIST calamares-3.3.6.tar.gz 4733000 BLAKE2B 6c5bae1c7939d84fdbf599e7c5b478c799efbdf21f1aa120fda05106775477274eafd5687a787c177b747226c8438aec72acc90414bff9c7952d71ce8cb5e376 SHA512 3fa38f136a7a8c1f7dc2be8f98d2f323e38ab3bb535ffaf833d26839c3a2fe1d1dab392cd103380098328fc7465f262cde7ae09efa996c7fb66233d8391ae4f6 -EBUILD calamares-3.3.6-r1.ebuild 4107 BLAKE2B fec52736168a9530e1928d057fac111003f87ac4c985266c9d8ffda42e2480db91c9d98be72c08b30634dd3b67fdb75a9177a22a840eed93ec88c5b6b15a706e SHA512 dbfce01620be1c0b7a6bd4a6943cf69ad1f38b044bccad5c11897ef95c5a0fc8c7bc62b869670b718998ae659a804f2f95edb851919b58572ebb4e7410193678 +EBUILD calamares-3.3.6-r2.ebuild 2983 BLAKE2B e4d9ea9d806879c895cf1e0e418feae9458dc19d65ac9187efafd29267b31da86ec12b1e2aa0b67f960742528c7c27d5bd2d7ae5bccbbafae85ace3b24c59554 SHA512 ae386faa344907006672393aa7355fc6aeaed4e8a234cf65444fda66235f41227be751bdb8435ff2dd9acf3850ed87084ce5b494a39ceac2a911fea49f5705c4 MISC metadata.xml 781 BLAKE2B 56d64535b539de398557b26f7705e6aa222d7073a0c31a38069d45deec697e488891c95850324a7610ee1faf8f4ce2e04d0d0a9fd29300afa5e5bf42804e6942 SHA512 156cd07700dfab61f78bbdd4c626a098ce111428cebbbc6ab541f60f12e347f62236ad21d2fd8031babfc0be87ad4b246ad2afb3e453005588f87bc500c78c72 diff --git a/app-admin/calamares/calamares-3.3.6-r1.ebuild b/app-admin/calamares/calamares-3.3.6-r1.ebuild deleted file mode 100644 index 2036bb2bfb26..000000000000 --- a/app-admin/calamares/calamares-3.3.6-r1.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# 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] - >=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 - >=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 -} 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..633a53a5ce26 --- /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="0" +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 +} -- cgit v1.2.3