Version bump, drop old

Package-Manager: portage-2.1.11.62/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

4 files changed, 73 insertions, 71 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/Manifest b/net-libs/glib-networking/Manifest
index 19b29200cc02..712678e4bf32 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,20 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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.2.tar.xz 346828 SHA256 00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde SHA512 e9474e340c928adc67d777108a8cd0a001584fce433bcd27d2b52bb946bd341fade3a89b41e07759ef666d48eb3ed73bab87df0e37dfbaa71606f18b31fdee1b WHIRLPOOL 9e085df94075e11abaa0d79c34267add5221ce7c94597e58edf9ad3b3cd19dd25369e69ab0f67b43f54828433c75b3de0035d87d028895fd6ca5da5b9b252032
 DIST glib-networking-2.36.0.tar.xz 351080 SHA256 190d66fbaeb023ba4f43c315f23c5372c43be6cbe857596e00990211514650d9 SHA512 663395d3a564ff7c536b740f5daf8c6ef31f66877515afa1c02785f6f636139d545ba153e191ee23107cea8c8af2b4c1d87716f106c910f60feef52aff1fbbfd WHIRLPOOL e726ede3b0812b910c078698bab12273825af47a52fa226a5bb8c7afca5368d21c8cea3dd0fccc384f39612b462c6a3d4369f897b7867c5f488397ce941e6631
-EBUILD glib-networking-2.30.2.ebuild 1934 SHA256 5a814f8be234d03cfa959757241be0f36818fb74b1f7a5965248d4926812c1c3 SHA512 5b1e2bd0bdbacc41adb902cee26b80643272a6de68b7b44796a03961600031ba6f5190a254c23bac76084d225af491c145489fc79500de4d94bad02772ebcbba WHIRLPOOL 21b3d8c57003d2032dd48487d8420dcf9c29e86f3e0cee475d87b854656dd11670138e4ee9bc98e86fd85ef51592b68771bdd41f1004ea94159fd3304cefee21
+DIST glib-networking-2.36.1.tar.xz 351892 SHA256 e2df2d1943a6193ca471addc58539895da1ae96fdba305dedb937ef56adb57ea SHA512 bd76f418b7d9ac77e82f63308e1a35e56d5a2bcdc7096f5ef122afda491914e893b2d7e75c2d85d40a75dce6218c7fadf7c8c5459ea8a2a68d2016275db5e09b WHIRLPOOL b3588a7dad70fd51b87d6ad1ba7d951068562649a4fd630eca9983698c1e5dda34ae2498a1e086102164b66eafea6ebc7de787a1986b6018b222f1cc4e441abf
 EBUILD glib-networking-2.32.3.ebuild 1879 SHA256 06920b6148c4b300d50d62cb35e848b319723844d2a9196cbe930c0479d26014 SHA512 7ebd5817c45b94cd8ccc63e2c54339bb5456aaeea573db63c6b8a6df5184f7a524c9b2f631c421107283fde0cc2e58f3e0deb0ce4caca91e24ba19856477b8c4 WHIRLPOOL 12bf8ccbaac62c1128e0e5d5c604f26607d3c02612e7a2ce9a7a6bc0684fd38cd6155ed1f0870d3da9af237436029f3e8cd97d4b5f79e2f9c1051b9f4051ecdf
 EBUILD glib-networking-2.34.2.ebuild 1697 SHA256 1642f3997c77b9cc52931af3211f6f5002050ccc0032017cd9056db9d044a57e SHA512 b46846dd0fe4fab0681e6ec2bda0dcaa272d604f5af67a668ad26ff56dc41871a938fe2be8e65c48c2587de592ea6be3cc0417267520f8e770245283992043f2 WHIRLPOOL aa05e5d7a813cd518a5e58f04be322b1d31278d5962ca9aed4915cf2167d4af41c9140b7d50bb8f70be961afc7e6790c2310fff6091527db4a2d4e22c099d9b2
 EBUILD glib-networking-2.36.0.ebuild 1701 SHA256 ac56eb847b54a2eccfdf6a53bd7c847159190b875a6c7b938f0b341cc5b6c143 SHA512 eab4adff2cb18df8b415b3440ce13fb3ff9ab2a87ede6f9e9e542b0321677016f907508d0c11c8835dc5bd9199dd144d56e0f89e1de7b0aae7534f32a5fa7e74 WHIRLPOOL 2535179b6dbcfd16e37629123d000a451d855ee68fb4fcbf85d9828e5ee83e960f4caca1328a14c0eaa4355e064effaed8f75572aeb059523117d6beb48ee872
-MISC ChangeLog 9480 SHA256 cff1eff53e539388f9ddc621138cf97785fbbfae5a2f353792a67e21d240a59e SHA512 e1b98c4f2d81dd96e255e2b0c52c278531a3b5b5bb5b03ac92fbc38568217b02f051c6c371950b5e41acf440a7fa4a38f287513714dabdeca43c22a39bb9b148 WHIRLPOOL 9b1a0115deb40911a43fe7e005ea2fdc5527974069580557b58f91460a16699bf91e48bb5c1e477b3dcfa25ce92198ed8b5cbbddb31633f79bf9b757d7e9f818
+EBUILD glib-networking-2.36.1.ebuild 1723 SHA256 84c2fb9e374e6a410f407f29cc0e44ca92ba59bb1b0ffa884f56c9530dda47e6 SHA512 779247d1c776868df6240b52ad919ffa2096a84a552d937eec43f58f4613099495d55324d27ad7511d4ea6a224b681cf0e037e7aacf040255253a45e0f38d03b WHIRLPOOL 26e7ff77c29158cffda21c36b532cb4deb4956aee26ff46f1e482a93c915957cd3c60a6bc2a3986cb14342b9615ca63112ac20290e1d05e0a0de59ab5d6ea005
+MISC ChangeLog 9659 SHA256 b03d1fc54e0a1fb102578b8e95258e1d71056d2de6f1d0e06a29a6f09ceba798 SHA512 fd4aec12481b5601d41d606974361395fef4a50378841eb86346d5509a7376f83d98a3999c8501ce3a97dde6943d84af5714232c740be6e9171b2931ddbd05ae WHIRLPOOL 624acefcfae766f25104b3dd1651593880e1da365a95219a3d50d79c19a2d72f5446f09ca96e1be80bb1a2932fdc1855a562d5e159bfcb0c49625fc2ba15f07f
 MISC metadata.xml 395 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e SHA512 302a9f2dff08e1925f57d3384875f2397f70998736d8b70f0d46f7f3abe37f6aaad192ae593395333e8f5118043a47dbdd1675dcdb4a6f84500d7d58b1e9af31 WHIRLPOOL 89498cd69c69b219da5cb20c337d2be0187e9db702c8a83b0f7ffcc6a0d1ded8a753a05dc28cd304f5098aa821be8fd8aa774b38818d370c3a56cbec01d8d6a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFhrBQACgkQ1fmVwcYIWAYZIwCgm+wc7OD/KXzBPhKHpdQ52hof
-B+AAoOlwN8tJLACvLCjyu9Kn2V6Q/t0H
-=bgiU
+iEYEAREIAAYFAlF23JgACgkQCaWpQKGI+9RoWwCfQ2SEun60PCPzab8tdrwlGg22
+kHMAn1wTmVffvcye7sTmcr4h/KY7G6sK
+=GK5g
 -----END PGP SIGNATURE-----
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
+}