Version bump for glib-2.34. Drop old. Make license more precise.

(Portage version: 2.2.0_alpha132/cvs/Linux x86_64)

9 files changed, 22 insertions, 258 deletions

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 205a06a93df2..92fe32a666ad 100644
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,18 @@
 # ChangeLog for net-libs/glib-networking
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.44 2012/07/15 18:12:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.45 2012/09/25 11:53:27 tetromino Exp $
+
+*glib-networking-2.34.0 (25 Sep 2012)
+
+  25 Sep 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -glib-networking-2.28.7.ebuild,
+  -files/glib-networking-2.28.7-gnome-proxy-AC_ARG_WITH.patch,
+  -glib-networking-2.30.1-r1.ebuild,
+  -files/glib-networking-2.30.1-gnome-proxy-test.patch,
+  glib-networking-2.30.2.ebuild, -glib-networking-2.32.0.ebuild,
+  -glib-networking-2.32.1.ebuild, glib-networking-2.32.3.ebuild,
+  +glib-networking-2.34.0.ebuild:
+  Version bump for glib-2.34. Drop old. Make license more precise.
 
   15 Jul 2012; Raúl Porcel <armin76@gentoo.org> glib-networking-2.30.2.ebuild:
   alpha/ia64/sh/sparc stable wrt #410611
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
deleted file mode 100644
index 2b0cdad25131..000000000000
--- a/net-libs/glib-networking/files/glib-networking-2.28.7-gnome-proxy-AC_ARG_WITH.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
deleted file mode 100644
index ca736d48566c..000000000000
--- a/net-libs/glib-networking/files/glib-networking-2.30.1-gnome-proxy-test.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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.ebuild b/net-libs/glib-networking/glib-networking-2.28.7.ebuild
deleted file mode 100644
index 3f5e989d8673..000000000000
--- a/net-libs/glib-networking/glib-networking-2.28.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2012 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.15 2012/05/05 02:54:25 jdhore 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 ~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? (
-		dev-libs/libgcrypt
-		>=net-libs/gnutls-2.1.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	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.30.1-r1.ebuild b/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild
deleted file mode 100644
index a511d4bc226c..000000000000
--- a/net-libs/glib-networking/glib-networking-2.30.1-r1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2012 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-r1.ebuild,v 1.11 2012/05/05 02:54:25 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-# tests need virtualx
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
-# for eautoreconf
-SRC_URI="${SRC_URI}
-	http://dev.gentoo.org/~tetromino/distfiles/aclocal/libgcrypt.m4.bz2"
-
-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" # test
-
-RDEPEND=">=dev-libs/glib-2.29.16:2
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
-	ssl? (
-		app-misc/ca-certificates
-		dev-libs/libgcrypt
-		>=net-libs/gnutls-2.1.7 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	sys-devel/gettext
-
-	>=sys-devel/autoconf-2.65:2.5"
-#	test? ( sys-apps/dbus[X] )"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-# 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
-	DOCS="NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-ca-certificates=${EPREFIX}/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}/${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
-	# libgcrypt.m4 needed for eautoreconf, bug #411139
-	mv "${WORKDIR}/libgcrypt.m4" m4/ || die
-	eautoreconf
-
-	gnome2_src_prepare
-
-	# Drop DEPRECATED flags
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		proxy/libproxy/Makefile.am proxy/libproxy/Makefile.in \
-		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
-#}
diff --git a/net-libs/glib-networking/glib-networking-2.30.2.ebuild b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
index b7d848734e5e..6c2ce7638c2c 100644
--- a/net-libs/glib-networking/glib-networking-2.30.2.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.2.ebuild,v 1.11 2012/07/15 18:12:25 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild,v 1.12 2012/09/25 11:53:27 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -12,7 +12,7 @@ inherit gnome2
 DESCRIPTION="Network-related giomodules for glib"
 HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
 
-LICENSE="LGPL-2"
+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" # test
diff --git a/net-libs/glib-networking/glib-networking-2.32.0.ebuild b/net-libs/glib-networking/glib-networking-2.32.0.ebuild
deleted file mode 100644
index 9da6a4d84e10..000000000000
--- a/net-libs/glib-networking/glib-networking-2.32.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2012 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.32.0.ebuild,v 1.2 2012/05/05 02:54:25 jdhore Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 virtualx
-
-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 smartcard +ssl test"
-
-RDEPEND=">=dev-libs/glib-2.31.6:2
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
-	smartcard? (
-		>=app-crypt/p11-kit-0.8
-		>=net-libs/gnutls-2.12.8[pkcs11] )
-	ssl? (
-		app-misc/ca-certificates
-		>=net-libs/gnutls-2.11.0 )
-"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35.0
-	virtual/pkgconfig
-	sys-devel/gettext
-	test? ( sys-apps/dbus[X] )"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-pkg_setup() {
-	# AUTHORS, ChangeLog are empty
-	DOCS="NEWS README"
-	G2CONF="${G2CONF}
-		--disable-static
-		--with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
-		$(use_with gnome gnome-proxy)
-		$(use_with libproxy)
-		$(use_with smartcard pkcs11)
-		$(use_with ssl gnutls)"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Drop DEPRECATED flags
-	sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED *\\:\\:g' \
-		-e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		-i Makefile.{decl,in} \
-		proxy/gnome/Makefile.in \
-		proxy/libproxy/Makefile.in \
-		proxy/tests/Makefile.in \
-		tls/gnutls/Makefile.in \
-		tls/pkcs11/Makefile.{am,in} \
-		tls/tests/Makefile.in || die
-	sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-		tls/pkcs11/Makefile.{am,in} || die
-}
-
-src_test() {
-	Xemake check
-}
diff --git a/net-libs/glib-networking/glib-networking-2.32.3.ebuild b/net-libs/glib-networking/glib-networking-2.32.3.ebuild
index 404aafcb9a41..b2345f733052 100644
--- a/net-libs/glib-networking/glib-networking-2.32.3.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.32.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.32.3.ebuild,v 1.1 2012/05/17 21:32:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.32.3.ebuild,v 1.2 2012/09/25 11:53:27 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit gnome2 virtualx
 DESCRIPTION="Network-related giomodules for glib"
 HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+gnome +libproxy smartcard +ssl test"
diff --git a/net-libs/glib-networking/glib-networking-2.32.1.ebuild b/net-libs/glib-networking/glib-networking-2.34.0.ebuild
index 049872d84a6a..6a8a92c77d41 100644
--- a/net-libs/glib-networking/glib-networking-2.32.1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.34.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 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.32.1.ebuild,v 1.3 2012/05/16 00:11:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.34.0.ebuild,v 1.1 2012/09/25 11:53:27 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,12 +11,12 @@ inherit gnome2 virtualx
 DESCRIPTION="Network-related giomodules for glib"
 HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
 
-LICENSE="LGPL-2"
+LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
 
-RDEPEND=">=dev-libs/glib-2.31.6:2
+RDEPEND=">=dev-libs/glib-2.34:2
 	gnome? ( gnome-base/gsettings-desktop-schemas )
 	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
 	smartcard? (
@@ -49,7 +49,7 @@ src_prepare() {
 	gnome2_src_prepare
 
 	# Drop DEPRECATED flags
-	sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED *\\:\\:g' \
+	LC_ALL=C sed -e 's:-D[A-Z_]*DISABLE_DEPRECATED *\\:\\:g' \
 		-e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
 		-i Makefile.{decl,in} \
 		proxy/gnome/Makefile.in \