Add some ncurses configure cleanups #400555.

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

5 files changed, 175 insertions, 22 deletions

diff --git a/sys-process/procps/ChangeLog b/sys-process/procps/ChangeLog
index e5f62d55b483..8877e8759dd3 100644
--- a/sys-process/procps/ChangeLog
+++ b/sys-process/procps/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-process/procps
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.61 2012/01/24 06:20:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/ChangeLog,v 1.62 2012/01/24 18:40:30 vapier Exp $
+
+*procps-3.3.2_p2-r1 (24 Jan 2012)
+
+  24 Jan 2012; Mike Frysinger <vapier@gentoo.org> -procps-3.3.2_p2.ebuild,
+  +procps-3.3.2_p2-r1.ebuild, +files/procps-3.3.2-ncurses.patch, metadata.xml:
+  Add some ncurses configure cleanups #400555.
 
 *procps-3.3.2_p2 (24 Jan 2012)
 
diff --git a/sys-process/procps/Manifest b/sys-process/procps/Manifest
index 24253aa6acd0..152ba806f311 100644
--- a/sys-process/procps/Manifest
+++ b/sys-process/procps/Manifest
@@ -11,6 +11,7 @@ AUX procps-3.2.8-r1-forest-prefix.patch 1178 RMD160 a1290cdca6b058a0b7a6f648f9c4
 AUX procps-3.2.8-time_t.patch 510 RMD160 e091b640bb1a7ebf7bc970448c3f2426244d1c60 SHA1 7f416bc994fa8ea8937303e66198203d47dbe4e9 SHA256 e2f48af1e487bdbb1d30ba4b638951b1082209ea9cd2607ff91f95591445bba7
 AUX procps-3.2.8-toprc-fixup.patch 647 RMD160 68ced4f43bcf86f61f4e66baecd60832fbcd8693 SHA1 e81c7dd3f836078bcb9b1d25ef2a161a48c5dce4 SHA256 da07ed67e5d1405ca673075459070f2fee985692ff930124ed484dacfe4db588
 AUX procps-3.3.2-headers.patch 5485 RMD160 16d2e2541c99d50381d2ee2fc1c64e8a36dbe954 SHA1 ff7711d2833488cf4eea2b94cdd09524a7534574 SHA256 3f2f14e9f544e39c72f35c0137921c654eb07e44a546c40fa67444af06b83d3d
+AUX procps-3.3.2-ncurses.patch 4597 RMD160 fa673a8cecbc8385d2cde632d368028915827b36 SHA1 3e5190a9e62616a5d99939f73583d207cee7748b SHA256 334964351068ed42db5abd56598cfa9cce8c8421fd4124b42fbd75d2fc1ec4d6
 AUX procps-3.3.2-noproc.patch 532 RMD160 52f20f6873b4cc4c993d1389894edd737ca25779 SHA1 adacc40636a65693ef8e4893cbc0a8ba6ceca5cc SHA256 02e593d5b7471dc16c624f627e765784f260cec3fb612ba0a7589db77e749ceb
 AUX procps-mips-define-pagesize.patch 1028 RMD160 aa0cb4fdf76d50bae983683e0de0a06daba52361 SHA1 7658c35e40c4c565bd4f4124b09c43ec474da0bd SHA256 9000966beaa7ae9e8261dfc691b7b7bec08857e8404de60f30b10bbe6e702d8e
 DIST procps-3.2.8.tar.gz 285758 RMD160 ad63601fb6bf4692108484d9ed362f510cbcf505 SHA1 a0c86790569dec26b5d9037e8868ca907acc9829 SHA256 11ed68d8a4433b91cd833deb714a3aa849c02aea738c42e6b4557982419c1535
@@ -23,23 +24,23 @@ EBUILD procps-3.2.8-r2.ebuild 2404 RMD160 6c7555d8704fc852ad796cf964829a4d9a1456
 EBUILD procps-3.2.8.ebuild 2178 RMD160 137ac755f53942f610174836337d95189278b2c1 SHA1 a2078c1e328c8dcf27323076faf133e590221611 SHA256 aa8bf0982fb584e8bc27cd6fba80871a85db1f818464bb9e7b08f586e10af1be
 EBUILD procps-3.2.8_p10-r1.ebuild 2666 RMD160 3697b5505e2360f0a633cdbebb0133db6546d352 SHA1 556d84a3433f3854785a2a225ffb18a5751dd090 SHA256 0ba59322fe034c1bab2f0e750ec7b225a9123a3270b630a60c559829a3b388c4
 EBUILD procps-3.2.8_p11.ebuild 2697 RMD160 f38b34860ed195d5e437e4b86ec7d1ca2ffc034c SHA1 431d39b532389d64abd12ec82bf768034718d685 SHA256 e377909f38408982a50eadb3b84ee2e021ab967cad013960b0da639fd90d8b0f
