Add a new ebuild with jack and alsa USE flags, so that at least the desktop file can be updated to run Qsynth without jack out of the box when not using it.

Package-Manager: portage-2.1.3.15

4 files changed, 103 insertions, 8 deletions

diff --git a/media-sound/qsynth/ChangeLog b/media-sound/qsynth/ChangeLog
index 43c869f78b50..21a6fac08d21 100644
--- a/media-sound/qsynth/ChangeLog
+++ b/media-sound/qsynth/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/qsynth
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.23 2007/10/19 20:48:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/ChangeLog,v 1.24 2007/10/21 12:28:42 flameeyes Exp $
+
+*qsynth-0.3.1-r1 (21 Oct 2007)
+
+  21 Oct 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +qsynth-0.3.1-r1.ebuild:
+  Add a new ebuild with jack and alsa USE flags, so that at least the desktop
+  file can be updated to run Qsynth without jack out of the box when not using
+  it.
 
 *qsynth-0.3.1 (19 Oct 2007)
 
diff --git a/media-sound/qsynth/Manifest b/media-sound/qsynth/Manifest
index 37ec5b90c5bd..c79fd4f9be15 100644
--- a/media-sound/qsynth/Manifest
+++ b/media-sound/qsynth/Manifest
@@ -12,14 +12,18 @@ EBUILD qsynth-0.2.6.ebuild 770 RMD160 7b05e753926106a2fe38abe18c1e493892600ae6 S
 MD5 3ba38d406ed49f6b59a75fa850e8ea5c qsynth-0.2.6.ebuild 770
 RMD160 7b05e753926106a2fe38abe18c1e493892600ae6 qsynth-0.2.6.ebuild 770
 SHA256 f94f4e8e4565bd8f9cb4d79278ef1e8c2422d4dcf9e78ccf27015785fab80d0e qsynth-0.2.6.ebuild 770
+EBUILD qsynth-0.3.1-r1.ebuild 2343 RMD160 37d201f7299f21ac8c316c14a777c15f7cd137e8 SHA1 ca28a248073113d6527dc4a8484fd4fcfdab53cf SHA256 1b1e6ea100634a331dbc087f000e21f2f9674e0d147c2822776cf1d45faca09c
+MD5 9345e0fe91b747a81555a8ee4526ade2 qsynth-0.3.1-r1.ebuild 2343
+RMD160 37d201f7299f21ac8c316c14a777c15f7cd137e8 qsynth-0.3.1-r1.ebuild 2343
+SHA256 1b1e6ea100634a331dbc087f000e21f2f9674e0d147c2822776cf1d45faca09c qsynth-0.3.1-r1.ebuild 2343
 EBUILD qsynth-0.3.1.ebuild 1217 RMD160 3af41afd24b25d0c5f22a9f559bcb88e09271cd0 SHA1 cfadaace9c7192b35fcd8c4566b360e5c201a966 SHA256 7e0e05f32cce8797bc86b3ebd42f0d02bfabb1c1f49c11d332fe879504ed1b3a
 MD5 aa17c35def2658f041c26631d7e4b4bb qsynth-0.3.1.ebuild 1217
 RMD160 3af41afd24b25d0c5f22a9f559bcb88e09271cd0 qsynth-0.3.1.ebuild 1217
 SHA256 7e0e05f32cce8797bc86b3ebd42f0d02bfabb1c1f49c11d332fe879504ed1b3a qsynth-0.3.1.ebuild 1217
-MISC ChangeLog 5731 RMD160 8f15e4ddce100a450493aeffbc86d1ac6343c442 SHA1 4b1fcba9ea9bfeab149a91023e4f8746f2621f5d SHA256 fdb4a151f35f66c21de18ef5b84bfe6162307e328c10df41fbf933bbddb84e10
-MD5 efa35bcc602777c23b1bab3648f801be ChangeLog 5731
-RMD160 8f15e4ddce100a450493aeffbc86d1ac6343c442 ChangeLog 5731
-SHA256 fdb4a151f35f66c21de18ef5b84bfe6162307e328c10df41fbf933bbddb84e10 ChangeLog 5731
+MISC ChangeLog 6007 RMD160 30b3379ae259815ac83ebe2e29d05a3f510faf25 SHA1 8a745ee66d23e4dcd921a672b95e849cd4aeaab1 SHA256 71eb7ef678d3ff0cccc96201f1257d4db715c98bd774922c43c8042b63c71251
+MD5 9cf0bb1c5edf041031db741d344bf019 ChangeLog 6007
+RMD160 30b3379ae259815ac83ebe2e29d05a3f510faf25 ChangeLog 6007
+SHA256 71eb7ef678d3ff0cccc96201f1257d4db715c98bd774922c43c8042b63c71251 ChangeLog 6007
 MISC metadata.xml 643 RMD160 392f46e6a9607c1f90805225b4afaf21ec2e3c95 SHA1 6147c4982e9d5d57539c65571dd27c892483a960 SHA256 7bb3ca974f3b9456197c4298a283fbb2aa28061cd932a29ea234efe1c61876eb
 MD5 ecdd21ebcfabfc715f74d74ef23b3a81 metadata.xml 643
 RMD160 392f46e6a9607c1f90805225b4afaf21ec2e3c95 metadata.xml 643
