net-p2p/retroshare: fix segfault in VOIP plugin, drop old version

When OpenCV is built with Qt4 support, Retroshare VOIP plugin, that links to it
causes segfault during application loading.

Gentoo-Bug: 556132

Package-Manager: portage-2.2.20

3 files changed, 1 insertions, 152 deletions

diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index aaf5f42de8c6..efa6aaffd90b 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,3 +1,2 @@
-DIST RetroShare-0.6.0-rc1.tar.gz 14023555 SHA256 987d74877b654eec945e0f8d400c49dd62279ed25f9eb6e7fd8c123f2289d0cf SHA512 79046349b9bf58b77e4ce42069a7ec201f3e5eab862ea2b56291318da887297ff960b1153f6ed87d3416052d9ce58e432ada11f91c0648066c300847a5b85aea WHIRLPOOL 9d73cced5530f0d4c7ae051f829b0d5954f8132ad15dc8545685cde5a4ece34c9b24b29fcd99056b92ba2e5299e08b6d765116b08e8473707881c3a7dba3065e
 DIST retroshare_0.5.5-0.7068.tar.gz 11899395 SHA256 772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650 SHA512 51caeca54c6b6ce6ec049d3004301a74db5bb5dc2390c769486429ca0db4e45e2d8eba98c3f9ea99628c1a2452d71c8460ea4d3b3c103e321d3459211767bc1d WHIRLPOOL f6c8a7323be84d79975e970629f5bd457487cac6a061bc6817da328ff1de03a8d3fab98ab3cf4fba0628f239e09d8f8da4c14587764689a23193bbda22419e88
 DIST retroshare_0.6.0.RC2~8551_src.tgz 14773671 SHA256 2320676da905de6c48b01eda611811965277ffa1d5ddbb387aa8f0414c2de050 SHA512 6cfd714f6e72d43559909a72d448b90068414be26da73928ff7bfaaf5be5f7c47f5e7932f1ff2ab4d8a7c277ea4407ab3bd539a1ad4a2a7810dc79b32b1348b1 WHIRLPOOL b1a030d9fc797fa6a13c2166323cc7bcbb79c70e46ead2e06414650ab763aaacf61fbe24fc634707be42c9b6611a265ac7d675e02b950fe1d8d42364bf0dc089
diff --git a/net-p2p/retroshare/retroshare-0.6.0_rc1.ebuild b/net-p2p/retroshare/retroshare-0.6.0_rc1.ebuild
deleted file mode 100644
index 381d5e0b3d03..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.0_rc1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-MY_PN="RetroShare"
-MY_PV="${PV/_/-}"
-MY_P="${MY_PN}-${MY_PV}"
-inherit eutils gnome2-utils multilib qmake-utils
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="http://retroshare.sourceforge.net"
-SRC_URI="mirror://sourceforge/retroshare/${MY_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 +qt5 voip"
-REQUIRED_USE="|| ( cli qt5 )
-	feedreader? ( qt5 )
-	voip? ( qt5 )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-db/sqlcipher
-	dev-libs/openssl:0
-	gnome-base/libgnome-keyring
-	net-libs/libmicrohttpd
-	net-libs/libupnp
-	sys-libs/zlib
-	cli? (
-		dev-libs/protobuf
-		net-libs/libssh[server]
-	)
-	feedreader? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		net-misc/curl
-	)
-	qt5? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		dev-qt/designer:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtx11extras:5
-		dev-qt/qtxml:5
-	)
-	voip? (
-		media-libs/opencv
-		media-libs/speex
-	)"
-DEPEND="${RDEPEND}
-	dev-qt/qtcore:5
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-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 qt5 && 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'
-
-	epatch_user
-}
-
-src_configure() {
-	for dir in ${rs_src_dirs} ; do
-		pushd "${S}/${dir}" 2>/dev/null || die
-		eqmake5
-		popd 2>/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 qt5 && dobin retroshare-gui/src/RetroShare
-
-	exeinto "${extension_dir}"
-	use feedreader && doexe plugins/FeedReader/*.so*
-	use voip && doexe plugins/VOIP/*.so*
-
-	insinto /usr/share/RetroShare06
-	doins libbitdht/src/bitdht/bdboot.txt
-
-	insinto /usr/share/RetroShare06/webui
-	doins libresapi/src/webfiles/*
-
-	dodoc README.txt
-	make_desktop_entry RetroShare
-	for i in 24 48 64 ; do
-		doicon -s ${i} "build_scripts/Debian+Ubuntu/data/${i}x${i}/${PN}.png"
-	done
-	doicon -s 128 "build_scripts/Debian+Ubuntu/data/${PN}.png"
-}
-
-pkg_preinst() {
-	if [[ "${REPLACING_VERSIONS}" = "0.5*"  ]]; 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"
-	fi
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
index bf794f8ae5ba..945eba2db014 100644
--- a/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
@@ -55,7 +55,7 @@ RDEPEND="
 		dev-qt/qtxml:5
 	)
 	voip? (
-		media-libs/opencv
+		<media-libs/opencv-3.0.0[-qt4]
 		media-libs/speex
 	)"
 DEPEND="${RDEPEND}