diff options
| author |   Jeroen Roovers <jer@gentoo.org> | 2014-11-15 12:29:35 +0000 |
|---|---|---|
| committer | Jeroen Roovers <jer@gentoo.org> | 2014-11-15 12:29:35 +0000 |
| commit | da61b9c81a3e273008c7b7e595390282bd2fa60d (patch) | |
| tree | d34699f48fb3d9c8dea95376d849f1e5e68a93a0 /app-text/reed | |
| parent | Version bump, drop -Werror. (diff) | |
| download | gentoo-2-da61b9c81a3e273008c7b7e595390282bd2fa60d.tar.gz gentoo-2-da61b9c81a3e273008c7b7e595390282bd2fa60d.tar.bz2 gentoo-2-da61b9c81a3e273008c7b7e595390282bd2fa60d.zip | |
Fix building against sys-libs/ncurses[tinfo] (bug #528382).
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Diffstat (limited to 'app-text/reed')
| -rw-r--r-- | app-text/reed/ChangeLog | 5 | ||||
| -rw-r--r-- | app-text/reed/reed-5.4.ebuild | 20 |
2 files changed, 14 insertions, 11 deletions
diff --git a/app-text/reed/ChangeLog b/app-text/reed/ChangeLog index edf524e9a124..9539b5c9a72e 100644 --- a/app-text/reed/ChangeLog +++ b/app-text/reed/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/reed # Copyright 2000-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/reed/ChangeLog,v 1.12 2014/08/10 18:31:27 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/reed/ChangeLog,v 1.13 2014/11/15 12:29:35 jer Exp $ + + 15 Nov 2014; Jeroen Roovers <jer@gentoo.org> reed-5.4.ebuild: + Fix building against sys-libs/ncurses[tinfo] (bug #528382). 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> reed-5.4.ebuild: QA: drop trailing '.' from DESCRIPTION diff --git a/app-text/reed/reed-5.4.ebuild b/app-text/reed/reed-5.4.ebuild index 5ccebf5a1dd6..cda5cf901a81 100644 --- a/app-text/reed/reed-5.4.ebuild +++ b/app-text/reed/reed-5.4.ebuild @@ -1,10 +1,9 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/reed/reed-5.4.ebuild,v 1.13 2014/08/10 18:31:27 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/reed/reed-5.4.ebuild,v 1.14 2014/11/15 12:29:35 jer Exp $ -EAPI=4 - -inherit toolchain-funcs +EAPI=5 +inherit eutils toolchain-funcs DESCRIPTION="This is a text pager (text file viewer), used to display etexts" # Homepage http://www.sacredchao.net/software/reed/index.shtml does not exist. @@ -14,7 +13,6 @@ SRC_URI="http://www.sacredchao.net/software/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 x86" -IUSE="" DEPEND="sys-libs/ncurses" RDEPEND="${DEPEND}" @@ -22,13 +20,15 @@ RDEPEND="${DEPEND}" DOCS=( AUTHORS BUGS NEWS README ) src_prepare() { - sed -e "s:-O2:${CFLAGS} ${LDFLAGS}:" \ - -e "s: wrap::" \ - -e "s:-s reed:reed:" -i Makefile.in || die + sed -e 's:-O2:$(CFLAGS) $(LDFLAGS):' \ + -e 's: wrap::' \ + -e 's:-s reed:reed:' \ + -e 's:-lcurses:$(shell ${PKG_CONFIG} --libs ncurses):g' \ + -i Makefile.in || die rm wrap.1 #Collision with talkfilters, bug #247396 - tc-export CC + tc-export CC PKG_CONFIG } src_configure() { - ./configures --prefix=/usr || die "configures failed" + ./configures --prefix=/usr || die } |