gentoo resync : 30.05.2020

6 files changed, 1 insertions, 406 deletions

diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index aac40c8003d4..3eb8187db26e 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,9 +1,3 @@
-AUX retroshare-0.6.3-fix-comment.patch 820 BLAKE2B 361dc83fbe46550ca7b9b6f7c5d0a21bf99b958575aa1e50f9492c790a9f46e52402ba47515a3a3e90c14b7d229dc7d13f3397336aa2b7f67c0147aab3dd67ef SHA512 d27e7a655a0848a1e5feb11778df8e3b1a6a1a6fdde09848d78cb4550842e7b9a581491c7040ce1642773db6b0429f67ff3069c6fc6d6938c20d97e91af5c6bb
-AUX retroshare-0.6.4-qt-5.11.patch 2365 BLAKE2B 34745015cae77990a71005a07be39522d292baf504ea609966b839cd945890cfda644766363f74927307d076e6cfca96b5a4be3b992a723b7672b9e9a1c67d71 SHA512 c3f2a4bcd65ffeb57a17761bb045daa20a19d545b746d8bb8d8c0d61c36be9690f3a05103d55e2390b29ec15d978d24461bae9433b1c92d14bfc8aaa8a2896cb
-DIST retroshare-0.6.3.tar.gz 19699359 BLAKE2B 5a7a77b5ab43d44928e08fd1edc3bd6baa8b42f5c1e68fb079d3c60786c1068914a4f7a4b32fe4b683e7b990fac1bd09e5af66a09a3e9b7013e5b51b3c69ae8c SHA512 ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757
-DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B 63a32ee3a22f4df8b9f6cff149be2c9a9cf18ac895456c808885d510b261f683bf57141b8beb4a0206f7e61eb5c88ce505440956ccdf963ad6ad7f7a73679fb3 SHA512 7fcca6479b73cb4d70532fe46bb4cf24332d523b14a198a0e81689d0e00b62ca300d167be5ac282200e97f5fd9dc6b6c3a2c992ab1daa25846db1a404bf616f8
 DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
-EBUILD retroshare-0.6.3-r2.ebuild 3947 BLAKE2B 414494c6da909cc92d33a42446b3b7506498ccd8a717ad23d261ca33fe0d154fcef080c96cd2b0102f95b938ec5af565056e0360eb829386a93f3d0197692225 SHA512 c02e41b40b8d165b8e6573b28025bbbeeab22ba9394bde6e095177340f37496bbae5669bfb54b40ec36b9952bead014140f186d4de28305405b9300cdecac6b6
-EBUILD retroshare-0.6.4-r1.ebuild 3784 BLAKE2B 49de37d083826e72d628b302772fd0dc76843597a3ecf897c3c9346246ca618550d5c2bd2c1ceedbbfea3b9504ec205b274340c1a45128e034b446cbb8a2372d SHA512 ed78ef2d141c6d5098d3008c9722c356454f04d0b6a36a1b4df4e3b647d0ae54861ce0e979f23c6527d399690bb3afb2678e80bf1ef508b31074c61afcbd4d2d
 EBUILD retroshare-0.6.5.ebuild 3979 BLAKE2B 35db0f242692977c06de9243a4ee76862a74f38560989cca51d40fbbe1c9ba551559604d9c2bd3a1e88a111c50aceea58ee6dd3c5afb51633d625c9fa1802d34 SHA512 19edf671bd9b754d031848b8f20c068e0b41e51b95c2a6ea3f2ba85b55ccb77fd98e9c634fb4592b44cf5ae62d5be27b0115d76cbaef542aa30eb4814c0ae26a
