From e23cdda4dbb0c83b9e682ab5e916085a35203da5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 23 Jun 2018 07:00:28 +0100
Subject: gentoo resync : 23.06.2018

---
 app-misc/ckermit/Manifest                  |  2 +-
 app-misc/ckermit/ckermit-8.0.211-r4.ebuild | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

(limited to 'app-misc/ckermit')

diff --git a/app-misc/ckermit/Manifest b/app-misc/ckermit/Manifest
index 90fb324bc8cf..5be4a90802a6 100644
--- a/app-misc/ckermit/Manifest
+++ b/app-misc/ckermit/Manifest
@@ -1,5 +1,5 @@
 AUX ckermit-8.0.211-build-wart.patch 728 BLAKE2B 5863f23b5eceeef8143e7060e28638b025e186d85b8ca4ebe5f421d89076b7a23914dea5f7ed3ec89169ab08c7996a804cda9e95e1e6473c8f6ca5ac8863bea7 SHA512 ab58d330153f8c86b737a7050dab6b77861451b2439010fcd45ebdd6656b8eb5f9d5cd87ad502d934ce3e906c73e68730b053da8155076408a0bff2b38011730
 AUX ckermit-8.0.211-cleanup.patch 2038 BLAKE2B caf0ed4e8da191cf5dc6f6d8bbfb03b9b898296f6df692dbd32cadf77723719d331b26c144a3c1578877686ce2d2861af30128ebce02645529042b6e2e8a2b08 SHA512 987a1acb9a9af63443eaf9cd1fe11bd422736f1c9d552a36c5f6c57033e445d243c3ba47ee24597e432873d7424ad12b0e5578e587b4f0db8d06ebd28a551ca7
 DIST cku211.tar.gz 2878523 BLAKE2B d87164bcd2e11c1146729ff423d8e631599da81bb4544dee3890d6f28d341412c93d228d954935c6321c0a32d67b73c5895d311f761919d5f95ff9114578d137 SHA512 470bf56d5b5f30721d0030ff89a5cd845f365dba81d097942524cc04dd620070678d278d1009fb67bae3cb875715808cbbfc7c0358b9671f30c65ce1d9bd35ad
-EBUILD ckermit-8.0.211-r4.ebuild 1955 BLAKE2B af963e7ece8e946e780f147015c94478d8c79972ea9b8af7d38b6b7bfefcabe55a88f88153e73f3d853137b0463353da16a335caf72391cd0ae4fbf442bdfdfe SHA512 67536adb24b301c2ebd62671f7bc8999b06b80b5f84ef9f648d746ffdc53cf3aa41eabb718411105aa9c1b06a8fa898b4c05be0613055aa7227e730164e03fd3
+EBUILD ckermit-8.0.211-r4.ebuild 2020 BLAKE2B f365f2fdadb3b0ee32d500e307ace95b5ef59e3cf8fe7f06f41df40c6c622b4b866521e85e6bf4e6f06cf843f927856c2845f9915f8866ecaf35c74559ff5089 SHA512 af5937486bd4e17a6b86aa6af79c15cb8cfcb726caea2406e850a73fd34f29b9e1bf8d807e3433a4a6a477d659fc7d35fc625b8a2c3b0d38b805e42476517e54
 MISC metadata.xml 251 BLAKE2B 118fce129507949f74491c6959c5b8c07a9ba6f1d6a813984cb222435023426d9581131651816ad72f759e87f2bbf70e63ead86330d73ffef3bd60aca060e055 SHA512 b3e4656ceb318c1dc3f8150664734711c9af7b589d5afa1aafe4ef063fb73157e8946a0d845ba02c54d759057597f5c1543b2fdaa93457c91a83b3ea31aec372
diff --git a/app-misc/ckermit/ckermit-8.0.211-r4.ebuild b/app-misc/ckermit/ckermit-8.0.211-r4.ebuild
index e129da2a6c12..9d8950eb448b 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
 }
-- 
cgit v1.2.3