1 |
tetromino 12/04/08 05:55:23 |
2 |
|
3 |
Modified: ChangeLog glib-networking-2.28.7.ebuild |
4 |
glib-networking-2.30.2.ebuild |
5 |
glib-networking-2.30.1-r1.ebuild |
6 |
Log: |
7 |
Add missing gcrypt dependency when USE=ssl, and fix build with USE=-ssl when gcrypt is not installed (bug #411139, thanks to Marvin Vek for reporting). |
8 |
|
9 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.32 net-libs/glib-networking/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/ChangeLog?rev=1.32&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/ChangeLog?rev=1.32&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/ChangeLog?r1=1.31&r2=1.32 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v |
21 |
retrieving revision 1.31 |
22 |
retrieving revision 1.32 |
23 |
diff -u -r1.31 -r1.32 |
24 |
--- ChangeLog 31 Mar 2012 12:16:24 -0000 1.31 |
25 |
+++ ChangeLog 8 Apr 2012 05:55:23 -0000 1.32 |
26 |
@@ -1,6 +1,12 @@ |
27 |
# ChangeLog for net-libs/glib-networking |
28 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.31 2012/03/31 12:16:24 nirbheek Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.32 2012/04/08 05:55:23 tetromino Exp $ |
31 |
+ |
32 |
+ 08 Apr 2012; Alexandre Rostovtsev <tetromino@g.o> |
33 |
+ glib-networking-2.28.7.ebuild, glib-networking-2.30.1-r1.ebuild, |
34 |
+ glib-networking-2.30.2.ebuild: |
35 |
+ Add missing gcrypt dependency when USE=ssl, and fix build with USE=-ssl when |
36 |
+ gcrypt is not installed (bug #411139, thanks to Marvin Vek for reporting). |
37 |
|
38 |
*glib-networking-2.32.0 (31 Mar 2012) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.14 net-libs/glib-networking/glib-networking-2.28.7.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild?rev=1.14&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild?rev=1.14&content-type=text/plain |
47 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild?r1=1.13&r2=1.14 |
48 |
|
49 |
Index: glib-networking-2.28.7.ebuild |
50 |
=================================================================== |
51 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild,v |
52 |
retrieving revision 1.13 |
53 |
retrieving revision 1.14 |
54 |
diff -u -r1.13 -r1.14 |
55 |
--- glib-networking-2.28.7.ebuild 18 Sep 2011 11:33:35 -0000 1.13 |
56 |
+++ glib-networking-2.28.7.ebuild 8 Apr 2012 05:55:23 -0000 1.14 |
57 |
@@ -1,6 +1,6 @@ |
58 |
-# Copyright 1999-2011 Gentoo Foundation |
59 |
+# Copyright 1999-2012 Gentoo Foundation |
60 |
# Distributed under the terms of the GNU General Public License v2 |
61 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild,v 1.13 2011/09/18 11:33:35 armin76 Exp $ |
62 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild,v 1.14 2012/04/08 05:55:23 tetromino Exp $ |
63 |
|
64 |
EAPI="3" |
65 |
GCONF_DEBUG="no" |
66 |
@@ -19,7 +19,9 @@ |
67 |
RDEPEND=">=dev-libs/glib-2.27.90:2 |
68 |
gnome? ( gnome-base/gsettings-desktop-schemas ) |
69 |
libproxy? ( >=net-libs/libproxy-0.4.6-r3 ) |
70 |
- ssl? ( >=net-libs/gnutls-2.1.7 ) |
71 |
+ ssl? ( |
72 |
+ dev-libs/libgcrypt |
73 |
+ >=net-libs/gnutls-2.1.7 ) |
74 |
" |
75 |
DEPEND="${RDEPEND} |
76 |
>=dev-util/intltool-0.35.0 |
77 |
|
78 |
|
79 |
|
80 |
1.3 net-libs/glib-networking/glib-networking-2.30.2.ebuild |
81 |
|
82 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild?rev=1.3&view=markup |
83 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild?rev=1.3&content-type=text/plain |
84 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild?r1=1.2&r2=1.3 |
85 |
|
86 |
Index: glib-networking-2.30.2.ebuild |
87 |
=================================================================== |
88 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild,v |
89 |
retrieving revision 1.2 |
90 |
retrieving revision 1.3 |
91 |
diff -u -r1.2 -r1.3 |
92 |
--- glib-networking-2.30.2.ebuild 18 Jan 2012 06:48:45 -0000 1.2 |
93 |
+++ glib-networking-2.30.2.ebuild 8 Apr 2012 05:55:23 -0000 1.3 |
94 |
@@ -1,6 +1,6 @@ |
95 |
# Copyright 1999-2012 Gentoo Foundation |
96 |
# Distributed under the terms of the GNU General Public License v2 |
97 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild,v 1.2 2012/01/18 06:48:45 tetromino Exp $ |
98 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild,v 1.3 2012/04/08 05:55:23 tetromino Exp $ |
99 |
|
100 |
EAPI="4" |
101 |
GCONF_DEBUG="no" |
102 |
@@ -22,6 +22,7 @@ |
103 |
libproxy? ( >=net-libs/libproxy-0.4.6-r3 ) |
104 |
ssl? ( |
105 |
app-misc/ca-certificates |
106 |
+ dev-libs/libgcrypt |
107 |
>=net-libs/gnutls-2.1.7 ) |
108 |
" |
109 |
DEPEND="${RDEPEND} |
110 |
|
111 |
|
112 |
|
113 |
1.10 net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild |
114 |
|
115 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild?rev=1.10&view=markup |
116 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild?rev=1.10&content-type=text/plain |
117 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild?r1=1.9&r2=1.10 |
118 |
|
119 |
Index: glib-networking-2.30.1-r1.ebuild |
120 |
=================================================================== |
121 |
RCS file: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild,v |
122 |
retrieving revision 1.9 |
123 |
retrieving revision 1.10 |
124 |
diff -u -r1.9 -r1.10 |
125 |
--- glib-networking-2.30.1-r1.ebuild 25 Mar 2012 17:08:17 -0000 1.9 |
126 |
+++ glib-networking-2.30.1-r1.ebuild 8 Apr 2012 05:55:23 -0000 1.10 |
127 |
@@ -1,6 +1,6 @@ |
128 |
# Copyright 1999-2012 Gentoo Foundation |
129 |
# Distributed under the terms of the GNU General Public License v2 |
130 |
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild,v 1.9 2012/03/25 17:08:17 armin76 Exp $ |
131 |
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild,v 1.10 2012/04/08 05:55:23 tetromino Exp $ |
132 |
|
133 |
EAPI="4" |
134 |
GCONF_DEBUG="no" |
135 |
@@ -11,6 +11,9 @@ |
136 |
|
137 |
DESCRIPTION="Network-related giomodules for glib" |
138 |
HOMEPAGE="http://git.gnome.org/browse/glib-networking/" |
139 |
+# for eautoreconf |
140 |
+SRC_URI="${SRC_URI} |
141 |
+ http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2" |
142 |
|
143 |
LICENSE="LGPL-2" |
144 |
SLOT="0" |
145 |
@@ -22,6 +25,7 @@ |
146 |
libproxy? ( >=net-libs/libproxy-0.4.6-r3 ) |
147 |
ssl? ( |
148 |
app-misc/ca-certificates |
149 |
+ dev-libs/libgcrypt |
150 |
>=net-libs/gnutls-2.1.7 ) |
151 |
" |
152 |
DEPEND="${RDEPEND} |
153 |
@@ -56,6 +60,8 @@ |
154 |
# Fixed in upstream git master |
155 |
epatch "${FILESDIR}/${P}-gnome-proxy-test.patch" |
156 |
mkdir m4 |
157 |
+ # libgcrypt.m4 needed for eautoreconf, bug #411139 |
158 |
+ mv "${WORKDIR}/libgcrypt.m4" m4/ || die |
159 |
eautoreconf |
160 |
|
161 |
gnome2_src_prepare |