-EBUILD procps-3.3.2_p2.ebuild 1500 RMD160 161001507ff025cff8d4707fcff85ab0eb41a762 SHA1 167e4d58b82f581e43e9db20d1420373cfa0f53a SHA256 242a0a5da08f0f7f07bc8f8bda938ae73204579a149c3ece136892120608960f
-MISC ChangeLog 24660 RMD160 6ab7ab68b71291664d0a6510e5a3278b678561ca SHA1 b3ac3ed94821d43e82b9e659c7803aefd4ee6054 SHA256 c6d58d650329718f4395b729f0655390e119295b1f013998bd8c5f09539f5a4c
-MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+EBUILD procps-3.3.2_p2-r1.ebuild 1696 RMD160 646dfc351cdfc94582a92f7f2bbb414237e0dac9 SHA1 32e43a3910dac16893b08683339aa9245fcc63b0 SHA256 bfe8cd09802d44b01eb9cd13df3c6a8d3eada0811479630a00a90f885598ab3a
+MISC ChangeLog 24897 RMD160 e9640315ec4c95cf08935eb3a11168882771a1c5 SHA1 c6103f7fcd8ed887c64b7d4638d2613a254d0b89 SHA256 23c452195ec39460d2396311217fef04f5742b4ceee96d1b2e29b99d58d257f7
+MISC metadata.xml 259 RMD160 d8b97cddd30bcf7980b6a0e118189acf64cf6e9e SHA1 b63e4be231f677f65142e468235e24a79c078d62 SHA256 0bb63eb156063b66b45ac343be2ccf262f08ea0a9d247e8b1428d2f413c978c2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPHk3EAAoJELEHsLL7fEFWqxgQALHbdhBhjLdsnZ5KOA5IT87a
-BSm47TIJ0G03VBJlZetr568zXVWLDz65aNu5ccmwe9GU+Jh05C7UjCvU00RP2uFE
-9R7QvHqKtfFNblEbmQ3rZAlwEBxMoj9T2ZSVV/2dQkp2F39Xel7ASG50T6lQty3L
-8jFz24wEP7fxBRP4gyVUWHdfa1vWyH/YzQsEPVdSDZ/OMDbHhc+Yydi92/zsHv4s
-EicuVQJjYV3QE3MgySvDN9X/yBORqKg5B0+HQKbztu5RsDDkXH199ucYZ+PGiczq
-77CAL9jMggc7MxBsg9TrClUVOqmRWVMT8mOWvOw3suG6ncAPd/nHutsO2J+UhlKR
-LiJ52dG8ukZjsXF01ds9Qq47s2lsADL5kw4X+Ksqj5iiQklKsYJ8yp9VXGh2hFRd
-Hun5Dn+Xzn69N+ija4A+DCIUZfrKobXdXg1t2/BcerkX8EOgNdTyvuITh9w/Nkdo
-wzvNezORK5Ea0mPSjp6Ju+tUZsH53lzujaqHWvN8XeNn7Ll3HFCbgxhS2tRRTDr5
-Dh9YmZSrO/8FFRzknipdN3c5gpm+mFg2Ari8w/PH7QBN4UgoV3KhLyMNA7ISUBda
-RyqB1V+AgT0QbxCmCuyC1HP+h1upDv4hL2KliqWge7UL1+3A7JiTSRWtTwqAvxl3
-f7QqgcFOMNaBg7U7Jo26
-=0tZn
+iQIcBAEBAgAGBQJPHvtJAAoJELEHsLL7fEFWa6YP/RXUopeShFthtZTcKy3qCMq+
+LJnJfW2cOX8ZTQEW7W+9nZjBan+7eqEXY4YHa93pzbFx+C5HrY2DbWEtj9L8eJWB
+oHqdf2FdE+RTUzNHXfuLMvas+Y5F+nz04iZWpwu9tTu6GThMnVADgulJ6VSaGlAF
+KP9PvgB8/DDI8+lG3VsccQMF7tMMpFIEExAtNrm68gjSNPvSSh297uPOBw2oXqWE
+ebwZfHlmGYOCGnzkCzwvqG3EEhACgOLsVR7pd0h9dtP5sWhmTq+NFKvnQfrsS51v
+hTzRhaBBmbsrXvx7PLZB4KAWODlas00OO8zGsjY6nRfb2H/sQtqy48gRXmk0zAfH
+13IjiQNz5q0nGsbl5caPwY0qJ2mixBlAdTZJyZsXaIdeYbCxhtMrlTo2fzxjQARB
+J/XEW8OWHzOFcwezwBKeypZ30bZG55P+ZN3wTOGu4mn1za5YLi0BJB74FkxnPc6j
+hTak8uA+sxfIhaRyt7kUOWUOHR36y4nAF0u+oCVao45x/G0UiTWmPJlKyNuIBe+y
+EWtHda+uuPSU3ngtufBDbdAPw05DaePy7cA1anWo+/NFba1yP3IxnYy62gGQAta8
+/ZmNpYO0ZqnYWVYDaJ9Eg/RzJkGHHSLhixzstn/palcv+UV7ANOovowP/CO0QN2D
+vZBwng1emPd5PKXCaPzU
+=r41S
 -----END PGP SIGNATURE-----
