public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Mike Frysinger" <vapier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ckermit/
Date: Mon, 18 Jun 2018 16:39:37 +0000 (UTC)	[thread overview]
Message-ID: <1529339931.fe90e0a3e734740eb2a8cad3c24a7c2b1db3f99f.vapier@gentoo> (raw)

commit:     fe90e0a3e734740eb2a8cad3c24a7c2b1db3f99f
Author:     Zentaro Kavanagh <zentaro <AT> chromium <DOT> org>
AuthorDate: Mon Jun 18 14:51:18 2018 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Jun 18 16:38:51 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe90e0a3

app-misc/ckermit: Support ncurses with tinfo enabled #621936

Use pkg-config to populate LIBS and CPPFLAGS instead of hardcoding.

Closes: https://bugs.gentoo.org/621936

 app-misc/ckermit/ckermit-8.0.211-r4.ebuild | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
index e129da2a6c1..9d8950eb448 100644
--- a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
+++ b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
@@ -34,23 +34,24 @@ src_prepare() {
 		makefile || die
 }
 
-ck_use() {
-	use $1 && append-cppflags $2 && libs+=" $3"
-}
 src_compile() {
 	# we don't enable any of the telnet/ftp authentication stuff
 	# since there are other packages which do these things better
 	# USE="kerberos pam shadow ssl zlib"
 	append-cppflags -DNO_AUTHENTICATION -DNOLOGIN -DNOFTP
 
-	local libs
-	ck_use ncurses -DCK_NCURSES -lncurses
+	if use ncurses; then
+		append-cppflags "-DCK_NCURSES"
+		append-cppflags "$($(tc-getPKG_CONFIG) --cflags ncurses)"
+		append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+	fi
+
 	append-cppflags -DHAVE_PTMX -D_XOPEN_SOURCE -D_BSD_SOURCE -D_DEFAULT_SOURCE #202840
 	append-cppflags -DHAVE_CRYPT_H
 	emake \
 		CC="$(tc-getCC)" \
 		KFLAGS="${CPPFLAGS}" \
-		LIBS="-lcrypt -lresolv ${libs}" \
+		LIBS="-lcrypt -lresolv ${LIBS}" \
 		LNKFLAGS="${LDFLAGS}" \
 		linuxa
 }


             reply	other threads:[~2018-06-18 16:39 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-18 16:39 Mike Frysinger [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-04-25  5:14 [gentoo-commits] repo/gentoo:master commit in: app-misc/ckermit/ Sam James
2021-04-20 23:35 Sam James
2021-04-20 23:35 Sam James
2021-04-20 11:57 Sam James
2021-04-20 11:56 Sam James
2017-08-23 17:10 Michał Górny
2016-01-22  8:28 Michael Palimaka
2015-08-12 15:23 Mike Frysinger
2015-08-12 15:23 Mike Frysinger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1529339931.fe90e0a3e734740eb2a8cad3c24a7c2b1db3f99f.vapier@gentoo \
    --to=vapier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox