Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in app-text/an: ChangeLog an-0.95.3.ebuild
Date: Tue, 25 Jan 2011 02:51:10
Message-Id: 20110125025058.EEE3520057@flycatcher.gentoo.org
1 jer 11/01/25 02:50:58
2
3 Modified: ChangeLog an-0.95.3.ebuild
4 Log:
5 Clean up patches. Fix phases, remove ebegin/eend, make sed die().
6
7 (Portage version: 2.2.0_alpha19/cvs/Linux i686)
8
9 Revision Changes Path
10 1.28 app-text/an/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/an/ChangeLog?rev=1.28&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/an/ChangeLog?rev=1.28&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/an/ChangeLog?r1=1.27&r2=1.28
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/app-text/an/ChangeLog,v
19 retrieving revision 1.27
20 retrieving revision 1.28
21 diff -u -r1.27 -r1.28
22 --- ChangeLog 27 Jun 2010 20:34:25 -0000 1.27
23 +++ ChangeLog 25 Jan 2011 02:50:58 -0000 1.28
24 @@ -1,6 +1,10 @@
25 # ChangeLog for app-text/an
26 -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/app-text/an/ChangeLog,v 1.27 2010/06/27 20:34:25 jer Exp $
28 +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
29 +# $Header: /var/cvsroot/gentoo-x86/app-text/an/ChangeLog,v 1.28 2011/01/25 02:50:58 jer Exp $
30 +
31 + 25 Jan 2011; Jeroen Roovers <jer@g.o> an-0.95.3.ebuild,
32 + files/an-0.95-make.patch, files/an_0.95-3.diff:
33 + Clean up patches. Fix phases, remove ebegin/eend, make sed die().
34
35 *an-0.95.3.2 (27 Jun 2010)
36
37
38
39
40 1.18 app-text/an/an-0.95.3.ebuild
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/an/an-0.95.3.ebuild?rev=1.18&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/an/an-0.95.3.ebuild?rev=1.18&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-text/an/an-0.95.3.ebuild?r1=1.17&r2=1.18
45
46 Index: an-0.95.3.ebuild
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/app-text/an/an-0.95.3.ebuild,v
49 retrieving revision 1.17
50 retrieving revision 1.18
51 diff -u -r1.17 -r1.18
52 --- an-0.95.3.ebuild 7 Mar 2009 14:11:06 -0000 1.17
53 +++ an-0.95.3.ebuild 25 Jan 2011 02:50:58 -0000 1.18
54 @@ -1,8 +1,9 @@
55 -# Copyright 1999-2009 Gentoo Foundation
56 +# Copyright 1999-2011 Gentoo Foundation
57 # Distributed under the terms of the GNU General Public License v2
58 -# $Header: /var/cvsroot/gentoo-x86/app-text/an/an-0.95.3.ebuild,v 1.17 2009/03/07 14:11:06 gentoofan23 Exp $
59 +# $Header: /var/cvsroot/gentoo-x86/app-text/an/an-0.95.3.ebuild,v 1.18 2011/01/25 02:50:58 jer Exp $
60
61 EAPI="2"
62 +
63 inherit eutils toolchain-funcs versionator
64
65 DESCRIPTION="Very fast anagram generator with dictionary lookup"
66 @@ -20,24 +21,19 @@
67
68 S="${WORKDIR}/${PN}-${MY_PV}"
69
70 -src_unpack() {
71 - unpack ${A}
72 - cd ${S}
73 -
74 +src_prepare() {
75 # Patching to -r3:
76 MY_PL="$(replace_version_separator 2 -)"
77 epatch "${FILESDIR}"/${PN}_${MY_PL}.diff
78
79 - ebegin "Patching an to use toolchain and custom CFLAGS"
80 sed -e "s:gcc:$(tc-getCC):" \
81 -e "s:-O2.*:${CFLAGS}:" \
82 - -i Makefile lib/Makefile
83 - eend ${?}
84 + -i Makefile lib/Makefile || die "sed Makefile lib/Makefile"
85
86 # sys-apps/miscfiles doesn't have /usr/dict/words:
87 sed \
88 -e 's:/usr/dict/words:/usr/share/dict/words:' \
89 - -i README || die
90 + -i README || die "sed README"
91 }
92
93 src_install() {