Fix build with recent check version, bug #498046. Apply a fix to pkgconfig from Debian. Update to EAPI=5 and team guidelines.

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

7 files changed, 189 insertions, 5 deletions

diff --git a/net-libs/gnet/ChangeLog b/net-libs/gnet/ChangeLog
index 8f778d03ee96..d3b846ce0be7 100644
--- a/net-libs/gnet/ChangeLog
+++ b/net-libs/gnet/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/gnet
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.81 2014/08/10 20:48:33 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/ChangeLog,v 1.82 2014/09/27 16:06:31 eva Exp $
+
+*gnet-2.0.8-r2 (27 Sep 2014)
+
+  27 Sep 2014; Gilles Dartiguelongue <eva@gentoo.org> +gnet-2.0.8-r2.ebuild,
+  +files/gnet-2.0.8-fix-pkgconfig-abuse.patch,
+  +files/gnet-2.0.8-test-existing-domain.patch,
+  +files/gnet-2.0.8-unittest-build.patch,
+  +files/gnet-2.0.8-unittest-service.patch:
+  Fix build with recent check version, bug #498046. Apply a fix to pkgconfig
+  from Debian. Update to EAPI=5 and team guidelines.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> gnet-2.0.8-r1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/net-libs/gnet/Manifest b/net-libs/gnet/Manifest
index 4378c8ed3cab..6fd020c96058 100644
--- a/net-libs/gnet/Manifest
+++ b/net-libs/gnet/Manifest
@@ -4,15 +4,20 @@ Hash: SHA256
 AUX gnet-2.0.8-check-usage-update.patch 1256 SHA256 f6013b797ba9f5e0bf0bcf9f0d3686d672b29e059bd1c1d99b244288d40a16d5 SHA512 e69486e5240c9816991c6774fb24b8edd4709f8310f2fc5fb2d6ac59e96f9e30b74553834e4c6eb7a48e476dcee6dadb43224449d2ec9ff98b568965c3f40e81 WHIRLPOOL a893a33d3ff8eed735d33ff685e8c10f04ad123a4a6cbe415942b1d31ffa1a6e746ced95d71dfdd7b28acaf960830ce76882a449c51c0a4a9b57b46d00c5e63f
 AUX gnet-2.0.8-context-leak.patch 838 SHA256 ff68ff73a8b46d6b78713aacb47ae558671dc241a01019b63fd0638c9fe102f8 SHA512 7d9a86f2580659372679846ae64050481064081c77f0019b1edddc3e565da13ba2f683a856d483268dd7a2c75d319956b5fab9393c5af8dba132457a2dba620d WHIRLPOOL 867d21e0b5e806e4e6fe3aa6bc33593bfccaa41495fcc38688e48852b512f77cdd6f6b7b000ddb322616197b2c4a816d677555ee0ec6756cd6671b826680f936
 AUX gnet-2.0.8-define-location.patch 519 SHA256 65824a271eb64d34d227c8f5865586790fe3a3c943fef65ae71f8f94ef471fe2 SHA512 a0d20e0f17d8247509a8e78b2571910167f0815679f0f30c75fc3ed69a31a20e8e70fb7005febdea1b7f81ef8b30603d99cffb522af185d163d2e9bb12a6e12f WHIRLPOOL 47e6f38e54a7b802c3b61b668c21b6a4203e50810778f2c712b5af2ad53271d246f38c5053f9ff073d5884ec2fdd841edd130db46afaa1defc067679af61c954
+AUX gnet-2.0.8-fix-pkgconfig-abuse.patch 830 SHA256 a6e9008880da95d4d57c4e8cbf92ca41f5dac9b6e8fa4e82fd9cda9eb240d5f7 SHA512 59b07d390fc1c8478346e86430e1fd8fb81286d4e68b8d3014bb59099855586e828292458071ebf02309f7b56e77918025ed7d43bf0df82270d0f17dcbb4bc6f WHIRLPOOL 59aec0dfa87b279c1ff3d617604d364b9a96a192b18fa3bc8745f1b77b3a2876646bc46754ea970ef09221c847925a7afe4ef971cafed563cf16781c2388fb5a
 AUX gnet-2.0.8-network-tests.patch 811 SHA256 0883e4a0d6c19e96f2f168b201966fe33ced2f17462fcd0231c682b2fdfd7b76 SHA512 c500dc6806f84eb1e6121fb35b6275f3cbabe3957aecdc246e4c68ae95b39e33fe1d82f76df767e1a463cb58aa9150e4469f7b30ab57a9d66a218f8064b48cb5 WHIRLPOOL e3f00018f4fb441eadb5b1e70980e084813a56d53cf850b9145831bc3cbaeb3e2fdfcd6f7371922f96ce07063fd4234ff28d9ab93364ef9019710c0c407b912d
