gentoo resync : 31.03.2018

5 files changed, 3 insertions, 84 deletions

diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 1d01e66c714d..e3882f336bc1 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/kaudiocreator/Manifest b/media-sound/kaudiocreator/Manifest
index 88c860f98dab..6cc2bcd8f41e 100644
--- a/media-sound/kaudiocreator/Manifest
+++ b/media-sound/kaudiocreator/Manifest
@@ -1,3 +1,3 @@
 DIST kaudiocreator-1.3_p20170806.tar.xz 706008 BLAKE2B 62f2a3106c581e43921a1b8abcc78039b45773d618e531d77f00cbcd121722aa2bf8ef0d4f009f656400d55f414aebc69742b2fe736ec5ea08d7106e18573f6e SHA512 0e06092f8519e9a5a1341f828442de5eace4982723fcb466c23e771d4c42f0c67e91bbf59e6a924d0dc9f2cb8b7b04aaa1660ac97a0075ea6aae155f6a4b2533
-EBUILD kaudiocreator-1.3_p20170806.ebuild 1736 BLAKE2B d675f24abd461257d92b23f59f9e590a812af488c746eacd0bb3a37eea3884522dfacef39d87649c0bc17b40558abb7b611a06632b116178e6bef7014ae0c8dd SHA512 d0e0243bc0a81779a42dff40b236a31daf9c3040c566d48dc696537051c616e869f5de87ddea88eaa150c610e88ea023110ab095c342a2202e688c1563e9bd5f
+EBUILD kaudiocreator-1.3_p20170806.ebuild 1737 BLAKE2B 72df346f68cab5e0a7c49e815feb525f2424b2b09a76379bff97d70d5d2f6d40cb30cc12f8e5a2f15a33b5a8d5b483da722f644d8a102c793b2aee1908758d98 SHA512 23b6544b34348d39102f9a4417b9534ffcb47fcddf53487f22662f981d13a08f16bd1ef56374794c87df7c2d57e8602bee1be5d8f0105a4a2d30ee20f3533372
 MISC metadata.xml 355 BLAKE2B 37b0260333559b93b9952b5a74e13010e7f2ddd57959f8bbd66ec5087ef180bcfdb6e82179ab99ad263b0cf04e1673461b4a6fa292992e74d63028d3d220e844 SHA512 c755125a1f6939ebb9f280bfaed947da3b6455dd66ba1db80eda78142386c3673b44d564922a522055d64015c2e99afd80ac523fb73ad388f6eca7f8aced2760
diff --git a/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild b/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild
index 8e50d973dccc..55c8e84afbb6 100644
--- a/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild
+++ b/media-sound/kaudiocreator/kaudiocreator-1.3_p20170806.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ KDE_TEST="forceoptional"
 inherit kde5
 
 DESCRIPTION="CD ripper and audio encoder frontend based on KDE Frameworks"
-HOMEPAGE="http://www.kde-apps.org/content/show.php?content=107645"
+HOMEPAGE="https://www.kde-apps.org/content/show.php?content=107645"
 SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
 
 LICENSE="GPL-2 FDL-1.2"
diff --git a/media-sound/picard/Manifest b/media-sound/picard/Manifest
index af2bbe71d46e..436d0ef12181 100644
--- a/media-sound/picard/Manifest
+++ b/media-sound/picard/Manifest
@@ -1,8 +1,6 @@
 DIST picard-1.4.2.tar.gz 2116021 BLAKE2B 9629d312df20a8c69b383b424724ef4cf9f774ae70b9e11b1c6c7f96cafea575657875642af70a73633ca79eb8c79237ada16dd5ff7c021d4bdb4a0df7890de3 SHA512 5e4a6a8cfadd86b7015ab77da1969acec26e0ed92564c6634afeee5060d33d34e8fc83015880e6c8f17df66c8d15b86a85031dbe5b596c995579fb449cf8a74e
-DIST picard-2.0.0_beta1.tar.gz 2661429 BLAKE2B ebffb2651e778c2cec8a4e41307d99c30038f36096b343489d7384b1cb4ac9a3492f23a4c69ec8a0be59306efc5cf4c9098a114445be6965ed243156dcee2803 SHA512 e2fc5dadf3e469df4ed16b1827909a60a54e7dc047e1ecd80480d9283a5795e3e792b31970eb6834590ba2ea12378ec18ef404b47237c38299350ee1d9acec9d
 DIST picard-2.0.0_beta2.tar.gz 2664130 BLAKE2B b1397744ee55f239a7518070ded63e69695e604e4975ca5b5173ce9c22eb795ac436e3695ae6cfa82ec098db03c2d009dd0e206388df4358947238e0e54d43a1 SHA512 7cba2d77a0b8a1c94984331bb9071a62c235193a593b79344b04c60c9ec4966960a44631db3c983a10060fa76e6cd46010d3c5f51f8eab3a19fa065a12129a6b
 EBUILD picard-1.4.2.ebuild 1575 BLAKE2B 12569c5ec7b03149bd3531b43a9e4f1aa793fd4f4479dac64eddef330121a60b64d266bc137f23f173338f50f82a51ddc25a524402f8cc0b5cd914a80a5c7942 SHA512 6aa9a13582a27d8647cdfe63f3b87369c7a14c642d5dde95f0a5add6d910fe3ac1794c956503d4e73a5ad786f80b4aef3cf689907afd9238e657945bbdbf43e3
