gentoo resync : 02.06.2019

6 files changed, 124 insertions, 2 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 8a54a11c39f3..e325598719f6 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index e76fb8f55507..e0c808aac4bc 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -2,5 +2,7 @@ AUX tellico-3.1.4-empty-permissions-set.patch 906 BLAKE2B e46830a15f0f1fa05b1d94
 AUX tellico-3.1.4-icu-64.patch 2136 BLAKE2B 667903d58771f3a0b2c4b83aaa864e3ce072dec1e3106c83f835b560c3cf653342b158693ce658adc7ed56cc12515e348922eaabd7e39d353a15908a85a34401 SHA512 468873c3dd692ca85b7bdc7ecdbe755e125d669686374b998593ce5c99bf7be3e3da15656925db9f294175a1fa0811b3de26c075ebc1dc49174960acf89bd06e
 AUX tellico-3.1.4-xmloutputclosecallback-signature.patch 918 BLAKE2B 2150dd13332ea01a5524951085dfe4a7032a4cf26776af5818f4caa7764584027112b3f793e3a839ade84979aa75c1e2e7034d5baaff250b9d32c64832d2e930 SHA512 6ceda2d2a10b480539677654a2b21132c17e88a4395016fdb703c09f9ee066a93c834bc9b229730970dd35dca4a110f4c2fea19775062d404f76515fc0fbc0f0
 DIST tellico-3.1.4.tar.xz 4632792 BLAKE2B 29db598ef558fe04618843cad6a58055b5de392f34aeea4860683f04ef4ab20856fd4a01523dc13c2d68023c266de69590e843ea56f912989d57c01e0d701ee2 SHA512 d09183bee13ae9f7c6c5114b76eeeb959a184def559ae239bb880ef9be964e33878530e9c4c0d3baa6f872bf8db155dffb94592e3a857623ab131d2f28f1f139
+DIST tellico-3.2.tar.xz 5596028 BLAKE2B e22cd7b5f1bfb5221379b0e6c12c894314c3f04348ce8e0f82fe5707aa98d99af004486afe9266056c9650636b553e2355fa4caabe7528e60c0fd5af5df2ed9b SHA512 a24985200a70958f727bda3056de357d6cb74fc407197e9d9056573bc606cd6ffbd5bd971ef56acce3cb58f0b98865f5e89b431fe38c1d27b4dceafe49e78fdd
 EBUILD tellico-3.1.4.ebuild 2608 BLAKE2B a5a2fa788fad61752733ed2c2e2181169eae4865ac7da3bfbcd213b5b3e093cf58fa939805ec624f57ae0eb73bbc11fc8956258f0d8e39afd32eec73c366c6b0 SHA512 aa9bf763266bae19ad6544806cf93d90a73fb0fa7fb0c2944db7db0d84d362788d3480a909705787b8f6cd4db1c67417b38db4912599af56f2a5c7bce9cebc9d
+EBUILD tellico-3.2.ebuild 2465 BLAKE2B 530489b82ff5ce34ce12deb41b1a9f170fdc1bfd37b3b439675eff89a1e5ed8a7a5a5e12010e715de1546b067975075b949b9195bedef436b8c1f9ca06099ccc SHA512 d1302b7abfcf50104abb9af31963ea78bfd5629d08e777a8bfac9f6d2a90f717df43867860627b70b571ce052a2695679b5107d74d3e92c809480ade012c8f50
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/tellico-3.2.ebuild b/kde-misc/tellico/tellico-3.2.ebuild
new file mode 100644
index 000000000000..e75e9ba7649e
--- /dev/null
+++ b/kde-misc/tellico/tellico-3.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Collection manager based on KDE Frameworks"
+HOMEPAGE="http://tellico-project.org/"
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+	SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
+
+BDEPEND="
+	sys-devel/gettext
+"
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemmodels)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_frameworks_dep sonnet)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-libs/libxml2
+	dev-libs/libxslt
+	>=dev-perl/Text-BibTeX-0.780.0-r1
+	cddb? ( $(add_kdeapps_dep libkcddb) )
+	discid? ( dev-libs/libcdio:= )
+	pdf? ( app-text/poppler[qt5] )
+	scanner? ( $(add_kdeapps_dep libksane) )
+	semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+	taglib? ( >=media-libs/taglib-1.5 )
+	v4l? ( >=media-libs/libv4l-0.8.3 )
+	xmp? ( >=media-libs/exempi-2 )
+	yaz? ( >=dev-libs/yaz-2:0 )
+"
+DEPEND="${RDEPEND}"
+
+# tests need network access
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Csv=ON
+		$(cmake-utils_use_find_package cddb KF5Cddb)
+		$(cmake-utils_use_find_package discid CDIO)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package scanner KF5Sane)
+		$(cmake-utils_use_find_package semantic-desktop KF5FileMetaData)
+		$(cmake-utils_use_find_package taglib Taglib)
+		-DENABLE_WEBCAM=$(usex v4l)
+		$(cmake-utils_use_find_package xmp Exempi)
+		$(cmake-utils_use_find_package yaz Yaz)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-misc/wacomtablet/Manifest b/kde-misc/wacomtablet/Manifest
index 5d668c17481c..529b9f4c1eea 100644
--- a/kde-misc/wacomtablet/Manifest
+++ b/kde-misc/wacomtablet/Manifest
@@ -1,4 +1,5 @@
+AUX wacomtablet-3.1.1-gcc9.patch 1196 BLAKE2B 2e8b7d2f3808b09caa1ed733a6d0876172324809ecc0567a8fffbf962bdcd03fee8399fdc5fbb1b5196530538c04513965ec2df0540c58eb8fd5ecd577ad6409 SHA512 600725f86e5b4eaa654731c14c4c7c4d4d5c8980634faadd5697a866667ca27356213d25c07918fee70ee056cd7d890d612e80c6bd7c0f4e4058be39dddba263
 AUX wacomtablet-3.1.1-xlib-optional.patch 838 BLAKE2B 997d42737c593c5074b6541ca91a1976afc36c7f43041ecd90a32d309c856a9b9b7fb203b135cf997a9a944e9a47febefdc196b36fde94975677ba16b2f17be4 SHA512 b7b8e3c1a2ad97788d6a1bbebc3183b4b1e13ab6295bfc716d5e083a0a317fcd6ba75b49051706c9d776a028a40d3f7cc8edec9b1186b67cdd727ef3e2019990
 DIST wacomtablet-3.1.1.tar.xz 724176 BLAKE2B 062f05067b9ca423527f1fbbc498d3228fba9333f96e918493a00c3ceb669a23c3ab9297bf6c2d3d161559f1d9cf6ccff8f502971718e71a360f3db2e7d9bd67 SHA512 91f8ab9326b8307d63e09c7d75d613553f16c6cb93837cc404cb251aeda93078011b0c5aa0fc20ca4613d82421d73804cc55fa71a688bf4dd0f1d616733ade97
