app-editors/xemacs: Build with ncurses using tinfo, bug #615544

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
new file mode 100644 (file)
index 0000000..19b8984
--- /dev/null
+++ b/app-editors/xemacs/files/xemacs-21.4.24-ncurses-tinfo.patch
@@ -0,0 +1,12 @@
+diff -r e2da872593c0 configure.in
+--- a/configure.in     Tue Mar 24 22:15:53 2015 -0400
++++ b/configure.in     Mon Apr 17 10:13:05 2017 +0200
+@@ -4449,7 +4449,7 @@
+     AC_CHECK_HEADER(ncurses/curses.h, curses_h_file=ncurses/curses.h)
+     AC_CHECK_HEADER(ncurses/term.h, term_h_file=ncurses/term.h)
+     XE_ADD_OBJS(terminfo.o)
+-    XE_PREPEND(-lncurses, LIBS)
++    XE_PREPEND($(pkg-config ncurses --libs), LIBS)
+ 
+     if test "$ac_cv_header_ncurses_curses_h" != "yes" ; then
+       dnl Try again, and check for the bogus ncurses/ include bug.

diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index e9e6f8a04e28313e035a257c481e12f8abf0786c..9f1e61beeecb829a6d3000372392e535f3e536b6 100644 (file)
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -64,6 +64,8 @@ src_prepare() {
        # see bug 576512
        epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
        epatch "${FILESDIR}"/xemacs-21.4.24-glibc-macro.patch
+       # see bug 615544
+       epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
 
        # Some binaries and man pages are installed under suffixed names
        # to avoid collions with their GNU Emacs counterparts (see below).

diff --git a/app-editors/xemacs/xemacs-21.4.24.ebuild b/app-editors/xemacs/xemacs-21.4.24.ebuild
index 9305b8ed2eb29b93fe06f6c829b68c63559ad417..6f9245c0ea78172b5b9dfe5e5e7f7686a60f49a7 100644 (file)
--- a/app-editors/xemacs/xemacs-21.4.24.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with a hardened profile. If you
@@ -63,6 +63,8 @@ src_prepare() {
        epatch "${FILESDIR}"/xemacs-21.4.19-db.patch
        # see bug 576512
        epatch "${FILESDIR}"/xemacs-21.4.24-gcc5.patch
+       # see bug 615544
+       epatch "${FILESDIR}"/xemacs-21.4.24-ncurses-tinfo.patch
 
        # Some binaries and man pages are installed under suffixed names
        # to avoid collions with their GNU Emacs counterparts (see below).