1 |
mr_bones_ 14/02/11 15:56:58 |
2 |
|
3 |
Modified: aspell-0.60.6.1.ebuild ChangeLog |
4 |
Log: |
5 |
use has_version instead of built_with_use |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit) |
8 |
|
9 |
Revision Changes Path |
10 |
1.13 app-text/aspell/aspell-0.60.6.1.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild?rev=1.13&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild?rev=1.13&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild?r1=1.12&r2=1.13 |
15 |
|
16 |
Index: aspell-0.60.6.1.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v |
19 |
retrieving revision 1.12 |
20 |
retrieving revision 1.13 |
21 |
diff -u -r1.12 -r1.13 |
22 |
--- aspell-0.60.6.1.ebuild 11 Feb 2014 06:47:09 -0000 1.12 |
23 |
+++ aspell-0.60.6.1.ebuild 11 Feb 2014 15:56:58 -0000 1.13 |
24 |
@@ -1,9 +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-text/aspell/aspell-0.60.6.1.ebuild,v 1.12 2014/02/11 06:47:09 nerdboy Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/aspell-0.60.6.1.ebuild,v 1.13 2014/02/11 15:56:58 mr_bones_ Exp $ |
29 |
|
30 |
EAPI=4 |
31 |
- |
32 |
inherit libtool eutils flag-o-matic autotools |
33 |
|
34 |
DESCRIPTION="A spell checker replacement for ispell" |
35 |
@@ -47,12 +46,13 @@ |
36 |
# fix for bug #467602 |
37 |
if has_version ">=sys-devel/automake-1.13" ; then |
38 |
sed -i -e 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' \ |
39 |
- "${S}"/configure.ac || die "sed failed" |
40 |
+ "${S}"/configure.ac || die |
41 |
fi |
42 |
|
43 |
- epatch "${FILESDIR}/${PN}-0.60.5-nls.patch" |
44 |
- epatch "${FILESDIR}/${PN}-0.60.5-solaris.patch" |
45 |
- epatch "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" |
46 |
+ epatch \ |
47 |
+ "${FILESDIR}/${PN}-0.60.5-nls.patch" \ |
48 |
+ "${FILESDIR}/${PN}-0.60.5-solaris.patch" \ |
49 |
+ "${FILESDIR}/${PN}-0.60.6-darwin-bundles.patch" |
50 |
|
51 |
rm m4/lt* m4/libtool.m4 |
52 |
eautoreconf |
53 |
@@ -62,14 +62,14 @@ |
54 |
# https://lists.gnu.org/archive/html/libtool/2011-03/msg00003.html |
55 |
# This has to be after automake has run so that we don't clobber |
56 |
# the default target that automake creates for us. |
57 |
- echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in |
58 |
+ echo 'install-filterLTLIBRARIES: install-libLTLIBRARIES' >> Makefile.in || die |
59 |
|
60 |
} |
61 |
|
62 |
src_configure() { |
63 |
# if ncurses is built with separate tinfo libs, then... |
64 |
- if built_with_use sys-libs/ncurses tinfo ; then |
65 |
- if built_with_use sys-libs/ncurses unicode ; then |
66 |
+ if has_version "sys-libs/ncurses[tinfo]" ; then |
67 |
+ if has_version "sys-libs/ncurses[unicode]" ; then |
68 |
CURSES_LIB="-lncursesw -ltinfow" |
69 |
else |
70 |
CURSES_LIB="-lncurses -ltinfo" |
71 |
|
72 |
|
73 |
|
74 |
1.146 app-text/aspell/ChangeLog |
75 |
|
76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/ChangeLog?rev=1.146&view=markup |
77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/ChangeLog?rev=1.146&content-type=text/plain |
78 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/aspell/ChangeLog?r1=1.145&r2=1.146 |
79 |
|
80 |
Index: ChangeLog |
81 |
=================================================================== |
82 |
RCS file: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v |
83 |
retrieving revision 1.145 |
84 |
retrieving revision 1.146 |
85 |
diff -u -r1.145 -r1.146 |
86 |
--- ChangeLog 11 Feb 2014 06:47:09 -0000 1.145 |
87 |
+++ ChangeLog 11 Feb 2014 15:56:58 -0000 1.146 |
88 |
@@ -1,6 +1,9 @@ |
89 |
# ChangeLog for app-text/aspell |
90 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
91 |
-# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.145 2014/02/11 06:47:09 nerdboy Exp $ |
92 |
+# $Header: /var/cvsroot/gentoo-x86/app-text/aspell/ChangeLog,v 1.146 2014/02/11 15:56:58 mr_bones_ Exp $ |
93 |
+ |
94 |
+ 11 Feb 2014; Michael Sterrett <mr_bones_@g.o> aspell-0.60.6.1.ebuild: |
95 |
+ use has_version instead of built_with_use |
96 |
|
97 |
11 Feb 2014; Steve Arnold <nerdboy@g.o> aspell-0.60.6.1.ebuild: |
98 |
Added fixes for bug #467602 and ncurses link issue when USE=tinfo. |