From ffebbcf0e259d8bb32d581b0843da0c3b679b448 Mon Sep 17 00:00:00 2001 From: Alexis Ballier Date: Sat, 25 Nov 2006 10:45:18 +0000 Subject: [PATCH] rev bump: dont ignore cflags nor ldflags, install into /usr instead of /usr/local, bug #155639; dont pre-strip binaries Package-Manager: portage-2.1.2_rc2-r2 --- media-sound/vkeybd/ChangeLog | 9 ++- media-sound/vkeybd/Manifest | 25 +++++-- .../vkeybd/files/digest-vkeybd-0.1.15-r2 | 3 + .../vkeybd/files/vkeybd-0.1.15-makefile.patch | 31 +++++++++ media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild | 66 +++++++++++++++++++ 5 files changed, 126 insertions(+), 8 deletions(-) create mode 100644 media-sound/vkeybd/files/digest-vkeybd-0.1.15-r2 create mode 100644 media-sound/vkeybd/files/vkeybd-0.1.15-makefile.patch create mode 100644 media-sound/vkeybd/vkeybd-0.1.15-r2.ebuild 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 + +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ò vkeybd-0.1.15-r1.ebuild: diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest index b454f84d33ba..3ec969c61872 100644 --- a/media-sound/vkeybd/Manifest +++ b/media-sound/vkeybd/Manifest @@ -1,15 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX vkeybd-0.1.15-makefile.patch 1126 RMD160 978cfb2e57b0386f57a002ddc5a1988cf66c4910 SHA1 60ee8e7dc5847943049fe247fc65c78c2c1e2b2f SHA256 99588b3b8752606eed880f567e671bd3bb720e3f943ab2b302145654d8cc0b31 +MD5 bdc9dca596496f04bc2b7d209dc1aba0 files/vkeybd-0.1.15-makefile.patch 1126 +RMD160 978cfb2e57b0386f57a002ddc5a1988cf66c4910 files/vkeybd-0.1.15-makefile.patch 1126 +SHA256 99588b3b8752606eed880f567e671bd3bb720e3f943ab2b302145654d8cc0b31 files/vkeybd-0.1.15-makefile.patch 1126 DIST vkeybd-0.1.15.tar.gz 26117 RMD160 51382b99528a1e6ba6b48e07a4840d0e655eddd9 SHA1 68693fceaf561d563ab7821df8368b479a9fe60b SHA256 a77e5376ab850d829e5759fcd82b236d5f92a6fd5826add84635e851f1b336a1 EBUILD vkeybd-0.1.15-r1.ebuild 1427 RMD160 9d985a94a02cc6ddf0dd3013cd7d0d5570d5cc42 SHA1 f326a8a1a8d2618b974ae425ba2801feec3a95f3 SHA256 5605e769f1206f35da6c7d4cdd35c71918c468cd6d5b83f899d4b83886eccae3 MD5 c3ba0c45afab3c239303138e19719828 vkeybd-0.1.15-r1.ebuild 1427 RMD160 9d985a94a02cc6ddf0dd3013cd7d0d5570d5cc42 vkeybd-0.1.15-r1.ebuild 1427 SHA256 5605e769f1206f35da6c7d4cdd35c71918c468cd6d5b83f899d4b83886eccae3 vkeybd-0.1.15-r1.ebuild 1427 -MISC ChangeLog 3453 RMD160 54e38c850ffdc924f644b253220fa0eb6f6ef4da SHA1 044f08b6b952b76edb0c5b4fc81b9b215a55a455 SHA256 1ddfb6c6bb40c2638f9932843d0255465622f3ce226bb3d6f65086f633572f55 -MD5 0ff47d0f5201f35adff3bb8cd58d02c6 ChangeLog 3453 -RMD160 54e38c850ffdc924f644b253220fa0eb6f6ef4da ChangeLog 3453 -SHA256 1ddfb6c6bb40c2638f9932843d0255465622f3ce226bb3d6f65086f633572f55 ChangeLog 3453 +EBUILD vkeybd-0.1.15-r2.ebuild 1577 RMD160 89e483b891ab7827dd1e07921d9768ca62c89419 SHA1 3b3f7b4af2fdfd8115756652adf86f31fc5a11bf SHA256 592aba23dc92c5566ff73f838e274b5c02e3874cef33e0ec5509e0e0aed8c223 +MD5 dc2a1feb0c12826498e61b77edc6ca88 vkeybd-0.1.15-r2.ebuild 1577 +RMD160 89e483b891ab7827dd1e07921d9768ca62c89419 vkeybd-0.1.15-r2.ebuild 1577 +SHA256 592aba23dc92c5566ff73f838e274b5c02e3874cef33e0ec5509e0e0aed8c223 vkeybd-0.1.15-r2.ebuild 1577 +MISC ChangeLog 3727 RMD160 49f82148445a9cff331898dc1540dcd8c3e55c4c SHA1 291103f1ea630030d7b0274cc4ae8898182e18a0 SHA256 8bfc1a884077db9bc6548574cb26b0ec890b5ab5e90534afbc89dd14a3b5868f +MD5 988c88c58e5243619ca7dbce92ef3a0b ChangeLog 3727 +RMD160 49f82148445a9cff331898dc1540dcd8c3e55c4c ChangeLog 3727 +SHA256 8bfc1a884077db9bc6548574cb26b0ec890b5ab5e90534afbc89dd14a3b5868f ChangeLog 3727 MISC metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 SHA1 aff61004cffd7341912643e1ab44a8df84e14c23 SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e MD5 d0d7ea03e238a808414b4426394c100f metadata.xml 221 RMD160 600a2278f8a89283311c5bb10b02d54cebef8ca3 metadata.xml 221 @@ -17,10 +25,13 @@ SHA256 3341e7789c5ba08aade2440d5ce6d2937e8432775731033190f11df5f64d085e metadata MD5 89f22f95b5731a1bfb5cc64b6f812de2 files/digest-vkeybd-0.1.15-r1 238 RMD160 bb0a57b691cde216f2c68b332d4a06668eded94f files/digest-vkeybd-0.1.15-r1 238 SHA256 1b276b98f0577efd7e08cfeeb8a67c48994133787b256ac2f567974c17726150 files/digest-vkeybd-0.1.15-r1 238 +MD5 89f22f95b5731a1bfb5cc64b6f812de2 files/digest-vkeybd-0.1.15-r2 238 +RMD160 bb0a57b691cde216f2c68b332d4a06668eded94f files/digest-vkeybd-0.1.15-r2 238 +SHA256 1b276b98f0577efd7e08cfeeb8a67c48994133787b256ac2f567974c17726150 files/digest-vkeybd-0.1.15-r2 238 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.5 (GNU/Linux) -iD8DBQFFQ+mDAiZjviIA2XgRAhq4AJwPHdp7EQjmXkQ2JNRBZsZr3i6B9QCgi8QT -sEKNqcCpsBMO+uhlyfgWUC4= -=W38p +iD8DBQFFaB94vFcC4BYPU0oRAqZWAJ9DRkpf0yS0qUueXlJNzsPVcUF5QQCgrg/D +wbN/F89wzjH7NOH3LEuOWA8= +=jvu7 -----END PGP SIGNATURE----- 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 +} -- 2.26.2