From f03862b21cf3913cf0aa8b9b559d57c9ed7634fc Mon Sep 17 00:00:00 2001 From: Jeroen Roovers Date: Mon, 26 Jan 2015 18:20:44 +0000 Subject: Fix --with-curses (bug #537886). (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key A792A613) --- app-admin/xstow/ChangeLog | 8 ++++++-- app-admin/xstow/files/xstow-1.0.1-ncurses.patch | 27 +++++++++++++++++++++++++ app-admin/xstow/xstow-1.0.1.ebuild | 11 +++++++--- 3 files changed, 41 insertions(+), 5 deletions(-) create mode 100644 app-admin/xstow/files/xstow-1.0.1-ncurses.patch (limited to 'app-admin') diff --git a/app-admin/xstow/ChangeLog b/app-admin/xstow/ChangeLog index 06bc67c8d53b..69423b246dc3 100644 --- a/app-admin/xstow/ChangeLog +++ b/app-admin/xstow/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/xstow -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.18 2014/06/27 08:39:09 maksbotan Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/ChangeLog,v 1.19 2015/01/26 18:20:44 jer Exp $ + + 26 Jan 2015; Jeroen Roovers xstow-1.0.1.ebuild, + +files/xstow-1.0.1-ncurses.patch: + Fix --with-curses (bug #537886). 27 Jun 2014; Maxim Koltsov xstow-1.0.1.ebuild: Move econf to src_configure, drop static use flag. Bug #515396. diff --git a/app-admin/xstow/files/xstow-1.0.1-ncurses.patch b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch new file mode 100644 index 000000000000..a3f0becfd287 --- /dev/null +++ b/app-admin/xstow/files/xstow-1.0.1-ncurses.patch @@ -0,0 +1,27 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -91,11 +91,12 @@ + AC_MSG_RESULT(disabled) + support_curses=0 + else ++ AC_MSG_RESULT(enabled) + support_curses=1 + fi + ], +- [ +- AC_MSG_RESULT(enabled) ++ []) ++if test $support_curses -eq 1; then + AC_CHECK_HEADER([curses.h], + [ + # test which libraray to use +@@ -154,8 +155,7 @@ + [ + support_curses=0 + ]) +- ]) +- ++fi + + NO_STL_SSTREAM=0 + NO_STL_STRSTREAM=0 diff --git a/app-admin/xstow/xstow-1.0.1.ebuild b/app-admin/xstow/xstow-1.0.1.ebuild index 07bbe0f9e7f1..5440022f77f9 100644 --- a/app-admin/xstow/xstow-1.0.1.ebuild +++ b/app-admin/xstow/xstow-1.0.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.2 2014/06/27 08:39:09 maksbotan Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/xstow/xstow-1.0.1.ebuild,v 1.3 2015/01/26 18:20:44 jer Exp $ EAPI=5 -inherit eutils +inherit autotools eutils DESCRIPTION="replacement for GNU stow with extensions" HOMEPAGE="http://xstow.sourceforge.net/" @@ -18,6 +18,11 @@ IUSE="ncurses" DEPEND="ncurses? ( sys-libs/ncurses )" RDEPEND="${DEPEND}" +src_prepare() { + epatch "${FILESDIR}"/${P}-ncurses.patch + eautoreconf +} + src_configure() { econf $(use_with ncurses curses) } -- cgit v1.2.3-65-gdbad