Detect ncurses using pkg-config, bug#455110

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64

4 files changed, 98 insertions, 18 deletions

diff --git a/app-crypt/nwipe/ChangeLog b/app-crypt/nwipe/ChangeLog
index ff3cb8c56b29..82aa8add1b47 100644
--- a/app-crypt/nwipe/ChangeLog
+++ b/app-crypt/nwipe/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/nwipe
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/nwipe/ChangeLog,v 1.6 2012/11/30 14:16:36 ssuominen Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/nwipe/ChangeLog,v 1.7 2013/02/02 22:59:24 alonbl Exp $
+
+*nwipe-0.12-r1 (02 Feb 2013)
+
+  02 Feb 2013; Alon Bar-Lev <alonbl@gentoo.org> +files/nwipe-0.12-ncurses.patch,
+  +nwipe-0.12-r1.ebuild:
+  Detect ncurses using pkg-config, bug#455110
 
   30 Nov 2012; Samuli Suominen <ssuominen@gentoo.org> -nwipe-0.10.ebuild,
   -nwipe-0.11.ebuild:
@@ -28,4 +34,3 @@
 
   16 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> +nwipe-0.06.ebuild:
   Initial commit.
-
diff --git a/app-crypt/nwipe/Manifest b/app-crypt/nwipe/Manifest
index 16e806d580f8..96083147897a 100644
--- a/app-crypt/nwipe/Manifest
+++ b/app-crypt/nwipe/Manifest
@@ -1,18 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX nwipe-0.12-ncurses.patch 2058 SHA256 a6bc4f72f01a140c9024905d9e3abed377f7923c9524f96f88ef24455d81656f SHA512 ad193881c3f02e08be03298dbb5f693b2b4c414228202c71f4eaa752229fd034e6bf4caa15098f11d518ce0b2c2c1c77530e99386b3aa7218ac81ce6ad47efd5 WHIRLPOOL d46def0bbc9a27d540067a3661bee8f4d48419544a5d7bb364ea42167180f37d33206b3819553cb0cbd674c062257578614e33fa5109afb7a2cff5289765b9d1
 DIST nwipe-0.12.tar.gz 147380 SHA256 da70976acad36c8f500ecd27b1b0ac4beb81e909f8a761753cd23da37534596a SHA512 c05def96418824fdf372c24323d40c9b4e9fe7ce946af37d8d5bf4dff618c3af2d70dfec6819b89f1dedea835bab66cec2cf4206247c6c7c095aaa18c1bfbb2c WHIRLPOOL 243f840b98994e02dfa9f3737a297b68c754fa0c93f94b7c3799271605501f850f2392edea9e4e33828d15ea05d1d89012c221f073210b9b2e8ef607730201bd
+EBUILD nwipe-0.12-r1.ebuild 670 SHA256 9543feba10ef8cf879050c25eebc9152563add247ca4c4176d652a13c9b37180 SHA512 22aafc48c5ba61b2f09bb494a35cf966e0fea5a8cf139827da6816bc9aea454aaa2d96f2ffb59eda48ba95fd4f47857ca9ba58b7dced7f3b65bb3f35628e49f7 WHIRLPOOL 10a859b94925db560d5a3b33aac6b66ca7a8c926c2bec2a72ff15df62fcce00d4da5ffdca222344e51428c56427e6069970f26e9c44827ffa2f65f52d2118752
 EBUILD nwipe-0.12.ebuild 627 SHA256 e527dd7571a5f5fc4aac37770a2a265e7a8fe444861551fb7ca109ef649596b5 SHA512 f63b86bd8ed349f0d813da6f0cb185b61e1fbb64c1129aaf4c996447af6d029b366218e738e63fee95203443907382d03ea42d2aaa670706002c53359bdd97c3 WHIRLPOOL cb52ecbf51dfc8442abc06f25c2bf60c0f6f93a2cf7ba147d49213be66a12508a9c0b1ba77569c291a2730972d00486af9ce8850970541e16daa420411b4e9f0
