diff options
| -rw-r--r-- | net-libs/gnet/files/gnet-2.0.8-autotools.patch | 37 | ||||
| -rw-r--r-- | net-libs/gnet/gnet-2.0.8-r4.ebuild (renamed from net-libs/gnet/gnet-2.0.8-r3.ebuild) | 50 |
2 files changed, 58 insertions, 29 deletions
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 \ |