gentoo resync : 25.11.2020

3 files changed, 2 insertions, 98 deletions

diff --git a/media-sound/guayadeque/Manifest b/media-sound/guayadeque/Manifest
index 6277cc6efd75..4ab1d4bf0ee8 100644
--- a/media-sound/guayadeque/Manifest
+++ b/media-sound/guayadeque/Manifest
@@ -1,9 +1,7 @@
 AUX guayadeque-0.4.5_p20170110-missing-aui-component.patch 404 BLAKE2B 9c17048796afe328fb136808c2cb88f8f9a7cada5a4f6cd8a01c0a398e8b93cc0d6158792097cf88e600beebd6105bd9036e9aa3ddf8da16878e7d5f82746ea2 SHA512 539fac802c3e91217f4eb6c5adf456f7e5bc2d53e1103cf54255514b0793e3ed17de84048ea31c5a03ea6121fae01ef712339dcc8e269d678e1272f757976029
 AUX guayadeque-0.4.6-gcc10.patch 2981 BLAKE2B a925446bca10a9f96a0babe889d151cc49792810c95295a0c0dc17796744b7486307c354fb47c07518e0f33b41cb8428feb1cc355678c78fb731cecf378c0068 SHA512 a998f055ef831bbd30c624b157de31ad847d3a8f838586e40ba7f978e184eb22914e036fb927794e61b432352d888cf808a90dde2e29458e203297e11079d144
 AUX guayadeque-0.4.6-metadata.patch 716 BLAKE2B 2dfd57e859eebfb174b6e66c3b9f11cad4af49a3ad615f1f6e53d7cd86c4e9851c8d7d78ba47ed1785cd2eab4017bc43720e9b3dbf4990d06165355c505fba32 SHA512 5d3d861eebaa629031de6186846353798b7178801d6b7c07344bf75d952891d17f90237986949bc4b12984b8635ae4d1f9fc8a319d2199bd6f22cc7669dcc564
-DIST guayadeque-0.4.5_p20170110.tar.gz 2070855 BLAKE2B a8783a61df636e3ddf1473ba20450c89eeb977e06491e840743e7b8a7aa1a7515138ecf8f6c92a27f0c762363ef12c094927192b254ae238196ac6d967fd84d1 SHA512 57215ba47574fba615b33d72f45279c3726035bea38746f7d927a39866fb3fa8a3fb1dbd13fe672c7daba16a2131fbf4b89afed6a3bf8d9a584e5112d926f518
 DIST guayadeque-0.4.6.tar.gz 2074965 BLAKE2B a6076a60f6560f51f1fa1ac7aca0529823d6579726049cfda212ae42e62c6f86ca18e8c06aa60d8e23c8accf51d4363ebe4b69b50ce5224f7db3215c32acf12f SHA512 d353aa492b393a5043cdab2d151d715381c3d9d50cad393ca5687b5c556257641fc2b5eda53772098c8c0621fba88ae693179d07a1085d5b69aab1e5d06459a7
-EBUILD guayadeque-0.4.5_p20170110.ebuild 2184 BLAKE2B e02a617872ba5b769eeff72398dcae731cd59c6751452ad04fe814125177287625f331f3d843c4a20a756721155d8b37216db1e14895e2021f21c987585d1029 SHA512 714a5a08df3e418aa14b188fc6108b940f93259cc3a5197517c5726de51fa9a940ef6ed93e69a4f88bafd074e75e1ea1c4939faa720c831978e5eea611104f55
-EBUILD guayadeque-0.4.6.ebuild 2358 BLAKE2B 1de77cf75e181cca529643b64d9a1ba4d472733839cef373404fa137017129abc4a138858363ea640e79e34b6f73e6003f50899cbb294fe1de672456c80aeb60 SHA512 6307ffe61b9e819ad93bff03d441850583702432a60fe8b00933cae6fc836adc17bb7371ee2429efa33e4c5d2ab6ab9f172987472708aa317857e900b5072c3f
+EBUILD guayadeque-0.4.6.ebuild 2356 BLAKE2B b7b8c58c38fad216bd73f236cf7797b49e8ff19b1aedf7291a5ff9a6b8db31dbb5c36153b3c5b86ab1f42ac3a8e83968d95b572325d5e9395c16986c3b62c9d7 SHA512 c0b9aef324c9e370e5262c1ba8e0c3efa08c103eeec067bda9dbb69e4cf33794c6fbb6ff931423c5b9e6f30875a8e3cb17ca3df800cbb0b618eaab14de1ec266
 EBUILD guayadeque-9999.ebuild 2282 BLAKE2B f785e50bc117afb1baa8076399c26d12a8afd75564745c966e87ad8b5d1696b4b0eb56f881c932b9680871aa60104b5bcb86d6ad2c8b9bd90b7389b1b3d1d77b SHA512 f9b444bef5266a22cef7bc802a1ef36317b2ad21a0a9801ef63f8a477c573cf5788fb0c8f89fd3dc765129f7c714bf1d55733ad0270f4d93996901c24e549bb0
 MISC metadata.xml 410 BLAKE2B d61d13faa8d5bb87bf8ef99b6841a4a05091db82d5961c69d5d922782d091639aff1919f843a92da39ee7181dcd1a8d94d63b83b9c80f1c17cc6c55fc79bf985 SHA512 826a540e373fdbe9027eb0bf9f66a6e7fd61c1b355a5b0cdbc00e2517e3b2e1b23224e6f0bc6025553c49135f4851422ff2055a2c681c9d42fa11f2fab905f3c
