Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Christian Ruppert (idl0r)" <idl0r@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-proxy/haproxy: metadata.xml haproxy-1.5.6.ebuild haproxy-9999.ebuild ChangeLog
Date: Thu, 30 Oct 2014 21:37:36
Message-Id: 20141030213730.715359191@oystercatcher.gentoo.org
1 idl0r 14/10/30 21:37:30
2
3 Modified: metadata.xml haproxy-1.5.6.ebuild
4 haproxy-9999.ebuild ChangeLog
5 Log:
6 Fix live ebuild. Add separate USE-flag for JIT and also fix the libpcre depend
7
8 (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key B427ABC8)
9
10 Revision Changes Path
11 1.5 net-proxy/haproxy/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/metadata.xml?rev=1.5&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/metadata.xml?rev=1.5&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/metadata.xml?r1=1.4&r2=1.5
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/metadata.xml,v
20 retrieving revision 1.4
21 retrieving revision 1.5
22 diff -u -r1.4 -r1.5
23 --- metadata.xml 17 Sep 2013 12:30:09 -0000 1.4
24 +++ metadata.xml 30 Oct 2014 21:37:30 -0000 1.5
25 @@ -20,6 +20,7 @@
26 Its event-driven architecture allows it to easily handle thousands of simultaneous connections on hundreds of instances without risking the system's stability.
27 </longdescription>
28 <use>
29 - <flag name='tools'>Install additional tools (halog, iprange).</flag>
30 + <flag name="pcre-jit">Use JIT support for PCRE</flag>
31 + <flag name="tools">Install additional tools (halog, iprange)</flag>
32 </use>
33 </pkgmetadata>
34
35
36
37 1.2 net-proxy/haproxy/haproxy-1.5.6.ebuild
38
39 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild?rev=1.2&view=markup
40 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild?rev=1.2&content-type=text/plain
41 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild?r1=1.1&r2=1.2
42
43 Index: haproxy-1.5.6.ebuild
44 ===================================================================
45 RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild,v
46 retrieving revision 1.1
47 retrieving revision 1.2
48 diff -u -r1.1 -r1.2
49 --- haproxy-1.5.6.ebuild 19 Oct 2014 09:11:44 -0000 1.1
50 +++ haproxy-1.5.6.ebuild 30 Oct 2014 21:37:30 -0000 1.2
51 @@ -1,6 +1,6 @@
52 # Copyright 1999-2014 Gentoo Foundation
53 # Distributed under the terms of the GNU General Public License v2
54 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild,v 1.1 2014/10/19 09:11:44 idl0r Exp $
55 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-1.5.6.ebuild,v 1.2 2014/10/30 21:37:30 idl0r Exp $
56
57 EAPI="5"
58
59 @@ -15,9 +15,11 @@
60 LICENSE="GPL-2 LGPL-2.1"
61 SLOT="0"
62 KEYWORDS="~amd64 ~ppc ~x86"
63 -IUSE="+crypt examples +pcre ssl tools vim-syntax +zlib"
64 +IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
65
66 -DEPEND="pcre? ( dev-libs/libpcre )
67 +DEPEND="pcre? ( dev-libs/libpcre
68 + pcre-jit? ( dev-libs/libpcre[jit] )
69 + )
70 ssl? ( dev-libs/openssl[zlib?] )
71 zlib? ( sys-libs/zlib )"
72 RDEPEND="${DEPEND}"
73 @@ -31,7 +33,7 @@
74
75 src_prepare() {
76 sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
77 - > contrib/systemd/haproxy.service || die
78 + > contrib/systemd/haproxy.service || die
79
80 sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
81 }
82 @@ -40,7 +42,12 @@
83 local args="TARGET=linux2628 USE_GETADDRINFO=1"
84
85 if use pcre ; then
86 - args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
87 + args="${args} USE_PCRE=1"
88 + if use pcre-jit; then
89 + args="${args} USE_PCRE_JIT=1"
90 + else
91 + args="${args} USE_PCRE_JIT="
92 + fi
93 else
94 args="${args} USE_PCRE= USE_PCRE_JIT="
95 fi
96
97
98
99 1.3 net-proxy/haproxy/haproxy-9999.ebuild
100
101 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild?rev=1.3&view=markup
102 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild?rev=1.3&content-type=text/plain
103 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild?r1=1.2&r2=1.3
104
105 Index: haproxy-9999.ebuild
106 ===================================================================
107 RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v
108 retrieving revision 1.2
109 retrieving revision 1.3
110 diff -u -r1.2 -r1.3
111 --- haproxy-9999.ebuild 17 Sep 2013 12:30:09 -0000 1.2
112 +++ haproxy-9999.ebuild 30 Oct 2014 21:37:30 -0000 1.3
113 @@ -1,6 +1,6 @@
114 -# Copyright 1999-2013 Gentoo Foundation
115 +# Copyright 1999-2014 Gentoo Foundation
116 # Distributed under the terms of the GNU General Public License v2
117 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v 1.2 2013/09/17 12:30:09 tomwij Exp $
118 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/haproxy-9999.ebuild,v 1.3 2014/10/30 21:37:30 idl0r Exp $
119
120 EAPI="5"
121
122 @@ -15,9 +15,11 @@
123 LICENSE="GPL-2 LGPL-2.1"
124 SLOT="0"
125 KEYWORDS=""
126 -IUSE="+crypt examples +pcre ssl tools vim-syntax +zlib"
127 +IUSE="+crypt examples +pcre pcre-jit ssl tools vim-syntax +zlib"
128
129 -DEPEND="pcre? ( dev-libs/libpcre )
130 +DEPEND="pcre? ( dev-libs/libpcre
131 + pcre-jit? ( dev-libs/libpcre[jit] )
132 + )
133 ssl? ( dev-libs/openssl[zlib?] )
134 zlib? ( sys-libs/zlib )"
135 RDEPEND="${DEPEND}"
136 @@ -30,15 +32,22 @@
137 }
138
139 src_prepare() {
140 - sed -e 's:@SBINDIR@:'/usr/sbin':' contrib/systemd/haproxy.service.in \
141 - > contrib/systemd/haproxy.service || die
142 + sed -e 's:@SBINDIR@:'/usr/bin':' contrib/systemd/haproxy.service.in \
143 + > contrib/systemd/haproxy.service || die
144 +
145 + sed -ie 's:/usr/sbin/haproxy:/usr/bin/haproxy:' src/haproxy-systemd-wrapper.c || die
146 }
147
148 src_compile() {
149 local args="TARGET=linux2628 USE_GETADDRINFO=1"
150
151 if use pcre ; then
152 - args="${args} USE_PCRE=1 USE_PCRE_JIT=1"
153 + args="${args} USE_PCRE=1"
154 + if use pcre-jit; then
155 + args="${args} USE_PCRE_JIT=1"
156 + else
157 + args="${args} USE_PCRE_JIT="
158 + fi
159 else
160 args="${args} USE_PCRE= USE_PCRE_JIT="
161 fi
162 @@ -68,14 +77,14 @@
163 fi
164
165 # For now, until the strict-aliasing breakage will be fixed
166 -# append-cflags -fno-strict-aliasing
167 + append-cflags -fno-strict-aliasing
168
169 emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
170
171 if use tools ; then
172 for contrib in halog iprange ; do
173 emake -C contrib/${contrib} \
174 - CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
175 + CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args}
176 done
177 fi
178 }
179 @@ -88,10 +97,10 @@
180 # Don't install useless files
181 # rm examples/build.cfg doc/*gpl.txt
182
183 - dodoc CHANGELOG ROADMAP TODO doc/{configuration,haproxy-en}.txt
184 + dodoc CHANGELOG ROADMAP doc/{configuration,haproxy-en}.txt
185 doman doc/haproxy.1
186
187 - dosbin haproxy-systemd-wrapper
188 + dobin haproxy-systemd-wrapper
189 systemd_dounit contrib/systemd/haproxy.service
190
191 if use tools ; then
192
193
194
195 1.109 net-proxy/haproxy/ChangeLog
196
197 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/ChangeLog?rev=1.109&view=markup
198 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/ChangeLog?rev=1.109&content-type=text/plain
199 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-proxy/haproxy/ChangeLog?r1=1.108&r2=1.109
200
201 Index: ChangeLog
202 ===================================================================
203 RCS file: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v
204 retrieving revision 1.108
205 retrieving revision 1.109
206 diff -u -r1.108 -r1.109
207 --- ChangeLog 19 Oct 2014 09:11:44 -0000 1.108
208 +++ ChangeLog 30 Oct 2014 21:37:30 -0000 1.109
209 @@ -1,6 +1,11 @@
210 # ChangeLog for net-proxy/haproxy
211 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
212 -# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.108 2014/10/19 09:11:44 idl0r Exp $
213 +# $Header: /var/cvsroot/gentoo-x86/net-proxy/haproxy/ChangeLog,v 1.109 2014/10/30 21:37:30 idl0r Exp $
214 +
215 + 30 Oct 2014; Christian Ruppert <idl0r@g.o> haproxy-1.5.6.ebuild,
216 + haproxy-9999.ebuild, metadata.xml:
217 + Fix live ebuild. Add separate USE-flag for JIT and also fix the libpcre
218 + depend
219
220 *haproxy-1.5.6 (19 Oct 2014)
Report Message
Find on MARC Find on Google Groups