jer 14/10/30 21:59:57 Modified: sc-7.16-r1.ebuild ChangeLog Log: Fix building against sys-libs/ncurses[tinfo] (bug #527420). (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613)
Revision Changes Path 1.9 app-office/sc/sc-7.16-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild?rev=1.9&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild?rev=1.9&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild?r1=1.8&r2=1.9 Index: sc-7.16-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sc-7.16-r1.ebuild 10 Aug 2014 18:17:32 -0000 1.8 +++ sc-7.16-r1.ebuild 30 Oct 2014 21:59:57 -0000 1.9 @@ -1,7 +1,8 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild,v 1.8 2014/08/10 18:17:32 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild,v 1.9 2014/10/30 21:59:57 jer Exp $ +EAPI=5 inherit eutils multilib toolchain-funcs DESCRIPTION="sc is a free curses-based spreadsheet program that uses key bindings similar to vi and less" @@ -11,31 +12,36 @@ SLOT="0" LICENSE="public-domain" KEYWORDS="amd64 ppc sparc x86" -IUSE="" -DEPEND=">=sys-libs/ncurses-5.2" -RDEPEND="${DEPEND} +COMMON_DEPEND=">=sys-libs/ncurses-5.2" +DEPEND="virtual/pkgconfig" +RDEPEND=" + ${COMMON_DEPEND} !dev-lang/stratego - !<sci-chemistry/ccp4-apps-6.1.3-r4" -src_unpack() { - unpack ${A} - cd "${S}" - - sed -i -e "/^prefix=/ s:/usr:${D}/usr:" \ - -e "/^MANDIR=/ s:${prefix}/man:${prefix}/share/man:" \ - -e "/^LIBDIR=/ s:${prefix}/lib:${prefix}/$(get_libdir):" \ - -e "/^CC=/ s:gcc:$(tc-getCC):" \ - -e "/^CFLAGS/ s:=-DSYSV3 -O2 -pipe:+=-DSYSV3:" \ - -e "/strip/ s:^:#:g" \ - Makefile + !<sci-chemistry/ccp4-apps-6.1.3-r4 +" + +src_prepare() { + epatch \ + "${FILESDIR}"/${P}-amd64.patch \ + "${FILESDIR}"/${P}-lex-syntax.patch + + sed -i \ + -e "/^prefix=/ s:/usr:${D}/usr:" \ + -e "/^MANDIR=/ s:${prefix}/man:${prefix}/share/man:" \ + -e "/^LIBDIR=/ s:${prefix}/lib:${prefix}/$(get_libdir):" \ + -e '/^LIB=/s|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses)|g' \ + -e "/^CC=/ s:gcc:$(tc-getCC):" \ + -e "/^CFLAGS/ s:=-DSYSV3 -O2 -pipe:+=-DSYSV3:" \ + -e "/strip/ s:^:#:g" \ + Makefile || die - epatch "${FILESDIR}"/${P}-amd64.patch - epatch "${FILESDIR}"/${P}-lex-syntax.patch } src_compile() { + tc-export PKG_CONFIG # no autoconf - emake prefix="${D}"/usr || die "emake failed" + emake prefix="${D}"/usr || die } src_install () { @@ -43,9 +49,9 @@ dodir /usr/bin dodir /usr/$(get_libdir)/sc dodir /usr/share/man/man1 - emake install || die + emake install - sed -i "s:${D}::g" sc.1 + sed -i -e "s:${D}::g" sc.1 || die doman sc.1 psc.1 dodoc CHANGES README sc.doc psc.doc tutorial.sc 1.26 app-office/sc/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/ChangeLog?rev=1.26&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/ChangeLog?rev=1.26&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/ChangeLog?r1=1.25&r2=1.26 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- ChangeLog 26 Sep 2014 19:57:56 -0000 1.25 +++ ChangeLog 30 Oct 2014 21:59:57 -0000 1.26 @@ -1,6 +1,10 @@ # ChangeLog for app-office/sc # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.25 2014/09/26 19:57:56 axs Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.26 2014/10/30 21:59:57 jer Exp $ + + 30 Oct 2014; Jeroen Roovers <[email protected]> files/sc-7.16-amd64.patch, + files/sc-7.16-lex-syntax.patch, sc-7.16-r1.ebuild: + Fix building against sys-libs/ncurses[tinfo] (bug #527420). 26 Sep 2014; Ian Stakenvicius (_AxS_) <[email protected]> +files/sc-7.16-amd64.patch:
