gentoo resync : 16.04.2022

3 files changed, 60 insertions, 30 deletions

diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest
index 6b26a3132e0b..faea0d02b96c 100644
--- a/net-libs/gnet/Manifest
+++ b/net-libs/gnet/Manifest
@@ -1,3 +1,4 @@
+AUX gnet-2.0.8-autotools.patch 892 BLAKE2B c59c7c00f3dfd0fec790ca2f7104541eca131f206feae99985c688c142724632acd0b82be14b80e498893a259fa4e84ffb262511413b251b98f04dd76736e6b1 SHA512 9d07c47fb800e7b49b4f6d57b63614045c1519349481c426916a5a2b10426856c18020e1fea7ed78721d41febe9083031f7175ae529312d4be3dc9ca363060d3
 AUX gnet-2.0.8-check-usage-update.patch 1256 BLAKE2B 5ccb69dc29f55cc9d71337fa7b11b41129874c8f0a6fc7e8aaad363cadeb962c8b3b9e0f7729759acd62ee13838dfab6bea704eea683904ccf1c53dd74679621 SHA512 e69486e5240c9816991c6774fb24b8edd4709f8310f2fc5fb2d6ac59e96f9e30b74553834e4c6eb7a48e476dcee6dadb43224449d2ec9ff98b568965c3f40e81
 AUX gnet-2.0.8-context-leak.patch 838 BLAKE2B d8b780575bc38db378a9a9fc49ef8e89cc32a84d105e461f33522a5f8319789ec6704e01be58ed8b08d95539a4a2fea3a1849f2f7c43d49be960dbd3cdf302d7 SHA512 7d9a86f2580659372679846ae64050481064081c77f0019b1edddc3e565da13ba2f683a856d483268dd7a2c75d319956b5fab9393c5af8dba132457a2dba620d
 AUX gnet-2.0.8-fix-pkgconfig-abuse.patch 830 BLAKE2B e09a507471e04dea3ddf94a74a59b5b2924973b53328eb36b9f1c2d6c8097e497e494a903c61681b40d87d1cc34356885c58414d0b9d276fbfb19fdd35a855f6 SHA512 59b07d390fc1c8478346e86430e1fd8fb81286d4e68b8d3014bb59099855586e828292458071ebf02309f7b56e77918025ed7d43bf0df82270d0f17dcbb4bc6f
@@ -6,5 +7,5 @@ AUX gnet-2.0.8-test-existing-domain.patch 1000 BLAKE2B 26d58d6bf8a8fe3b46e7cc892
 AUX gnet-2.0.8-unittest-build.patch 1041 BLAKE2B 0efb7cd8f6d2b2cd8e775ad499614a4de2659153070f940a5326de36ca70b621b6ea41d27307cc62b67a20b3a490416884e3438b506c152f8370c2bb38468292 SHA512 f7cec5602a33a14083117188190881bd4e6cca188a16d854b9d48fe5fab7653386f7e8e116d2c3eedc30595068e844078b73286cc80e2d165f7acec0b8376773
 AUX gnet-2.0.8-unittest-service.patch 1093 BLAKE2B 572ac32893cf3221c9e2743a97bdf91dd60bba521ed54dac9252d260445d0da67b6b2eb68d5b21cd760f1e7e61b71c6f8ec7ffbce8b8ad4f248e27ba55bf505e SHA512 2b815264462491b072a7ffb2f8413999149aa249d33d5500fc2279b523c518a31c4dcb1baf3c5554bdfef0c6f4c112ebf1d26b19f211a0a7ace9f867e07c037b
 DIST gnet-2.0.8.tar.bz2 514019 BLAKE2B 6e09912d4d438fc55290c9df45b2fe29397efbaf2ca0ff88fa6e22a9935aa1520f4a1faac24720ab1925bd6537a8725766351e4256e036ef61cfea91470bc6d5 SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f
-EBUILD gnet-2.0.8-r3.ebuild 2057 BLAKE2B ca48c424db278f02683847883de06daf906ce4f555d4893da16583f3a5db33cf267e9bbd7d7c41c12fe71f470482850b019ec674f9f5f62a802d35f9cd8e7b5f SHA512 bdd19fc228fe7aeb83bfef89f09c18dff739b743dc3ed04e65b03b957b7351665a9d3df38716e25647e0330237fb0a66f12e1a36a40a028086a8789217583c40
+EBUILD gnet-2.0.8-r4.ebuild 1800 BLAKE2B b9e7ed89492115500670d8fc63c30e37160e4cddd8726b11cc7d35c8ca4139a33a8e181e30846cce8e8524eac06e267c48a22668a06a634be4ad36a3f980b9e2 SHA512 96dbbcebfbd677d05540f7734df8663661c63cc53cfb1cc712940225f04b0d681b86dad4e81af81b3638ab9d64cc5046fb1ce64b9e4f29f77ee06320dfaa034b
 MISC metadata.xml 250 BLAKE2B 8f7f0fe023d43e380e7861e897e6afcb5de4baefb42ea9c65a57dfc0d204c6f787a99295141832e732ebb08be218da56ba77e2dd9639e4e3aabf718ce4db1d0c SHA512 2684e772dd6d83e4b49f08f2ba22d8a0a753e7b46863489eff1b5d1f2f147ad80ffd93245ca405ac4c747249bc1b754454ec9865fe16da70f9b257051e105fd8
