From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- app-admin/calamares/Manifest | 7 +- app-admin/calamares/calamares-3.2.28.3.ebuild | 93 --------------------- app-admin/calamares/calamares-3.2.32.1.ebuild | 95 ++++++++++++++++++++++ .../calamares-3.2.32.1-remove-broken-tests.ebuild | 83 +++++++++++++++++++ app-admin/calamares/metadata.xml | 3 - 5 files changed, 182 insertions(+), 99 deletions(-) delete mode 100644 app-admin/calamares/calamares-3.2.28.3.ebuild create mode 100644 app-admin/calamares/calamares-3.2.32.1.ebuild create mode 100644 app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild (limited to 'app-admin/calamares') diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 11c75e2f2bca..a3197446a31d 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1,4 +1,5 @@ AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb -DIST calamares-3.2.28.3.tar.gz 3837417 BLAKE2B d248423e09aa21cd3808e00408f34d7c178a19d2c82bed5ab0dedff945ab7aad601f4aefbee62a772e4fdf5915dc3888af1fb0711e4bbe1e9b089adfbae2b1a0 SHA512 124de0bdd09fe15450460fa858c6f3df3a00c609684238bf3bc8eb18f10c39c4bc0e8fd02b0e9bae50d42bade2716cb16247c23ace397288a5e8f27790b60280 -EBUILD calamares-3.2.28.3.ebuild 2194 BLAKE2B 3c9bf74a167dff378a09cdf6f882b98e065a23645025a316f9012ad61b7f3560ba9fa557fc9f9462aa3d91995e0a39ec9a2065ea6b7c66d2df50b0b648fa9bcf SHA512 2a35274fbc2a11ad86ef4020422e82f007d65bac58c9e906a0168e5b24307665ca8e695325dfa6767d9f3f75b32ac7599b8a93099ec4bf263261bea8ef8483ab -MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f +DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222 +EBUILD calamares-3.2.32.1.ebuild 2181 BLAKE2B 51657120350b031f39b10fee5f84c92586a198dc6d576e9043334b8c6b31febf7f72219566c22f639222071156e419628a73c2d21616322589ed8cc1ed0f7e66 SHA512 4be64c8b57a0f690a121628e3fd1c2586aedda193cfcf6d1fd8b5cb2b0f1928b987eb12bd4c4f56f7092c4ddafc5cbd24ac4196110070217aa6de8a3ec4a8ca2 +EBUILD files/calamares-3.2.32.1-remove-broken-tests.ebuild 1682 BLAKE2B 1d41c22b99797d41066e55b21bd5b9957411c210be3d1a8c01470694211387aa7e8b931d5499143d7d2747657625ac1c3db17d67bac9f741aada25fde93f517a SHA512 1c4a5a2d8b6c96299f45d3ef7581dfdca81c0854c9c746e6636a07101fb4e0d05809a4d64d826180599969c6fe398175dc7f5322ab52ff6c61dac4925919f275 +MISC metadata.xml 970 BLAKE2B fc958c25bf44e37c32da53c4fe0bfabc0e2ba8ef6213f8c3b3d95a685c8f7bfb6806ab06719ea5b39f94800c03f9f3ef211408ad57f58f60d0d09e5fbb823c12 SHA512 b5ca20e1baddb3f7cb4f704d9becbb7163cdc90be23145367d0787cfa1f55a54f5740e4bb57231dbd4ced0a23406341a89e00cf03cee21808c5c26a1ead35712 diff --git a/app-admin/calamares/calamares-3.2.28.3.ebuild b/app-admin/calamares/calamares-3.2.28.3.ebuild deleted file mode 100644 index 8ad695ecfb23..000000000000 --- a/app-admin/calamares/calamares-3.2.28.3.ebuild +++ /dev/null @@ -1,93 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_TEST="true" -PYTHON_COMPAT=( python3_7 ) -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" -KEYWORDS="~amd64" -SLOT=5 -LICENSE="GPL-3" -IUSE="+networkmanager pythonqt +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-1.55:=[python,${PYTHON_MULTI_USEDEP}] - dev-libs/libpwquality[${PYTHON_MULTI_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= - pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] ) -" -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-boot/systemd-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 -} - -src_configure() { - local mycmakeargs=( - -DINSTALL_CONFIG=ON - -DWEBVIEW_FORCE_WEBKIT=OFF - -DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON - -DWITH_PYTHONQT=$(usex pythonqt) - ) - - ecm_src_configure -} - -src_install() { - ecm_src_install - dobin "${FILESDIR}"/calamares-pkexec -} diff --git a/app-admin/calamares/calamares-3.2.32.1.ebuild b/app-admin/calamares/calamares-3.2.32.1.ebuild new file mode 100644 index 000000000000..0c4287a8e8fd --- /dev/null +++ b/app-admin/calamares/calamares-3.2.32.1.ebuild @@ -0,0 +1,95 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +PYTHON_COMPAT=( python3_{6..9} ) + +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-1.55:=[python,${PYTHON_MULTI_USEDEP}] + dev-libs/libpwquality[${PYTHON_MULTI_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= +" +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-boot/systemd-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}"/${PN}-3.2.32.1-remove-broken-tests.ebuild ) + +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_install() { + ecm_src_install + dobin "${FILESDIR}"/calamares-pkexec +} diff --git a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild new file mode 100644 index 000000000000..346e1bfb4028 --- /dev/null +++ b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild @@ -0,0 +1,83 @@ +--- a/src/libcalamares/CMakeLists.txt ++++ b/src/libcalamares/CMakeLists.txt +@@ -216,12 +216,6 @@ + ) + + calamares_add_test( +- libcalamaresnetworktest +- SOURCES +- network/Tests.cpp +-) +- +-calamares_add_test( + libcalamarespartitiontest + SOURCES + partition/Tests.cpp +@@ -238,12 +232,6 @@ + endif() + + calamares_add_test( +- libcalamaresutilstest +- SOURCES +- utils/Tests.cpp +-) +- +-calamares_add_test( + libcalamaresutilspathstest + SOURCES + utils/TestPaths.cpp +--- a/src/modules/locale/CMakeLists.txt ++++ b/src/modules/locale/CMakeLists.txt +@@ -37,18 +37,3 @@ + yamlcpp + SHARED_LIB + ) +- +-calamares_add_test( +- localetest +- SOURCES +- Tests.cpp +- Config.cpp +- LocaleConfiguration.cpp +- SetTimezoneJob.cpp +- timezonewidget/TimeZoneImage.cpp +- DEFINITIONS +- SOURCE_DIR="${CMAKE_CURRENT_LIST_DIR}/images" +- DEBUG_TIMEZONES=1 +- LIBRARIES +- Qt5::Gui +-) +--- a/src/modules/packagechooser/CMakeLists.txt ++++ b/src/modules/packagechooser/CMakeLists.txt +@@ -58,13 +58,3 @@ + ${_extra_libraries} + SHARED_LIB + ) +- +-calamares_add_test( +- packagechoosertest +- GUI +- SOURCES +- Tests.cpp +- LIBRARIES +- calamares_viewmodule_packagechooser +- ${_extra_libraries} +-) +--- a/src/modules/users/CMakeLists.txt ++++ b/src/modules/users/CMakeLists.txt +@@ -70,15 +70,6 @@ + ) + + calamares_add_test( +- usershostnametest +- SOURCES +- TestSetHostNameJob.cpp +- SetHostNameJob.cpp +- LIBRARIES +- Qt5::DBus # HostName job can use DBus to systemd +-) +- +-calamares_add_test( + userstest + SOURCES + Tests.cpp diff --git a/app-admin/calamares/metadata.xml b/app-admin/calamares/metadata.xml index bc9aeb32994b..8c2f79648746 100644 --- a/app-admin/calamares/metadata.xml +++ b/app-admin/calamares/metadata.xml @@ -21,7 +21,4 @@ calamares/calamares - - Enable PythonQt-based module interface - -- cgit v1.2.3