public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/
@ 2017-08-07  8:55 Sergey Popov
  0 siblings, 0 replies; 4+ messages in thread
From: Sergey Popov @ 2017-08-07  8:55 UTC (permalink / raw
  To: gentoo-commits

commit:     6a0047276f9fc04631f1c2131764705e60fd2c48
Author:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Aug  7 08:54:33 2017 +0000
Commit:     Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Aug  7 08:55:12 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6a004727

net-p2p/retroshare: version bump

Fix comment type to prevent compile error.
Sync live ebuild

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

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 net-p2p/retroshare/Manifest                        |  1 +
 .../files/retroshare-0.6.3-fix-comment.patch       | 19 +++++++++++++
 ...are-0.6.9999.ebuild => retroshare-0.6.3.ebuild} | 33 +++++++++++++++-------
 net-p2p/retroshare/retroshare-0.6.9999.ebuild      | 16 +++++++----
 4 files changed, 53 insertions(+), 16 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.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.3.ebuild
similarity index 79%
copy from net-p2p/retroshare/retroshare-0.6.9999.ebuild
copy to net-p2p/retroshare/retroshare-0.6.3.ebuild
index 15d6a116d95..8e7f93647e4 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.3.ebuild
@@ -3,16 +3,16 @@
 
 EAPI=6
 
-EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
-inherit eutils git-r3 gnome2-utils qmake-utils versionator
+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=""
+KEYWORDS="~amd64 ~x86"
 
 IUSE="cli feedreader gnome-keyring +gui voip"
 REQUIRED_USE="
@@ -53,7 +53,10 @@ RDEPEND="
 		virtual/ffmpeg[encode]
 	)"
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/RetroShare-${PV}"
 
 src_prepare() {
 	local dir
@@ -76,7 +79,13 @@ 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
+
+	# 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
 }
