| 1 |
jer 14/10/28 23:24:31 |
| 2 |
|
| 3 |
Modified: ChangeLog snownews-1.5.12-r1.ebuild |
| 4 |
Log: |
| 5 |
Fix building against sys-libs/ncurses[tinfo] (bug #526264). |
| 6 |
|
| 7 |
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A792A613) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.40 net-news/snownews/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/ChangeLog?rev=1.40&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/ChangeLog?rev=1.40&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/ChangeLog?r1=1.39&r2=1.40 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v |
| 19 |
retrieving revision 1.39 |
| 20 |
retrieving revision 1.40 |
| 21 |
diff -u -r1.39 -r1.40 |
| 22 |
--- ChangeLog 1 Jun 2013 12:24:26 -0000 1.39 |
| 23 |
+++ ChangeLog 28 Oct 2014 23:24:31 -0000 1.40 |
| 24 |
@@ -1,6 +1,9 @@ |
| 25 |
# ChangeLog for net-news/snownews |
| 26 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v 1.39 2013/06/01 12:24:26 pacho Exp $ |
| 28 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/net-news/snownews/ChangeLog,v 1.40 2014/10/28 23:24:31 jer Exp $ |
| 30 |
+ |
| 31 |
+ 28 Oct 2014; Jeroen Roovers <jer@g.o> snownews-1.5.12-r1.ebuild: |
| 32 |
+ Fix building against sys-libs/ncurses[tinfo] (bug #526264). |
| 33 |
|
| 34 |
01 Jun 2013; Pacho Ramos <pacho@g.o> -snownews-1.5.10.ebuild, |
| 35 |
metadata.xml: |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.9 net-news/snownews/snownews-1.5.12-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild?rev=1.9&view=markup |
| 42 |
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 |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild?r1=1.8&r2=1.9 |
| 44 |
|
| 45 |
Index: snownews-1.5.12-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-news/snownews/snownews-1.5.12-r1.ebuild,v |
| 48 |
retrieving revision 1.8 |
| 49 |
retrieving revision 1.9 |
| 50 |
diff -u -r1.8 -r1.9 |
| 51 |
--- snownews-1.5.12-r1.ebuild 11 Jan 2013 02:06:25 -0000 1.8 |
| 52 |
+++ snownews-1.5.12-r1.ebuild 28 Oct 2014 23:24:31 -0000 1.9 |
| 53 |
@@ -1,8 +1,8 @@ |
| 54 |
-# Copyright 1999-2013 Gentoo Foundation |
| 55 |
+# Copyright 1999-2014 Gentoo Foundation |
| 56 |
# Distributed under the terms of the GNU General Public License v2 |
| 57 |
-# $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 $ |
| 58 |
+# $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 $ |
| 59 |
|
| 60 |
-EAPI=3 |
| 61 |
+EAPI=5 |
| 62 |
inherit eutils toolchain-funcs |
| 63 |
|
| 64 |
DESCRIPTION="Snownews, a text-mode RSS/RDF newsreader" |
| 65 |
@@ -14,36 +14,48 @@ |
| 66 |
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos" |
| 67 |
IUSE="unicode" |
| 68 |
|
| 69 |
-DEPEND=">=dev-libs/libxml2-2.5.6 |
| 70 |
+COMMON_DEPEND=" |
| 71 |
+ >=dev-libs/libxml2-2.5.6 |
| 72 |
>=sys-libs/ncurses-5.3[unicode?] |
| 73 |
- dev-libs/openssl" |
| 74 |
- |
| 75 |
-RDEPEND="${DEPEND} |
| 76 |
+ dev-libs/openssl |
| 77 |
+" |
| 78 |
+RDEPEND=" |
| 79 |
+ ${COMMON_DEPEND} |
| 80 |
dev-perl/XML-LibXML |
| 81 |
- dev-perl/libwww-perl" |
| 82 |
- |
| 83 |
-src_prepare() { |
| 84 |
- use unicode && sed -i -e "s/-lncurses/-lncursesw/" \ |
| 85 |
- configure |
| 86 |
+ dev-perl/libwww-perl |
| 87 |
+" |
| 88 |
|
| 89 |
- sed -i -e "s/-O2//" \ |
| 90 |
- configure |
| 91 |
+DEPEND=" |
| 92 |
+ ${COMMON_DEPEND} |
| 93 |
+ virtual/pkgconfig |
| 94 |
+" |
| 95 |
|
| 96 |
- sed -i -e 's/$(INSTALL) -s/$(INSTALL)/' \ |
| 97 |
- Makefile |
| 98 |
+src_prepare() { |
| 99 |
+ sed -i -e "s|-O2||g" configure || die |
| 100 |
+ sed -i -e 's|$(INSTALL) -s|$(INSTALL)|g' Makefile || die |
| 101 |
} |
| 102 |
|
| 103 |
src_configure() { |
| 104 |
- local conf="--prefix=${EPREFIX}/usr" |
| 105 |
- ./configure ${conf} || die "configure failed" |
| 106 |
+ tc-export PKG_CONFIG |
| 107 |
+ if use unicode; then |
| 108 |
+ sed -i -e 's|-lncurses|`\\$(PKG_CONFIG) --libs ncursesw`|' configure || die |
| 109 |
+ else |
| 110 |
+ sed -i -e 's|-lncurses|`\\$(PKG_CONFIG) --libs ncurses`|' configure || die |
| 111 |
+ fi |
| 112 |
+ |
| 113 |
+ # perl script, not autotools based |
| 114 |
+ ./configure --prefix="${EPREFIX}/usr" || die |
| 115 |
} |
| 116 |
|
| 117 |
src_compile() { |
| 118 |
- emake CC="$(tc-getCC)" EXTRA_CFLAGS="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}" || die "emake failed" |
| 119 |
+ emake \ |
| 120 |
+ CC="$(tc-getCC)" \ |
| 121 |
+ EXTRA_CFLAGS="${CFLAGS}" \ |
| 122 |
+ EXTRA_LDFLAGS="${LDFLAGS}" |
| 123 |
} |
| 124 |
|
| 125 |
src_install() { |
| 126 |
- emake PREFIX="${ED}/usr" install || die "make install failed" |
| 127 |
+ emake PREFIX="${ED}/usr" install |
| 128 |
|
| 129 |
dodoc AUTHOR Changelog CREDITS README README.de README.patching |
| 130 |
} |
Archives