| 1 |
jer 14/10/30 21:59:57 |
| 2 |
|
| 3 |
Modified: sc-7.16-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix building against sys-libs/ncurses[tinfo] (bug #527420). |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.9 app-office/sc/sc-7.16-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild?rev=1.9&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild?rev=1.9&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild?r1=1.8&r2=1.9 |
| 15 |
|
| 16 |
Index: sc-7.16-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild,v |
| 19 |
retrieving revision 1.8 |
| 20 |
retrieving revision 1.9 |
| 21 |
diff -u -r1.8 -r1.9 |
| 22 |
--- sc-7.16-r1.ebuild 10 Aug 2014 18:17:32 -0000 1.8 |
| 23 |
+++ sc-7.16-r1.ebuild 30 Oct 2014 21:59:57 -0000 1.9 |
| 24 |
@@ -1,7 +1,8 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild,v 1.8 2014/08/10 18:17:32 slyfox Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/sc/sc-7.16-r1.ebuild,v 1.9 2014/10/30 21:59:57 jer Exp $ |
| 29 |
|
| 30 |
+EAPI=5 |
| 31 |
inherit eutils multilib toolchain-funcs |
| 32 |
|
| 33 |
DESCRIPTION="sc is a free curses-based spreadsheet program that uses key bindings similar to vi and less" |
| 34 |
@@ -11,31 +12,36 @@ |
| 35 |
SLOT="0" |
| 36 |
LICENSE="public-domain" |
| 37 |
KEYWORDS="amd64 ppc sparc x86" |
| 38 |
-IUSE="" |
| 39 |
|
| 40 |
-DEPEND=">=sys-libs/ncurses-5.2" |
| 41 |
-RDEPEND="${DEPEND} |
| 42 |
+COMMON_DEPEND=">=sys-libs/ncurses-5.2" |
| 43 |
+DEPEND="virtual/pkgconfig" |
| 44 |
+RDEPEND=" |
| 45 |
+ ${COMMON_DEPEND} |
| 46 |
!dev-lang/stratego |
| 47 |
- !<sci-chemistry/ccp4-apps-6.1.3-r4" |
| 48 |
-src_unpack() { |
| 49 |
- unpack ${A} |
| 50 |
- cd "${S}" |
| 51 |
- |
| 52 |
- sed -i -e "/^prefix=/ s:/usr:${D}/usr:" \ |
| 53 |
- -e "/^MANDIR=/ s:${prefix}/man:${prefix}/share/man:" \ |
| 54 |
- -e "/^LIBDIR=/ s:${prefix}/lib:${prefix}/$(get_libdir):" \ |
| 55 |
- -e "/^CC=/ s:gcc:$(tc-getCC):" \ |
| 56 |
- -e "/^CFLAGS/ s:=-DSYSV3 -O2 -pipe:+=-DSYSV3:" \ |
| 57 |
- -e "/strip/ s:^:#:g" \ |
| 58 |
- Makefile |
| 59 |
+ !<sci-chemistry/ccp4-apps-6.1.3-r4 |
| 60 |
+" |
| 61 |
+ |
| 62 |
+src_prepare() { |
| 63 |
+ epatch \ |
| 64 |
+ "${FILESDIR}"/${P}-amd64.patch \ |
| 65 |
+ "${FILESDIR}"/${P}-lex-syntax.patch |
| 66 |
+ |
| 67 |
+ sed -i \ |
| 68 |
+ -e "/^prefix=/ s:/usr:${D}/usr:" \ |
| 69 |
+ -e "/^MANDIR=/ s:${prefix}/man:${prefix}/share/man:" \ |
| 70 |
+ -e "/^LIBDIR=/ s:${prefix}/lib:${prefix}/$(get_libdir):" \ |
| 71 |
+ -e '/^LIB=/s|-lncurses|$(shell ${PKG_CONFIG} --libs ncurses)|g' \ |
| 72 |
+ -e "/^CC=/ s:gcc:$(tc-getCC):" \ |
| 73 |
+ -e "/^CFLAGS/ s:=-DSYSV3 -O2 -pipe:+=-DSYSV3:" \ |
| 74 |
+ -e "/strip/ s:^:#:g" \ |
| 75 |
+ Makefile || die |
| 76 |
|
| 77 |
- epatch "${FILESDIR}"/${P}-amd64.patch |
| 78 |
- epatch "${FILESDIR}"/${P}-lex-syntax.patch |
| 79 |
} |
| 80 |
|
| 81 |
src_compile() { |
| 82 |
+ tc-export PKG_CONFIG |
| 83 |
# no autoconf |
| 84 |
- emake prefix="${D}"/usr || die "emake failed" |
| 85 |
+ emake prefix="${D}"/usr || die |
| 86 |
} |
| 87 |
|
| 88 |
src_install () { |
| 89 |
@@ -43,9 +49,9 @@ |
| 90 |
dodir /usr/bin |
| 91 |
dodir /usr/$(get_libdir)/sc |
| 92 |
dodir /usr/share/man/man1 |
| 93 |
- emake install || die |
| 94 |
+ emake install |
| 95 |
|
| 96 |
- sed -i "s:${D}::g" sc.1 |
| 97 |
+ sed -i -e "s:${D}::g" sc.1 || die |
| 98 |
doman sc.1 psc.1 |
| 99 |
|
| 100 |
dodoc CHANGES README sc.doc psc.doc tutorial.sc |
| 101 |
|
| 102 |
|
| 103 |
|
| 104 |
1.26 app-office/sc/ChangeLog |
| 105 |
|
| 106 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/ChangeLog?rev=1.26&view=markup |
| 107 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/ChangeLog?rev=1.26&content-type=text/plain |
| 108 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-office/sc/ChangeLog?r1=1.25&r2=1.26 |
| 109 |
|
| 110 |
Index: ChangeLog |
| 111 |
=================================================================== |
| 112 |
RCS file: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v |
| 113 |
retrieving revision 1.25 |
| 114 |
retrieving revision 1.26 |
| 115 |
diff -u -r1.25 -r1.26 |
| 116 |
--- ChangeLog 26 Sep 2014 19:57:56 -0000 1.25 |
| 117 |
+++ ChangeLog 30 Oct 2014 21:59:57 -0000 1.26 |
| 118 |
@@ -1,6 +1,10 @@ |
| 119 |
# ChangeLog for app-office/sc |
| 120 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 121 |
-# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.25 2014/09/26 19:57:56 axs Exp $ |
| 122 |
+# $Header: /var/cvsroot/gentoo-x86/app-office/sc/ChangeLog,v 1.26 2014/10/30 21:59:57 jer Exp $ |
| 123 |
+ |
| 124 |
+ 30 Oct 2014; Jeroen Roovers <jer@g.o> files/sc-7.16-amd64.patch, |
| 125 |
+ files/sc-7.16-lex-syntax.patch, sc-7.16-r1.ebuild: |
| 126 |
+ Fix building against sys-libs/ncurses[tinfo] (bug #527420). |
| 127 |
|
| 128 |
26 Sep 2014; Ian Stakenvicius (_AxS_) <axs@g.o> |
| 129 |
+files/sc-7.16-amd64.patch: |
Archives