gentoo resync : 18.08.2019

3 files changed, 23 insertions, 95 deletions

diff --git a/app-admin/calamares/Manifest b/app-admin/calamares/Manifest
index cb9ca5c6ae34..f124f7f4390c 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.1.13.tar.gz 2279516 BLAKE2B ff2c81e81086d53c205c25dbdb7e8b1b60f5f10c979e9afd85c02426cd38037c6fbbf76e21fa5fb152ea9bf1c47658563ba5b2fb7e84b4e2734d6269584315df SHA512 451e04fe41448976e612b2a682cf38ed2683b490bb195ba82ad97d47dfd3eb808f8c25251be00104e3f3b4086ab37be462034bbd2866e64536e90f7ebcfb0d7a
-DIST calamares-3.2.2.tar.gz 2579462 BLAKE2B f477493451e084a287f43abfdd66d4a77ce839cad61f921801462bef73df74d42e616d63682d09d59309d6f98ffe560e6c8f9176c9fb290701dfb4e5aa263b29 SHA512 f060534941e0191defa65f024ec8dbbd275d16d40e491015997f12d3eb404a3117d1f113d4dcef3421ed0d15c1e24bdd8b31fc4554d313ebbd3959058c202e63
-EBUILD calamares-3.1.13.ebuild 1976 BLAKE2B ae7f3e5dad7c55e1cf9a1e558245614c48021d43a354d7cfbde9d7555eefdb66d617d4643f373315961c9451dcc6bfa4c04ac5e042300d6fe54827ab4616ce7d SHA512 34f996df1e4f2f7479eecca39cfbf3ee784f7e681bc8aaa6da904bb70d36eac088ec739eec6ba96570803d4f7d5d5587a556680fa964aadda6eaa776de02e480
-EBUILD calamares-3.2.2.ebuild 2188 BLAKE2B faf22c0f1f77779345778b693eea01edb5dfb28a3466b3393dda099e97c4e076924225c98bfa77a055cfeba312395f08b35eb21808161bf828c5bf658d378956 SHA512 9465e1540456e74042313b88a314757d7e6a0496ff6012818e601be11ad2f0c149c48870278c5ef8c06ac5218584e38798156061089189b20dfd1177becc1289
+DIST calamares-3.2.12.tar.gz 3008153 BLAKE2B 32b8a141346da528c2aef40a8fe480445cc8acbccc1190ca5ad1b5b0d03b59c709abd663e5ed33503955e3c0caa71476e7d737d46422992fc22e3acd96260857 SHA512 00dec40eb9c9e95933d3785a7b2ddc606530d8b94fde233d91071afbe11067d4e5b0a81298e66aaa0c65b55b6a86359466d8789f3ed886e76c2102b850f2bbc0
+EBUILD calamares-3.2.12.ebuild 2347 BLAKE2B 2408aa4e84a1e0b6b4d4b5b7ac97d9f59207094e89f1af14455df64c7c5c494519232f7f1d64d9ec4b4e62eb1bf26e7e4d8f44d570fa23bddc3aed5d89b5c55c SHA512 5d29dda4d3d44ec644695f986feb5bc39691ffcc64063c3bac9af4953cffb6e3547be688777d37ea62681b7da6c41242cc88659ca98375048f1c4c2defbbc461
 MISC metadata.xml 1055 BLAKE2B a6c7974103baa5a646cb1d594e3f224903df9ce5c618ad4ed46c0b3d4df5d3437be570eda0d55e3b0ca8f6df4af9627b088ace2a3f0efc802528aeb49fc7bce6 SHA512 0269dad0b0a05e7c729ad5b9f1f7d6790c117b0d76b904dc909b868b1c298ff3352faafe91104b39cfc3c2e4f5e1a20244d3f5321c937d2334bd15bd910dc89f
