rev bump: dont ignore cflags nor ldflags, install into /usr instead of /usr/local, bug #155639; dont pre-strip binaries

(Portage version: 2.1.2_rc2-r2)

4 files changed, 108 insertions, 1 deletions

diff --git a/media-sound/vkeybd/ChangeLog b/media-sound/vkeybd/ChangeLog
index 2ff923311530..fba7afc84f4d 100644
--- a/media-sound/vkeybd/ChangeLog
+++ b/media-sound/vkeybd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.24 2006/10/28 23:36:28 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.25 2006/11/25 10:45:17 aballier Exp $
+
+*vkeybd-0.1.15-r2 (25 Nov 2006)
+
+  25 Nov 2006; Alexis Ballier <aballier@gentoo.org>
+  +files/vkeybd-0.1.15-makefile.patch, +vkeybd-0.1.15-r2.ebuild:
+  rev bump: dont ignore cflags nor ldflags, install into /usr instead of
+  /usr/local, bug #155639; dont pre-strip binaries
 
   28 Oct 2006; Diego Pettenò <flameeyes@gentoo.org>
   vkeybd-0.1.15-r1.ebuild:
diff --git a/media-sound/vkeybd/files/digest-vkeybd-0.1.15-r2 b/media-sound/vkeybd/files/digest-vkeybd-0.1.15-r2
new file mode 100644
index 000000000000..9364939e7b17
--- /dev/null
+++ b/media-sound/vkeybd/files/digest-vkeybd-0.1.15-r2
@@ -0,0 +1,3 @@
+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/files/vkeybd-0.1.15-makefile.patch b/media-sound/vkeybd/files/vkeybd-0.1.15-makefile.patch
new file mode 100644
index 000000000000..70c7d7334b8e
--- /dev/null
+++ b/media-sound/vkeybd/files/vkeybd-0.1.15-makefile.patch
@@ -0,0 +1,31 @@
+--- 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/vkeybd-0.1.15-r2.ebuild b/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild
new file mode 100644
index 000000000000..dbda92062ae3
--- /dev/null
+++ b/media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild
@@ -0,0 +1,66 @@
+# 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-r2.ebuild,v 1.1 2006/11/25 10:45:17 aballier 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 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}"
+	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 "Make failed."
+}
+
+src_install() {
+	emake ${myconf} DESTDIR="${D}" install-all || die "Installation Failed"
+	dodoc README ChangeLog
+}