gentoo resync : 28.04.2019

3 files changed, 2 insertions, 87 deletions

diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index bc9296dfff09..93185c1f97bb 100644
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -1,6 +1,4 @@
 AUX 2.58.0-disable-failing-tests.patch 1879 BLAKE2B 6821bf4e1e18f085759c9ac19ff80a53d7b3e0c1af03db84faa2a19a6b7076ba129a00db47a0513e412e66a853b27c4e389622799843d2b0ab8a37e2fbe314d3 SHA512 18894abf35e3e750282d8563e5fac8f8ea2306ced81909a8aca6a55f3a8075c4e13c69706814c257b486a32fa4b5f02ae3696cd04d468e0d2838b7ff74228a94
-DIST glib-networking-2.50.0.tar.xz 435380 BLAKE2B 02eea0692cf20c9b1df8efc7e65eb144675fa307851450d461a73df6ccd55cb2ad4e8db5790ca8b0a38a14e30391e583dada30e858154e7c5b7fa0970658410a SHA512 a1e9d28a546f83d461057f088ca2467a32be110f444c8ede1cbfeb20244637d8d5fb5b5b0ee4485feb517beebc3536671442bbfdd3ba01663b52e6da138bd7fe
 DIST glib-networking-2.58.0.tar.xz 172632 BLAKE2B 2b1e478ecac7ffb25f0d4e319fc71f7a0c6d9bd4181a5e8abb310d11774491312b0ff1c81b9d8b383ae0b236ece89253d6bd222740199d816c94ea557b4e3511 SHA512 d9cfd97ef9905eceb1f807a7d18c648fcf148214bf3fc55c718c5bcd6fb0afc429ab5b7bf72e83cf959d5ce7f145ce17952c1288d4225cc99d3c6ad66e4494ff
-EBUILD glib-networking-2.50.0.ebuild 2298 BLAKE2B 0426bb0f2248be977e20c1f3f95df7283e56c08969f4f2ffe6b20dfa34b91bbe3d37200574f9e708803a4f8eeae450ce4a3ef2ec7028ac0ba76791225c755292 SHA512 9e84588bde50d6b13f36ffc0e0e906639eb38bcd4c0282fe531a42adffaca7a199b678f59878f443058a4b9489cd31eccab7a153f421d61f350433eaa58b7993
-EBUILD glib-networking-2.58.0.ebuild 1955 BLAKE2B b95b1357c7425694cba80908a5e30af8bed7ab7cceb68cbaa3efbfa2943da9bb8917891381e5e0016d662865ef2cd13ec5b669ccf96b1bd0212d53725112e085 SHA512 52cf4c6a7797690b5a2274156a1cb9fb2e7383240e1261bfbd75a521d79b0f10e0f9ed3c3c8b9792d1b2880ab8bde845e372343f976c102decca962a00d13bb3
+EBUILD glib-networking-2.58.0.ebuild 1952 BLAKE2B 3a801454107b9250a12912ecd5c82ff134558f853cd2a63081c449a5cb7fe47dcc475fb34ef10830bff4d4a0c5afde5753c894420a10b93ca1fd96eb999bbede SHA512 b0d2a0c4d7f654c955a6aa6f7979b6d81cc32217dd4a1f2dc6129cbe114a65e52c48ed7c068145f0d2ee2e8d6de072d869bac9c1b562b0d877ed2132e5fa0652
 MISC metadata.xml 481 BLAKE2B f777702cce7998cc718ae660ab6bfc0842afdfaa4a81f34cc585c18bd94bbce3f0a41c6d23cb1bfe6bdcb008a64e34dca73b4a2e9f048254a5199c2aa698fc36 SHA512 7e72edca01c8141f913340022b2f3682ddb05e96d4c6bdd8abc361b21822ab9f4c0a129aa059e94e420d73fd7187c5477e3b578f5019dfb6fb2427d04698d050
diff --git a/net-libs/glib-networking/glib-networking-2.50.0.ebuild b/net-libs/glib-networking/glib-networking-2.50.0.ebuild
deleted file mode 100644
index fcf20f749d31..000000000000
--- a/net-libs/glib-networking/glib-networking-2.50.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 multilib-minimal virtualx
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-IUSE="+gnome +libproxy smartcard +ssl test"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~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.46.0:2[${MULTILIB_USEDEP}]
-	gnome? ( gnome-base/gsettings-desktop-schemas )
-	libproxy? ( >=net-libs/libproxy-0.4.11-r1:=[${MULTILIB_USEDEP}] )
-	smartcard? (
-		>=app-crypt/p11-kit-0.18.4[${MULTILIB_USEDEP}]
-		>=net-libs/gnutls-3:=[pkcs11,${MULTILIB_USEDEP}] )
-	ssl? (
-		app-misc/ca-certificates
-		>=net-libs/gnutls-3:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	>=sys-devel/gettext-0.19.4
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus[X] )
-"
-# eautoreconf needs >=sys-devel/autoconf-2.65:2.5
-
-src_prepare() {
-	default
-	# Disable SSLv3 requiring fallback test, which fails with net-libs/gnutls[-sslv3], bug 595952
-	# https://bugzilla.gnome.org/show_bug.cgi?id=782853
-	sed -i -e '/\/tls\/connection\/fallback\/SSL/d' "${S}"/tls/tests/connection.c || die
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} \
-	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)
-}
-
-multilib_src_test() {
-	# XXX: non-native tests fail if glib-networking is already installed.
-	# have no idea what's wrong. would appreciate some help.
-	multilib_is_native_abi || return 0
-
-	virtx emake check
-}
-
-multilib_src_install() {
-	gnome2_src_install
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	multilib_pkg_postinst() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-
-	multilib_pkg_postrm() {
-		gnome2_giomodule_cache_update \
-			|| die "Update GIO modules cache failed (for ${ABI})"
-	}
-	multilib_foreach_abi multilib_pkg_postrm
-}
diff --git a/net-libs/glib-networking/glib-networking-2.58.0.ebuild b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
index 99544bf7f56e..3c2e24b0db5d 100644
--- a/net-libs/glib-networking/glib-networking-2.58.0.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.58.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://git.gnome.org/browse/glib-networking/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+gnome +libproxy +ssl test"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.55.1:2[${MULTILIB_USEDEP}]