gentoo Easter resync : 12.04.2020

3 files changed, 4 insertions, 101 deletions

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index 0bf2a73a964c..1f99094e5453 100644
--- a/app-admin/calamares/Manifest
+++ b/app-admin/calamares/Manifest
@@ -1,6 +1,4 @@
 AUX calamares-pkexec 43 BLAKE2B 432999808da0fdde0e5d9c88887a5f112ac00c90af51f3d907d02ab4f9eb4fae7348856028bcfff98ced8698d0d039bd9506f50baa90f5b12b43c1b72885f230 SHA512 768148cd58cdfb5c6791b76ec60c21a4ca852120f53ed31a83bc7a2e0a26aa77b10bd3756182d3dff03208e820def4b83c45edba0484fa2f5a33c93880c3f4bb
-DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857 SHA512 00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
-DIST calamares-3.2.17.1.tar.gz 3128350 BLAKE2B a6926faaf1d521647cc0037b88686f9ceee1cc8167b888fe3c25228cbca8058572c8786a51f6ce0ccb77b31351d21ac41fa6c86a6577569c118729e1263ccafa SHA512 fa8f1906aa7774b0f6bd65d1dc87ea2e08df92018c162f7e7fe01fe6119e65d6391141bc242623f88040bb18eb8b71003cb7417b27c10b39bc30de0f0bf8deb0
-EBUILD calamares-3.2.12.ebuild 2386 BLAKE2B 6923c31ce1f118fae3c0ce79fde43d17980f4a6acfb92147c3f61783f4166f3d176d3b4d332dc3d21b56ef5c3a77230210237f24f0ee334428e6a2d4ca59e070 SHA512 b03c45f4ea1d46c210b5ee1fde6d752c0d194591ed2192162d1abf17d953fa5858b9f36d4cc8d1affb555bdc6fed129eb4f78e81747bb75626ed0d9c4c2d7daa
-EBUILD calamares-3.2.17.1-r1.ebuild 2172 BLAKE2B a8d52845342e1ecc6651513eeab07aeb345d682e251cc1376a7e608a78046637d68f821ba0cfb817f3f759d6c2b610182531c3a0a24bd428b6257f934ad8c0d4 SHA512 fc2d315b0ce7071cfaba6002a9329fb0a8024be263436a303bfcb77ead3288ce09b8fb8fe8e665489c5857fc3a9c51f307eb0037acf2de3baca8669bd799afcb
+DIST calamares-3.2.20.tar.gz 3246752 BLAKE2B 11bc23da8f035a0399f54c1f0f9e11806b0e3b77ad9f57c694c15de077ad37d3f282d29d0b4c010f19372e78d14af2cf9c58b95b03d6d867ea6c0c104e701fab SHA512 473422eca83007ce0d82e09d637b73c114fffab338ece8269d37a4496d786eeef5e75b06b60ec51fb85bbd145984d37f0a586edd9c5d58e23abde665b8370c7c
+EBUILD calamares-3.2.20.ebuild 2194 BLAKE2B 3c9bf74a167dff378a09cdf6f882b98e065a23645025a316f9012ad61b7f3560ba9fa557fc9f9462aa3d91995e0a39ec9a2065ea6b7c66d2df50b0b648fa9bcf SHA512 2a35274fbc2a11ad86ef4020422e82f007d65bac58c9e906a0168e5b24307665ca8e695325dfa6767d9f3f75b32ac7599b8a93099ec4bf263261bea8ef8483ab
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.2.12.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild
deleted file mode 100644
index 8ce51a9bf5da..000000000000
--- a/app-admin/calamares/calamares-3.2.12.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-PYTHON_COMPAT=( python3_6 )
-inherit kde5 python-single-r1
-
-DESCRIPTION="Distribution-independent installer framework"
-HOMEPAGE="https://calamares.io"
-if [[ ${KDE_BUILD_TYPE} == live ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64"
-fi
-
-LICENSE="GPL-3"
-IUSE="+networkmanager pythonqt +upower"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-BDEPEND="
-	$(add_qt_dep linguist-tools)
-"
-COMMON_DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-cpp/yaml-cpp:=
-	$(python_gen_cond_dep '
-		>=dev-libs/boost-1.55:=[python,${PYTHON_MULTI_USEDEP}]
-		dev-libs/libpwquality[${PYTHON_MULTI_USEDEP}]
-	')
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt[qt5(+)]
-	>=sys-libs/kpmcore-4.0.0:5=
-	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_SINGLE_USEDEP}] )
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_qt_dep qttest) )
-"
-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() {
-	cmake-utils_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=(
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
-		-DWITH_PYTHONQT=$(usex pythonqt)
-	)
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/calamares/calamares-3.2.17.1-r1.ebuild b/app-admin/calamares/calamares-3.2.20.ebuild
index de32e110d2e0..8ad695ecfb23 100644
--- a/app-admin/calamares/calamares-3.2.17.1-r1.ebuild
+++ b/app-admin/calamares/calamares-3.2.20.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 ECM_TEST="true"
-PYTHON_COMPAT=( python3_6 )
+PYTHON_COMPAT=( python3_7 )
 inherit ecm python-single-r1
 
 DESCRIPTION="Distribution-independent installer framework"
@@ -78,6 +78,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DINSTALL_CONFIG=ON
 		-DWEBVIEW_FORCE_WEBKIT=OFF
 		-DCMAKE_DISABLE_FIND_PACKAGE_LIBPARTED=ON
 		-DWITH_PYTHONQT=$(usex pythonqt)