From 1db00cc6e94b90c08090bb5b8c406622946c4ae5 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Thu, 31 Jan 2019 16:00:27 +0000
Subject: gentoo resync 31.01.2019

---
 net-p2p/gtk-gnutella/Manifest                      |  5 +--
 .../files/gtk-gnutella-1.1.14-statx.patch          | 38 ++++++++++++++++++++++
 net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild    |  4 ++-
 net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild    |  8 +++--
 4 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch

(limited to 'net-p2p/gtk-gnutella')

diff --git a/net-p2p/gtk-gnutella/Manifest b/net-p2p/gtk-gnutella/Manifest
index ed3d1bee223b..3507ffe4559c 100644
--- a/net-p2p/gtk-gnutella/Manifest
+++ b/net-p2p/gtk-gnutella/Manifest
@@ -1,5 +1,6 @@
+AUX gtk-gnutella-1.1.14-statx.patch 967 BLAKE2B 73cc687043d2b932b8e36d69c935c84a6668a28902f9ce8b060679ef1e567958053d5e565d1087ada4a590547250bf6ef7b9daa5e8a6b66cdbc275bb1a3c2941 SHA512 fd2cc3d0486efe526b9764d0d6c5bdffa08c344fc91f14305d0b16b957353ca38a23ff873cc669a49f67fd416b79ba38c288cda080ebeac545ea64e40634596f
 DIST gtk-gnutella-1.1.13.tar.xz 19207704 BLAKE2B 4a11fd3f8bd7554e78a75b51b818e2e863edc328d07d0da4fce07e9a6eca7307dd66082dc70caf96e9e85d1d68ee1ef253a47ffb58cc9f33358a5d71b10782cb SHA512 14ff19a3f0bf55101570b4268cdd422defd2ccd112d80e9bafe2f6eb019b94c3c72763e67e2853d4446e68943355093c1279c6d67c101ca6d9b7f05ddd9ac7e0
 DIST gtk-gnutella-1.1.14.tar.xz 19372716 BLAKE2B b9caf1eaa79ca9c9e4d6a036f438eabbbab59a2d94a5227aee17ef9e9551af8185c3049247ee2e53ed913cbb46fafc6841d84346928490b380e16ccf5d27cc4e SHA512 cf8d76a5d531ad26e6155aedc2099f86ff91f96c4587bd6910e844fb6d19d35b48e3d1c4df45b7c68b34f4afcf2ce507943d73a33d923a97f6c43dd9c9ce10c9
-EBUILD gtk-gnutella-1.1.13.ebuild 1872 BLAKE2B c704f54e9224f327610f05cba33c2eba849179c4ccebae84e054469299b2eec1f26732b852fbcad67b50f5d33abb7146398e1449383d5710736352d8595c6986 SHA512 7a1455c3e35e8044d2954d555bd5728490d037c089a422199eb2a0754487bd56322b08dd0ec2ba3df1effccdc229d22ad6ee951ed1494e670db6cb56e1acb615
-EBUILD gtk-gnutella-1.1.14.ebuild 1897 BLAKE2B 8fbf26c1666183903caf86009b9b6d1510bfbe92a26017ed8e8dc084eab52bfe0be0b4446ad111af88c07d529a1b0cd36073b365cc6e8cbe2331b1c743b8862c SHA512 c344633b7a9c3071afc6722bca76ee0b1f488357121347119f57f3714b29e3c27f53884e7d8e5dbede9a7dfba0f0e2afd42b584589dcf5b047312f5009c26bf8
+EBUILD gtk-gnutella-1.1.13.ebuild 1917 BLAKE2B c01b96371f81b051fec6a14c8836f49f41a0da8a12da335e3eeb43af1ac314667a5ce64a5c51cc85e3762e8e0dee55d3eb4f749367418c7f937fa13f18546921 SHA512 72c1ef037bec822301daf3755658c82b62458127e571d4009fedafc68eef437b6dcad8a285a593bfa36cb670f74332c109f686f01349adc809c911cd77878b5f
+EBUILD gtk-gnutella-1.1.14.ebuild 1961 BLAKE2B 035fe3946e0e8d9d6c0448a8d41de3686f9f4c9f61370b0c86048b15d11284d54db82d3049ca01e7a51e07ba2c9c998d5129a4d6d5afc68eab32235c184d123a SHA512 36a3cbebf84d120456f52e14fb818396003b2e490075c113fdd80319fc28bbdfa19561597646b05c5398363a6a291fc3b6346658c0013013bd838af4766978e4
 MISC metadata.xml 299 BLAKE2B 8e823e2ff9ff16738e4f1d5a5e04264557ee9529ce035978e59a8d1371a8dba5485bde5095e05346ddca410d197e7fbb62f8b651bbe8cd0815396fdeda7935ed SHA512 ab18fa3318fdd64a0e4bff392a88d9f58b1c611c71ee090a767a4a25f75f273dc60a7cfeb7e386e5fbed548d982788c16654584938aec8ef5f6b11cd6d5b3c61
diff --git a/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
new file mode 100644
index 000000000000..5d455887c04f
--- /dev/null
+++ b/net-p2p/gtk-gnutella/files/gtk-gnutella-1.1.14-statx.patch
@@ -0,0 +1,38 @@
+diff --git a/src/lib/stats.c b/src/lib/stats.c
+index 8d0d87b8b..725986268 100644
+--- a/src/lib/stats.c
++++ b/src/lib/stats.c
+@@ -50,7 +50,7 @@ enum statx_magic { STATX_MAGIC = 0x560044e5 };
+ /**
+  * A one-dimension container (x).
+  */
+-struct statx {
++struct statistics {
+ 	enum statx_magic magic;	/**< Magic number */
+ 	elist_t data;			/**< Data points */
+ 	long n;					/**< Amount of data points */
+@@ -60,7 +60,7 @@ struct statx {
+ };
+ 
+ static inline void
+-statx_check(const struct statx * const sx)
++statx_check(const struct statistics * const sx)
+ {
+ 	g_assert(sx != NULL);
+ 	g_assert(STATX_MAGIC == sx->magic);
+diff --git a/src/lib/stats.h b/src/lib/stats.h
+index ba876467c..2a67952e2 100644
+--- a/src/lib/stats.h
++++ b/src/lib/stats.h
+@@ -40,9 +40,9 @@
+  * One dimension statistics.
+  */
+ 
+-struct statx;
++struct statistics;
+ 
+-typedef struct statx statx_t;
++typedef struct statistics statx_t;
+ 
+ statx_t *statx_make(void);
+ statx_t *statx_make_nodata(void);
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
index 6dc93535b3c1..0d716e9f88df 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,8 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 src_prepare() {
+	eapply "${FILESDIR}/${PN}-1.1.14-statx.patch"
+
 	strip-linguas -i po
 
 	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
diff --git a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
index 7e55b5198d14..61b7b1fcdeb4 100644
--- a/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
+++ b/net-p2p/gtk-gnutella/gtk-gnutella-1.1.14.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-# strip-linguas
-inherit eutils
+# eutils: strip-linguas
+inherit eutils toolchain-funcs
 
 IUSE="nls dbus ssl +gtk"
 
@@ -28,6 +28,8 @@ DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
 
 src_prepare() {
+	eapply "${FILESDIR}/${P}-statx.patch"
+
 	strip-linguas -i po
 
 	echo "# Gentoo-selected LINGUAS" > po/LINGUAS
-- 
cgit v1.2.3