Remove old and RDEPEND on a fixed libproxy version to prevent errors with buggy xulru...

Package-Manager: portage-2.1.10.7/cvs/Linux x86_64

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 5f62e20e6ace4a3bea062b051ae7a2a064a4ea45..64e75f18e699619efbfdd56695e60eb8d303abc9 100644 (file)
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,11 @@
 # 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.12 2011/07/15 11:07:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.13 2011/07/28 18:35:49 pacho Exp $
+
+  28 Jul 2011; Pacho Ramos <pacho@gentoo.org> -glib-networking-2.28.5.ebuild,
+  -glib-networking-2.28.6.1.ebuild, glib-networking-2.28.7.ebuild:
+  Remove old and RDEPEND on a fixed libproxy version to prevent errors with
+  buggy xulrunner and webkit backends.
 
   15 Jul 2011; Kacper Kowalik <xarthisius@gentoo.org>
   glib-networking-2.28.7.ebuild:

diff --git a/net-libs/glib-networking/glib-networking-2.28.5.ebuild b/net-libs/glib-networking/glib-networking-2.28.5.ebuild
deleted file mode 100644 (file)
index 21e44a5..0000000
--- a/net-libs/glib-networking/glib-networking-2.28.5.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.5.ebuild,v 1.3 2011/06/11 15:57:28 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~sh ~sparc ~x86"
-IUSE="+gnome +libproxy +ssl"
-
-RDEPEND=">=dev-libs/glib-2.27.90:2
-       gnome? ( gnome-base/gsettings-desktop-schemas )
-       libproxy? ( >=net-libs/libproxy-0.3.1 )
-       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)"
-}

diff --git a/net-libs/glib-networking/glib-networking-2.28.6.1.ebuild b/net-libs/glib-networking/glib-networking-2.28.6.1.ebuild
deleted file mode 100644 (file)
index 53c9db4..0000000
--- a/net-libs/glib-networking/glib-networking-2.28.6.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# 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.6.1.ebuild,v 1.6 2011/06/11 15:57:28 armin76 Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit 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 ~sh ~sparc ~x86 ~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.3.1 )
-       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)"
-}

diff --git a/net-libs/glib-networking/glib-networking-2.28.7.ebuild b/net-libs/glib-networking/glib-networking-2.28.7.ebuild
index e69f46b34e131e97a9f0fd9008030da88eeb3e4c..0b95e789b4df1df41460493406b56a2163c80ed4 100644 (file)
--- a/net-libs/glib-networking/glib-networking-2.28.7.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.28.7.ebuild
@@ -1,6 +1,6 @@
 # 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.ebuild,v 1.7 2011/07/15 11:07:22 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7.ebuild,v 1.8 2011/07/28 18:35:49 pacho Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -18,7 +18,7 @@ IUSE="+gnome +libproxy +ssl"
 
 RDEPEND=">=dev-libs/glib-2.27.90:2
        gnome? ( gnome-base/gsettings-desktop-schemas )
-       libproxy? ( >=net-libs/libproxy-0.3.1 )
+       libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
        ssl? ( >=net-libs/gnutls-2.1.7 )
 "
 DEPEND="${RDEPEND}

