Version bump, drop old

(Portage version: 2.1.11.62/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

3 files changed, 67 insertions, 65 deletions

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 2410dc98bbce..e1e8a62874a9 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-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.59 2013/04/07 17:25:39 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.60 2013/04/23 19:10:15 pacho Exp $
+
+*glib-networking-2.36.1 (23 Apr 2013)
+
+  23 Apr 2013; Pacho Ramos <pacho@gentoo.org> +glib-networking-2.36.1.ebuild,
+  -glib-networking-2.30.2.ebuild:
+  Version bump, drop old
 
   07 Apr 2013; Gilles Dartiguelongue <eva@gentoo.org>
   glib-networking-2.36.0.ebuild:
diff --git a/net-libs/glib-networking/glib-networking-2.30.2.ebuild b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
deleted file mode 100644
index 6c2ce7638c2c..000000000000
--- a/net-libs/glib-networking/glib-networking-2.30.2.ebuild
+++ /dev/null
@@ -1,64 +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.2.ebuild,v 1.12 2012/09/25 11:53:27 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-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" # 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"
-#	test? ( sys-apps/dbus[X] )"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-# 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() {
-	# 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() {
-	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.36.1.ebuild b/net-libs/glib-networking/glib-networking-2.36.1.ebuild
new file mode 100644
index 000000000000..5fe398dc8b94
--- /dev/null
+++ b/net-libs/glib-networking/glib-networking-2.36.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 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.36.1.ebuild,v 1.1 2013/04/23 19:10:15 pacho Exp $
+
+EAPI="5"
+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"
+IUSE="+gnome +libproxy smartcard +ssl test"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+RDEPEND="
+	>=dev-libs/glib-2.35.8: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
+	sys-devel/gettext
+	virtual/pkgconfig
+	test? ( sys-apps/dbus[X] )
+"
+# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
+
+src_prepare() {
+	# Failing tests, upstream #695062 (will be fixed in 2.38)
+	sed -e '/tls.connection.simultaneous-async-rehandshake/,+1 d' \
+		-e '/tls.connection.simultaneous-sync-rehandshake/,+1 d' \
+		-i tls/tests/connection.c || die
+	gnome2_src_prepare
+}
+
+src_configure() {
+	# AUTHORS, ChangeLog are empty
+	DOCS="NEWS README"
+	gnome2_src_configure \
+		--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_test() {
+	Xemake check
+}