diff --git a/sys-process/procps/files/procps-3.3.2-ncurses.patch b/sys-process/procps/files/procps-3.3.2-ncurses.patch
new file mode 100644
index 000000000000..d717502489a8
--- /dev/null
+++ b/sys-process/procps/files/procps-3.3.2-ncurses.patch
@@ -0,0 +1,136 @@
+From 1928653399e4aa73a99049c34334d66345ca8b97 Mon Sep 17 00:00:00 2001
+From: Craig Small <csmall@enc.com.au>
+Date: Mon, 9 Jan 2012 21:40:53 +1100
+Subject: [PATCH] watch needs a conditonal LDADD
+
+Makes Debian patch makefile_watch_ncurses redundant.
+watch was being linked to NCURSES_LIBS when it should of been
+WATCH_NCURSES_LIBS which can be ncursesw with 8bit enabled.
+---
+ Makefile.am |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 06b70ed..0ec2938 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -62,7 +62,7 @@ dist_man_MANS += \
+ slabtop_SOURCES = slabtop.c $(top_srcdir)/lib/strutils.c
+ slabtop_LDADD = @NCURSES_LIBS@
+ watch_SOURCES = watch.c $(top_srcdir)/lib/strutils.c
+-watch_LDADD = @NCURSES_LIBS@
++watch_LDADD = @WATCH_NCURSES_LIBS@
+ endif
+ 
+ kill_SOURCES = skill.c $(top_srcdir)/lib/strutils.c
+-- 
+1.7.8.3
+
+From b953a2926549a26b185c56de17d15b232368f6d6 Mon Sep 17 00:00:00 2001
+From: Samuli Suominen <ssuominen@gentoo.org>
+Date: Tue, 24 Jan 2012 12:11:46 -0500
+Subject: [PATCH] fix basic ncurses check
+
+The first check for ncurses is for the non-wide variant, so drop the "w".
+The wide version gets checked later on based on watch8bit.
+
+Signed-off-by: Samuli Suominen <ssuominen@gentoo.org>
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+			squashed below
+-- 
+1.7.8.3
+
+From fd1295e4618ad9711d8af359e097f3162f30ebd0 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 24 Jan 2012 12:15:13 -0500
+Subject: [PATCH] fix AC_ARG_WITH(ncurses) handling
+
+The third arg is for "the user has specified some flag", not "the user
+has disabled things", so use $withval.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 838d4a4..f6a24a6 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -127,7 +127,7 @@ AC_TRY_COMPILE([#include <argp.h>],
+ 
+ AC_ARG_WITH([ncurses],
+   AS_HELP_STRING([--without-ncurses], [build only applications not needing ncurses]),
+-  [with_ncurses=no], [with_ncurses=yes]
++  [with_ncurses=$withval], [with_ncurses=yes]
+ )
+ 
+ if test "x$with_ncurses" = xno; then
+-- 
+1.7.8.3
+
+From 32b74bce18cda251cb1f8d4b1851b1217065eaa3 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 24 Jan 2012 12:40:27 -0500
+Subject: [PATCH] use pkg-config for ncurses by default
+
+Newer ncurses install pkg-config files, so search those first.  If they
+aren't found, fall back to existing detection logic.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ configure.ac |   23 ++++++++++++++---------
+ 1 files changed, 14 insertions(+), 9 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index f6a24a6..792222c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -16,6 +16,7 @@ AC_PROG_CC
+ AM_PROG_CC_C_O
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
++PKG_PROG_PKG_CONFIG
+ 
+ AC_SUBST([WITH_WATCH8BIT])
+ AC_ARG_ENABLE([watch8bit],
+@@ -133,19 +134,23 @@ AC_ARG_WITH([ncurses],
+ if test "x$with_ncurses" = xno; then
+   AM_CONDITIONAL(WITH_NCURSES, false)
+ else
+-  AC_CHECK_LIB(ncursesw, initscr, [have_ncurses=yes], [have_ncurses=no])
+-  AC_CHECK_HEADERS(curses.h ncurses.h term.h, [], [have_ncurses=no], AC_INCLUDES_DEFAULT)
+-  if test "x$have_ncurses" = xno; then
+-    AC_MSG_ERROR([ncurses support missing/incomplete (for partial build use --without-ncurses)])
+-  fi
++  PKG_CHECK_MODULES([NCURSES], [ncurses], [], [
++    AC_CHECK_LIB(ncurses, initscr, [have_ncurses=yes], [have_ncurses=no])
++    AC_CHECK_HEADERS(curses.h ncurses.h term.h, [], [have_ncurses=no], AC_INCLUDES_DEFAULT)
++    if test "x$have_ncurses" = xno; then
++      AC_MSG_ERROR([ncurses support missing/incomplete (for partial build use --without-ncurses)])
++    fi
++    NCURSES_LIBS="-lncurses"
++  ])
+   AM_CONDITIONAL(WITH_NCURSES, true)
+   if test "$enable_watch8bit" = yes; then
+-    AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
+-                [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
++    PKG_CHECK_MODULES([NCURSESW], [ncursesw], [WATCH_NCURSES_LIBS="$NCURSESW_LIBS"], [
++      AC_CHECK_LIB([ncursesw], [addwstr], [WATCH_NCURSES_LIBS=-lncursesw],
++                   [AC_MSG_ERROR([Cannot find ncurses wide library ncursesw with --enable-watch8bit])])
++    ])
+   else
+-    WATCH_NCURSES_LIBS="-lncurses"
++    WATCH_NCURSES_LIBS="$NCURSES_LIBS"
+   fi
+-  NCURSES_LIBS="-lncurses"
+ fi
+ AC_SUBST([NCURSES_LIBS])
+ AC_SUBST([WATCH_NCURSES_LIBS])
+-- 
+1.7.8.3
+
diff --git a/sys-process/procps/metadata.xml b/sys-process/procps/metadata.xml
index 96a2d586367d..16e9fa35c44d 100644
--- a/sys-process/procps/metadata.xml
+++ b/sys-process/procps/metadata.xml
@@ -2,4 +2,7 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>base-system</herd>
+<use>
+ <flag name='ncurses'>Build programs that use ncurses: top, slabtop, watch</flag>
+</use>
 </pkgmetadata>
diff --git a/sys-process/procps/procps-3.3.2_p2.ebuild b/sys-process/procps/procps-3.3.2_p2-r1.ebuild
index befe2a21fce7..dd618c9822fd 100644
--- a/sys-process/procps/procps-3.3.2_p2.ebuild
+++ b/sys-process/procps/procps-3.3.2_p2-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.2_p2.ebuild,v 1.1 2012/01/24 06:20:13 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-process/procps/procps-3.3.2_p2-r1.ebuild,v 1.1 2012/01/24 18:40:30 vapier Exp $
 
 EAPI="4"
 
-inherit flag-o-matic eutils toolchain-funcs multilib
+inherit eutils toolchain-funcs autotools
 
 DEB_VER=${PV#*_p}
 MY_PV=${PV%_p*}
@@ -16,9 +16,11 @@ SRC_URI="mirror://debian/pool/main/p/procps/${PN}_${MY_PV}.orig.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="static-libs unicode"
+IUSE="+ncurses static-libs unicode"
 
-RDEPEND=">=sys-libs/ncurses-5.2-r2[unicode?]"
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.2-r2[unicode?] )"
+DEPEND="${RDEPEND}
+	ncurses? ( dev-util/pkgconfig )"
 
 S=${WORKDIR}/${PN}-ng-${MY_PV}
 
@@ -28,13 +30,18 @@ src_prepare() {
 
 	epatch "${FILESDIR}"/${PN}-3.3.2-noproc.patch
 	epatch "${FILESDIR}"/${PN}-3.3.2-headers.patch
+	epatch "${FILESDIR}"/${PN}-3.3.2-ncurses.patch #400555
+
+	eautoreconf
 }
 
 src_configure() {
 	econf \
 		--exec-prefix="${EPREFIX}/" \
 		--docdir='$(datarootdir)'/doc/${PF} \
-		$(use_enable static-libs static)
+		$(use_with ncurses) \
+		$(use_enable static-libs static) \
+		$(use_enable unicode watch8bit)
 }
 
 src_install() {