gentoo resync : 24.12.2018

7 files changed, 71 insertions, 177 deletions

diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 0bd9849a0c7d..3413dec89bc5 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,9 +1,4 @@
-DIST qsampler-0.4.0.tar.gz 243065 BLAKE2B 7a51b15ddc9ca80180eba8134dae400cb1cf15cbd73214ac827cf33cc5669e9d6d8cd12aa3f28fe1c11206102c76837c991732257317af6acf5eaf5314fc2f04 SHA512 42c235396cf68bd811fa251fd6f112a835ce1769130823163fa1a0e517431922b941aa56bc88f22890e6d6326b38765a2f3ced8e67a78d3420600f85e827d467
-DIST qsampler-0.4.1.tar.gz 243377 BLAKE2B 521dddf1e07c11bee489148f82b33663c0bfdc0357fe146548e88075de23a1224673b5ae40ea6cb0c5a45bfc6f8808d7854cb0e7c9420e6d0e8ebc6d4c5e9e19 SHA512 ffa6e2feb11f9a96580fb1803b6ddb5c56ae475c1f04b5bfa94b1403c29ed0e14f8f60e9166ca166d5b478184c37337b0de0e098a54f74a90f951260d070ce14
-DIST qsampler-0.4.2.tar.gz 244794 BLAKE2B 1b94c2a60537d20e62c31e05e4fb235b832b1bb808d508e10b1390fe039f5323280dd402f0bcd8df1e345f2b199f73baa6e16cc4e257ee9a92dea25d5738f88b SHA512 edebbc801e177cce44aa4e8cdc9db9e9e5c6cb35b75f33c4c15cae5920fa869053748075179c3b4d68956e30b05e5c94513419af567e60f27ca222f77fa41f30
-DIST qsampler-0.4.3.tar.gz 246314 BLAKE2B 8e4415aa8cfec8922881b569afde5cea4d6fbea27cc5518ef2abafb4a174d95031d235b7d226bde8074bd306ca09063bc5a09fb66fc56878521752dbfb7f6f58 SHA512 015b747bd7c796341c6516fec68dd3b12725f461f7e5e3898b24862af556d69d67d73354f0aaf3bfbca069ebe67de34121350dcd3ee8161ec12e6bae80227fb9
-EBUILD qsampler-0.4.0-r1.ebuild 963 BLAKE2B cab3f430d50fee97f4765cb97ebc688ff2f30e8c7659d1754a8d85e0c75ee9a88114ebeddd628432836ed88ff71cd8276e77c292a6685920ea58685556b08f2b SHA512 7b70af07ebf5d221140b208d58801c7df7ec772d0e99ec84c1b099b5dbfbfe55cde3516d1e30060bdd9149901a46bf107302e563fe999a3e00d6c9f721b69d98
-EBUILD qsampler-0.4.1.ebuild 946 BLAKE2B 7bf1a210b4090f134e8c922cf04565547ec83f79b8c7b63f0aa4949cfbf4153209a32a2fc3dc94fdd7b641c4ffd6aad941e3c844bf84511b51567ab1c11f22fc SHA512 a9b3ab3e38b00cf0188f1e35e0d9fc4df1b0035ef71d882e886105d4a0b4f3c3e76f288f109cdcff21be84ddb244f0b0288670c28fc1fcc0f7a9e766ab415a6e
-EBUILD qsampler-0.4.2.ebuild 946 BLAKE2B 7bf1a210b4090f134e8c922cf04565547ec83f79b8c7b63f0aa4949cfbf4153209a32a2fc3dc94fdd7b641c4ffd6aad941e3c844bf84511b51567ab1c11f22fc SHA512 a9b3ab3e38b00cf0188f1e35e0d9fc4df1b0035ef71d882e886105d4a0b4f3c3e76f288f109cdcff21be84ddb244f0b0288670c28fc1fcc0f7a9e766ab415a6e
-EBUILD qsampler-0.4.3.ebuild 978 BLAKE2B c2bbf6aaf288a947211ddad21c99365094eaa2b97e948318b7bdfe533bb33ddf0e708ce4301c5597049c6d67ddba3595049c7ac99401440d521200d71bdcb24e SHA512 50d4038e18d83d3fa9473b5dc03acee1e6fe1070250168dc3a05826ce3c7252e7e35b3f6d3a8bb13ab220c6ff60e66c2744824de8bc26c7e47bc4e539f176187
+AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
+DIST qsampler-0.5.3.tar.gz 259144 BLAKE2B 9efad81f6392cc6412e7d73c0701bdd2deab635a2857825248f003a594deb1a655201ed8e313b95cfaf066b71369f910a6634252b7ad7f2c636aa089c563f33a SHA512 0d870e1df1b20aac09b11667541767ebcadb8a9a8fb458aa3f48d4d4b2ff55b32e4e56e6d00b0330ab854120ace93b57f524a5126962456223026c7e69178bfe
+EBUILD qsampler-0.5.3.ebuild 1174 BLAKE2B f8fd1a22bb4cc9df434ae72a686bbb447ac936dfdad21a0120b176f5098005eaf67383c93f1900fe5203d84dd6fe98214967a4a5d3e400c78dccf7795c1c30fb SHA512 da85ec4df4096fb7f6c05633ddfe54ff653b9f0948b20ce9d5b9c882879baad016beb9bde8af43b54f4b862c2aa2d95ded8a8cf3dbd21907e8285ca10cfb1d0f
 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
