gentoo christmass resync : 25.12.2020

4 files changed, 2 insertions, 63 deletions

diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 103220589abc..8992bcec40b0 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,9 +1,6 @@
-AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
 AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
 AUX qsampler-9999-Makefile.patch 701 BLAKE2B cc95a22d6e003d3b25993e2068e2101684a85da1b8ac47c35ae330dcebd9f72ab3cc2931f1ec840d484c3f1871c0991ab90d45e1744de9fabcec293a3e260f28 SHA512 7f582fa7103d77f79c14671551ffe9ce83ac4ac0a12ee76f5fd63a670d5838af6a2b7718b8de27946b8e1234081b7316fbc4837a94ceb28063797027f54cddb3
-DIST qsampler-0.5.6.tar.gz 260607 BLAKE2B 52002ad95fe11266337f058124e7ae33947eb50ce5b12574c9091c10827bff2a8135a52bd53dd030be0394fdb39c2bd034308ae9d615c0b74ad660a06573446b SHA512 2a3a322fec31d9c66d7d1e9b4a7f74629e4b2bcf3ee2350bca8d450d2f68c41ac80563f8e28bd5314f00f0387503aa1e33c0b94ff518cca27b2ca93d9d72334e
 DIST qsampler-0.6.3.tar.gz 284613 BLAKE2B a4ef67014578b4eb7b6f6e7b5da94b04253a40bed0cc413acfde62f4660d2e1d3485d301637d1871e7f20dcdac34ea81511738a4455f8690f40460d7ea4db72b SHA512 55fe16d5cfe0245cfedb228d448235997160471343191cf204347bb13c260be747a06fce2344b36a60c5877f89b32b0f4ac4861ed8a3d555d4cc798f21f5e1ae
-EBUILD qsampler-0.5.6.ebuild 1018 BLAKE2B 8a350360a4d6bc54ae75a3f2e895a4711cc50532f62cf3d260a38a25142ee7531b4641bbeb539e41b35864ad5d37834d7fda94f827eb8c3dbac3a34057cf6c36 SHA512 254e07e7188f7fa5a381e04826f2a5aa0c636c74fcbbcec66cd144b3575c1d813021309acc8843ddd31f62677054d5ecd71d915195ccd611c64cab9a8bf4a004
-EBUILD qsampler-0.6.3.ebuild 1000 BLAKE2B 7bb7b8ef05cec4637340b639dfd562e2d16c0fae437aa987c50caccc62e8544d6c8b8cd33b4b1a5318acb395cd37cd8aa9d51a7236793b9aefa8e51601dc4274 SHA512 efdd00dd01f36a78e72f251a10e97816af5a18daa41135c488e8731e9a8fa93f8358088c41597b4426d33d319f5581a4df2d8f6f9c75fbe54b5801adfd55a27e
+EBUILD qsampler-0.6.3.ebuild 999 BLAKE2B 3799e7cf4eb2c7695e532e3e2dbb8790a8715937d74108f4a83367d4a885d965e9f3b2f2beba21b0ca587ba6219f30022807b887a260666e461e22a2580eb03f SHA512 2818e544b0b51e87812f60d0bf02a6033faff016ef2e0ed6574dbc599786329b0fa5ad637def0b1cb1787ac8ee17a39e3c40398ed2e22a8580a9e72473702493
 EBUILD qsampler-9999.ebuild 1072 BLAKE2B 756a2fa86b6e39d464018c6873017f8c914c59b08a9d3ae702af01fd20549daf7e2249591045b1a3ce6cdf6f3acf24f4be567749ee943c09a6fafd6dcbd8a2bd SHA512 9a58651e257148e1d13979573d036047acea54a60566dc2e979d7008b34e11e11e756220f816af0e70ca20facddef6869c615a3f30a7ea66d79443a56a0011cf
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch b/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
deleted file mode 100644
index 7f23e78b669a..000000000000
--- a/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/Makefile.in	2018-12-16 23:40:26.001395069 +0100
-+++ b/Makefile.in	2018-12-16 23:46:00.210638503 +0100
-@@ -109,7 +109,6 @@
- 	@install -d -v -m 0755 $(DESTDIR)$(mandir)/man1
- 	@install -v -m 0644 $(translations_targets) $(DESTDIR)$(translations_dir)
- 	@install -v -m 0644 $(name)*.1 $(DESTDIR)$(mandir)/man1
--	@gzip -vf $(DESTDIR)$(mandir)/man1/$(name)*.1
- 
- uninstall:	$(DESTDIR)$(prefix)/bin/$(name)
- 	@$(MAKE) INSTALL_ROOT=$(DESTDIR) -f $(name).mak uninstall
diff --git a/media-sound/qsampler/qsampler-0.5.6.ebuild b/media-sound/qsampler/qsampler-0.5.6.ebuild
deleted file mode 100644
index ab5a0073a2c5..000000000000
--- a/media-sound/qsampler/qsampler-0.5.6.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg
-
-DESCRIPTION="Graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="debug +libgig"
-
-COMMON_DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtx11extras:5
-	media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=media-sound/linuxsampler-0.5
-"
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
-
-DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
-
-PATCHES=( "${FILESDIR}/${PN}-0.5.3-Makefile.patch" )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable debug)
-		$(use_enable libgig)
-	)
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf "${myeconfargs[@]}"
-
-	cd src || die
-	eqmake5 src.pro -o Makefile
-}
diff --git a/media-sound/qsampler/qsampler-0.6.3.ebuild b/media-sound/qsampler/qsampler-0.6.3.ebuild
index 6cb59ab6dfc0..049457c6e582 100644
--- a/media-sound/qsampler/qsampler-0.6.3.ebuild
+++ b/media-sound/qsampler/qsampler-0.6.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug +libgig"
 
 DEPEND="