Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

2 files changed, 13 insertions, 18 deletions

diff --git a/net-libs/gloox/Manifest b/net-libs/gloox/Manifest
index 3f02634b632a..e9365851d042 100644
--- a/net-libs/gloox/Manifest
+++ b/net-libs/gloox/Manifest
@@ -1,5 +1,5 @@
+DIST gloox-1.0.20.tar.bz2 701114 BLAKE2B d86b4de05a040b4f7fe1200d5863514778197e7e13ee08ebe983a85255065045c47b322ba20fa4ea051049ce609f122c00374cc3188f46c8729ec904da7778eb SHA512 b94269487875ae32631b5b15eeebe3293c6b8ab4080a6e15926c575305841a609a5e4da25bff266806ef4b65c1db14e9a9e5dabf8af8b174773cbdc37cfa12f8
 DIST gloox-1.0.21.tar.bz2 716449 BLAKE2B 9728b137b088e3ebd067dd88688474e37ec27108cc87ffe6d2d78b206c3215f36c072e333d04c659e5dc9db43c330bcac7ee7f495208bd8df1bbeb72db1e0792 SHA512 ee2c180e6a6e05955707fdd3e790c4c0e7be46fdf071201abd081b8620e3f664045f000804e1a30bddf8a3324e90f211ce5ee870fd5330ab87979dedfeb45575
-DIST gloox-1.0.22.tar.bz2 722653 BLAKE2B e029930ae51053772d4f7bb0cb0933cb260aacc571a6fab6b78c0e12cb7e119938c742afcc0e1af037a97c293f03b423a626c9b01dc9ce974b922c7e9054bcf2 SHA512 89b51dbee338ef8b234d934a5536a2e5d83d8121fa624e933b63bd15017d60f941781a1045884d0d125f50370ed7857cf4131242d39f6703e72c9cf064691416
+EBUILD gloox-1.0.20.ebuild 1063 BLAKE2B 5208eac42c29956090260acef6296431d5b11cb97bb228d8226b43d1d79d86a69265a46f68cf8e3db3ad45525f8812dcdd7e4a421cb765c4e08dfeb73dc6de12 SHA512 730a79015e801d6db8fc8cf8a3317fc3c173150afce50d240f9e619d601fa50682e193a4e9ea3c577c303c490a2dc3d355ed22fdf4d51ff4789c7874d9f36fa7
 EBUILD gloox-1.0.21.ebuild 1137 BLAKE2B 4dc96a2de96d178ce47a50557a87d9315bf7c300916d46bbf9d5944e62e4d80098e0b42c624f80970b5397725012de83c519146858ef2bce95dc3b7684392eb1 SHA512 26c80a4ac50faddbd2ec15bfcc45bb217441be6ae16c0d25428f283f82303fd0412cc3f6ec847fbd7caeba2e1dc6a1fea45c82e354c87b69651a5ac264a62a8d
-EBUILD gloox-1.0.22.ebuild 1113 BLAKE2B 14f3bcabe9c03b3047c97202cb7dc9a22f2fd936c414004086e4d3e32f964e206c227fe7a15ea1cc393ce14886bc8873917d743403cae1a792a0714158a1cf25 SHA512 75e0f22dafc9199ad527a2ebaa304f70ee41c07a5b5cb8fceaa31bc83787fdeb0a4e9be4946c17cb0c14bc727360f7750579a90352291316505577854e16f9b8
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/gloox/gloox-1.0.22.ebuild b/net-libs/gloox/gloox-1.0.20.ebuild
index 9b02001ae84f..96432182bb70 100644
--- a/net-libs/gloox/gloox-1.0.22.ebuild
+++ b/net-libs/gloox/gloox-1.0.20.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=6
 
 MY_P="${P/_/-}"
 DESCRIPTION="A portable high-level Jabber/XMPP library for C++"
@@ -23,27 +23,22 @@ DEPEND="idn? ( net-dns/libidn:= )
 
 RDEPEND="${DEPEND}"
 
-# GnuTLS checks hang forever
-RESTRICT="test"
-
 S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	# Examples are not installed anyway, so - why should we build them?
-	local myeconfargs=(
-		--without-examples
-		$(usex debug "--enable-debug" '')
-		$(use_enable static-libs static)
-		$(use_with idn libidn)
-		$(use_with gnutls)
-		$(use_with ssl openssl)
-		$(use_with test tests)
+	econf \
+		--without-examples \
+		$(usex debug "--enable-debug" '') \
+		$(use_enable static-libs static) \
+		$(use_with idn libidn) \
+		$(use_with gnutls) \
+		$(use_with ssl openssl) \
+		$(use_with test tests) \
 		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
 }
 
 src_install() {
 	default
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 }