closing 23468 (tcl_version not being abided by during link phase), and 39119 (alsa-lib compilation issues w/ 1.0)

6 files changed, 54 insertions, 22 deletions

diff --git a/media-sound/vkeybd/ChangeLog b/media-sound/vkeybd/ChangeLog
index 31ea746ec194..d686da52d010 100644
--- a/media-sound/vkeybd/ChangeLog
+++ b/media-sound/vkeybd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/vkeybd
-# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.9 2003/12/20 17:42:57 mholzer Exp $
+# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.10 2004/02/01 11:52:58 ferringb Exp $
+
+  01 Feb 2004; Brian Harring <ferringb@gentoo.org> vkeybd-0.1.12.ebuild,
+  vkeybd-0.1.13-r1.ebuild, vkeybd-0.1.15.ebuild, 
+  files/vkeybd-0.1.13-alsa-fix.patch:
+  Closing bugs 23468 and 39119.  Adjusted copyright headers to 2004.
 
 *vkeybd-0.1.15 (20 Dec 2003)
 
diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest
index 1a9292131039..d7bbf60ba714 100644
--- a/media-sound/vkeybd/Manifest
+++ b/media-sound/vkeybd/Manifest
@@ -1,7 +1,7 @@
-MD5 4a2eaf33eae5c0f26b8cd48ceab2022e vkeybd-0.1.12.ebuild 1298
-MD5 b54627894a155e2c72009b30a34c9f17 ChangeLog 1378
-MD5 badb5b31090d0be01b8db89d3182638d vkeybd-0.1.15.ebuild 1292
-MD5 c59f98f59b257c410e502b78ce4dc2b5 vkeybd-0.1.13-r1.ebuild 1638
+MD5 2e79cfdd74130569c6395396f5235f44 vkeybd-0.1.12.ebuild 1300
+MD5 4425f52c36f49884fa9f49d2eedd32d2 ChangeLog 1611
+MD5 366c3cb0ba3465dab2b668d18ea83160 vkeybd-0.1.15.ebuild 1293
+MD5 8e2ece34dfbbfea2d66d2912155e6c43 vkeybd-0.1.13-r1.ebuild 1643
 MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221
 MD5 2c8d3d650a7f17d0365b3aca73cc0d16 files/vkeybd-0.1.12-Makefile.passvariables.patch 588
 MD5 eca9134ac4275c528a1a0f6bebb539d1 files/vkeybd-0.1.13-Makefile.passvariables.patch 736
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.13-alsa-fix.patch b/media-sound/vkeybd/files/vkeybd-0.1.13-alsa-fix.patch
new file mode 100644
index 000000000000..36cf0d266701
--- /dev/null
+++ b/media-sound/vkeybd/files/vkeybd-0.1.13-alsa-fix.patch
@@ -0,0 +1,19 @@
+diff -ur vkeybd/oper_alsa.c vkeybd-fixed/oper_alsa.c
+--- vkeybd/oper_alsa.c	2003-01-23 10:02:05.000000000 -0600
++++ vkeybd-fixed/oper_alsa.c	2004-01-23 01:01:22.000000000 -0600
+@@ -30,10 +30,14 @@
+ #ifdef USE_OLD_ALSA
+ #include <sys/asoundlib.h>
+ #else
++#include <alsa/version.h>
++# if SND_LIB_MAJOR==1
++# define ALSA_PCM_OLD_HW_PARAMS_API
++# endif
+ #include <alsa/asoundlib.h>
+ #endif
+ 
+-#if SND_LIB_MINOR >= 6
++#if SND_LIB_MINOR >= 6 || SND_LIB_MAJOR > 0
+ #define snd_seq_flush_output(x) snd_seq_drain_output(x)
+ #define snd_seq_set_client_group(x,name) /*nop*/
+ #define my_snd_seq_open(seqp) snd_seq_open(seqp, "hw", SND_SEQ_OPEN_OUTPUT, 0)
diff --git a/media-sound/vkeybd/vkeybd-0.1.12.ebuild b/media-sound/vkeybd/vkeybd-0.1.12.ebuild
index a0c75e780b54..5c21e549f9a9 100644
--- a/media-sound/vkeybd/vkeybd-0.1.12.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.12.ebuild,v 1.4 2003/02/13 13:20:55 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.12.ebuild,v 1.5 2004/02/01 11:52:58 ferringb Exp $
 
 DESCRIPTION="A virtual MIDI keyboard for X."
 HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
