Gentoo Archives: gentoo-commits

From: "JosA MarAa Alonso (nimiux)" <nimiux@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-irc/inspircd: ChangeLog inspircd-2.0.13.ebuild
Date: Wed, 28 Aug 2013 08:54:59
Message-Id: 20130828085451.D62D42004C@flycatcher.gentoo.org
1 nimiux 13/08/28 08:54:51
2
3 Modified: ChangeLog inspircd-2.0.13.ebuild
4 Log:
5 Fix USE flags wrt bug #481612 by El Goretto
6
7 (Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key D628E536)
8
9 Revision Changes Path
10 1.85 net-irc/inspircd/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/ChangeLog?rev=1.85&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/ChangeLog?rev=1.85&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/ChangeLog?r1=1.84&r2=1.85
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v
19 retrieving revision 1.84
20 retrieving revision 1.85
21 diff -u -r1.84 -r1.85
22 --- ChangeLog 7 Jul 2013 12:04:56 -0000 1.84
23 +++ ChangeLog 28 Aug 2013 08:54:51 -0000 1.85
24 @@ -1,6 +1,9 @@
25 # ChangeLog for net-irc/inspircd
26 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.84 2013/07/07 12:04:56 ago Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/ChangeLog,v 1.85 2013/08/28 08:54:51 nimiux Exp $
29 +
30 + 28 Aug 2013; Chema Alonso <nimiux@g.o> inspircd-2.0.13.ebuild:
31 + Fix USE flags wrt bug #481612 by El Goretto
32
33 07 Jul 2013; Agostino Sarubbo <ago@g.o> inspircd-2.0.13.ebuild:
34 Stable for x86, wrt bug #476066
35
36
37
38 1.4 net-irc/inspircd/inspircd-2.0.13.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/inspircd-2.0.13.ebuild?rev=1.4&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/inspircd-2.0.13.ebuild?rev=1.4&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-irc/inspircd/inspircd-2.0.13.ebuild?r1=1.3&r2=1.4
43
44 Index: inspircd-2.0.13.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.13.ebuild,v
47 retrieving revision 1.3
48 retrieving revision 1.4
49 diff -u -r1.3 -r1.4
50 --- inspircd-2.0.13.ebuild 7 Jul 2013 12:04:56 -0000 1.3
51 +++ inspircd-2.0.13.ebuild 28 Aug 2013 08:54:51 -0000 1.4
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2013 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.13.ebuild,v 1.3 2013/07/07 12:04:56 ago Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/net-irc/inspircd/inspircd-2.0.13.ebuild,v 1.4 2013/08/28 08:54:51 nimiux Exp $
57
58 EAPI=5
59
60 @@ -42,16 +42,25 @@
61
62 src_configure() {
63 local extras=""
64 + local essl="--enable-openssl"
65 + local egnutls="--enable-gnutls"
66 + local dipv6="--disable-ipv6"
67
68 use geoip && extras="${extras}m_geoip.cpp,"
69 + use gnutls && extras="${extras}m_ssl_gnutls.cpp,"
70 + use ipv6 && dipv6=""
71 use ldap && extras="${extras}m_ldapauth.cpp,m_ldapoper.cpp,"
72 use mysql && extras="${extras}m_mysql.cpp,"
73 use pcre && extras="${extras}m_regex_pcre.cpp,"
74 use posix && extras="${extras}m_regex_posix.cpp,"
75 use postgres && extras="${extras}m_pgsql.cpp,"
76 use sqlite && extras="${extras}m_sqlite3.cpp,"
77 + use ssl && extras="${extras}m_ssl_openssl.cpp,"
78 use tre && extras="${extras}m_regex_tre.cpp,"
79
80 + use !ssl && essl=""
81 + use !gnutls && egnutls=""
82 +
83 if [ -n "${extras}" ]; then
84 ./configure --disable-interactive --enable-extras=${extras}
85 fi
86 @@ -65,8 +74,7 @@
87 --log-dir="/var/log/${PN}" \
88 --binary-dir="/usr/bin" \
89 --module-dir="/usr/$(get_libdir)/${PN}/modules" \
90 - $(use_enable ssl openssl) $(use_enable gnutls) \
91 - $(use_enable ipv6)
92 + ${essl} ${egnutls} ${dipv6} || die
93 }
94
95 src_compile() {