gentoo resync : 20.03.2022

3 files changed, 2 insertions, 39 deletions

diff --git a/media-plugins/qmmp-plugin-pack/Manifest b/media-plugins/qmmp-plugin-pack/Manifest
index 274e05187a0c..8b8dac32ee2d 100644
--- a/media-plugins/qmmp-plugin-pack/Manifest
+++ b/media-plugins/qmmp-plugin-pack/Manifest
@@ -1,5 +1,3 @@
-DIST qmmp-plugin-pack-1.5.1.tar.bz2 226034 BLAKE2B 804e18c538119bfe89700f1975ff717c20bb65c2b956c30dae91d1ab2a06baf716a07809d1391f1844dadc3e8524fb6d37106b33091b91109a19f323b0942306 SHA512 0242754fdea26fc7c48a18edf77d35820af86643079c729465d9e4ddacb22470686e9d2771abe52e30441f97db5f1546ab984e941396d4cc67e7a0a1450328f3
 DIST qmmp-plugin-pack-1.5.2.tar.bz2 230341 BLAKE2B 4959be4423f08cf1c0d16cf8f454167a7f7795786258526ce72ed694e8a33388cfe6308ff861f29011fcbb63563552965cea6c04a002b9ac40f1ab959d7fc232 SHA512 d2e7b1545e41ec40fa4b165f7154d76211fd4fb004c79f801caced0fb8972d182e9c393705ce2d9aa4359e00dbe51c9efdf499ae85f8d8578d68fcb4e108d7d5
-EBUILD qmmp-plugin-pack-1.5.1.ebuild 683 BLAKE2B 77404c7461cafbf794b558f370715fbfaabcbb593de681190c72ab7bebf9aedbecbef53aaeb301dfe5bb5f4ee532529aa7cbcd88f5477305fc334fb7bdfb0bab SHA512 aa170ba7a5889e2b38a9177165a19089b1897274b213bcb82b7a9bc21b23db36b9cdad1693878d26d0f7c4124eed09123f6210dfc282023e03b7596f6b6c3f14
-EBUILD qmmp-plugin-pack-1.5.2.ebuild 685 BLAKE2B 87ab402a828f5997daa25d1f8ff26d18630b3b3026adbdb1a4e249d5a1357fec59398273256987da9e150ab92ca219a70b39cf300045f05aadf7271d34caa69a SHA512 5df4c11ab57f1ff48e3ca28ba1c4bb98561a5a8349e845fb82f8a0ba9279076bd93c8074c0ccd731c137a367073450927b96835ec926974f4c2f3d50ed7ffd71
+EBUILD qmmp-plugin-pack-1.5.2.ebuild 683 BLAKE2B 55cc2fdc439fa5b59cb6585dcb3431f66b8f9a01278f4c9230b2f0cf2b2257e7917b83510a67c6c5486234d0d5081c9a00dbdd167d7a2163c7ebea521dfca9c9 SHA512 5c6724829bcb79ce0b67952867823b2ff940138d8a625ac5a89307623df289a5b915d1f532fcc59d03b41a5a1952f7f0b717b7f4a5c7f5eef95fa9012ad7e891
 MISC metadata.xml 254 BLAKE2B 7f76152858fde96b9de5250e4cba30bfe0c5f2aa6ec7c84316072d84e4b664ecd6485642d3d184b1f2ddde8d9e03a94dd47dd00c5b8d82f80c5c0993d5627593 SHA512 7ed31d18221f55928f798dbf095166f535f7c0f5a1c3010b5113fd6b0d275af283f3d2e6839591335ec93bcd50aab5d0f104ad76eefda4d7a6b64d41af183f0b
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.1.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.1.ebuild
deleted file mode 100644
index 16ab2fbd5275..000000000000
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A set of extra plugins for Qmmp"
-HOMEPAGE="http://qmmp.ylsoftware.com/"
-SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	media-libs/libsamplerate
-	media-libs/taglib
-	=media-sound/qmmp-$(ver_cut 1-2)*
-	media-video/ffmpeg
-"
-DEPEND="${RDEPEND}
-	dev-lang/yasm
-	dev-qt/linguist-tools:5
-"
-
-src_configure() {
-	append-ldflags -Wl,-z,noexecstack
-	cmake_src_configure
-}
diff --git a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.2.ebuild b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.2.ebuild
index e567073cd376..db3d82b3054f 100644
--- a/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.2.ebuild
+++ b/media-plugins/qmmp-plugin-pack/qmmp-plugin-pack-1.5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="