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

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 38 insertions, 48 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/Manifest b/dev-tcltk/ck/Manifest
index fbd68b64f6ec..66dc4a4cbe5e 100644
--- a/dev-tcltk/ck/Manifest
+++ b/dev-tcltk/ck/Manifest
@@ -1,17 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX ck-8.0-gentoo.patch 4453 SHA256 f8abdb09449549750a5d1aef70f6575661da5bfd992b6fccd39589fa3bdf834d SHA512 cfe65801f1c91f123b580cc08759959be6060799721e688a4d2b11e73879f1b3c41d0b8f8192dff1a0e93d921f38737b283a272f92e7b740cc10ec7bd19c19d6 WHIRLPOOL a526c0f30a976258da6ca582d09f514e9331f15b7fabe1282192aa1ab23b70f915e89a189de261ed58d6229b1212b70b40b19f29c3531fd82ae21ce0881b9428
 DIST ck-8.0-tcl8.6.patch.xz 12836 SHA256 e414eb16f1905738474e2d1c773c369c54a219ede311289e1edbe1a22c53116b SHA512 55682b9490ac5470ef14213f0dac3fa10139a13a7e3d915773c50285038b3b566c140fcc5f4721a091744e45bbef405c2ee3ee22daf71a3a82148acba28b0dde WHIRLPOOL d5317abce4eaf875b9980a9e2051465df1f3a70b1edb764632623784a287d8096e36c4cf8b42a7d5f879a822dc9e273215ba438f1b865fb7a62b5bc1e2cc0147
 DIST ck8.0.tar.gz 400262 SHA256 11588244fcbbb1e19658357194ade5ad3877e6315a04530e6a41c18ee99babdf SHA512 68d92be354e5ec24830cc9a20d1cbb5a27d4e04369ceecf6fdad7759da3d9b4909970bf54abdf5f5b015fd0d08b8680a33cdcdf468b9007afc21e69c7381b262 WHIRLPOOL 69926cee3b4879d47f762425ca39ca08ca9bad2021162b7540af1edd1770fa4eeafe2e5be0c923787945779c7fc92cb7a168fe160bc75151b56182c45092f4cd
-EBUILD ck-8.0-r3.ebuild 752 SHA256 5ae3bb114376194bf60565c709a53cc8abd6494c39939823610ea85ae555b91b SHA512 505bdfcc0ddaa11b30078c1de3e8defb5cafc343603466a2c5d26bc92f894c77cae2ff6c981a80f3a1e865a619235d22f27dc7dbae396fa81f39f0e941d356a2 WHIRLPOOL 6d0c08a4d17e85d5bb8b0c26b798e95a9cf037719379aa54858ada27eb61134c79459b03550c7da1c938822137ee3e5072a58bd5a99ab64dd252a52ddbfeb3b9
-EBUILD ck-8.0-r4.ebuild 848 SHA256 f00c1cd3ba156c5e13085620158c5471601132b849cb6a2306a3b2d6ddb87607 SHA512 4eb57e35c5dfaf1c9d0c4726791a2a61d73181f01009337f910f6fe70ae663f6dcfbfb27fce9c57028eb8f51437a0643e7e9739b925618afd32fc1d5c8cf6b79 WHIRLPOOL 31c515a0d5ea51e2b87543139843bc597688091dcadad73104f00f9921b795ec81429cd7afb159d228f41e26417f42d2f46f5366a05ba50fa7f4935f325aebdc
-MISC ChangeLog 1753 SHA256 a2547f8c73854f580b53bad294828f3b53ba741d40dd324b17ca55285f5ee777 SHA512 71b25408fdcbd90c95042debc8f49b3ab34533e5a4fd8c5d2a9f7a0a0b3e3cd5004d4d851681e6965a3ac49665bcddba30922eb0ffbbfb4e9e6cabf3cd79144f WHIRLPOOL e1449c85300a059833c720b2bac5708d8d883d50d4dffc33b0a7656a66dfb2b3f6f1726b46b3aaa82a29839c594abe8e140b9afa1492c07410e652606c7a5dd7
+EBUILD ck-8.0-r4.ebuild 1021 SHA256 1bf3065468a9df6d176ad45aa77d9d42c68696067c1e7c7de354760807070695 SHA512 8e93ea9880227f4405290f13969f822f52d5a4e6df4d941fa5d99cb873ddb36cc4ac90336b12da474c081a1b84379984e03f9e8795f6101c8ac244e17a1e35e7 WHIRLPOOL c9689655a6b2471c3592623001a0498a5f33a298607dd8033d10bb58fedd2bafcaae81542097cb1d61bfd09fdc2ab8e5cacbd2d44392722931d15ecfffaaf857
+MISC ChangeLog 1893 SHA256 2884dd412eeaf8d8c4d1a677cdf8f2a143ba7fd0a2b897568580b45e64ac093c SHA512 1b51adacd711dc146e69b3ad5be3952c89d9ba556e89e14f39a7d0271f35180c3ea489dcb22972dc65e5affdd056561792deff7dd1a824eeb843e2a7510104c5 WHIRLPOOL e6d1fd13d62d4704dd262f3d9d3aa549e6ebf29f44d4fbc4bc4f6d64baa0f8c2647b0d08c6312333a83b15c879b8281e495b25cf04ed14cbb01136a174b948a3
 MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2.0
 
-iEYEAREIAAYFAlMVEJ8ACgkQCaWpQKGI+9SilQCeIoSKg8OhQPsxmkYTJ4SZqfQ3
-i5oAn0DsNzj1SOUtKBwVdFIA7FGaH7Jf
-=0EcE
+iQJ8BAEBCgBmBQJUT4z6XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirhrIP/1uLhQHZwgqRMIjDpQHb2TTq
+kgqnh10FUZyUZrtcuRsA0byhohK05yBFAQHMk7B+1FvudWlRZvNudb7MkwLsTEbf
+Xt5uvQOXdhNJCl4M/wCnYBHh6IwmUfYQcMeAAz9CmgnK/Dp3kpTg5opEV3ihK+7I
+p8Pi6YA0wk95FPSdhnFX5yyoOX1S0Xt4sQMENV97P4xNs5xmuZDSk4qDONYWPKhr
+mO0x9WnqmkZ2x6qWZgWozBvsDDaTGoOCvHhEwQJFNYeT00MuSIo//d/4QS0lGp/O
+bCGo0dhEERE3VlCAXbSqtcUs+tOxTCYweCuXrMcEaywsdkDgo7vh83BV4ZCKcpLj
+rUbtryGKmgLOuOzGsrcIG594ipk9ryICIPaqGD7aPE1fjBeJEDqkIqQTbObFqA5p
+Q8cBQomBPKkdy95dsLKav3+vs/zYzseLvRw+9TfiXE22DynbonCG7EV/O046y9NW
+n1mHCFcVPyQpG6f1bqpZpDRGe4XTIxBEbrmGoT8Ecliv1LSgmjgJgBG9asy5ciNC
+80AC+2KRAB9vzoZ9IpH9hMmW6Zan3IgpY0lrziIOHgLhx0Xq6a0cEVoBURWGss1a
+ue+Aw4mGDiubw+p99m0e4jOQ/mk0frtVGHQDr1MM1NzBOExkUZtIANLh2hJXnsvn
+ulFa9j2HHTbe4hzb1/2u
+=C+Gq
 -----END PGP SIGNATURE-----
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"
+}