Update to EAPI5, drop old.

Package-Manager: portage-2.2.0_alpha145/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

4 files changed, 19 insertions, 80 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/Manifest b/net-libs/glib-networking/Manifest
index 098c9529a843..e16a369cbd83 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -3,18 +3,20 @@ Hash: SHA256
 
 DIST glib-networking-2.30.2.tar.xz 297336 SHA256 9f7542500939ca25896f0a74955cd3889758524583f6a15d02e00c9b815559bc SHA512 052e9d806b38983112fec5c64fc34ef254ff746056ada3e1ccc0e0a895fdddb54704150913c2c41de8ea3895cdb23bbc67ce6039c67664729d9fc361add389b3 WHIRLPOOL 9ecf68746e9e6046c2e871d5c5f3f9736e285befce719c350839d6e8136938cd6ec5d0e52bdfae88d832026171d9e66f12a70f1264f05c43c1d902a6c11a1a91
 DIST glib-networking-2.32.3.tar.xz 331996 SHA256 39fe23e86a57bb7a8a67c65668394ad0fbe2d43960c1f9d68311d5d13ef1e5cf SHA512 33e29a31b0c62c8413f40d2c562c3ec0580c374a16052d174ceb703ef0c9e91145953b4377547ae2184d60d24b01c1b7694b99c94221d8d0f16d5ef7ab21f72d WHIRLPOOL 3fbc3fdd0c800483d0cefe37511f8a61dc60526b5dcd68dbeea033d5c3229f8357af16a0c32389f7462ae6f97153597784fd59fcd3eeaced5fe6d9a2f9865c8d
-DIST glib-networking-2.34.0.tar.xz 344880 SHA256 c56eb4161671bff9568f3a92a88531ca01217eb7ee8514bb6255730400f877f1 SHA512 aaeebd8649d381885a5e2a72c72f04b00e3287e4fe4936619c9338b9413727a7b04ea67ee447d90e2ee983987a867340b37b5b4ee85e2e91c1341ff38daf57a6 WHIRLPOOL d46401f9bae1813f0ab30d27a9c4bf122aa7e02fdda17d05fa1fbc9452a537736e834e88c8fcca8851eb65b2422e84d130733972d13628f02b0574c892c021e2
 DIST glib-networking-2.34.2.tar.xz 346828 SHA256 00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde SHA512 e9474e340c928adc67d777108a8cd0a001584fce433bcd27d2b52bb946bd341fade3a89b41e07759ef666d48eb3ed73bab87df0e37dfbaa71606f18b31fdee1b WHIRLPOOL 9e085df94075e11abaa0d79c34267add5221ce7c94597e58edf9ad3b3cd19dd25369e69ab0f67b43f54828433c75b3de0035d87d028895fd6ca5da5b9b252032
 EBUILD glib-networking-2.30.2.ebuild 1934 SHA256 5a814f8be234d03cfa959757241be0f36818fb74b1f7a5965248d4926812c1c3 SHA512 5b1e2bd0bdbacc41adb902cee26b80643272a6de68b7b44796a03961600031ba6f5190a254c23bac76084d225af491c145489fc79500de4d94bad02772ebcbba WHIRLPOOL 21b3d8c57003d2032dd48487d8420dcf9c29e86f3e0cee475d87b854656dd11670138e4ee9bc98e86fd85ef51592b68771bdd41f1004ea94159fd3304cefee21
 EBUILD glib-networking-2.32.3.ebuild 1879 SHA256 06920b6148c4b300d50d62cb35e848b319723844d2a9196cbe930c0479d26014 SHA512 7ebd5817c45b94cd8ccc63e2c54339bb5456aaeea573db63c6b8a6df5184f7a524c9b2f631c421107283fde0cc2e58f3e0deb0ce4caca91e24ba19856477b8c4 WHIRLPOOL 12bf8ccbaac62c1128e0e5d5c604f26607d3c02612e7a2ce9a7a6bc0684fd38cd6155ed1f0870d3da9af237436029f3e8cd97d4b5f79e2f9c1051b9f4051ecdf
