gentoo resync : 18.11.2018

3 files changed, 2 insertions, 90 deletions

diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index b2c61f228c73..743311184171 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,7 +1,5 @@
 AUX tellico-3.1.3-regexp-filtering.patch 1450 BLAKE2B 0149988de7c468ba089fe61aff7d7d0b111576f894d2f80bf4e2ddec13edf59baf575fec007833baa1d2610f045948dc79a89896d9482927bed62df4c341ad53 SHA512 406d30f13b3f9c7adf884ab71658781ceececa9e3befe05338f7d90bc0955ac93bc6d362c1e03a70452da34fb8640907fd89374f896ef33523bc51bdce3208ec
 AUX tellico-3.1.3-version.patch 586 BLAKE2B a4e6a53891b8418f1abdde2ecd25085c15f7f689e3647be241af605c877798e31a95bc3bd269c6a5103919f13a542cd60a626f7fab4e129b91cacfd80a0bde93 SHA512 72393098706404d200c5c57826ec064db49ace5508577e05d35078f215c204d6cf5921384ee823d4adf0f0d3e3aeb15e29fae214dfe01b21748b36b199e87ed4
-DIST tellico-3.1.2.tar.xz 4591752 BLAKE2B 9601fa35c068d7c961bef1235cb65609b8c148b64a72771817ac16e3662ebdc35ed9b53944fe1d30c62732f2861e5a668907cc3ea9dc9f682c9e2336b12bea22 SHA512 e86966636123db813f33ad90197950e1afb38d4096e15c785a9d9f2b846872d254cbdaeec7528a13627bf8edc63d409a42fbb35172949b9b45d6a4b5c40ac28f
 DIST tellico-3.1.3.tar.xz 4607668 BLAKE2B 4c4fb678b16611c448e0fc77f0b5c9e03f344c76d20e6006c03ee12140b647fefa7a3aba2f5312ea8c36f3722418981fb469a6c199f1e115542c784003854d28 SHA512 9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e
-EBUILD tellico-3.1.2.ebuild 2444 BLAKE2B dfec9fcfd4d5aa540754add21046d5b2612c330f2a25532265afe9ee862ef653623088042eb21b159df97afaf1ce564dd1eca3ddaa0632c326e4b74497c0e8f6 SHA512 dd30b2d42880faaa59f42a00a600f4c81f541b8bc69700f8d86f63fe8a774604e7ffba136c6afb0e1e51ad1cc04c54658080249b15eb1555c666da8a3ca91a44
-EBUILD tellico-3.1.3.ebuild 2531 BLAKE2B 1c430392dff83d804b2569f81391a27dac33ba44fe05e2890250161488809d339e7db77c530fb2cb5f6593639702bf14fb6c7e8c9cd770b69be3928a575889be SHA512 74552cda47e9c8a94c02c82ea58aab356e40b3ed402bc05b50456fa2e1b7b03d255d53476e3c71c29b61c5a8ab4b4b67b396a9aa1f42521c50418b5a3b7c3f0d
+EBUILD tellico-3.1.3.ebuild 2529 BLAKE2B 58ffc4c9752e884dc2b5632f0929153561ca3429af7aec61abda96e4f988842676d7a0a93d1a087eb6d3e975b53277a2fb1d27d292e403ba46a31cb1964beebc SHA512 ce74db02a19525c1398b1e013e8c95bca7c96d23937ffad4a273c31ce12e89314bcfc87dcbb419d67ef65e4835a280c6efdc0815f3e510de024ab7cb9cf1388d
 MISC metadata.xml 597 BLAKE2B 7b88f7d3e9aa4e5a291eb98034886b61d9f68dd0ef694da227287a6e4892fb553fc3c14a84a087dbbccdfbd5a4291e7708f772e2655ba9e314a8627e77871346 SHA512 3e1196598053c7ba9a29d578f20da3da281d0ed27e371716e66c3311e6dc888baa28f72cbe5af768ff8aed50eff84f541b2ba2a62f5f5fe6ef48ed125e4f8300
diff --git a/kde-misc/tellico/tellico-3.1.2.ebuild b/kde-misc/tellico/tellico-3.1.2.ebuild
deleted file mode 100644
index 11e601eda113..000000000000
--- a/kde-misc/tellico/tellico-3.1.2.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="A collection manager based on KDE Frameworks"
-HOMEPAGE="http://tellico-project.org/"
-SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
-
-LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="amd64 x86"
-IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
-
-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-perl/Text-BibTeX-0.780.0-r1
-	dev-libs/libxml2
-	dev-libs/libxslt
-	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}
-	sys-devel/gettext
-"
-
-# tests need network access
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog README )
-
-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/tellico/tellico-3.1.3.ebuild b/kde-misc/tellico/tellico-3.1.3.ebuild
index f536c9614b6a..f2c511b9ba2e 100644
--- a/kde-misc/tellico/tellico-3.1.3.ebuild
+++ b/kde-misc/tellico/tellico-3.1.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://tellico-project.org/"
 SRC_URI="http://tellico-project.org/files/${P}.tar.xz"
 
 LICENSE="|| ( GPL-2 GPL-3 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cddb discid pdf scanner semantic-desktop taglib v4l xmp yaz"
 
 RDEPEND="