Gentoo Archives: gentoo-commits

From: "Tiziano Mueller (dev-zero)" <dev-zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-util/imediff2: imediff2-1.1.2-r2.ebuild ChangeLog
Date: Wed, 06 Jun 2012 08:49:18
Message-Id: 20120606084901.A5BD32004B@flycatcher.gentoo.org
1 dev-zero 12/06/06 08:49:01
2
3 Modified: ChangeLog
4 Added: imediff2-1.1.2-r2.ebuild
5 Log:
6 Use EAPI-4, set shebang (bug #326097).
7
8 (Portage version: 2.1.10.56/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.6 dev-util/imediff2/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/imediff2/ChangeLog?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/imediff2/ChangeLog?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/imediff2/ChangeLog?r1=1.5&r2=1.6
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/dev-util/imediff2/ChangeLog,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- ChangeLog 5 Apr 2011 05:29:51 -0000 1.5
24 +++ ChangeLog 6 Jun 2012 08:49:01 -0000 1.6
25 @@ -1,6 +1,11 @@
26 # ChangeLog for dev-util/imediff2
27 -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/dev-util/imediff2/ChangeLog,v 1.5 2011/04/05 05:29:51 ulm Exp $
29 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
30 +# $Header: /var/cvsroot/gentoo-x86/dev-util/imediff2/ChangeLog,v 1.6 2012/06/06 08:49:01 dev-zero Exp $
31 +
32 +*imediff2-1.1.2-r2 (06 Jun 2012)
33 +
34 + 06 Jun 2012; Tiziano Müller <dev-zero@g.o> +imediff2-1.1.2-r2.ebuild:
35 + Use EAPI-4, set shebang (bug #326097).
36
37 05 Apr 2011; Ulrich Mueller <ulm@g.o> imediff2-1.1.2-r1.ebuild:
38 Depend on dev-lang/python because virtual/python will go away, bug 358849.
39
40
41
42 1.1 dev-util/imediff2/imediff2-1.1.2-r2.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/imediff2/imediff2-1.1.2-r2.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/imediff2/imediff2-1.1.2-r2.ebuild?rev=1.1&content-type=text/plain
46
47 Index: imediff2-1.1.2-r2.ebuild
48 ===================================================================
49 # Copyright 1999-2012 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/dev-util/imediff2/imediff2-1.1.2-r2.ebuild,v 1.1 2012/06/06 08:49:01 dev-zero Exp $
52
53 EAPI="4"
54
55 PYTHON_DEPEND="2"
56 PYTHON_USE_WITH="ncurses"
57
58 inherit python versionator
59
60 MY_P=${PN}_$(replace_version_separator 3 -)
61
62 DESCRIPTION="An interactive, user friendly 2-way merge tool in text mode."
63 HOMEPAGE="http://elonen.iki.fi/code/imediff/"
64 SRC_URI="mirror://debian/pool/main/i/${PN}/${MY_P}.orig.tar.gz"
65
66 LICENSE="GPL-2"
67 SLOT="0"
68 KEYWORDS="~amd64 ~x86"
69 IUSE=""
70
71 DEPEND="dev-lang/python[ncurses]"
72 RDEPEND="${DEPEND}"
73
74 S=${WORKDIR}/${PN}
75
76 pkg_setup() {
77 python_set_active_version 2
78 python_pkg_setup
79 }
80
81 src_prepare() {
82 python_convert_shebangs 2 imediff2
83 }
84
85 src_compile() {
86 # Otherwise the docs get regenerated :)
87 :
88 }
89
90 src_install() {
91 dobin imediff2
92 dodoc AUTHORS README
93 doman imediff2.1
94 }