-MISC ChangeLog 864 SHA256 d35d64757035b408478637dc74cb6db8157ab0968fcc382353bd498e99e18122 SHA512 8d92cda4d0626c0bf5e82286a638edbaa2a740aefcb718a50151b2db79f5dc11759292308a4047f090e4f383b1e0162178392791971649cc591725060608072b WHIRLPOOL 49db8a859f51e3ee37540b78a8e64a534fc776e7c2ccef00ddef27bb2869634351dcf8e955ec820f4bd295c621fe1b9ba88a9edd851238f5d429dcf7a6377af4
+MISC ChangeLog 1043 SHA256 5cf5b969000e84f4fd2857383af2f5f8cd087ef87972ebb2bf48e721a41a6a63 SHA512 72c69ecbef18432eeb647b8841db95aa246f59c03f654479d21a60c00988afa2fda77b18251860639baa9d5d146bb2537a91ef8ac172d55be91edd801d0e586c WHIRLPOOL aff59deb9aabbb542208b5006e27463d987cb2fa37c75c153df2e280a11a0647bc4d726b7a432c44234460f6af4088a07cc4211e5f65eedf35761a5916f4d3ac
 MISC metadata.xml 265 SHA256 31c2a237002f219bc5891d5a846596e2e885ce2b1a4a0bdbf74fe75d43206618 SHA512 56a6cada248c06dab5c5194161b7cc2af50f4fe6d119ba99333f2b2921740403f264a6a020ffaada19e4d16de40ad709922911aa50f5a3d48530664e45c837af WHIRLPOOL ed8e2d9b3ddae6de11f35cbce6d800b5e26e048f298718b0f7c3ee73c5941576cde678e9bb79a411ad0e0bbf0f836c2a1a9378445bf922a6324fa5c5aee158e5
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQuL+FAAoJEEdUh39IaPFNNV0H/A4G3CRrWhcm8ctueDzhCpfK
-J0VJTv4x3LatFvvXgQEDmib+UpiGlkn/MHDtCHBq8fJ5nogvxTlf8Ux1RnRoTE3x
-f2PC/bwyVW8j928ZhZTJyQZbi2SiJFLg40OAMyqSO7VCpLPyVmboG3JG9N5+7BOw
-cfk/bC6Tw07TV8asLoWoM/mq1pQnZkYbB+bNgkcR7F/7icCPEVM2ToxuZUmY09U8
-hByHqrhafPYdNRjsmhyU1AdIMX/5t4/60pVc9L7KJlxFzjGfBuhNeHHGef1JOU5i
-fchKtmfq0Wk4YLdIXpFRcPprzLGFvHBJfciRoMwyIXLoOKNfh/IgG5WIiw7vkqk=
-=6U0p
------END PGP SIGNATURE-----
diff --git a/app-crypt/nwipe/files/nwipe-0.12-ncurses.patch b/app-crypt/nwipe/files/nwipe-0.12-ncurses.patch
new file mode 100644
index 000000000000..7cb8131fb0bc
--- /dev/null
+++ b/app-crypt/nwipe/files/nwipe-0.12-ncurses.patch
@@ -0,0 +1,59 @@
+From 0176793f19a368c3786c231042b87c3a2ef3de2b Mon Sep 17 00:00:00 2001
+From: Alon Bar-Lev <alon.barlev@gmail.com>
+Date: Sun, 3 Feb 2013 00:40:57 +0200
+Subject: [PATCH] build: detect ncurses using pkg-config
+
+---
+ configure.ac | 32 ++++++++++++++++++++------------
+ 1 file changed, 20 insertions(+), 12 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index a551913..a84680f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,22 +10,30 @@ AC_CONFIG_HEADERS([config.h])
+ 
+ # Checks for programs.
+ AC_PROG_CC
++PKG_PROG_PKG_CONFIG
+ 
+ # Checks for libraries.
+ 
+-# Check for ncurses. If we find the library then we check to see if it's
+-# in a ncurses directory inside the include directory.
+-# The assumption is made in the source code that panel.h will be in the same place
+-AC_CHECK_LIB([ncurses], [delscreen], [
+-        LIBS="-lncurses $LIBS"
+-        AC_CHECK_HEADERS(ncurses.h,, [
+-            AC_CHECK_HEADERS(ncurses/ncurses.h, [
+-                AC_DEFINE([NCURSES_IN_SUBDIR], [ncurses/], [Look for ncurses headers in subdir])
+-                ], [AC_MSG_ERROR([ncurses headers not found])])
+-        ])
+-    ], [AC_MSG_ERROR([ncurses development library not found])]
++PKG_CHECK_MODULES(
++	[PANEL],
++	[panel],
++	[
++		CFLAGS="${CFLAGS} ${PANEL_CFLAGS}"
++		LIBS="${LIBS} ${PANEL_LIBS}"
++	],
++	[
++		AC_CHECK_LIB([ncurses], [delscreen], [
++			LIBS="-lncurses $LIBS"
++			AC_CHECK_HEADERS(ncurses.h,, [
++			    AC_CHECK_HEADERS(ncurses/ncurses.h, [
++				AC_DEFINE([NCURSES_IN_SUBDIR], [ncurses/], [Look for ncurses headers in subdir])
++				], [AC_MSG_ERROR([ncurses headers not found])])
++			])
++		    ], [AC_MSG_ERROR([ncurses development library not found])]
++		)
++		AC_CHECK_LIB([panel], [main], ,[AC_MSG_ERROR([ncurses panel library not found])])
++	]
+ )
+-AC_CHECK_LIB([panel], [main], ,[AC_MSG_ERROR([ncurses panel library not found])])
+ 
+ AC_CHECK_LIB([parted], [ped_device_probe_all], ,[AC_MSG_ERROR([parted development library not found])])
+ AC_CHECK_LIB([pthread], [main], ,[AC_MSG_ERROR([pthread development library not found])])
+-- 
+1.7.12.4
+
diff --git a/app-crypt/nwipe/nwipe-0.12-r1.ebuild b/app-crypt/nwipe/nwipe-0.12-r1.ebuild
new file mode 100644
index 000000000000..c6c37f811e2a
--- /dev/null
+++ b/app-crypt/nwipe/nwipe-0.12-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/nwipe/nwipe-0.12-r1.ebuild,v 1.1 2013/02/02 22:59:24 alonbl Exp $
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Securely erase disks using a variety of recognized methods"
+HOMEPAGE="http://sourceforge.net/projects/nwipe/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=sys-block/parted-2.3
+	>=sys-libs/ncurses-5.7-r7"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS="README"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-ncurses.patch"
+	eautoreconf
+}