commit: 2504c85538260a890489ebf37565e4727dfb9baa
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 16 12:44:54 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Oct 16 12:48:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2504c855
app-admin/calamares: drop 3.2.32.1-r1
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
app-admin/calamares/Manifest | 1 -
app-admin/calamares/calamares-3.2.32.1-r1.ebuild | 96 ----------------------
.../calamares-3.2.32.1-remove-broken-tests.patch | 83 -------------------
3 files changed, 180 deletions(-)
diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 78f41b19dd7b..9301d4735645 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,2 +1 @@
-DIST calamares-3.2.32.1.tar.gz 3425260 BLAKE2B
e10174d400a402cfe3d7a015f4fe7a02ad1653e5a4cdf65c31360467e3b3ff10629d991dd206424d51c67533f8ab550e09e74b4334dbebe9e5fec1a06ed0dbd4
SHA512
30e523dd3c340f9c4385a53a4011ed0f16e317572fa2e5b6acfe638aaf029538f0ab85924999e9683ba10014be99b3c35ff3234bc85cefa2ccd14e2715c87222
DIST calamares-3.2.60.tar.gz 4260547 BLAKE2B
edf300ce9d534cd506b2341b3ce314bbde7fcc6dac40ad2307e549bbeab7a63ddfe6d7ae8c8176ee1ad4e4b02c9eadcd5efc66872e1f464c39200d8d117dca80
SHA512
dfc01212f74694f10d40dd1d1ad61db384c83021dc9cd4753027a9cf40b92c8e8b2d5032df76533a8f22c05448aba546c9bb21c38c03fb0cb8d7de35fb79fb7f
diff --git a/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
b/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
deleted file mode 100644
index bbb5ce9445ab..000000000000
--- a/app-admin/calamares/calamares-3.2.32.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PYTHON_COMPAT=( python3_{8..10} )
-
-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-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.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_install() {
- ecm_src_install
- dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git
a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
b/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
deleted file mode 100644
index 346e1bfb4028..000000000000
--- a/app-admin/calamares/files/calamares-3.2.32.1-remove-broken-tests.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- 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