-EBUILD picard-2.0.0_beta1.ebuild 1869 BLAKE2B 2d128e1012b412dd77df05d2236d1c998daea8d7e140b9c245558718aaa39498206c31ac60cf13234d7349d9669c951e515973c5082a440515bb5c23131168e1 SHA512 ab016780ef055c62ab7b7cf82d31212db11f1e7e5a118c3d2f5462cd0df01d631f6db6962f11b40cb968763cbfbe272ae1601f0fc985dfdf69410f4061e279db
 EBUILD picard-2.0.0_beta2.ebuild 1867 BLAKE2B 1bb3e167a5f1d6c2541b88a19d222a2c161fe15c6fe32452a1c152de21e079586571751c705ade41f57799c4034964f65646bcf37da1261a0a07594e4cdc2136 SHA512 3f2eba818d92c1a0affce11cb15431394f3627126e88a5774571c161d2c9a2ca3ddb9437e57ff1ea8c3a0eaf1c95933da9c0fac9cab8d3183a22fdb1269414af
 EBUILD picard-9999.ebuild 1698 BLAKE2B e2a3f8d9f18bc4560afa0dd926487d5a7ba1d609870c67cfd569c71ba25f623613796ee3fe61c3d2884670af6c64a609e12d7ba2667f64a6bcb87eb1724eea6d SHA512 d780f2c5855f59314d86089eed73b60c35dbe0083198b38bb4b61231affa31c3a7fc184083c593e3fde6c39cb4f4e561d2bc10d4bd57cd7226187bd9e3c60b75
 MISC metadata.xml 564 BLAKE2B 0408874b350710d85cd50f27158d074ee0a22c392822bfd7d90ae455906934c6ec1fd5963f4f225d2852a7bcbb5f74ec756b8c5ae449d2159ef52d552f6da954 SHA512 ce79b6abdff9db80eeac888838dea351058b17e90ffc5b13d4b446203531948f80705ef4184b35623fef1a0952f0071d5b4588f2fee5d93cebbc902a1a97577d
diff --git a/media-sound/picard/picard-2.0.0_beta1.ebuild b/media-sound/picard/picard-2.0.0_beta1.ebuild
deleted file mode 100644
index 99c6bf39afd7..000000000000
--- a/media-sound/picard/picard-2.0.0_beta1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{5,6} )
-DISTUTILS_SINGLE_IMPL=1
-DISABLE_AUTOFORMATTING=true
-
-inherit distutils-r1 gnome2-utils readme.gentoo-r1 xdg-utils
-
-DESCRIPTION="A cross-platform music tagger"
-HOMEPAGE="https://picard.musicbrainz.org"
-SRC_URI="https://github.com/metabrainz/${PN}/archive/${PV/_beta1/.dev4}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	dev-python/PyQt5[declarative,gui,network,widgets,${PYTHON_USEDEP}]
-	dev-qt/qtgui:5[accessibility]
-	>=media-libs/mutagen-1.38"
-DEPEND="
-	nls? ( dev-qt/linguist-tools:5 )
-"
-
-RESTRICT="test" # doesn't work with ebuilds
-
-# upstream quickly renamed to dev4 after buildsystem and runtime(!) were broken by 'beta1'
-S="${WORKDIR}/${P/_beta1/.dev4}"
-
-python_compile() {
-	local build_args=(
-		--disable-autoupdate
-	)
-	if ! use nls; then
-		build_args+=( --disable-locales )
-	fi
-	distutils-r1_python_compile ${build_args[@]}
-}
-
-python_install() {
-	local install_args=(
-		--disable-autoupdate
-		--skip-build
-	)
-	if ! use nls; then
-		install_args+=( --disable-locales )
-	fi
-	distutils-r1_python_install ${install_args[@]}
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	local DOC_CONTENTS="Install optional package media-libs/chromaprint[tools] to enable
-calculation and lookup of AcoustID fingerprints.
-
-Install optional package dev-python/python-discid to enable
-calculation and lookup of compact disc identifiers (disc IDs).
-
-If you are upgrading Picard and it does not start, try removing
-Picard's settings:
-	rm ~/.config/MusicBrainz/Picard.conf"
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}