diff --git a/net-libs/gnet/files/gnet-2.0.8-autotools.patch b/net-libs/gnet/files/gnet-2.0.8-autotools.patch
new file mode 100644
index 000000000000..760e41398fa6
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-autotools.patch
@@ -0,0 +1,37 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,6 +7,7 @@
+ 
+ # Init autoconf and automake
+ AC_INIT([gnet], [2.0.8], [gnet@gnetlibrary.org])
++AC_CONFIG_MACRO_DIR([macros])
+ AC_CANONICAL_SYSTEM
+ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
+ AM_MAINTAINER_MODE
+@@ -127,7 +128,6 @@
+ ###############################
+ # Check for programs
+ AC_PROG_CC
+-AM_PROG_CC_STDC
+ AC_PROG_INSTALL
+ AC_PROG_MAKE_SET
+ AC_LIBTOOL_WIN32_DLL
+@@ -551,9 +551,6 @@
+ if test "x$GCC" = "xyes"; then
+   CFLAGS="$CFLAGS -Wall -Wstrict-prototypes \
+     -Wmissing-prototypes -Wmissing-declarations"
+-  if test "x$enable_debug" = "xyes"; then
+-    CFLAGS="$CFLAGS -Werror"
+-  fi
+ 
+   if test "x$enable_ansi" = "xyes"; then
+     CFLAGS="$CFLAGS -ansi"
+@@ -610,7 +607,7 @@
+ # Outputs
+ ###############################
+ 
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS(config.h)
+ AC_CONFIG_FILES([
+ 	Makefile
+ 	src/Makefile
diff --git a/net-libs/gnet/gnet-2.0.8-r3.ebuild b/net-libs/gnet/gnet-2.0.8-r4.ebuild
index 27d0d63139f0..9beafdec55d7 100644
--- a/net-libs/gnet/gnet-2.0.8-r3.ebuild
+++ b/net-libs/gnet/gnet-2.0.8-r4.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="yes"
+EAPI=8
+
+GNOME2_EAUTORECONF="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit autotools epatch gnome2
+inherit gnome2
 
 DESCRIPTION="A simple network library"
 HOMEPAGE="https://wiki.gnome.org/Projects/GNetLibrary"
@@ -18,51 +19,42 @@ RESTRICT="!test? ( test )"
 
 # FIXME: automagic use of valgrind
 RDEPEND=">=dev-libs/glib-2.6:2"
-DEPEND="${RDEPEND}
-	>=dev-libs/check-0.9.11
-	>=dev-util/gtk-doc-am-1.2
-	virtual/pkgconfig
-"
 # FIXME: check should only be needed with USE 'test', bug #349301
 #	test? ( >=dev-libs/check-0.9.7 )"
+DEPEND="${RDEPEND}
+	>=dev-libs/check-0.9.11"
+BDEPEND="
+	>=dev-util/gtk-doc-am-1.2
+	virtual/pkgconfig"
 
-src_prepare() {
+PATCHES=(
 	# Do not leak main context reference, from master
-	epatch "${FILESDIR}"/${PN}-2.0.8-context-leak.patch
+	"${FILESDIR}"/${PN}-2.0.8-context-leak.patch
 
 	# Fix usage of check framework, bug #296849, from master
 	# Disable this patch, bug 698654
-	# epatch "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch
+	# "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch
 
 	# ifdef around network tests code, refs. bug #320759
-	epatch "${FILESDIR}"/${PN}-2.0.8-network-tests.patch
+	"${FILESDIR}"/${PN}-2.0.8-network-tests.patch
 
 	# Do not hardcode glib patch in pkgconfig file, debian bug #652165
-	epatch "${FILESDIR}"/${PN}-2.0.8-fix-pkgconfig-abuse.patch
+	"${FILESDIR}"/${PN}-2.0.8-fix-pkgconfig-abuse.patch
 
 	# Compatibility with recent check releases, bug #498046
-	epatch "${FILESDIR}"/${PN}-2.0.8-unittest-build.patch
+	"${FILESDIR}"/${PN}-2.0.8-unittest-build.patch
 
 	# gnetlibrary.org has been adandoned, from master
-	epatch "${FILESDIR}"/${PN}-2.0.8-test-existing-domain.patch
+	"${FILESDIR}"/${PN}-2.0.8-test-existing-domain.patch
 
 	# Do not depend on a running HTTP server on port 80 for unittest
-	epatch "${FILESDIR}"/${PN}-2.0.8-unittest-service.patch
-
-	# Do not pass silly cflags with USE=debug, bug #320759
-	sed -i \
-		-e 's:-Werror::' \
-		-e '/AM_PROG_CC_STDC/d' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
-		configure.ac || die
+	"${FILESDIR}"/${PN}-2.0.8-unittest-service.patch
 
-	# bug #672170
-	AT_M4DIR="macros" eautoreconf
-	gnome2_src_prepare
-}
+	# Do not pass silly cflags with USE=debug, bug #320759, #672170
+	"${FILESDIR}"/${PN}-2.0.8-autotools.patch
+)
 
 src_configure() {
-	DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO"
 	# Do not enable network tests in an ebuild environment
 	gnome2_src_configure \
 		--disable-static \