diff options
author | V3n3RiX <venerix@koprulu.sector> | 2024-05-29 00:07:15 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2024-05-29 00:07:15 +0100 |
commit | 5c4786a868bad6e3f46aecf32ad6c6dc5de98408 (patch) | |
tree | 1a1792815761a5b6f645c8d55b6b698e102dca48 /app-admin/calamares | |
parent | 3c1648a0749c1d66b300d857e6b417c1162890da (diff) |
gentoo auto-resync : 29:05:2024 - 00:07:15
Diffstat (limited to 'app-admin/calamares')
-rw-r--r-- | app-admin/calamares/Manifest | 4 | ||||
-rw-r--r-- | app-admin/calamares/calamares-3.3.5.ebuild | 167 | ||||
-rw-r--r-- | app-admin/calamares/calamares-3.3.6-r1.ebuild (renamed from app-admin/calamares/calamares-3.3.6.ebuild) | 2 |
3 files changed, 1 insertions, 172 deletions
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 5125fb928e76..9957af9b7955 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -2,9 +2,7 @@ AUX calamares-3.2.60-ldflags.patch 661 BLAKE2B ebeea9a8dbb067ebf3f862d425342338e AUX calamares-gentoo-branding.desc 10382 BLAKE2B 1a8f68c54d1e7d4392f4545b4d5cb3bebfb16c2d15320be3b0b63382ed255ebf79ac6286f6111b8b357603abde5b58f12da9ad2713bbfdf7445f7a135ba37637 SHA512 b2136662e2d580679dd13c4e642364329231c5636421911a0012f6763fe602959b54616323bb81f857b78fa12187f0331fb290611c720a45ec3c122b4e6e65f8 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb 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 EBUILD calamares-3.2.60-r5.ebuild 2824 BLAKE2B a4931b7a2e77a3f9fb286374469f463d90a6687617836153a3a4150823528300c79ec90a26b794d1fbd45d5de9f880957da9d27c231d41b05ac9faed5c1fc223 SHA512 d2a5e6f0d8b2b4a97d1cc305db65b73dd1a1a527b6e17228386f27d41381f864b899af6e2a20a5444641031babb4d0b76342ceaac6923d46e304e77be118d2f4 -EBUILD calamares-3.3.5.ebuild 4419 BLAKE2B d2ce67ac7db2e1aa6766060015c63872245976cee3f5ab4e740f1aca1f918f1bf310cdbdf92937e2bc1ac6f9a2c62a8d0c6ca4613bba1775c7b2a531d6974c9d SHA512 c9ab1c71656dd0f22eeb879e4026107ffb78b74ed275c3da0f8479ed096be99edde48acc441183a3f6a4b736c36b7a4f8520fec463de8f2d8f1b7370c65d8a40 -EBUILD calamares-3.3.6.ebuild 4176 BLAKE2B fbfdb43f6405b3d146678b7a89d5215e02bb9fdc18f0177fa355304d280250caed28fffc7af4325d32c36f56e724e99c66ab30b67d2bc9d5e6fc2c099d1b44d3 SHA512 b41c675427d9254155090a8064dbe89dea088b167a5be4a9cc275bbc4b6241799920f1db092b80b04cd32e101042b3a1e7f38ed847b5984b4540e7da25c0e1bb +EBUILD calamares-3.3.6-r1.ebuild 4107 BLAKE2B fec52736168a9530e1928d057fac111003f87ac4c985266c9d8ffda42e2480db91c9d98be72c08b30634dd3b67fdb75a9177a22a840eed93ec88c5b6b15a706e SHA512 dbfce01620be1c0b7a6bd4a6943cf69ad1f38b044bccad5c11897ef95c5a0fc8c7bc62b869670b718998ae659a804f2f95edb851919b58572ebb4e7410193678 MISC metadata.xml 781 BLAKE2B 56d64535b539de398557b26f7705e6aa222d7073a0c31a38069d45deec697e488891c95850324a7610ee1faf8f4ce2e04d0d0a9fd29300afa5e5bf42804e6942 SHA512 156cd07700dfab61f78bbdd4c626a098ce111428cebbbc6ab541f60f12e347f62236ad21d2fd8031babfc0be87ad4b246ad2afb3e453005588f87bc500c78c72 diff --git a/app-admin/calamares/calamares-3.3.5.ebuild b/app-admin/calamares/calamares-3.3.5.ebuild deleted file mode 100644 index 18227c7ccfcf..000000000000 --- a/app-admin/calamares/calamares-3.3.5.ebuild +++ /dev/null @@ -1,167 +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..11} ) - -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)" - - sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' \ - calamares.desktop || die - sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' \ - calamares.desktop || die - - 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 -} - -src_install() { - ecm_src_install - dobin "${FILESDIR}"/calamares-pkexec -} diff --git a/app-admin/calamares/calamares-3.3.6.ebuild b/app-admin/calamares/calamares-3.3.6-r1.ebuild index add03ed16ed6..2036bb2bfb26 100644 --- a/app-admin/calamares/calamares-3.3.6.ebuild +++ b/app-admin/calamares/calamares-3.3.6-r1.ebuild @@ -44,7 +44,6 @@ COMMON_DEPEND="${PYTHON_DEPS} >=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 @@ -66,7 +65,6 @@ COMMON_DEPEND="${PYTHON_DEPS} >=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 |