From: Jeroen Roovers <jer@gentoo.org>
Date: Mon, 26 Jan 2015 09:46:15 +0000 (+0000)
Subject: Fix building against sys-libs/ncurses[tinfo] (bug #529730).
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=476d85bd218508749cf82548ce8bf78bd3a542d0;p=gentoo.git

Fix building against sys-libs/ncurses[tinfo] (bug #529730).

Package-Manager: portage-2.2.15/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613
---

diff --git a/app-crypt/ckpass/ChangeLog b/app-crypt/ckpass/ChangeLog
index b9c5a4a5de33..2aae448c8a7e 100644
--- a/app-crypt/ckpass/ChangeLog
+++ b/app-crypt/ckpass/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/ckpass
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ckpass/ChangeLog,v 1.3 2013/10/23 13:27:26 joker Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ckpass/ChangeLog,v 1.4 2015/01/26 09:46:13 jer Exp $
+
+  26 Jan 2015; Jeroen Roovers <jer@gentoo.org> ckpass-0.2.ebuild,
+  +files/ckpass-0.2-tinfo.patch:
+  Fix building against sys-libs/ncurses[tinfo] (bug #529730).
 
   23 Oct 2013; Christian Birchinger <joker@gentoo.org> -ckpass-0.1.ebuild:
   Remove outdated version
diff --git a/app-crypt/ckpass/Manifest b/app-crypt/ckpass/Manifest
index 47148cdaaf1a..0816f21308e0 100644
--- a/app-crypt/ckpass/Manifest
+++ b/app-crypt/ckpass/Manifest
@@ -1,26 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ckpass-0.2-tinfo.patch 417 SHA256 8868f6ae84f5652980d2ec5ca2d873c8f6d59be9ff6d4e837c6fbe31dbc1e147 SHA512 172753fa8d0cc6050e06010e721a69c99aab3d743af80a9b63949ed0a79a4c39fefce9cc34fe711caab89c20715b982142379d57f6acac92a762d19fdb805220 WHIRLPOOL 70e67fdd6031463a266febb3945f3293bc79bbaaa972013c6b2b7a5c589a444bd1b0f387a77915abc7bfab355dffa2b76246778de5ea7372b954010c3899f00c
 DIST ckpass-0.2.tar.gz 95921 SHA256 4027708b9518e7d320958f186f6b932001a3501c88773a88191fe5c976fe0686 SHA512 aca439caea2e3736539f5ec6bb235e51c59fed627eb9b414e629ad246c301e6f1dc90594826f6d95be9963aa4af0dae64419d08a44beb0a02d16a9fdf42a9a0b WHIRLPOOL 462fa8b7a82176ce01d1801525cf2b06ba6702cc2a7bf6e2d38d15a2879366e22524721f990ae36ba7a1c004eeab103ac23490faea9b6fd20a682dc70cf85afa
-EBUILD ckpass-0.2.ebuild 592 SHA256 a846317d1040f8ea025305e2988ac020bb46258518e72ea8b17915a7b2e1d29a SHA512 0ba67ae1fb7ff513b7e9aff30f99d4d18900d234b9849405df857567faf9814f3d242e41e0a2a4f3dc45d7f207684ca5fbcefcbba529752f168e694c64305d93 WHIRLPOOL bb5579900351787ee8c9eea36849bc518660fa7982b9c6d4841f9e7d6d7f89f152fa3dd92c5eee2ab8a9ae2c07520f856351e0b140408189662cdf3e78fc45ed
-MISC ChangeLog 561 SHA256 c004f7b56c16df17eac2fd780e2fa7d07786f5b01cf1f2125d7b4239db14b9ca SHA512 d62a2b131d01743b1b005a641cbd815b026a4fc07cd6dd29dafb83b40a83686c9f799ea850ba3c68889e5ecb354c17a08428033d85b6b525f648804c6330bee2 WHIRLPOOL 851f36474f565f659f95d84f14faae62a2059314874f98a47ca8874a6ef5203954d9fe58d652564192ce2f6036de1d6a8da9a7a8e585aa06a13aacd49177256e
+EBUILD ckpass-0.2.ebuild 632 SHA256 b0eb86caf3c56ab150844467ac7825eddb09a49ba81984f444214376bbb2126e SHA512 e3c0567007f5c28d57ef05b159c1eea81e1c3534ca81188b92636b2f23719396c8a8a2e418a3b7864d4ac434b0fbde585b37918feb83c05d92b987940ba5a5e8 WHIRLPOOL f97605fc59e3af07d40fb7ba96d548e50d7fb866a8953419e794577adaf26998d46c8c781e54d09d628798ad0117e1ea7ab814f3573dec51fb4d2a4e292d279c
+MISC ChangeLog 721 SHA256 f851c50786aba28060b90ca3e754b67b34e3c2e83d73b867978daff914a73e86 SHA512 6008d5f5b22fae3a2d5585b3b8546c209f7027784df9cef8a70d1dc7f1288dfdb9feb0c6ba8c59ad93ebb5de425a7a1b31593dadeff8e440d6b8c12e98a2e5b1 WHIRLPOOL d26c650165014eb1d6cd8a1dbcd263cd7488af9209cbb556a7a5b1d00c8c111d7303a7e4eb6f3927b2e702f7cf52b2675e45d695cd085f391ea4b8f9178760bc
 MISC metadata.xml 232 SHA256 3fec936c3c12346c6d8ce15a91b235820d02ded00bede44570bf3d833bf327fc SHA512 f8bf7ddd223c68c163507b8974f83b38bf8e2a8c1ea21f0e7740e0972f60970a5667f1e52f6abefe052cf7426fc5acaeafb44d3e4e339d7a4005238114322c60 WHIRLPOOL 4ffa20456113de1b9104008ea3afc0383dacc5d774dd328fa8742e29ddac0c106d29ec3f2681a9d7f251018c15250973238b267429fa7535b49ba1987295b920
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJSZ87BXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0ODVGNzIyN0VCNkRCNUU5MzkzNzY5ODAw
-MTUxODYzQTY3NjUyOTAwAAoJEAFRhjpnZSkAS8oQAKdvJeJwxWMpzeA6qP0Xized
-AewRFeoR/oWkrad0jRy9/Q1zL6RCdX5JdrnsuhCLWmhJLd2za5Ud2QpNdo/qL8fh
-BVlAi6RCgqtd5RhQuD/NNwG+sbMHR6jVtSXBZVnnbo8yi2T0tzQAp6BEoFbnPlca
-+jSLfbXP9ljxo8FXb9ubITQLm1Lfowv2JkOFsEGBcaVc6ZFYfDcfAMq47OwhmeWr
-U8iUR0VzOblckS+sOzg/2tfGJ9blZyNtbGbr7MDoQr9VNUD3J6rxxiejdBM4avxU
-WFRhDesiRqpp49x2teW2EKN4K93X8Sgo+ePGY3cHvGQtstt5x5RV1LP8yK6WwoH7
-kF8Kt1Pbe+o2gSI3j2Sh+5Jpg33L/TWxaua1n4nSzoPMDeKrK2Xmj7ShAwS2137z
-sP0Ti0bRs8PvShFSrnevr+cVr97kqaFXrtw6xNVzmc01FoV5bXEwxCf9feb3W+hl
-HIEr7x+gOkhaZ/HrxsZAIRDLCPge2TP7praovDF+e3/gbj2Q+Wfx4pk2FXM1suyp
-RXXbBTXxmqFRCAg5zDuW1+mpxf1kmYZCynsuj7gI1S7yvpvipdt2Z0cw37RmJaao
-DR+1v/Wwrm/KHxYSZ0Vu4ffB3anb2yKm9l63eNXGi0pu8zhqoZ4S+Td8ImxIpfU0
-60Eskiy4CP++JssPP7h+
-=Nf1F
+iEYEAREIAAYFAlTGDOcACgkQVWmRsqeSphPprACaAnoNUfHevmSjPLepwsuMrejW
+esgAn17WdLDnBVmvM19CuvtkJbbyjqst
+=HWNJ
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/ckpass/ckpass-0.2.ebuild b/app-crypt/ckpass/ckpass-0.2.ebuild
index 81d3ae4a93bf..69844c7af856 100644
--- a/app-crypt/ckpass/ckpass-0.2.ebuild
+++ b/app-crypt/ckpass/ckpass-0.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/ckpass/ckpass-0.2.ebuild,v 1.1 2013/10/23 13:17:39 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/ckpass/ckpass-0.2.ebuild,v 1.2 2015/01/26 09:46:13 jer Exp $
 
 EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="An ncurses based password database client that is compatible with KeePass 1.x format databases"
 HOMEPAGE="http://ckpass.sourceforge.net/"
@@ -11,12 +12,13 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
 
 DEPEND=">=dev-libs/libkpass-6"
 RDEPEND="${DEPEND}"
 
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tinfo.patch
+	eautoreconf
 }
+
+DOCS=( AUTHORS )
diff --git a/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch b/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch
new file mode 100644
index 000000000000..8d99bc93ad8f
--- /dev/null
+++ b/app-crypt/ckpass/files/ckpass-0.2-tinfo.patch
@@ -0,0 +1,10 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,6 +29,7 @@
+ 
+ AC_CHECK_LIB([c], [main], [], AC_MSG_ERROR(requires libc))
+ AC_CHECK_LIB([ncurses], [main], [], AC_MSG_ERROR(requires libncurses))
++AC_SEARCH_LIBS([acs_map],[tinfo], [], AC_MSG_ERROR(requires a library providing acs_map))
+ AC_CHECK_LIB([form], [main], [], AC_MSG_ERROR(requires libform))
+ AC_CHECK_LIB([kpass], [main], [], AC_MSG_ERROR(requires libkpass))
+