gentoo resync : 24.02.2018

3 files changed, 2 insertions, 109 deletions

diff --git a/media-sound/flacon/Manifest b/media-sound/flacon/Manifest
index 6e731f8db652..5ca000b771a9 100644
--- a/media-sound/flacon/Manifest
+++ b/media-sound/flacon/Manifest
@@ -1,5 +1,3 @@
-DIST flacon-3.1.1.tar.gz 431743 BLAKE2B 491919b31e0f19993c01c8a55145f1f6db7465e10112b7d3862ca2f66f15a534501248d682258fa944d0ac5de1d716c80a98f8329a4f62e22074dd397d9a03da SHA512 13b1abc2edba73e30c9a1b729650e8001a5b8de7e34fe2b599f28277c347539fb50679f8a0e608c87eb7feb1e05e26c7f71fbc3c696f0fa29ae8ae9e20e63cfd
 DIST flacon-4.0.0.tar.gz 1294289 BLAKE2B 3afadc3545493558a5eadb7720509410fb448fed1e1fc5511f0ce477ea0e6e876d19e3038d5eb77191b449f730f50e6f1e3e4eacf546b064868863ed918acdee SHA512 64efc3369f11a7345d106a253873bcaf64ff0bbfb045e3554fecdc48a86ee5d150bef06643a5bf481d6e139a45a2bfdee91e730f9aa1354a4772f0d994297b78
-EBUILD flacon-3.1.1.ebuild 2611 BLAKE2B 4aa79f517e9519e72e0016e8223ab4d9cf594151e8659e7e995e7d9a466c40bfbd563fe9ab71d300c8c41f59d61219f8706fc2428e6c52f2cc312694cd739c09 SHA512 09e2ae615acc0d69861ef1eaf8ed6a45b5548a5fb09191ee4f32200d0b0ff61db90f2e7212636183b1d250fb1207ed4b5d041d17173b8a8c1e9a029e13ea6a24
-EBUILD flacon-4.0.0.ebuild 2473 BLAKE2B f86ca417fdb328ae9a42d0ddbb582bd13fb6b9330837f8f850133e1e7c2a6bd4f49856657a3c920654c4c055eadf54b14f14b5b58998a7f063fd06e0ff72fbb3 SHA512 7c11f54921fe5b1ab61a661d53de15132161c595a27ba41a5a4d88c7d1fc8298f2e57ec89babb5d27a3f4a0777b3b5d82bd97388a730af3e0ec6b50ee2f513d5
+EBUILD flacon-4.0.0.ebuild 2472 BLAKE2B 7f289cf3b0cd94d757bc47122d117af72be6d8e9bb8ab273af64bbffd955f01e59b63effb27e821bb1ab6f119cc504700acb4efaed33e202ad5c02a362352c77 SHA512 a6300f02429e8eca6a81dbae41cd6904f76c3114f182765f60dd8e2851cf83132f3e0d497dc3c8ee5f0079df54b028811fbc71e028064c980c5bc0c72f96c4a8
 MISC metadata.xml 505 BLAKE2B 95e22c79d22d438696eaca5a304e1ac5660b049511a59bf6ed79aeedf9039b24fcd4de3ee3babc4c34b9e471a615ffcc1a36a9156350e430dc6fa6ca6bbd9923 SHA512 6979e575ee4e5230e7674fa77ece86fc27b983af03c1dfd938c3b3ca9e8f0e89f7ab2c99eaecdd1f512e70fd9d1004963669bfefa68176d40c6460272ac334dc
diff --git a/media-sound/flacon/flacon-3.1.1.ebuild b/media-sound/flacon/flacon-3.1.1.ebuild
deleted file mode 100644
index b53f30f14ddd..000000000000
--- a/media-sound/flacon/flacon-3.1.1.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Ignore rudimentary et, uz@Latn, zh_TW translation(s).
-PLOCALES="cs cs_CZ de es es_MX fr gl hu it ja_JP lt nb nl pl pl_PL pt_BR pt_PT ro_RO ru sr sr@latin tr uk zh_CN"
-# Tests require lots of disk space
-CHECKREQS_DISK_BUILD=10G
-
-inherit check-reqs cmake-utils eutils gnome2-utils l10n virtualx xdg-utils
-
-DESCRIPTION="Extracts audio tracks from an audio CD image to separate tracks"
-HOMEPAGE="https://flacon.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="qt5 test"
-
-RDEPEND="
-	app-i18n/uchardet
-	!qt5? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwidgets:5
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	qt5? ( dev-qt/linguist-tools:5 )
-	test? (
-		media-libs/flac
-		media-sound/mac
-		media-sound/ttaenc
-		media-sound/wavpack
-		media-sound/shntool
-		!qt5? ( dev-qt/qttest:4 )
-		qt5? ( dev-qt/qttest:5 )
-	)
-"
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# Ignore rudimentary et, uz@Latn, zh_TW translation(s).
-	rm "translations/${PN}_uz@Latn.desktop" || die
-	rm "translations/${PN}"_{et,zh_TW}.ts || die
-
-	remove_locale() {
-		rm "translations/${PN}_${1}".{ts,desktop} || die
-	}
-
-	l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
-	l10n_for_each_disabled_locale_do remove_locale
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_QT4="$(usex !qt5)"
-		-DUSE_QT5="$(usex qt5)"
-		-DBUILD_TESTS="$(usex test)"
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	virtx "${BUILD_DIR}/tests/${PN}_test"
-}
-
-pkg_postinst() {
-	elog "${PN} optionally supports formats listed below."
-	elog "(List will be empty if all extra packages are installed.)"
-	elog "Please install the required packages and restart ${PN}."
-	optfeature 'FLAC input and output support' media-libs/flac
-	optfeature 'WavPack input and output support' media-sound/wavpack
-	optfeature 'APE input support' media-sound/mac
-	optfeature 'TTA input support' media-sound/ttaenc
-	optfeature 'AAC output support' media-libs/faac
-	optfeature 'MP3 output support' media-sound/lame
-	optfeature 'Vorbis output support' media-sound/vorbis-tools
-	optfeature 'MP3 Replay Gain support' media-sound/mp3gain
-	optfeature 'Vorbis Replay Gain support' media-sound/vorbisgain
-
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/media-sound/flacon/flacon-4.0.0.ebuild b/media-sound/flacon/flacon-4.0.0.ebuild
index cb11e38d9e9e..a9ff778b390a 100644
--- a/media-sound/flacon/flacon-4.0.0.ebuild
+++ b/media-sound/flacon/flacon-4.0.0.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/flacon/flacon/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 
 RDEPEND="