[gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/

[Sergey Popov]

commit:     11162c449cb73bf19511d0d0e72465686f1199a7
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 27 12:16:43 2017 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Fri Jul 28 13:05:51 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11162c44

net-p2p/retroshare: drop Qt4 support, drop old version

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-p2p/retroshare/Manifest                 |   1 -
 net-p2p/retroshare/metadata.xml             |   1 -
 net-p2p/retroshare/retroshare-0.5.5c.ebuild | 129 ----------------------------
 net-p2p/retroshare/retroshare-0.6.2.ebuild  |  52 ++++-------
 4 files changed, 16 insertions(+), 167 deletions(-)

diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index bc57697ca2f..780a57b574a 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,2 +1 @@
 DIST retroshare-0.6.2.tar.gz 18523943 SHA256 76a3ae2f2089b14562d5be34602f5ae3c73a8549aecee246ea5e67d03018de2b SHA512 7b935321f436d72948c5c0286ef5e0236bd52d1b25f00980a3b3644ae4acbde043063279f90f6bc0356363bceda484aba57e160f34f013dde120b4f6969ef6c7 WHIRLPOOL 054f5ec8dbf70c89dabaccb50265bbf2a97fe1b2eab6c6a13d0b86f0dd1d4e4097e4eacf163fa75f4cd1225307e4c2d214dddb364de7a29b809c1dc0f767c32e
-DIST retroshare_0.5.5-0.7068.tar.gz 11899395 SHA256 772b0d7916137e81fc0f5ea14f0a8fa70d3d7acb701ca0b0c1c66018f2255650 SHA512 51caeca54c6b6ce6ec049d3004301a74db5bb5dc2390c769486429ca0db4e45e2d8eba98c3f9ea99628c1a2452d71c8460ea4d3b3c103e321d3459211767bc1d WHIRLPOOL f6c8a7323be84d79975e970629f5bd457487cac6a061bc6817da328ff1de03a8d3fab98ab3cf4fba0628f239e09d8f8da4c14587764689a23193bbda22419e88

diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 1c91da5e5c0..ccf103c0b98 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -18,7 +18,6 @@
 		<flag name="cli">Enables the CLI version of RetroShare</flag>
 		<flag name="feedreader">Enables the Feedreader plugin</flag>
 		<flag name="gui">Enables the GUI version of RetroShare</flag>
-		<flag name="links-cloud">Enables LinkClouds plugin</flag>
 		<flag name="voip">Enables VOIP plugin</flag>
 	</use>
 	<upstream>

diff --git a/net-p2p/retroshare/retroshare-0.5.5c.ebuild b/net-p2p/retroshare/retroshare-0.5.5c.ebuild
deleted file mode 100644
index 3f6da59fe35..00000000000
--- a/net-p2p/retroshare/retroshare-0.5.5c.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib gnome2-utils qmake-utils
-
-MY_PN="RetroShare"
-MY_P="${MY_PN}-v${PV}"
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="http://retroshare.sourceforge.net"
-SRC_URI="mirror://sourceforge/retroshare/retroshare_0.5.5-0.7068.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 links-cloud qt4 voip"
-REQUIRED_USE="|| ( cli qt4 )
-	feedreader? ( qt4 )
-	links-cloud? ( qt4 )
-	voip? ( qt4 )"
-
-RDEPEND="
-	app-arch/bzip2
-	dev-libs/openssl:0
-	gnome-base/libgnome-keyring
-	net-libs/libupnp:0
-	sys-libs/zlib
-	cli? (
-		dev-libs/protobuf
-		net-libs/libssh[server]
-	)
-	feedreader? (
-		dev-libs/libxml2
-		dev-libs/libxslt
-		net-misc/curl
-	)
-	qt4? (
-		x11-libs/libX11
-		x11-libs/libXScrnSaver
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-	)
-	voip? (
-		media-libs/speex
-		dev-qt/qt-mobility[multimedia]
-		dev-qt/qtmultimedia:4
-	)"
-DEPEND="${RDEPEND}
-	app-arch/unzip
-	dev-qt/qtcore:4
-	virtual/pkgconfig"
-
-S="${WORKDIR}/retroshare-0.5.5/src"
-
-src_prepare() {
-	local dir
-
-	sed -i \
-		-e "s|/usr/lib/retroshare/extensions/|/usr/$(get_libdir)/${PN}/extensions/|" \
-		libretroshare/src/rsserver/rsinit.cc \
-		|| die "sed failed"
-
-	rs_src_dirs="libbitdht/src openpgpsdk/src libretroshare/src supportlibs/pegmarkdown"
-	use cli && rs_src_dirs="${rs_src_dirs} retroshare-nogui/src"
-	use qt4 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
-	use links-cloud && rs_src_dirs="${rs_src_dirs} plugins/LinksCloud"
-	use feedreader && rs_src_dirs="${rs_src_dirs} plugins/FeedReader"
-
-	if use voip ; then
-		rs_src_dirs="${rs_src_dirs} plugins/VOIP"
-		echo "QT += multimedia" >> "plugins/VOIP/VOIP.pro" || die
-		echo "CONFIG += mobility" >> "plugins/VOIP/VOIP.pro" || die
-	fi
-}
-
-src_configure() {
-	for dir in ${rs_src_dirs} ; do
-		cd "${S}"/${dir} || die
-		eqmake4
-	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}/extensions/"
-
-	use cli && dobin retroshare-nogui/src/retroshare-nogui
-	use qt4 && dobin retroshare-gui/src/RetroShare
-
-	exeinto "${extension_dir}"
-	use feedreader && doexe plugins/FeedReader/*.so*
-	use links-cloud && doexe plugins/LinksCloud/*.so*
-	use voip && doexe plugins/VOIP/*.so*
-
-	insinto /usr/share/RetroShare
-	doins libbitdht/src/bitdht/bdboot.txt
-
-	dodoc README.txt
-	make_desktop_entry RetroShare
-	for i in 24 48 64 ; do
-		doicon -s ${i} build_scripts/Ubuntu_src/data/${i}x${i}/${PN}.png
-	done
-	doicon -s 128 build_scripts/Ubuntu_src/data/${PN}.png
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}

diff --git a/net-p2p/retroshare/retroshare-0.6.2.ebuild b/net-p2p/retroshare/retroshare-0.6.2.ebuild
index 0e416e880aa..9bbc687a0fb 100644
--- a/net-p2p/retroshare/retroshare-0.6.2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.2.ebuild
@@ -14,11 +14,9 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 x86"
 
-IUSE="cli feedreader +gui qt4 +qt5 voip"
+IUSE="cli feedreader +gui voip"
 REQUIRED_USE="
 	|| ( cli gui )
-	gui? ( ^^ ( qt4 qt5 ) )
-	cli? ( ^^ ( qt4 qt5 ) )
 	feedreader? ( gui )
 	voip? ( gui )"
 
@@ -26,6 +24,12 @@ 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
 	gnome-base/libgnome-keyring
 	net-libs/libmicrohttpd
 	net-libs/libupnp:0
@@ -35,39 +39,16 @@ RDEPEND="
 		dev-libs/libxslt
 		net-misc/curl
 	)
-	qt4? (
-		gui? (
-			dev-qt/designer:4
-			dev-qt/qtgui:4
-			x11-libs/libX11
-			x11-libs/libXScrnSaver
-		)
-		dev-qt/qtcore:4
-	)
-	qt5? (
-		gui? (
-			dev-qt/designer:5
-			dev-qt/qtgui:5
-			dev-qt/qtwidgets:5
-			dev-qt/qtx11extras:5
-			x11-libs/libX11
-			x11-libs/libXScrnSaver
-		)
-		dev-qt/qtcore:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtscript:5
-		dev-qt/qtxml:5
+	gui? (
+		dev-qt/designer:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
 	)
 	voip? (
-		qt5? (
-			media-libs/opencv[-qt4(-)]
-		)
-		qt4? (
-			media-libs/opencv
-			dev-qt/qt-mobility[multimedia]
-		)
+		media-libs/opencv[-qt4(-)]
 		media-libs/speex
 		virtual/ffmpeg[encode]
 	)"
@@ -106,8 +87,7 @@ src_prepare() {
 src_configure() {
 	for dir in ${rs_src_dirs} ; do
 		pushd "${S}/${dir}" >/dev/null || die
-		use qt4 && eqmake4
-		use qt5 && eqmake5
+		eqmake5
 		popd >/dev/null || die
 	done
 }