gentoo resync : 13.03.2018

4 files changed, 2 insertions, 93 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index ca64e850c8f3..1bc2c842932e 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index a540bacfa023..3b9733f2f018 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,3 @@
 DIST tellico-3.1.1.tar.xz 4584460 BLAKE2B d495c400b7261954cc6f68ef8fe4cf01e9e81573e4de7aaa040b15b26a6c3a8198ca533c11ec5d784cb4e848d5779d6ac244b8cbe5d0addc2d7fa3efde2e103d SHA512 f0fd631c177eadcbb493b630e9127faa745da02e3db041e37e737efa2d2565b5bbf26fca471a7e2dea368b432d38537d975d59a8e4bf216210c2c65266cbcaad
-DIST tellico-3.1.tar.xz 5559552 BLAKE2B 4512ea0780abf0ffae665099318c143b3979904a8a72806f440aa79456de63f8ce76c83c1ae7768405eab72129c4ad60f93ab21f32577e5a655595d0631b4d1c SHA512 6b3ad53bede52564ebd6bdf567d0da290cc77c1ee86c802314a194a680dc7cdc8d097b687f2562c95b72a5cf494e7be024fc00240b7bc2eb01aa7792febd40ad
-EBUILD tellico-3.1.1.ebuild 2510 BLAKE2B 3e5edb5fbedc2cb03469e28b015484b37421625c05682ba44306d2281170d39993d98f54ac2a0bed460ff1f1ac7758856210a3a798a858dd58c5d7f459c67c4a SHA512 cb9cd58404d8587e42399cdbeb675ff6ea3c0b57d6294452ebaef4b2124df48ea5049f999c72f5a2d590e7f7eae9c0cd81d6529fe463df0e2ff3f50bcdc55b86
-EBUILD tellico-3.1.ebuild 2508 BLAKE2B a9d9668a485ab1d26e5ea1f23eecde4ea28a9d359a9311c1c0423f9faab19baf7a28d5b6155e53be4116e72582cf3d48f6fe38094682a414860dccc8b579de7c SHA512 fcff3d14d67df4ffd4e8a7434855db04e5b62a65af78e9cc7db1dc4ecdd4deb4c35ce33123b7ce0d792e84ce65312bef53b74f2e9f8b850c01fbf2530c3f5bd1
+EBUILD tellico-3.1.1.ebuild 2508 BLAKE2B df39081a81109a823d6b196064dfe27431676d6c5f061d4ec29e48bcd0d608a31922c80186e550f378fb5bf264d783a60ddbad67cce606cfdde673f0c9ebaccb SHA512 8af928efa0cb392ef729beacf1918072d75da48f301eb06d9012b14e2b33af7efd26e4326e35156011410784b8d29ef9a1901713001b7d2748678284dcc321e1
 MISC metadata.xml 597 BLAKE2B 7b88f7d3e9aa4e5a291eb98034886b61d9f68dd0ef694da227287a6e4892fb553fc3c14a84a087dbbccdfbd5a4291e7708f772e2655ba9e314a8627e77871346 SHA512 3e1196598053c7ba9a29d578f20da3da281d0ed27e371716e66c3311e6dc888baa28f72cbe5af768ff8aed50eff84f541b2ba2a62f5f5fe6ef48ed125e4f8300
diff --git a/kde-misc/tellico/tellico-3.1.1.ebuild b/kde-misc/tellico/tellico-3.1.1.ebuild
index 58fc19710b7d..c879158a6951 100644
--- a/kde-misc/tellico/tellico-3.1.1.ebuild
+++ b/kde-misc/tellico/tellico-3.1.1.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"
 
 COMMON_DEPEND="
diff --git a/kde-misc/tellico/tellico-3.1.ebuild b/kde-misc/tellico/tellico-3.1.ebuild
deleted file mode 100644
index 528c524070a8..000000000000
--- a/kde-misc/tellico/tellico-3.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 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"
-
-COMMON_DEPEND="
-	$(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="${COMMON_DEPEND}
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/tellico:4
-"
-
-# 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 PopplerQt5)
-		$(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
-}