From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7D864138334 for ; Mon, 18 Jun 2018 16:39:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A67AEE0867; Mon, 18 Jun 2018 16:39:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 779EAE0867 for ; Mon, 18 Jun 2018 16:39:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id CEE4D335C8A for ; Mon, 18 Jun 2018 16:39:38 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2CB842C2 for ; Mon, 18 Jun 2018 16:39:37 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1529339931.fe90e0a3e734740eb2a8cad3c24a7c2b1db3f99f.vapier@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/ckermit/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/ckermit/ckermit-8.0.211-r4.ebuild X-VCS-Directories: app-misc/ckermit/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: fe90e0a3e734740eb2a8cad3c24a7c2b1db3f99f X-VCS-Branch: master Date: Mon, 18 Jun 2018 16:39:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6ef69e6e-66ff-4cb4-ab38-b384c21bd629 X-Archives-Hash: 29613d029d03d281d5b367e9db498148 commit: fe90e0a3e734740eb2a8cad3c24a7c2b1db3f99f Author: Zentaro Kavanagh chromium org> AuthorDate: Mon Jun 18 14:51:18 2018 +0000 Commit: Mike Frysinger gentoo 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 }