jer 14/10/28 23:24:31 Modified: ChangeLog snownews-1.5.12-r1.ebuild Log: Fix building against sys-libs/ncurses[tinfo] (bug #526264). (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.40 net-news/snownews/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/ChangeLog?rev=1.40&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/ChangeLog?rev=1.40&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/ChangeLog?r1=1.39&r2=1.40 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v retrieving revision 1.39 retrieving revision 1.40 diff -u -r1.39 -r1.40 --- ChangeLog 1 Jun 2013 12:24:26 -0000 1.39 +++ ChangeLog 28 Oct 2014 23:24:31 -0000 1.40 @@ -1,6 +1,9 @@ # ChangeLog for net-news/snownews -# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v 1.39 2013/06/01 12:24:26 pacho Exp $ +# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v 1.40 2014/10/28 23:24:31 jer Exp $ + + 28 Oct 2014; Jeroen Roovers <[email protected]> snownews-1.5.12-r1.ebuild: + Fix building against sys-libs/ncurses[tinfo] (bug #526264). 01 Jun 2013; Pacho Ramos <[email protected]> -snownews-1.5.10.ebuild, metadata.xml: 1.9 net-news/snownews/snownews-1.5.12-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild?r1=1.8&r2=1.9 Index: snownews-1.5.12-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- snownews-1.5.12-r1.ebuild 11 Jan 2013 02:06:25 -0000 1.8 +++ snownews-1.5.12-r1.ebuild 28 Oct 2014 23:24:31 -0000 1.9 @@ -1,8 +1,8 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild,v 1.8 2013/01/11 02:06:25 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild,v 1.9 2014/10/28 23:24:31 jer Exp $ -EAPI=3 +EAPI=5 inherit eutils toolchain-funcs DESCRIPTION="Snownews, a text-mode RSS/RDF newsreader" @@ -14,36 +14,48 @@ KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos" IUSE="unicode" -DEPEND=">=dev-libs/libxml2-2.5.6 +COMMON_DEPEND=" + >=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3[unicode?] - dev-libs/openssl" - -RDEPEND="${DEPEND} + dev-libs/openssl +" +RDEPEND=" + ${COMMON_DEPEND} dev-perl/XML-LibXML - dev-perl/libwww-perl" - -src_prepare() { - use unicode && sed -i -e "s/-lncurses/-lncursesw/" \ - configure + dev-perl/libwww-perl +" - sed -i -e "s/-O2//" \ - configure +DEPEND=" + ${COMMON_DEPEND} + virtual/pkgconfig +" - sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' \ - Makefile +src_prepare() { + sed -i -e "s|-O2||g" configure || die + sed -i -e 's|$(INSTALL) -s|$(INSTALL)|g' Makefile || die } src_configure() { - local conf="--prefix=${EPREFIX}/usr" - ./configure ${conf} || die "configure failed" + tc-export PKG_CONFIG + if use unicode; then + sed -i -e 's|-lncurses|`\\$(PKG_CONFIG) --libs ncursesw`|' configure || die + else + sed -i -e 's|-lncurses|`\\$(PKG_CONFIG) --libs ncurses`|' configure || die + fi + + # perl script, not autotools based + ./configure --prefix="${EPREFIX}/usr" || die } src_compile() { - emake CC="$(tc-getCC)" EXTRA_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" || die "emake failed" + emake \ + CC="$(tc-getCC)" \ + EXTRA_CFLAGS="${CFLAGS}" \ + EXTRA_LDFLAGS="${LDFLAGS}" } src_install() { - emake PREFIX="${ED}/usr" install || die "make install failed" + emake PREFIX="${ED}/usr" install dodoc AUTHOR Changelog CREDITS README README.de README.patching }