-EBUILD wacomtablet-3.1.1.ebuild 1324 BLAKE2B ad8cf2da6207cd093e0b740a61106c3b00782721a30a71dc8622dadb6d54e29f5fc528aa82406a2669936929a96e4983df9d762a5441df4aecdcfc405c4e6e72 SHA512 0dde63f12d9beef44947ca1639e2722fd806afbe1539f7b8a5d8aaf0e033325cdad88821c9b8ca3cf98f8906225460b40b53424e3b429e9c083d231468658c41
+EBUILD wacomtablet-3.1.1.ebuild 1369 BLAKE2B 7e255af0154d8bac2d38b6607b00527f009ca126373b9d8a69c6153cc4e52f73b53d472efd47347ae5d10c97dadc6db556b7da0753fb6f7bfc3be628168fc95a SHA512 0b9d7e39aa3f827e457cec0eb2e8f4634e5490579c844dbc924e1246ae6d6efc44aa8950f33347917a9c80a68b6609140ca817330c25d6e3779075067940c083
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
new file mode 100644
index 000000000000..6b0cc5dec637
--- /dev/null
+++ b/kde-misc/wacomtablet/files/wacomtablet-3.1.1-gcc9.patch
@@ -0,0 +1,29 @@
+From 810487c4fa240f6de598b04929bb08de8937feb5 Mon Sep 17 00:00:00 2001
+From: Valerii Malov <jazzvoid@gmail.com>
+Date: Sun, 28 Apr 2019 19:10:43 +0300
+Subject: (Supposedly) fix building with gcc9
+
+I don't really have access to gcc9 right now to test, but this should
+fix "static assertion failed: unique_ptr's deleter must be invocable
+with a pointer"
+
+CCBUG: 407015
+---
+ src/common/libwacomwrapper.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/common/libwacomwrapper.cpp b/src/common/libwacomwrapper.cpp
+index 1d11fc3..92a559a 100644
+--- a/src/common/libwacomwrapper.cpp
++++ b/src/common/libwacomwrapper.cpp
+@@ -60,7 +60,7 @@ libWacomWrapper::~libWacomWrapper()
+ bool libWacomWrapper::lookupTabletInfo(int tabletId, int vendorId, TabletInformation &tabletInfo)
+ {
+     qCDebug(COMMON) << "LibWacom lookup for" << tabletId << vendorId;
+-    auto errorDeleter = [](WacomError *&e){libwacom_error_free(&e);};
++    auto errorDeleter = [](WacomError *e){libwacom_error_free(&e);};
+     std::unique_ptr<WacomError, decltype(errorDeleter)>
+             error(libwacom_error_new(), errorDeleter);
+     std::unique_ptr<WacomDevice, decltype(&libwacom_destroy)>
+-- 
+cgit v1.1
diff --git a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
index 733552086e0d..382e2fbe52a7 100644
--- a/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
+++ b/kde-misc/wacomtablet/wacomtablet-3.1.1.ebuild
@@ -45,7 +45,10 @@ RDEPEND="${CDEPEND}
 	!kde-misc/wacomtablet:4
 "
 
-PATCHES=( "${FILESDIR}/${P}-xlib-optional.patch" ) # bug 681674
+PATCHES=(
+	"${FILESDIR}/${P}-xlib-optional.patch" # bug 681674
+	"${FILESDIR}/${P}-gcc9.patch" # bug 686822
+)
 
 src_test() {
 	# test needs DBus, bug 675548