media-sound/qsampler-9999: synced with the main tree

Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>

4 files changed, 61 insertions, 59 deletions

diff --git a/media-sound/qsampler/Manifest b/media-sound/qsampler/Manifest
index 8f646f9fc..4bf17f251 100644
--- a/media-sound/qsampler/Manifest
+++ b/media-sound/qsampler/Manifest
@@ -1,2 +1,3 @@
-EBUILD qsampler-9999.ebuild 1293 BLAKE2B e688c217272ae354ee1f1d4333823270583983ce0a7ec986b790dcd2c2f8a88b4a9a755ffea6cf81a10c81fbd690dcccf94dd7c4acbf0481fd8abc2296845a11 SHA512 4e09c7c695e4761566a8ff544afd4dfb5a51130676e36db1609b45a2e6fc9731fa4ad97303441b393322b050f90dc78e427da2f46e5e6cef515ff7160ece2bb8
-MISC metadata.xml 391 BLAKE2B 4a92044f4a08673ce2f6efa63f0da06694b516f67753f6783ff6d1a8d14ccb3dfe35c5849f892004f4a6cf94c170f37472dd6d3ec2ce831170ef2472219f8aca SHA512 534c42157a2a1a689d9fb056e7493b5674bb17ebbe554a0c36cceda9e9310f983c35ea9974194c5878acc2c730203fbbc65a7039df405e2aeed17211389e7820
+AUX qsampler-0.5.3-Makefile.patch 466 BLAKE2B 17d8ac1e29f6668a02fc7734d51f40e9f5a161da799fdeb2ddc5eaa89a69c607de6183fab78a13f4bec5a0efc002081589ca141f3232f37cc0051218f440fd5b SHA512 6f02c41941bacce8b49837471f5699960b069bd48e99b116402afa5452116890fa26da340a2e85b036d2051906b5eb828832598925b1d314de2a866eec47f155
+EBUILD qsampler-9999.ebuild 1103 BLAKE2B 9b7ed322f92821fe05051647c2601f67273e55c55c17feb04564f919b88fa4035f87ad13119fbc528f573f78b8867ccb2cd2af4ea770eee29a073fbecee682be SHA512 44f97614cf5b312e49485e92aa9434ddc4162c6bb24bf661feae90ae61f24653397d1c3eac9d87df1646024b77e5f96f60cc1fe21108d141d866a2112d12751b
+MISC metadata.xml 489 BLAKE2B c2d484bac1e1855e0469bca4e2bd14312a4bc568d3790eb39f42f2eb1dbc770934e3d618591450189706076eb39b9e070a152ea82e8ff00449526abe365a7412 SHA512 65a46d11884ae48588d530a6df9b8bee887bae57bd2c521521f5259ddc012d3abe7465fbf67d8b8ec8c1b45a4a2cc9fcbb1988d85315f02bae4bed704ddded1b
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 000000000..7f23e78b6
--- /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/metadata.xml b/media-sound/qsampler/metadata.xml
index a7e90777c..767b5af9d 100644
--- a/media-sound/qsampler/metadata.xml
+++ b/media-sound/qsampler/metadata.xml
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>fordfrog@gentoo.org</email>
-	<name>Miroslav Šulc</name>
-</maintainer>
-<use>
-	<flag name="gig">Enables GigaSampler instrument file support</flag>
-	<flag name="xunique">Enables X11 unique/single instance</flag>
-</use>
+  <maintainer type="person">
+    <email>fordfrog@gentoo.org</email>
+    <name>Miroslav Šulc</name>
+  </maintainer>
+  <use>
+    <flag name="libgig">Enable libgig support for loading Gigasampler files and
+      DLS (Downloadable Sounds) Level 1/2 files</flag>
+  </use>
+  <upstream>
+    <remote-id type="sourceforge">qsampler</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/media-sound/qsampler/qsampler-9999.ebuild b/media-sound/qsampler/qsampler-9999.ebuild
index 668353450..097079ef9 100644
--- a/media-sound/qsampler/qsampler-9999.ebuild
+++ b/media-sound/qsampler/qsampler-9999.ebuild
@@ -1,67 +1,55 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit subversion gnome2-utils xdg-utils
+EAPI=7
 
-DESCRIPTION="A graphical frontend to the LinuxSampler engine"
-HOMEPAGE="https://qsampler.sourceforge.io http://www.linuxsampler.org/"
+inherit qmake-utils autotools xdg subversion
+
+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="doc +gig +xunique"
+IUSE="debug +libgig"
 
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/double-conversion
-	dev-libs/expat
-	dev-libs/glib
-	dev-libs/libpcre
-	dev-libs/libpcre2
+COMMON_DEPEND="
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtx11extras:5
-	media-gfx/graphite2
-	media-libs/freetype
-	media-libs/harfbuzz
-	media-libs/liblscp
-	media-libs/libpng:=
-	sys-apps/util-linux
-	dev-libs/icu:=
-	sys-libs/zlib
-	virtual/opengl
-	gig? ( media-libs/libgig )"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS ChangeLog README )
-
-src_configure() {
-	emake -f Makefile.svn
-
-	econf \
-		--enable-qt4=no \
-		--with-qt5=/usr/$(get_libdir)/qt5 \
-		$(use_enable gig libgig) \
-		$(use_enable xunique xunique)
-}
-
-src_compile() {
+	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_prepare() {
 	default
 
-	use doc && emake docs
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
+	emake -f Makefile.svn
+	eautoreconf
 }
 
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
+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
 }