stable amd64, bug 277964

(Portage version: 2.2_rc33/cvs/Linux x86_64)

3 files changed, 7 insertions, 67 deletions

diff --git a/media-sound/vkeybd/ChangeLog b/media-sound/vkeybd/ChangeLog
index 49c7004f9653..c666a11a0b6b 100644
--- a/media-sound/vkeybd/ChangeLog
+++ b/media-sound/vkeybd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/vkeybd
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.34 2009/07/16 08:05:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.35 2009/07/16 08:58:25 ssuominen Exp $
+
+  16 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  vkeybd-0.1.17b-r1.ebuild:
+  stable amd64, bug 277964
 
   16 Jul 2009; Christian Faulhammer <fauli@gentoo.org>
   vkeybd-0.1.17b-r1.ebuild:
diff --git a/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild b/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild
index 78c3e7296dc7..f89791d7eb9f 100644
--- a/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 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-r1.ebuild,v 1.2 2009/07/16 08:05:18 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild,v 1.3 2009/07/16 08:58:25 ssuominen Exp $
 
 EAPI=2
 inherit toolchain-funcs eutils
@@ -11,7 +11,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"
 IUSE="alsa lash oss"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
diff --git a/media-sound/vkeybd/vkeybd-0.1.17b.ebuild b/media-sound/vkeybd/vkeybd-0.1.17b.ebuild
deleted file mode 100644
index e3fb8e36acb9..000000000000
--- a/media-sound/vkeybd/vkeybd-0.1.17b.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# 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.3 2008/04/14 18:50:37 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.gtlib.gatech.edu/pub/suse/people/tiwai/vkeybd/${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}"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-desktop-entry.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake ${myconf} COPTFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed."
-}
-
-src_install() {
-	emake ${myconf} DESTDIR="${D}" install-all || die "emake install failed."
-	dodoc README ChangeLog
-}