gentoo resync : 18.08.2019

4 files changed, 53 insertions, 91 deletions

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index b4050613dbc6..247b14bd5a5f 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,4 @@
+AUX tellico-3.2.1-missing-header.patch 1196 BLAKE2B 757bfca5c2edd2fb41903a8ff1961ad200347a97ff589ceed3e4c84a061e527a69f19367ad3111a63a0bd222795bf5d478cacaf9e372fb1b5fb76b0cc66f2b73 SHA512 22ce1aa6d5ab3fcd5e9b427e8950e31afc5ebe02de30ca961c03a79a0bf967b5049cb77d6d3a08e5635c00d10c6d51ac3d02887bbb5fd81fc7adb2f3ec3e303b
 DIST tellico-3.2.1.tar.xz 5604632 BLAKE2B 4e0f156a315eca387b60f254df9824615aca3a917a1a256bfd3612e6babd7495e22d79234bdd92297167c323d5a3aabed253ddc38d757e41b64c289392b6e827 SHA512 ada45c66fce2e73f301e3f7d69acb20caf5ebde85ac77bd6e6f0701f55044f5f1a44f8e6ae5d6d6bd244fd6538fba88591caf70178855b6910ce5132508fba9b
-DIST tellico-3.2.tar.xz 5596028 BLAKE2B e22cd7b5f1bfb5221379b0e6c12c894314c3f04348ce8e0f82fe5707aa98d99af004486afe9266056c9650636b553e2355fa4caabe7528e60c0fd5af5df2ed9b SHA512 a24985200a70958f727bda3056de357d6cb74fc407197e9d9056573bc606cd6ffbd5bd971ef56acce3cb58f0b98865f5e89b431fe38c1d27b4dceafe49e78fdd
-EBUILD tellico-3.2.1.ebuild 2465 BLAKE2B 530489b82ff5ce34ce12deb41b1a9f170fdc1bfd37b3b439675eff89a1e5ed8a7a5a5e12010e715de1546b067975075b949b9195bedef436b8c1f9ca06099ccc SHA512 d1302b7abfcf50104abb9af31963ea78bfd5629d08e777a8bfac9f6d2a90f717df43867860627b70b571ce052a2695679b5107d74d3e92c809480ade012c8f50
-EBUILD tellico-3.2.ebuild 2463 BLAKE2B 41cf33255a9e068b3ca97c5f039aeea9bed026b8c0aee2062db5a660f321b26d0b496babab2bbb5c0e6b0981110e67442878abd894ff6575eb64db8460e202be SHA512 9d445f2364b583cf7080bf33f46b87732849edbbbbac361d24639f85cf11cf0d5838c6de94c61933f2785bae2775ddf44a7c3f8c0a541129fa3a28a7f26c854c
+EBUILD tellico-3.2.1.ebuild 2516 BLAKE2B 84b1943c2d8fd608642252e75408ae827edda5e273597265982f3422c2994a580a1f6436f8873ddccab46f5719a92e9cd4be22ca254c46bbdf6f66f5b49e2ba3 SHA512 53c16b74327a9c800a817712553be35a1ab11306cb0a0774f403f9b859b99deb9facd5c701998c6d91169a845f0228d62838622b1771a8efc0db1c48ecc349aa
 MISC metadata.xml 666 BLAKE2B 5d03d3b6466087a3fee7c12daee7824d8a995fdb8feeeb458801e56549cca5cd24794f30ba82dd0146626edc7284d02770a904400b2aae25831dca59a8c31e76 SHA512 57316bf5ca997b02babd947e54909960300e0ca0340662fdb7b151b161913ab255502aee63951c78d301071b2fd1b5cd33d5238496e3ba8e8a8956c102d4d16e
diff --git a/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch b/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
new file mode 100644
index 000000000000..cff61fcdb614
--- /dev/null
+++ b/kde-misc/tellico/files/tellico-3.2.1-missing-header.patch
@@ -0,0 +1,48 @@
+From 43851a0a655a3a961f289087bdea989aa32cc028 Mon Sep 17 00:00:00 2001
+From: Luca Beltrame <lbeltrame@kde.org>
+Date: Sun, 21 Jul 2019 09:21:16 +0200
+Subject: Fix build with Qt 5.13
+
+(cherry picked from commit 43e6bbb4721adc83d8b2a77bd51d9efaf7aefd6b)
+---
+ src/gui/datewidget.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gui/datewidget.cpp b/src/gui/datewidget.cpp
+index 724370e..e6502bb 100644
+--- a/src/gui/datewidget.cpp
++++ b/src/gui/datewidget.cpp
+@@ -35,6 +35,7 @@
+ #include <QPushButton>
+ #include <QHBoxLayout>
+ #include <QFrame>
++#include <QDate>
+ #include <QEvent>
+ #include <QMenu>
+ #include <QWidgetAction>
+-- 
+cgit v1.1
+
+From d3c56eca11cd059d4348ab6696822c23d85af61a Mon Sep 17 00:00:00 2001
+From: Robby Stephenson <robby@periapsis.org>
+Date: Sun, 21 Jul 2019 19:17:35 -0400
+Subject: Fix apparent build problem on Jenkins
+
+---
+ src/mainwindow.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
+index d8348e8..8250c56 100644
+--- a/src/mainwindow.cpp
++++ b/src/mainwindow.cpp
+@@ -108,6 +108,7 @@
+ #include <QMimeType>
+ #include <QMenuBar>
+ #include <QFileDialog>
++#include <QMetaMethod>
+ 
+ #include <unistd.h>
+ 
+-- 
+cgit v1.1
diff --git a/kde-misc/tellico/tellico-3.2.1.ebuild b/kde-misc/tellico/tellico-3.2.1.ebuild
index e75e9ba7649e..1cd59e71c253 100644
--- a/kde-misc/tellico/tellico-3.2.1.ebuild
+++ b/kde-misc/tellico/tellico-3.2.1.ebuild
@@ -12,7 +12,7 @@ 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"
+	KEYWORDS="amd64 x86"
 fi
 
 LICENSE="|| ( GPL-2 GPL-3 )"
@@ -66,6 +66,8 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-missing-header.patch )
+
 # tests need network access
 RESTRICT+=" test"
 
diff --git a/kde-misc/tellico/tellico-3.2.ebuild b/kde-misc/tellico/tellico-3.2.ebuild
deleted file mode 100644
index b7d5f0f2be4a..000000000000
--- a/kde-misc/tellico/tellico-3.2.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# 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
-}