[gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/, sys-libs/ncurses/files/, profiles/

[gentoo-commits] repo/gentoo:master commit in: sys-libs/ncurses/, sys-libs/ncurses/files/, profiles/

[Mike Frysinger]

commit:     d4017f5e973af975a3facf642ddc027bd965eba8
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 13:54:05 2015 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 13:55:04 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4017f5e

sys-libs/ncurses: fix header mismatch with multilib installs #557360

The progs change had a subtle effect that broke multilib builds.
A few ticlib headers aren't installed when progs are disabled.
Add a patch to always install them regardless of the progs state.

 profiles/package.mask                           |  4 ----
 sys-libs/ncurses/files/ncurses-6.0-ticlib.patch | 15 +++++++++++++++
 sys-libs/ncurses/ncurses-6.0.ebuild             |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index 21e8a4e..01d9b69 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -30,10 +30,6 @@
 
 #--- END OF EXAMPLES ---
 
-# Lars Wendler <polynomial-c@gentoo.org> (12 Aug 2015)
-# Masked due to ABI_X86="32" breakage (bug #557360)
-=sys-libs/ncurses-6.0
-
 # Patrice Clement <monsieurp@gentoo.org> (11 Aug 2015)
 # Old and doesn't compile with recent JDKs (>= 1.8).
 # Masked for removal in 30 days. See bug #557210.

diff --git a/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch b/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch
new file mode 100644
index 0000000..188e6ad
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-6.0-ticlib.patch
@@ -0,0 +1,15 @@
+always include ticlib even when progs are disabled
+
+https://bugs.gentoo.org/557360
+
+--- a/configure
++++ b/configure
+@@ -21312,7 +21312,7 @@ echo "$as_me:21311: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+ 
+-if test "x$cf_with_progs" = xyes || test "$with_ticlib" != no || test "$with_termcap" != no; then
++if true; then
+ 	LIB_SUBSETS="${LIB_SUBSETS}ticlib"
+ 	if test "$with_ticlib" != no ; then
+ 		LIB_SUBSETS="${LIB_SUBSETS} "

diff --git a/sys-libs/ncurses/ncurses-6.0.ebuild b/sys-libs/ncurses/ncurses-6.0.ebuild
index a73d58f..898956c 100644
--- a/sys-libs/ncurses/ncurses-6.0.ebuild
+++ b/sys-libs/ncurses/ncurses-6.0.ebuild
@@ -34,6 +34,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-6.0-rxvt-unicode-9.15.patch" #192083 #383871
 	"${FILESDIR}/${PN}-6.0-pkg-config.patch"
 	"${FILESDIR}/${PN}-5.9-gcc-5.patch" #545114
+	"${FILESDIR}/${PN}-6.0-ticlib.patch" #557360
 )
 
 src_prepare() {