Version bump (thanks to upstream who addressed some of the issues found on previous ebuild); also remove old versions, .23 is the target stable for next month.

Package-Manager: portage-2.1.3_rc6

9 files changed, 35 insertions, 103 deletions

diff --git a/media-sound/qjackctl/ChangeLog b/media-sound/qjackctl/ChangeLog
index 244cdb693247..06ca39879888 100644
--- a/media-sound/qjackctl/ChangeLog
+++ b/media-sound/qjackctl/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/qjackctl
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.42 2007/07/02 15:17:20 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/ChangeLog,v 1.43 2007/07/03 11:55:54 flameeyes Exp $
+
+*qjackctl-0.2.23 (03 Jul 2007)
+
+  03 Jul 2007; Diego Pettenò <flameeyes@gentoo.org>
+  -qjackctl-0.2.20.ebuild, -qjackctl-0.2.21.ebuild, -qjackctl-0.2.22.ebuild,
+  +qjackctl-0.2.23.ebuild:
+  Version bump (thanks to upstream who addressed some of the issues found on
+  previous ebuild); also remove old versions, .23 is the target stable for
+  next month.
 
   02 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> metadata.xml:
   Hand to newly-born proaudio herd.
diff --git a/media-sound/qjackctl/Manifest b/media-sound/qjackctl/Manifest
index 1d8a4709c00e..aa8df76c769c 100644
--- a/media-sound/qjackctl/Manifest
+++ b/media-sound/qjackctl/Manifest
@@ -2,29 +2,19 @@
 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
+DIST qjackctl-0.2.23.tar.gz 260545 RMD160 a975e51ec6d95abaff33ea9e32430e30d8d31a46 SHA1 e44b7487ab1e436e4c1bdf909e8e96d338c059c3 SHA256 f6781aba529cd4acfa1e4278f6c65b91336684b79232364cb43aa42fcba868bc
 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
 SHA256 198c12cd7c7a3d43af29eb8b6e6f84d509ec9ec717923e530d767f194810f3f4 qjackctl-0.2.19a.ebuild 672
-EBUILD qjackctl-0.2.20.ebuild 674 RMD160 cb51d460c9f56f44b691eb5e52c03b48429aae95 SHA1 4914c05e377f33a62de31ed1562ecc8d546268a6 SHA256 2fb4566b1bde9e255763b4b9b3ece7cebb23db6ee113a60b9fe759aadf3a77fd
-MD5 75b20c15402b86716c6e2d08edc626d5 qjackctl-0.2.20.ebuild 674
-RMD160 cb51d460c9f56f44b691eb5e52c03b48429aae95 qjackctl-0.2.20.ebuild 674
-SHA256 2fb4566b1bde9e255763b4b9b3ece7cebb23db6ee113a60b9fe759aadf3a77fd qjackctl-0.2.20.ebuild 674
-EBUILD qjackctl-0.2.21.ebuild 674 RMD160 fd4db2b06d9f9cb852790c075edc8c48569d25b7 SHA1 e2027fedb6159cfc783f26fa63763109806fa753 SHA256 024d6efeb6b3a2196b0847d7fbebca70d81505da42cf39ede43fab9d652a731c
-MD5 95794b9cf53e9ec2b9bda9648a717b71 qjackctl-0.2.21.ebuild 674
-RMD160 fd4db2b06d9f9cb852790c075edc8c48569d25b7 qjackctl-0.2.21.ebuild 674
-SHA256 024d6efeb6b3a2196b0847d7fbebca70d81505da42cf39ede43fab9d652a731c qjackctl-0.2.21.ebuild 674
-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 5540 RMD160 08a5b4d2792f27ca49c9dfd1a0fd474688e6fb84 SHA1 619324010c52bba9bcd677c06c4750e26c3f41a6 SHA256 e5de50f7eca676961b7b2f15085cbd0aebabfffbec97c60775eb5c0a42915d1a
-MD5 6f63139e00e56f420ea7db677916ff6c ChangeLog 5540
-RMD160 08a5b4d2792f27ca49c9dfd1a0fd474688e6fb84 ChangeLog 5540
-SHA256 e5de50f7eca676961b7b2f15085cbd0aebabfffbec97c60775eb5c0a42915d1a ChangeLog 5540
+EBUILD qjackctl-0.2.23.ebuild 1364 RMD160 5a90408e109fdaf1b76a4d3947166a06ca8d82ab SHA1 8c7c0b5180054e9fdb8fc804f784513007b4d0d9 SHA256 254975bc45a5a6464647eeb4db1f7dad882aa7afe3319c8b769e7a35d6cc1a43
+MD5 ded02472f32b31af6c483636cee84cee qjackctl-0.2.23.ebuild 1364
+RMD160 5a90408e109fdaf1b76a4d3947166a06ca8d82ab qjackctl-0.2.23.ebuild 1364
+SHA256 254975bc45a5a6464647eeb4db1f7dad882aa7afe3319c8b769e7a35d6cc1a43 qjackctl-0.2.23.ebuild 1364
+MISC ChangeLog 5896 RMD160 2260a2377274ca33bb3f346b53eef9fd07202ec1 SHA1 d5e79045ba8ce84831f2e7a4331c18ef8ab14aa5 SHA256 4d04a1d12e7b74b3d37397c986e4ff102fb49b8c6ff6f0511d2b8fa2f180da36
+MD5 0f8cec0d03323a2f0df60c17606d88ac ChangeLog 5896
+RMD160 2260a2377274ca33bb3f346b53eef9fd07202ec1 ChangeLog 5896
+SHA256 4d04a1d12e7b74b3d37397c986e4ff102fb49b8c6ff6f0511d2b8fa2f180da36 ChangeLog 5896
 MISC metadata.xml 161 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 SHA1 90201ddb830142147774cc7b7b5178fbd0a9af0c SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e
 MD5 f62f5a9cf5fe86389cf2bf4d85244ef5 metadata.xml 161
 RMD160 2738d17827a71b5ccbadae4c4f909d2b57d147b0 metadata.xml 161
