Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/coccinelle: ChangeLog coccinelle-1.0.0_rc14.ebuild
Date: Fri, 03 Aug 2012 00:25:23
Message-Id: 20120803002452.DC3A62004B@flycatcher.gentoo.org
1 radhermit 12/08/03 00:24:52
2
3 Modified: ChangeLog coccinelle-1.0.0_rc14.ebuild
4 Log:
5 Fix configure method of looking for external tools (bug #429556).
6
7 (Portage version: 2.2.0_alpha120/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.22 dev-util/coccinelle/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/coccinelle/ChangeLog?rev=1.22&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/coccinelle/ChangeLog?rev=1.22&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/coccinelle/ChangeLog?r1=1.21&r2=1.22
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v
19 retrieving revision 1.21
20 retrieving revision 1.22
21 diff -u -r1.21 -r1.22
22 --- ChangeLog 1 Aug 2012 07:15:14 -0000 1.21
23 +++ ChangeLog 3 Aug 2012 00:24:52 -0000 1.22
24 @@ -1,6 +1,10 @@
25 # ChangeLog for dev-util/coccinelle
26 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.21 2012/08/01 07:15:14 radhermit Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/ChangeLog,v 1.22 2012/08/03 00:24:52 radhermit Exp $
29 +
30 + 03 Aug 2012; Tim Harder <radhermit@g.o> coccinelle-1.0.0_rc14.ebuild,
31 + +files/coccinelle-1.0.0_rc14-findtool.patch:
32 + Fix configure method of looking for external tools (bug #429556).
33
34 01 Aug 2012; Tim Harder <radhermit@g.o> -coccinelle-1.0.0_rc11.ebuild,
35 -files/coccinelle-1.0.0_rc7-parallel-make.patch:
36
37
38
39 1.2 dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild?rev=1.2&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild?rev=1.2&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild?r1=1.1&r2=1.2
44
45 Index: coccinelle-1.0.0_rc14.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild,v
48 retrieving revision 1.1
49 retrieving revision 1.2
50 diff -u -r1.1 -r1.2
51 --- coccinelle-1.0.0_rc14.ebuild 1 Aug 2012 07:12:04 -0000 1.1
52 +++ coccinelle-1.0.0_rc14.ebuild 3 Aug 2012 00:24:52 -0000 1.2
53 @@ -1,11 +1,11 @@
54 # Copyright 1999-2012 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild,v 1.1 2012/08/01 07:12:04 radhermit Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/dev-util/coccinelle/coccinelle-1.0.0_rc14.ebuild,v 1.2 2012/08/03 00:24:52 radhermit Exp $
58
59 EAPI="4"
60 PYTHON_DEPEND="python? 2"
61
62 -inherit multilib eutils python bash-completion-r1 elisp-common
63 +inherit multilib eutils python bash-completion-r1 elisp-common autotools
64
65 MY_P="${P/_/-}"
66 DESCRIPTION="Program matching and transformation engine"
67 @@ -59,6 +59,10 @@
68 sed -i -e "/export PYTHONPATH/s:\$COCCINELLE_HOME/python:$(python_get_sitedir):" \
69 scripts/spatch.sh.in || die
70 fi
71 +
72 + epatch "${FILESDIR}"/${P}-findtool.patch
73 + cp Makefile Makefile.orig || die
74 + eautoreconf
75 }
76
77 src_configure() {
78 @@ -71,6 +75,8 @@
79 sed -i -e "s:^LIBDIR=.*:LIBDIR=/usr/$(get_libdir)/ocaml/stublibs/:" \
80 -e "s:^SHAREDIR=.*:SHAREDIR=/usr/$(get_libdir)/ocaml/${PN}/:" \
81 Makefile.config || die
82 +
83 + cp Makefile.orig Makefile || die
84 }
85
86 src_compile() {