summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2021-04-19 08:56:28 +0100
committerSam James <sam@gentoo.org>2021-04-19 20:10:42 +0100
commit7a3487bf9eb655f222ef2e805698d9cf30524e4b (patch)
treecda20183c62a53bf5a6ab33e93478efa198ed1d9
parentapp-laptop/pommed: tidy up patch (diff)
downloadgentoo-7a3487bf9eb655f222ef2e805698d9cf30524e4b.tar.gz
gentoo-7a3487bf9eb655f222ef2e805698d9cf30524e4b.tar.bz2
gentoo-7a3487bf9eb655f222ef2e805698d9cf30524e4b.zip
app-misc/dvorak7min: respect PKG_CONFIG
Signed-off-by: Sam James <sam@gentoo.org>
-rw-r--r--app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild9
-rw-r--r--app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch4
2 files changed, 6 insertions, 7 deletions
diff --git a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
index 38f74d2fc07..cb6545c1f3c 100644
--- a/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
+++ b/app-misc/dvorak7min/dvorak7min-1.6.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -18,12 +18,13 @@ DEPEND="sys-libs/ncurses:="
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${PN}-1.6.1-debian-changes.patch"
- "${FILESDIR}/${PN}-1.6.1-makefile-flags.patch"
- "${FILESDIR}/${PN}-1.6.1-ncurses-pkg-config.patch"
+ "${FILESDIR}"/${PN}-1.6.1-debian-changes.patch
+ "${FILESDIR}"/${PN}-1.6.1-makefile-flags.patch
+ "${FILESDIR}"/${PN}-1.6.1-ncurses-pkg-config.patch
)
src_compile() {
+ tc-export PKG_CONFIG
emake \
CC="$(tc-getCC)" \
PROF="${CFLAGS}" \
diff --git a/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch b/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch
index 2f62112ceb4..045278ef4e0 100644
--- a/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch
+++ b/app-misc/dvorak7min/files/dvorak7min-1.6.1-ncurses-pkg-config.patch
@@ -2,8 +2,6 @@ https://bugs.gentoo.org/show_bug.cgi?id=722336
https://bugs.gentoo.org/show_bug.cgi?id=689986
https://bugs.gentoo.org/show_bug.cgi?id=698082
https://bugs.gentoo.org/show_bug.cgi?id=702372
-diff --git a/Makefile b/Makefile
-index e0e7645..6aee6ab 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,13 @@ LIMIT_LENGTH = -DLIMIT_LENGTH=1024
@@ -18,7 +16,7 @@ index e0e7645..6aee6ab 100644
$(LIMIT_LENGTH) $(PROF)
LDFLAGS += $(PROF)
-LIBS = -lncurses
-+LIBS = $(shell pkg-config --libs ncurses)
++LIBS = $(shell ${PKG_CONFIG} --libs ncurses)
OBJECTS = dvorak7min.o lessons.o
HEADERS = lessons.h