+AUX gnet-2.0.8-test-existing-domain.patch 1000 SHA256 4f9cc07979fe08b63f5b0c64461e7ad698348d82ecd2f6b9edc74a60d1e9ef4d SHA512 5c514357bd7ef59a4d97154c436aaf60e38e4fd1aa479df1a750df2329369e486bae6e74e1e5dace5b0a8e0b8d130707c6b2b87deb1aeca3ed9a2c95974bab4e WHIRLPOOL 7a6f46db09c65908784918d8418b16bb9b1b5ef5de572132058b463705331aac542d5b4b4851da196d535affc81c218f81bc19eb8ef15e9399026558ae776e1b
+AUX gnet-2.0.8-unittest-build.patch 1041 SHA256 6ee1a7a7bf0090ac07129d6723faf812c280dac14344e289a96e9f4fe4334df5 SHA512 f7cec5602a33a14083117188190881bd4e6cca188a16d854b9d48fe5fab7653386f7e8e116d2c3eedc30595068e844078b73286cc80e2d165f7acec0b8376773 WHIRLPOOL c63ccdb0a23a48e151bb63f6a2a67b1ada93c409b43b9daef50d4e6d031098ce7602c87cbcb479ca799c5747509ee0543771c842b69ad5f508e0092ff9f01d95
+AUX gnet-2.0.8-unittest-service.patch 1093 SHA256 a83fa961f1d25e02f22eadd51ad0cd03ebd9c65512915c1962c7a6401b434f1e SHA512 2b815264462491b072a7ffb2f8413999149aa249d33d5500fc2279b523c518a31c4dcb1baf3c5554bdfef0c6f4c112ebf1d26b19f211a0a7ace9f867e07c037b WHIRLPOOL 7a5c4096d7dccfbe0468793f8097c211b2d46c6c7259d18a7eef0e9d61c29e55e7e49148f498b97b4a972a82903711f6ecd74e15bfcbd34175c8e328e0e34eac
 DIST gnet-2.0.8.tar.bz2 514019 SHA256 14034c7ef571a93f2aca21b2280fa86b35ef5730541d3eb57557dd42d7cc506b SHA512 b52ce73c62eb93d7f68a124128780dcf6c6795e82436d0882469dd7873d482c6b87c77d4efa9f69838a58313d7d958abad5b41a89620014c239030d0294cf11f WHIRLPOOL f259f28194b9932f30a72cfe9cbd7a645dbf18a0d02b8b3a506e4bf90ffb77a76f45500142d0b7b2e2c370f0da2f40e99710f5599336ff7d1080de108a60cbfd
 EBUILD gnet-2.0.8-r1.ebuild 1542 SHA256 f7ac4843274a91881d2ea79acf207d4ea2e3159c2f3e039b13d2dbcf50616701 SHA512 06de9b7cd4237dc68ea4112429e5ed0f23a0bd259fdabc455f6b7784a491d1fbc9cebdf137ac2819374d262a703964f2dcf922d08a1f4cfbd87f6c5de8a3323c WHIRLPOOL 9f0e8d2e6316483212d3883185096f05aeef243a107f9deb2db69926bef3e50f613d158942e6ea6d21c6a8fb6fc9d6ca03eb6160d1055e444d0e3f3ba82905d5
