Fix configure to respect --without-gnome-proxy (bug #387597), drop ~arch versions...

Package-Manager: portage-2.2.0_alpha69/cvs/Linux x86_64

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 15c8692057a986848e97700516f7f9be29833bdb..aa09ba89405add3a537052c8d33bd2b4257a9cca 100644 (file)
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,22 @@
 # ChangeLog for net-libs/glib-networking
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.20 2011/10/18 18:50:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.21 2011/10/19 16:09:07 tetromino Exp $
+
+*glib-networking-2.30.1-r1 (19 Oct 2011)
+*glib-networking-2.30.0-r1 (19 Oct 2011)
+*glib-networking-2.28.7-r1 (19 Oct 2011)
+
+  19 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +glib-networking-2.28.7-r1.ebuild,
+  +files/glib-networking-2.28.7-gnome-proxy-AC_ARG_WITH.patch,
+  -glib-networking-2.30.0.ebuild, +glib-networking-2.30.0-r1.ebuild,
+  -glib-networking-2.30.1.ebuild, +glib-networking-2.30.1-r1.ebuild,
+  +files/glib-networking-2.30.1-gnome-proxy-test.patch:
+  Fix configure to respect --without-gnome-proxy (bug #387597) and drop ~arch
+  versions with broken configure. For 2.30.1, apply patch to not build
+  gnome-proxy test when USE=-gnome, and restrict tests (they appear to fail
+  ~50% of the time, need to investigate).
+  Note that the gnome-proxy patches have been applied in upstream git master.
 
 *glib-networking-2.30.1 (18 Oct 2011)
 

diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index d1c20e8ef9ed50415bc136cea35225fe904f580e..315ab9efd2e7bd2964b49f156fbc676987361a41 100644 (file)
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,18 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX glib-networking-2.28.7-gnome-proxy-AC_ARG_WITH.patch 987 RMD160 42073eaf04967418ad48b2566ca76f5102741288 SHA1 af4948a6152305cad24294eb5da92e3901c4de5f SHA256 d9bcf47ac0fd511394542d9158322cd546df38cb1b12bf7680b9c129b22e8b9d
+AUX glib-networking-2.30.1-gnome-proxy-test.patch 752 RMD160 428c085867db8e4130858b2ecc94e6eb2b6b4a64 SHA1 6959c6d32a9f111d4bba3dbe1c0e7f977410db2c SHA256 8c7aa53e636b99f158a5e1ac01f50b8ac3d34ba680d9b80203bd584857406d18
 DIST glib-networking-2.28.7.tar.bz2 319260 RMD160 059f5956c96de586db6f457d52909420b0a86f7d SHA1 711d548a88dffb4c3be7ffa1d515ef3efccedc62 SHA256 98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c
 DIST glib-networking-2.30.0.tar.xz 285240 RMD160 ce76a267789cced605b61a18e7bd5d5b79cae31f SHA1 6a11675b8a0b3a565f4f8d1e72df78dedfe20b6f SHA256 e28ca1e354d6519efb5c9c01c1f10e8a1a196710dfbcc5ea8f8aade3244e108c
 DIST glib-networking-2.30.1.tar.xz 297072 RMD160 a88088598afeb09241f4d399e84deb8b4f321264 SHA1 5762eb4e37fb595ab0ef12dbbc44514b226c4e06 SHA256 5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3
+EBUILD glib-networking-2.28.7-r1.ebuild 1408 RMD160 4bd8f28bde792cab4088109d9bdec8daf856a6f6 SHA1 03b7decf01a451a80e4f7ca63ee05df15e7f7ccf SHA256 3ac2042b00ab62f41d011af0688185f4110889cc127b560b0f6999cc7c1c3d5b
 EBUILD glib-networking-2.28.7.ebuild 1160 RMD160 7bd3bd7e2e178f9eac0c50194de3e8c5c2ed06ed SHA1 38485d31dde8503864d206aee18e585681d15306 SHA256 46b0c7d38bb34c8ca5b0a71e77e0d824bccbb2f72aa16652fd99cf24a6102c07
-EBUILD glib-networking-2.30.0.ebuild 1419 RMD160 9b07780c057fb419224349a4de3961168144a815 SHA1 a9b782facb897c187939ec7b8bf38174eb077612 SHA256 537a22021f978e61428c6327f12bacd7b8c0b6d46873561a5d811279735c1cc7
-EBUILD glib-networking-2.30.1.ebuild 1463 RMD160 d6d7b0baafb48cfe2889f66fd4b88bc2cab157f6 SHA1 3748c0656bce4923e4d4e43be4682aacf5e2724d SHA256 505cbe7df21d0be56e81314b9a9e82f45f45cd6115005cbdab0bb5dcb2429cd6
-MISC ChangeLog 3153 RMD160 e4d8bbef0f74b23446ea3c3ceaeb27b2a2804c9c SHA1 49f7c5a9d4d6211fcfc63df9158780916f3ec91d SHA256 e2ce20dd13e6764f736214487881ad244c02521f2efb0ff90978ad40d45a8923
+EBUILD glib-networking-2.30.0-r1.ebuild 1666 RMD160 4bf500fcab9df24a53a7c75fa941d2a84d93ceb6 SHA1 d0e7005b6279a645bd8c8e78cb67d47b2b8a7209 SHA256 6948c0d90754fddb2e8e309bc6fd1e0d302f40b28a602dbd854e4595209459da
+EBUILD glib-networking-2.30.1-r1.ebuild 2205 RMD160 cbffc17fdf201da75f3a8281116f2d5cc98f7dbf SHA1 92393a58254ea1aeb658689cd4408aaeda05be5f SHA256 5daf212b74271d3d52c243b84dd2fe6d197e7becfb19e613ea3ddedb76458165
+MISC ChangeLog 3980 RMD160 0a7cd26ce1f3ccc5613cf0966f144eeaab494e82 SHA1 099aa9e6c7cc3753a148529f6e17d912d2ec61b9 SHA256 2d308fedb5a9213a23c0931c100daa79a9425a34f6bf3863524948f6669783ec
 MISC metadata.xml 395 RMD160 18bae0d230824208fc84fdad0c54b73e2e99eeeb SHA1 a07face2c8ec4a0b4bf04b18dbbd9b29a86f20b8 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk6dynQACgkQCaWpQKGI+9QIkwCfc5Jwek9EyvayhBO4TCpisSrR
-wj0An1OhOks+V3pNxuJXTIeSI7cqjY3Y
-=e/Tm
+iF4EAREIAAYFAk6e9ikACgkQdjK8w9WeBnDx4gEAqfowYBlxfCh0rqBaJJ3M1eMh
+c0Rm6yxZqGBskwpl7xgA/jv22WqGaQVRS8hijlPEcoYCQmH2p8knBJ1pXeReuke5
+=12vQ
 -----END PGP SIGNATURE-----

diff --git a/net-libs/glib-networking/files/glib-networking-2.28.7-gnome-proxy-AC_ARG_WITH.patch b/net-libs/glib-networking/files/glib-networking-2.28.7-gnome-proxy-AC_ARG_WITH.patch
new file mode 100644 (file)
index 0000000..2b0cdad
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.28.7-gnome-proxy-AC_ARG_WITH.patch
@@ -0,0 +1,29 @@
+From 621e4dfb32fd8f5407d5b64f3f05a21fc7d3d3fa Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gmail.com>
+Date: Wed, 19 Oct 2011 10:31:17 -0400
+Subject: [PATCH] Add missing comma to gnome-proxy AC_ARG_WITH
+
+This was causing "--without-gnome-proxy" to be treated as
+"--with-gnome-proxy=check".
+
+https://bugzilla.gnome.org/show_bug.cgi?id=662203
+---
+ configure.ac |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index b7833d4..38d3114 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -66,7 +66,7 @@ dnl *** Checks for GNOME proxy backend ***
+ dnl **************************************
+ AC_ARG_WITH(gnome-proxy,
+     [AC_HELP_STRING([--with-gnome-proxy],
+-                    [support for GNOME proxy configuration @<:@default=check@:>@])]
++                    [support for GNOME proxy configuration @<:@default=check@:>@])],
+     [],
+     [with_gnome_proxy=check])
+ AS_IF([test "x$with_gnome_proxy" != "xno"],
+-- 
+1.7.7
+

diff --git a/net-libs/glib-networking/files/glib-networking-2.30.1-gnome-proxy-test.patch b/net-libs/glib-networking/files/glib-networking-2.30.1-gnome-proxy-test.patch
new file mode 100644 (file)
index 0000000..ca736d4
--- /dev/null
+++ b/net-libs/glib-networking/files/glib-networking-2.30.1-gnome-proxy-test.patch
@@ -0,0 +1,31 @@
+From b46ee18dce0dcf417b443d780444081cf239c0c5 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Tue, 18 Oct 2011 14:33:45 +0300
+Subject: [PATCH] proxy/gnome: Only build the test if we are building gnome
+ proxy support
+
+Fixes the build with mingw32.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=662085
+---
+ proxy/tests/Makefile.am |    5 ++++-
+ 1 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/proxy/tests/Makefile.am b/proxy/tests/Makefile.am
+index a1e69bd..e2d05d3 100644
+--- a/proxy/tests/Makefile.am
++++ b/proxy/tests/Makefile.am
+@@ -14,6 +14,9 @@ noinst_PROGRAMS = $(TEST_PROGS)
+ LDADD  = \
+       $(GLIB_LIBS)
+ 
++if HAVE_GNOME_PROXY
++TEST_PROGS += gnome
++endif
++
+ TEST_PROGS +=         \
+-      gnome           \
+       $(NULL)
+-- 
+1.7.6.4
+

diff --git a/net-libs/glib-networking/glib-networking-2.28.7-r1.ebuild b/net-libs/glib-networking/glib-networking-2.28.7-r1.ebuild
new file mode 100644 (file)
index 0000000..d08db1e
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.28.7-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7-r1.ebuild,v 1.1 2011/10/19 16:09:07 tetromino Exp $
+
+EAPI="3"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="Network-related giomodules for glib"
+HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+gnome +libproxy +ssl"
+
+RDEPEND=">=dev-libs/glib-2.27.90:2
+       gnome? ( gnome-base/gsettings-desktop-schemas )
+       libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
+       ssl? ( >=net-libs/gnutls-2.1.7 )
+"
+DEPEND="${RDEPEND}
+       >=dev-util/intltool-0.35.0
+       >=dev-util/pkgconfig-0.9
+       sys-devel/gettext"
+
+pkg_setup() {
+       # AUTHORS, ChangeLog are empty
+       DOCS="NEWS README"
+       G2CONF="${G2CONF}
+               --disable-static
+               --disable-maintainer-mode
+               --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
+               $(use_with gnome gnome-proxy)
+               $(use_with libproxy)
+               $(use_with ssl gnutls)"
+}
+
+src_prepare() {
+       # bug #387589, https://bugzilla.gnome.org/show_bug.cgi?id=662203
+       # Fixed in upstream git master
+       epatch "${FILESDIR}/${P}-gnome-proxy-AC_ARG_WITH.patch"
+       mkdir m4
+       eautoreconf
+       gnome2_src_prepare
+}

diff --git a/net-libs/glib-networking/glib-networking-2.30.0.ebuild b/net-libs/glib-networking/glib-networking-2.30.0-r1.ebuild
similarity index 80%
rename from net-libs/glib-networking/glib-networking-2.30.0.ebuild
rename to net-libs/glib-networking/glib-networking-2.30.0-r1.ebuild
index 9d79b0cd0631875ec02b773622cf2c139937b35e..eaa28ef8a38ea97e72ffcc6eff79f246284bdebe 100644 (file)
--- a/net-libs/glib-networking/glib-networking-2.30.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.30.0-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.0.ebuild,v 1.1 2011/09/27 12:59:41 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.0-r1.ebuild,v 1.1 2011/10/19 16:09:07 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
 
 DESCRIPTION="Network-related giomodules for glib"
 HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
@@ -45,3 +45,12 @@ pkg_setup() {
                $(use_with libproxy)
                $(use_with ssl gnutls)"
 }
+
+src_prepare() {
+       # bug #387589, https://bugzilla.gnome.org/show_bug.cgi?id=662203 
+       # Fixed in upstream git master
+       epatch "${FILESDIR}/${PN}-2.28.7-gnome-proxy-AC_ARG_WITH.patch"
+       mkdir m4
+       eautoreconf
+       gnome2_src_prepare
+}

diff --git a/net-libs/glib-networking/glib-networking-2.30.1.ebuild b/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild
similarity index 61%
rename from net-libs/glib-networking/glib-networking-2.30.1.ebuild
rename to net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild
index c4f8d4b742535725d46650a7b0ce3818e0d3887f..7c9fb5964406b5cd9cbf6b6d30289c191ac3ba28 100644 (file)
--- a/net-libs/glib-networking/glib-networking-2.30.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild
@@ -1,12 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1.ebuild,v 1.1 2011/10/18 18:50:22 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild,v 1.1 2011/10/19 16:09:07 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit gnome2
+inherit autotools eutils gnome2
+# tests need virtualx
 
 DESCRIPTION="Network-related giomodules for glib"
 HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
@@ -16,7 +17,7 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 ~sparc-solaris ~x86-solaris"
-IUSE="+gnome +libproxy +ssl"
+IUSE="+gnome +libproxy +ssl" # test
 
 RDEPEND=">=dev-libs/glib-2.29.16:2
        gnome? ( gnome-base/gsettings-desktop-schemas )
@@ -29,6 +30,11 @@ DEPEND="${RDEPEND}
        >=dev-util/intltool-0.35.0
        >=dev-util/pkgconfig-0.9
        sys-devel/gettext"
+#      test? ( sys-apps/dbus[X] )"
+
+# FIXME: tls tests often fail, figure out why
+# ERROR:tls.c:265:on_input_read_finish: assertion failed (error == NULL): Error performing TLS handshake: The request is invalid. (g-tls-error-quark, 1)
+RESTRICT="test"
 
 pkg_setup() {
        # AUTHORS, ChangeLog are empty
@@ -42,6 +48,15 @@ pkg_setup() {
 }
 
 src_prepare() {
+       # bug #387589, https://bugzilla.gnome.org/show_bug.cgi?id=662203
+       # Fixed in upstream git master
+       epatch "${FILESDIR}/${PN}-2.28.7-gnome-proxy-AC_ARG_WITH.patch"
+       # https://bugzilla.gnome.org/show_bug.cgi?id=662085
+       # Fixed in upstream git master
+       epatch "${FILESDIR}/${P}-gnome-proxy-test.patch"
+       mkdir m4
+       eautoreconf
+
        gnome2_src_prepare
 
        # Drop DEPRECATED flags
@@ -50,3 +65,9 @@ src_prepare() {
                proxy/gnome/Makefile.am proxy/gnome/Makefile.in \
                tls/gnutls/Makefile.am tls/gnutls/Makefile.in || die
 }
+
+#src_test() {
+       # global make check fails if gnome-proxy test is not built
+#      use gnome || cd tls/tests
+#      Xemake check
+#}