From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- media-sound/vkeybd/Manifest | 3 +- .../files/vkeybd-0.1.18c-fix-buildsystem.patch | 81 ++++++++++++++++++++++ media-sound/vkeybd/vkeybd-0.1.18d.ebuild | 57 ++++++--------- 3 files changed, 105 insertions(+), 36 deletions(-) create mode 100644 media-sound/vkeybd/files/vkeybd-0.1.18c-fix-buildsystem.patch (limited to 'media-sound/vkeybd') diff --git a/media-sound/vkeybd/Manifest b/media-sound/vkeybd/Manifest index 5de9e0c8e4be..cd10b3dae32b 100644 --- a/media-sound/vkeybd/Manifest +++ b/media-sound/vkeybd/Manifest @@ -1,4 +1,5 @@ AUX vkeybd-0.1.18c-desktop_entry.patch 498 BLAKE2B abc3ba4a1425e097b96fda6a3fa14f99adebd315d493a46a40422b6590a4fceb567e1179af58ba52fcc44bdffe9d7e611901c67f3c3df3d2ba6c28bfae39076f SHA512 5bb4d0a1b47e1e3390f927c1c8394da12c3058d68b43a5b46b4c3d91659aa720abd2fff2cdd1a8827c90512a116010d8d023b35214f6ec696a34857eb547b6a9 +AUX vkeybd-0.1.18c-fix-buildsystem.patch 2243 BLAKE2B 635d6c46029b9e9012bc93880042213be52d46584d1478cfdb702292878faa17536c84016ac791813650b33abcbcb94fed8070120d96def6b6a70a017c56492b SHA512 1d2cfe82272df9859175e921ab4c0d3683b69d5cc74a35c5f47395396f08b992f3b59adb4923e20b69a425485e891cd406f81a86dddbf71305bf0288acd3a0d6 DIST vkeybd-0.1.18d.tar.bz2 38918 BLAKE2B 75af417b1458f840c22c4fb1fd10da24a78b1bff9e64c094291643bbe6c2c0dd5e552665ee41765e3cb7659f4d81dc35b69e372291ab1e154f838417b936952b SHA512 d26766e80b598af12e3962d043896f7737685a04dc5bd466be6902cc14a8bf5727900e0dfe66e443169a2539f22a110d1fbbc514a621a4a7cb8aa0e9d38be583 -EBUILD vkeybd-0.1.18d.ebuild 1432 BLAKE2B 7f032bbed481f71dbde70b92455541aafa6e94e275808629acd780317697bef6f9c03232f55a66f22e418c1dae1e0fbb3cb1c8c580177b6e77124e67da122253 SHA512 93987076c0b7ef1b933207c077a631216ee476671e8c787cf6e87096235c9da498ce00fb9b75fbf0186cdcc0093171c331f9e537ed3843683ba15fa893d67800 +EBUILD vkeybd-0.1.18d.ebuild 1251 BLAKE2B 5deb886515e00c504e6123086db5beea05e1996adda29d0f14fd9131ced236b0d0d2cd2e352c086ad2e4f9bc5f89f5488e977b7b30f616dd9aeddefc5c3fa50a SHA512 5b93bc7faffb3f365e35678f9c712fbbe54a7106b4cc32b76c00fda036e1dcf9554646c6f97895a13a921de66a9f58f42fcfbc398f33a43c28f3f72992d42f02 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 diff --git a/media-sound/vkeybd/files/vkeybd-0.1.18c-fix-buildsystem.patch b/media-sound/vkeybd/files/vkeybd-0.1.18c-fix-buildsystem.patch new file mode 100644 index 000000000000..84c99172ca4d --- /dev/null +++ b/media-sound/vkeybd/files/vkeybd-0.1.18c-fix-buildsystem.patch @@ -0,0 +1,81 @@ +--- a/Makefile ++++ b/Makefile +@@ -8,7 +8,7 @@ + # + # installation directory + # +-PREFIX = /usr/local ++PREFIX = $(EPREFIX)/usr + # binary and Tcl script are put there + BIN_DIR = $(PREFIX)/bin + # man page +@@ -27,21 +27,21 @@ + # device selections -- multiple avaialble + # to disable the device, set value 0 (do not comment out!) + # +-USE_AWE = 1 +-USE_MIDI = 1 +-USE_ALSA = 1 +-USE_LASH = 0 ++USE_AWE ?= 1 ++USE_MIDI ?= 1 ++USE_ALSA ?= 1 ++USE_LASH ?= 0 + + # + # Tcl/Tk library -- depends on your distribution + # +-TCL_VERSION = 8.4 ++TCL_VERSION ?= 8.4 + TCLLIB = -ltcl$(TCL_VERSION) + TCLINC = + TKLIB = -ltk$(TCL_VERSION) + TKINC = +-XLIB = -L/usr/X11R6/lib -lX11 +-XINC = -I/usr/X11R6/include ++XLIB = $(shell $(PKG_CONFIG) --libs x11) ++XINC = $(shell $(PKG_CONFIG) --cflags x11) + EXTRALIB += -ldl + + #---------------------------------------------------------------- +@@ -71,9 +71,9 @@ + # LASH stuff + # + 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) ++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 +@@ -84,8 +84,7 @@ + + VKB_TCLFILE = $(VKBLIB_DIR)/vkeybd.tcl + +-COPTFLAGS = -Wall -O +-CFLAGS = $(COPTFLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \ ++CFLAGS += -Wall -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \ + -DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\ + -DVERSION_STR=\"$(VERSION)\"\ + $(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS) +@@ -100,7 +99,7 @@ + sftovkb: sftovkb.o sffile.o malloc.o fskip.o + $(CC) $(LDFLAGS) -o $@ $^ -lm + +-install: $(TARGETS) vkeybd.tcl vkeybd.list vkeybdmap* ++install-default: $(TARGETS) vkeybd.tcl vkeybd.list vkeybdmap* + mkdir -p $(DESTDIR)$(BIN_DIR) + install -c -m 755 vkeybd $(DESTDIR)$(BIN_DIR) + install -c -m 755 sftovkb $(DESTDIR)$(BIN_DIR) +@@ -120,7 +119,7 @@ + mkdir -p $(DESTDIR)$(DATA_DIR)/pixmaps + install -c -m 644 pixmaps/*.png $(DESTDIR)$(DATA_DIR)/pixmaps + +-install-all: install install-man install-desktop ++install: install-default install-man install-desktop + + clean: + rm -f *.o $(TARGETS) diff --git a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild index 56fd2ccbeca4..eadf36bb8eca 100644 --- a/media-sound/vkeybd/vkeybd-0.1.18d.ebuild +++ b/media-sound/vkeybd/vkeybd-0.1.18d.ebuild @@ -1,8 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=2 -inherit eutils toolchain-funcs +EAPI=7 + +inherit toolchain-funcs DESCRIPTION="A virtual MIDI keyboard for X" HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html" @@ -13,44 +14,30 @@ 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" +RDEPEND=" + >=dev-lang/tk-8.3:= + x11-libs/libX11 + alsa? ( media-libs/alsa-lib:= ) + lash? ( media-sound/lash:= )" DEPEND="${RDEPEND} - x11-base/xorg-proto" + x11-base/xorg-proto + virtual/pkgconfig" S=${WORKDIR}/${PN} +PATCHES=( + "${FILESDIR}"/${PN}-0.1.18c-desktop_entry.patch + "${FILESDIR}"/${PN}-0.1.18c-fix-buildsystem.patch +) -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 +src_configure() { + export TCL_VERSION="$(echo 'puts [info tclversion]' | tclsh)" - use lash && vkeybconf+=" USE_LASH=1" - - vkeybconf+=" TCL_VERSION=${TCL_VERSION}" -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-0.1.18c-desktop_entry.patch -} - -src_compile() { - tc-export CC - emake ${vkeybconf} COPTFLAGS="${CFLAGS}" || die -} + export USE_ALSA=$(usex alsa 1 0) + export USE_AWE=$(usex alsa $(usex oss 1 0) 1) + export USE_MIDI=$(usex alsa $(usex oss 1 0) 1) + export USE_LASH=$(usex lash 1 0) -src_install() { - emake ${vkeybconf} DESTDIR="${D}" install-all || die - dodoc ChangeLog README + tc-export CC PKG_CONFIG } pkg_postinst() { -- cgit v1.2.3