diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2013-03-03 14:57:57 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2013-03-03 14:57:57 +0000 |
| commit | 17d56cffcb746b32766dbe02fe89414f1c06fc58 (patch) | |
| tree | 10cba4c8e62788ec5e9623249ce779ca6e5b1303 | |
| parent | eapi5: define subslot and use slot deps. (diff) | |
| download | gentoo-2-17d56cffcb746b32766dbe02fe89414f1c06fc58.tar.gz gentoo-2-17d56cffcb746b32766dbe02fe89414f1c06fc58.tar.bz2 gentoo-2-17d56cffcb746b32766dbe02fe89414f1c06fc58.zip | |
Check for -ltinfo before -lncurses wrt #457556 by Travis Hansen
(Portage version: 2.2.0_alpha163/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
| -rw-r--r-- | sys-apps/texinfo/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-apps/texinfo/files/texinfo-4.13-tinfo.patch | 24 | ||||
| -rw-r--r-- | sys-apps/texinfo/texinfo-4.13-r2.ebuild | 5 |
3 files changed, 33 insertions, 4 deletions
diff --git a/sys-apps/texinfo/ChangeLog b/sys-apps/texinfo/ChangeLog index 02d10aec7715..bbd7f4bbd168 100644 --- a/sys-apps/texinfo/ChangeLog +++ b/sys-apps/texinfo/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/texinfo -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.116 2012/05/24 02:02:37 flameeyes Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/ChangeLog,v 1.117 2013/03/03 14:57:57 ssuominen Exp $ + + 03 Mar 2013; Samuli Suominen <ssuominen@gentoo.org> texinfo-4.13-r2.ebuild, + +files/texinfo-4.13-tinfo.patch: + Check for -ltinfo before -lncurses wrt #457556 by Travis Hansen *texinfo-4.13-r2 (24 May 2012) diff --git a/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch b/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch new file mode 100644 index 000000000000..2f3c4c37d9dc --- /dev/null +++ b/sys-apps/texinfo/files/texinfo-4.13-tinfo.patch @@ -0,0 +1,24 @@ +http://bugs.gentoo.org/457556 + +--- configure ++++ configure +@@ -17477,7 +17477,7 @@ + # rather ncurses. So we check for it. + TERMLIBS= + # Check for termlib before termcap because Solaris termcap needs libucb. +-TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" ++TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" + for termlib in ${TERMLIB_VARIANTS}; do + as_ac_Lib=`$as_echo "ac_cv_lib_${termlib}''_tgetent" | $as_tr_sh` + { $as_echo "$as_me:$LINENO: checking for tgetent in -l${termlib}" >&5 +--- configure.ac ++++ configure.ac +@@ -130,7 +130,7 @@ + # rather ncurses. So we check for it. + TERMLIBS= + # Check for termlib before termcap because Solaris termcap needs libucb. +-TERMLIB_VARIANTS="ncurses curses termlib termcap terminfo" ++TERMLIB_VARIANTS="tinfo ncurses curses termlib termcap terminfo" + for termlib in ${TERMLIB_VARIANTS}; do + AC_CHECK_LIB(${termlib}, tgetent, + [TERMLIBS="${TERMLIBS} -l${termlib}"; break]) diff --git a/sys-apps/texinfo/texinfo-4.13-r2.ebuild b/sys-apps/texinfo/texinfo-4.13-r2.ebuild index 1466b36cebbf..a38244469cca 100644 --- a/sys-apps/texinfo/texinfo-4.13-r2.ebuild +++ b/sys-apps/texinfo/texinfo-4.13-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.13-r2.ebuild,v 1.1 2012/05/24 02:02:37 flameeyes Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/texinfo/texinfo-4.13-r2.ebuild,v 1.2 2013/03/03 14:57:57 ssuominen Exp $ EAPI="2" @@ -31,6 +31,7 @@ src_prepare() { # waiting to be sent upstream for my copyright assignment form to be # ready - Flameeyes epatch "${FILESDIR}"/${P}-docbook.patch + epatch "${FILESDIR}"/${P}-tinfo.patch #457556 } src_configure() { |