gentoo resync 31.01.2019

9 files changed, 58 insertions, 15 deletions

diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 144946a1e183..bbf00de10ba6 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
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
diff --git a/net-p2p/qbittorrent/Manifest b/net-p2p/qbittorrent/Manifest
index 2a513b1f007a..2160a68df56c 100644
--- a/net-p2p/qbittorrent/Manifest
+++ b/net-p2p/qbittorrent/Manifest
@@ -1,6 +1,6 @@
 DIST qbittorrent-4.1.4.tar.gz 7718217 BLAKE2B 46fc3ad230a74cc2f05bdfe5f53b6b39e0dcd99afff941614345ef1d85492f647080a6111c403f30746b24d1b03e1a6fd196015c7646dc5ab5c73027a8c8c5b8 SHA512 2621a9b6a19609bafd2d99336e5dc4c5f4aef9e5ab6ecebd9c622c759cdcea2a18999c08a70ac32d88fbd65c310749ea2254562152c1d3886285aa7c5c86bf68
 DIST qbittorrent-4.1.5.tar.gz 7719557 BLAKE2B d849227443843684d16ba93e65a64b2d637f1ce41c2f5c3a1ee46db74c7497d0d3cb6b627bfee79ce2e4f2b99ee252287b584542cd47003a1055a43bf0f63cfc SHA512 e090ecc9343ff94874a6d54d487a672dcd44a943da4e2d625b5f7db849c861173c12c870f4d7f0843a60fdffd1fbbd74d05d48223bd3ebf32b7a1ef478c95dec
-EBUILD qbittorrent-4.1.4.ebuild 1522 BLAKE2B 635627177cb24d40dc1c6a580dc2ae956fb327f017e2d5f98c78b8ef11da635a9dfd35c087710c4fe434c9c5a09d81c2d74ab023ebc425fc149205c94b67afc3 SHA512 d7cf4877b11e8e2ce0551f283b9a8e525c887190d3d17be3e0a554f2824eb21cde05c536ada2aada1460bb11d9f4dca2d2f024371134049615f4bd351dc421ed
-EBUILD qbittorrent-4.1.5.ebuild 1524 BLAKE2B b1ffccd5412928ec9d01e98fec6c3e333e071c40b8069e12f0a55a30f700f24c1aca731774ddfb916402e980d75309c8a475aab2121e365edcdd32e2e5959a75 SHA512 99688a063f1507df125cc605c72b820b7cd0de3766e9fb727224f9ccdbc2105dd9fc2d63c93a400b13b4d4b06eca4e9c2ad7c819f70dfef3053b67b81c9579ea
-EBUILD qbittorrent-9999.ebuild 1481 BLAKE2B e44e1467247dd1e67b9595b354c137f5a0b6d5b7a61c0b00d1f05475dcb2b004d7f79aa76c9fa880bb6dfbe1c421723f76ef58c0bee19aaafa3ad899aeaab839 SHA512 d68658e22cc3e2eea08074f8e5ea45f646997c68c99dd72546f3b5ed14107a229acbfc9f0ff666891a49cfab3643856e31639b73b863b5d01d39e7a67ff70e8b
+EBUILD qbittorrent-4.1.4-r1.ebuild 1520 BLAKE2B 82ff5d353ba5d1d7ee43276bc012051f12b29b6cf60b5c90b248e1e1d3c6d7c56eb30cff6e540e8cc5a953fb4dd74fb8bfa529272cf374b076ce154bc4664a1b SHA512 97ac862854c1cb5a89d311a2b3e1cb4b38544bfe9b4cc1da6f41c3b5ec0a09b50fa07ad359e2b371a6af14fc2b9e0462e621af2b88d61dd77886e6cbf81e2838
+EBUILD qbittorrent-4.1.5-r1.ebuild 1522 BLAKE2B b1a43e0a3054fa22e18a99f589580b91bdd8111cdb4f2522aaa5106d94d6737e72c3b1132d6f7b5da297166a8d2f10b050b8b15b6fe3a69f3ea8fe1bd8b9ddde SHA512 2e48a9961f5461024e1f80d53b88eaa1626989ed6e4426153d877c102b85b3df1a69ce3c7615933bf4d1b5277f73f47b38b8159c974e612966e08f629af9fe83
+EBUILD qbittorrent-9999.ebuild 1476 BLAKE2B 17de90559b1830bd74b745589e7fdd9f3b6eb9de191ab0e6083bbafe66143549117ab94bc5dd0fd587c17a3e34f7b7775121c622ec4333e9ec648a41d6cd37fd SHA512 bffb41425575c458fd7db4eba7ec071dbad620cb65c84aab7a18b4b9670587eee33139b12e9a370875857b6f806531ad24ee32b740538e6e94b055ccfc185acd
 MISC metadata.xml 452 BLAKE2B 80b94ef467eaad04be0f17b8d15d1af20a2d09f27825a2c315445fb82c33bbcb35ca5c81e40b7ff21a0496b03f030a2d30b92fd2b39caafce47b7295d4daf98d SHA512 bce9d619f6c591237e412393678d54db4fe55fbd3ab52d191860bc97c7245e199c9630c8b76ea885fe195b486231b65906dc099361ccff59fe0adca08059c85e
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.4.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild
index f990644fdeca..e294819ff929 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.4.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
 	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6:0=
+	=net-libs/libtorrent-rasterbar-1.1*:0=
 	sys-libs/zlib
 	dbus? ( dev-qt/qtdbus:5 )
 	X? (
diff --git a/net-p2p/qbittorrent/qbittorrent-4.1.5.ebuild b/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild
index 970763d76f69..5023499c1558 100644
--- a/net-p2p/qbittorrent/qbittorrent-4.1.5.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-4.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
 	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6:0=
+	=net-libs/libtorrent-rasterbar-1.1*:0=
 	sys-libs/zlib
 	dbus? ( dev-qt/qtdbus:5 )
 	X? (
diff --git a/net-p2p/qbittorrent/qbittorrent-9999.ebuild b/net-p2p/qbittorrent/qbittorrent-9999.ebuild
index 2c128403ac6f..30188ae78c36 100644
--- a/net-p2p/qbittorrent/qbittorrent-9999.ebuild
+++ b/net-p2p/qbittorrent/qbittorrent-9999.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
@@ -29,7 +29,7 @@ RDEPEND="
 	dev-qt/qtnetwork:5[ssl]
 	>=dev-qt/qtsingleapplication-2.6.1_p20130904-r1[qt5(+),X?]
 	dev-qt/qtxml:5
-	>=net-libs/libtorrent-rasterbar-1.0.6:0=
+	=net-libs/libtorrent-rasterbar-1.1*:0=
 	sys-libs/zlib
 	dbus? ( dev-qt/qtdbus:5 )
 	X? (