From 701bae8e03115b7387e5d44426c3b63f1106f3a6 Mon Sep 17 00:00:00 2001 From: Jeremy Huddleston Date: Tue, 9 Nov 2004 04:03:41 +0000 Subject: Removing old versions. Fixed tclsh in global context. --- media-sound/vkeybd/ChangeLog | 11 ++++- media-sound/vkeybd/files/digest-vkeybd-0.1.12 | 1 - media-sound/vkeybd/files/digest-vkeybd-0.1.13-r1 | 1 - .../files/vkeybd-0.1.12-Makefile.destdir.patch | 29 ----------- .../vkeybd-0.1.12-Makefile.passvariables.patch | 28 ----------- .../vkeybd-0.1.13-Makefile.passvariables.patch | 38 --------------- .../vkeybd/files/vkeybd-0.1.13-alsa-fix.patch | 19 -------- .../vkeybd/files/vkeybd-0.1.13-vkb.c-ladcca.patch | 12 ----- media-sound/vkeybd/vkeybd-0.1.12.ebuild | 49 ------------------- media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild | 57 ---------------------- media-sound/vkeybd/vkeybd-0.1.15.ebuild | 7 ++- 11 files changed, 15 insertions(+), 237 deletions(-) delete mode 100644 media-sound/vkeybd/files/digest-vkeybd-0.1.12 delete mode 100644 media-sound/vkeybd/files/digest-vkeybd-0.1.13-r1 delete mode 100644 media-sound/vkeybd/files/vkeybd-0.1.12-Makefile.destdir.patch delete mode 100644 media-sound/vkeybd/files/vkeybd-0.1.12-Makefile.passvariables.patch delete mode 100644 media-sound/vkeybd/files/vkeybd-0.1.13-Makefile.passvariables.patch delete mode 100644 media-sound/vkeybd/files/vkeybd-0.1.13-alsa-fix.patch delete mode 100644 media-sound/vkeybd/files/vkeybd-0.1.13-vkb.c-ladcca.patch delete mode 100644 media-sound/vkeybd/vkeybd-0.1.12.ebuild delete mode 100644 media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild (limited to 'media-sound/vkeybd') diff --git a/media-sound/vkeybd/ChangeLog b/media-sound/vkeybd/ChangeLog index 1eb81c8b5cf4..ffbc648fa9ee 100644 --- a/media-sound/vkeybd/ChangeLog +++ b/media-sound/vkeybd/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for media-sound/vkeybd # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.15 2004/09/15 17:42:28 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.16 2004/11/09 04:03:40 eradicator Exp $ + + 08 Nov 2004; Jeremy Huddleston + -files/vkeybd-0.1.12-Makefile.destdir.patch, + -files/vkeybd-0.1.12-Makefile.passvariables.patch, + -files/vkeybd-0.1.13-Makefile.passvariables.patch, + -files/vkeybd-0.1.13-alsa-fix.patch, + -files/vkeybd-0.1.13-vkb.c-ladcca.patch, -vkeybd-0.1.12.ebuild, + -vkeybd-0.1.13-r1.ebuild: + Removing old versions. Fixed tclsh in global context. 15 Sep 2004; Jeremy Huddleston vkeybd-0.1.15.ebuild: Stable amd64. diff --git a/media-sound/vkeybd/files/digest-vkeybd-0.1.12 b/media-sound/vkeybd/files/digest-vkeybd-0.1.12 deleted file mode 100644 index 52dc882a57d9..000000000000 --- a/media-sound/vkeybd/files/digest-vkeybd-0.1.12 +++ /dev/null @@ -1 +0,0 @@ -MD5 7c627d85ba4acf4c287d195aeb6e9998 vkeybd-0.1.12.tar.gz 24015 diff --git a/media-sound/vkeybd/files/digest-vkeybd-0.1.13-r1 b/media-sound/vkeybd/files/digest-vkeybd-0.1.13-r1 deleted file mode 100644 index 6eb51cce349d..000000000000 --- a/media-sound/vkeybd/files/digest-vkeybd-0.1.13-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 3c8353800e28783b23e19478143d11f6 vkeybd-0.1.13.tar.gz 25539 diff --git a/media-sound/vkeybd/files/vkeybd-0.1.12-Makefile.destdir.patch b/media-sound/vkeybd/files/vkeybd-0.1.12-Makefile.destdir.patch deleted file mode 100644 index 9de8ccc0273d..000000000000 --- a/media-sound/vkeybd/files/vkeybd-0.1.12-Makefile.destdir.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- ../vkeybd.orig/Makefile 2002-12-16 07:15:57.000000000 +0100 -+++ Makefile 2002-12-16 07:22:42.000000000 +0100 -@@ -93,17 +93,17 @@ - $(CC) -o $@ $^ -lm - - install: $(TARGETS) vkeybd.tcl vkeybd.list -- mkdir -p $(INSTALL_DIR) -- install -c -s vkeybd $(INSTALL_DIR) -- install -c -s sftovkb $(INSTALL_DIR) -- rm -f $(INSTALL_DIR)/vkeybd.tcl -- mkdir -p $(VKBLIB_DIR) -- install -c -m 444 vkeybd.tcl $(VKBLIB_DIR) -- install -c -m 444 vkeybd.list $(VKBLIB_DIR) -+ mkdir -p ${DESTDIR}$(INSTALL_DIR) -+ install -c -s vkeybd ${DESTDIR}$(INSTALL_DIR) -+ install -c -s sftovkb ${DESTDIR}$(INSTALL_DIR) -+ rm -f ${DESTDIR}$(INSTALL_DIR)/vkeybd.tcl -+ mkdir -p ${DESTDIR}$(VKBLIB_DIR) -+ install -c -m 444 vkeybd.tcl ${DESTDIR}$(VKBLIB_DIR) -+ install -c -m 444 vkeybd.list ${DESTDIR}$(VKBLIB_DIR) - - install-man: -- mkdir -p $(MAN_DIR) -- install -c -m 444 vkeybd.man $(MAN_DIR)/vkeybd.$(MAN_SUFFIX) -+ mkdir -p ${DESTDIR}$(MAN_DIR) -+ install -c -m 444 vkeybd.man ${DESTDIR}$(MAN_DIR)/vkeybd.$(MAN_SUFFIX) - - install-all: install install-man - diff --git a/media-sound/vkeybd/files/vkeybd-0.1.12-Makefile.passvariables.patch b/media-sound/vkeybd/files/vkeybd-0.1.12-Makefile.passvariables.patch deleted file mode 100644 index 5565ed2b4797..000000000000 --- a/media-sound/vkeybd/files/vkeybd-0.1.12-Makefile.passvariables.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- ../vkeybd.orig/Makefile 2001-05-25 16:57:22.000000000 +0200 -+++ Makefile 2002-12-16 03:36:46.000000000 +0100 -@@ -8,7 +8,9 @@ - # - # installation directory - # -+ifndef $(PREFIX) - PREFIX = /usr/local -+endif - # binary and Tcl script are put there - INSTALL_DIR = $(PREFIX)/bin - # man page -@@ -24,9 +26,15 @@ - # device selections -- multiple avaialble - # to disable the device, set value 0 (do not comment out!) - # -+ifndef $(USE_AWE) - USE_AWE = 1 -+endif -+ifndef $(USE_MIDI) - USE_MIDI = 1 -+endif -+ifndef $(USE_ALSA) - USE_ALSA = 1 -+endif - - # - # Tcl/Tk library -- depends on your distribution diff --git a/media-sound/vkeybd/files/vkeybd-0.1.13-Makefile.passvariables.patch b/media-sound/vkeybd/files/vkeybd-0.1.13-Makefile.passvariables.patch deleted file mode 100644 index 282e9dd1876b..000000000000 --- a/media-sound/vkeybd/files/vkeybd-0.1.13-Makefile.passvariables.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- Makefile~ 2003-01-23 16:41:33.000000000 +0100 -+++ Makefile 2003-04-22 19:16:04.000000000 +0200 -@@ -8,7 +8,9 @@ - # - # installation directory - # -+ifndef $(PREFIX) - PREFIX = /usr/local -+endif - # binary and Tcl script are put there - BIN_DIR = $(PREFIX)/bin - # man page -@@ -24,15 +26,25 @@ - # device selections -- multiple avaialble - # to disable the device, set value 0 (do not comment out!) - # -+ifndef $(USE_AWE) - USE_AWE = 1 -+endif -+ifndef $(USE_MIDI) - USE_MIDI = 1 -+endif -+ifndef $(USE_ALSA) - USE_ALSA = 1 -+endif -+ifndef $(USE_LADCCA) - USE_LADCCA = 0 -+endif - - # - # Tcl/Tk library -- depends on your distribution - # -+ifndef $(TCL_VERSION) - TCL_VERSION = 8.4 -+endif - TCLLIB = -ltcl$(TCL_VERSION) - TCLINC = - TKLIB = -ltk$(TCL_VERSION) 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 deleted file mode 100644 index 36cf0d266701..000000000000 --- a/media-sound/vkeybd/files/vkeybd-0.1.13-alsa-fix.patch +++ /dev/null @@ -1,19 +0,0 @@ -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 - #else -+#include -+# if SND_LIB_MAJOR==1 -+# define ALSA_PCM_OLD_HW_PARAMS_API -+# endif - #include - #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/files/vkeybd-0.1.13-vkb.c-ladcca.patch b/media-sound/vkeybd/files/vkeybd-0.1.13-vkb.c-ladcca.patch deleted file mode 100644 index b4cfcd895cb9..000000000000 --- a/media-sound/vkeybd/files/vkeybd-0.1.13-vkb.c-ladcca.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- vkb.c~ 2003-01-23 17:00:19.000000000 +0100 -+++ vkb.c 2003-05-17 18:12:13.000000000 +0200 -@@ -80,7 +80,7 @@ - #ifdef HAVE_LADCCA - cca_client = cca_init (cca_extract_args (&argc, &argv), - "vkeybd", -- CCA_Use_Alsa); -+ CCA_Use_Alsa, CCA_PROTOCOL_VERSION ); - #endif /* HAVE_LADCCA */ - - nargc = argc + 1; - diff --git a/media-sound/vkeybd/vkeybd-0.1.12.ebuild b/media-sound/vkeybd/vkeybd-0.1.12.ebuild deleted file mode 100644 index 82b0949824fd..000000000000 --- a/media-sound/vkeybd/vkeybd-0.1.12.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# 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.7 2004/06/25 00:28:05 agriffis Exp $ - -DESCRIPTION="A virtual MIDI keyboard for X." -HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="x86" -IUSE="alsa oss" - -DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 ) - =dev-lang/tk-8.3* - =dev-lang/tcl-8.3* - virtual/x11" - -SRC_URI="http://www.alsa-project.org/~iwai/${P}.tar.gz" -S=${WORKDIR}/${PN} - -src_unpack() { - unpack ${A} || die - cd ${S} - patch -p0 < ${FILESDIR}/${P}-Makefile.passvariables.patch || die \ - "Patch #1 failed" - patch -p0 < ${FILESDIR}/${P}-Makefile.destdir.patch || die \ - "Patch #2 failed" -} - -src_compile() { - local 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 - - make ${myconf} || 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" - dodoc README -} diff --git a/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild b/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild deleted file mode 100644 index 6bcb0d76d737..000000000000 --- a/media-sound/vkeybd/vkeybd-0.1.13-r1.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# 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.5 2004/06/25 00:28:05 agriffis Exp $ - -inherit eutils - -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="x86" -IUSE="alsa oss ladcca" - -DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 ) - >=dev-lang/tk-8.3 - >=dev-lang/tcl-8.3 - virtual/x11 - ladcca? ( >=media-libs/ladcca-0.3.1 )" - -S=${WORKDIR}/${PN} -TCL_VERSION=`echo 'puts [info tclversion]' | tclsh` - -src_unpack() { - unpack ${A} || die - cd ${S} - epatch ${FILESDIR}/${P}-Makefile.passvariables.patch || die \ - "Patch #1 failed" - 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() { - local 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 - use ladcca && myconf="${myconf} USE_LADCCA=1" - - make ${myconf} TCL_VERSION=${TCL_VERSION} || die "Make failed." -} - -src_install() { - 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 79a799c10a9d..0b24040cb49d 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-2004 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.ebuild,v 1.6 2004/09/15 17:42:28 eradicator Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.15.ebuild,v 1.7 2004/11/09 04:03:41 eradicator Exp $ DESCRIPTION="A virtual MIDI keyboard for X" HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html" @@ -18,9 +18,10 @@ DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.0 ) ladcca? ( >=media-libs/ladcca-0.3.1 )" S=${WORKDIR}/${PN} -TCL_VERSION=`echo 'puts [info tclversion]' | tclsh` src_compile() { + TCL_VERSION=`echo 'puts [info tclversion]' | tclsh` + local myconf="PREFIX=/usr" #vkeybd requires at least one of its USE_ variable to be set @@ -36,6 +37,8 @@ src_compile() { } src_install() { + TCL_VERSION=`echo 'puts [info tclversion]' | tclsh` + make DESTDIR=${D} TCL_VERSION=$TCL_VERSION PREFIX=/usr install || \ die "Installation Failed" make DESTDIR=${D} TCL_VERSION=$TCL_VERSION PREFIX=/usr install-man || \ -- cgit v1.2.3-65-gdbad