dev-tcltk/ck: Use pkg-config to detect ncurses, #527040; drop old

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 19 insertions, 40 deletions

diff --git a/dev-tcltk/ck/ChangeLog b/dev-tcltk/ck/ChangeLog
index 918241dfe6ed..60f1f352ede8 100644
--- a/dev-tcltk/ck/ChangeLog
+++ b/dev-tcltk/ck/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-tcltk/ck
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ChangeLog,v 1.14 2014/03/03 23:30:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ChangeLog,v 1.15 2014/10/28 12:32:57 jlec Exp $
+
+  28 Oct 2014; Justin Lecher <jlec@gentoo.org> -ck-8.0-r3.ebuild,
+  ck-8.0-r4.ebuild:
+  Use pkg-config to detect ncurses, #527040; drop old
 
   03 Mar 2014; Pacho Ramos <pacho@gentoo.org> ck-8.0-r4.ebuild:
   amd64 stable, bug #474210
diff --git a/dev-tcltk/ck/ck-8.0-r3.ebuild b/dev-tcltk/ck/ck-8.0-r3.ebuild
deleted file mode 100644
index b6dcc7051d74..000000000000
--- a/dev-tcltk/ck/ck-8.0-r3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ck-8.0-r3.ebuild,v 1.3 2012/02/24 14:10:29 phajdan.jr Exp $
-
-EAPI=4
-
-inherit eutils multilib
-
-MY_P=${PN}${PV}
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="A curses based toolkit for tcl"
-HOMEPAGE="http://www.ch-werner.de/ck/"
-SRC_URI="http://www.ch-werner.de/ck/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-lang/tk"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-	sed \
-		-e "/^LIB_INSTALL_DIR/s:lib$:$(get_libdir):g" \
-		-i Makefile.in || die
-}
-
-src_configure() {
-	econf \
-		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
-		--enable-shared
-}
diff --git a/dev-tcltk/ck/ck-8.0-r4.ebuild b/dev-tcltk/ck/ck-8.0-r4.ebuild
index 92c7cbe3f5fd..b0af80255e76 100644
--- a/dev-tcltk/ck/ck-8.0-r4.ebuild
+++ b/dev-tcltk/ck/ck-8.0-r4.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ck-8.0-r4.ebuild,v 1.3 2014/03/03 23:30:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-tcltk/ck/ck-8.0-r4.ebuild,v 1.4 2014/10/28 12:32:57 jlec Exp $
 
 EAPI=5
 
-inherit eutils multilib
+inherit eutils multilib toolchain-funcs
 
 MY_P=${PN}${PV}
 S=${WORKDIR}/${MY_P}
@@ -20,8 +20,13 @@ SLOT="0"
 KEYWORDS="amd64 x86"
 IUSE=""
 
-DEPEND="dev-lang/tk"
-RDEPEND="${DEPEND}"
+RDEPEND="
+	dev-lang/tk
+	sys-libs/ncurses[gpm]
+	sys-libs/gpm
+	"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
 
 src_prepare() {
 	epatch \
@@ -37,3 +42,8 @@ src_configure() {
 		--with-tcl="${EPREFIX}/usr/$(get_libdir)" \
 		--enable-shared
 }
+
+src_compile() {
+	emake \
+		CURSES_LIB_SWITCHES="$($(tc-getPKG_CONFIG) --libs ncursesw) -lgpm"
+}