Gentoo Archives: gentoo-commits

From: "Jeroen Roovers (jer)" <jer@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-irc/bitchx: ChangeLog bitchx-1.2.ebuild
Date: Mon, 28 Jan 2013 19:32:22
Message-Id: 20130128193219.826772171D@flycatcher.gentoo.org
1 jer 13/01/28 19:32:19
2
3 Modified: ChangeLog bitchx-1.2.ebuild
4 Log:
5 Do not remove "duplicate" CFLAGS args. Respect LDFLAGS.
6
7 (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key A792A613)
8
9 Revision Changes Path
10 1.73 net-irc/bitchx/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/bitchx/ChangeLog?rev=1.73&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/bitchx/ChangeLog?rev=1.73&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/bitchx/ChangeLog?r1=1.72&r2=1.73
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v
19 retrieving revision 1.72
20 retrieving revision 1.73
21 diff -u -r1.72 -r1.73
22 --- ChangeLog 28 Jan 2013 17:06:32 -0000 1.72
23 +++ ChangeLog 28 Jan 2013 19:32:19 -0000 1.73
24 @@ -1,6 +1,10 @@
25 # ChangeLog for net-irc/bitchx
26 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.72 2013/01/28 17:06:32 jer Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/ChangeLog,v 1.73 2013/01/28 19:32:19 jer Exp $
29 +
30 + 28 Jan 2013; Jeroen Roovers <jer@g.o> bitchx-1.2.ebuild,
31 + files/bitchx-1.2-build.patch:
32 + Do not remove "duplicate" CFLAGS args. Respect LDFLAGS.
33
34 28 Jan 2013; Jeroen Roovers <jer@g.o> bitchx-1.2.ebuild:
35 Restore missing keywords (bug #425634). Fix quoting issue.
36
37
38
39 1.3 net-irc/bitchx/bitchx-1.2.ebuild
40
41 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/bitchx/bitchx-1.2.ebuild?rev=1.3&view=markup
42 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/bitchx/bitchx-1.2.ebuild?rev=1.3&content-type=text/plain
43 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/bitchx/bitchx-1.2.ebuild?r1=1.2&r2=1.3
44
45 Index: bitchx-1.2.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.2.ebuild,v
48 retrieving revision 1.2
49 retrieving revision 1.3
50 diff -u -r1.2 -r1.3
51 --- bitchx-1.2.ebuild 28 Jan 2013 17:06:32 -0000 1.2
52 +++ bitchx-1.2.ebuild 28 Jan 2013 19:32:19 -0000 1.3
53 @@ -1,10 +1,10 @@
54 # Copyright 1999-2013 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.2.ebuild,v 1.2 2013/01/28 17:06:32 jer Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/net-irc/bitchx/bitchx-1.2.ebuild,v 1.3 2013/01/28 19:32:19 jer Exp $
58
59 EAPI=4
60
61 -inherit flag-o-matic eutils
62 +inherit autotools eutils flag-o-matic
63
64 MY_PN=BitchX
65 MY_P=${MY_PN}-${PV}-final
66 @@ -25,12 +25,17 @@
67 src_prepare() {
68 sed -i \
69 -e "s/#undef LATIN1/#define LATIN1 ON/;" \
70 - include/config.h
71 + include/config.h || die
72
73 epatch "${FILESDIR}"/${P}-build.patch
74 # Do epatch_user since even BX-1.2 has A LOT of patches and A LOT
75 # of behaviour controlled by manually editing config.h
76 epatch_user
77 +
78 + sed -i \
79 + -e 's|$(SHLIB_LD)|& $(LDFLAGS)|g' \
80 + dll/*/Makefile.in || die
81 + eautoreconf
82 }
83
84 src_configure() {