Updated to build with current media-lib/ladcca closes #21163.

4 files changed, 20 insertions, 6 deletions

diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest
index b419bbfb176a..18e60e423257 100644
--- a/media-sound/vkeybd/Manifest
+++ b/media-sound/vkeybd/Manifest
@@ -1,6 +1,6 @@
-MD5 2161d0543c6a65f1a39d7c701d88d0e9 ChangeLog 1122
+MD5 e717238dfc96e145f74f5cb873f3e6bb ChangeLog 1122
 MD5 2e111e8e55609771e18924e28931c2e5 vkeybd-0.1.12.ebuild 1298
-MD5 c7adaa8fe3b3e023b15bdc57a2ede171 vkeybd-0.1.13-r1.ebuild 1366
+MD5 50dbcad2848fd02b71817f68bbc62438 vkeybd-0.1.13-r1.ebuild 1468
 MD5 ff865aa6f311fa78914478083e85fb4b files/digest-vkeybd-0.1.12 64
 MD5 50662097f6756de017137af3c19d182b files/vkeybd-0.1.12-Makefile.destdir.patch 1020
 MD5 2c8d3d650a7f17d0365b3aca73cc0d16 files/vkeybd-0.1.12-Makefile.passvariables.patch 588
diff --git a/media-sound/vkeybd/files/digest-vkeybd-0.1.13 b/media-sound/vkeybd/files/digest-vkeybd-0.1.13-r1
index 6eb51cce349d..6eb51cce349d 100644
--- a/media-sound/vkeybd/files/digest-vkeybd-0.1.13
+++ b/media-sound/vkeybd/files/digest-vkeybd-0.1.13-r1
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.13-vkb.c-ladcca.patch b/media-sound/vkeybd/files/vkeybd-0.1.13-vkb.c-ladcca.patch
new file mode 100644
index 000000000000..b4cfcd895cb9
--- /dev/null
+++ b/media-sound/vkeybd/files/vkeybd-0.1.13-vkb.c-ladcca.patch
@@ -0,0 +1,12 @@
+--- vkb.c~	2003-01-23 17:00:19.000000000 +0100
++++ vkb.c	2003-05-17 18:12:13.000000000 +0200
+@@ -80,7 +80,7 @@
+ #ifdef HAVE_LADCCA	
+ 	cca_client = cca_init (cca_extract_args (&argc, &argv),
+ 	                       "vkeybd",
+-	                       CCA_Use_Alsa);
++	                       CCA_Use_Alsa, CCA_PROTOCOL_VERSION );
+ #endif /* HAVE_LADCCA */
+ 
+ 	nargc = argc + 1;
+
diff --git a/media-sound/vkeybd/vkeybd-0.1.13.ebuild b/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild
index c9225fa19fc2..c301be6ce7bb 100644
--- a/media-sound/vkeybd/vkeybd-0.1.13.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.13.ebuild,v 1.2 2003/04/24 16:26:46 utx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild,v 1.1 2003/05/18 02:56:52 jje Exp $
 
 DESCRIPTION="A virtual MIDI keyboard for X."
 HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
+SRC_URI="http://www.alsa-project.org/~iwai/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -14,17 +15,18 @@ DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	>=dev-lang/tk-8.3
 	>=dev-lang/tcl-8.3
 	virtual/x11
-	ladcca? ( =media-libs/ladcca-0.1 )"
+	ladcca? ( >=media-libs/ladcca-0.3.1 )"
 
-SRC_URI="http://www.alsa-project.org/~iwai/${P}.tar.gz"
 S=${WORKDIR}/${PN}
 TCL_VERSION=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh`
 
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-Makefile.passvariables.patch || die \
+	epatch ${FILESDIR}/${P}-Makefile.passvariables.patch || die \
 		"Patch #1 failed"
+	epatch  ${FILESDIR}/${P}-vkb.c-ladcca.patch || die \
+		"Patch #2 failed"
 }
 
 src_compile() {