Gentoo Archives: gentoo-commits

From: "Anthony G. Basile (blueness)" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-libs/axtls: axtls-1.4.6-r1.ebuild ChangeLog
Date: Thu, 07 Jun 2012 00:13:39
Message-Id: 20120607001329.1787A2004B@flycatcher.gentoo.org
1 blueness 12/06/07 00:13:29
2
3 Modified: ChangeLog
4 Added: axtls-1.4.6-r1.ebuild
5 Log:
6 Fix crypto/bigint_impl.h so curl can build against axtls
7
8 (Portage version: 2.1.10.49/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.3 net-libs/axtls/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/ChangeLog?rev=1.3&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/ChangeLog?rev=1.3&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/ChangeLog?r1=1.2&r2=1.3
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v
20 retrieving revision 1.2
21 retrieving revision 1.3
22 diff -u -r1.2 -r1.3
23 --- ChangeLog 29 May 2012 07:47:36 -0000 1.2
24 +++ ChangeLog 7 Jun 2012 00:13:29 -0000 1.3
25 @@ -1,6 +1,16 @@
26 # ChangeLog for net-libs/axtls
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.2 2012/05/29 07:47:36 jer Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/ChangeLog,v 1.3 2012/06/07 00:13:29 blueness Exp $
30 +
31 +*axtls-1.4.6-r1 (07 Jun 2012)
32 +
33 + 07 Jun 2012; Anthony G. Basile <blueness@g.o> +axtls-1.4.6-r1.ebuild,
34 + +files/bigint_impl.h-add-missing-include.patch:
35 + Fix crypto/bigint_impl.h so curl can build against axtls
36 + https://sourceforge.net/tracker/?func=detail&aid=3515628&group_id=171217&atid
37 + =857113
38 + https://sourceforge.net/tracker/?func=detail&aid=3532467&group_id=171217&atid
39 + =857113
40
41 29 May 2012; Jeroen Roovers <jer@g.o> axtls-1.4.6.ebuild:
42 Marked ~hppa too.
43
44
45
46 1.1 net-libs/axtls/axtls-1.4.6-r1.ebuild
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/axtls-1.4.6-r1.ebuild?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/axtls/axtls-1.4.6-r1.ebuild?rev=1.1&content-type=text/plain
50
51 Index: axtls-1.4.6-r1.ebuild
52 ===================================================================
53 # Copyright 1999-2012 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 # $Header: /var/cvsroot/gentoo-x86/net-libs/axtls/axtls-1.4.6-r1.ebuild,v 1.1 2012/06/07 00:13:28 blueness Exp $
56
57 EAPI="4"
58
59 inherit eutils savedconfig toolchain-funcs user
60
61 ################################################################################
62 # axtls CONFIG MINI-HOWTO
63 #
64 # Note: axtls is highly configurable and uses mconf, like the linux kernel.
65 # You can configure it in a couple of ways:
66 #
67 # 1) USE="-savedconfig" and set/unset the remaining flags to obtain the features
68 # you want, and possibly a lot more.
69 #
70 # 2) You can create your own configuration file by doing
71 #
72 # FEATURES="keepwork" USE="savedconfig -*" emerge axtls
73 # cd /var/tmp/portage/net-libs/axtls*/work/axTLS
74 # make menuconfig
75 #
76 # Now configure axtls as you want. Finally save your config file:
77 #
78 # cp config/.config /etc/portage/savedconfig/net-libs/axtls-${PV}
79 #
80 # where ${PV} is the current version. You can then run emerge again with
81 # your configuration by doing
82 #
83 # USE="savedconfig" emerge axtls
84 #
85 ################################################################################
86
87 MY_PN=${PN/tls/TLS}
88
89 DESCRIPTION="Embedded client/server TLSv1 SSL library and small HTTP(S) server"
90 HOMEPAGE="http://axtls.sourceforge.net/"
91 SRC_URI="mirror://sourceforge/axtls/${MY_PN}-${PV}.tar.gz"
92 S="${WORKDIR}/${MY_PN}"
93
94 LICENSE="BSD"
95 SLOT="0"
96 KEYWORDS="~amd64 ~hppa ~x86"
97 IUSE="httpd cgi-lua cgi-php static doc"
98
99 # TODO: add ipv6, and c#, java, lua, perl bindings
100 # Currently these all have some issue
101 DEPEND="doc? ( app-doc/doxygen )"
102 RDEPEND="
103 httpd? (
104 cgi-lua? ( dev-lang/lua )
105 cgi-php? ( dev-lang/php[cgi] )
106 )"
107
108 #Note1: static, cgi-* makes no sense if httpd is not given
109 REQUIRED_USE="
110 static? ( httpd )
111 cgi-lua? ( httpd )
112 cgi-php? ( httpd )"
113
114 AXTLS_GROUP="axtls"
115 AXTLS_USER="axtls"
116
117 pkg_setup() {
118 use httpd && {
119 ebegin "Creating axtls user and group"
120 enewgroup ${AXTLS_GROUP}
121 enewuser ${AXTLS_USER} -1 -1 -1 ${AXTLS_GROUP}
122 }
123 }
124
125 src_prepare() {
126 tc-export CC
127
128 epatch "${FILESDIR}/bigint_impl.h-add-missing-include.patch"
129
130 #Use CC as the host compiler for mconf
131 sed -i -e "s:^HOSTCC.*:HOSTCC=${CC}:" \
132 "${S}"/config/Rules.mak
133
134 #We want CONFIG_DEBUG to avoid stripping
135 #but not for debugging info
136 sed -i -e 's: -g::' \
137 "${S}"/config/Rules.mak
138 sed -i -e 's: -g::' \
139 "${S}"/config/makefile.conf
140 }
141
142 use_flag_config() {
143 cp "${FILESDIR}"/config "${S}"/config/.config
144
145 #Respect CFLAGS/LDFLAGS
146 sed -i -e "s:^CONFIG_EXTRA_CFLAGS_OPTIONS.*$:CONFIG_EXTRA_CFLAGS_OPTIONS=\"${CFLAGS}\":" \
147 "${S}"/config/.config
148 sed -i -e "s:^CONFIG_EXTRA_LDFLAGS_OPTIONS.*$:CONFIG_EXTRA_LDFLAGS_OPTIONS=\"${LDLAGS}\":" \
149 "${S}"/config/.config
150
151 #The logic is that the default config file enables everything and we disable
152 #here with sed unless a USE flags says to keep it
153 if use httpd; then
154 if ! use static; then
155 sed -i -e 's:^CONFIG_HTTP_STATIC_BUILD:# CONFIG_HTTP_STATIC_BUILD:' \
156 "${S}"/config/.config
157 fi
158 if ! use cgi-php && ! use cgi-lua; then
159 sed -i -e 's:^CONFIG_HTTP_HAS_CGI:# CONFIG_HTTP_HAS_CGI:' \
160 "${S}"/config/.config
161 fi
162 if ! use cgi-php; then
163 sed -i -e 's:,.php::' "${S}"/config/.config
164 fi
165 if ! use cgi-lua; then
166 sed -i -e 's:\.lua,::' \
167 -e 's:lua:php:' \
168 -e 's:^CONFIG_HTTP_ENABLE_LUA:# CONFIG_HTTP_ENABLE_LUA:' \
169 "${S}"/config/.config
170 fi
171 else
172 sed -i -e 's:^CONFIG_AXHTTPD:# CONFIG_AXHTTPD:' \
173 "${S}"/config/.config
174 fi
175
176 yes "n" | emake -j1 oldconfig > /dev/null
177 }
178
179 src_configure() {
180 tc-export CC
181
182 if use savedconfig; then
183 restore_config config/.config
184 if [ -f config/.config ]; then
185 ewarn "Using saved config, all other USE flags ignored"
186 else
187 ewarn "No saved config, seeding with the default"
188 cp "${FILESDIR}"/config "${S}"/config/.config
189 fi
190 yes "" | emake -j1 oldconfig > /dev/null
191 else
192 use_flag_config
193 fi
194 }
195
196 src_compile() {
197 default
198 if use doc; then
199 emake docs
200 mv www README
201 fi
202 }
203
204 src_install() {
205 if use savedconfig; then
206 save_config config/.config
207 fi
208
209 emake PREFIX="${ED}/usr" install
210 if [ -f "${ED}"/usr/bin/htpasswd ]; then
211 mv "${ED}"/usr/bin/{,ax}htpasswd
212 fi
213
214 if use httpd; then
215 newinitd "${FILESDIR}"/axhttpd.initd axhttpd
216 newconfd "${FILESDIR}"/axhttpd.confd axhttpd
217 fi
218
219 docompress -x /usr/share/doc/${PF}/README
220 dodoc -r README
221
222 if use doc; then
223 dodoc -r docsrc/html
224 fi
225 }