Gentoo Archives: gentoo-commits

From: "Steve Arnold (nerdboy)" <nerdboy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/aspell: ChangeLog aspell-0.60.6.1.ebuild
Date: Tue, 11 Feb 2014 06:47:15
Message-Id: 20140211064709.3DD002004C@flycatcher.gentoo.org
1 nerdboy 14/02/11 06:47:09
2
3 Modified: ChangeLog aspell-0.60.6.1.ebuild
4 Log:
5 Added fixes for bug #467602 and ncurses link issue when USE=tinfo.
6
7 (Portage version: 2.2.8/cvs/Linux x86_64, signed Manifest commit with key )
8
9 Revision Changes Path
10 1.145 app-text/aspell/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/ChangeLog?rev=1.145&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/ChangeLog?rev=1.145&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/ChangeLog?r1=1.144&r2=1.145
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v
19 retrieving revision 1.144
20 retrieving revision 1.145
21 diff -u -r1.144 -r1.145
22 --- ChangeLog 5 Jan 2014 11:33:24 -0000 1.144
23 +++ ChangeLog 11 Feb 2014 06:47:09 -0000 1.145
24 @@ -1,6 +1,9 @@
25 # ChangeLog for app-text/aspell
26 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.144 2014/01/05 11:33:24 pacho Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.145 2014/02/11 06:47:09 nerdboy Exp $
29 +
30 + 11 Feb 2014; Steve Arnold <nerdboy@g.o> aspell-0.60.6.1.ebuild:
31 + Added fixes for bug #467602 and ncurses link issue when USE=tinfo.
32
33 05 Jan 2014; Pacho Ramos <pacho@g.o> metadata.xml:
34 Cleanup due http://gentoo.2317880.n4.nabble.com/app-dicts-herd-is-empty-
35
36
37
38 1.12 app-text/aspell/aspell-0.60.6.1.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild?rev=1.12&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild?rev=1.12&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild?r1=1.11&r2=1.12
43
44 Index: aspell-0.60.6.1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v
47 retrieving revision 1.11
48 retrieving revision 1.12
49 diff -u -r1.11 -r1.12
50 --- aspell-0.60.6.1.ebuild 2 Jan 2014 18:06:54 -0000 1.11
51 +++ aspell-0.60.6.1.ebuild 11 Feb 2014 06:47:09 -0000 1.12
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2014 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.11 2014/01/02 18:06:54 vapier Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.12 2014/02/11 06:47:09 nerdboy Exp $
57
58 EAPI=4
59
60 @@ -44,7 +44,12 @@
61 !=app-dicts/aspell-en-0.5*"
62
63 src_prepare() {
64 - #epatch "${FILESDIR}/${PN}-0.60.3-templateinstantiations.patch"
65 + # fix for bug #467602
66 + if has_version ">=sys-devel/automake-1.13" ; then
67 + sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \
68 + "${S}"/configure.ac || die "sed failed"
69 + fi
70 +
71 epatch "${FILESDIR}/${PN}-0.60.5-nls.patch"
72 epatch "${FILESDIR}/${PN}-0.60.5-solaris.patch"
73 epatch "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch"
74 @@ -58,10 +63,20 @@
75 # This has to be after automake has run so that we don't clobber
76 # the default target that automake creates for us.
77 echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in
78 +
79 }
80
81 src_configure() {
82 - econf \
83 + # if ncurses is built with separate tinfo libs, then...
84 + if built_with_use sys-libs/ncurses tinfo ; then
85 + if built_with_use sys-libs/ncurses unicode ; then
86 + CURSES_LIB="-lncursesw -ltinfow"
87 + else
88 + CURSES_LIB="-lncurses -ltinfo"
89 + fi
90 + fi
91 +
92 + CURSES_LIB="${CURSES_LIB}" econf \
93 $(use_enable nls) \
94 --disable-static \
95 --sysconfdir="${EPREFIX}"/etc/aspell \