Version bump. Add alsa and debug USE flags. When alsa USE flag is enabled, check for the midi flag on alsa-lib or it will not build. Install a desktop file and move the icon in the right place. Install the documentation.

Package-Manager: portage-2.1.3_rc6

4 files changed, 83 insertions, 10 deletions

diff --git a/media-sound/qjackctl/ChangeLog b/media-sound/qjackctl/ChangeLog
index 844d6984c03e..7991b56be628 100644
--- a/media-sound/qjackctl/ChangeLog
+++ b/media-sound/qjackctl/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/qjackctl
-# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.40 2006/10/08 03:18:45 eldad Exp $
+# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.41 2007/06/29 12:22:55 flameeyes Exp $
+
+*qjackctl-0.2.22 (29 Jun 2007)
+
+  29 Jun 2007; Diego Pettenò <flameeyes@gentoo.org>
+  +qjackctl-0.2.22.ebuild:
+  Version bump. Add alsa and debug USE flags. When alsa USE flag is enabled,
+  check for the midi flag on alsa-lib or it will not build. Install a desktop
+  file and move the icon in the right place. Install the documentation.
 
 *qjackctl-0.2.21 (08 Oct 2006)
 
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 9fb56c2bdf5e..60e03f05917b 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 DIST qjackctl-0.2.19a.tar.gz 250456 RMD160 b5a20e751c0069f31b32ba5566a4416eae06728d SHA1 184efce1fe25308bfd420cbdf51c2dc3399fbf4e SHA256 68d2b3c3720bbda58281d048e5f6f42e09d5502debbe16cbb9df99b904bcb4f7
 DIST qjackctl-0.2.20.tar.gz 248981 RMD160 c2d73b8b25d25f49472a4ee9e6f46ad109cc3e72 SHA1 73fa4e03182868bb17a79c68bcc95ce7b318e181 SHA256 6f96b2cc9474e6d71cbeddac71987a136e22177d2e394dd0e276d51ad7e9156f
 DIST qjackctl-0.2.21.tar.gz 253365 RMD160 5151e32d07d2b51ff9db41bf97633ef6f5b24b4d SHA1 3305fd7b35576b07f620c5c09ac50380071b2c06 SHA256 1ed6d4dab444fa1bb8854fb021f4b470009b5d3e0520b2ae521b12dca10230b5
+DIST qjackctl-0.2.22.tar.gz 256654 RMD160 4f9ed30bc9c3a187028d9329cc09b730e6113d00 SHA1 d3ac6d3a3bd59ad99f9ef34588abc260608c67d5 SHA256 332b24c1813f3ed711233ceaf570221e80c10ae4cbeba673a397450d9eb40f0a
 EBUILD qjackctl-0.2.19a.ebuild 672 RMD160 44028b2c178b00ba75fad1b2348145aab84b026d SHA1 a18753d940a2899392d77bd8992597915dd7627e SHA256 198c12cd7c7a3d43af29eb8b6e6f84d509ec9ec717923e530d767f194810f3f4
 MD5 d1fb0bce866e67c46452319ce13950f6 qjackctl-0.2.19a.ebuild 672
 RMD160 44028b2c178b00ba75fad1b2348145aab84b026d qjackctl-0.2.19a.ebuild 672
@@ -16,10 +17,14 @@ EBUILD qjackctl-0.2.21.ebuild 674 RMD160 fd4db2b06d9f9cb852790c075edc8c48569d25b
 MD5 95794b9cf53e9ec2b9bda9648a717b71 qjackctl-0.2.21.ebuild 674
 RMD160 fd4db2b06d9f9cb852790c075edc8c48569d25b7 qjackctl-0.2.21.ebuild 674
 SHA256 024d6efeb6b3a2196b0847d7fbebca70d81505da42cf39ede43fab9d652a731c qjackctl-0.2.21.ebuild 674
-MISC ChangeLog 5092 RMD160 d42f456f51932e1c05c71cb5344dbb8ce2feb7da SHA1 17991cc0b4929e3034dece1292d96086079d2bc5 SHA256 49404b28119b17dc21ccd07afe9648440fe377d29ebaf9126b0645ead09dcc9a
-MD5 a836972b99ca902fbd45221c4f009376 ChangeLog 5092
-RMD160 d42f456f51932e1c05c71cb5344dbb8ce2feb7da ChangeLog 5092
-SHA256 49404b28119b17dc21ccd07afe9648440fe377d29ebaf9126b0645ead09dcc9a ChangeLog 5092
+EBUILD qjackctl-0.2.22.ebuild 1636 RMD160 8e02781cf6e42892246e2c3d829ba65b80482473 SHA1 8a95c2209f0abd2ce17977af02920dfa517fea0e SHA256 ebcf96f100ddba731423aba9eab17016beacfdfef165e9f6c5ffc3eb32afbb2c
+MD5 0b440a86ecdeb6f76c29dd7a628da502 qjackctl-0.2.22.ebuild 1636
+RMD160 8e02781cf6e42892246e2c3d829ba65b80482473 qjackctl-0.2.22.ebuild 1636
+SHA256 ebcf96f100ddba731423aba9eab17016beacfdfef165e9f6c5ffc3eb32afbb2c qjackctl-0.2.22.ebuild 1636
+MISC ChangeLog 5436 RMD160 f8ae0d5c599020d4b63d6a9b854f56c75db13c77 SHA1 74e0482fb5014f53756ac58cc185719ec5c42e1a SHA256 2da79e8908520f2d49d5d45b5770c67959456414b8bb55ef931bfc02a8bea8b6
+MD5 5e7555d32b663611cddc3aedcdb39dc9 ChangeLog 5436
+RMD160 f8ae0d5c599020d4b63d6a9b854f56c75db13c77 ChangeLog 5436
+SHA256 2da79e8908520f2d49d5d45b5770c67959456414b8bb55ef931bfc02a8bea8b6 ChangeLog 5436
 MISC metadata.xml 257 RMD160 1b31d5290c0f2d4c7f75f79e2e073258eea39abe SHA1 97fa9c254875dfa462f68355cf8b5579a2d7b6df SHA256 c78b9281ef43dc8c1966c705dae4e1f1b713209322c56a20a9a0b71e8c28faa9
 MD5 958cdff6e2710ee30529dd9af63497de metadata.xml 257
 RMD160 1b31d5290c0f2d4c7f75f79e2e073258eea39abe metadata.xml 257
