gentoo resync : 16.01.2018

3 files changed, 2 insertions, 47 deletions

diff --git a/media-sound/qtagger/Manifest b/media-sound/qtagger/Manifest
index db55c570358e..dca88328ccea 100644
--- a/media-sound/qtagger/Manifest
+++ b/media-sound/qtagger/Manifest
@@ -1,5 +1,3 @@
-DIST qtagger-1.0.1.tar.gz 60791 BLAKE2B 617f8bcff6e3627ad9f36b814662111ad7cdb9a782e4cd3703e2010ce019ec247e77f6e7dd620409338b1561fcaa356924de009778a812ddbd57ee27abc79a39 SHA512 45969475abefa865244946fb6a74dcfa7397f0a9bd57b0fda4de98fc8c8edb2c0c3a631eccfa199bebb8442df38b0beaca9234fae4166629bcb5c08aee42b47a
 DIST qtagger-1.0.1_p20150402.tar.gz 60745 BLAKE2B 0260ac8cf4b07cdb3b5887357ac4034f4c02a801cc91568cc54cb73293884fefcdbf2019d1b61542353f4ef2e79c07ffda1c1414ff4b99d10faff1e8dcab95fb SHA512 2510350d479008b0c2af4b489aa16ab88003b18f1cbb66796dece6c93dd4222ff073f575b9de8136fb6a46ece1c67ace7de605ef3db0c73038a52472d652f279
-EBUILD qtagger-1.0.1-r2.ebuild 906 BLAKE2B b92ce2eb06c8c053a8dcd943cdd64bc9d50e41f5d86eca5d03b98137b5434c01334a5e66589231b6f438b2409e735dc95b2b1e84dad397fa6f8d12dd6ff4a313 SHA512 d1a61f34be72cc595a19adbe8b6856896bb6c07d73ec1205bc27cac42a1744519180679beeccf26ca37195196dfd170977f38336dbe36405f2abdf182c041dac
-EBUILD qtagger-1.0.1_p20150402.ebuild 1042 BLAKE2B 400191e12c5afa0100d8e3ce979a8b289a05992ababc3abce37f716f4b3d9b337ddd8cab19e73ee12e0dc054f924aae91a20ed91d99cdd77763c36d2781ee065 SHA512 f07ce8858d9d4f5a3c79d7c9623b7f5f65bb6f944aad92fc340477adbe6fd7f07813ffd71801db91d8f1027dd5bef353c483f9d5ac981d4b17897208508039b0
+EBUILD qtagger-1.0.1_p20150402.ebuild 1042 BLAKE2B 65e641ec7e66754bb23ddace61747a437b22fc41c1146fd32ee9fe96ea6e95d6c99ea8ad8bb54605b23cdc953e34b2560c21f6562c0f537d6e5758657767cd7a SHA512 17d1da69e1c6c45d212e21efb6709de101b23033d08ce1732f5437c06b4b7586d59a17033c6c03e6f86d3e371b9e495eea4615cb2fcd060b9f96e6f4732cdf97
 MISC metadata.xml 326 BLAKE2B 176217a8a77bdd384e28da6436cbd32a61420981e5ab63ea76c9c4681463c6ce69bc9ca197591d9620a48abb145563de081122ecffe976118f7e2276687dd775 SHA512 e73586aa673a0b41300f88e9523c322d3dd42c2f319bd237b8b88fe346327c068c8d9e272ebc0e5503adbfb2562925231663da7fbf86a9edf7b48026d65a3854
diff --git a/media-sound/qtagger/qtagger-1.0.1-r2.ebuild b/media-sound/qtagger/qtagger-1.0.1-r2.ebuild
deleted file mode 100644
index 2412d4a4374d..000000000000
--- a/media-sound/qtagger/qtagger-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils
-
-DESCRIPTION="Simple Qt4 ID3v2 tag editor"
-HOMEPAGE="https://github.com/DOOMer/qtagger"
-SRC_URI="https://github.com/DOOMer/qtagger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/taglib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix doc installation path
-	sed -i -e "s/doc\/${PN}/doc\/${PF}/" CMakeLists.txt || die
-	sed -i -e "s/share%1doc%1qtagger/share%1doc%1${PF}/" src/mainwindow.cpp || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{ChangeLog~,LICENSE} || die
-}
diff --git a/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild b/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
index 17e012ecab95..460a0e654404 100644
--- a/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
+++ b/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
@@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="emake"
 COMMIT=0e74fe022ddbb689f7bae0460a21be303114029b
 inherit cmake-utils qmake-utils vcs-snapshot
 
-DESCRIPTION="Simple Qt4 ID3v2 tag editor"
+DESCRIPTION="Simple Qt5 ID3v2 tag editor"
 HOMEPAGE="https://github.com/DOOMer/qtagger"
 SRC_URI="https://github.com/DOOMer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"