jer         14/11/15 12:29:35

  Modified:             ChangeLog reed-5.4.ebuild
  Log:
  Fix building against sys-libs/ncurses[tinfo] (bug #528382).
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
A792A613)

Revision  Changes    Path
1.13                 app-text/reed/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/reed/ChangeLog?rev=1.13&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/reed/ChangeLog?rev=1.13&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/reed/ChangeLog?r1=1.12&r2=1.13

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/reed/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ChangeLog   10 Aug 2014 18:31:27 -0000      1.12
+++ ChangeLog   15 Nov 2014 12:29:35 -0000      1.13
@@ -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 <j...@gentoo.org> reed-5.4.ebuild:
+  Fix building against sys-libs/ncurses[tinfo] (bug #528382).
 
   10 Aug 2014; Sergei Trofimovich <sly...@gentoo.org> reed-5.4.ebuild:
   QA: drop trailing '.' from DESCRIPTION



1.14                 app-text/reed/reed-5.4.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/reed/reed-5.4.ebuild?rev=1.14&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/reed/reed-5.4.ebuild?rev=1.14&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/reed/reed-5.4.ebuild?r1=1.13&r2=1.14

Index: reed-5.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-text/reed/reed-5.4.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- reed-5.4.ebuild     10 Aug 2014 18:31:27 -0000      1.13
+++ reed-5.4.ebuild     15 Nov 2014 12:29:35 -0000      1.14
@@ -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 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 x86"
-IUSE=""
 
 DEPEND="sys-libs/ncurses"
 RDEPEND="${DEPEND}"
@@ -22,13 +20,15 @@
 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
 }




Reply via email to