gentoo resync : 01.12.2017

4 files changed, 3 insertions, 94 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 887874183e09..09080492c77f 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/tellico/Manifest b/kde-misc/tellico/Manifest
index 794afde7d94c..ba29d5a113ed 100644
--- a/kde-misc/tellico/Manifest
+++ b/kde-misc/tellico/Manifest
@@ -1,5 +1,3 @@
-DIST tellico-3.0.2.tar.xz 5492348 SHA256 455b0b24e2046e0a4919677719c4e2dcb1d8076cb49617c4f4fe5908ee40768b SHA512 68ac3063cd12bb59368b6106fe8e580afebeb61dd6db0fbef1751f5d6ed0c9bed04456a5cf1fb7fcfdc52be936670831eb766073a2c370148cf3e89907615a8f WHIRLPOOL 28af59c9add426ebf857a7ff14a91b95cfd093b46568bd2d7d3d4abfa0ed6282a4f3dc0912133e149a2680aab6a17e37e5a0cf21fcd388cf288148a52b95f46d
-DIST tellico-3.1.tar.xz 5559552 SHA256 ca549c249ee2562ef583a2b2dedc76843660ff726ed2cd26025dd4607b59a124 SHA512 6b3ad53bede52564ebd6bdf567d0da290cc77c1ee86c802314a194a680dc7cdc8d097b687f2562c95b72a5cf494e7be024fc00240b7bc2eb01aa7792febd40ad WHIRLPOOL 42f357e060aec411f267e08ff7d2983fc8a99aaee455675ce70c62f17880b5a685a578ac5a74d331b4dcb24434a5f75c87b9d9a49cc955f388a8ef757bab4823
-EBUILD tellico-3.0.2.ebuild 2512 BLAKE2B f50212f7d08a05e55c01f38543fc5c047f60a8c38513a8edb12357f16fe77f36a228952f374d31b4aaf0a24ac5940c38d6db4b05b3f7a9d4c9bd5a3f2e5f75e3 SHA512 12537526183bc42513c0d3d8ee7cc03cda6ad740417bfd8b8bbc82e27fbba83b88ff47506125a7bc9930d7a514efceb17fdeccd0ebc1fe4748d8978a2d7959aa
-EBUILD tellico-3.1.ebuild 2509 BLAKE2B 489438aba2e58001a3a16579fa81ef95a77eacc96642c0ce513b16f9877c8a2cc003c184843baa0391150dff45ea0d993917faf75496a80ca340f55ebac9aea6 SHA512 9622b4bdaaf0523d09767f4a5821a411b34e8325d49873201b8b5d681f5f345b62f21d8c71d88206a74adb660283b7b2e05bb31da1f1cbe5c389931a53db28cf
+DIST tellico-3.1.tar.xz 5559552 BLAKE2B 4512ea0780abf0ffae665099318c143b3979904a8a72806f440aa79456de63f8ce76c83c1ae7768405eab72129c4ad60f93ab21f32577e5a655595d0631b4d1c SHA512 6b3ad53bede52564ebd6bdf567d0da290cc77c1ee86c802314a194a680dc7cdc8d097b687f2562c95b72a5cf494e7be024fc00240b7bc2eb01aa7792febd40ad
+EBUILD tellico-3.1.ebuild 2508 BLAKE2B a9d9668a485ab1d26e5ea1f23eecde4ea28a9d359a9311c1c0423f9faab19baf7a28d5b6155e53be4116e72582cf3d48f6fe38094682a414860dccc8b579de7c SHA512 fcff3d14d67df4ffd4e8a7434855db04e5b62a65af78e9cc7db1dc4ecdd4deb4c35ce33123b7ce0d792e84ce65312bef53b74f2e9f8b850c01fbf2530c3f5bd1
 MISC metadata.xml 597 BLAKE2B 7b88f7d3e9aa4e5a291eb98034886b61d9f68dd0ef694da227287a6e4892fb553fc3c14a84a087dbbccdfbd5a4291e7708f772e2655ba9e314a8627e77871346 SHA512 3e1196598053c7ba9a29d578f20da3da281d0ed27e371716e66c3311e6dc888baa28f72cbe5af768ff8aed50eff84f541b2ba2a62f5f5fe6ef48ed125e4f8300
diff --git a/kde-misc/tellico/tellico-3.0.2.ebuild b/kde-misc/tellico/tellico-3.0.2.ebuild
deleted file mode 100644
index 97f056c40841..000000000000
--- a/kde-misc/tellico/tellico-3.0.2.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? ( media-libs/libdiscid )
-	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 DiscID)
-		$(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
-}
diff --git a/kde-misc/tellico/tellico-3.1.ebuild b/kde-misc/tellico/tellico-3.1.ebuild
index 65249033f944..528c524070a8 100644
--- a/kde-misc/tellico/tellico-3.1.ebuild
+++ b/kde-misc/tellico/tellico-3.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="