diff --git a/net-libs/libproxy/Manifest b/net-libs/libproxy/Manifest
index d3b2481460786fa74b7691fdabdc600317409f1c..4c34176524e405cd6606fc86876cd124ad44937b 100644 (file)
--- a/net-libs/libproxy/Manifest
+++ b/net-libs/libproxy/Manifest
@@ -6,17 +6,14 @@ AUX libproxy-0.4.6-flags-mixing.patch 415 RMD160 41dfeee7ec15c58b3e65326b71f959c
 AUX libproxy-0.4.6-mozjs-link_directory.patch 1365 RMD160 4ba7b7f923a8d48575db2f13c86482d78e54ae1c SHA1 0a083243f29571e5e971de6df6e4c81b9cf6444f SHA256 783bc34d685ddf3ba6e6c85003417412f2bb87e9fc87c4ca5c9c56bf5e99aea5
 AUX libproxy-0.4.6-xulrunner-2.patch 4763 RMD160 66210bdb6497b14358fd73037b6e9813ffd55de3 SHA1 a0ee71fc9b6cd15176b53601655ee6c0d760651b SHA256 e4bd9cb3c43249593015c1fe2b6630e999627e01ca1091455a70ec32d0233525
 DIST libproxy-0.4.6.tar.gz 82483 RMD160 f5f03c84ad2d87fe728869fadc669628737c639e SHA1 6e9745c87b774f34bf53f07a54284c0d72020e94 SHA256 9ad912e63b1efca98fb442240a2bc7302e6021c1d0b1b9363327729f29462f30
-EBUILD libproxy-0.4.6-r2.ebuild 2009 RMD160 bebf116c5478345343aa3bd2fbeabeefb6637ab4 SHA1 6ad2056b8efd1beed4495c1fbf283dc454c43acf SHA256 739dbc640d4d58fafe3723f4eda8fc197c52a381aa797e456d2fe426e532b4a7
 EBUILD libproxy-0.4.6-r3.ebuild 2359 RMD160 078447efe53a56706d2279772c1f83a68d6debc6 SHA1 21a01fdc7ef5cd987d5e91c662fabc643b74c94a SHA256 c6dacb0607a5471dc344ac69efae94d3ef8984eac5a0a0e281855253906b4e6f
 EBUILD libproxy-0.4.6.ebuild 2158 RMD160 d43c8c283daea56e53712eda8f498a5be07eaf4c SHA1 41b655075b6ef6bc0b109f1b098857573cb02116 SHA256 a3bcf5ea0df5bc42d30907774ee1745c5b95adfbb7c99364845a19a6103422cf
-MISC ChangeLog 10451 RMD160 7b927a3f1710f8be0f1a0173d2df461b2ba2ba43 SHA1 59de810e95f33cb6f7c3bb9ce669db5e037f6e06 SHA256 1818b4eb328efa712ad91d2f5836317e7deababfe8abb903944246bae75d6f67
-MISC metadata.xml 733 RMD160 877172f5073bdd58cf76bdb152503d6080027191 SHA1 1d5eb42d45cafddd1af934c3a7bcfea3bd4d9c1e SHA256 7c806aa9aee9a1b529b0353ed05898466be659ea3fde84007ff614e935742b34
+MISC ChangeLog 10534 RMD160 c96541c9a13c1a6710034f3956f66b68c440f06c SHA1 76619e87e3cf1a4e009e658e55bdbda987b9f0a2 SHA256 def76c3ff1caa933d9be6e67fde0dcd003a079198e331e9f4ef7aeaa80dca192
+MISC metadata.xml 658 RMD160 21df7580031de423ef6647c07350806f9e6149dc SHA1 db7e4a8d582788c3af1629213ce8190b0d85626a SHA256 d16b934e849c02fa2ff14411ceb5242a68633a3d4b88848c92a5ca53c6c934f0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk4sFfQACgkQIiMqcbOVdxSUOgP/VaMKFk1P1zlkd93npD/FybGl
-Evm+CPpOS+JN0O1eLI1P4QNtTrQVsCNU1B7NItzxsM9VUIei54FaZPFWFM5ujfs3
-CYoka5ioY42bMUP91xXtE2Xhs/WdIOeNhrc7Psj6TrlwuFc01szqmDh1g/6icZQD
-6onFZfwPXnXdzc+hHQk=
-=bILP
+iEYEARECAAYFAk4xrMcACgkQCaWpQKGI+9QxiQCeLe9nrKVIW5AL0t/5TdTCzKP0
+qPoAn1tVcqBVEY98JPhlmxe6KoZyQkLu
+=18Qa
 -----END PGP SIGNATURE-----