@@ -32,19 +22,13 @@ SHA256 0ba191421eefd954d1efe9f6c3384e8c8d7455d35a7e79457272e1c29211b09e metadata
 MD5 5549403ce3ac00fb4f2c3427ea458399 files/digest-qjackctl-0.2.19a 250
 RMD160 0a13e0ce84a5e35832d466d41db1c5b5503ef084 files/digest-qjackctl-0.2.19a 250
 SHA256 420f195b83d5249524e13c3a269ce3dfc344b1d35451caa0ba077c21c7deccaf files/digest-qjackctl-0.2.19a 250
-MD5 90cbc7f364556777241d9cb34ea3e191 files/digest-qjackctl-0.2.20 247
-RMD160 382f21e16776727997f5887928c2f0179040c315 files/digest-qjackctl-0.2.20 247
-SHA256 223f59ab34322a889bd3009cd3d9a2192ad65e6e93321580f6df168e1a4083eb files/digest-qjackctl-0.2.20 247
-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
+MD5 034e44ab944ab16a7f12d3dd7043e55a files/digest-qjackctl-0.2.23 247
+RMD160 d56e32a7b2f03e426347d618524df7d57785b53d files/digest-qjackctl-0.2.23 247
+SHA256 bf3a14801e2b5e2b45d350e942c37f5ef9aae6f9bcd4a5eae30ead88310b3869 files/digest-qjackctl-0.2.23 247
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGiRcoAiZjviIA2XgRAqDYAJ0WaDNBYxQOu5Y6MykBQdmXJtJ7zwCeIzZS
-pSsizKguhtkvl06izJG/XRo=
-=SZDz
+iD8DBQFGijmtAiZjviIA2XgRAqqZAKDVkF4m7FVNqzur+LRikY01D7cXKwCbBX1I
+tJVP20Wn68pYvn05xoDkGlM=
+=XH00
 -----END PGP SIGNATURE-----