@@ -33,10 +38,13 @@ SHA256 223f59ab34322a889bd3009cd3d9a2192ad65e6e93321580f6df168e1a4083eb files/di
 MD5 02a2150c1e62326c3918668c83c52b7c files/digest-qjackctl-0.2.21 247
 RMD160 99bbf0c95ad29cdc1b503ec3622841084353a36f files/digest-qjackctl-0.2.21 247
 SHA256 7ae87fa3506959b2336888e24e1990d747c64a538d7ae26e1e3db63b7624c585 files/digest-qjackctl-0.2.21 247
+MD5 247d205e88ac4abd31f75ca4d316db02 files/digest-qjackctl-0.2.22 247
+RMD160 57c710cdcdbe3703d28239de6fd81783370e2807 files/digest-qjackctl-0.2.22 247
+SHA256 0b47b0499d51bdbfd73b129871ad06d404dd1efbb5efa948fed17bf295bea111 files/digest-qjackctl-0.2.22 247
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFFKG6wT+MN7JbqCpMRAhgOAKCR9zDxB+7kxF+3U3OzOSkBF2NAqgCdHT8v
-KfXqDUfp1zB4e25jz6zZhYg=
-=mCg+
+iD8DBQFGhPnXAiZjviIA2XgRAimzAKCK/OWVYQCHat1DG6utiIGjoYM6IgCZAWZT
+ccihdiDBSZ1AK7vw8biLraQ=
+=KzkP
 -----END PGP SIGNATURE-----
diff --git a/media-sound/qjackctl/files/digest-qjackctl-0.2.22 b/media-sound/qjackctl/files/digest-qjackctl-0.2.22
new file mode 100644
index 000000000000..e04ac59cd89a
--- /dev/null
+++ b/media-sound/qjackctl/files/digest-qjackctl-0.2.22
@@ -0,0 +1,3 @@
+MD5 384e69d49c854bf14615752ba097d261 qjackctl-0.2.22.tar.gz 256654
+RMD160 4f9ed30bc9c3a187028d9329cc09b730e6113d00 qjackctl-0.2.22.tar.gz 256654
+SHA256 332b24c1813f3ed711233ceaf570221e80c10ae4cbeba673a397450d9eb40f0a qjackctl-0.2.22.tar.gz 256654
diff --git a/media-sound/qjackctl/qjackctl-0.2.22.ebuild b/media-sound/qjackctl/qjackctl-0.2.22.ebuild
new file mode 100644
index 000000000000..17fe18a359ff
--- /dev/null
+++ b/media-sound/qjackctl/qjackctl-0.2.22.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.22.ebuild,v 1.1 2007/06/29 12:22:55 flameeyes Exp $
+
+inherit eutils qt3
+
+DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
+HOMEPAGE="http://qjackctl.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+IUSE="alsa debug"
+
+DEPEND="alsa? ( media-libs/alsa-lib )
+	$(qt_min_version 3.1.1)
+	media-sound/jack-audio-connection-kit"
+
+pkg_setup() {
+	if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then
+		eerror ""
+		eerror "To be able to build ${CATEGORY}/${PN} with ALSA support you"
+		eerror "need to have built media-libs/alsa-lib with midi USE flag."
+		die "Missing midi USE flag on media-libs/alsa-lib"
+	fi
+}
+
+src_compile() {
+	local myconf
+
+	# Upstream's configure.ac is broken, assumes that passing any
+	# --(dis|en)able-(feature) means the non-default option.
+
+	use alsa || myconf="${myconf} --disable-alsa-seq"
+	use debug && myconf="${myconf} --enable-debug"
+
+	econf ${myconf} || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	# The icon is installed in the wrong place, move it into a more
+	# proper path.
+	dodir /usr/share/icons/hicolor/32x32/apps
+	mv "${D}/usr/share/icons/${PN}.png" "${D}/usr/share/icons/hicolor/32x32/apps/"
+
+	make_desktop_entry "${PN}" "QjackCtl" "${PN}"
+
+	dodoc README ChangeLog TODO AUTHORS
+}