Update to EAPI5, drop old.

(Portage version: 2.2.0_alpha145/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)

3 files changed, 10 insertions, 73 deletions

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 794ca328fe21..b217000db4a3 100644
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,10 @@
 # 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.54 2012/11/22 22:35:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.55 2012/12/10 11:58:10 tetromino Exp $
+
+  10 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -glib-networking-2.34.0.ebuild, glib-networking-2.34.2.ebuild:
+  Update to EAPI5, drop old.
 
 *glib-networking-2.34.2 (22 Nov 2012)
 
diff --git a/net-libs/glib-networking/glib-networking-2.34.0.ebuild b/net-libs/glib-networking/glib-networking-2.34.0.ebuild
deleted file mode 100644
index 6a8a92c77d41..000000000000
--- a/net-libs/glib-networking/glib-networking-2.34.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.34.0.ebuild,v 1.1 2012/09/25 11:53:27 tetromino 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"
-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.34: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
-	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 \
-		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.34.2.ebuild b/net-libs/glib-networking/glib-networking-2.34.2.ebuild
index 98401e6eb210..b04c16e2da1c 100644
--- a/net-libs/glib-networking/glib-networking-2.34.2.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.34.2.ebuild
@@ -1,8 +1,8 @@
 # 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.34.2.ebuild,v 1.1 2012/11/22 22:35:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.34.2.ebuild,v 1.2 2012/12/10 11:58:10 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -18,13 +18,13 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
 
 RDEPEND=">=dev-libs/glib-2.34:2
 	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
+	libproxy? ( >=net-libs/libproxy-0.4.6-r3:= )
 	smartcard? (
 		>=app-crypt/p11-kit-0.8
-		>=net-libs/gnutls-2.12.8[pkcs11] )
+		>=net-libs/gnutls-2.12.8:=[pkcs11] )
 	ssl? (
 		app-misc/ca-certificates
-		>=net-libs/gnutls-2.11.0 )
+		>=net-libs/gnutls-2.11.0:= )
 "
 DEPEND="${RDEPEND}
 	>=dev-util/intltool-0.35.0