diff --git a/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild b/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild
index c301be6ce7bb..f843102b7652 100644
--- a/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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-r1.ebuild,v 1.1 2003/05/18 02:56:52 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild,v 1.2 2004/02/01 11:52:58 ferringb Exp $
 
 DESCRIPTION="A virtual MIDI keyboard for X."
 HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
@@ -18,15 +18,18 @@ DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	ladcca? ( >=media-libs/ladcca-0.3.1 )"
 
 S=${WORKDIR}/${PN}
-TCL_VERSION=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh`
+TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
 
 src_unpack() {
 	unpack ${A} || die
 	cd ${S}
+	echo ${S}
 	epatch ${FILESDIR}/${P}-Makefile.passvariables.patch || die \
 		"Patch #1 failed"
-	epatch  ${FILESDIR}/${P}-vkb.c-ladcca.patch || die \
+	epatch ${FILESDIR}/${P}-vkb.c-ladcca.patch || die \
 		"Patch #2 failed"
+	epatch ${FILESDIR}/${P}-alsa-fix.patch || die \
+		"Alsalib 1.0 fix failed"
 }
 
 src_compile() {
@@ -41,12 +44,16 @@ src_compile() {
 	fi
 	use ladcca && myconf="${myconf} USE_LADCCA=1"
 
-	make ${myconf} TCL_VERSION=$TCL_VERSION || die "Make failed."
+#	echo $TCL_VERSION
+#	echo $myconf
+	echo ${myconf}
+	make ${myconf} TCL_VERSION=${TCL_VERSION} || die "Make failed."
 }
 
 src_install() {
-	make DESTDIR=${D} PREFIX=/usr install || die "Installation Failed"
-	make DESTDIR=${D} PREFIX=/usr install-man || die \
-					    "Man-Page Installation Failed"
+	make DESTDIR=${D} TCL_VERSION=${TCL_VERSION} PREFIX=/usr install || \
+		die "Installation Failed"
+	make DESTDIR=${D} TCL_VERSION=${TCL_VERSION} PREFIX=/usr install-man \
+		|| die "Man-Page Installation Failed"
 	dodoc README
 }
diff --git a/media-sound/vkeybd/vkeybd-0.1.15.ebuild b/media-sound/vkeybd/vkeybd-0.1.15.ebuild
index 100b14e69d0b..4fe1d64487f8 100644
--- a/media-sound/vkeybd/vkeybd-0.1.15.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.15.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Copyright 1999-2004 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.15.ebuild,v 1.1 2003/12/20 17:42:57 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.15.ebuild,v 1.2 2004/02/01 11:52:58 ferringb Exp $
 
 DESCRIPTION="A virtual MIDI keyboard for X"
 HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
@@ -18,7 +18,7 @@ DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	ladcca? ( >=media-libs/ladcca-0.3.1 )"
 
 S=${WORKDIR}/${PN}
-TCL_VERSION=`awk -F\' '/TCL_VERSION/ {print $2}' /usr/lib/tclConfig.sh`
+TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
 
 src_compile() {
 	local myconf="PREFIX=/usr"
@@ -36,8 +36,9 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR=${D} PREFIX=/usr install || die "Installation Failed"
-	make DESTDIR=${D} PREFIX=/usr install-man || die \
-					    "Man-Page Installation Failed"
+	make DESTDIR=${D} TCL_VERSION=$TCL_VERSION PREFIX=/usr install || \
+		die "Installation Failed"
+	make DESTDIR=${D} TCL_VERSION=$TCL_VERSION PREFIX=/usr install-man || \
+		die "Man-Page Installation Failed"
 	dodoc README
 }