From f61d8811e916303cabe9fafdefbe188ba9b500d5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 5 Mar 2024 13:06:03 +0000 Subject: gentoo auto-resync : 05:03:2024 - 13:06:02 --- app-admin/Manifest.gz | Bin 32046 -> 32038 bytes app-admin/calamares/Manifest | 2 +- app-admin/calamares/calamares-3.2.60-r4.ebuild | 123 ------------------------- app-admin/calamares/calamares-3.2.60-r5.ebuild | 123 +++++++++++++++++++++++++ 4 files changed, 124 insertions(+), 124 deletions(-) delete mode 100644 app-admin/calamares/calamares-3.2.60-r4.ebuild create mode 100644 app-admin/calamares/calamares-3.2.60-r5.ebuild (limited to 'app-admin') diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz index d2e6f4f79a8d..4ccb93da373d 100644 Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 4eb64fe628ba..171c8b06c52e 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,5 +1,5 @@ AUX calamares-3.2.60-ldflags.patch 661 BLAKE2B ebeea9a8dbb067ebf3f862d425342338e4830bf75771c240aea22eb19cf44f5c64ca3560198dd4a43c0ab8b13dab98c5118921c7096ae24ab1f7c4b03467bab6 SHA512 9b12576d687b518e4652cd1c2f67248ed11fed3ed443ae8d1ba0b7ee4e8d312dca423a6ea87c3e5cd25ad079d732f45a059e735d2df24a71f93f4f04cba3dbc1 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80 SHA512 dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f -EBUILD calamares-3.2.60-r4.ebuild 2816 BLAKE2B 8d857950fff554a9f18e398a7d9b8f946455895db8e69aaafee2b5ad71bf40f2bedc8d144ac12ba732cae0e60864dcc685ee5551c10efdfece324e3ffe5b3245 SHA512 f1793f3d88fc884cb8c99f97745c9c4532ffb958199f97075dac6e1dd129fee07a8789949a88bd5e7727f05c507f36082926302c1ca04bc4f708d62adb90560d +EBUILD calamares-3.2.60-r5.ebuild 2824 BLAKE2B a4931b7a2e77a3f9fb286374469f463d90a6687617836153a3a4150823528300c79ec90a26b794d1fbd45d5de9f880957da9d27c231d41b05ac9faed5c1fc223 SHA512 d2a5e6f0d8b2b4a97d1cc305db65b73dd1a1a527b6e17228386f27d41381f864b899af6e2a20a5444641031babb4d0b76342ceaac6923d46e304e77be118d2f4 MISC metadata.xml 781 BLAKE2B 56d64535b539de398557b26f7705e6aa222d7073a0c31a38069d45deec697e488891c95850324a7610ee1faf8f4ce2e04d0d0a9fd29300afa5e5bf42804e6942 SHA512 156cd07700dfab61f78bbdd4c626a098ce111428cebbbc6ab541f60f12e347f62236ad21d2fd8031babfc0be87ad4b246ad2afb3e453005588f87bc500c78c72 diff --git a/app-admin/calamares/calamares-3.2.60-r4.ebuild b/app-admin/calamares/calamares-3.2.60-r4.ebuild deleted file mode 100644 index 370b7cfa23d3..000000000000 --- a/app-admin/calamares/calamares-3.2.60-r4.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="true" -PYTHON_COMPAT=( python3_{9..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 +upower" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -BDEPEND=" - dev-qt/linguist-tools:5 -" -COMMON_DEPEND="${PYTHON_DEPS} - dev-cpp/yaml-cpp:= - $(python_gen_cond_dep ' - dev-libs/boost:=[python,${PYTHON_USEDEP}] - dev-libs/libpwquality[${PYTHON_USEDEP}] - ') - dev-qt/qtconcurrent:5 - dev-qt/qtdbus:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtsvg:5 - dev-qt/qtwebengine:5[widgets] - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - kde-frameworks/kconfig:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kcrash:5 - kde-frameworks/kpackage:5 - kde-frameworks/kparts:5 - kde-frameworks/kservice:5 - sys-apps/dbus - sys-apps/dmidecode - sys-auth/polkit-qt - >=sys-libs/kpmcore-4.0.0:5= - virtual/libcrypt:= -" -DEPEND="${COMMON_DEPEND} - test? ( dev-qt/qttest:5 ) -" -RDEPEND="${COMMON_DEPEND} - app-admin/sudo - dev-libs/libatasmart - net-misc/rsync - || ( - sys-boot/grub:2 - sys-apps/systemd[gnuefi(-)] - 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 ) -" - -PATCHES=( - "${FILESDIR}/${P}-ldflags.patch" -) - -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 -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_CONFIG=ON - -DWEBVIEW_FORCE_WEBKIT=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON - -DWITH_PYTHONQT=OFF - ) - - 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 - -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)" - ) - - cmake_src_test -} - -src_install() { - ecm_src_install - dobin "${FILESDIR}"/calamares-pkexec -} diff --git a/app-admin/calamares/calamares-3.2.60-r5.ebuild b/app-admin/calamares/calamares-3.2.60-r5.ebuild new file mode 100644 index 000000000000..592c5af31d92 --- /dev/null +++ b/app-admin/calamares/calamares-3.2.60-r5.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="true" +PYTHON_COMPAT=( python3_{9..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 +upower" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +BDEPEND=" + dev-qt/linguist-tools:5 +" +COMMON_DEPEND="${PYTHON_DEPS} + dev-cpp/yaml-cpp:= + $(python_gen_cond_dep ' + dev-libs/boost:=[python,${PYTHON_USEDEP}] + dev-libs/libpwquality[${PYTHON_USEDEP}] + ') + dev-qt/qtconcurrent:5 + dev-qt/qtdbus:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + kde-frameworks/kconfig:5 + kde-frameworks/kcoreaddons:5 + kde-frameworks/kcrash:5 + kde-frameworks/kpackage:5 + kde-frameworks/kparts:5 + kde-frameworks/kservice:5 + sys-apps/dbus + sys-apps/dmidecode + sys-auth/polkit-qt[qt5(+)] + >=sys-libs/kpmcore-4.0.0:5= + virtual/libcrypt:= +" +DEPEND="${COMMON_DEPEND} + test? ( dev-qt/qttest:5 ) +" +RDEPEND="${COMMON_DEPEND} + app-admin/sudo + dev-libs/libatasmart + net-misc/rsync + || ( + sys-boot/grub:2 + sys-apps/systemd[gnuefi(-)] + 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 ) +" + +PATCHES=( + "${FILESDIR}/${P}-ldflags.patch" +) + +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 +} + +src_configure() { + local mycmakeargs=( + -DINSTALL_CONFIG=ON + -DWEBVIEW_FORCE_WEBKIT=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON + -DWITH_PYTHONQT=OFF + ) + + 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 + -E "(load-dracut|libcalamaresnetworktest|libcalamaresutilstest|test_libcalamaresuipaste|validate-netinstall|validate-services-systemd|localetest|machineidtest|packagechoosertest)" + ) + + cmake_src_test +} + +src_install() { + ecm_src_install + dobin "${FILESDIR}"/calamares-pkexec +} -- cgit v1.2.3