-EBUILD glib-networking-2.34.0.ebuild 1897 SHA256 22216c451ef141eaf7dbbcc68e772068a1d9bf435b403f0f05e229569e9e28d6 SHA512 d0a5c25cad92cb8a4376b4d1831608a154336af29adf8a1dcc2e80f410ac3bf0534df0dc8dcd043376112859e649556879c3db3daacc1670aefbc274a4c14978 WHIRLPOOL 2ea3e13ebc08824de594bc59103ffbada769fef4b4595abe938c3f0a11d6e9d82aace7feb2a60ef3ad6eae45c67c5a834cc93d83cfd68c84f5d1ace35eec5038
-EBUILD glib-networking-2.34.2.ebuild 1676 SHA256 840bad50dbf1eb4e6aa585fb78e835ece82132c32464bd0c2791a104e7fba383 SHA512 12953977b22d9e5d93c45db78252dbf79f7444659a248c02db7d224d3f6e0138a66bc3494e11f68da5212caa7b6850f72c81259917c9c36b795c87418f32a671 WHIRLPOOL 313b8d6aa8eebe98acba67e503ac3ced20a2a14b5b5b5b0737982d17b6ccd06a49a895ed234b398470e43bf33fd6412bd20a89b11d51b31bec9d68f130baf7f2
-MISC ChangeLog 8818 SHA256 7782f4b666bc747d45ab78d13defe5455bb7e1f91096725aff474af7283cb6e6 SHA512 473cb75f82f338a90479b1879f222cee62a08715d74ae63753736c0c2134707c782e1a7f405d230069ff03d4db831808b65cdd17712bd531a00fa5d501dcfd3b WHIRLPOOL 1f1b28cf23762e7ea31c5c3d811c5f7e07f4908240748b08081c2f074b3b776e0420df7c70507b2c5b0b41da2d1c773b1e02d228ceb653a5ab4a0877a56d7d53
+EBUILD glib-networking-2.34.2.ebuild 1688 SHA256 b14cb83a5920dd215714c4ac3b631e5b9da760ecf397260e3c5731f931051f3a SHA512 31cc6655e7a77760cf83828f4b98f5acfba2cc595e5ade7fa2c0de3d90f09296c33857f34d69933e358d714f575fef70a4d9f746ac629cd63c86fb2d8e7852ad WHIRLPOOL 4b69cd8a963dc8e5542bbde52a5ff7483087206b01f9d687536091df8bc1194eeff6059bb58321da7daba94eaa2d29839833937e49862e173abbd8e8903c88ad
+MISC ChangeLog 8978 SHA256 524646648faf1c93a41c7e07d71f7c7a49ce3055c0eef6203751958fd40c4b66 SHA512 e68ea74e4532179c83288367dcb73525ccc3754484d3e7de44b02bf23adf4ddc3ecf746f17c2e0526c95a78da145229b20a99cb54bb2cdba14e0da37a6c35ffb WHIRLPOOL 62e31a568408e559758c7d2be60d9f3d218727c994e4e3ff53877978f00291f68fd138bc84421a8680a0805b24c7e908f497d448bc622d17169eb6162447fe9a
 MISC metadata.xml 395 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e SHA512 302a9f2dff08e1925f57d3384875f2397f70998736d8b70f0d46f7f3abe37f6aaad192ae593395333e8f5118043a47dbdd1675dcdb4a6f84500d7d58b1e9af31 WHIRLPOOL 89498cd69c69b219da5cb20c337d2be0187e9db702c8a83b0f7ffcc6a0d1ded8a753a05dc28cd304f5098aa821be8fd8aa774b38818d370c3a56cbec01d8d6a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlCuqLsACgkQ1fmVwcYIWAYNBwCgwbVbsdWqPV6kkJiqlboxq5Pr
-YB8An1VrTAJYwTdrTbh978EW7d1aNFQA
-=gPyu
+iQEcBAEBCAAGBQJQxc5UAAoJEJ0WA1zPCt1hELgH/2I2jdVOmsWPbaF6fWnFXpQx
+8H7X1n7VnybT2PSGVVMiqb8Xva0gbsR8Spjuq+J5CvCWcVxfAWLyHaOxLGOEtvYK
+JmCuHuMU1mfzS7KzZcY+DGURuGy2fA1f7wKpoHnitaY8oVV0o3c1b6pXZF/DFsXG
+hRE3i2CaztedPyedQPa5pHBZqwNR6jJKuHRoc2TBzG2N/pwEK3F7N+3J5Tu1ElFw
+ULvyIkaDeYyLuwdVjsC7hv73CMfpfLc85AOKLjXGI11C+ekxVBMg8FS+/3dqC0JA
+9WQ8snz28htyz4gxPOz6Msxr1zdVpfXC/7+9l+6+p+CAoI3LfwyPmVx/1NdKraQ=
+=utlm
 -----END PGP SIGNATURE-----
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