gentoo resync : 25.08.2020

4 files changed, 58 insertions, 24 deletions

diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 21828ef53d29..5a2e7b4eba72 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,6 +1,8 @@
 AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
-AUX qsampler-9999-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
+AUX qsampler-0.6.3-Makefile.patch 515 BLAKE2B b12882524ac5e0500a6c07804ed8b50ae085ac14873b723ca4ec2a71797da76711c5516ca0f6866994a1172d3f19ae671009d270be4429850e8bff0893044123 SHA512 0d49e0d178e638cddd69677c064368b5e6dc214c173286c3f6f82b1c469a875559bb25538ed8433d4e842d98418d344dc349ac454239983006b7cd4f195b1751
 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-9999.ebuild 1480 BLAKE2B e937433e396dfdb3474e9a5c53b4a4a45a0d729bfd6c08be4b07159e7d3cba8373887f513e6cfe5c981e977dd28bc05e5a7c629e8382f50ae3cc96f7fed48ea5 SHA512 520c03a9dc34616972b76f040f5438be71cf5395a5cca41053c864333f6d818fc17cad32c2760340760c1c018509bd420973778aa81cfacb5f96cb4fe0b9b304
+EBUILD qsampler-0.6.3.ebuild 1000 BLAKE2B 7bb7b8ef05cec4637340b639dfd562e2d16c0fae437aa987c50caccc62e8544d6c8b8cd33b4b1a5318acb395cd37cd8aa9d51a7236793b9aefa8e51601dc4274 SHA512 efdd00dd01f36a78e72f251a10e97816af5a18daa41135c488e8731e9a8fa93f8358088c41597b4426d33d319f5581a4df2d8f6f9c75fbe54b5801adfd55a27e
+EBUILD qsampler-9999.ebuild 1079 BLAKE2B 7b68bb9196760efef7f8f8880356d0ec511d238333d192a9bdcb587fe90a6c9d019b52b52ea8fcbb5011fe1313d11f6bcfabdfe94bedac5a594ced17aa38a65d SHA512 30123798a8c6dc1adc28ac1d6f0e2bdd4e35375bc720e1bbf4641a8f5d565e1b42c29feae3f6d3f4f0eb1f224b2b4b7fbb879cf2f75442a7483f4f46438d1682
 MISC metadata.xml 493 BLAKE2B 4df149f56c8c138f3a0037470860cc03040d482a75dfde7d27fa71526003c1fcfd42915cc822dc8d7de93aa73f034cb0c72e8882937770b7872d1db72ab6419d SHA512 1e64ef3cc6a1389548e5c88f676d68567f034cebcfbcdf14c369d5c73d914059fb2a8eff2f7e66b5700400b92560d042097ecf91b39712b8552f74fe1e75e6cd
diff --git a/media-sound/qsampler/files/qsampler-9999-Makefile.patch b/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch
index 5da44d8a8175..5da44d8a8175 100644
--- a/media-sound/qsampler/files/qsampler-9999-Makefile.patch
+++ b/media-sound/qsampler/files/qsampler-0.6.3-Makefile.patch
diff --git a/media-sound/qsampler/qsampler-0.6.3.ebuild b/media-sound/qsampler/qsampler-0.6.3.ebuild
new file mode 100644
index 000000000000..6cb59ab6dfc0
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.6.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 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"
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork: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="${DEPEND}
+	>=media-sound/linuxsampler-0.5
+"
+BDEPEND="dev-qt/linguist-tools:5"
+
+DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
+
+PATCHES=( "${FILESDIR}"/${P}-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-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index c59da124ba79..fbbbc262bb94 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -3,20 +3,21 @@
 
 EAPI=7
 
-inherit qmake-utils xdg autotools subversion
+EGIT_REPO_URI="https://git.code.sf.net/p/qsampler/code"
+inherit qmake-utils xdg autotools git-r3
 
 DESCRIPTION="Graphical frontend to the LinuxSampler engine"
 HOMEPAGE="https://qsampler.sourceforge.io/ https://www.linuxsampler.org/"
-ESVN_REPO_URI="https://svn.linuxsampler.org/svn/qsampler/trunk"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
 IUSE="debug +libgig"
 
-COMMON_DEPEND="
+DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
 	media-libs/alsa-lib
@@ -24,16 +25,14 @@ COMMON_DEPEND="
 	x11-libs/libX11
 	libgig? ( >=media-libs/libgig-3.3.0:= )
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	>=media-sound/linuxsampler-0.5
 "
-DEPEND="${COMMON_DEPEND}
-	dev-qt/linguist-tools:5
-"
+BDEPEND="dev-qt/linguist-tools:5"
 
 DOCS=( AUTHORS ChangeLog README TODO TRANSLATORS )
 
-PATCHES=( "${FILESDIR}/${P}-Makefile.patch" )
+PATCHES=( "${FILESDIR}"/${PN}-0.6.3-Makefile.patch )
 
 src_prepare() {
 	default
@@ -53,17 +52,3 @@ src_configure() {
 	cd src || die
 	eqmake5 src.pro -o Makefile
 }
-
-pkg_postinst() {
-	# these are not run automagically in live ebuild for some reason so running them manually
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	# these are not run automagically in live ebuild for some reason so running them manually
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}