gentoo resync : 16.01.2018

5 files changed, 4 insertions, 49 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 270cac081c41..d25c79cb6cbc 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
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"
 
diff --git a/media-sound/ventrilo-server-bin/Manifest b/media-sound/ventrilo-server-bin/Manifest
index 4cc0787108c5..3e6016a5dc68 100644
--- a/media-sound/ventrilo-server-bin/Manifest
+++ b/media-sound/ventrilo-server-bin/Manifest
@@ -2,8 +2,8 @@ AUX 3.0.3-conf.d.ventrilo 84 BLAKE2B 73d9732a8a53bff8600cde7ef5ff940fae859d03e49
 AUX 3.0.3-init.d.ventrilo 654 BLAKE2B bfb8ad3ab959623c085758e2a4accbaf13ad2bb550fe5611770bec13fbabecd1cb74f305c89934ae685be006b9e483debecac1f6c659ba7b6c62948f73cc51fb SHA512 55c4245de9045b012ff85fe3b025318522c7eb01f96671d5b8c48ad2ea4ba5778d25320ea7b9bec86d64cbfa8d13aaae88b0080d5547c43792ce5427b5ac6917
 AUX conf.d.ventrilo 82 BLAKE2B 16096c124731a288743e50ad2bca4a6dff12a2f54a9bd05275e1376e1170fcb811a79b7f23f72b223e4549eecdf5ad61c299a883ae5920bef04946b721558e9e SHA512 ada8c5fa3bb6a80cb31f8ce220527e91e9e70e39e12ef3db28ab42a0b2327e89684cb825b4e6d6ddaaf439c0797f3509eb6f5fc587226a967e9f2fcfc54eba45
 AUX init.d.ventrilo 601 BLAKE2B 98d59cf7bcf3ba0a29713c5203367e458d8fecf3f6179185ca502ccb187947bafd49090d65baea65ddc846a5ae770ef8bd0b766f72160a85f7b594b0aabe663d SHA512 5d3821e9dfc25709cbf54bd73ce2a4f44bbe2e73590f8b9349840a5bf235e375efa80966e25c92a8f79d38652cdf4d9a074e43c248a1e8ce02f50735bfbc09a1
-DIST ventrilo_srv-2.3.1-Linux-i386.tar.gz 166862 SHA256 5fd929056be6e44e61617080b157680cd3cd3432721a237076c01651ec2bb32f SHA512 01e8bce092f8b1ef0f08e736040871e221f4e039d21671d451abfcaf077be104e1f3488b90661e4895118d971f5e56040a01290734a02a4d5e67d183dc91cd5d WHIRLPOOL bcb226d07e8b52e82260b35c0d08dbe2ed06468519e596bdd1a0854b14050aba124a661181c7e697e75060eb1504b8806bbd77dbe1ea83dc378fcc69fc0abb6d
-DIST ventrilo_srv-3.0.3-Linux-i386.tar.gz 211494 SHA256 702a0cf88234e229b68e7a1f2624e23879541cb4e2c2b2f5f88591a85b364e56 SHA512 ac4b38d7ee5cb66b88507e5cfb810d28b98252dfbabdb8d3777ae4b4dfd7a793ae8e0ee0a4d3a03cf7d0d1b1b34162e5f026c7217d296201e48607e44f04e79f WHIRLPOOL 0fdfee56ac1457dc892033bd8de4b7d12628ecb62b1f0e06c083a87ae45b339356429879dfb5d080b1427572027722643db9aec2cfacc48fc48d710f3586a86e
+DIST ventrilo_srv-2.3.1-Linux-i386.tar.gz 166862 BLAKE2B 6eb4c55088d2aa6c9c7da0973f96dc849c9b0a93994206ed7ffcf2abdcce3fa73f0bead50158fc74c9275bfc7964826ce3b22328aaf0d73434a1185e3ca6b34e SHA512 01e8bce092f8b1ef0f08e736040871e221f4e039d21671d451abfcaf077be104e1f3488b90661e4895118d971f5e56040a01290734a02a4d5e67d183dc91cd5d
+DIST ventrilo_srv-3.0.3-Linux-i386.tar.gz 211494 BLAKE2B e75fba4c9f660de84913728aa0ad08af65b07004368640e47810110c0f694634d00421226accd904f23e2141e6be849da31b3604fe441f6ad610db2a1eb58147 SHA512 ac4b38d7ee5cb66b88507e5cfb810d28b98252dfbabdb8d3777ae4b4dfd7a793ae8e0ee0a4d3a03cf7d0d1b1b34162e5f026c7217d296201e48607e44f04e79f
 EBUILD ventrilo-server-bin-2.3.1.ebuild 894 BLAKE2B 0072076825fb50475418d63a16a5ed38b937c70601bb28b2b2f2b246ba63697f76d2fa485821acd620dbdc4f263aabecb124332e4379087d2515a0a9ded55e3a SHA512 5b58199a0ee8d844905593671cb228e0bc917a604329bcf0daed1d312c59225b564c05de144738d8c8ca1e341400fd0bdc5dc6448bccc2aed74a94efd39d8dd0
 EBUILD ventrilo-server-bin-3.0.3.ebuild 1081 BLAKE2B fb66a31cfcc3b067b5f8f0c5f35a71a0512dc83202f8053583883dea9e66b95027fad684b83d2545d87ea43c1852b3e0c38c7378c57e9994abeab163f38ceeb9 SHA512 687a6e67981d7125d4d36e9f383290a0c60bf1a8b535de8aad85d9eef8e3fea69deb73d73851ceb32fc388a92474d9f80e7b5f418dd6da335c2a4bac773a6b19
 MISC metadata.xml 372 BLAKE2B 1b26d3bb36d1dc84ed27fe0ebf0ce02abc995f9b17c16718b01ed35979daeb01fa9a9021c8314026a43e8d0baa69a67504890604f2bca5e6e3a4d1d6d9bfd17d SHA512 53e71d78ef4609a60a0f11d5579197455abf9fe5a050d387e92a0e1c2af50721cfd5b4756dfe61064b59d69c097650a94af5232fc9027fd62f9ca1a0e3977277