commit: 9a9c062bf8e328aac84825b9c265a8d1e1d1781f Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sun Nov 13 13:34:42 2022 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> CommitDate: Mon Nov 14 15:11:25 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a9c062b
net-libs/gnet: Delete Closes: https://bugs.gentoo.org/349301 Closes: https://bugs.gentoo.org/713152 Closes: https://bugs.gentoo.org/802723 Closes: https://bugs.gentoo.org/808435 Closes: https://bugs.gentoo.org/870730 Closes: https://bugs.gentoo.org/877079 Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> net-libs/gnet/Manifest | 1 - net-libs/gnet/files/gnet-2.0.8-autotools.patch | 37 ------------- .../gnet/files/gnet-2.0.8-check-usage-update.patch | 35 ------------ net-libs/gnet/files/gnet-2.0.8-context-leak.patch | 32 ----------- .../files/gnet-2.0.8-fix-pkgconfig-abuse.patch | 16 ------ net-libs/gnet/files/gnet-2.0.8-network-tests.patch | 32 ----------- .../files/gnet-2.0.8-test-existing-domain.patch | 32 ----------- .../gnet/files/gnet-2.0.8-unittest-build.patch | 22 -------- .../gnet/files/gnet-2.0.8-unittest-service.patch | 31 ----------- net-libs/gnet/gnet-2.0.8-r4.ebuild | 62 ---------------------- net-libs/gnet/metadata.xml | 8 --- profiles/package.mask | 7 --- 12 files changed, 315 deletions(-) diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest deleted file mode 100644 index f69fc6cf19af..000000000000 --- a/net-libs/gnet/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST gnet-2.0.8.tar.bz2 514019 BLAKE2B 6e09912d4d438fc55290c9df45b2fe29397efbaf2ca0ff88fa6e22a9935aa1520f4a1faac24720ab1925bd6537a8725766351e4256e036ef61cfea91470bc6d5 SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f diff --git a/net-libs/gnet/files/gnet-2.0.8-autotools.patch b/net-libs/gnet/files/gnet-2.0.8-autotools.patch deleted file mode 100644 index 760e41398fa6..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-autotools.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -7,6 +7,7 @@ - - # Init autoconf and automake - AC_INIT([gnet], [2.0.8], [[email protected]]) -+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/files/gnet-2.0.8-check-usage-update.patch b/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch deleted file mode 100644 index 0ca2156b791d..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-check-usage-update.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a61601a487394cbd5970c3b736aea71bf277ecc1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]> -Date: Sat, 16 Oct 2010 20:13:52 +0100 -Subject: [PATCH] tests: require check >= 0.9.7 for unit tests, and fix for new API - -The check API changed slightly. Fix things for the new API. - -https://bugzilla.gnome.org/show_bug.cgi?id=632258 ---- - tests/check/gnetcheck.h | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/tests/check/gnetcheck.h b/tests/check/gnetcheck.h -index aeb9f68..14b6c28 100644 ---- a/tests/check/gnetcheck.h -+++ b/tests/check/gnetcheck.h -@@ -311,11 +311,11 @@ int main (int argc, char **argv) \ - gboolean _gnet_check_run_test_func (const gchar * func_name); - - static inline void --__gnet_tcase_add_test (TCase * tc, TFun tf, const gchar * func_name, -- int sig, int start, int end) -+__gnet_tcase_add_test (TCase * tc, TFun tf, const char * fname, int signal, -+ int allowed_exit_value, int start, int end) - { -- if (_gnet_check_run_test_func (func_name)) { -- _tcase_add_test (tc, tf, func_name, sig, start, end); -+ if (_gnet_check_run_test_func (fname)) { -+ _tcase_add_test (tc, tf, fname, signal, allowed_exit_value, start, end); - } - } - --- -1.7.3.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-context-leak.patch b/net-libs/gnet/files/gnet-2.0.8-context-leak.patch deleted file mode 100644 index a56e549edccf..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-context-leak.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d6997987ce7f3e84d1125715b17502452d085073 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]> -Date: Tue, 13 May 2008 07:10:28 +0000 -Subject: [PATCH] Don't leak main context ref when one was set. Spotted by Kuang-Chun Cheng. - - * src/conn.c: (gnet_conn_unref): - Don't leak main context ref when one was set. - Spotted by Kuang-Chun Cheng. - - -svn path=/trunk/; revision=495 ---- - src/conn.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/src/conn.c b/src/conn.c -index f4de415..9d41fa6 100644 ---- a/src/conn.c -+++ b/src/conn.c -@@ -305,6 +305,9 @@ gnet_conn_unref (GConn* conn) - if (conn->inetaddr) - gnet_inetaddr_delete (conn->inetaddr); - -+ if (conn->context) -+ g_main_context_unref (conn->context); -+ - g_free (conn->buffer); - - g_free (conn); --- -1.7.3.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch b/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch deleted file mode 100644 index 9c85b72d8e29..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch +++ /dev/null @@ -1,16 +0,0 @@ -Bug-Debian: http://bugs.debian.org/652165 -Author: Julien Cristau <[email protected]> - -use pkg-config to get the glib include path, not hardcode it. - ---- gnet-2.0.8.orig/gnet-2.0.pc.in -+++ gnet-2.0.8/gnet-2.0.pc.in -@@ -6,5 +6,6 @@ - Name: Gnet - Description: A network compatibility layer library - Version: @VERSION@ --Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ @GLIB_LIBS@ @GTHREAD_LIBS@ --Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ @GLIB_CFLAGS@ @GTHREAD_CFLAGS@ -+Libs: -L${libdir} -lgnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -+Requires.private: glib-2.0 gthread-2.0 -+Cflags: -I${includedir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@ -I${libdir}/gnet-@GNET_MAJOR_VERSION@.@GNET_MINOR_VERSION@/include/ diff --git a/net-libs/gnet/files/gnet-2.0.8-network-tests.patch b/net-libs/gnet/files/gnet-2.0.8-network-tests.patch deleted file mode 100644 index 7bb7cefd133c..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-network-tests.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 576f6de12bf4a509882af0bbe4727e27e8bc9373 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Tue, 16 Nov 2010 14:18:08 +0100 -Subject: [PATCH] Do not build network related tests if not enabled - ---- - tests/check/gnet/gnetconn.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/tests/check/gnet/gnetconn.c b/tests/check/gnet/gnetconn.c -index 739b467..0558e28 100644 ---- a/tests/check/gnet/gnetconn.c -+++ b/tests/check/gnet/gnetconn.c -@@ -25,6 +25,7 @@ - - #include <string.h> - -+#ifdef GNET_ENABLE_NETWORK_TESTS - static void - conn_fail_cb (GConn * conn, GConnEvent * event, gpointer data) - { -@@ -243,6 +244,7 @@ GNET_START_TEST (test_conn_new_socket) - g_main_loop_unref (loop); - } - GNET_END_TEST; -+#endif - - static Suite * - gnetconn_suite (void) --- -1.7.3.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch b/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch deleted file mode 100644 index b75258e38d02..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 1825f69b1a149cd3f2daa5f6c3333a32f0470f0a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <[email protected]> -Date: Sat, 16 Oct 2010 23:10:15 +0100 -Subject: tests: update GConnHttp unit test to not use inactive domains - -www.gnetlibrary.org has been abandoned. - -diff --git a/tests/check/gnet/gnetconnhttp.c b/tests/check/gnet/gnetconnhttp.c -index b1cecce..4316f74 100644 ---- a/tests/check/gnet/gnetconnhttp.c -+++ b/tests/check/gnet/gnetconnhttp.c -@@ -487,7 +487,7 @@ GNET_END_TEST; - - GNET_START_TEST (test_gnet_http_get) - { -- const gchar *urls[] = {"http://www.gnetlibrary.org/src/";, -+ const gchar *urls[] = {"http://www.gnome.org/";, - "http://www.heise.de"; }; - guint i; - -@@ -514,7 +514,7 @@ GNET_END_TEST; - - GNET_START_TEST (test_get_binary) - { -- gchar *uris[] = { "http://www.gnetlibrary.org/gnet.png"; }; -+ gchar *uris[] = { "http://www.gnome.org/img/logo/foot-16.png"; }; - guint i; - - for (i = 0; i < G_N_ELEMENTS (uris); ++i) { --- -cgit v0.10.1 - diff --git a/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch b/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch deleted file mode 100644 index 9527dbe5da65..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch +++ /dev/null @@ -1,22 +0,0 @@ -Fix build failure with newer releases of check library. - ---- a/tests/check/gnetcheck.h 2014-09-27 15:32:17.088312230 +0200 -+++ b/tests/check/gnetcheck.h 2014-09-27 15:32:35.728239492 +0200 -@@ -281,7 +281,7 @@ - _gnet_check_expecting_log = TRUE; \ - _gnet_check_raised_critical = FALSE; \ - code; \ -- _fail_unless (_gnet_check_raised_critical, __FILE__, __LINE__, \ -+ (_gnet_check_raised_critical) ? _mark_point(__FILE__, __LINE__) : _ck_assert_failed (__FILE__, __LINE__, \ - "Expected g_critical, got nothing", NULL); \ - _gnet_check_expecting_log = FALSE; \ - } G_STMT_END -@@ -291,7 +291,7 @@ - _gnet_check_expecting_log = TRUE; \ - _gnet_check_raised_warning = FALSE; \ - code; \ -- _fail_unless (_gnet_check_raised_warning, __FILE__, __LINE__, \ -+ (_gnet_check_raised_warning) ? _mark_point(__FILE__, __LINE__) : _ck_assert_failed (__FILE__, __LINE__, \ - "Expected g_warning, got nothing", NULL); \ - _gnet_check_expecting_log = FALSE; \ - } G_STMT_END diff --git a/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch b/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch deleted file mode 100644 index f2946aaf438c..000000000000 --- a/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch +++ /dev/null @@ -1,31 +0,0 @@ -Disable unittests requiring a running HTTP server on port 80. - ---- a/tests/check/gnet/gnetinetaddr.c.old 2014-09-27 17:56:51.130350306 +0200 -+++ b/tests/check/gnet/gnetinetaddr.c 2014-09-27 17:57:23.396114568 +0200 -@@ -443,7 +443,7 @@ - - GNET_START_TEST (test_inetaddr_list_async) - { -- do_test_inetaddr_list_async ("localhost"); -+/* do_test_inetaddr_list_async ("localhost"); */ - /* FIXME: these might not work right yet because of the timings in the test - #ifdef GNET_ENABLE_NETWORK_TESTS - do_test_inetaddr_list_async ("www.google.com"); -@@ -573,7 +573,7 @@ - - GNET_START_TEST (test_inetaddr_name_async) - { -- do_test_inetaddr_name_async ("localhost"); -+/* do_test_inetaddr_name_async ("localhost"); */ - - /* FIXME: these might not work right yet because of the timings in the test - #ifdef GNET_ENABLE_NETWORK_TESTS -@@ -798,7 +798,7 @@ - - GNET_START_TEST (test_inetaddr_reverse_async) - { -- do_test_inetaddr_reverse_async ("localhost"); -+/* do_test_inetaddr_reverse_async ("localhost"); */ - - #ifdef GNET_ENABLE_NETWORK_TESTS - do_test_inetaddr_reverse_async ("gabe.freedesktop.org"); diff --git a/net-libs/gnet/gnet-2.0.8-r4.ebuild b/net-libs/gnet/gnet-2.0.8-r4.ebuild deleted file mode 100644 index 9beafdec55d7..000000000000 --- a/net-libs/gnet/gnet-2.0.8-r4.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -GNOME2_EAUTORECONF="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit gnome2 - -DESCRIPTION="A simple network library" -HOMEPAGE="https://wiki.gnome.org/Projects/GNetLibrary"; - -LICENSE="LGPL-2" -SLOT="2" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="test" -RESTRICT="!test? ( test )" - -# FIXME: automagic use of valgrind -RDEPEND=">=dev-libs/glib-2.6:2" -# 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" - -PATCHES=( - # Do not leak main context reference, from master - "${FILESDIR}"/${PN}-2.0.8-context-leak.patch - - # Fix usage of check framework, bug #296849, from master - # Disable this patch, bug 698654 - # "${FILESDIR}"/${PN}-2.0.8-check-usage-update.patch - - # ifdef around network tests code, refs. bug #320759 - "${FILESDIR}"/${PN}-2.0.8-network-tests.patch - - # Do not hardcode glib patch in pkgconfig file, debian bug #652165 - "${FILESDIR}"/${PN}-2.0.8-fix-pkgconfig-abuse.patch - - # Compatibility with recent check releases, bug #498046 - "${FILESDIR}"/${PN}-2.0.8-unittest-build.patch - - # gnetlibrary.org has been adandoned, from master - "${FILESDIR}"/${PN}-2.0.8-test-existing-domain.patch - - # Do not depend on a running HTTP server on port 80 for unittest - "${FILESDIR}"/${PN}-2.0.8-unittest-service.patch - - # Do not pass silly cflags with USE=debug, bug #320759, #672170 - "${FILESDIR}"/${PN}-2.0.8-autotools.patch -) - -src_configure() { - # Do not enable network tests in an ebuild environment - gnome2_src_configure \ - --disable-static \ - --disable-network-tests -} diff --git a/net-libs/gnet/metadata.xml b/net-libs/gnet/metadata.xml deleted file mode 100644 index 7b343b06be8a..000000000000 --- a/net-libs/gnet/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<maintainer type="project"> - <email>[email protected]</email> - <name>Gentoo GNOME Desktop</name> -</maintainer> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 64c9e3e3fba6..b12322da8a5f 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -248,13 +248,6 @@ dev-python/nose_warnings_filters # Removal on 2022-11-14 x11-terms/lilyterm -# Matt Turner <[email protected]> (2022-10-14) -# Unmaintained upstream. Last release in 2008. Only reverse dependency is -# gnome-mud, which is masked for removal. -# Bugs #349301, #713152, #802723, #808435, #870730, #877079. -# Removal on 2022-11-14 -net-libs/gnet - # Joshua Kinard <[email protected]> (2022-10-13) # Difficult-to-resolve build issues on modern toolchains, # not publicly maintained, developer contact is difficult,
![http://www.gnetlibrary.org/gnet.png"](http://www.gnetlibrary.org/gnet.png"){kind=link}
![http://www.gnome.org/img/logo/foot-16.png"](http://www.gnome.org/img/logo/foot-16.png"){kind=link}