remove old

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

6 files changed, 7 insertions, 317 deletions

diff --git a/media-sound/vkeybd/ChangeLog b/media-sound/vkeybd/ChangeLog
index 4c011b37f853..6d6b18d20e4b 100644
--- a/media-sound/vkeybd/ChangeLog
+++ b/media-sound/vkeybd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/vkeybd
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.40 2010/07/13 14:38:29 fauli Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.41 2011/04/19 13:50:40 aballier Exp $
+
+  19 Apr 2011; Alexis Ballier <aballier@gentoo.org> -vkeybd-0.1.17b-r1.ebuild,
+  -files/vkeybd-0.1.17b-desktop-entry.patch, -files/vkeybd-0.1.17b-lash.patch,
+  -files/vkeybd-0.1.17b-makefile.patch, -vkeybd-0.1.18c.ebuild:
+  remove old
 
   13 Jul 2010; Christian Faulhammer <fauli@gentoo.org>
   vkeybd-0.1.18d.ebuild:
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.17b-desktop-entry.patch b/media-sound/vkeybd/files/vkeybd-0.1.17b-desktop-entry.patch
deleted file mode 100644
index 7b1a7357e5db..000000000000
--- a/media-sound/vkeybd/files/vkeybd-0.1.17b-desktop-entry.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-diff -ur vkeybd.orig/vkeybd.desktop vkeybd/vkeybd.desktop
---- vkeybd.orig/vkeybd.desktop	2004-03-03 16:06:30.000000000 +0200
-+++ vkeybd/vkeybd.desktop	2009-07-15 20:35:38.000000000 +0300
-@@ -3,4 +3,5 @@
- Name=vkeybd
- Comment=A virtual MIDI keyboard
- Exec=vkeybd
--Icon=vkeybd
-+Icon=vkeybd_48x48
-+Categories=AudioVideo;Audio;
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.17b-lash.patch b/media-sound/vkeybd/files/vkeybd-0.1.17b-lash.patch
deleted file mode 100644
index c5c150d981bc..000000000000
--- a/media-sound/vkeybd/files/vkeybd-0.1.17b-lash.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-diff -ur vkeybd.orig/Makefile vkeybd/Makefile
---- vkeybd.orig/Makefile	2007-08-06 20:22:15.000000000 +0300
-+++ vkeybd/Makefile	2009-07-15 20:23:43.000000000 +0300
-@@ -30,7 +30,7 @@
- USE_AWE = 1
- USE_MIDI = 1
- USE_ALSA = 1
--USE_LADCCA = 0
-+USE_LASH = 0
- 
- #
- # Tcl/Tk library -- depends on your distribution
-@@ -68,14 +68,14 @@
- endif
- 
- #
--# LADCCA stuff
-+# LASH stuff
- #
--ifeq (1,$(USE_LADCCA))
--LADCCACFLAGS = $(shell pkg-config --cflags ladcca-1.0) \
--	       $(shell pkg-config --exists ladcca-1.0 && echo "-DHAVE_LADCCA" )
--LADCCALIBS   = $(shell pkg-config --libs ladcca-1.0)
--DEVICES += $(LADCCACFLAGS)
--EXTRALIB += $(LADCCALIBS)
-+ifeq (1,$(USE_LASH))
-+LASHCFLAGS = $(shell pkg-config --cflags lash-1.0) \
-+	       $(shell pkg-config --exists lash-1.0 && echo "-DHAVE_LASH" )
-+LASHLIBS   = $(shell pkg-config --libs lash-1.0)
-+DEVICES += $(LASHCFLAGS)
-+EXTRALIB += $(LASHLIBS)
- endif
- 
- #----------------------------------------------------------------
-@@ -88,7 +88,7 @@
- CFLAGS = $(COPTFLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
- 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
- 	-DVERSION_STR=\"$(VERSION)\"\
--	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LADCCACFLAGS)
-+	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS)
- 
- TARGETS = vkeybd sftovkb
- 
-diff -ur vkeybd.orig/oper_alsa.c vkeybd/oper_alsa.c
---- vkeybd.orig/oper_alsa.c	2004-03-03 15:58:48.000000000 +0200
-+++ vkeybd/oper_alsa.c	2009-07-15 20:23:44.000000000 +0300
-@@ -78,8 +78,8 @@
- static vkb_optarg_t alsa_opts[] = {
- 	{"addr", "subscriber", "--addr client:port or 'subscriber' : ALSA sequencer destination"},
- 	{"name", DEFAULT_NAME, "--name string : use the specified string as client/port names"},
--#ifdef HAVE_LADCCA	
--	{"ladcca", "no", "--ladcca <yes|no> : support LADCCA (default = no)"},
-+#ifdef HAVE_LASH	
-+	{"lash", "no", "--lash <yes|no> : support LASH (default = no)"},
- #endif
- 	{NULL},
- };
-@@ -100,8 +100,8 @@
- static int seq_client, seq_port;
- static int chan_no;
- 
--#ifdef HAVE_LADCCA	
--static cca_client_t * cca_client = NULL;
-+#ifdef HAVE_LASH	
-+static lash_client_t * lash_client = NULL;
- #endif
- 
- /*
-@@ -156,25 +156,25 @@
- 	/* get my client id */
- 	my_client = snd_seq_client_id(seq_handle);
- 	
--	/* tell the ladcca server our client id */
--#ifdef HAVE_LADCCA
--	if ((var = Tcl_GetVar2(ip, "optvar", "ladcca", TCL_GLOBAL_ONLY)) != NULL) {
-+	/* tell the lash server our client id */
-+#ifdef HAVE_LASH
-+	if ((var = Tcl_GetVar2(ip, "optvar", "lash", TCL_GLOBAL_ONLY)) != NULL) {
- 		if (*var == 'y' || *var == 'Y' || *var == '1') {
--			cca_client = cca_init (cca_args,
-+			lash_client = lash_init (lash_args,
- 					       "vkeybd",
--					       my_client, CCA_PROTOCOL_VERSION);
--			if (cca_enabled (cca_client)) {
--				cca_event_t * event;
-+					       my_client, LASH_PROTOCOL_VERSION);
-+			if (lash_enabled (lash_client)) {
-+				lash_event_t * event;
- 				unsigned char id[2];
--				event = cca_event_new_with_type (CCA_Alsa_Client_ID);
-+				event = lash_event_new_with_type (LASH_Alsa_Client_ID);
- 				id[0] = snd_seq_client_id (seq_handle);
- 				id[1] = '\0';
--				cca_event_set_string (event, id);
--				cca_send_event (cca_client, event);
-+				lash_event_set_string (event, id);
-+				lash_send_event (lash_client, event);
- 			}
- 		}
- 	}
--#endif /* HAVE_LADCCA */
-+#endif /* HAVE_LASH */
-  
- 	/* set client info */
- 	if ((var = Tcl_GetVar2(ip, "optvar", "name", TCL_GLOBAL_ONLY)) != NULL)
-@@ -203,8 +203,8 @@
- 	if (seq_client != SND_SEQ_ADDRESS_SUBSCRIBERS) {
- 		/* subscribe to MIDI port */
- 		if (
--#ifdef HAVE_LADCCA
--		    !cca_enabled (cca_client) &&
-+#ifdef HAVE_LASH
-+		    !lash_enabled (lash_client) &&
- #endif
- 		    snd_seq_connect_to(seq_handle, my_port, seq_client, seq_port) < 0) {
- 			vkb_error(ip, "can't subscribe to MIDI port (%d:%d)\n", seq_client, seq_port);
-diff -ur vkeybd.orig/vkb.c vkeybd/vkb.c
---- vkeybd.orig/vkb.c	2003-08-19 18:47:59.000000000 +0300
-+++ vkeybd/vkb.c	2009-07-15 20:23:44.000000000 +0300
-@@ -64,8 +64,8 @@
- static int seq_bend = 0;
- static vkb_oper_t *oper;
- 
--#ifdef HAVE_LADCCA	
--cca_args_t * cca_args = NULL;
-+#ifdef HAVE_LASH	
-+lash_args_t * lash_args = NULL;
- #endif
-  
- /*
-@@ -77,9 +77,9 @@
- 	char **nargv;
- 	int c, nargc;
- 
--#ifdef HAVE_LADCCA	
--	cca_args = cca_extract_args(&argc, &argv);
--#endif /* HAVE_LADCCA */
-+#ifdef HAVE_LASH	
-+	lash_args = lash_extract_args(&argc, &argv);
-+#endif /* HAVE_LASH */
- 
- 	nargc = argc + 1;
- 	if ((nargv = (char**)malloc(sizeof(char*) * nargc)) == NULL) {
-diff -ur vkeybd.orig/vkb.h vkeybd/vkb.h
---- vkeybd.orig/vkb.h	2004-03-03 15:58:48.000000000 +0200
-+++ vkeybd/vkb.h	2009-07-15 20:23:43.000000000 +0300
-@@ -23,8 +23,8 @@
- 
- #include <tcl.h>
- 
--#ifdef HAVE_LADCCA
--#include <ladcca/ladcca.h>
-+#ifdef HAVE_LASH
-+#include <lash/lash.h>
- #endif
- 
- #ifndef VKB_TCLFILE
-@@ -72,8 +72,8 @@
- void vkb_error(Tcl_Interp *ip, char *fmt, ...);
- int vkb_get_int(Tcl_Interp *ip, char *opt, int *ret);
- 
--#ifdef HAVE_LADCCA
--extern cca_args_t *cca_args;
-+#ifdef HAVE_LASH
-+extern lash_args_t *lash_args;
- #endif
- 
- #endif
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.17b-makefile.patch b/media-sound/vkeybd/files/vkeybd-0.1.17b-makefile.patch
deleted file mode 100644
index ee0ef098ea29..000000000000
--- a/media-sound/vkeybd/files/vkeybd-0.1.17b-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: vkeybd/Makefile
-===================================================================
---- vkeybd.orig/Makefile
-+++ vkeybd/Makefile
-@@ -95,10 +95,10 @@ TARGETS = vkeybd sftovkb
- 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.17b-r1.ebuild b/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild
deleted file mode 100644
index f89791d7eb9f..000000000000
--- a/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# 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.3 2009/07/16 08:58:25 ssuominen Exp $
-
-EAPI=2
-inherit toolchain-funcs eutils
-
-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"
-IUSE="alsa lash oss"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	>=dev-lang/tk-8.3
-	lash? ( media-sound/lash )
-	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`
-
-	vkeybconf="PREFIX=/usr"
-
-	if use alsa; then
-		vkeybconf+=" USE_ALSA=1"
-		use oss || vkeybconf+=" USE_AWE=0 USE_MIDI=0"
-	else
-		vkeybconf+=" USE_ALSA=0 USE_AWE=1 USE_MIDI=1"
-	fi
-
-	use lash && vkeybconf+=" USE_LASH=1"
-
-	vkeybconf+=" TCL_VERSION=${TCL_VERSION}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-makefile.patch \
-		"${FILESDIR}"/${P}-desktop-entry.patch \
-		"${FILESDIR}"/${P}-lash.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake ${vkeybconf} COPTFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake ${vkeybconf} DESTDIR="${D}" \
-		install-all || die "emake install failed"
-	dodoc ChangeLog README
-}
diff --git a/media-sound/vkeybd/vkeybd-0.1.18c.ebuild b/media-sound/vkeybd/vkeybd-0.1.18c.ebuild
deleted file mode 100644
index ad9e861d3390..000000000000
--- a/media-sound/vkeybd/vkeybd-0.1.18c.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# 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.18c.ebuild,v 1.2 2009/07/16 16:28:32 ssuominen Exp $
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A virtual MIDI keyboard for X"
-HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
-SRC_URI="http://ftp.suse.com/pub/people/tiwai/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="alsa lash oss"
-
-RDEPEND="alsa? ( media-libs/alsa-lib )
-	>=dev-lang/tk-8.3
-	lash? ( media-sound/lash )
-	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`
-
-	vkeybconf="PREFIX=/usr"
-
-	if use alsa; then
-		vkeybconf+=" USE_ALSA=1"
-		use oss || vkeybconf+=" USE_AWE=0 USE_MIDI=0"
-	else
-		vkeybconf+=" USE_ALSA=0 USE_AWE=1 USE_MIDI=1"
-	fi
-
-	use lash && vkeybconf+=" USE_LASH=1"
-
-	vkeybconf+=" TCL_VERSION=${TCL_VERSION}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-desktop_entry.patch
-}
-
-src_compile() {
-	tc-export CC
-	emake ${vkeybconf} COPTFLAGS="${CFLAGS}" || die "emake failed"
-}
-
-src_install() {
-	emake ${vkeybconf} DESTDIR="${D}" \
-		install-all || die "emake install failed"
-	dodoc ChangeLog README
-}