amd64/x86 stable, because current linux-headers doesn't provide awe_voice.h wrt #205949, #216928. stop. collecting. duplicates.

(Portage version: 2.1.4.4)

6 files changed, 9 insertions, 184 deletions

diff --git a/media-sound/vkeybd/ChangeLog b/media-sound/vkeybd/ChangeLog
index a52bc0038752..58ed598ba6a4 100644
--- a/media-sound/vkeybd/ChangeLog
+++ b/media-sound/vkeybd/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/vkeybd
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.30 2008/01/26 22:17:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.31 2008/04/10 08:19:25 drac Exp $
+
+  10 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  -files/vkeybd-0.1.15-makefile.patch, -files/vkeybd-0.1.17a-makefile.patch,
+  -vkeybd-0.1.15-r2.ebuild, -vkeybd-0.1.17a.ebuild, vkeybd-0.1.17b.ebuild:
+  amd64/x86 stable, because current linux-headers doesn't provide awe_voice.h
+  wrt #205949, #216928
 
 *vkeybd-0.1.17b (26 Jan 2008)
 
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.15-makefile.patch b/media-sound/vkeybd/files/vkeybd-0.1.15-makefile.patch
deleted file mode 100644
index 70c7d7334b8e..000000000000
--- a/media-sound/vkeybd/files/vkeybd-0.1.15-makefile.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- vkeybd/Makefile.old	2006-11-25 11:39:42.000000000 +0100
-+++ vkeybd/Makefile	2006-11-25 11:40:09.000000000 +0100
-@@ -81,7 +81,7 @@
- 
- VKB_TCLFILE = $(VKBLIB_DIR)/vkeybd.tcl
- 
--CFLAGS = -Wall -O -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
-+CFLAGS = -Wall -O $(EXTRACFLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
- 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
- 	-DVERSION_STR=\"$(VERSION)\"\
- 	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LADCCACFLAGS)
-@@ -91,15 +91,15 @@
- all: $(TARGETS)
- 
- vkeybd: vkb.o vkb_device.o $(DEVOBJS) $(EXTRAOBJS)
--	$(CC) -o $@ $^ $(TKLIB) $(TCLLIB) $(XLIB) $(EXTRALIB) -lm
-+	$(CC) $(LDFLAGS) -o $@ $^ $(TKLIB) $(TCLLIB) $(XLIB) $(EXTRALIB) -lm
- 
- sftovkb: sftovkb.o sffile.o malloc.o fskip.o
--	$(CC) -o $@ $^ -lm
-+	$(CC) $(LDFLAGS) -o $@ $^ -lm
- 
- install: $(TARGETS) vkeybd.tcl vkeybd.list
- 	mkdir -p $(DESTDIR)$(BIN_DIR)
--	install -c -s vkeybd $(DESTDIR)$(BIN_DIR)
--	install -c -s sftovkb $(DESTDIR)$(BIN_DIR)
-+	install -c vkeybd $(DESTDIR)$(BIN_DIR)
-+	install -c sftovkb $(DESTDIR)$(BIN_DIR)
- 	rm -f $(DESTDIR)$(BIN_DIR)/vkeybd.tcl
- 	mkdir -p $(DESTDIR)$(VKBLIB_DIR)
- 	install -c -m 444 vkeybd.tcl $(DESTDIR)$(VKBLIB_DIR)
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.17a-makefile.patch b/media-sound/vkeybd/files/vkeybd-0.1.17a-makefile.patch
deleted file mode 100644
index ca2e97130ffc..000000000000
--- a/media-sound/vkeybd/files/vkeybd-0.1.17a-makefile.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- vkeybd/Makefile.old	2006-11-25 12:09:56.000000000 +0100
-+++ vkeybd/Makefile	2006-11-25 12:10:41.000000000 +0100
-@@ -84,7 +84,7 @@
- 
- VKB_TCLFILE = $(VKBLIB_DIR)/vkeybd.tcl
- 
--CFLAGS = -Wall -O -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
-+CFLAGS = -Wall -O $(EXTRACFLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
- 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
- 	-DVERSION_STR=\"$(VERSION)\"\
- 	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LADCCACFLAGS)
-@@ -94,10 +94,10 @@
- all: $(TARGETS)
- 
- vkeybd: vkb.o vkb_device.o $(DEVOBJS) $(EXTRAOBJS)
--	$(CC) -o $@ $^ $(TKLIB) $(TCLLIB) $(XLIB) $(EXTRALIB) -lm
-+	$(CC) $(LDFLAGS) -o $@ $^ $(TKLIB) $(TCLLIB) $(XLIB) $(EXTRALIB) -lm
- 
- sftovkb: sftovkb.o sffile.o malloc.o fskip.o
--	$(CC) -o $@ $^ -lm
-+	$(CC) $(LDFLAGS) -o $@ $^ -lm
- 
- install: $(TARGETS) vkeybd.tcl vkeybd.list vkeybdmap*
- 	mkdir -p $(DESTDIR)$(BIN_DIR)
diff --git a/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild b/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild
deleted file mode 100644
index 5ce90c8f96e8..000000000000
--- a/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild,v 1.4 2007/07/22 08:38:31 drac Exp $
-
-inherit toolchain-funcs eutils
-
-IUSE="alsa oss ladcca"
-
-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"
-KEYWORDS="amd64 ~sparc x86"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 )
-	>=dev-lang/tk-8.3
-	ladcca? ( >=media-libs/ladcca-0.3.1 )
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto"
-
-S="${WORKDIR}"/${PN}
-
-pkg_setup() {
-	TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
-
-	myconf="PREFIX=/usr"
-
-	#vkeybd requires at least one of its USE_ variable to be set
-	if use alsa ; then
-		myconf="${myconf} USE_ALSA=1"
-		use oss || myconf="${myconf} USE_AWE=0 USE_MIDI=0"
-	else
-		myconf="${myconf} USE_ALSA=0 USE_AWE=1 USE_MIDI=1"
-	fi
-
-	if use ladcca ; then
-		myconf="${myconf} USE_LADCCA=1"
-	fi
-
-	myconf="${myconf} TCL_VERSION=${TCL_VERSION}"
-	myconf="${myconf} CC=$(tc-getCC)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake ${myconf} EXTRACFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	emake ${myconf} DESTDIR="${D}" install-all || die "emake install failed."
-	dodoc README ChangeLog
-}
diff --git a/media-sound/vkeybd/vkeybd-0.1.17a.ebuild b/media-sound/vkeybd/vkeybd-0.1.17a.ebuild
deleted file mode 100644
index 84aec9319ed2..000000000000
--- a/media-sound/vkeybd/vkeybd-0.1.17a.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.17a.ebuild,v 1.2 2007/07/22 08:38:31 drac Exp $
-
-inherit toolchain-funcs eutils
-
-IUSE="alsa oss ladcca"
-
-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.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 )
-	>=dev-lang/tk-8.3
-	ladcca? ( >=media-libs/ladcca-0.3.1 )
-	x11-libs/libX11"
-DEPEND="${RDEPEND}
-	x11-proto/xf86bigfontproto
-	x11-proto/bigreqsproto
-	x11-proto/xextproto
-	x11-proto/xcmiscproto"
-
-S="${WORKDIR}"/${PN}
-
-pkg_setup() {
-	TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
-
-	myconf="PREFIX=/usr"
-
-	#vkeybd requires at least one of its USE_ variable to be set
-	if use alsa ; then
-		myconf="${myconf} USE_ALSA=1"
-		use oss || myconf="${myconf} USE_AWE=0 USE_MIDI=0"
-	else
-		myconf="${myconf} USE_ALSA=0 USE_AWE=1 USE_MIDI=1"
-	fi
-
-	if use ladcca ; then
-		myconf="${myconf} USE_LADCCA=1"
-	fi
-
-	myconf="${myconf} TCL_VERSION=${TCL_VERSION}"
-	myconf="${myconf} CC=$(tc-getCC)"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch
-}
-
-src_compile() {
-	emake ${myconf} EXTRACFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	emake ${myconf} DESTDIR="${D}" install-all || die "emake install failed."
-	dodoc README ChangeLog
-}
diff --git a/media-sound/vkeybd/vkeybd-0.1.17b.ebuild b/media-sound/vkeybd/vkeybd-0.1.17b.ebuild
index ce2e83f29a54..bf13ea72362c 100644
--- a/media-sound/vkeybd/vkeybd-0.1.17b.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.17b.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.17b.ebuild,v 1.1 2008/01/26 22:17:03 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.17b.ebuild,v 1.2 2008/04/10 08:19:25 drac Exp $
 
 inherit toolchain-funcs eutils
 
@@ -12,7 +12,7 @@ SRC_URI="http://www.gtlib.gatech.edu/pub/suse/people/tiwai/vkeybd/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="amd64 ~sparc x86"
 
 RDEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 )
 	>=dev-lang/tk-8.3