diff --git a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild b/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
deleted file mode 100644
index 5becf50651c6..000000000000
--- a/media-sound/guayadeque/guayadeque-0.4.5_p20170110.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER=3.0
-
-inherit cmake-utils vcs-snapshot wxwidgets
-
-DESCRIPTION="Music management program designed for all music enthusiasts"
-HOMEPAGE="https://guayadeque.org/"
-SRC_URI="https://github.com/anonbeat/${PN}/archive/9fec4f7b85095fa2d9f8e4d39c0cf5015f7624fa.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="appindicator ipod +minimal"
-
-# No test available, Making src_test fail
-RESTRICT="test"
-
-GST_DEPS="
-	media-libs/gnonlin:1.0
-	media-plugins/gst-plugins-libav:1.0
-	media-plugins/gst-plugins-libnice:1.0
-	media-plugins/gst-plugins-pulse:1.0
-	media-plugins/gst-plugins-soup:1.0
-	media-libs/gst-plugins-bad:1.0
-	media-libs/gst-plugins-ugly:1.0
-"
-RDEPEND="
-	dev-db/sqlite:3
-	>=dev-db/wxsqlite3-3.2.1
-	dev-libs/glib:2
-	media-libs/flac
-	media-libs/gst-plugins-base:1.0
-	media-libs/gst-plugins-good:1.0
-	media-libs/gstreamer:1.0
-	>=media-libs/taglib-1.6.4
-	net-misc/curl
-	sys-apps/dbus
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	appindicator? ( >=dev-libs/libindicate-0.7 )
-	ipod? ( media-libs/libgpod )
-	!minimal? ( ${GST_DEPS} )"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PF}-missing-aui-component.patch"
-)
-
-# echo $(cat po/CMakeLists.txt | grep ADD_SUBDIRECTORY | sed 's#ADD_SUBDIRECTORY( \(\w\+\) )#\1#')
-LANGS=( bg ca_ES cs de el es fr hr hu is it ja nb nl pl pt pt_BR ru sk sr sr@latin sv th tr uk )
-
-pkg_setup() {
-	setup-wxwidgets
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bundled libs
-	rm -rf src/wx/wxsql* src/wxsqlite3 || die
-
-	# comment out unused languages
-	cd po || die
-	local l
-	for l in "${LANGS[@]}"; do
-		! has ${l} ${LINGUAS-${l}} && cmake_comment_add_subdirectory ${l}
-	done
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_IPOD=$(usex ipod)
-		-DENABLE_LIBINDICATE=$(usex appindicator)
-	)
-	cmake-utils_src_configure
-}
-
-pkg_postinst() {
-	if use minimal; then
-		elog "If you are missing functionalities consider setting USE=-minimal"
-		elog "or install any of the following packages:"
-
-		local pkg
-		for pkg in ${GST_DEPS}; do
-			elog "\t ${pkg}"
-		done
-	fi
-}
diff --git a/media-sound/guayadeque/guayadeque-0.4.6.ebuild b/media-sound/guayadeque/guayadeque-0.4.6.ebuild
index d9bb5a095471..02eecd472933 100644
--- a/media-sound/guayadeque/guayadeque-0.4.6.ebuild
+++ b/media-sound/guayadeque/guayadeque-0.4.6.ebuild
@@ -20,7 +20,7 @@ HOMEPAGE="https://guayadeque.org/"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="appindicator ipod +minimal"
 
 # No test available, Making src_test fail