1 |
floppym 14/02/10 03:00:12 |
2 |
|
3 |
Modified: litmus-0.13.ebuild metadata.xml ChangeLog |
4 |
Log: |
5 |
Allow >=net-libs/neon-30, bug 499732 by Arfrever. Also several other small changes from maintainer Bertrand Jacquin. |
6 |
|
7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.3 www-misc/litmus/litmus-0.13.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/litmus/litmus-0.13.ebuild?rev=1.3&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/litmus/litmus-0.13.ebuild?rev=1.3&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/litmus/litmus-0.13.ebuild?r1=1.2&r2=1.3 |
15 |
|
16 |
Index: litmus-0.13.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/www-misc/litmus/litmus-0.13.ebuild,v |
19 |
retrieving revision 1.2 |
20 |
retrieving revision 1.3 |
21 |
diff -u -r1.2 -r1.3 |
22 |
--- litmus-0.13.ebuild 1 Sep 2013 18:26:28 -0000 1.2 |
23 |
+++ litmus-0.13.ebuild 10 Feb 2014 03:00:12 -0000 1.3 |
24 |
@@ -1,9 +1,11 @@ |
25 |
-# Copyright 1999-2013 Gentoo Foundation |
26 |
+# Copyright 1999-2014 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/litmus-0.13.ebuild,v 1.2 2013/09/01 18:26:28 tomwij Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/litmus-0.13.ebuild,v 1.3 2014/02/10 03:00:12 floppym Exp $ |
30 |
|
31 |
EAPI="5" |
32 |
|
33 |
+inherit autotools eutils |
34 |
+ |
35 |
# TODO: FAIL (connection refused by '...' port 80: Connection refused) |
36 |
# We can't run tests that connect with the internet. |
37 |
RESTRICT="test" |
38 |
@@ -15,30 +17,32 @@ |
39 |
LICENSE="GPL-2" |
40 |
SLOT="0" |
41 |
KEYWORDS="~amd64 ~x86" |
42 |
+IUSE="debug expat gnutls kerberos libproxy +libxml2 pkcs11 +ssl threads" |
43 |
+REQUIRED_USE="?? ( gnutls ssl ) |
44 |
+ ^^ ( expat libxml2 ) |
45 |
+ threads? ( ^^ ( gnutls ssl ) )" |
46 |
|
47 |
-IUSE="debug gnutls kerberos libproxy ssl pkcs11 threads" |
48 |
- |
49 |
-REQUIRED_USE="^^ ( ssl gnutls )" |
50 |
- |
51 |
-neon_dep="<net-libs/neon-0.30:0/0" |
52 |
- |
53 |
-# First paragraph are required dependencies, second optional. |
54 |
-DEPEND=" |
55 |
- gnutls? ( ${neon_dep}[ssl,zlib] ) |
56 |
- ssl? ( ${neon_dep}[ssl,zlib] ) |
57 |
- !gnutls? ( !ssl? ( ${neon_dep}[zlib] ) ) |
58 |
- || ( dev-libs/expat:0 dev-libs/libxml2:2 ) |
59 |
+NEON_DEP="net-libs/neon:0=" |
60 |
+DEPEND="${NEON_DEP}[expat?,gnutls?,kerberos?,libproxy?,pkcs11?,ssl?,zlib] |
61 |
|
62 |
+ expat? ( dev-libs/expat:0 ) |
63 |
gnutls? ( net-libs/gnutls:0 ) |
64 |
- kerberos? ( dev-perl/GSSAPI:0 ) |
65 |
+ kerberos? ( app-crypt/mit-krb5:0 ) |
66 |
libproxy? ( net-libs/libproxy:0 ) |
67 |
+ libxml2? ( dev-libs/libxml2:2 ) |
68 |
pkcs11? ( dev-libs/pakchois:0 ) |
69 |
ssl? ( dev-libs/openssl:0 )" |
70 |
- |
71 |
RDEPEND="${DEPEND}" |
72 |
|
73 |
DOCS=( ChangeLog FAQ NEWS README THANKS TODO ) |
74 |
|
75 |
+src_prepare() { |
76 |
+ # Accept Neon 0.30. |
77 |
+ epatch "${FILESDIR}/${PV}-autotools-neon-version.patch" |
78 |
+ |
79 |
+ eautoreconf |
80 |
+} |
81 |
+ |
82 |
src_configure() { |
83 |
# No EGD available in the Portage tree. |
84 |
econf \ |
85 |
@@ -49,8 +53,10 @@ |
86 |
$(use_enable debug) \ |
87 |
$(use_enable threads threadsafe-ssl posix) \ |
88 |
$(use_with gnutls ssl gnutls) \ |
89 |
+ $(use_with ssl ssl openssl) \ |
90 |
+ $(use_with expat) \ |
91 |
+ $(use_with libxml2) \ |
92 |
$(use_with kerberos gssapi) \ |
93 |
- $(use_with libproxy) \ |
94 |
- $(use_with ssl ssl openssl) \ |
95 |
- $(use_with pkcs11 pakchois) |
96 |
+ $(use_with pkcs11 pakchois) \ |
97 |
+ $(use_with libproxy) |
98 |
} |
99 |
|
100 |
|
101 |
|
102 |
1.4 www-misc/litmus/metadata.xml |
103 |
|
104 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/litmus/metadata.xml?rev=1.4&view=markup |
105 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/litmus/metadata.xml?rev=1.4&content-type=text/plain |
106 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/litmus/metadata.xml?r1=1.3&r2=1.4 |
107 |
|
108 |
Index: metadata.xml |
109 |
=================================================================== |
110 |
RCS file: /var/cvsroot/gentoo-x86/www-misc/litmus/metadata.xml,v |
111 |
retrieving revision 1.3 |
112 |
retrieving revision 1.4 |
113 |
diff -u -r1.3 -r1.4 |
114 |
--- metadata.xml 2 Sep 2013 00:43:49 -0000 1.3 |
115 |
+++ metadata.xml 10 Feb 2014 03:00:12 -0000 1.4 |
116 |
@@ -9,6 +9,7 @@ |
117 |
<longdescription>WebDAV server protocol compliance test suite</longdescription> |
118 |
<use> |
119 |
<flag name="libproxy">Support for automatic proxy configuratino management through <pkg>net-libs/libproxy</pkg>.</flag> |
120 |
+ <flag name="libxml2">Use dev-libs/libxml2 to parse XML</flag> |
121 |
<flag name="pkcs11">Support for PKCS #11 through PaKChoiS (<pkg>dev-libs/pakchois</pkg>).</flag> |
122 |
</use> |
123 |
</pkgmetadata> |
124 |
|
125 |
|
126 |
|
127 |
1.4 www-misc/litmus/ChangeLog |
128 |
|
129 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/litmus/ChangeLog?rev=1.4&view=markup |
130 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/litmus/ChangeLog?rev=1.4&content-type=text/plain |
131 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-misc/litmus/ChangeLog?r1=1.3&r2=1.4 |
132 |
|
133 |
Index: ChangeLog |
134 |
=================================================================== |
135 |
RCS file: /var/cvsroot/gentoo-x86/www-misc/litmus/ChangeLog,v |
136 |
retrieving revision 1.3 |
137 |
retrieving revision 1.4 |
138 |
diff -u -r1.3 -r1.4 |
139 |
--- ChangeLog 2 Sep 2013 00:43:49 -0000 1.3 |
140 |
+++ ChangeLog 10 Feb 2014 03:00:12 -0000 1.4 |
141 |
@@ -1,6 +1,11 @@ |
142 |
# ChangeLog for www-misc/litmus |
143 |
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
144 |
-# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/ChangeLog,v 1.3 2013/09/02 00:43:49 patrick Exp $ |
145 |
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
146 |
+# $Header: /var/cvsroot/gentoo-x86/www-misc/litmus/ChangeLog,v 1.4 2014/02/10 03:00:12 floppym Exp $ |
147 |
+ |
148 |
+ 10 Feb 2014; Mike Gilbert <floppym@g.o> |
149 |
+ +files/0.13-autotools-neon-version.patch, litmus-0.13.ebuild, metadata.xml: |
150 |
+ Allow >=net-libs/neon-30, bug 499732 by Arfrever. Also several other small |
151 |
+ changes from maintainer Bertrand Jacquin. |
152 |
|
153 |
02 Sep 2013; Patrick Lauer <patrick@g.o> metadata.xml: |
154 |
Remove unneeded useflag description from metadata.xml |