diff --git a/app-admin/calamares/calamares-3.1.13.ebuild b/app-admin/calamares/calamares-3.1.13.ebuild
deleted file mode 100644
index 9294153d0cc5..000000000000
--- a/app-admin/calamares/calamares-3.1.13.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_5,3_6} )
-inherit kde5 python-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}"
-
-DEPEND="${PYTHON_DEPS}
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(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)
-	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-auth/polkit-qt[qt5(+)]
-	>=sys-libs/kpmcore-3.0.3:5=
-	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
-"
-
-RDEPEND="${DEPEND}
-	app-admin/sudo
-	dev-libs/libatasmart
-	net-misc/rsync
-	>=sys-block/parted-3.0
-	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
-	sys-boot/os-prober
-	sys-fs/squashfs-tools
-	virtual/udev
-	networkmanager? ( net-misc/networkmanager )
-	upower? ( sys-power/upower )
-"
-
-src_prepare() {
-	cmake-utils_src_prepare
-	python_setup
-	export PYTHON_INCLUDE_DIRS="$(python_get_includedir)" \
-	       PYTHON_INCLUDE_PATH="$(python_get_library_path)"\
-	       PYTHON_CFLAGS="$(python_get_CFLAGS)"\
-	       PYTHON_LIBS="$(python_get_LIBS)"
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DWEBVIEW_FORCE_WEBKIT=OFF
-		-DWITH_PYTHONQT=$(usex pythonqt)
-	)
-
-	kde5_src_configure
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
-}
-
-src_install() {
-	kde5_src_install
-	dobin "${FILESDIR}"/calamares-pkexec
-}
diff --git a/app-admin/calamares/calamares-3.2.2.ebuild b/app-admin/calamares/calamares-3.2.12.ebuild
index 39df940004c3..2b847131cb13 100644
--- a/app-admin/calamares/calamares-3.2.2.ebuild
+++ b/app-admin/calamares/calamares-3.2.12.ebuild
@@ -1,9 +1,10 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python{3_5,3_6} )
+KDE_TEST="true"
+PYTHON_COMPAT=( python3_{5,6} )
 inherit kde5 python-r1
 
 DESCRIPTION="Distribution-independent installer framework"
@@ -20,14 +21,17 @@ IUSE="+networkmanager pythonqt +upower"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-DEPEND="${PYTHON_DEPS}
+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 linguist-tools)
+	$(add_qt_dep qtconcurrent)
 	$(add_qt_dep qtdbus)
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
@@ -37,20 +41,21 @@ DEPEND="${PYTHON_DEPS}
 	$(add_qt_dep qtwidgets)
 	$(add_qt_dep qtxml)
 	dev-cpp/yaml-cpp:=
-	>=dev-libs/boost-1.55:=[${PYTHON_USEDEP}]
+	>=dev-libs/boost-1.55:=[python,${PYTHON_USEDEP}]
 	dev-libs/libpwquality[${PYTHON_USEDEP}]
 	sys-apps/dbus
 	sys-apps/dmidecode
 	sys-auth/polkit-qt[qt5(+)]
-	>=sys-libs/kpmcore-3.0.3:5=
+	>=sys-libs/kpmcore-4.0.0:5=
 	pythonqt? ( >=dev-python/PythonQt-3.1:=[${PYTHON_USEDEP}] )
 "
-
-RDEPEND="${DEPEND}
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_qt_dep qttest) )
+"
+RDEPEND="${COMMON_DEPEND}
 	app-admin/sudo
 	dev-libs/libatasmart
 	net-misc/rsync
-	>=sys-block/parted-3.0
 	|| ( sys-boot/grub:2 sys-boot/systemd-boot )
 	sys-boot/os-prober
 	sys-fs/squashfs-tools
@@ -67,17 +72,21 @@ src_prepare() {
 	       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
-	sed -i -e 's:pkexec /usr/bin/calamares:calamares-pkexec:' "${S}"/calamares.desktop
-	sed -i -e 's:Icon=calamares:Icon=drive-harddisk:' "${S}"/calamares.desktop
 }
 
 src_install() {