Updated to 0.6.4 and added patch to compile with GCC4 and without vumeter (arts).

Package-Manager: portage-2.0.53_rc6

5 files changed, 87 insertions, 6 deletions

diff --git a/media-sound/kamix/ChangeLog b/media-sound/kamix/ChangeLog
index 1348caebb3fb..6b7721ea26f5 100644
--- a/media-sound/kamix/ChangeLog
+++ b/media-sound/kamix/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/kamix
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/ChangeLog,v 1.17 2005/10/13 22:40:44 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/ChangeLog,v 1.18 2005/10/30 22:02:01 flameeyes Exp $
+
+*kamix-0.6.4 (30 Oct 2005)
+
+  30 Oct 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kamix-0.6.4-misc.patch, +kamix-0.6.4.ebuild:
+  Updated to 0.6.4 and added patch to compile with GCC4 and without vumeter
+  (arts).
 
 *kamix-0.6.3 (10 Oct 2005)
 
diff --git a/media-sound/kamix/Manifest b/media-sound/kamix/Manifest
index ec11e3ebc80e..4f19cc1928af 100644
--- a/media-sound/kamix/Manifest
+++ b/media-sound/kamix/Manifest
@@ -1,8 +1,21 @@
-MD5 da8117cd5d1b103680fecbfcb9cb6848 kamix-0.6.3.ebuild 574
-MD5 c5b779c22120e92b83d42d9a79a0d146 kamix-0.5.7.ebuild 640
-MD5 248d53648039a037985f7db38c6165ce ChangeLog 2124
-MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
-MD5 446282856052753575f9ed3a8d9d11a7 kamix-0.6.1.ebuild 572
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 d4040e6428274e62940fbf90a33b93f1 ChangeLog 2349
 MD5 7fcb080495d5a1a3f902288032ef4025 files/digest-kamix-0.5.7 64
 MD5 235e2f9a7ebc68ce021272095ef6f4cd files/digest-kamix-0.6.1 64
 MD5 d6dacb863546456ed26bc2240d101fd3 files/digest-kamix-0.6.3 64
+MD5 eb69f9b32a908975ebc052ccd250d626 files/digest-kamix-0.6.4 66
+MD5 43a9be2869b8a5e16fa75ef96354a0df files/kamix-0.6.4-misc.patch 907
+MD5 c5b779c22120e92b83d42d9a79a0d146 kamix-0.5.7.ebuild 640
+MD5 446282856052753575f9ed3a8d9d11a7 kamix-0.6.1.ebuild 572
+MD5 da8117cd5d1b103680fecbfcb9cb6848 kamix-0.6.3.ebuild 574
+MD5 81c353a9546f3c484c93c32fee47a659 kamix-0.6.4.ebuild 669
+MD5 83c2574543d0501303b57050254e3880 metadata.xml 222
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDZULlj5H05b2HAEkRArmJAKCFo4A4VgrALjP4XcPWdkc+XNjOcQCglAQB
+wxSKAPc/CRaP0ni7NNGa6tE=
+=8Ix0
+-----END PGP SIGNATURE-----
diff --git a/media-sound/kamix/files/digest-kamix-0.6.4 b/media-sound/kamix/files/digest-kamix-0.6.4
new file mode 100644
index 000000000000..e38b8b4a4836
--- /dev/null
+++ b/media-sound/kamix/files/digest-kamix-0.6.4
@@ -0,0 +1 @@
+MD5 ec5ab232c0c1e695f532051ab0e62bb9 kamix-0.6.4-2.tar.bz2 492331
diff --git a/media-sound/kamix/files/kamix-0.6.4-misc.patch b/media-sound/kamix/files/kamix-0.6.4-misc.patch
new file mode 100644
index 000000000000..6f5a96e9eb2c
--- /dev/null
+++ b/media-sound/kamix/files/kamix-0.6.4-misc.patch
@@ -0,0 +1,27 @@
+Index: kamix/src/kconfigwin.cpp
+===================================================================
+--- kamix.orig/src/kconfigwin.cpp
++++ kamix/src/kconfigwin.cpp
+@@ -88,7 +88,9 @@ KConfigWin::KConfigWin(QWidget*)
+     cHideI->setChecked( KamixConfig::self()->hideInactive );
+     cAST->setChecked  ( KamixConfig::self()->alwaysSystray );
+     cMid->setChecked ( KamixConfig::self()->midButtonMutes );
++#ifdef VUMETER
+     cVum->setChecked ( KamixConfig::self()->useVumeter );
++#endif
+     
+     vu->setShortcut ( KShortcut ( KamixConfig::self()->volUpShortcut ), false );
+     vd->setShortcut ( KShortcut ( KamixConfig::self()->volDnShortcut ), false );
+Index: kamix/src/kconfigwin.h
+===================================================================
+--- kamix.orig/src/kconfigwin.h
++++ kamix/src/kconfigwin.h
+@@ -29,6 +29,8 @@
+ 
+ #include "kcard.h"
+ 
++class QComboBox;
++
+ /**
+ @author Stefano Rivoir
+ */
diff --git a/media-sound/kamix/kamix-0.6.4.ebuild b/media-sound/kamix/kamix-0.6.4.ebuild
new file mode 100644
index 000000000000..afa6726fb6a2
--- /dev/null
+++ b/media-sound/kamix/kamix-0.6.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/kamix/kamix-0.6.4.ebuild,v 1.1 2005/10/30 22:02:01 flameeyes Exp $
+
+inherit kde
+
+MY_P="${P}-2"
+
+DESCRIPTION="A mixer for KDE and ALSA."
+HOMEPAGE="http://kamix.sourceforge.net/"
+SRC_URI="mirror://sourceforge/kamix/${MY_P}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=">=media-libs/alsa-lib-1.0.9"
+
+need-kde 3
+
+S=${WORKDIR}/${PN}
+
+src_unpack() {
+	kde_src_unpack
+	epatch "${FILESDIR}/${P}-misc.patch"
+}
+
+src_compile() {
+	myconf="$(use_enable arts vumeter)"
+
+	kde_src_compile
+}