new file mode 100644
index 000000000000..7f23e78b669a
--- /dev/null
+++ b/media-sound/qsampler/files/qsampler-0.5.3-Makefile.patch
@@ -0,0 +1,10 @@
+--- 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.4.0-r1.ebuild b/media-sound/qsampler/qsampler-0.4.0-r1.ebuild
deleted file mode 100644
index f64b383de284..000000000000
--- a/media-sound/qsampler/qsampler-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="A graphical frontend to the LinuxSampler engine"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5"
-DEPEND="${DEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf $(use_enable debug) \
-		$(use_enable libgig) \
-		--disable-qt4 \
-		--enable-qt5
-	cd "${S}/src"
-	eqmake5 src.pro -o Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
-	doman ${PN}.1
-}
diff --git a/media-sound/qsampler/qsampler-0.4.1.ebuild b/media-sound/qsampler/qsampler-0.4.1.ebuild
deleted file mode 100644
index 4dca71da49fa..000000000000
--- a/media-sound/qsampler/qsampler-0.4.1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="A graphical frontend to the LinuxSampler engine"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5"
-DEPEND="${DEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf $(use_enable debug) \
-		$(use_enable libgig) \
-		--disable-qt4
-	cd "${S}/src"
-	eqmake5 src.pro -o Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
-	doman ${PN}.1
-}
diff --git a/media-sound/qsampler/qsampler-0.4.2.ebuild b/media-sound/qsampler/qsampler-0.4.2.ebuild
deleted file mode 100644
index 4dca71da49fa..000000000000
--- a/media-sound/qsampler/qsampler-0.4.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="A graphical frontend to the LinuxSampler engine"
-HOMEPAGE="http://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5"
-DEPEND="${DEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf $(use_enable debug) \
-		$(use_enable libgig) \
-		--disable-qt4
-	cd "${S}/src"
-	eqmake5 src.pro -o Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
-	doman ${PN}.1
-}
diff --git a/media-sound/qsampler/qsampler-0.4.3.ebuild b/media-sound/qsampler/qsampler-0.4.3.ebuild
deleted file mode 100644
index 6eebb29abc59..000000000000
--- a/media-sound/qsampler/qsampler-0.4.3.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils qmake-utils
-
-DESCRIPTION="A graphical frontend to the LinuxSampler engine"
-HOMEPAGE="http://qsampler.sourceforge.net http://www.linuxsampler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +libgig"
-
-DEPEND="media-libs/alsa-lib
-	>=media-libs/liblscp-0.5.6:=
-	x11-libs/libX11
-	libgig? ( >=media-libs/libgig-3.3.0:= )
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtx11extras:5
-	dev-qt/qtwidgets:5"
-RDEPEND="${DEPEND}
-	>=media-sound/linuxsampler-0.5"
-DEPEND="${DEPEND}
-	dev-qt/linguist-tools:5"
-
-src_configure() {
-	ac_qmake="$(qt5_get_bindir)/qmake" \
-		econf $(use_enable debug) \
-		$(use_enable libgig) \
-		--disable-qt4
-	cd "${S}/src"
-	eqmake5 src.pro -o Makefile
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README TODO TRANSLATORS
-	doman ${PN}.1
-}
diff --git a/media-sound/qsampler/qsampler-0.5.3.ebuild b/media-sound/qsampler/qsampler-0.5.3.ebuild
new file mode 100644
index 000000000000..b6f28fce46ce
--- /dev/null
+++ b/media-sound/qsampler/qsampler-0.5.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg-utils
+
+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}/${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
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}