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.

(Portage version: 2.1.3_rc6)

8 files changed, 20 insertions, 72 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/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