-MISC ChangeLog 10116 SHA256 061c5da5c503d0ccef50c8a7e93303721c9729f58e7df35f5fe7249a6c92e4d4 SHA512 be969e076bdb7d4cd039187fe7e4314ea5022e8df2efed18e7feb4962f97b3cb3a9df93e1645a5dca8c96dc1944b60d57b8cab8b22b6fab62d5426429b6d0603 WHIRLPOOL 740a821d8b965627206fa4b020cb970aad05276d099e2ef7b1e26f367eb92b1de735b8160263aa269d0b999c5096b051844bffa0106eb9a44f169028cd5c7f3d
+EBUILD gnet-2.0.8-r2.ebuild 2075 SHA256 70c50dc27f1175853eb739bc088e02b97feefe39678f52e3708bba09fffdb99f SHA512 cba4fe209e0bcd845358aff1d501410b2da45a94d66961b776e22928a6aef5149398d873726126a6c53d0325791b8f2f61b5db1bc880b0acff0f92e82586d6b3 WHIRLPOOL 69f99517df1af065ed0946285d5a42e179f9ee7168e140238c01d85388cb919096739efc7d673bfefe427f32ccaf934aae98b9609aa9ede5a41422236a82d21b
+MISC ChangeLog 10532 SHA256 522dc24a2aa6bf305a4c5b1793a6a52959f6917086fc374c84123c41bd443679 SHA512 b63c2367a5d6345b0fb6651324cf472e7406dcfb57e0c89c7667176ee14f2a78d777846ee48457c5b88e0ac2015f5b762b5050dd732bc9f99c3474c97eb34b34 WHIRLPOOL fd5c0d3d71e91128d23d5d731d35ab10cfcfbfacce9b1f61048493738c528d51b8c08a1168f6e97a53744e69adbc84eaf68cb5be4696f861521a8676f495ff43
 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn2qIACgkQcaHudmEf86pHYACfW2ttAnd8lZ9mEUWr+/u14Zyp
-72sAnjgXJS+jt4MmUln4jK1sqo5qoO4g
-=9HWR
+iEYEAREIAAYFAlQm4IgACgkQ1fmVwcYIWAYLGgCgrbwtfvbgw3bOuWHOmfIRR1tZ
+xPQAoNGoxpPrc3nyS5sC1+qZ7BkK9p58
+=EGG3
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..9c85b72d8e29
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-fix-pkgconfig-abuse.patch
@@ -0,0 +1,16 @@
+Bug-Debian: http://bugs.debian.org/652165
+Author: Julien Cristau <jcristau@debian.org>
+
+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-test-existing-domain.patch b/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch
new file mode 100644
index 000000000000..b75258e38d02
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-test-existing-domain.patch
@@ -0,0 +1,32 @@
+From 1825f69b1a149cd3f2daa5f6c3333a32f0470f0a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim.muller@collabora.co.uk>
+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
new file mode 100644
index 000000000000..9527dbe5da65
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-unittest-build.patch
@@ -0,0 +1,22 @@
+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
new file mode 100644
index 000000000000..f2946aaf438c
--- /dev/null
+++ b/net-libs/gnet/files/gnet-2.0.8-unittest-service.patch
@@ -0,0 +1,31 @@
+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-r2.ebuild b/net-libs/gnet/gnet-2.0.8-r2.ebuild
new file mode 100644
index 000000000000..e5e32200c2b3
--- /dev/null
+++ b/net-libs/gnet/gnet-2.0.8-r2.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnet/gnet-2.0.8-r2.ebuild,v 1.1 2014/09/27 16:06:31 eva Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A simple network library"
+HOMEPAGE="http://live.gnome.org/GNetLibrary"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+IUSE="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 )"
+
+src_prepare() {
+	# Do not leak main context reference, from master
+	epatch "${FILESDIR}"/${PN}-2.0.8-context-leak.patch
+
+	# Fix usage of check framework, bug #296849, from master
+	epatch "${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
+
+	# Do not hardcode glib patch in pkgconfig file, debian bug #652165
+	epatch "${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
+
+	# gnetlibrary.org has been adandoned, from master
+	epatch "${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
+
+	eautoreconf
+	gnome2_src_prepare
+}
+
+src_configure() {
+	DOCS="AUTHORS BUGS ChangeLog HACKING NEWS README* TODO"
+	# Do not enable network tests in an ebuild environment
+	gnome2_src_configure \
+		--disable-static \
+		--disable-network-tests
+}