-MISC metadata.xml 1694 BLAKE2B 7266177c5abea3b795043576795318e44a98961f7e673dc32f530232add78e56cea5a9db3e56cb2d1a504c6d13c6c531200dfd6d1e2d48b3f9170730eb3fda28 SHA512 3f856caf5306b1f84308c27a44112bb131312aabc1aa6389deb51c0c3d816ffd4a9ab29b92221cc2baf31e10a17cea2e5f5f46c622f3ac30edd9b05b54d6f9b5
+MISC metadata.xml 1584 BLAKE2B 35f66764610422f5ae44273f336d84668035cea9458da32e4af81edf162ce1c83b4e6d4d4d7d17a27a2b9ed4bcef7caff9efbd05b8bcee2bb00d33860fa4b63e SHA512 353333842e9c3335e57795447850dfe56ac29865c27232080b97f293d2c1fda89c9d1a47942861428f3b2a69f8fca5b7389f9a15b3fcfa8bd89b7ea8314f3114
diff --git a/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch b/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch
deleted file mode 100644
index 20652f180cd6..000000000000
--- a/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit b686771a38c93339ece773bd5ae4d0db1fa629b7
-Author: Gleb Nemshilov <gleb@fastmail.com>
-Date:   Sun Aug 6 14:27:26 2017 +0700
-
-    fix C++ comment to avoid compilation error
-
-diff --git a/supportlibs/pegmarkdown/utility_functions.c b/supportlibs/pegmarkdown/utility_functions.c
-index 08f910274..9445de420 100644
---- a/supportlibs/pegmarkdown/utility_functions.c
-+++ b/supportlibs/pegmarkdown/utility_functions.c
-@@ -26,7 +26,7 @@ element *reverse(element *list) {
-     element *new = NULL;
-     element *next = NULL;
- #warning Phenom (2017-07-21): I don't know if it is a real memLeak for new. If not remove this warning and add a comment how it is deleted.
--    // cppcheck-suppress memleak
-+    /* cppcheck-suppress memleak */
-     while (list != NULL) {
-         next = list->next;
-         new = cons(list, new);
diff --git a/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch b/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch
deleted file mode 100644
index 892cc89aff9a..000000000000
--- a/net-p2p/retroshare/files/retroshare-0.6.4-qt-5.11.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 428b331d8efede1e2f39f2fc49216c675d081030 Mon Sep 17 00:00:00 2001
-From: sehraf <sehraf42@gmail.com>
-Date: Fri, 25 May 2018 23:12:35 +0200
-Subject: [PATCH] fix for Qt 5.11
-
-Quote from Arch mailing list:
-- there's been a huge header cleanup in Qt modules. Expect build failures for applications that rely on transitive includes instead of declaring all required headers. Those need to be fixed upstream by explicitely adding the missing includes.
----
- retroshare-gui/src/gui/Posted/PostedItem.cpp        | 1 +
- retroshare-gui/src/gui/chat/ChatTabWidget.cpp       | 2 ++
- retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp | 1 +
- retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp    | 1 +
- 4 files changed, 5 insertions(+)
-
-diff --git a/retroshare-gui/src/gui/Posted/PostedItem.cpp b/retroshare-gui/src/gui/Posted/PostedItem.cpp
-index 7d70b3e157..8fc1cc6869 100644
---- a/retroshare-gui/src/gui/Posted/PostedItem.cpp
-+++ b/retroshare-gui/src/gui/Posted/PostedItem.cpp
-@@ -22,6 +22,7 @@
-  */
- 
- #include <QDateTime>
-+#include <QStyle>
- 
- #include "rshare.h"
- #include "PostedItem.h"
-diff --git a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
-index a965bbb323..6dd9c27576 100644
---- a/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
-+++ b/retroshare-gui/src/gui/chat/ChatTabWidget.cpp
-@@ -20,6 +20,8 @@
-  *  Boston, MA  02110-1301, USA.

-  ****************************************************************/

- 

-+#include <QTabBar>

-+

- #include "ChatTabWidget.h"

- #include "ui_ChatTabWidget.h"

- #include "ChatDialog.h"

-diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
-index d154408b73..72317640c7 100644
---- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
-+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QTimer>
- #include <QFileInfo>
-+#include <QStyle>
- 
- #include "rshare.h"
- #include "GxsChannelPostItem.h"
-diff --git a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
-index 97ac9dd75a..e9773aba9c 100644
---- a/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
-+++ b/retroshare-gui/src/gui/feeds/GxsForumMsgItem.cpp
-@@ -23,6 +23,7 @@
- 
- #include <QTimer>
- #include <QFileInfo>
-+#include <QStyle>
- 
- #include "rshare.h"
- #include "GxsForumMsgItem.h"
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 8c048e6d36af..836fec2f91a1 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -20,12 +20,10 @@
 	<use>
 		<flag name="cli">Enables the CLI version of RetroShare</flag>
 		<flag name="control-socket">Enables API via Unix socket support</flag>
-		<flag name="feedreader">Enables the Feedreader plugin</flag>
 		<flag name="gnome-keyring">Enables potentially insecure autologin capability via Gnome Keyring</flag>
 		<flag name="jsonapi">Enables the new RetroShare JSON API</flag>
 		<flag name="service">Enables the new RetroShare service controllable only through JSON API</flag>
 		<flag name="sqlcipher">Enables GXS database encryption via SQLCipher</flag>
-		<flag name="voip">Enables VOIP plugin</flag>
 		<flag name="webui">Enables Web interface and API support</flag>
 		<flag name="xapian">Enables GXS content indexing and search through Xapian</flag>
 	</use>
diff --git a/net-p2p/retroshare/retroshare-0.6.3-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.3-r2.ebuild
deleted file mode 100644
index 6d046cba38a5..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.3-r2.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils gnome2-utils qmake-utils versionator
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="http://retroshare.net"
-SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# pegmarkdown can also be used with MIT
-LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="cli feedreader gnome-keyring +gui voip"
-REQUIRED_USE="
-	|| ( cli gui )
-	feedreader? ( gui )
-	voip? ( gui )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlcipher
-	dev-libs/openssl:0
-	dev-qt/qtcore:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtxml:5
-	net-libs/libmicrohttpd
-	net-libs/libupnp:0
-	sys-libs/zlib
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	feedreader? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		net-misc/curl
-	)
-	gui? (
-		dev-qt/designer:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	voip? (
-		media-libs/opencv[-qt4(-)]
-		media-libs/speex
-		media-libs/speexdsp
-		media-video/ffmpeg[encode]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/RetroShare-${PV}"
-
-src_prepare() {
-	local dir
-
-	sed -i \
-		-e "s|/usr/lib/retroshare/extensions6/|/usr/$(get_libdir)/${PN}/extensions6/|" \
-		libretroshare/src/rsserver/rsinit.cc \
-		|| die "sed on libretroshare/src/rsserver/rsinit.cc failed"
-
-	rs_src_dirs="libbitdht/src openpgpsdk/src libresapi/src libretroshare/src supportlibs/pegmarkdown"
-	use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
-	use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
-	use gui && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
-	use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
-
-	# Force linking to sqlcipher ONLY
-	sed -i \
-		-e '/isEmpty(SQLCIPHER_OK) {/aerror(libsqlcipher not found)' \
-		retroshare-gui/src/retroshare-gui.pro \
-		retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
-
-	# Avoid openpgpsdk false dependency on qtgui
-	sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die
-
-	# Fix version
-	sed -i -e '/RS_BUILD_NUMBER/s/2/3/' libretroshare/src/retroshare/rsversion.in || die
-
-	# Fix comment not allowed in C++11
-	eapply "${FILESDIR}/${P}-fix-comment.patch"
-
-	eapply_user
-}
-
-src_configure() {
-	for dir in ${rs_src_dirs} ; do
-		pushd "${S}/${dir}" >/dev/null || die
-		eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin)
-		popd >/dev/null || die
-	done
-}
-
-src_compile() {
-	local dir
-
-	for dir in ${rs_src_dirs} ; do
-		emake -C "${dir}"
-	done
-
-	unset rs_src_dirs
-}
-
-src_install() {
-	local i
-	local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
-
-	use cli && dobin retroshare-nogui/src/retroshare-nogui
-	use gui && dobin retroshare-gui/src/retroshare
-
-	exeinto "${extension_dir}"
-	use feedreader && doexe plugins/FeedReader/*.so*
-	use voip && doexe plugins/VOIP/*.so*
-
-	insinto /usr/share/retroshare
-	doins libbitdht/src/bitdht/bdboot.txt
-
-	doins -r libresapi/src/webui
-
-	dodoc README.md
-	make_desktop_entry retroshare
-	for i in 24 48 64 128 ; do
-		doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
-	done
-}
-
-pkg_preinst() {
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.5.9999 ${ver}; then
-			elog "You are upgrading from Retroshare 0.5.* to ${PV}"
-			elog "Version 0.6.* is backward-incompatible with 0.5 branch"
-			elog "and clients with 0.6.* can not connect to clients that have 0.5.*"
-			elog "It's recommended to drop all your configuration and either"
-			elog "generate a new certificate or import existing from a backup"
-			break
-		fi
-		if version_is_at_least 0.6.0 ${ver}; then
-			elog "Main executable was renamed upstream from RetroShare06 to retroshare"
-			break
-		fi
-	done
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.4-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.4-r1.ebuild
deleted file mode 100644
index 1e9543ef3ad0..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.4-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils qmake-utils versionator
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="http://retroshare.net"
-SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-# pegmarkdown can also be used with MIT
-LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="cli feedreader gnome-keyring +gui voip"
-REQUIRED_USE="
-	|| ( cli gui )
-	feedreader? ( gui )
-	voip? ( gui )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlcipher
-	dev-libs/openssl:0
-	dev-qt/qtcore:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtscript:5
-	dev-qt/qtxml:5
-	net-libs/libmicrohttpd
-	net-libs/libupnp:0
-	sys-libs/zlib
-	gnome-keyring? ( gnome-base/libgnome-keyring )
-	feedreader? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		net-misc/curl
-	)
-	gui? (
-		dev-qt/designer:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-	)
-	voip? (
-		media-libs/opencv[-qt4(-)]
-		media-libs/speex
-		media-libs/speexdsp
-		media-video/ffmpeg[encode]
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/RetroShare-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_prepare() {
-	default
-
-	local dir
-
-	sed -i \
-		-e "s|/usr/lib/retroshare/extensions6/|/usr/$(get_libdir)/${PN}/extensions6/|" \
-		libretroshare/src/rsserver/rsinit.cc \
-		|| die "sed on libretroshare/src/rsserver/rsinit.cc failed"
-
-	rs_src_dirs="libbitdht/src openpgpsdk/src libresapi/src libretroshare/src supportlibs/pegmarkdown"
-	use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
-	use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
-	use gui && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
-	use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
-
-	# Force linking to sqlcipher ONLY
-	sed -i \
-		-e '/isEmpty(SQLCIPHER_OK) {/aerror(libsqlcipher not found)' \
-		retroshare-gui/src/retroshare-gui.pro \
-		retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
-
-	# Avoid openpgpsdk false dependency on qtgui
-	sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die
-}
-
-src_configure() {
-	for dir in ${rs_src_dirs} ; do
-		pushd "${S}/${dir}" >/dev/null || die
-		eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin)
-		popd >/dev/null || die
-	done
-}
-
-src_compile() {
-	local dir
-
-	for dir in ${rs_src_dirs} ; do
-		emake -C "${dir}"
-	done
-
-	unset rs_src_dirs
-}
-
-src_install() {
-	local i
-	local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
-
-	use cli && dobin retroshare-nogui/src/retroshare-nogui
-	use gui && dobin retroshare-gui/src/retroshare
-
-	exeinto "${extension_dir}"
-	use feedreader && doexe plugins/FeedReader/*.so*
-	use voip && doexe plugins/VOIP/*.so*
-
-	insinto /usr/share/retroshare
-	doins libbitdht/src/bitdht/bdboot.txt
-
-	doins -r libresapi/src/webui
-
-	dodoc README.md
-	make_desktop_entry retroshare
-	for i in 24 48 64 128 ; do
-		doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
-	done
-}
-
-pkg_preinst() {
-	local ver
-	for ver in ${REPLACING_VERSIONS}; do
-		if ! version_is_at_least 0.5.9999 ${ver}; then
-			elog "You are upgrading from Retroshare 0.5.* to ${PV}"
-			elog "Version 0.6.* is backward-incompatible with 0.5 branch"
-			elog "and clients with 0.6.* can not connect to clients that have 0.5.*"
-			elog "It's recommended to drop all your configuration and either"
-			elog "generate a new certificate or import existing from a backup"
-			break
-		fi
-		if version_is_at_least 0.6.0 ${ver}; then
-			elog "Main executable was renamed upstream from RetroShare06 to retroshare"
-			break
-		fi
-	done
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}