* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2015-08-10 4:28 Robin H. Johnson
0 siblings, 0 replies; 67+ messages in thread
From: Robin H. Johnson @ 2015-08-10 4:28 UTC (permalink / raw
To: gentoo-commits
commit: 4f1b90a27021102d5eeac770b4f6cb0c62dbd041
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 10 04:27:45 2015 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 10 04:27:57 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f1b90a2
Explicitly quote the ~ in the replacement, so that it does not get expanded to a homedir.
Package-Manager: portage-2.2.18
net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 a98daf9..3de48be 100644
--- a/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit eutils gnome2-utils multilib qmake-utils
MY_PV="${PV/_rc/.RC}"
-MY_PV="${MY_PV/_pre/~}"
+MY_PV="${MY_PV/_pre/\~}"
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.sourceforge.net"
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2015-08-12 10:19 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2015-08-12 10:19 UTC (permalink / raw
To: gentoo-commits
commit: c31708b96ab45da8c17fd8dfc546082f13bbba05
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 10:15:35 2015 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 10:18:37 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c31708b9
net-p2p/retroshare: fix MY_PV, which is non-portable across bash versions wrt bug #557276
Reported-by: dwfreed <dwfreed AT mtu.edu>
Suggested-by: Ulrich Müller <ulm AT gentoo.org>
Package-Manager: portage-2.2.20
net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 3de48be..bf794f8 100644
--- a/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
@@ -7,7 +7,7 @@ EAPI=5
inherit eutils gnome2-utils multilib qmake-utils
MY_PV="${PV/_rc/.RC}"
-MY_PV="${MY_PV/_pre/\~}"
+MY_PV="${MY_PV/_pre/$'\x7e'}" # bug #557276
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.sourceforge.net"
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2015-09-21 18:23 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2015-09-21 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 6aa217ab3eae0c66911ed8f1ca12ddb05d03e5e7
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 18:22:36 2015 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 18:23:22 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6aa217ab
net-p2p/retroshare: simplify Qt dependencies
Package-Manager: portage-2.2.20
net-p2p/retroshare/retroshare-0.5.5c.ebuild | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.5.5c.ebuild b/net-p2p/retroshare/retroshare-0.5.5c.ebuild
index 2e80205..533d445 100644
--- a/net-p2p/retroshare/retroshare-0.5.5c.ebuild
+++ b/net-p2p/retroshare/retroshare-0.5.5c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -37,14 +37,12 @@ RDEPEND="
dev-libs/libxml2
dev-libs/libxslt
net-misc/curl
- dev-qt/qtcore:4
- dev-qt/qtgui:4
)
qt4? (
x11-libs/libX11
x11-libs/libXScrnSaver
dev-qt/qtcore:4
- || ( ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 ) <dev-qt/qtgui-4.8.5:4 )
+ dev-qt/qtgui:4
)
voip? (
media-libs/speex
@@ -56,7 +54,7 @@ DEPEND="${RDEPEND}
dev-qt/qtcore:4
virtual/pkgconfig"
-S=${WORKDIR}/retroshare-0.5.5/src
+S="${WORKDIR}/retroshare-0.5.5/src"
src_prepare() {
local dir
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2015-09-22 10:18 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2015-09-22 10:18 UTC (permalink / raw
To: gentoo-commits
commit: edfb91aa7662a1b956d99409f709d0f8fb409bdb
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 10:17:27 2015 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 10:17:27 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=edfb91aa
net-p2p/retroshare: add live ebuild
Package-Manager: portage-2.2.20
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 145 ++++++++++++++++++++++++++
1 file changed, 145 insertions(+)
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
new file mode 100644
index 0000000..981025e
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
+inherit eutils git-r3 gnome2-utils multilib qmake-utils
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="http://retroshare.sourceforge.net"
+
+# pegmarkdown can also be used with MIT
+LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
+SLOT="0"
+KEYWORDS=""
+
+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-3.0.0[-qt4]
+ media-libs/speex
+ virtual/ffmpeg[encode]
+ )"
+DEPEND="${RDEPEND}
+ dev-qt/qtcore:5
+ virtual/pkgconfig"
+
+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/RetroShare06-nogui
+ use qt5 && dobin retroshare-gui/src/RetroShare06
+
+ 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.md
+ make_desktop_entry RetroShare06
+ for i in 24 48 64 128 ; do
+ doicon -s ${i} "data/${i}x${i}/apps/retroshare06.png"
+ done
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2015-09-22 10:18 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2015-09-22 10:18 UTC (permalink / raw
To: gentoo-commits
commit: deec4416ebd76c8ffc84af138d9949269d8610c8
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 22 10:14:54 2015 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Sep 22 10:14:54 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=deec4416
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
net-p2p/retroshare/Manifest | 1 -
net-p2p/retroshare/retroshare-0.6.0_rc1.ebuild | 150 ---------------------
.../retroshare/retroshare-0.6.0_rc2_pre8551.ebuild | 2 +-
3 files changed, 1 insertion(+), 152 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index aaf5f42..efa6aaf 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 381d5e0..0000000
--- 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 bf794f8..945eba2 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}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-02-08 19:00 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-02-08 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 1643208d26e8341f70085dd2328f91662252658b
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 8 18:56:54 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Feb 8 19:00:17 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1643208d
net-p2p/retroshare: add support for building with Qt4
Reported-by: Stanislav Nikitin <pztrn <AT> pztrn.name>
Gentoo-Bug: 568176
Package-Manager: portage-2.2.27
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 41 ++++++++++++++++++++-------
1 file changed, 30 insertions(+), 11 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 981025e..3b2a078 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
-EAPI=5
+EAPI=6
EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
-inherit eutils git-r3 gnome2-utils multilib qmake-utils
+inherit eutils git-r3 gnome2-utils qmake-utils
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.sourceforge.net"
@@ -15,10 +15,11 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="cli feedreader +qt5 voip"
-REQUIRED_USE="|| ( cli qt5 )
- feedreader? ( qt5 )
- voip? ( qt5 )"
+IUSE="cli feedreader qt4 +qt5 voip"
+REQUIRED_USE="^^ ( qt4 qt5 )
+ || ( cli qt4 qt5 )
+ feedreader? ( || ( qt4 qt5 ) )
+ voip? ( || ( qt4 qt5 ) )"
RDEPEND="
app-arch/bzip2
@@ -37,6 +38,13 @@ RDEPEND="
dev-libs/libxslt
net-misc/curl
)
+ qt4? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
qt5? (
x11-libs/libX11
x11-libs/libXScrnSaver
@@ -52,12 +60,20 @@ RDEPEND="
dev-qt/qtxml:5
)
voip? (
- <media-libs/opencv-3.0.0[-qt4]
+ qt5? (
+ <media-libs/opencv-3.0.0[-qt4]
+ )
+ qt4? (
+ <media-libs/opencv-3.0.0
+ dev-qt/qtmultimedia:4
+ dev-qt/qt-mobility[multimedia]
+ )
media-libs/speex
virtual/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
- dev-qt/qtcore:5
+ qt4? ( dev-qt/qtcore:4 )
+ qt5? ( dev-qt/qtcore:5 )
virtual/pkgconfig"
src_prepare() {
@@ -71,6 +87,7 @@ src_prepare() {
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 qt4 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
use qt5 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
use voip && rs_src_dirs="${rs_src_dirs} plugins/VOIP"
@@ -80,13 +97,14 @@ src_prepare() {
retroshare-gui/src/retroshare-gui.pro \
retroshare-nogui/src/retroshare-nogui.pro || die 'sed on retroshare-gui/src/retroshare-gui.pro failed'
- epatch_user
+ eapply_user
}
src_configure() {
for dir in ${rs_src_dirs} ; do
pushd "${S}/${dir}" 2>/dev/null || die
- eqmake5
+ use qt4 && eqmake4
+ use qt5 && eqmake5
popd 2>/dev/null || die
done
}
@@ -106,6 +124,7 @@ src_install() {
local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
use cli && dobin retroshare-nogui/src/RetroShare06-nogui
+ use qt4 && dobin retroshare-gui/src/RetroShare06
use qt5 && dobin retroshare-gui/src/RetroShare06
exeinto "${extension_dir}"
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-02-08 19:00 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-02-08 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 53eea0c998bc6564e39de88f4785babccdb9b919
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 8 18:57:39 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Feb 8 19:00:19 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53eea0c9
net-p2p/retroshare: version bump
Package-Manager: portage-2.2.27
net-p2p/retroshare/Manifest | 1 +
net-p2p/retroshare/retroshare-0.6.0.ebuild | 166 +++++++++++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index efa6aaf..597ea0e 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,2 +1,3 @@
+DIST retroshare-0.6.0.tar.gz 17436205 SHA256 50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c SHA512 794dacf1205a3c54973a7e34b6bd59fe88e9820677df182aaea37cfa90b90f548cd762b1243c25138f1b08ce67adf730c2f7b1cbfb1d97185eacabfd60f82374 WHIRLPOOL ef9b2222f84b4ecd4ef1f515b4cdce8362cb56f77e4d223ba1960d5131a1bed1bae816f4715a28f1b8ed36a969c89aad86ae32d95234bf54ad46b40b4e568902
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.ebuild b/net-p2p/retroshare/retroshare-0.6.0.ebuild
new file mode 100644
index 0000000..7c2f2e4
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.0.ebuild
@@ -0,0 +1,166 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils gnome2-utils qmake-utils
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="http://retroshare.sourceforge.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 qt4 +qt5 voip"
+REQUIRED_USE="^^ ( qt4 qt5 )
+ || ( cli qt4 qt5 )
+ feedreader? ( || ( qt4 qt5 ) )
+ voip? ( || ( qt4 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
+ )
+ qt4? (
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ )
+ 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? (
+ qt5? (
+ <media-libs/opencv-3.0.0[-qt4]
+ )
+ qt4? (
+ <media-libs/opencv-3.0.0
+ dev-qt/qtmultimedia:4
+ dev-qt/qt-mobility[multimedia]
+ )
+ media-libs/speex
+ virtual/ffmpeg[encode]
+ )"
+DEPEND="${RDEPEND}
+ qt4? ( dev-qt/qtcore:4 )
+ qt5? ( dev-qt/qtcore:5 )
+ 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 qt4 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
+ 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'
+
+ eapply_user
+}
+
+src_configure() {
+ for dir in ${rs_src_dirs} ; do
+ pushd "${S}/${dir}" 2>/dev/null || die
+ use qt4 && eqmake4
+ use qt5 && 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/RetroShare06-nogui
+ use qt4 && dobin retroshare-gui/src/RetroShare06
+ use qt5 && dobin retroshare-gui/src/RetroShare06
+
+ 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.md
+ make_desktop_entry RetroShare06
+ for i in 24 48 64 128 ; do
+ doicon -s ${i} "data/${i}x${i}/apps/retroshare06.png"
+ done
+}
+
+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
+}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-03-05 15:50 Mikle Kolyada
0 siblings, 0 replies; 67+ messages in thread
From: Mikle Kolyada @ 2016-03-05 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 5d20e10bfd364e1d390bf5b85749e4b8f98fcc64
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 15:47:14 2016 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 15:47:14 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d20e10b
net-p2p/retroshare: amd64 stable wrt bug #570746
Package-Manager: portage-2.2.26
net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 945eba2..e64d2f3 100644
--- a/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/retroshare/${PN}_${MY_PV}_src.tgz"
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="cli feedreader +qt5 voip"
REQUIRED_USE="|| ( cli qt5 )
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-04-26 9:23 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-04-26 9:23 UTC (permalink / raw
To: gentoo-commits
commit: d163403ad7c2e38fe230dcf0b3bf81b9ebb4f4e0
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 09:21:54 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 09:23:37 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d163403a
net-p2p/retroshare: fix web files installation in live ebuild
Reported-by: Alan Neilan <ANeilan <AT> student.bridgew.edu>
Gentoo-Bug: 578974
Package-Manager: portage-2.2.28
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 3b2a078..88822af 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -134,8 +134,7 @@ src_install() {
insinto /usr/share/RetroShare06
doins libbitdht/src/bitdht/bdboot.txt
- insinto /usr/share/RetroShare06/webui
- doins libresapi/src/webfiles/*
+ doins -r libresapi/src/webui
dodoc README.md
make_desktop_entry RetroShare06
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-06-18 11:49 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-06-18 11:49 UTC (permalink / raw
To: gentoo-commits
commit: aec6f2c6738776d2bdb5827b39cc39be6ff152af
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 18 11:48:29 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Sat Jun 18 11:48:29 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aec6f2c6
net-p2p/retroshare: stable on x86
Gentoo-Bug: 570746
Package-Manager: portage-2.3.0_rc1
net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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 e64d2f3..ddcd3a9 100644
--- a/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -16,7 +16,7 @@ SRC_URI="mirror://sourceforge/retroshare/${PN}_${MY_PV}_src.tgz"
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cli feedreader +qt5 voip"
REQUIRED_USE="|| ( cli qt5 )
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-07-27 21:00 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-07-27 21:00 UTC (permalink / raw
To: gentoo-commits
commit: e58b27650fec503b092ea1802ae33e1c3c159995
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 27 18:54:25 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Jul 27 20:59:56 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e58b2765
net-p2p/retroshare: fix wrong assumption that REPLACING_VERSION is a string
Gentoo-Bug: 589502
Package-Manager: portage-2.3.0
net-p2p/retroshare/retroshare-0.6.0.ebuild | 20 ++++++++++++--------
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 19 +++++++++++--------
2 files changed, 23 insertions(+), 16 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.0.ebuild b/net-p2p/retroshare/retroshare-0.6.0.ebuild
index 7c2f2e4..7088971 100644
--- a/net-p2p/retroshare/retroshare-0.6.0.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0.ebuild
@@ -4,7 +4,7 @@
EAPI=6
-inherit eutils gnome2-utils qmake-utils
+inherit eutils gnome2-utils qmake-utils versionator
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.sourceforge.net"
@@ -147,13 +147,17 @@ src_install() {
}
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
+ 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
+ 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 88822af..053fb70 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -5,7 +5,7 @@
EAPI=6
EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
-inherit eutils git-r3 gnome2-utils qmake-utils
+inherit eutils git-r3 gnome2-utils qmake-utils versionator
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.sourceforge.net"
@@ -144,13 +144,16 @@ src_install() {
}
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
+ 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
+ done
gnome2_icon_savelist
}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-08-17 14:19 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-08-17 14:19 UTC (permalink / raw
To: gentoo-commits
commit: b08be6c7e29b0a21cb124ef25b71797b156332ac
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 14:19:30 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 14:19:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b08be6c7
net-p2p/retroshare: drop old version
Package-Manager: portage-2.2.28
net-p2p/retroshare/Manifest | 1 -
.../retroshare/retroshare-0.6.0_rc2_pre8551.ebuild | 150 ---------------------
2 files changed, 151 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 597ea0e..376f948 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,3 +1,2 @@
DIST retroshare-0.6.0.tar.gz 17436205 SHA256 50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c SHA512 794dacf1205a3c54973a7e34b6bd59fe88e9820677df182aaea37cfa90b90f548cd762b1243c25138f1b08ce67adf730c2f7b1cbfb1d97185eacabfd60f82374 WHIRLPOOL ef9b2222f84b4ecd4ef1f515b4cdce8362cb56f77e4d223ba1960d5131a1bed1bae816f4715a28f1b8ed36a969c89aad86ae32d95234bf54ad46b40b4e568902
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_rc2_pre8551.ebuild b/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
deleted file mode 100644
index ddcd3a9..0000000
--- a/net-p2p/retroshare/retroshare-0.6.0_rc2_pre8551.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit eutils gnome2-utils multilib qmake-utils
-
-MY_PV="${PV/_rc/.RC}"
-MY_PV="${MY_PV/_pre/$'\x7e'}" # bug #557276
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="http://retroshare.sourceforge.net"
-SRC_URI="mirror://sourceforge/retroshare/${PN}_${MY_PV}_src.tgz"
-
-# 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-3.0.0[-qt4]
- media-libs/speex
- )"
-DEPEND="${RDEPEND}
- dev-qt/qtcore:5
- virtual/pkgconfig"
-
-S="${WORKDIR}/retroshare06-0.6.0/src"
-
-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
-}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-08-17 14:19 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-08-17 14:19 UTC (permalink / raw
To: gentoo-commits
commit: 1e15717d46f4068918d25f5166bd649e90dc52f0
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 17 14:18:55 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Aug 17 14:18:55 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e15717d
net-p2p/retroshare-0.6.0: stable on amd64/x86
Gentoo-Bug: 584832
Package-Manager: portage-2.2.28
net-p2p/retroshare/retroshare-0.6.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.0.ebuild b/net-p2p/retroshare/retroshare-0.6.0.ebuild
index bf71893..757b5b2 100644
--- a/net-p2p/retroshare/retroshare-0.6.0.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cli feedreader qt4 +qt5 voip"
REQUIRED_USE="^^ ( qt4 qt5 )
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-12-06 12:30 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-12-06 12:30 UTC (permalink / raw
To: gentoo-commits
commit: 08e3b8ab4f8954a43d3106ae52a2182c7522760c
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 12:29:21 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 12:30:35 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08e3b8ab
net-p2p/retroshare: drop redundant description for qt4 USE-flag
Package-Manager: portage-2.3.2
net-p2p/retroshare/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 52a262e..6a41ac3 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="qt4">Enables the GUI using qt4</flag>
<flag name="links-cloud">Enables LinkClouds plugin</flag>
<flag name="voip">Enables VOIP plugin</flag>
</use>
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-12-06 12:30 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-12-06 12:30 UTC (permalink / raw
To: gentoo-commits
commit: d5a9552e68bd0a2629af5b7337474f3c41442b97
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 12:28:18 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 12:30:31 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d5a9552e
net-p2p/retroshare: version bump
Implement optional(enabled by default) 'gui' USE-flag:
now it is possible to build only CLI version of RetroShare.
Rearrange dependencies, thanks to Gioacchino Mazzurco
and Amadeusz Żołnowski. Sync live ebuild with this changes.
Reported-by: Gioacchino Mazzurco <gio <AT> eigenlab.org>
Gentoo-Bug: 593718
Package-Manager: portage-2.3.2
net-p2p/retroshare/Manifest | 1 +
net-p2p/retroshare/metadata.xml | 1 +
...are-0.6.9999.ebuild => retroshare-0.6.1.ebuild} | 64 +++++++++++-----------
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 53 +++++++++---------
4 files changed, 61 insertions(+), 58 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 376f948..b6198d9 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,2 +1,3 @@
DIST retroshare-0.6.0.tar.gz 17436205 SHA256 50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c SHA512 794dacf1205a3c54973a7e34b6bd59fe88e9820677df182aaea37cfa90b90f548cd762b1243c25138f1b08ce67adf730c2f7b1cbfb1d97185eacabfd60f82374 WHIRLPOOL ef9b2222f84b4ecd4ef1f515b4cdce8362cb56f77e4d223ba1960d5131a1bed1bae816f4715a28f1b8ed36a969c89aad86ae32d95234bf54ad46b40b4e568902
+DIST retroshare-0.6.1.tar.gz 18002032 SHA256 4ffbb6c61538f80d0f667c2a155c5eac38b0722a3e8d4f1dc1487d10087cfe42 SHA512 911c57a8c4bb8963043988e4aef626b3b411f74f3258a938fe893b96e43aedaf880dc7de1a5efda4a447e4857075ba10f5030f7d83f63b62fed1b1fddcfdfe80 WHIRLPOOL 000737cfa3e7568a5984d9a3bbde9d772b965c1be183e9d510e9114f3212e0499c8383ee1cc040b4ccf2e33d28b2b06ac63f7851a38c7447b6d97f5cec81649f
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 0ced479..52a262e 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -17,6 +17,7 @@
<use>
<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="qt4">Enables the GUI using qt4</flag>
<flag name="links-cloud">Enables LinkClouds plugin</flag>
<flag name="voip">Enables VOIP plugin</flag>
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.1.ebuild
similarity index 76%
copy from net-p2p/retroshare/retroshare-0.6.9999.ebuild
copy to net-p2p/retroshare/retroshare-0.6.1.ebuild
index 053fb70..aadf420 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.1.ebuild
@@ -4,22 +4,24 @@
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.sourceforge.net"
+HOMEPAGE="http://retroshare.net"
+SRC_URI="https://github.com/RetroShare/RetroShare/archive/${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 qt4 +qt5 voip"
-REQUIRED_USE="^^ ( qt4 qt5 )
- || ( cli qt4 qt5 )
- feedreader? ( || ( qt4 qt5 ) )
- voip? ( || ( qt4 qt5 ) )"
+IUSE="cli feedreader +gui qt4 +qt5 voip"
+REQUIRED_USE="
+ || ( cli gui )
+ gui? ( ^^ ( qt4 qt5 ) )
+ cli? ( ^^ ( qt4 qt5 ) )
+ feedreader? ( gui )
+ voip? ( gui )"
RDEPEND="
app-arch/bzip2
@@ -29,33 +31,31 @@ RDEPEND="
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
)
qt4? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- dev-qt/designer:4
+ gui? (
+ dev-qt/qtgui:4
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ )
dev-qt/qtcore:4
- dev-qt/qtgui:4
)
qt5? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- dev-qt/designer:5
+ gui? (
+ dev-qt/qtwidgets:5
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ )
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
)
@@ -65,16 +65,16 @@ RDEPEND="
)
qt4? (
<media-libs/opencv-3.0.0
- dev-qt/qtmultimedia:4
dev-qt/qt-mobility[multimedia]
)
media-libs/speex
virtual/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
- qt4? ( dev-qt/qtcore:4 )
- qt5? ( dev-qt/qtcore:5 )
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/RetroShare-${PV}"
src_prepare() {
local dir
@@ -87,8 +87,7 @@ src_prepare() {
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 qt4 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
- use qt5 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
+ 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
@@ -97,15 +96,18 @@ src_prepare() {
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
+
eapply_user
}
src_configure() {
for dir in ${rs_src_dirs} ; do
- pushd "${S}/${dir}" 2>/dev/null || die
+ pushd "${S}/${dir}" >/dev/null || die
use qt4 && eqmake4
use qt5 && eqmake5
- popd 2>/dev/null || die
+ popd >/dev/null || die
done
}
@@ -124,8 +126,7 @@ src_install() {
local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
use cli && dobin retroshare-nogui/src/RetroShare06-nogui
- use qt4 && dobin retroshare-gui/src/RetroShare06
- use qt5 && dobin retroshare-gui/src/RetroShare06
+ use gui && dobin retroshare-gui/src/RetroShare06
exeinto "${extension_dir}"
use feedreader && doexe plugins/FeedReader/*.so*
@@ -144,6 +145,7 @@ src_install() {
}
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}"
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 053fb70..7137ccb 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -8,18 +8,20 @@ EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
inherit eutils git-r3 gnome2-utils qmake-utils versionator
DESCRIPTION="P2P private sharing application"
-HOMEPAGE="http://retroshare.sourceforge.net"
+HOMEPAGE="http://retroshare.net"
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="cli feedreader qt4 +qt5 voip"
-REQUIRED_USE="^^ ( qt4 qt5 )
- || ( cli qt4 qt5 )
- feedreader? ( || ( qt4 qt5 ) )
- voip? ( || ( qt4 qt5 ) )"
+IUSE="cli feedreader +gui qt4 +qt5 voip"
+REQUIRED_USE="
+ || ( cli gui )
+ gui? ( ^^ ( qt4 qt5 ) )
+ cli? ( ^^ ( qt4 qt5 ) )
+ feedreader? ( gui )
+ voip? ( gui )"
RDEPEND="
app-arch/bzip2
@@ -29,33 +31,31 @@ RDEPEND="
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
)
qt4? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- dev-qt/designer:4
+ gui? (
+ dev-qt/qtgui:4
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ )
dev-qt/qtcore:4
- dev-qt/qtgui:4
)
qt5? (
- x11-libs/libX11
- x11-libs/libXScrnSaver
- dev-qt/designer:5
+ gui? (
+ dev-qt/qtwidgets:5
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ )
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
)
@@ -65,15 +65,12 @@ RDEPEND="
)
qt4? (
<media-libs/opencv-3.0.0
- dev-qt/qtmultimedia:4
dev-qt/qt-mobility[multimedia]
)
media-libs/speex
virtual/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
- qt4? ( dev-qt/qtcore:4 )
- qt5? ( dev-qt/qtcore:5 )
virtual/pkgconfig"
src_prepare() {
@@ -87,8 +84,7 @@ src_prepare() {
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 qt4 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
- use qt5 && rs_src_dirs="${rs_src_dirs} retroshare-gui/src"
+ 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
@@ -97,15 +93,18 @@ src_prepare() {
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
+
eapply_user
}
src_configure() {
for dir in ${rs_src_dirs} ; do
- pushd "${S}/${dir}" 2>/dev/null || die
+ pushd "${S}/${dir}" >/dev/null || die
use qt4 && eqmake4
use qt5 && eqmake5
- popd 2>/dev/null || die
+ popd >/dev/null || die
done
}
@@ -124,8 +123,7 @@ src_install() {
local extension_dir="/usr/$(get_libdir)/${PN}/extensions6/"
use cli && dobin retroshare-nogui/src/RetroShare06-nogui
- use qt4 && dobin retroshare-gui/src/RetroShare06
- use qt5 && dobin retroshare-gui/src/RetroShare06
+ use gui && dobin retroshare-gui/src/RetroShare06
exeinto "${extension_dir}"
use feedreader && doexe plugins/FeedReader/*.so*
@@ -144,6 +142,7 @@ src_install() {
}
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}"
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2016-12-15 8:44 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2016-12-15 8:44 UTC (permalink / raw
To: gentoo-commits
commit: 3905f7ea026bfcd8eaab629230291a5ca3a7b03c
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 15 08:44:09 2016 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu Dec 15 08:44:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3905f7ea
net-p2p/retroshare: restore accidentally deleted dependency on dev-qt/designer
Reported-by: Amadeusz Żołnowski <aidecoe <AT> gentoo.org>
Gentoo-Bug: 602566
Package-Manager: portage-2.3.2
net-p2p/retroshare/retroshare-0.6.1.ebuild | 2 ++
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 2 ++
2 files changed, 4 insertions(+)
diff --git a/net-p2p/retroshare/retroshare-0.6.1.ebuild b/net-p2p/retroshare/retroshare-0.6.1.ebuild
index aadf420..68c8eb7 100644
--- a/net-p2p/retroshare/retroshare-0.6.1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.1.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
)
qt4? (
gui? (
+ dev-qt/designer:4
dev-qt/qtgui:4
x11-libs/libX11
x11-libs/libXScrnSaver
@@ -46,6 +47,7 @@ RDEPEND="
)
qt5? (
gui? (
+ dev-qt/designer:5
dev-qt/qtwidgets:5
x11-libs/libX11
x11-libs/libXScrnSaver
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 7137ccb..1159db1 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -38,6 +38,7 @@ RDEPEND="
)
qt4? (
gui? (
+ dev-qt/designer:4
dev-qt/qtgui:4
x11-libs/libX11
x11-libs/libXScrnSaver
@@ -46,6 +47,7 @@ RDEPEND="
)
qt5? (
gui? (
+ dev-qt/designer:5
dev-qt/qtwidgets:5
x11-libs/libX11
x11-libs/libXScrnSaver
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2017-01-12 13:49 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2017-01-12 13:49 UTC (permalink / raw
To: gentoo-commits
commit: b87c05690de2ff9666253364ae50206711f15ff4
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 13:42:58 2017 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 13:49:26 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b87c0569
net-p2p/retroshare: correct dependency on media-libs/opencv in 0.6.1 and live ebuilds
Reported-by: Vadim A. Misbakh-Soloviov <gentoo <AT> mva.name>
Package-Manager: portage-2.3.3
net-p2p/retroshare/retroshare-0.6.1.ebuild | 6 +++---
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.1.ebuild b/net-p2p/retroshare/retroshare-0.6.1.ebuild
index 68c8eb7..d647cbb 100644
--- a/net-p2p/retroshare/retroshare-0.6.1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -63,10 +63,10 @@ RDEPEND="
)
voip? (
qt5? (
- <media-libs/opencv-3.0.0[-qt4]
+ media-libs/opencv[-qt4(-)]
)
qt4? (
- <media-libs/opencv-3.0.0
+ media-libs/opencv
dev-qt/qt-mobility[multimedia]
)
media-libs/speex
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 1159db1..effdc96 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -63,10 +63,10 @@ RDEPEND="
)
voip? (
qt5? (
- <media-libs/opencv-3.0.0[-qt4]
+ media-libs/opencv[-qt4(-)]
)
qt4? (
- <media-libs/opencv-3.0.0
+ media-libs/opencv
dev-qt/qt-mobility[multimedia]
)
media-libs/speex
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2017-01-12 13:49 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2017-01-12 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 56a484380c000d44d1fea4af3364f65d92acd8d1
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 12 13:47:48 2017 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Thu Jan 12 13:49:28 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56a48438
net-p2p/retroshare: correct dependency on net-libs/libupnp
Reported-by: <shinydoofy <AT> gmail.com>
Gentoo-Bug: 604886
Package-Manager: portage-2.3.3
net-p2p/retroshare/retroshare-0.5.5c.ebuild | 4 ++--
net-p2p/retroshare/retroshare-0.6.0.ebuild | 4 ++--
net-p2p/retroshare/retroshare-0.6.1.ebuild | 2 +-
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.5.5c.ebuild b/net-p2p/retroshare/retroshare-0.5.5c.ebuild
index 533d445..f03cd47 100644
--- a/net-p2p/retroshare/retroshare-0.5.5c.ebuild
+++ b/net-p2p/retroshare/retroshare-0.5.5c.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ RDEPEND="
app-arch/bzip2
dev-libs/openssl:0
gnome-base/libgnome-keyring
- net-libs/libupnp
+ net-libs/libupnp:0
sys-libs/zlib
cli? (
dev-libs/protobuf
diff --git a/net-p2p/retroshare/retroshare-0.6.0.ebuild b/net-p2p/retroshare/retroshare-0.6.0.ebuild
index 757b5b2..2be0879 100644
--- a/net-p2p/retroshare/retroshare-0.6.0.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -27,7 +27,7 @@ RDEPEND="
dev-libs/openssl:0
gnome-base/libgnome-keyring
net-libs/libmicrohttpd
- net-libs/libupnp
+ net-libs/libupnp:0
sys-libs/zlib
cli? (
dev-libs/protobuf
diff --git a/net-p2p/retroshare/retroshare-0.6.1.ebuild b/net-p2p/retroshare/retroshare-0.6.1.ebuild
index d647cbb..0c018fe 100644
--- a/net-p2p/retroshare/retroshare-0.6.1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-libs/openssl:0
gnome-base/libgnome-keyring
net-libs/libmicrohttpd
- net-libs/libupnp
+ net-libs/libupnp:0
sys-libs/zlib
feedreader? (
dev-libs/libxml2
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index effdc96..5ff4cab 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
dev-libs/openssl:0
gnome-base/libgnome-keyring
net-libs/libmicrohttpd
- net-libs/libupnp
+ net-libs/libupnp:0
sys-libs/zlib
feedreader? (
dev-libs/libxml2
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2017-03-27 13:44 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2017-03-27 13:44 UTC (permalink / raw
To: gentoo-commits
commit: 87de1b1da4d2f5659295e1f6b35e630dd20d0b17
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 13:43:16 2017 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 13:44:25 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=87de1b1d
net-p2p/retroshare: version bump. Sync live ebuild
Gentoo-Bug: 612532
Package-Manager: portage-2.3.3
net-p2p/retroshare/Manifest | 1 +
...retroshare-0.6.9999.ebuild => retroshare-0.6.2.ebuild} | 15 +++++++++------
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 4 ++--
3 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index b6198d91afd..96036ec6b24 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,3 +1,4 @@
DIST retroshare-0.6.0.tar.gz 17436205 SHA256 50b9157bbe407aaefcbf9af1f29392e63148dc060bf78a3b200c9bc09998cf7c SHA512 794dacf1205a3c54973a7e34b6bd59fe88e9820677df182aaea37cfa90b90f548cd762b1243c25138f1b08ce67adf730c2f7b1cbfb1d97185eacabfd60f82374 WHIRLPOOL ef9b2222f84b4ecd4ef1f515b4cdce8362cb56f77e4d223ba1960d5131a1bed1bae816f4715a28f1b8ed36a969c89aad86ae32d95234bf54ad46b40b4e568902
DIST retroshare-0.6.1.tar.gz 18002032 SHA256 4ffbb6c61538f80d0f667c2a155c5eac38b0722a3e8d4f1dc1487d10087cfe42 SHA512 911c57a8c4bb8963043988e4aef626b3b411f74f3258a938fe893b96e43aedaf880dc7de1a5efda4a447e4857075ba10f5030f7d83f63b62fed1b1fddcfdfe80 WHIRLPOOL 000737cfa3e7568a5984d9a3bbde9d772b965c1be183e9d510e9114f3212e0499c8383ee1cc040b4ccf2e33d28b2b06ac63f7851a38c7447b6d97f5cec81649f
+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/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.2.ebuild
similarity index 93%
copy from net-p2p/retroshare/retroshare-0.6.9999.ebuild
copy to net-p2p/retroshare/retroshare-0.6.2.ebuild
index cebd547b988..10a27270235 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.2.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 +gui qt4 +qt5 voip"
REQUIRED_USE="
@@ -47,17 +47,17 @@ RDEPEND="
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/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtscript:5
- dev-qt/qtx11extras:5
dev-qt/qtxml:5
)
voip? (
@@ -72,7 +72,10 @@ RDEPEND="
virtual/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
- virtual/pkgconfig"
+ virtual/pkgconfig
+"
+
+S="${WORKDIR}/RetroShare-${PV}"
src_prepare() {
local dir
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index cebd547b988..56cb00f8a62 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -47,17 +47,17 @@ RDEPEND="
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/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtscript:5
- dev-qt/qtx11extras:5
dev-qt/qtxml:5
)
voip? (
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2017-06-13 16:09 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2017-06-13 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 5f984067d33911e6a47d768ce5571118864e2618
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 16:00:59 2017 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 16:03:17 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f984067
net-p2p/retroshare-0.6.9999: drop Qt4 support
Suggested-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
Gentoo-Bug: 621502
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 52 +++++++++------------------
1 file changed, 16 insertions(+), 36 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 56cb00f8a62..e5cfb2b92f6 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -14,11 +14,9 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS=""
-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]
)"
@@ -103,8 +84,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
}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2017-06-13 16:09 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2017-06-13 16:09 UTC (permalink / raw
To: gentoo-commits
commit: 6b17795f59b6fadf2074187fa7d3cd12901f89a3
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 13 16:01:57 2017 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Tue Jun 13 16:03:19 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b17795f
net-p2p/retroshare-0.6.2: stable on amd64 and x86
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-p2p/retroshare/retroshare-0.6.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.2.ebuild b/net-p2p/retroshare/retroshare-0.6.2.ebuild
index 10a27270235..0e416e880aa 100644
--- a/net-p2p/retroshare/retroshare-0.6.2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cli feedreader +gui qt4 +qt5 voip"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2017-07-28 13:06 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2017-07-28 13:06 UTC (permalink / raw
To: gentoo-commits
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
}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2017-08-02 9:28 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2017-08-02 9:28 UTC (permalink / raw
To: gentoo-commits
commit: e776e88cc3a24b002b350b06772622be452081f7
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 2 09:22:04 2017 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Aug 2 09:22:04 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e776e88c
net-p2p/retroshare: make gnome-base/libgnome-keyring dependency optional, fix autologin
Package-Manager: Portage-2.3.6, Repoman-2.3.1
net-p2p/retroshare/metadata.xml | 1 +
net-p2p/retroshare/retroshare-0.6.2.ebuild | 6 +++---
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 6 +++---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index ccf103c0b98..b92e67f3011 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -17,6 +17,7 @@
<use>
<flag name="cli">Enables the CLI version of RetroShare</flag>
<flag name="feedreader">Enables the Feedreader plugin</flag>
+ <flag name="gnome-keyring">Enables potentially insecure autologin capability via Gnome Keyring</flag>
<flag name="gui">Enables the GUI version of RetroShare</flag>
<flag name="voip">Enables VOIP plugin</flag>
</use>
diff --git a/net-p2p/retroshare/retroshare-0.6.2.ebuild b/net-p2p/retroshare/retroshare-0.6.2.ebuild
index 9bbc687a0fb..86ae46473b4 100644
--- a/net-p2p/retroshare/retroshare-0.6.2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.2.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 x86"
-IUSE="cli feedreader +gui voip"
+IUSE="cli feedreader gnome-keyring +gui voip"
REQUIRED_USE="
|| ( cli gui )
feedreader? ( gui )
@@ -30,10 +30,10 @@ RDEPEND="
dev-qt/qtprintsupport:5
dev-qt/qtscript:5
dev-qt/qtxml:5
- gnome-base/libgnome-keyring
net-libs/libmicrohttpd
net-libs/libupnp:0
sys-libs/zlib
+ gnome-keyring? ( gnome-base/libgnome-keyring )
feedreader? (
dev-libs/libxml2
dev-libs/libxslt
@@ -87,7 +87,7 @@ src_prepare() {
src_configure() {
for dir in ${rs_src_dirs} ; do
pushd "${S}/${dir}" >/dev/null || die
- eqmake5
+ eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin)
popd >/dev/null || die
done
}
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index e5cfb2b92f6..15d6a116d95 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="cli feedreader +gui voip"
+IUSE="cli feedreader gnome-keyring +gui voip"
REQUIRED_USE="
|| ( cli gui )
feedreader? ( gui )
@@ -30,10 +30,10 @@ RDEPEND="
dev-qt/qtprintsupport:5
dev-qt/qtscript:5
dev-qt/qtxml:5
- gnome-base/libgnome-keyring
net-libs/libmicrohttpd
net-libs/libupnp:0
sys-libs/zlib
+ gnome-keyring? ( gnome-base/libgnome-keyring )
feedreader? (
dev-libs/libxml2
dev-libs/libxslt
@@ -84,7 +84,7 @@ src_prepare() {
src_configure() {
for dir in ${rs_src_dirs} ; do
pushd "${S}/${dir}" >/dev/null || die
- eqmake5
+ eqmake5 $(use gnome-keyring && echo CONFIG+=rs_autologin)
popd >/dev/null || die
done
}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-04-23 8:30 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2018-04-23 8:30 UTC (permalink / raw
To: gentoo-commits
commit: 78ebd7b1f914fe4cbaf6ee951a0a62030150cc0f
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 08:18:45 2018 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 08:18:45 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78ebd7b1
net-p2p/retroshare: add proxied maintainer
net-p2p/retroshare/metadata.xml | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index b92e67f3011..d634614148a 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -1,6 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
+ <maintainer type="person">
+ <email>gio@eigenlab.org</email>
+ <name>Gioacchino Mazzurco</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
<maintainer type="person">
<email>pinkbyte@gentoo.org</email>
<name>Sergey Popov</name>
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-04-23 8:30 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2018-04-23 8:30 UTC (permalink / raw
To: gentoo-commits
commit: d8c67d39d2f55d9fe283ff83728d77a5ff3ee995
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 08:17:55 2018 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 08:17:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8c67d39
net-p2p/retroshare: version bump
Closes: https://bugs.gentoo.org/650450
Package-Manager: Portage-2.3.31, Repoman-2.3.9
net-p2p/retroshare/Manifest | 1 +
net-p2p/retroshare/retroshare-0.6.4.ebuild | 154 +++++++++++++++++++++++++++++
2 files changed, 155 insertions(+)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 5703bb17982..c4d253bbba6 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,2 +1,3 @@
DIST retroshare-0.6.2.tar.gz 18523943 BLAKE2B 92be204bcc028685651af9d5eecbde655a37c649e5e2423fb4114b00d392cd9f15292bcba5b8f5069c30b1d7ccb177b31842105595e8fb29ac8970404f9040d8 SHA512 7b935321f436d72948c5c0286ef5e0236bd52d1b25f00980a3b3644ae4acbde043063279f90f6bc0356363bceda484aba57e160f34f013dde120b4f6969ef6c7
DIST retroshare-0.6.3.tar.gz 19699359 BLAKE2B 5a7a77b5ab43d44928e08fd1edc3bd6baa8b42f5c1e68fb079d3c60786c1068914a4f7a4b32fe4b683e7b990fac1bd09e5af66a09a3e9b7013e5b51b3c69ae8c SHA512 ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757
+DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B 63a32ee3a22f4df8b9f6cff149be2c9a9cf18ac895456c808885d510b261f683bf57141b8beb4a0206f7e61eb5c88ce505440956ccdf963ad6ad7f7a73679fb3 SHA512 7fcca6479b73cb4d70532fe46bb4cf24332d523b14a198a0e81689d0e00b62ca300d167be5ac282200e97f5fd9dc6b6c3a2c992ab1daa25846db1a404bf616f8
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4.ebuild
new file mode 100644
index 00000000000..89ef994223c
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 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
+ media-libs/speexdsp
+ 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
+
+ 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
+}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-04-23 8:30 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2018-04-23 8:30 UTC (permalink / raw
To: gentoo-commits
commit: e71f4d65fd0b77a318413a857d44090c45457308
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 08:27:25 2018 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 08:27:25 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e71f4d65
net-p2p/retroshare: drop old version
Package-Manager: Portage-2.3.31, Repoman-2.3.9
net-p2p/retroshare/Manifest | 1 -
net-p2p/retroshare/retroshare-0.6.2.ebuild | 149 -----------------------------
2 files changed, 150 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index c4d253bbba6..867cb5ce204 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,3 +1,2 @@
-DIST retroshare-0.6.2.tar.gz 18523943 BLAKE2B 92be204bcc028685651af9d5eecbde655a37c649e5e2423fb4114b00d392cd9f15292bcba5b8f5069c30b1d7ccb177b31842105595e8fb29ac8970404f9040d8 SHA512 7b935321f436d72948c5c0286ef5e0236bd52d1b25f00980a3b3644ae4acbde043063279f90f6bc0356363bceda484aba57e160f34f013dde120b4f6969ef6c7
DIST retroshare-0.6.3.tar.gz 19699359 BLAKE2B 5a7a77b5ab43d44928e08fd1edc3bd6baa8b42f5c1e68fb079d3c60786c1068914a4f7a4b32fe4b683e7b990fac1bd09e5af66a09a3e9b7013e5b51b3c69ae8c SHA512 ee699ddc71aba3d20498d46e8183953b948896709d1469a5d5374b7c9b7955e460326b1ea3fe6f87e7235c5d2d5e8f042161410a0990b2dd2a44b42551fb5757
DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B 63a32ee3a22f4df8b9f6cff149be2c9a9cf18ac895456c808885d510b261f683bf57141b8beb4a0206f7e61eb5c88ce505440956ccdf963ad6ad7f7a73679fb3 SHA512 7fcca6479b73cb4d70532fe46bb4cf24332d523b14a198a0e81689d0e00b62ca300d167be5ac282200e97f5fd9dc6b6c3a2c992ab1daa25846db1a404bf616f8
diff --git a/net-p2p/retroshare/retroshare-0.6.2.ebuild b/net-p2p/retroshare/retroshare-0.6.2.ebuild
deleted file mode 100644
index 86ae46473b4..00000000000
--- a/net-p2p/retroshare/retroshare-0.6.2.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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
-
- 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/RetroShare06-nogui
- use gui && dobin retroshare-gui/src/RetroShare06
-
- 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
-
- doins -r libresapi/src/webui
-
- dodoc README.md
- make_desktop_entry RetroShare06
- for i in 24 48 64 128 ; do
- doicon -s ${i} "data/${i}x${i}/apps/retroshare06.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
- done
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-04-23 8:30 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2018-04-23 8:30 UTC (permalink / raw
To: gentoo-commits
commit: fa30be47bcfe5c2e3c484148ac48b3ddd998d66f
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 08:20:47 2018 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 08:20:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa30be47
net-p2p/retroshare: revision bump
Add missing dependency on media-libs/speexdsp
Closes: https://bugs.gentoo.org/646502
Package-Manager: Portage-2.3.31, Repoman-2.3.9
.../retroshare/{retroshare-0.6.3.ebuild => retroshare-0.6.3-r1.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.3.ebuild b/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
similarity index 98%
rename from net-p2p/retroshare/retroshare-0.6.3.ebuild
rename to net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
index 8e7f93647e4..5686dc403dc 100644
--- a/net-p2p/retroshare/retroshare-0.6.3.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -50,6 +50,7 @@ RDEPEND="
voip? (
media-libs/opencv[-qt4(-)]
media-libs/speex
+ media-libs/speexdsp
virtual/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-04-23 8:30 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2018-04-23 8:30 UTC (permalink / raw
To: gentoo-commits
commit: b6cb44d4638cf9dc106715e53d4ba79f39fa642b
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 23 08:26:58 2018 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Mon Apr 23 08:26:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6cb44d4
net-p2p/retroshare-0.6.3: stable on amd64/x86
Package-Manager: Portage-2.3.31, Repoman-2.3.9
net-p2p/retroshare/retroshare-0.6.3-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
index 5686dc403dc..faf5d585b2c 100644
--- a/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cli feedreader gnome-keyring +gui voip"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-06-09 21:15 Michał Górny
0 siblings, 0 replies; 67+ messages in thread
From: Michał Górny @ 2018-06-09 21:15 UTC (permalink / raw
To: gentoo-commits
commit: c1d3bf0747652395bfc75312a3639e9e07a4fc3f
Author: Gioacchino Mazzurco <gio <AT> eigenlab <DOT> org>
AuthorDate: Mon Apr 23 08:53:16 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jun 9 21:15:36 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d3bf07
net-p2p/retroshare update development ebuild
Development version of retroshare expose qmake flags that permit easier
build customization without crufty patching, improve development ebuild
to take advantage of that and have a cleaner ebuild.
Removed VoIP and feedreader plugins are not maintained.
For future stable versions this ebuild should be used as reference
and not the older ones.
Development version depends on rapidjson.
Closes: https://github.com/gentoo/gentoo/pull/8115
net-p2p/retroshare/metadata.xml | 16 +--
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 134 ++++++++++----------------
2 files changed, 61 insertions(+), 89 deletions(-)
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index d634614148a..6f5d194f45d 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -14,24 +14,26 @@
<name>Sergey Popov</name>
</maintainer>
<longdescription lang="en">
- RetroShare is a Open Source cross-platform, Friend-2-Friend and
+ RetroShare is a Free and Open Source cross-platform, Friend-2-Friend
secure decentralised communication platform.
- It lets you to securely chat and share files with your friends
- and family, using a web-of-trust to authenticate peers and OpenSSL
+ It lets you to securely chat and share files with your friends, family
+ and even unknown people using PGP to authenticate peers and OpenSSL
to encrypt all communication.
- RetroShare provides filesharing, chat, messages, forums and
- channels
+ RetroShare provides filesharing, chat, mails, forums and channels.
</longdescription>
<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="gui">Enables the GUI version of RetroShare</flag>
+ <flag name="settings-api">Enables settings control via 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>
</use>
<upstream>
- <bugs-to>https://sourceforge.net/p/retroshare/bugs</bugs-to>
- <remote-id type="sourceforge">retroshare</remote-id>
+ <bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to>
<remote-id type="github">RetroShare/RetroShare</remote-id>
</upstream>
</pkgmetadata>
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 2a62dc7dc3d..0db2373b5c2 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,135 +10,105 @@ DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.net"
# pegmarkdown can also be used with MIT
-LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
+LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
KEYWORDS=""
-IUSE="cli feedreader gnome-keyring +gui voip"
+IUSE="cli control-socket gnome-keyring +gui settings-api +sqlcipher +webui"
REQUIRED_USE="
|| ( cli gui )
- feedreader? ( gui )
- voip? ( gui )"
+ settings-api? ( || ( control-socket webui ) )"
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
+ dev-libs/openssl:0=
+ >=dev-libs/rapidjson-1.1.0
+ net-libs/libupnp:0=
sys-libs/zlib
+ control-socket? ( dev-qt/qtnetwork:5 )
gnome-keyring? ( gnome-base/libgnome-keyring )
- feedreader? (
- dev-libs/libxml2
- dev-libs/libxslt
- net-misc/curl
- )
gui? (
- dev-qt/designer:5
+ 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
)
- voip? (
- media-libs/opencv[-qt4(-)]
- media-libs/speex
- virtual/ffmpeg[encode]
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-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"
+ settings-api? ( dev-qt/qtcore:5 )
+ sqlcipher? ( dev-db/sqlcipher )
+ !sqlcipher? ( dev-db/sqlite:3 )
+ webui? ( net-libs/libmicrohttpd )"
- 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
-
- eapply_user
-}
+DEPEND="${RDEPEND}
+ gui? ( dev-qt/designer:5 )
+ dev-qt/qtcore:5
+ virtual/pkgconfig
+"
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
-}
+ local qConfigs=()
-src_compile() {
- local dir
-
- for dir in ${rs_src_dirs} ; do
- emake -C "${dir}"
- done
+ qConfigs+=( $(usex cli '' 'no_')retroshare_nogui )
+ qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver )
+ qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin )
+ qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
+ qConfigs+=( $(usex settings-api '' 'no_')libresapi_settings )
+ qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
+ qConfigs+=( $(usex webui '' 'no_')libresapihttpserver )
- unset rs_src_dirs
+ eqmake5 CONFIG+="${qConfigs[*]}"
}
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
+ use webui && 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_pretend() {
+ if ! use 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
+}
+
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"
+ 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 version_is_at_least 0.6.0 ${ver}; then
- elog "Main executable was renamed upstream from RetroShare06 to retroshare"
+ if version_is_at_least 0.6.0 ${ver} && ! version_is_at_least 0.6.4 ${ver}; then
+ elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
break
fi
done
- gnome2_icon_savelist
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-08-21 8:27 Andreas Sturmlechner
0 siblings, 0 replies; 67+ messages in thread
From: Andreas Sturmlechner @ 2018-08-21 8:27 UTC (permalink / raw
To: gentoo-commits
commit: 8216d231aed55908c746322bfe0c5a74ce588f95
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 08:26:27 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 08:27:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8216d231
net-p2p/retroshare: eutils -> desktop
Package-Manager: Portage-2.3.47, Repoman-2.3.10
net-p2p/retroshare/retroshare-0.6.4.ebuild | 2 +-
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4.ebuild
index 1a98bba1107..03af56503dc 100644
--- a/net-p2p/retroshare/retroshare-0.6.4.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit eutils gnome2-utils qmake-utils versionator
+inherit desktop gnome2-utils qmake-utils versionator
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.net"
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
index 0db2373b5c2..a7718e73f90 100644
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
@@ -4,7 +4,7 @@
EAPI=6
EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
-inherit eutils git-r3 gnome2-utils qmake-utils versionator
+inherit desktop git-r3 gnome2-utils qmake-utils versionator
DESCRIPTION="P2P private sharing application"
HOMEPAGE="http://retroshare.net"
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-08-21 8:27 Andreas Sturmlechner
0 siblings, 0 replies; 67+ messages in thread
From: Andreas Sturmlechner @ 2018-08-21 8:27 UTC (permalink / raw
To: gentoo-commits
commit: 3172de02e06cb962e1c088353eb76bfb2c2339f6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 21 08:26:54 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 21 08:27:16 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3172de02
net-p2p/retroshare: Drop obsolete gnome2_icon_savelist
Package-Manager: Portage-2.3.47, Repoman-2.3.10
net-p2p/retroshare/retroshare-0.6.4.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4.ebuild
index 03af56503dc..68915e3eb57 100644
--- a/net-p2p/retroshare/retroshare-0.6.4.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4.ebuild
@@ -144,7 +144,6 @@ pkg_preinst() {
break
fi
done
- gnome2_icon_savelist
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-09-09 1:12 Thomas Deutschmann
0 siblings, 0 replies; 67+ messages in thread
From: Thomas Deutschmann @ 2018-09-09 1:12 UTC (permalink / raw
To: gentoo-commits
commit: e62774c904bfb1175bf0da5854af94fb0269f521
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 9 01:09:04 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Sun Sep 9 01:12:04 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e62774c9
net-p2p/retroshare: x86 stable (bug #664564)
Package-Manager: Portage-2.3.49, Repoman-2.3.10
net-p2p/retroshare/retroshare-0.6.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4.ebuild
index 68915e3eb57..f9884a5c274 100644
--- a/net-p2p/retroshare/retroshare-0.6.4.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
IUSE="cli feedreader gnome-keyring +gui voip"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-09-09 8:25 Mikle Kolyada
0 siblings, 0 replies; 67+ messages in thread
From: Mikle Kolyada @ 2018-09-09 8:25 UTC (permalink / raw
To: gentoo-commits
commit: 8da7052869619bbd5be9a13427eb6f26ef1c69a0
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 9 08:25:40 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Sep 9 08:25:40 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da70528
net-p2p/retroshare: amd64 stable wrt bug #664564
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-p2p/retroshare/retroshare-0.6.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4.ebuild
index f9884a5c274..3f8d484b636 100644
--- a/net-p2p/retroshare/retroshare-0.6.4.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/archive/v${PV}.tar.gz -> ${P}.
# pegmarkdown can also be used with MIT
LICENSE="GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
IUSE="cli feedreader gnome-keyring +gui voip"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2018-11-07 9:26 Sergey Popov
0 siblings, 0 replies; 67+ messages in thread
From: Sergey Popov @ 2018-11-07 9:26 UTC (permalink / raw
To: gentoo-commits
commit: 477b42dd48b102b42c262cb90311ddf843b72058
Author: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 7 09:23:27 2018 +0000
Commit: Sergey Popov <pinkbyte <AT> gentoo <DOT> org>
CommitDate: Wed Nov 7 09:26:26 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=477b42dd
net-p2p/retroshare: remove myself from maintainers
Signed-off-by: Sergey Popov <pinkbyte <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.10
net-p2p/retroshare/metadata.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 6f5d194f45d..1e20d558f6e 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -9,10 +9,6 @@
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <maintainer type="person">
- <email>pinkbyte@gentoo.org</email>
- <name>Sergey Popov</name>
- </maintainer>
<longdescription lang="en">
RetroShare is a Free and Open Source cross-platform, Friend-2-Friend
secure decentralised communication platform.
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2019-05-15 12:48 Andreas Sturmlechner
0 siblings, 0 replies; 67+ messages in thread
From: Andreas Sturmlechner @ 2019-05-15 12:48 UTC (permalink / raw
To: gentoo-commits
commit: ccd1f937f20181e2d62dbcfe1e3f7acc7862e4d9
Author: Gioacchino Mazzurco <gio <AT> eigenlab <DOT> org>
AuthorDate: Mon Feb 11 23:47:37 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 15 12:46:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccd1f937
net-p2p/retroshare: version bump to 0.6.5
Signed-off-by: Gioacchino Mazzurco <gio <AT> eigenlab.org>
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-p2p/retroshare/Manifest | 1 +
net-p2p/retroshare/metadata.xml | 4 +-
net-p2p/retroshare/retroshare-0.6.5.ebuild | 145 +++++++++++++++++++++++++++++
3 files changed, 148 insertions(+), 2 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 867cb5ce204..8a44be70537 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,2 +1,3 @@
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/metadata.xml b/net-p2p/retroshare/metadata.xml
index 51ddf9dc82e..6f3c32a1f56 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -24,11 +24,11 @@
<flag name="gnome-keyring">Enables potentially insecure autologin capability via Gnome Keyring</flag>
<flag name="gui">Enables the GUI version of RetroShare</flag>
<flag name="jsonapi">Enables the new RetroShare JSON API</flag>
- <flag name="service">Enables the new RetroShare service controllable only trough 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 trough Xapian</flag>
+ <flag name="xapian">Enables GXS content indexing and search through Xapian</flag>
</use>
<upstream>
<bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to>
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
new file mode 100644
index 00000000000..0a7090d1661
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2019 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop qmake-utils xdg-utils
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="https://retroshare.cc"
+SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz"
+
+# pegmarkdown can also be used with MIT
+LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
+
+REQUIRED_USE="
+ || ( cli gui service )
+ service? ( jsonapi )"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/openssl:0=
+ >=dev-libs/rapidjson-1.1.0
+ net-libs/libupnp:0=
+ sys-libs/zlib
+ control-socket? ( dev-qt/qtnetwork:5 )
+ gnome-keyring? ( gnome-base/libgnome-keyring )
+ 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
+ )
+ service? ( dev-qt/qtcore:5 )
+ sqlcipher? ( dev-db/sqlcipher )
+ !sqlcipher? ( dev-db/sqlite:3 )
+ webui? ( net-libs/libmicrohttpd )
+ xapian? ( dev-libs/xapian )"
+
+DEPEND="${RDEPEND}
+ gui? ( dev-qt/designer:5 )
+ jsonapi? (
+ app-doc/doxygen
+ dev-util/cmake
+ )
+ dev-qt/qtcore:5
+ virtual/pkgconfig
+"
+src_unpack() {
+ default
+
+ mv RetroShare ${P}
+}
+
+src_configure() {
+ local qConfigs=()
+
+ qConfigs+=( $(usex cli '' 'no_')retroshare_nogui )
+ qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver )
+ qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin )
+ qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
+ qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
+ qConfigs+=( $(usex service '' 'no_')retroshare_service )
+ qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
+ qConfigs+=( $(usex webui '' 'no_')libresapihttpserver )
+ qConfigs+=( $(usex xapian '' 'no_')rs_deep_search )
+
+ 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}"
+}
+
+src_compile() {
+ use jsonapi && {
+ nonfatal emake ||
+ elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal"
+ }
+
+ emake
+}
+
+src_install() {
+ use cli && dobin retroshare-nogui/src/retroshare-nogui
+ 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
+
+ use webui && 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_pretend() {
+ if ! use 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
+}
+
+pkg_preinst() {
+ local ver
+ for ver in ${REPLACING_VERSIONS}; do
+ if ! version_is_at_least 0.5.9999 ${ver}; 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 version_is_at_least 0.6.0 ${ver} && ! version_is_at_least 0.6.4 ${ver}; then
+ elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
+ break
+ fi
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2019-05-15 12:48 Andreas Sturmlechner
0 siblings, 0 replies; 67+ messages in thread
From: Andreas Sturmlechner @ 2019-05-15 12:48 UTC (permalink / raw
To: gentoo-commits
commit: de94a2f07ced4c0020367e75a447acddd382b7a8
Author: Gioacchino Mazzurco <gio <AT> eigenlab <DOT> org>
AuthorDate: Mon Feb 11 18:20:53 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed May 15 12:46:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de94a2f0
net-p2p/retroshare: Drop 0.6.9999 ebuild
Remove un-maintainable ebuild
Signed-off-by: Gioacchino Mazzurco <gio <AT> eigenlab.org>
Closes: https://github.com/gentoo/gentoo/pull/11029
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-p2p/retroshare/metadata.xml | 4 +-
net-p2p/retroshare/retroshare-0.6.9999.ebuild | 120 --------------------------
2 files changed, 3 insertions(+), 121 deletions(-)
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 1e20d558f6e..51ddf9dc82e 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -23,10 +23,12 @@
<flag name="feedreader">Enables the Feedreader plugin</flag>
<flag name="gnome-keyring">Enables potentially insecure autologin capability via Gnome Keyring</flag>
<flag name="gui">Enables the GUI version of RetroShare</flag>
- <flag name="settings-api">Enables settings control via API</flag>
+ <flag name="jsonapi">Enables the new RetroShare JSON API</flag>
+ <flag name="service">Enables the new RetroShare service controllable only trough 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 trough Xapian</flag>
</use>
<upstream>
<bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to>
diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild
deleted file mode 100644
index a7718e73f90..00000000000
--- a/net-p2p/retroshare/retroshare-0.6.9999.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-EGIT_REPO_URI="https://github.com/RetroShare/RetroShare.git"
-inherit desktop git-r3 gnome2-utils qmake-utils versionator
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="http://retroshare.net"
-
-# pegmarkdown can also be used with MIT
-LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-2.1"
-SLOT="0"
-KEYWORDS=""
-
-IUSE="cli control-socket gnome-keyring +gui settings-api +sqlcipher +webui"
-REQUIRED_USE="
- || ( cli gui )
- settings-api? ( || ( control-socket webui ) )"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/openssl:0=
- >=dev-libs/rapidjson-1.1.0
- net-libs/libupnp:0=
- sys-libs/zlib
- control-socket? ( dev-qt/qtnetwork:5 )
- gnome-keyring? ( gnome-base/libgnome-keyring )
- 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
- )
- settings-api? ( dev-qt/qtcore:5 )
- sqlcipher? ( dev-db/sqlcipher )
- !sqlcipher? ( dev-db/sqlite:3 )
- webui? ( net-libs/libmicrohttpd )"
-
-DEPEND="${RDEPEND}
- gui? ( dev-qt/designer:5 )
- dev-qt/qtcore:5
- virtual/pkgconfig
-"
-
-src_configure() {
- local qConfigs=()
-
- qConfigs+=( $(usex cli '' 'no_')retroshare_nogui )
- qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver )
- qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin )
- qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
- qConfigs+=( $(usex settings-api '' 'no_')libresapi_settings )
- qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
- qConfigs+=( $(usex webui '' 'no_')libresapihttpserver )
-
- eqmake5 CONFIG+="${qConfigs[*]}"
-}
-
-src_install() {
- use cli && dobin retroshare-nogui/src/retroshare-nogui
- use gui && dobin retroshare-gui/src/retroshare
-
- insinto /usr/share/retroshare
- doins libbitdht/src/bitdht/bdboot.txt
-
- use webui && 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_pretend() {
- if ! use 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
-}
-
-pkg_preinst() {
- local ver
- for ver in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 0.5.9999 ${ver}; 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 version_is_at_least 0.6.0 ${ver} && ! version_is_at_least 0.6.4 ${ver}; then
- elog "Main executable has been 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] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2020-01-12 11:14 David Seifert
0 siblings, 0 replies; 67+ messages in thread
From: David Seifert @ 2020-01-12 11:14 UTC (permalink / raw
To: gentoo-commits
commit: d381f15066a6865162fc73f1f0b019e8bc5c15fa
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 12 11:13:32 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jan 12 11:13:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d381f150
net-p2p/retroshare: Remove local USE="gui"
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-p2p/retroshare/metadata.xml | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 6f3c32a1f56..8c048e6d36a 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -22,7 +22,6 @@
<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="gui">Enables the GUI version of RetroShare</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>
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2020-03-19 13:48 Joonas Niilola
0 siblings, 0 replies; 67+ messages in thread
From: Joonas Niilola @ 2020-03-19 13:48 UTC (permalink / raw
To: gentoo-commits
commit: d3d39c52a35468175b7602d9ab795c741d28ae44
Author: Gioacchino Mazzurco <gio <AT> eigenlab <DOT> org>
AuthorDate: Tue Feb 11 17:04:52 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 13:48:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3d39c52
net-p2p/retroshare: avoid broken doxygen-1.8.16
Closes: https://bugs.gentoo.org/699164
Closes: https://bugs.gentoo.org/694668
Signed-off-by: Gioacchino Mazzurco <gio <AT> eigenlab.org>
Closes: https://github.com/gentoo/gentoo/pull/14628
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index 052ee58a9b1..853efe6ea0a 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -50,7 +50,7 @@ RDEPEND="
DEPEND="${RDEPEND}
gui? ( dev-qt/designer:5 )
jsonapi? (
- app-doc/doxygen
+ || ( <app-doc/doxygen-1.8.16 >=app-doc/doxygen-1.8.17 )
dev-util/cmake
)
dev-qt/qtcore:5
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2020-03-19 13:48 Joonas Niilola
0 siblings, 0 replies; 67+ messages in thread
From: Joonas Niilola @ 2020-03-19 13:48 UTC (permalink / raw
To: gentoo-commits
commit: b2dbe86df208d567f1f09c6f25bc5a18dc771e06
Author: Gioacchino Mazzurco <gio <AT> eigenlab <DOT> org>
AuthorDate: Fri Feb 14 10:50:07 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Mar 19 13:44:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2dbe86d
net-p2p/retroshare: 0.6.5 need <libupnp-1.8.0
RetroShare 0.6.5 woun't build with libupnp 1.8 series so specify version
dependency in ebuild
Closes: https://bugs.gentoo.org/709514
Signed-off-by: Gioacchino Mazzurco <gio <AT> eigenlab.org>
Closes: https://github.com/gentoo/gentoo/pull/14660
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index 7bf5fdbe3a9..052ee58a9b1 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
app-arch/bzip2
dev-libs/openssl:0=
>=dev-libs/rapidjson-1.1.0
- net-libs/libupnp:0=
+ <net-libs/libupnp-1.8.0
sys-libs/zlib
control-socket? ( dev-qt/qtnetwork:5 )
gnome-keyring? ( gnome-base/libgnome-keyring )
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2020-03-20 7:02 Joonas Niilola
0 siblings, 0 replies; 67+ messages in thread
From: Joonas Niilola @ 2020-03-20 7:02 UTC (permalink / raw
To: gentoo-commits
commit: ca2037b136859e79eaa5468dbd0a46d4d8c09893
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 20 06:59:46 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar 20 06:59:46 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca2037b1
net-p2p/retroshare: fix styling, add BDEPEND, add missing die
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5.ebuild | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index 853efe6ea0a..5a687445460 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -48,18 +48,22 @@ RDEPEND="
xapian? ( dev-libs/xapian )"
DEPEND="${RDEPEND}
- gui? ( dev-qt/designer:5 )
- jsonapi? (
- || ( <app-doc/doxygen-1.8.16 >=app-doc/doxygen-1.8.17 )
- dev-util/cmake
- )
dev-qt/qtcore:5
+ gui? ( dev-qt/designer:5 )"
+
+BDEPEND="dev-util/cmake
virtual/pkgconfig
-"
+ jsonapi? (
+ || (
+ >=app-doc/doxygen-1.8.17
+ <app-doc/doxygen-1.8.16
+ )
+ )"
+
src_unpack() {
default
- mv RetroShare ${P}
+ mv RetroShare ${P} || die
}
src_configure() {
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2020-04-26 11:00 David Seifert
0 siblings, 0 replies; 67+ messages in thread
From: David Seifert @ 2020-04-26 11:00 UTC (permalink / raw
To: gentoo-commits
commit: ea4f1771e1149b9dd81d2dca3280f2d13db5f73a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 10:59:09 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 10:59:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea4f1771
net-p2p/retroshare: Replace virtual/ffmpeg
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../{retroshare-0.6.3-r1.ebuild => retroshare-0.6.3-r2.ebuild} | 4 ++--
.../{retroshare-0.6.4.ebuild => retroshare-0.6.4-r1.ebuild} | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.3-r2.ebuild
similarity index 98%
rename from net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
rename to net-p2p/retroshare/retroshare-0.6.3-r2.ebuild
index faf5d585b2c..6d046cba38a 100644
--- a/net-p2p/retroshare/retroshare-0.6.3-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -51,7 +51,7 @@ RDEPEND="
media-libs/opencv[-qt4(-)]
media-libs/speex
media-libs/speexdsp
- virtual/ffmpeg[encode]
+ media-video/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
diff --git a/net-p2p/retroshare/retroshare-0.6.4.ebuild b/net-p2p/retroshare/retroshare-0.6.4-r1.ebuild
similarity index 98%
rename from net-p2p/retroshare/retroshare-0.6.4.ebuild
rename to net-p2p/retroshare/retroshare-0.6.4-r1.ebuild
index 3f8d484b636..1e9543ef3ad 100644
--- a/net-p2p/retroshare/retroshare-0.6.4.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -51,7 +51,7 @@ RDEPEND="
media-libs/opencv[-qt4(-)]
media-libs/speex
media-libs/speexdsp
- virtual/ffmpeg[encode]
+ media-video/ffmpeg[encode]
)"
DEPEND="${RDEPEND}
virtual/pkgconfig
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2020-04-28 17:47 Matt Turner
0 siblings, 0 replies; 67+ messages in thread
From: Matt Turner @ 2020-04-28 17:47 UTC (permalink / raw
To: gentoo-commits
commit: 822f29a0137f968a0f07f7753e08d52978d9e859
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 28 17:46:00 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 28 17:46:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822f29a0
net-p2p/retroshare: Switch dependency to libsecret
Bug: https://bugs.gentoo.org/713034
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index 5a687445460..5bca35b0f42 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -27,7 +27,7 @@ RDEPEND="
<net-libs/libupnp-1.8.0
sys-libs/zlib
control-socket? ( dev-qt/qtnetwork:5 )
- gnome-keyring? ( gnome-base/libgnome-keyring )
+ gnome-keyring? ( app-crypt/libsecret )
gui? (
dev-qt/qtcore:5
dev-qt/qtmultimedia:5
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2020-05-08 6:38 Agostino Sarubbo
0 siblings, 0 replies; 67+ messages in thread
From: Agostino Sarubbo @ 2020-05-08 6:38 UTC (permalink / raw
To: gentoo-commits
commit: 9eb1d4b1dfe9ddfdb6091bfbfd771a613e49c183
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 06:36:54 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Fri May 8 06:36:54 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9eb1d4b1
net-p2p/retroshare: amd64 stable wrt bug #697578
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index 5bca35b0f42..ceac437cec8 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/Retro
# pegmarkdown can also be used with MIT
LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2020-05-11 16:49 Agostino Sarubbo
0 siblings, 0 replies; 67+ messages in thread
From: Agostino Sarubbo @ 2020-05-11 16:49 UTC (permalink / raw
To: gentoo-commits
commit: 2118225e11c98caf3fd5268b27c9897316f7057d
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 16:48:28 2020 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Mon May 11 16:49:07 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2118225e
net-p2p/retroshare: x86 stable wrt bug #697578
Package-Manager: Portage-2.3.99, Repoman-2.3.22
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
index ceac437cec8..ab3d11026c9 100644
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/Retro
# pegmarkdown can also be used with MIT
LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-02-03 18:18 Ben Kohler
0 siblings, 0 replies; 67+ messages in thread
From: Ben Kohler @ 2021-02-03 18:18 UTC (permalink / raw
To: gentoo-commits
commit: 3ca02924dcb7e13bc34a84b4ebeea876357ea8be
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 3 18:12:20 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Feb 3 18:18:02 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ca02924
net-p2p/retroshare: switch to miniupnpc & fix EAPI=7 conversion
Bug: https://bugs.gentoo.org/761885
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5-r1.ebuild | 153 ++++++++++++++++++++++++++
1 file changed, 153 insertions(+)
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r1.ebuild
new file mode 100644
index 00000000000..717d55dae57
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.5-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils qmake-utils xdg-utils
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="https://retroshare.cc"
+SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz"
+
+# pegmarkdown can also be used with MIT
+LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
+
+REQUIRED_USE="
+ || ( cli gui service )
+ service? ( jsonapi )"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/openssl:0=
+ >=dev-libs/rapidjson-1.1.0
+ net-libs/miniupnpc:=
+ sys-libs/zlib
+ control-socket? ( dev-qt/qtnetwork:5 )
+ gnome-keyring? ( 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
+ )
+ service? ( dev-qt/qtcore:5 )
+ sqlcipher? ( dev-db/sqlcipher )
+ !sqlcipher? ( dev-db/sqlite:3 )
+ webui? ( net-libs/libmicrohttpd )
+ xapian? ( dev-libs/xapian )"
+
+DEPEND="${RDEPEND}
+ dev-qt/qtcore:5
+ gui? ( dev-qt/designer:5 )"
+
+BDEPEND="dev-util/cmake
+ virtual/pkgconfig
+ jsonapi? (
+ || (
+ >=app-doc/doxygen-1.8.17
+ <app-doc/doxygen-1.8.16
+ )
+ )"
+
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
+
+S="${WORKDIR}"/RetroShare
+
+src_prepare() {
+ # CRLF endings break patch...
+ edos2unix retroshare-gui/src/gui/elastic/elnode.h
+ default
+}
+
+src_configure() {
+ local qConfigs=()
+
+ qConfigs+=( $(usex cli '' 'no_')retroshare_nogui )
+ qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver )
+ qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin )
+ qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
+ qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
+ qConfigs+=( $(usex service '' 'no_')retroshare_service )
+ qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
+ qConfigs+=( $(usex webui '' 'no_')libresapihttpserver )
+ qConfigs+=( $(usex xapian '' 'no_')rs_deep_search )
+
+ 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=miniupnpc
+}
+
+src_compile() {
+ use jsonapi && {
+ nonfatal emake ||
+ elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal"
+ }
+
+ emake
+}
+
+src_install() {
+ use cli && dobin retroshare-nogui/src/retroshare-nogui
+ 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
+
+ use webui && 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_pretend() {
+ if ! use 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
+}
+
+pkg_preinst() {
+ local ver
+ for ver in ${REPLACING_VERSIONS}; do
+ if ver_test ${ver} -lt 0.5.9999; 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 ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then
+ elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
+ break
+ fi
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-02-06 16:25 Ben Kohler
0 siblings, 0 replies; 67+ messages in thread
From: Ben Kohler @ 2021-02-06 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 99b2c647918dd51a4bcd00e6c572a4cc25a54b4f
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 6 16:25:09 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Feb 6 16:25:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b2c647
net-p2p/retroshare: add missing \ line ending
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r1.ebuild
index 717d55dae57..51d46eb7ff2 100644
--- a/net-p2p/retroshare/retroshare-0.6.5-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5-r1.ebuild
@@ -84,7 +84,7 @@ src_configure() {
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_MINI_VERSION=$(ver_cut 3) RS_EXTRA_VERSION="-gentoo-${PR}" \
RS_UPNP_LIB=miniupnpc
}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-02-06 18:04 Ben Kohler
0 siblings, 0 replies; 67+ messages in thread
From: Ben Kohler @ 2021-02-06 18:04 UTC (permalink / raw
To: gentoo-commits
commit: 7a0ce379877403eed2dde5a9944ba68618713f1f
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 6 18:03:51 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Feb 6 18:04:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a0ce379
net-p2p/retroshare: revbump to make sure we really link to miniupnpc
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
.../retroshare/{retroshare-0.6.5-r1.ebuild => retroshare-0.6.5-r2.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
similarity index 100%
rename from net-p2p/retroshare/retroshare-0.6.5-r1.ebuild
rename to net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
^ permalink raw reply [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-03-11 2:35 Sam James
0 siblings, 0 replies; 67+ messages in thread
From: Sam James @ 2021-03-11 2:35 UTC (permalink / raw
To: gentoo-commits
commit: bd9a1635716a34958185d553090499e42b084a82
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 02:35:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 02:35:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd9a1635
net-p2p/retroshare: Stabilize 0.6.5-r2 amd64, #761885
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
index 51d46eb7ff2..595609fef04 100644
--- a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/Retro
# pegmarkdown can also be used with MIT
LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-03-11 13:30 Sam James
0 siblings, 0 replies; 67+ messages in thread
From: Sam James @ 2021-03-11 13:30 UTC (permalink / raw
To: gentoo-commits
commit: f4176ac91b9d50ce41fd2534fabb5cecaf715ad0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 11 13:30:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Mar 11 13:30:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4176ac9
net-p2p/retroshare: Stabilize 0.6.5-r2 x86, #761885
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
index 595609fef04..d4bd286e78e 100644
--- a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/Retro
# pegmarkdown can also be used with MIT
LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-03-12 16:01 Ben Kohler
0 siblings, 0 replies; 67+ messages in thread
From: Ben Kohler @ 2021-03-12 16:01 UTC (permalink / raw
To: gentoo-commits
commit: f234282e99f789bef500cafff2f4bb0458a8807a
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 12 16:01:34 2021 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Mar 12 16:01:51 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f234282e
net-p2p/retroshare: drop old
Closes: https://bugs.gentoo.org/761885
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5.ebuild | 152 -----------------------------
1 file changed, 152 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.5.ebuild b/net-p2p/retroshare/retroshare-0.6.5.ebuild
deleted file mode 100644
index b2c53a2a283..00000000000
--- a/net-p2p/retroshare/retroshare-0.6.5.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils qmake-utils xdg-utils
-
-DESCRIPTION="P2P private sharing application"
-HOMEPAGE="https://retroshare.cc"
-SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz"
-
-# pegmarkdown can also be used with MIT
-LICENSE="AGPL-3 GPL-2 GPL-3 Apache-2.0 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli control-socket gnome-keyring +gui +jsonapi service +sqlcipher webui +xapian"
-
-REQUIRED_USE="
- || ( cli gui service )
- service? ( jsonapi )"
-
-RDEPEND="
- app-arch/bzip2
- dev-libs/openssl:0=
- >=dev-libs/rapidjson-1.1.0
- <net-libs/libupnp-1.8.0
- sys-libs/zlib
- control-socket? ( dev-qt/qtnetwork:5 )
- gnome-keyring? ( 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
- )
- service? ( dev-qt/qtcore:5 )
- sqlcipher? ( dev-db/sqlcipher )
- !sqlcipher? ( dev-db/sqlite:3 )
- webui? ( net-libs/libmicrohttpd )
- xapian? ( dev-libs/xapian )"
-
-DEPEND="${RDEPEND}
- dev-qt/qtcore:5
- gui? ( dev-qt/designer:5 )"
-
-BDEPEND="dev-util/cmake
- virtual/pkgconfig
- jsonapi? (
- || (
- >=app-doc/doxygen-1.8.17
- <app-doc/doxygen-1.8.16
- )
- )"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
-
-S="${WORKDIR}"/RetroShare
-
-src_prepare() {
- # CRLF endings break patch...
- edos2unix retroshare-gui/src/gui/elastic/elnode.h
- default
-}
-
-src_configure() {
- local qConfigs=()
-
- qConfigs+=( $(usex cli '' 'no_')retroshare_nogui )
- qConfigs+=( $(usex control-socket '' 'no_')libresapilocalserver )
- qConfigs+=( $(usex gnome-keyring '' 'no_')rs_autologin )
- qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
- qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
- qConfigs+=( $(usex service '' 'no_')retroshare_service )
- qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
- qConfigs+=( $(usex webui '' 'no_')libresapihttpserver )
- qConfigs+=( $(usex xapian '' 'no_')rs_deep_search )
-
- 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}"
-}
-
-src_compile() {
- use jsonapi && {
- nonfatal emake ||
- elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal"
- }
-
- emake
-}
-
-src_install() {
- use cli && dobin retroshare-nogui/src/retroshare-nogui
- 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
-
- use webui && 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_pretend() {
- if ! use 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
-}
-
-pkg_preinst() {
- local ver
- for ver in ${REPLACING_VERSIONS}; do
- if ! version_is_at_least 0.5.9999 ${ver}; 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 version_is_at_least 0.6.0 ${ver} && ! version_is_at_least 0.6.4 ${ver}; then
- elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
- break
- fi
- done
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-08-07 5:51 Ionen Wolkens
0 siblings, 0 replies; 67+ messages in thread
From: Ionen Wolkens @ 2021-08-07 5:51 UTC (permalink / raw
To: gentoo-commits
commit: ecb9cc63edcb746d24ef05dfc472005d29fd486e
Author: Gioacchino Mazzurco <gio <AT> eigenlab <DOT> org>
AuthorDate: Fri Aug 6 15:29:19 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=ecb9cc63
net-p2p/retroshare: 0.6.5 minimal maintenance
Fixes a bunch of bugs disabling components that are been obsoleted
upstream in older versions
Closes: https://bugs.gentoo.org/779838
Closes: https://bugs.gentoo.org/798048
Closes: https://bugs.gentoo.org/798099
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Gioacchino Mazzurco <gio <AT> altermundi.net>
Closes: https://github.com/gentoo/gentoo/pull/21725
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.5-r3.ebuild | 142 ++++++++++++++++++++++++++
1 file changed, 142 insertions(+)
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild
new file mode 100644
index 00000000000..4a653396a8f
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.5-r3.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop edos2unix qmake-utils xdg-utils
+
+DESCRIPTION="P2P private sharing application"
+HOMEPAGE="https://retroshare.cc"
+SRC_URI="https://github.com/RetroShare/RetroShare/releases/download/v${PV}/RetroShare-v${PV}-source-with-submodules.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="autologin +gui +jsonapi +service +sqlcipher"
+
+REQUIRED_USE="
+ || ( gui service )
+ service? ( jsonapi )"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/openssl:0=
+ >=dev-libs/rapidjson-1.1.0
+ net-libs/miniupnpc:=
+ 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
+ )
+ 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}-qt-5.15.patch" )
+
+S="${WORKDIR}"/RetroShare
+
+src_prepare() {
+ # CRLF endings break patch...
+ edos2unix retroshare-gui/src/gui/elastic/elnode.h
+ default
+}
+
+src_configure() {
+ local qConfigs=()
+
+ qConfigs+=( $(usex autologin '' 'no_')rs_autologin )
+ qConfigs+=( $(usex gui '' 'no_')retroshare_gui )
+ qConfigs+=( $(usex jsonapi '' 'no_')rs_jsonapi )
+ qConfigs+=( $(usex service '' 'no_')retroshare_service )
+ qConfigs+=( $(usex sqlcipher '' 'no_')sqlcipher )
+ qConfigs+=( no_retroshare_nogui )
+ qConfigs+=( no_libresapi )
+ qConfigs+=( no_libresapi_settings )
+ qConfigs+=( no_libresapilocalserver )
+ qConfigs+=( no_libresapihttpserver )
+
+ 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=miniupnpc
+}
+
+src_compile() {
+ use jsonapi && {
+ nonfatal emake ||
+ elog "Due to a bug in RetroShare-v0.6.5 build system when JSON API is enabled, failure at first emake is normal"
+ }
+
+ emake
+}
+
+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.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_pretend() {
+ if ! use 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
+}
+
+pkg_preinst() {
+ local ver
+ for ver in ${REPLACING_VERSIONS}; do
+ if ver_test ${ver} -lt 0.5.9999; 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 ${ver} -ge 0.6.0 && ver_test ${ver} -lt 0.6.4; then
+ elog "Main executable has been renamed upstream from RetroShare06 to retroshare"
+ break
+ fi
+ done
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-10-31 8:21 Joonas Niilola
0 siblings, 0 replies; 67+ messages in thread
From: Joonas Niilola @ 2021-10-31 8:21 UTC (permalink / raw
To: gentoo-commits
commit: 43df6846b5a0058db977ac0c2f32eb6c8973e383
Author: Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Mon Oct 18 05:45:13 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Oct 31 08:21:21 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43df6846
net-p2p/retroshare: install qss stylesheet files
Closes: https://bugs.gentoo.org/818772
Package-Manager: Portage-3.0.20-r6, Repoman-3.0.3-r1
Signed-off-by: Matteo Bianco <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/22620
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.6-r1.ebuild | 123 ++++++++++++++++++++++++++
1 file changed, 123 insertions(+)
diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
new file mode 100644
index 00000000000..1fedc3f34d4
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
@@ -0,0 +1,123 @@
+# 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
+ use gui && doins -r retroshare-gui/src/qss
+
+ 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] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-12-07 7:48 Agostino Sarubbo
0 siblings, 0 replies; 67+ messages in thread
From: Agostino Sarubbo @ 2021-12-07 7:48 UTC (permalink / raw
To: gentoo-commits
commit: d9361578f5644d3b5a9615c661bf9f62ce6b2b75
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 7 07:48:37 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Tue Dec 7 07:48:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9361578
net-p2p/retroshare: amd64 stable wrt bug #828374
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
index 1fedc3f34d4b..a57d5b582fd4 100644
--- a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 ~x86"
IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2021-12-09 16:24 Agostino Sarubbo
0 siblings, 0 replies; 67+ messages in thread
From: Agostino Sarubbo @ 2021-12-09 16:24 UTC (permalink / raw
To: gentoo-commits
commit: 338499a7386a3474542654a150349abf00cfc575
Author: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 9 16:24:22 2021 +0000
Commit: Agostino Sarubbo <ago <AT> gentoo <DOT> org>
CommitDate: Thu Dec 9 16:24:22 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=338499a7
net-p2p/retroshare: x86 stable wrt bug #828374
Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo <ago <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.6-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
index a57d5b582fd4..c51a86d61b83 100644
--- a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
@@ -12,7 +12,7 @@ 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"
+KEYWORDS="amd64 x86"
IUSE="autologin cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2023-05-18 12:17 Andreas Sturmlechner
0 siblings, 0 replies; 67+ messages in thread
From: Andreas Sturmlechner @ 2023-05-18 12:17 UTC (permalink / raw
To: gentoo-commits
commit: 68cc8c2252fbcd2e0de23e5d01ecb73fbaf2c3b8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 12:41:00 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu May 18 12:09:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68cc8c22
net-p2p/retroshare: Rename USE=autologin -> keyring
Bug: https://bugs.gentoo.org/905928
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
net-p2p/retroshare/metadata.xml | 1 -
net-p2p/retroshare/retroshare-0.6.6-r1.ebuild | 8 ++++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 7f0b4e9f7e6d..a784b5ae777f 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -18,7 +18,6 @@
RetroShare provides filesharing, chat, mails, forums and channels.
</longdescription>
<use>
- <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="jsonapi">Enables the new RetroShare JSON API</flag>
<flag name="libupnp">Enables UPnP port forwarding via <pkg>net-libs/libupnp</pkg></flag>
diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
index c51a86d61b83..c0ed3fc143ab 100644
--- a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ 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"
+IUSE="keyring cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher"
REQUIRED_USE="
|| ( gui service )
@@ -25,7 +25,7 @@ RDEPEND="
dev-libs/openssl:0=
>=dev-libs/rapidjson-1.1.0
sys-libs/zlib
- autologin? ( app-crypt/libsecret )
+ keyring? ( app-crypt/libsecret )
gui? (
dev-qt/qtcore:5
dev-qt/qtmultimedia:5
@@ -58,7 +58,7 @@ PATCHES=( "${FILESDIR}/${P}-fix-cxx17-compilation.patch" )
src_configure() {
local qconfigs=(
$(usex cli '' 'no_')rs_service_terminal_login
- $(usex autologin '' 'no_')rs_autologin
+ $(usex keyring '' 'no_')rs_autologin
$(usex gui '' 'no_')retroshare_gui
$(usex jsonapi '' 'no_')rs_jsonapi
$(usex service '' 'no_')retroshare_service
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-03-03 20:38 Andreas K. Hüttel
0 siblings, 0 replies; 67+ messages in thread
From: Andreas K. Hüttel @ 2024-03-03 20:38 UTC (permalink / raw
To: gentoo-commits
commit: d3aaeba9d0b1bf4930bd2b074abd58f2ec6573f1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 3 20:37:36 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 3 20:38:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3aaeba9
net-p2p/retroshare: Apply musl-1.2.4 largefile workaround
Bug: https://bugs.gentoo.org/907898
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.6-r1.ebuild | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
index 2d5b75c038d1..ba21bf7b2854 100644
--- a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit desktop qmake-utils xdg
+inherit flag-o-matic desktop qmake-utils xdg
DESCRIPTION="P2P private sharing application"
HOMEPAGE="https://retroshare.cc"
@@ -69,6 +69,9 @@ src_configure() {
use miniupnp && qupnplibs="miniupnpc"
use libupnp && qupnplibs="upnp ixml"
+ # bug 907898
+ use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
+
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}" \
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-05-24 7:51 Joonas Niilola
0 siblings, 0 replies; 67+ messages in thread
From: Joonas Niilola @ 2024-05-24 7:51 UTC (permalink / raw
To: gentoo-commits
commit: 55498cc2b29b5717c5540dac492462b9f132a82d
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 07:50:33 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 24 07:50:33 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55498cc2
net-p2p/retroshare: drop deprecated qtscript dep from 0.6.7
- at least it's not linked to RDEPEND.
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.7.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.7.ebuild b/net-p2p/retroshare/retroshare-0.6.7.ebuild
index 52d37ce35fa8..e0634fd9a163 100644
--- a/net-p2p/retroshare/retroshare-0.6.7.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.7.ebuild
@@ -33,7 +33,6 @@ RDEPEND="
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
- dev-qt/qtscript:5
dev-qt/qtxml:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-05-24 7:51 Joonas Niilola
0 siblings, 0 replies; 67+ messages in thread
From: Joonas Niilola @ 2024-05-24 7:51 UTC (permalink / raw
To: gentoo-commits
commit: 9dd6ba06e91a78043f7688d5bf5f6673da61a383
Author: gentoo-setan <gentoo <AT> supporter <DOT> addy <DOT> io>
AuthorDate: Thu May 16 09:11:01 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 24 07:50:11 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dd6ba06
net-p2p/retroshare: add 0.6.7
Closes: https://bugs.gentoo.org/927207
Closes: https://github.com/gentoo/gentoo/pull/36697
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/retroshare/Manifest | 1 +
net-p2p/retroshare/metadata.xml | 1 +
net-p2p/retroshare/retroshare-0.6.7.ebuild | 138 +++++++++++++++++++++++++++++
3 files changed, 140 insertions(+)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 28864b4b5852..7f8ab6cd3665 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1 +1,2 @@
DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d
+DIST retroshare-0.6.7.tar.gz 26506259 BLAKE2B 3c0963c8afbbf741c8c5d22dc9c9f86f82d1a338a9f0dd02065617d16e96738a4d22c2bc30c1ba32c61fcc7beedaa15ac3c185aab429882b0947aa28b8c037b1 SHA512 ff5455b97519878d83c6872dfce457804430938864259f7d0fa5b06ebae161e62ea8300e809a03a821b2ecdf755a3de7465a580882709ae79bfb9c1de855e347
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index a784b5ae777f..4388bd9dcb1d 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -22,6 +22,7 @@
<flag name="jsonapi">Enables the new RetroShare 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="plugins">Enables plugin support</flag>
<flag name="service">Enables the new RetroShare service</flag>
<flag name="sqlcipher">Enables GXS database encryption via SQLCipher</flag>
</use>
diff --git a/net-p2p/retroshare/retroshare-0.6.7.ebuild b/net-p2p/retroshare/retroshare-0.6.7.ebuild
new file mode 100644
index 000000000000..52d37ce35fa8
--- /dev/null
+++ b/net-p2p/retroshare/retroshare-0.6.7.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2024 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
+
+LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="keyring cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher plugins"
+
+REQUIRED_USE="
+ || ( gui service )
+ ?? ( libupnp miniupnp )
+ plugins? ( gui )
+ service? ( || ( cli jsonapi ) )"
+
+RDEPEND="
+ app-arch/bzip2
+ dev-libs/openssl:0=
+ sys-libs/zlib
+ keyring? ( app-crypt/libsecret )
+ gui? (
+ 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/qtxml:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtx11extras:5
+ x11-libs/libX11
+ x11-libs/libXScrnSaver
+ )
+ libupnp? ( net-libs/libupnp:= )
+ miniupnp? ( net-libs/miniupnpc:= )
+ sqlcipher? ( dev-db/sqlcipher )
+ !sqlcipher? ( dev-db/sqlite:3 )
+ plugins? (
+ media-libs/speex
+ <media-video/ffmpeg-5
+ )"
+
+# NOTE(setan): rapidjson might not be needed if not using jsonapi. This is to be tested
+DEPEND="${RDEPEND}
+ >=dev-libs/rapidjson-1.1.0
+ gui? ( dev-qt/designer:5 )"
+
+BDEPEND="dev-build/cmake
+ dev-qt/qtcore:5
+ virtual/pkgconfig
+ gui? ( x11-base/xorg-proto )
+ jsonapi? ( app-text/doxygen )"
+
+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"
+ use miniupnp && qupnplibs="miniupnpc"
+ use libupnp && qupnplibs="upnp ixml"
+
+ # 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 gui && dobin retroshare-gui/src/retroshare
+ use service && dobin retroshare-service/src/retroshare-service
+
+ insinto /usr/share/retroshare
+ doins libbitdht/src/bitdht/bdboot.txt
+ use gui && doins -r retroshare-gui/src/qss
+
+ 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
+ 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
+
+ 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] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-05-24 13:49 Joonas Niilola
0 siblings, 0 replies; 67+ messages in thread
From: Joonas Niilola @ 2024-05-24 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 0ba3b9b83699dea518cb520b740b3ec17b0e4ae4
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri May 24 13:48:36 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 24 13:49:12 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba3b9b8
net-p2p/retroshare: add missing speexdsp dep on 0.6.7
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.7.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-p2p/retroshare/retroshare-0.6.7.ebuild b/net-p2p/retroshare/retroshare-0.6.7.ebuild
index e0634fd9a163..d33aa29b2933 100644
--- a/net-p2p/retroshare/retroshare-0.6.7.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.7.ebuild
@@ -45,6 +45,7 @@ RDEPEND="
!sqlcipher? ( dev-db/sqlite:3 )
plugins? (
media-libs/speex
+ media-libs/speexdsp
<media-video/ffmpeg-5
)"
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-07-04 1:23 Sam James
0 siblings, 0 replies; 67+ messages in thread
From: Sam James @ 2024-07-04 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 0e641b1b68c37e016a87ca74d06f9721d49cabbd
Author: gentoo-setan <gentoo-setan <AT> protonmail <DOT> com>
AuthorDate: Wed Jul 3 17:34:35 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 4 01:22:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e641b1b
net-p2p/retroshare: remove 0.6.6-r1
First is long overdue and the rest are recent
Closes: https://bugs.gentoo.org/741100
Closes: https://bugs.gentoo.org/829605
Closes: https://bugs.gentoo.org/831389
Closes: https://bugs.gentoo.org/875725
Closes: https://bugs.gentoo.org/895762
Closes: https://bugs.gentoo.org/907898
Closes: https://bugs.gentoo.org/916249
Closes: https://bugs.gentoo.org/931516
Signed-off-by: gentoo-setan <gentoo-setan <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/retroshare/Manifest | 1 -
net-p2p/retroshare/retroshare-0.6.6-r1.ebuild | 111 --------------------------
2 files changed, 112 deletions(-)
diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index 7f8ab6cd3665..e1ddd3528a96 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,2 +1 @@
-DIST retroshare-0.6.6.tar.gz 24140207 BLAKE2B 1328f2d36f6bc2d1123dd915698f2778e771e36089d8fd8d9ec44d1a8bfa0f56c625b73f62811936e4cee5dd1eca797f9fdf16fdb8defd66706294abc4dde419 SHA512 23ed7c633426caa910a5ae6f04cfd33c523ecaedae1e4044981706420622aadd67ba2772ffd17c9cc1c6193fad508837a31fdcfabe2aab309b8b4302335ede4d
DIST retroshare-0.6.7.tar.gz 26506259 BLAKE2B 3c0963c8afbbf741c8c5d22dc9c9f86f82d1a338a9f0dd02065617d16e96738a4d22c2bc30c1ba32c61fcc7beedaa15ac3c185aab429882b0947aa28b8c037b1 SHA512 ff5455b97519878d83c6872dfce457804430938864259f7d0fa5b06ebae161e62ea8300e809a03a821b2ecdf755a3de7465a580882709ae79bfb9c1de855e347
diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
deleted file mode 100644
index 8c962fdf3221..000000000000
--- a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic 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="keyring 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
- keyring? ( 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-build/cmake
- virtual/pkgconfig
- jsonapi? ( app-text/doxygen )"
-
-PATCHES=( "${FILESDIR}/${P}-fix-cxx17-compilation.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
- )
-
- local qupnplibs="none"
- use miniupnp && qupnplibs="miniupnpc"
- use libupnp && qupnplibs="upnp ixml"
-
- # bug 907898
- use elibc_musl && append-flags -D_LARGEFILE64_SOURCE
-
- 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
- use gui && doins -r retroshare-gui/src/qss
-
- 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
-}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-07-04 1:23 Sam James
0 siblings, 0 replies; 67+ messages in thread
From: Sam James @ 2024-07-04 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 9b0a50bdb4a417142d4e87c154bcccf87576e268
Author: gentoo-setan <gentoo-setan <AT> protonmail <DOT> com>
AuthorDate: Wed Jul 3 17:56:57 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 4 01:22:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b0a50bd
net-p2p/retroshare: Swap 0.6.7 for 0.6.7-r1, fix miniupnpc API
Retroshare only recognizes API over 14:
https://github.com/RetroShare/libretroshare/blob/402f32eda026c3ec3e429b5fb842e87ebd985d73/src/rs_upnp/upnphandler_miniupnp.cc#L50
And miniupnp changed one of the functions core functions in API 18
https://github.com/miniupnp/miniupnp/blob/3911bace98ec1593dcc41953a09f3fd657c341be/miniupnpc/apiversions.txt#L6
Retroshare did not adapt so we need to pin the dep until the upstream
resolves this issue: https://github.com/RetroShare/RetroShare/issues/2865
Closes: https://bugs.gentoo.org/935043
Signed-off-by: gentoo-setan <gentoo-setan <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37412
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{retroshare-0.6.7.ebuild => retroshare-0.6.7-r1.ebuild} | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.7.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r1.ebuild
similarity index 95%
rename from net-p2p/retroshare/retroshare-0.6.7.ebuild
rename to net-p2p/retroshare/retroshare-0.6.7-r1.ebuild
index 75d54db90e7a..40334e72e45b 100644
--- a/net-p2p/retroshare/retroshare-0.6.7.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.7-r1.ebuild
@@ -10,6 +10,7 @@ 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 which is bad for us
LICENSE="AGPL-3 Apache-2.0 CC-BY-SA-4.0 GPL-2 GPL-3 LGPL-3"
SLOT="0"
@@ -40,14 +41,14 @@ RDEPEND="
x11-libs/libXScrnSaver
)
libupnp? ( net-libs/libupnp:= )
- miniupnp? ( net-libs/miniupnpc:= )
+ miniupnp? ( <net-libs/miniupnpc-2.2.8:= )
sqlcipher? ( dev-db/sqlcipher )
!sqlcipher? ( dev-db/sqlite:3 )
plugins? (
media-libs/speex
media-libs/speexdsp
<media-video/ffmpeg-5
- )"
+ )" # REVIEW: miniupnp pinned because retroshare does not support API 18 yet
# NOTE(setan): rapidjson might not be needed if not using jsonapi. This is to be tested
DEPEND="${RDEPEND}
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-07-04 1:23 Sam James
0 siblings, 0 replies; 67+ messages in thread
From: Sam James @ 2024-07-04 1:23 UTC (permalink / raw
To: gentoo-commits
commit: a25f26e5862911dbcb86c527a128c3bf71efa03e
Author: gentoo-setan <gentoo-setan <AT> protonmail <DOT> com>
AuthorDate: Wed Jul 3 17:32:50 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 4 01:22:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a25f26e5
net-p2p/retroshare: remove obsolete ewarns
Signed-off-by: gentoo-setan <gentoo-setan <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.6-r1.ebuild | 15 ---------------
net-p2p/retroshare/retroshare-0.6.7.ebuild | 15 ---------------
2 files changed, 30 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
index ba21bf7b2854..8c962fdf3221 100644
--- a/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.6-r1.ebuild
@@ -108,19 +108,4 @@ pkg_preinst() {
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
}
diff --git a/net-p2p/retroshare/retroshare-0.6.7.ebuild b/net-p2p/retroshare/retroshare-0.6.7.ebuild
index d33aa29b2933..75d54db90e7a 100644
--- a/net-p2p/retroshare/retroshare-0.6.7.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.7.ebuild
@@ -120,19 +120,4 @@ pkg_preinst() {
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] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-07-04 1:29 Sam James
0 siblings, 0 replies; 67+ messages in thread
From: Sam James @ 2024-07-04 1:29 UTC (permalink / raw
To: gentoo-commits
commit: 82b5d1987abe8a5000409162d89aaa6fc04f3fdc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 4 01:23:40 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 4 01:23:40 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82b5d198
net-p2p/retroshare: stabilize 0.6.7-r1 for amd64, x86
These got lost.
Signed-off-by: Sam James <sam <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.7-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.7-r1.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r1.ebuild
index 40334e72e45b..515696241dc3 100644
--- a/net-p2p/retroshare/retroshare-0.6.7-r1.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.7-r1.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 x86"
IUSE="keyring cli +gui +jsonapi libupnp +miniupnp +service +sqlcipher plugins"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-09-13 7:42 Joonas Niilola
0 siblings, 0 replies; 67+ messages in thread
From: Joonas Niilola @ 2024-09-13 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 0b6598d7dc177f89c6bff35408d5b756326e7506
Author: Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Mon Aug 26 15:39:39 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 07:42:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6598d7
net-p2p/retroshare: add me as proxied maintainer, improve metadata
Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Closes: https://github.com/gentoo/gentoo/pull/38292
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/retroshare/metadata.xml | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml
index 4388bd9dcb1d..a91c546333c8 100644
--- a/net-p2p/retroshare/metadata.xml
+++ b/net-p2p/retroshare/metadata.xml
@@ -5,11 +5,15 @@
<email>gio@eigenlab.org</email>
<name>Gioacchino Mazzurco</name>
</maintainer>
+ <maintainer type="person" proxied="yes">
+ <email>fkobi@pm.me</email>
+ <name>Filip Kobierski</name>
+ </maintainer>
<maintainer type="project" proxied="proxy">
<email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers</name>
</maintainer>
- <longdescription lang="en">
+ <longdescription>
RetroShare is a Free and Open Source cross-platform, Friend-2-Friend
secure decentralised communication platform.
It lets you to securely chat and share files with your friends, family
@@ -28,6 +32,8 @@
</use>
<upstream>
<bugs-to>https://github.com/RetroShare/RetroShare/issues</bugs-to>
+ <!-- NOTE: for core functionalities check cout RetroShare/libretroshare -->
+ <doc>https://retrosharedocs.readthedocs.io/en/latest/</doc>
<remote-id type="github">RetroShare/RetroShare</remote-id>
</upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-09-13 7:42 Joonas Niilola
0 siblings, 0 replies; 67+ messages in thread
From: Joonas Niilola @ 2024-09-13 7:42 UTC (permalink / raw
To: gentoo-commits
commit: 599e5e5da157f27b761c450b9f2207e5b71eb67d
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 13 07:36:22 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Sep 13 07:42:35 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=599e5e5d
net-p2p/retroshare: alphabetical ordering all around in 0.6.7-r2
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.7-r2.ebuild | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
index 49e285a13636..e33f7eb5f234 100644
--- a/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
@@ -15,7 +15,7 @@ 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="cli +gui +jsonapi keyring libupnp +miniupnp +service +sqlcipher plugins"
+IUSE="cli +gui +jsonapi keyring libupnp +miniupnp plugins +service +sqlcipher"
REQUIRED_USE="
|| ( gui service )
@@ -27,33 +27,33 @@ RDEPEND="
app-arch/bzip2
dev-libs/openssl:0=
sys-libs/zlib
- keyring? ( app-crypt/libsecret )
gui? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
- dev-qt/qtxml: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:= )
- sqlcipher? ( dev-db/sqlcipher )
- !sqlcipher? ( dev-db/sqlite:3 )
plugins? (
media-libs/speex
media-libs/speexdsp
<media-video/ffmpeg-5
)
+ sqlcipher? ( dev-db/sqlcipher )
+ !sqlcipher? ( dev-db/sqlite:3 )
"
DEPEND="
${RDEPEND}
- jsonapi? ( >=dev-libs/rapidjson-1.1.0 )
gui? ( dev-qt/designer:5 )
+ jsonapi? ( >=dev-libs/rapidjson-1.1.0 )
"
BDEPEND="
dev-build/cmake
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-10-23 11:47 Arthur Zamarin
0 siblings, 0 replies; 67+ messages in thread
From: Arthur Zamarin @ 2024-10-23 11:47 UTC (permalink / raw
To: gentoo-commits
commit: c9723dff29c5e6965f3fadeb54b9641559b90a9e
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 11:47:05 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 11:47:05 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9723dff
net-p2p/retroshare: Stabilize 0.6.7-r2 amd64, #941948
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.7-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
index e33f7eb5f234..2b999a2f0b66 100644
--- a/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ~x86"
IUSE="cli +gui +jsonapi keyring libupnp +miniupnp plugins +service +sqlcipher"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/
@ 2024-10-23 11:47 Arthur Zamarin
0 siblings, 0 replies; 67+ messages in thread
From: Arthur Zamarin @ 2024-10-23 11:47 UTC (permalink / raw
To: gentoo-commits
commit: 6b2cc83a38666ae5787414679165b2377e5631e1
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 23 11:47:06 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Oct 23 11:47:06 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b2cc83a
net-p2p/retroshare: Stabilize 0.6.7-r2 x86, #941948
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
net-p2p/retroshare/retroshare-0.6.7-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
index 2b999a2f0b66..b33ba3383a20 100644
--- a/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
+++ b/net-p2p/retroshare/retroshare-0.6.7-r2.ebuild
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 x86"
IUSE="cli +gui +jsonapi keyring libupnp +miniupnp plugins +service +sqlcipher"
REQUIRED_USE="
^ permalink raw reply related [flat|nested] 67+ messages in thread
end of thread, other threads:[~2024-10-23 11:47 UTC | newest]
Thread overview: 67+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-06 16:25 [gentoo-commits] repo/gentoo:master commit in: net-p2p/retroshare/ Ben Kohler
-- strict thread matches above, loose matches on Subject: below --
2024-10-23 11:47 Arthur Zamarin
2024-10-23 11:47 Arthur Zamarin
2024-09-13 7:42 Joonas Niilola
2024-09-13 7:42 Joonas Niilola
2024-07-04 1:29 Sam James
2024-07-04 1:23 Sam James
2024-07-04 1:23 Sam James
2024-07-04 1:23 Sam James
2024-05-24 13:49 Joonas Niilola
2024-05-24 7:51 Joonas Niilola
2024-05-24 7:51 Joonas Niilola
2024-03-03 20:38 Andreas K. Hüttel
2023-05-18 12:17 Andreas Sturmlechner
2021-12-09 16:24 Agostino Sarubbo
2021-12-07 7:48 Agostino Sarubbo
2021-10-31 8:21 Joonas Niilola
2021-08-07 5:51 Ionen Wolkens
2021-03-12 16:01 Ben Kohler
2021-03-11 13:30 Sam James
2021-03-11 2:35 Sam James
2021-02-06 18:04 Ben Kohler
2021-02-03 18:18 Ben Kohler
2020-05-11 16:49 Agostino Sarubbo
2020-05-08 6:38 Agostino Sarubbo
2020-04-28 17:47 Matt Turner
2020-04-26 11:00 David Seifert
2020-03-20 7:02 Joonas Niilola
2020-03-19 13:48 Joonas Niilola
2020-03-19 13:48 Joonas Niilola
2020-01-12 11:14 David Seifert
2019-05-15 12:48 Andreas Sturmlechner
2019-05-15 12:48 Andreas Sturmlechner
2018-11-07 9:26 Sergey Popov
2018-09-09 8:25 Mikle Kolyada
2018-09-09 1:12 Thomas Deutschmann
2018-08-21 8:27 Andreas Sturmlechner
2018-08-21 8:27 Andreas Sturmlechner
2018-06-09 21:15 Michał Górny
2018-04-23 8:30 Sergey Popov
2018-04-23 8:30 Sergey Popov
2018-04-23 8:30 Sergey Popov
2018-04-23 8:30 Sergey Popov
2018-04-23 8:30 Sergey Popov
2017-08-02 9:28 Sergey Popov
2017-07-28 13:06 Sergey Popov
2017-06-13 16:09 Sergey Popov
2017-06-13 16:09 Sergey Popov
2017-03-27 13:44 Sergey Popov
2017-01-12 13:49 Sergey Popov
2017-01-12 13:49 Sergey Popov
2016-12-15 8:44 Sergey Popov
2016-12-06 12:30 Sergey Popov
2016-12-06 12:30 Sergey Popov
2016-08-17 14:19 Sergey Popov
2016-08-17 14:19 Sergey Popov
2016-07-27 21:00 Sergey Popov
2016-06-18 11:49 Sergey Popov
2016-04-26 9:23 Sergey Popov
2016-03-05 15:50 Mikle Kolyada
2016-02-08 19:00 Sergey Popov
2016-02-08 19:00 Sergey Popov
2015-09-22 10:18 Sergey Popov
2015-09-22 10:18 Sergey Popov
2015-09-21 18:23 Sergey Popov
2015-08-12 10:19 Sergey Popov
2015-08-10 4:28 Robin H. Johnson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox