gentoo resync : 22.06.2019

4 files changed, 2 insertions, 122 deletions

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 1e6670ebbfe7..3df23e7c53f5 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,7 +1,3 @@
-DIST kaffeine-2.0.16-2.tar.xz 5995824 BLAKE2B a472be60d10be077fd7ab3828e6958b0c3a2a8fef66318d33c0972e08cf3f5f19ce9d99cf42c21fed0aba67e296b639624e78d0e5567a9dc291a342c0ccf9249 SHA512 1b39bf59127c777b34f3076a237c53973af827191d2a279d40e7f14891dcd3d7bba1444b0b456d0e614807bf6bff494568aed958632dfba54515de8de5b06f21
-DIST kaffeine-2.0.17.tar.xz 6029896 BLAKE2B 044a801539fcde5eaa263fd6c68837fd070d588c09f30b46f9791c06e2b5c26c1d85d15590d3540848eff9b41a2d757494fc55ed1f7d1cd6453a8bfa9381e9f0 SHA512 96b4f676452102802f0226037a21572f851b2ebe2338f758d4d14f15af63adc93fc1ff15d78753284793ca01ebe9fa5f7b367545cfa491e08f563c19d63130dc
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
-EBUILD kaffeine-2.0.16.2.ebuild 1359 BLAKE2B e399a99f40969f54df4cc01ccd105bb2062a1e4fb28b6296dd81ceda19d2f154e905f7e277c2305e2c61656f982142f11653bc6c297daeb519d70157c148ebaf SHA512 9323a80ace09ae95e3a3440552062e4861db492623cba0f8d5f85d3577205e158c9e7d449930aa2a0a0411e86cf5b168fcbb05c74da6f94a01161a05a739b151
-EBUILD kaffeine-2.0.17.ebuild 1309 BLAKE2B 54c7a7c557df584917dc1476c18dbde7d1096ad7639ef07b09e347859a7c7916b9a3c6bc7102c78bc091330263f5109d33bd0a0f7f535df45f075cffa2fd81ae SHA512 c011fa27767b573bba9bd069559be1c6afcc7f3069306dae03d6d71b122ea382ee71d20b96d27f67967e6b0cfae9e894e9e81a4c365b019fbc16321028acb84d
-EBUILD kaffeine-2.0.18.ebuild 1309 BLAKE2B 54c7a7c557df584917dc1476c18dbde7d1096ad7639ef07b09e347859a7c7916b9a3c6bc7102c78bc091330263f5109d33bd0a0f7f535df45f075cffa2fd81ae SHA512 c011fa27767b573bba9bd069559be1c6afcc7f3069306dae03d6d71b122ea382ee71d20b96d27f67967e6b0cfae9e894e9e81a4c365b019fbc16321028acb84d
+EBUILD kaffeine-2.0.18.ebuild 1307 BLAKE2B b0edff04fb85d8c1030067e597ae4c8a53759ca696967cdb4757904f778e8acea8cba4beb33246c53d54ba359e58b25b35c7ccf5294ebb512890b70f6b3f5536 SHA512 08442396edb506fa76751e44c66b2344d9709c36f3b9d9c64ed56a07f5985fcc5f6cfd05e31e3148cdf1669ad9ff322e159a102a54eaf3f175162d1999e91ba3
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/kaffeine-2.0.16.2.ebuild b/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
deleted file mode 100644
index 7bd747eeec59..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.16.2.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="amd64 x86"
-	SRC_URI="mirror://kde/stable/${PN}/${PN}-$(ver_rs 3 -).tar.xz"
-fi
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://userbase.kde.org/Kaffeine"
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-IUSE="dvb"
-
-RDEPEND="
-	$(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-video/vlc[X]
-	x11-libs/libXScrnSaver
-	dvb? ( media-libs/libv4l )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-DOCS=( Changelog NOTES README.md )
-
-S="${WORKDIR}/${PN}-$(ver_rs 3 -)"
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-		$(cmake-utils_use_find_package dvb Libdvbv5)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-2.0.17.ebuild b/media-video/kaffeine/kaffeine-2.0.17.ebuild
deleted file mode 100644
index b6bb14b5b452..000000000000
--- a/media-video/kaffeine/kaffeine-2.0.17.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_HANDBOOK="optional"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
-	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
-fi
-
-DESCRIPTION="Media player with digital TV support by KDE"
-HOMEPAGE="https://userbase.kde.org/Kaffeine"
-LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
-IUSE="dvb"
-
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-DEPEND="
-	$(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-video/vlc[X]
-	x11-libs/libXScrnSaver
-	dvb? ( media-libs/libv4l )
-"
-RDEPEND="${DEPEND}"
-
-DOCS=( Changelog NOTES README.md )
-
-src_configure() {
-	# tools working on $HOME directory for a local git checkout
-	local mycmakeargs=(
-		-DBUILD_TOOLS=OFF
-		$(cmake-utils_use_find_package dvb Libdvbv5)
-	)
-
-	kde5_src_configure
-}
diff --git a/media-video/kaffeine/kaffeine-2.0.18.ebuild b/media-video/kaffeine/kaffeine-2.0.18.ebuild
index b6bb14b5b452..3c10640660ee 100644
--- a/media-video/kaffeine/kaffeine-2.0.18.ebuild
+++ b/media-video/kaffeine/kaffeine-2.0.18.ebuild
@@ -7,7 +7,7 @@ KDE_HANDBOOK="optional"
 inherit kde5
 
 if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
 fi