@@ -103,22 +112,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 +142,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
 }

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
 }


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/
@ 2020-05-21 18:13 Andreas Sturmlechner
  0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2020-05-21 18:13 UTC (permalink / raw
  To: gentoo-commits

commit:     bc4e11b46948e7d3fb18e80293c639988fc4869d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu May 21 17:14:15 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 21 18:13:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc4e11b4

net-p2p/retroshare: Drop 0.6.3-r2 and 0.6.4-r1

Bug: https://bugs.gentoo.org/697578
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 net-p2p/retroshare/Manifest                        |   2 -
 .../files/retroshare-0.6.3-fix-comment.patch       |  19 ---
 .../files/retroshare-0.6.4-qt-5.11.patch           |  63 --------
 net-p2p/retroshare/metadata.xml                    |   2 -
 net-p2p/retroshare/retroshare-0.6.3-r2.ebuild      | 160 ---------------------
 net-p2p/retroshare/retroshare-0.6.4-r1.ebuild      | 155 --------------------
 6 files changed, 401 deletions(-)

diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 8a44be70537..b3ae51167eb 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,3 +1 @@
-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

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 20652f180cd..00000000000
--- 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 892cc89aff9..00000000000
--- 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 8c048e6d36a..836fec2f91a 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 6d046cba38a..00000000000
--- 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 1e9543ef3ad..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/
@ 2021-08-07  5:51 Ionen Wolkens
  0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-08-07  5:51 UTC (permalink / raw
  To: gentoo-commits

commit:     ff5e87afa1e6030f4bfd2ca30e198bd728a13fda
Author:     Gioacchino Mazzurco <gio <AT> eigenlab <DOT> org>
AuthorDate: Tue Jul 20 09:06:38 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Aug  7 05:50:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff5e87af

net-p2p/retroshare: 0.6.6 version bump

Fixes a bunch of bugs fixed upstream in newer version and disabling
  components that are been obsoleted upstream in older versions
Modernize 0.6.6 ebuild after ionenwks suggestions

Bug: https://bugs.gentoo.org/779838
Bug: https://bugs.gentoo.org/798048
Bug: https://bugs.gentoo.org/798099
Closes: https://bugs.gentoo.org/785964
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Gioacchino Mazzurco <gio <AT> altermundi.net>
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 net-p2p/retroshare/Manifest                        |   1 +
 .../retroshare-0.6.6-fix-cxx17-compilation.patch   |  79 +++++++++++++
 net-p2p/retroshare/metadata.xml                    |  11 +-
 net-p2p/retroshare/retroshare-0.6.6.ebuild         | 122 +++++++++++++++++++++
 4 files changed, 209 insertions(+), 4 deletions(-)

diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index b3ae51167eb..e636d71484b 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1 +1,2 @@
 DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
+DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d

diff --git a/net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch b/net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch
new file mode 100644
index 00000000000..c756937c165
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.6-fix-cxx17-compilation.patch
@@ -0,0 +1,79 @@
+From 8bed99cc9f3763269b6b1aada45a43c9993d7b80 Mon Sep 17 00:00:00 2001
+From: Gioacchino Mazzurco <gio@eigenlab.org>
+Date: Fri, 6 Aug 2021 12:15:34 +0200
+Subject: [PATCH] Fix compilation with C++17
+
+---
+ libretroshare/src/util/rsdir.cc | 42 +++++++++++++++++----------------
+ 1 file changed, 22 insertions(+), 20 deletions(-)
+
+diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc
+index 8556b8198..1a6375297 100644
+--- a/libretroshare/src/util/rsdir.cc
++++ b/libretroshare/src/util/rsdir.cc
+@@ -4,8 +4,8 @@
+  * libretroshare: retroshare core library                                      *
+  *                                                                             *
+  * Copyright (C) 2004-2007  Robert Fernie <retroshare@lunamutt.com>            *
+- * Copyright (C) 2020  Gioacchino Mazzurco <gio@eigenlab.org>                  *
+- * Copyright (C) 2020  Asociación Civil Altermundi <info@altermundi.net>       *
++ * Copyright (C) 2020-2021  Gioacchino Mazzurco <gio@eigenlab.org>             *
++ * Copyright (C) 2020-2021  Asociación Civil Altermundi <info@altermundi.net>  *
+  *                                                                             *
+  * This program is free software: you can redistribute it and/or modify        *
+  * it under the terms of the GNU Lesser General Public License as              *
+@@ -64,6 +64,26 @@
+  * #define RSDIR_DEBUG 1
+  ****/
+ 
++#if __cplusplus < 201703L
++bool std::filesystem::create_directories(const std::string& path)
++{
++	for( std::string::size_type lastIndex = 0; lastIndex < std::string::npos;
++	     lastIndex = path.find('/', lastIndex) )
++	{
++		std::string&& curDir = path.substr(0, ++lastIndex);
++		if(!RsDirUtil::checkCreateDirectory(curDir))
++		{
++			RsErr() << __PRETTY_FUNCTION__ << " failure creating: " << curDir
++			        << " of: " << path << std::endl;
++			return false;
++		}
++	}
++	return true;
++}
++#else
++#	include <filesystem>
++#endif // __cplusplus < 201703L
++
+ std::string 	RsDirUtil::getTopDir(const std::string& dir)
+ {
+ 	std::string top;
+@@ -528,24 +548,6 @@ bool RsDirUtil::checkCreateDirectory(const std::string& dir)
+ 	return true;
+ }
+ 
+-#if __cplusplus < 201703L
+-bool std::filesystem::create_directories(const std::string& path)
+-{
+-	for( std::string::size_type lastIndex = 0; lastIndex < std::string::npos;
+-	     lastIndex = path.find('/', lastIndex) )
+-	{
+-		std::string&& curDir = path.substr(0, ++lastIndex);
+-		if(!RsDirUtil::checkCreateDirectory(curDir))
+-		{
+-			RsErr() << __PRETTY_FUNCTION__ << " failure creating: " << curDir
+-			        << " of: " << path << std::endl;
+-			return false;
+-		}
+-	}
+-	return true;
+-}
+-#endif // __cplusplus < 201703L
+-
+ std::string RsDirUtil::removeSymLinks(const std::string& path)
+ {
+ #if defined(WINDOWS_SYS) || defined(__APPLE__) || defined(__ANDROID__)
+-- 
+2.31.1
+

diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index a2e56631bdb..1d61cb0cbd8 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -18,14 +18,17 @@
 		RetroShare provides filesharing, chat, mails, forums and channels.
 	</longdescription>
 	<use>
-		<flag name="cli">Enables the CLI version of RetroShare</flag>
+		<flag name="autologin">Enables potentially insecure autologin capability via <pkg>app-crypt/libsecret</pkg></flag>
+		<flag name="cli">Enables terminal login support for retroshare-service</flag>
 		<flag name="control-socket">Enables API via Unix socket support</flag>
-		<flag name="gnome-keyring">Enables potentially insecure autologin capability via Gnome Keyring</flag>
+		<flag name="gnome-keyring">Enables potentially insecure autologin capability via <pkg>gnome-base/gnome-keyring</pkg></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="libupnp">Enables UPnP port forwarding via <pkg>net-libs/libupnp</pkg></flag>
+		<flag name="miniupnp">Enables UPnP port forwarding via <pkg>net-libs/miniupnpc</pkg></flag>
+		<flag name="service">Enables the new RetroShare service</flag>
 		<flag name="sqlcipher">Enables GXS database encryption via SQLCipher</flag>
 		<flag name="webui">Enables Web interface and API support</flag>
-		<flag name="xapian">Enables GXS content indexing and search through Xapian</flag>
+		<flag name="xapian">Enables GXS content indexing and search via <pkg>dev-libs/xapian</pkg></flag>
 	</use>
 	<upstream>
 		<bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to>

diff --git a/net-p2p/retroshare/retroshare-0.6.6.ebuild b/net-p2p/retroshare/retroshare-0.6.6.ebuild
new file mode 100644
index 00000000000..d331568ada6
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.6.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="https://retroshare.cc"
+SRC_URI="http://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/RetroShare"
+
+LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher"
+
+REQUIRED_USE="
+	|| ( gui service )
+	?? ( libupnp miniupnp )
+	service? ( || ( cli jsonapi ) )"
+
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/openssl:0=
+	>=dev-libs/rapidjson-1.1.0
+	sys-libs/zlib
+	autologin? ( app-crypt/libsecret )
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtscript:5
+		dev-qt/qtxml:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+	libupnp? ( net-libs/libupnp:= )
+	miniupnp? ( net-libs/miniupnpc:= )
+	service? ( dev-qt/qtcore:5 )
+	sqlcipher? ( dev-db/sqlcipher )
+	!sqlcipher? ( dev-db/sqlite:3 )"
+
+DEPEND="${RDEPEND}
+	dev-qt/qtcore:5
+	gui? ( dev-qt/designer:5 )"
+
+BDEPEND="dev-util/cmake
+	virtual/pkgconfig
+	jsonapi? ( app-doc/doxygen )"
+
+PATCHES=( "${FILESDIR}/${P}-fix-cxx17-compilation.patch" )
+
+src_configure() {
+	local qconfigs=(
+		$(usex cli '' 'no_')rs_service_terminal_login
+		$(usex autologin '' 'no_')rs_autologin
+		$(usex gui '' 'no_')retroshare_gui
+		$(usex jsonapi '' 'no_')rs_jsonapi
+		$(usex service '' 'no_')retroshare_service
+		$(usex sqlcipher '' 'no_')sqlcipher
+	)
+
+	local qupnplibs="none"
+	use miniupnp && qupnplibs="miniupnpc"
+	use libupnp && qupnplibs="upnp ixml"
+
+	eqmake5 CONFIG+="${qconfigs[*]}" \
+		RS_MAJOR_VERSION=$(ver_cut 1) RS_MINOR_VERSION=$(ver_cut 2) \
+		RS_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \
+		RS_UPNP_LIB="${qupnplibs}"
+}
+
+src_install() {
+	use gui && dobin retroshare-gui/src/retroshare
+	use service && dobin retroshare-service/src/retroshare-service
+
+	insinto /usr/share/retroshare
+	doins libbitdht/src/bitdht/bdboot.txt
+
+	dodoc README.asciidoc
+
+	if use gui; then
+		make_desktop_entry retroshare
+
+		for i in 24 48 64 128 ; do
+			doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
+		done
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	if ! use sqlcipher && ! has_version "net-p2p/retroshare[-sqlcipher]"; then
+		ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
+		ewarn "instead of SQLCipher for GXS databases."
+		ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
+		ewarn "database format, so you will need to manually delete GXS"
+		ewarn "database (loosing all your GXS data and identities) when you"
+		ewarn "toggle sqlcipher USE flag."
+	fi
+
+	if [[ ${REPLACING_VERSIONS} ]]; then
+		if ver_test ${REPLACING_VERSIONS} -lt 0.6; then
+			ewarn "You are upgrading from Retroshare 0.5.* to ${PV}"
+			ewarn "Version 0.6.* is backward-incompatible with 0.5 branch"
+			ewarn "and clients with 0.6.* can not connect to clients that have 0.5.*"
+			ewarn "It's recommended to drop all your configuration and either"
+			ewarn "generate a new certificate or import existing from a backup"
+			break
+		fi
+		if ver_test ${REPLACING_VERSIONS} -ge 0.6.0 && ver_test ${REPLACING_VERSIONS} -lt 0.6.4; then
+			elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
+			break
+		fi
+	fi
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/
@ 2025-01-03 16:56 Joonas Niilola
  0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2025-01-03 16:56 UTC (permalink / raw
  To: gentoo-commits

commit:     de321b8b2d7039960c0725e8efb87cec1dcccd1c
Author:     Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Mon Nov 25 19:44:27 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Jan  3 16:55:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de321b8b

net-p2p/retroshare: Patch bundled libraries, improve ebuild

- port a patch from bundled rapidjson
- use upstream .desktop file
- avoid evaluating `uselibupnp` if USE=miniupnp (default)

Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Closes: https://github.com/gentoo/gentoo/pull/39471
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/retroshare-0.6.7_fix-old-rapidjson.patch |  24 ++++
 net-p2p/retroshare/retroshare-0.6.7-r3.ebuild      | 136 +++++++++++++++++++++
 2 files changed, 160 insertions(+)

diff --git a/net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch b/net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch
new file mode 100644
index 000000000000..90c973c53493
--- /dev/null
+++ b/net-p2p/retroshare/files/retroshare-0.6.7_fix-old-rapidjson.patch
@@ -0,0 +1,24 @@
+This fixes a c23 issue in the rapidjson library:
+
+     error: assignment of read-only member 'rapidjson::GenericStringRef::length'
+
+This was fixed upstream in 2016 and this patch combines two commit from PR
+https://github.com/Tencent/rapidjson/pull/719
+We are using OpenBuildService as the tarball source and it bundles libraries that old.
+
+For Gentoo details see https://bugs.gentoo.org/945721
+--- a/supportlibs/rapidjson/include/rapidjson/document.h
++++ b/supportlibs/rapidjson/include/rapidjson/document.h
+@@ -316,10 +316,10 @@
+ 
+     GenericStringRef(const GenericStringRef& rhs) : s(rhs.s), length(rhs.length) {}
+ 
+-    GenericStringRef& operator=(const GenericStringRef& rhs) { s = rhs.s; length = rhs.length; }
+-
+     //! implicit conversion to plain CharType pointer
+     operator const Ch *() const { return s; }
++    //! Copy assignment operator not permitted - immutable type
++    GenericStringRef& operator=(const GenericStringRef& rhs) /* = delete */;
+ 
+     const Ch* const s; //!< plain CharType pointer
+     const SizeType length; //!< length of the string (excluding the trailing NULL terminator)

diff --git a/net-p2p/retroshare/retroshare-0.6.7-r3.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r3.ebuild
new file mode 100644
index 000000000000..a9cec116ed37
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.7-r3.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic desktop qmake-utils xdg
+
+DESCRIPTION="Friend to Friend secure communication and sharing application"
+HOMEPAGE="https://retroshare.cc"
+SRC_URI="https://download.opensuse.org/repositories/network:/retroshare/Debian_Testing/retroshare-common_${PV}.orig.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/RetroShare"
+# NOTE: GitHub releases/archive is impractical to build so we use the OBS repo
+# but they squash point releases and include 3rd party libraries in the tarball
+
+LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli +gui +jsonapi keyring libupnp +miniupnp plugins +service +sqlcipher"
+
+REQUIRED_USE="
+	|| ( gui service )
+	?? ( libupnp miniupnp )
+	plugins? ( gui )
+	service? ( || ( cli jsonapi ) )
+"
+RDEPEND="
+	app-arch/bzip2
+	dev-libs/openssl:0=
+	sys-libs/zlib
+	gui? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtmultimedia:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtprintsupport:5
+		dev-qt/qtwidgets:5
+		dev-qt/qtx11extras:5
+		dev-qt/qtxml:5
+		x11-libs/libX11
+		x11-libs/libXScrnSaver
+	)
+	keyring? ( app-crypt/libsecret )
+	libupnp? ( net-libs/libupnp:= )
+	miniupnp? ( net-libs/miniupnpc:= )
+	plugins? (
+		media-libs/speex
+		media-libs/speexdsp
+		<media-video/ffmpeg-5
+	)
+	sqlcipher? ( dev-db/sqlcipher )
+	!sqlcipher? ( dev-db/sqlite:3 )
+"
+DEPEND="
+	${RDEPEND}
+	gui? ( dev-qt/designer:5 )
+	jsonapi? ( >=dev-libs/rapidjson-1.1.0 )
+"
+BDEPEND="
+	dev-build/cmake
+	dev-qt/qtcore:5
+	virtual/pkgconfig
+	gui? ( x11-base/xorg-proto )
+	jsonapi? ( app-text/doxygen )
+"
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-miniupnp-api-v18.patch
+	"${FILESDIR}"/${P}_fix-old-rapidjson.patch
+)
+
+src_configure() {
+	local qconfigs=(
+		$(usex cli     '' 'no_')rs_service_terminal_login
+		$(usex keyring '' 'no_')rs_autologin
+		$(usex gui     '' 'no_')retroshare_gui
+		$(usex jsonapi '' 'no_')rs_jsonapi
+		$(usex service '' 'no_')retroshare_service
+		$(usex sqlcipher '' 'no_')sqlcipher
+		$(usex plugins '' 'no_')retroshare_plugins
+	)
+
+	local qupnplibs="none"
+	if use miniupnp; then
+		qupnplibs="miniupnpc"
+	elif use libupnp; then
+		qupnplibs="upnp ixml"
+	fi
+
+	# bug 907898
+	use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
+	# REVIEW: qmake is deprecated
+	# https://github.com/RetroShare/RetroShare/tree/master/jsonapi-generator
+	eqmake5 CONFIG+="${qconfigs[*]}" \
+		RS_MAJOR_VERSION=$(ver_cut 1) \
+		RS_MINOR_VERSION=$(ver_cut 2) \
+		RS_MINI_VERSION=$(ver_cut 3) \
+		RS_EXTRA_VERSION="-gentoo-${PR}" \
+		RS_UPNP_LIB="${qupnplibs}"
+}
+
+src_install() {
+	use service && dobin retroshare-service/src/retroshare-service
+
+	insinto /usr/share/retroshare
+	doins libbitdht/src/bitdht/bdboot.txt
+
+	dodoc README.asciidoc
+
+	if use gui; then
+		dobin retroshare-gui/src/retroshare
+		doins -r retroshare-gui/src/qss
+
+		doicon data/${PN}.xpm
+		domenu data/${PN}.desktop
+		for i in 24 48 64 128 ; do
+			doicon -s ${i} "data/${i}x${i}/apps/retroshare.png"
+		done
+	fi
+	if use plugins; then
+		insinto /usr/lib/retroshare/extensions6
+		doins plugins/*/lib/*.so
+	fi
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	if ! use sqlcipher && ! has_version "net-p2p/retroshare[-sqlcipher]"; then
+		ewarn "You have disabled GXS database encryption, ${PN} will use SQLite"
+		ewarn "instead of SQLCipher for GXS databases."
+		ewarn "Builds using SQLite and builds using SQLCipher have incompatible"
+		ewarn "database format, so you will need to manually delete GXS"
+		ewarn "database (loosing all your GXS data and identities) when you"
+		ewarn "toggle sqlcipher USE flag."
+	fi
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-01-03 16:56 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-01-03 16:56 [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/files/, net-p2p/retroshare/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2021-08-07  5:51 Ionen Wolkens
2020-05-21 18:13 Andreas Sturmlechner
2017-08-07  8:55 Sergey Popov

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox