gentoo resync : 25.01.2018

4 files changed, 4 insertions, 75 deletions

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index f9d53897517c..4a880d2ec7a4 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,5 +1,3 @@
-DIST kaffeine-2.0.13.tar.xz 4374124 BLAKE2B 14e5d026cf41308e400072b53fdafdb616d4df48ee3413a1115aa4028c7c69407064278e2a60af3b7859dfefc841b09b1827278b093071df29af39491df3a736 SHA512 710d6c5b35f2b2f82094004e8d09edd33ec95c8e0afb64f6dcf2bc14f3e6619ae87712e2a5bd3cde23e886d1e9300510fb0b0c355c33386d4dd238aada2760f5
 DIST kaffeine-2.0.14.tar.xz 5972768 BLAKE2B b1c8f7338474804ce0003126a0e041a6aefb3d4b6b48c4c45577138f0686100b08c1f64adfd23658a0f04f8638d38df81c9f186d6fab60d607550e238d14a2a0 SHA512 03a4ffbfbe7b9c90de546bf7449e8e5f05d5e7023b75b5253297e885c412677a0c4b46c7f60761ef5f48ad3c284591acba6ff0fe4fa7256d5b01ca9a07d7276f
-EBUILD kaffeine-2.0.13.ebuild 1431 BLAKE2B 6df2475430dfb14f0867ce9661fbb5e83e641554608471c23bacf78f5cbff3ffbc82304fd2cb4d3e22da82ba1b0e13f0a23b6f2c555f92f7565bfbb5c9860f1a SHA512 7a89677fd7a5c0f4f820da6a76037ff032ba9bb24e0a92fa529d01dfe8eea88c36830d99e311cb60b26c538ec18999a2d904688c252f50bddf7538a720bbe419
-EBUILD kaffeine-2.0.14.ebuild 1457 BLAKE2B 52d174f5f36a49caf1eff0f083c49f9175ab2e44c1c3a5da1ed89e17bc88b4ada9de930f6a4f79ac7fdcec9629e11fd5cb074f900c54ef16ff9302a65460b1bd SHA512 1d83100b0affa96ecddd9520b845073768459a0760b908fd97149cc8c4797043231887fd3329ef6be852e5f7f3b96adfb9d6ff33aced6013f608edac7037cdcd
-MISC metadata.xml 447 BLAKE2B a8d3f7396f9ec720f0a47f90a81218ec536edef061cdf11912caa7e99370f03061594fa8c8943eeb0b494a341c3aae6cd1460979c11f306b1a426ecab9df2e1c SHA512 e2c7a2f56b06dae76e7714fa7a2b2170b47330712bf6b9d91a22854d75469bef20e16b916678674e81ba089f920d9bd27b04cd796cabb7fc4762f79740828d7c
+EBUILD kaffeine-2.0.14.ebuild 1455 BLAKE2B 82497d168fc1ecdab6cb5c5180eef9423fed401defd6f510dc02a0c8b84b8671af8f3eca703168a17ee43354f5911455a2716557c193a86c313c9ea678d25d9b SHA512 66043b4298b5bdf30ee7b6a0774899dadbbc4f852a2223ebbd03df804b1b1265521d69b5fc4155a28cb29549243c56026784bcfd705609fe084e3d6d49c1029d
+MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.13.ebuild b/media-video/kaffeine/kaffeine-2.0.13.ebuild
deleted file mode 100644
index d6dc589879c8..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.13.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://kaffeine.kde.org/"
-SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-CDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql 'sqlite')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/libv4l
-	media-video/vlc[X]
-	x11-libs/libXScrnSaver
-"
-DEPEND="${CDEPEND}
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-RDEPEND="${CDEPEND}
-	!media-video/kaffeine:4
-"
-
-DOCS=( Changelog NOTES README.md )
-
-src_prepare() {
-	kde5_src_prepare
-
-	if ! use handbook ; then
-		sed -i CMakeLists.txt \
-			-e "/find_package(KF5DocTools CONFIG REQUIRED)/s/^/#/" \
-			-e "/kdoctools_install(po)/s/^/#/" || die
-	fi
-}
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-	)
-
-	kde5_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-2.0.14.ebuild b/media-video/kaffeine/kaffeine-2.0.14.ebuild
index 5ffcfdfea1f9..77757018422d 100644
--- a/media-video/kaffeine/kaffeine-2.0.14.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://kaffeine.kde.org/"
 SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dvb"
 
 CDEPEND="
diff --git a/media-video/kaffeine/metadata.xml b/media-video/kaffeine/metadata.xml
index 81fb67df1eba..00c71c8a23d3 100644
--- a/media-video/kaffeine/metadata.xml
+++ b/media-video/kaffeine/metadata.xml
@@ -9,7 +9,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">kaffeine</remote-id>
-	</upstream>
 </pkgmetadata>