commit: 2a0cbc53e96583cc6572ea7a7846b750960df4ff Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Wed Oct 21 11:53:48 2020 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Wed Oct 21 11:53:48 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a0cbc53
app-admin/calamares: Version bump to 3.2.32.1 Bug: https://bugs.gentoo.org/744316 Closes: https://bugs.gentoo.org/749984 Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: David Seifert <soap <AT> gentoo.org> app-admin/calamares/Manifest | 1 + app-admin/calamares/calamares-3.2.32.1.ebuild | 95 ++++++++++++++++++++++ .../calamares-3.2.32.1-remove-broken-tests.ebuild | 70 ++++++++++++++++ 3 files changed, 166 insertions(+) diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest index 98c99a4cf27..9901780ae48 100644 --- a/app-admin/calamares/Manifest +++ b/app-admin/calamares/Manifest @@ -1 +1,2 @@ DIST calamares-3.2.28.3.tar.gz 3837417 BLAKE2B d248423e09aa21cd3808e00408f34d7c178a19d2c82bed5ab0dedff945ab7aad601f4aefbee62a772e4fdf5915dc3888af1fb0711e4bbe1e9b089adfbae2b1a0 SHA512 124de0bdd09fe15450460fa858c6f3df3a00c609684238bf3bc8eb18f10c39c4bc0e8fd02b0e9bae50d42bade2716cb16247c23ace397288a5e8f27790b60280 +DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4 SHA512 30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222 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 00000000000..0c4287a8e8f --- /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 00000000000..6ecf6c36a99 --- /dev/null +++ b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.ebuild @@ -0,0 +1,70 @@ +--- a/src/libcalamares/CMakeLists.txt ++++ b/src/libcalamares/CMakeLists.txt +@@ -238,12 +238,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
