Remove unused version and virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

5 files changed, 28 insertions, 90 deletions

diff --git a/media-sound/vkeybd/ChangeLog b/media-sound/vkeybd/ChangeLog
index eb2f3aa444d7..caf92ce3f2ae 100644
--- a/media-sound/vkeybd/ChangeLog
+++ b/media-sound/vkeybd/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/vkeybd
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.28 2006/11/27 00:23:37 malc Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.29 2007/07/22 08:38:31 drac Exp $
+
+  22 Jul 2007; Samuli Suominen <drac@gentoo.org> -vkeybd-0.1.15-r1.ebuild,
+  vkeybd-0.1.15-r2.ebuild, vkeybd-0.1.17a.ebuild:
+  Remove unused version and virtual/x11 references.
 
   27 Nov 2006; <malc@gentoo.org> vkeybd-0.1.15-r2.ebuild:
   Stable on amd64 - bug #155639
diff --git a/media-sound/vkeybd/files/digest-vkeybd-0.1.15-r1 b/media-sound/vkeybd/files/digest-vkeybd-0.1.15-r1
deleted file mode 100644
index 9364939e7b17..000000000000
--- a/media-sound/vkeybd/files/digest-vkeybd-0.1.15-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 cf5112b4119ee21be7a819533777ba01 vkeybd-0.1.15.tar.gz 26117
-RMD160 51382b99528a1e6ba6b48e07a4840d0e655eddd9 vkeybd-0.1.15.tar.gz 26117
-SHA256 a77e5376ab850d829e5759fcd82b236d5f92a6fd5826add84635e851f1b336a1 vkeybd-0.1.15.tar.gz 26117
diff --git a/media-sound/vkeybd/vkeybd-0.1.15-r1.ebuild b/media-sound/vkeybd/vkeybd-0.1.15-r1.ebuild
deleted file mode 100644
index 5e0539b8043e..000000000000
--- a/media-sound/vkeybd/vkeybd-0.1.15-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2006 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-r1.ebuild,v 1.6 2006/10/28 23:36:28 flameeyes Exp $
-
-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 virtual/x11 )"
-
-DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86bigfontproto
-			x11-proto/bigreqsproto
-			x11-proto/xextproto
-			x11-proto/xcmiscproto )
-		virtual/x11 )"
-
-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_compile() {
-	emake ${myconf} || die "Make failed."
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Installation Failed"
-	emake DESTDIR="${D}" install-man || die "Man-Page Installation Failed"
-	dodoc README
-}
diff --git a/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild b/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild
index 609e80e98cc4..5ce90c8f96e8 100644
--- a/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.3 2006/11/27 00:23:37 malc Exp $
+# $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
 
@@ -17,16 +17,14 @@ 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 virtual/x11 )"
-
+	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86bigfontproto
-			x11-proto/bigreqsproto
-			x11-proto/xextproto
-			x11-proto/xcmiscproto )
-		virtual/x11 )"
+	x11-proto/xf86bigfontproto
+	x11-proto/bigreqsproto
+	x11-proto/xextproto
+	x11-proto/xcmiscproto"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}"/${PN}
 
 pkg_setup() {
 	TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
@@ -52,15 +50,14 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}"/${P}-makefile.patch
 }
 
 src_compile() {
-	emake ${myconf} EXTRACFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "Make failed."
+	emake ${myconf} EXTRACFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed."
 }
 
 src_install() {
-	emake ${myconf} DESTDIR="${D}" install-all || die "Installation Failed"
+	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
index 61a6d03ce953..84aec9319ed2 100644
--- a/media-sound/vkeybd/vkeybd-0.1.17a.ebuild
+++ b/media-sound/vkeybd/vkeybd-0.1.17a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# 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.1 2006/11/25 11:17:47 aballier Exp $
+# $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
 
@@ -17,16 +17,14 @@ 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 virtual/x11 )"
-
+	x11-libs/libX11"
 DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xf86bigfontproto
-			x11-proto/bigreqsproto
-			x11-proto/xextproto
-			x11-proto/xcmiscproto )
-		virtual/x11 )"
+	x11-proto/xf86bigfontproto
+	x11-proto/bigreqsproto
+	x11-proto/xextproto
+	x11-proto/xcmiscproto"
 
-S=${WORKDIR}/${PN}
+S="${WORKDIR}"/${PN}
 
 pkg_setup() {
 	TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
@@ -52,15 +50,14 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-
-	epatch "${FILESDIR}/${P}-makefile.patch"
+	epatch "${FILESDIR}"/${P}-makefile.patch
 }
 
 src_compile() {
-	emake ${myconf} EXTRACFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "Make failed."
+	emake ${myconf} EXTRACFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed."
 }
 
 src_install() {
-	emake ${myconf} DESTDIR="${D}" install-all || die "Installation Failed"
+	emake ${myconf} DESTDIR="${D}" install-all || die "emake install failed."
 	dodoc README ChangeLog
 }