Version bump, remove old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 30 insertions, 66 deletions

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 084b1f866779..d52562726608 100644
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,12 @@
 # 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.23 2011/12/29 18:01:05 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.24 2012/01/04 20:03:12 pacho Exp $
+
+*glib-networking-2.30.2 (04 Jan 2012)
+
+  04 Jan 2012; Pacho Ramos <pacho@gentoo.org> +glib-networking-2.30.2.ebuild,
+  -glib-networking-2.28.7-r1.ebuild, -glib-networking-2.30.0-r1.ebuild:
+  Version bump, remove old.
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> glib-networking-2.30.1-r1.ebuild:
   amd64 stable, bug 393007
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
deleted file mode 100644
index d08db1e54dca..000000000000
--- a/net-libs/glib-networking/glib-networking-2.28.7-r1.ebuild
+++ /dev/null
@@ -1,48 +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.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-r1.ebuild b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
index 9213568374d5..9d013b80b908 100644
--- a/net-libs/glib-networking/glib-networking-2.30.0-r1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.0-r1.ebuild,v 1.2 2011/10/19 16:32:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild,v 1.1 2012/01/04 20:03:12 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
+# tests need 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 +ssl"
+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 )
@@ -29,9 +28,10 @@ DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.0
 	>=dev-util/pkgconfig-0.9
 	sys-devel/gettext"
+#	test? ( sys-apps/dbus[X] )"
 
-# FIXME: tls tests fail, figure out why
-# ERROR:tls.c:256:on_input_read_finish: assertion failed (error == NULL): Error performing TLS handshake: The request is invalid. (g-tls-error-quark, 1)
+# FIXME: tls tests often fail, figure out why, bug #387799
+# 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() {
@@ -39,18 +39,24 @@ pkg_setup() {
 	DOCS="NEWS README"
 	G2CONF="${G2CONF}
 		--disable-static
-		--disable-maintainer-mode
-		--with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
+		--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"
-	mkdir m4
-	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
+#}