@@ -33,10 +37,13 @@ SHA256 5b5e059995c35e6442d0dc5eb426fc3d39c823d46bca967eab2f513d03bddd89 files/di
 MD5 82d00c2f43a0a96207ad51f6729c0d53 files/digest-qsynth-0.3.1 238
 RMD160 5c43169ead92fd6d90024a7bf9d243d6e1b899ac files/digest-qsynth-0.3.1 238
 SHA256 1f676d8ad8666d2c13b289ca4c5122738c016f23cb911c1cf59ff4d1e4ae0f68 files/digest-qsynth-0.3.1 238
+MD5 82d00c2f43a0a96207ad51f6729c0d53 files/digest-qsynth-0.3.1-r1 238
+RMD160 5c43169ead92fd6d90024a7bf9d243d6e1b899ac files/digest-qsynth-0.3.1-r1 238
+SHA256 1f676d8ad8666d2c13b289ca4c5122738c016f23cb911c1cf59ff4d1e4ae0f68 files/digest-qsynth-0.3.1-r1 238
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHGRfBAiZjviIA2XgRAtthAKChGFq9cy9cMfWZM8Wx+ibKqCBBIACg6cai
-eOasAeoyjfmy2XI8ZjPVtPU=
-=m8pY
+iD8DBQFHG0XfAiZjviIA2XgRAtENAKDTsO3jb1sF16CuzbuUx09+0/ydMACeNpke
+8fopZ8cwlYE0sAgz/5gQWoU=
+=RM7H
 -----END PGP SIGNATURE-----
diff --git a/media-sound/qsynth/files/digest-qsynth-0.3.1-r1 b/media-sound/qsynth/files/digest-qsynth-0.3.1-r1
new file mode 100644
index 000000000000..c1c841b623dc
--- /dev/null
+++ b/media-sound/qsynth/files/digest-qsynth-0.3.1-r1
@@ -0,0 +1,3 @@
+MD5 41de4b244cd896a1150101855bafbbb8 qsynth-0.3.1.tar.gz 137632
+RMD160 276937ef5d118bd651556332290780cc9a48ecdc qsynth-0.3.1.tar.gz 137632
+SHA256 56d0c14f85a9469df97df2d813860a471a71e2206e7e11365e37a3be028a2aa6 qsynth-0.3.1.tar.gz 137632
diff --git a/media-sound/qsynth/qsynth-0.3.1-r1.ebuild b/media-sound/qsynth/qsynth-0.3.1-r1.ebuild
new file mode 100644
index 000000000000..82aa932151c9
--- /dev/null
+++ b/media-sound/qsynth/qsynth-0.3.1-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qsynth/qsynth-0.3.1-r1.ebuild,v 1.1 2007/10/21 12:28:42 flameeyes Exp $
+
+inherit qt4 eutils flag-o-matic
+
+DESCRIPTION="A Qt application to control FluidSynth"
+HOMEPAGE="http://qsynth.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qsynth/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="debug jack alsa"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+DEPEND="$(qt4_min_version 4.2)
+	media-sound/fluidsynth"
+
+pkg_setup() {
+	if use jack; then
+		if ! built_with_use media-sound/fluidsynth jack; then
+			eerror "To use Qsynth with JACK, you need to build media-sound/fluidsynth"
+			eerror "with the jack USE flag enabled."
+			die "Missing jack USE flag on media-sound/fluidsynth"
+		fi
+		einfo "Enabling default JACK output."
+	elif use alsa; then
+		if ! built_with_use media-sound/fluidsynth alsa; then
+			eerror "To use Qsynth with ALSA, you need to build media-sound/fluidsynth"
+			eerror "with the alsa USE flag enabled."
+			die "Missing alsa USE flag on media-sound/fluidsynth"
+		fi
+		einfo "Enabling non-default ALSA output."
+	else
+		if ! built_with_use media-sound/fluidsynth oss; then
+			eerror "If you don't want to use either JACK or ALSA on Qsynth"
+			eerror "you need to enable the oss USE flag on media-sound/fluidsynth"
+			die "Missing oss USE flag on media-sound/fluidsynth"
+		fi
+		einfo "Enabling non-default OSS output."
+	fi
+}
+
+src_compile() {
+	# Stupidly, qsynth's configure does *not* use pkg-config to
+	# discover the presence of Qt4, but uses fixed paths; as they
+	# don't really work that well for our case, let's just use this
+	# nasty hack and be done with it. *NOTE*: this hinders
+	# cross-compile.
+	append-flags -I/usr/include/qt4
+	append-ldflags -L/usr/$(get_libdir)/qt4
+
+	econf \
+		$(use_enable debug) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install () {
+	make DESTDIR="${D}" install || die "make install failed"
+	dodoc AUTHORS ChangeLog README TODO
+
+	# The desktop file is invalid, and we also change the command
+	# depending on useflags
+	rm -rf "${D}/usr/share/applications/qsynth.desktop"
+
+	local cmd
+	if use jack; then
+		cmd="qsynth"
+	elif use alsa; then
+		cmd="qsynth -a alsa"
+	else
+		cmd="qsynth -a oss"
+	fi
+
+	make_desktop_entry "${cmd}" Qsynth qsynth
+}