net-p2p/retroshare: version bump

Fix comment type to prevent compile error.
Sync live ebuild

Reported-by: Gleb <gleb@fastmail.com>
Gentoo-Bug: 627150

Package-Manager: Portage-2.3.6, Repoman-2.3.1

4 files changed, 189 insertions, 6 deletions

diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 780a57b574a..f00ff216e37 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1 +1,2 @@
 DIST retroshare-0.6.2.tar.gz 18523943 SHA256 76a3ae2f2089b14562d5be34602f5ae3c73a8549aecee246ea5e67d03018de2b SHA512 7b935321f436d72948c5c0286ef5e0236bd52d1b25f00980a3b3644ae4acbde043063279f90f6bc0356363bceda484aba57e160f34f013dde120b4f6969ef6c7 WHIRLPOOL 054f5ec8dbf70c89dabaccb50265bbf2a97fe1b2eab6c6a13d0b86f0dd1d4e4097e4eacf163fa75f4cd1225307e4c2d214dddb364de7a29b809c1dc0f767c32e
+DIST retroshare-0.6.3.tar.gz 19699359 SHA256 ddb64aa5148fdc950d4426f52f1cbb11578619b1242614e3c4ca4792ee5ce30b SHA512 ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757 WHIRLPOOL 38b78b920b4be88a313d3edad4e299c05667597a1945cd3455cbf2545a673f38ceb5b2cc4703a13b2f6a199b3ea72823934650446d51c144c0efdb946dd0a1d6
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
new file mode 100644
index 00000000000..20652f180cd
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.3-fix-comment.patch
@@ -0,0 +1,19 @@
+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/retroshare-0.6.3.ebuild b/net-p2p/retroshare/retroshare-0.6.3.ebuild
new file mode 100644
index 00000000000..8e7f93647e4
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.3.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2017 Gentoo Foundation
+# 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
+		virtual/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.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 15d6a116d95..2a62dc7dc3d 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -76,7 +76,7 @@ src_prepare() {
 		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
+	sed -i '2iQT -= gui' openpgpsdk/src/openpgpsdk.pro || die
 
 	eapply_user
 }
@@ -103,22 +103,22 @@ src_install() {
 	local i
 	local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
 
-	use cli && dobin retroshare-nogui/src/RetroShare06-nogui
-	use gui && dobin retroshare-gui/src/RetroShare06
+	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/RetroShare06
+	insinto /usr/share/retroshare
 	doins libbitdht/src/bitdht/bdboot.txt
 
 	doins -r libresapi/src/webui
 
 	dodoc README.md
-	make_desktop_entry RetroShare06
+	make_desktop_entry retroshare
 	for i in 24 48 64 128 ; do
-		doicon -s ${i} "data/${i}x${i}/apps/retroshare06.png"
+		doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
 	done
 }
 
@@ -133,6 +133,10 @@ pkg_preinst() {
 			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
 }