Gentoo Archives: gentoo-commits

From: "Christoph Junghans (ottxor)" <ottxor@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-irc/ninja: ninja-1.5.9_pre14.ebuild ninja-1.5.9_pre14-r1.ebuild ChangeLog
Date: Sun, 30 Dec 2012 23:51:25
Message-Id: 20121230235112.E9E6F2171D@flycatcher.gentoo.org
1 ottxor 12/12/30 23:51:12
2
3 Modified: ninja-1.5.9_pre14.ebuild ChangeLog
4 Added: ninja-1.5.9_pre14-r1.ebuild
5 Log:
6 fix collision with dev-util/ninja (bug #436804)
7
8 (Portage version: 2.2.0_alpha149/cvs/Linux x86_64, signed Manifest commit with key C2000586)
9
10 Revision Changes Path
11 1.6 net-irc/ninja/ninja-1.5.9_pre14.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14.ebuild?rev=1.6&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14.ebuild?rev=1.6&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14.ebuild?r1=1.5&r2=1.6
16
17 Index: ninja-1.5.9_pre14.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14.ebuild,v
20 retrieving revision 1.5
21 retrieving revision 1.6
22 diff -u -r1.5 -r1.6
23 --- ninja-1.5.9_pre14.ebuild 23 Sep 2009 18:45:04 -0000 1.5
24 +++ ninja-1.5.9_pre14.ebuild 30 Dec 2012 23:51:12 -0000 1.6
25 @@ -1,6 +1,6 @@
26 -# Copyright 1999-2009 Gentoo Foundation
27 +# Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14.ebuild,v 1.5 2009/09/23 18:45:04 patrick Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14.ebuild,v 1.6 2012/12/30 23:51:12 ottxor Exp $
31
32 S=${WORKDIR}/${P/_*/}
33
34 @@ -15,7 +15,9 @@
35 RESTRICT="test"
36
37 DEPEND="ncurses? ( sys-libs/ncurses )
38 - ssl? ( dev-libs/openssl )"
39 + ssl? ( dev-libs/openssl )
40 + !dev-util/ninja" #436804
41 +RDEPEND="${DEPEND}"
42
43 MAKEOPTS="${MAKEOPTS} -j1"
44
45
46
47
48 1.21 net-irc/ninja/ChangeLog
49
50 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ninja/ChangeLog?rev=1.21&view=markup
51 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ninja/ChangeLog?rev=1.21&content-type=text/plain
52 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ninja/ChangeLog?r1=1.20&r2=1.21
53
54 Index: ChangeLog
55 ===================================================================
56 RCS file: /var/cvsroot/gentoo-x86/net-irc/ninja/ChangeLog,v
57 retrieving revision 1.20
58 retrieving revision 1.21
59 diff -u -r1.20 -r1.21
60 --- ChangeLog 23 Sep 2009 18:45:04 -0000 1.20
61 +++ ChangeLog 30 Dec 2012 23:51:12 -0000 1.21
62 @@ -1,6 +1,12 @@
63 # ChangeLog for net-irc/ninja
64 -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
65 -# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ChangeLog,v 1.20 2009/09/23 18:45:04 patrick Exp $
66 +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
67 +# $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ChangeLog,v 1.21 2012/12/30 23:51:12 ottxor Exp $
68 +
69 +*ninja-1.5.9_pre14-r1 (30 Dec 2012)
70 +
71 + 30 Dec 2012; Christoph Junghans <ottxor@g.o>
72 + +ninja-1.5.9_pre14-r1.ebuild, ninja-1.5.9_pre14.ebuild:
73 + fix collision with dev-util/ninja (bug #436804)
74
75 23 Sep 2009; Patrick Lauer <patrick@g.o> ninja-1.5.9_pre14.ebuild:
76 Remove virtual/libc
77
78
79
80 1.1 net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild?rev=1.1&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild?rev=1.1&content-type=text/plain
84
85 Index: ninja-1.5.9_pre14-r1.ebuild
86 ===================================================================
87 # Copyright 1999-2012 Gentoo Foundation
88 # Distributed under the terms of the GNU General Public License v2
89 # $Header: /var/cvsroot/gentoo-x86/net-irc/ninja/ninja-1.5.9_pre14-r1.ebuild,v 1.1 2012/12/30 23:51:12 ottxor Exp $
90
91 EAPI=5
92
93 S=${WORKDIR}/${P/_*/}
94
95 DESCRIPTION="Ninja IRC Client"
96 HOMEPAGE="http://ninja.qoop.org/"
97 SRC_URI="ftp://qoop.org/ninja/stable/${P/_/}.tar.gz"
98 SLOT="0"
99 LICENSE="GPL-2"
100 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
101 IUSE="ncurses ipv6 ssl"
102
103 RESTRICT="test"
104
105 DEPEND="ncurses? ( sys-libs/ncurses )
106 ssl? ( dev-libs/openssl )"
107 RDEPEND="${DEPEND}"
108
109 MAKEOPTS="${MAKEOPTS} -j1"
110
111 src_configure() {
112 econf $(use_enable ipv6)
113 }
114
115 src_install() {
116 default
117 mv "${ED}"/usr/bin/ninja{,_irc} || die #436804
118 }