diff --git a/media-sound/qjackctl/files/digest-qjackctl-0.2.20 b/media-sound/qjackctl/files/digest-qjackctl-0.2.20
deleted file mode 100644
index 7e4e48eaf77e..000000000000
--- a/media-sound/qjackctl/files/digest-qjackctl-0.2.20
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 04141b66ba0b06d8acc92fdd442192fe qjackctl-0.2.20.tar.gz 248981
-RMD160 c2d73b8b25d25f49472a4ee9e6f46ad109cc3e72 qjackctl-0.2.20.tar.gz 248981
-SHA256 6f96b2cc9474e6d71cbeddac71987a136e22177d2e394dd0e276d51ad7e9156f qjackctl-0.2.20.tar.gz 248981
diff --git a/media-sound/qjackctl/files/digest-qjackctl-0.2.21 b/media-sound/qjackctl/files/digest-qjackctl-0.2.21
deleted file mode 100644
index 4c0580ff74ef..000000000000
--- a/media-sound/qjackctl/files/digest-qjackctl-0.2.21
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8655bb2ab43d8ab06f97a993805d5a1f qjackctl-0.2.21.tar.gz 253365
-RMD160 5151e32d07d2b51ff9db41bf97633ef6f5b24b4d qjackctl-0.2.21.tar.gz 253365
-SHA256 1ed6d4dab444fa1bb8854fb021f4b470009b5d3e0520b2ae521b12dca10230b5 qjackctl-0.2.21.tar.gz 253365
diff --git a/media-sound/qjackctl/files/digest-qjackctl-0.2.22 b/media-sound/qjackctl/files/digest-qjackctl-0.2.22
deleted file mode 100644
index e04ac59cd89a..000000000000
--- a/media-sound/qjackctl/files/digest-qjackctl-0.2.22
+++ /dev/null
@@ -1,3 +0,0 @@
-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/files/digest-qjackctl-0.2.23 b/media-sound/qjackctl/files/digest-qjackctl-0.2.23
new file mode 100644
index 000000000000..ac568e2c2806
--- /dev/null
+++ b/media-sound/qjackctl/files/digest-qjackctl-0.2.23
@@ -0,0 +1,3 @@
+MD5 3a0b1dbad9ed1ad1f1871dc4406a912d qjackctl-0.2.23.tar.gz 260545
+RMD160 a975e51ec6d95abaff33ea9e32430e30d8d31a46 qjackctl-0.2.23.tar.gz 260545
+SHA256 f6781aba529cd4acfa1e4278f6c65b91336684b79232364cb43aa42fcba868bc qjackctl-0.2.23.tar.gz 260545
diff --git a/media-sound/qjackctl/qjackctl-0.2.20.ebuild b/media-sound/qjackctl/qjackctl-0.2.20.ebuild
deleted file mode 100644
index bef0b89a21b6..000000000000
--- a/media-sound/qjackctl/qjackctl-0.2.20.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.20.ebuild,v 1.1 2006/06/11 20:04:55 eldad Exp $
-
-IUSE=""
-
-inherit eutils kde-functions
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
-HOMEPAGE="http://qjackctl.sf.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="virtual/libc
-	media-libs/alsa-lib
-	=x11-libs/qt-3*
-	media-sound/jack-audio-connection-kit"
-
-src_install() {
-	einstall || die "make install failed"
-}
diff --git a/media-sound/qjackctl/qjackctl-0.2.21.ebuild b/media-sound/qjackctl/qjackctl-0.2.21.ebuild
deleted file mode 100644
index c681e8e11541..000000000000
--- a/media-sound/qjackctl/qjackctl-0.2.21.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.21.ebuild,v 1.1 2006/10/08 03:18:45 eldad Exp $
-
-IUSE=""
-
-inherit eutils kde-functions
-
-DESCRIPTION="A Qt application to control the JACK Audio Connection Kit and ALSA sequencer connections."
-HOMEPAGE="http://qjackctl.sf.net/"
-SRC_URI="mirror://sourceforge/qjackctl/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-DEPEND="virtual/libc
-	media-libs/alsa-lib
-	=x11-libs/qt-3*
-	media-sound/jack-audio-connection-kit"
-
-src_install() {
-	einstall || die "make install failed"
-}
diff --git a/media-sound/qjackctl/qjackctl-0.2.22.ebuild b/media-sound/qjackctl/qjackctl-0.2.23.ebuild
index 17fe18a359ff..7b7703ef4b7e 100644
--- a/media-sound/qjackctl/qjackctl-0.2.22.ebuild
+++ b/media-sound/qjackctl/qjackctl-0.2.23.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/qjackctl/qjackctl-0.2.23.ebuild,v 1.1 2007/07/03 11:55:54 flameeyes Exp $
 
 inherit eutils qt3
 
@@ -28,26 +28,19 @@ pkg_setup() {
 }
 
 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"
+	econf \
+		$(use_enable alsa alsa-seq) \
+		$(use_enable debug) \
+		|| 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/"
+	rm "${D}/usr/share/applications/qjackctl.desktop"
 
+	# Upstream desktop file is invalid, better stick with our for now.
 	make_desktop_entry "${PN}" "QjackCtl" "${PN}"
 
 	dodoc README ChangeLog TODO AUTHORS