gentoo resync : 01.12.2017

3 files changed, 2 insertions, 124 deletions

diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index adc0234b44d9..d7ae47cf66b5 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,3 @@
-DIST k3b-17.04.3.tar.xz 10568048 SHA256 d3d5ef74df0f6a15e4d0238d502d49af09909f4392fe80f35e5cc7a223983028 SHA512 4bcd9977c46da66172b30c69922698a4f1f60176c6435a99969cca215bf3baf72f9f70e25da0500145b7a377f5b80b02f0fcf1a3a8145d8d51e1ae54370c9be7 WHIRLPOOL 34f31f542ecf022f4f99fb2f4acb185573a00b6df29413a61c1f6da3c07eb574498e0090f6db1b84824640e162c9550c7aa8f60dd07e88bf635cdef33659df58
 DIST k3b-17.08.3.tar.xz 10565760 SHA256 f3edc5a79991ebdefdbbf0f0ee756e43499ebd73a00215e7b569c946e458504f SHA512 91038cc862bdebad1cfa843e8688a71494140cdf59fc8f9815a6e6eef2dca40b94ee7d0a8e7c6b277004ff0945431bb7873113e6e7fc5649b8120ef03b1564ba WHIRLPOOL e3de1aa23010c42156dad1631c52f91e2f04a0893cdd96b8399a9619a1b3fff954889dfb0e23854e3317ea89d32ce9ffc827ac3ac01f8369bbb92bb2e33f4342
-EBUILD k3b-17.04.3-r1.ebuild 3321 BLAKE2B 2077740375a1af1dec4e16c39558af6022b48d4be1958a53f6b3c43db161f21d9026f2d546216f91653dacd26e931693326a58721f4e2a83cad3cc1af30fe919 SHA512 8bce8952193c12d48473d354c6fa3db7cf19f8bb8ecf1c6ef87a7f7381e98c7d28df298d7c09ecd5f4fc84690dfb21fb84530ffa6464fa378ade8575bd88f1b2
-EBUILD k3b-17.08.3.ebuild 3409 BLAKE2B ba4d5325a7cec21f1d0f9e955b0594823e9554179ea9e3fa5e07b66abec0b93b88f39c2f34e0d3f2f02a233dc3ab636542f35d07583835a9108992353e0fd78a SHA512 7d572fedae467d32ebc20f6cd20c29fe26c3373608eba1182f93aa5f19383ec4e3def6afc6265ae42a39941dab791cebcf4e1171a380c75299485444251bd081
+EBUILD k3b-17.08.3.ebuild 3407 BLAKE2B c886597e80d59e1dc5ea7b8f76a95f2f52b970aaee28eb552a8653943bb376374ea505a89d21d1f397b0064daae1fd66752155cc423c5337d527797474468e43 SHA512 eb1ac09d344ac6eb4a1c2df12d47e8ca617c83ddde54a78d903407c0466330f016b02865e0e645291f7791cd32214372f1920f4f6e8fd81b19e158ad4c02b040
 MISC metadata.xml 334 BLAKE2B 0af18188f4b2d7ffa34ad43e06154f943c5da262588331287f89c34f737b435ecf6ac092424057440c9de9ccef1228d0d3c0978d457b5bbf5bdfeaefc464863e SHA512 16203cd75177004bb4844f67659dc7370c12e216871272ff8f781ed11172e72271b15f347ad6d59354ef077ebab1fad2bc150f3e2388f370b660b2d2adcb0faa
diff --git a/kde-apps/k3b/k3b-17.04.3-r1.ebuild b/kde-apps/k3b/k3b-17.04.3-r1.ebuild
deleted file mode 100644
index 03384a4c09b1..000000000000
--- a/kde-apps/k3b/k3b-17.04.3-r1.ebuild
+++ /dev/null
@@ -1,120 +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="true"
-inherit kde5
-
-DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
-HOMEPAGE="http://www.k3b.org/"
-
-LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="amd64 x86"
-IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
-
-DEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kfilemetadata 'taglib?')
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_kdeapps_dep libkcddb)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	media-libs/libsamplerate
-	dvd? ( media-libs/libdvdread )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	flac? ( >=media-libs/flac-1.2[cxx] )
-	mp3? ( media-sound/lame )
-	mad? ( media-libs/libmad )
-	musepack? ( >=media-sound/musepack-tools-444 )
-	sndfile? ( media-libs/libsndfile )
-	taglib? ( >=media-libs/taglib-1.5 )
-	vorbis? ( media-libs/libvorbis )
-	webkit? ( $(add_qt_dep qtwebkit) )
-"
-RDEPEND="${DEPEND}
-	app-cdr/cdrdao
-	dev-libs/libburn
-	media-sound/cdparanoia
-	virtual/cdrtools
-	dvd? (
-		>=app-cdr/dvd+rw-tools-7
-		encode? ( media-video/transcode[dvd] )
-	)
-	emovix? ( media-video/emovix )
-	sox? ( media-sound/sox )
-	vcd? ( media-video/vcdimager )
-"
-
-REQUIRED_USE="
-	flac? ( taglib )
-	mp3? ( encode taglib )
-	sox? ( encode taglib )
-"
-
-DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
-
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DK3B_BUILD_API_DOCS=OFF
-		-DK3B_BUILD_WAVE_DECODER_PLUGIN=ON
-		-DK3B_ENABLE_HAL_SUPPORT=OFF
-		-DK3B_ENABLE_MUSICBRAINZ=OFF
-		-DK3B_DEBUG=$(usex debug)
-		-DK3B_ENABLE_DVD_RIPPING=$(usex dvd)
-		-DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode)
-		-DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg)
-		-DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac)
-		-DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3)
-		-DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
-		-DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
-		-DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile)
-		-DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox)
-		-DK3B_ENABLE_TAGLIB=$(usex taglib)
-		-DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis)
-		-DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis)
-		$(cmake-utils_use_find_package webkit Qt5WebKitWidgets)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	echo
-	elog "If you get warnings on start-up, uncheck the \"Check system"
-	elog "configuration\" option in the \"Misc\" settings window."
-	echo
-
-	local group=cdrom
-	use kernel_linux || group=operator
-	elog "Make sure you have proper read/write permissions on optical device(s)."
-	elog "Usually, it is sufficient to be in the ${group} group."
-	echo
-}
diff --git a/kde-apps/k3b/k3b-17.08.3.ebuild b/kde-apps/k3b/k3b-17.08.3.ebuild
index dea185af5a78..144d18136f49 100644
--- a/kde-apps/k3b/k3b-17.08.3.ebuild
+++ b/kde-apps/k3b/k3b-17.08.3.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="Full-featured burning and ripping application based on KDE Framewor
 HOMEPAGE="https://userbase.kde.org/K3b"
 
 LICENSE="GPL-2 FDL-1.2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit"
 
 DEPEND="