From f1bc537f089cc8477a9a18db597cb349e1b00e91 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Jun 2018 05:02:38 +0100 Subject: gentoo resync : 16.06.2018 --- net-p2p/retroshare/Manifest | 4 +- net-p2p/retroshare/metadata.xml | 16 +-- net-p2p/retroshare/retroshare-0.6.9999.ebuild | 134 ++++++++++---------------- 3 files changed, 63 insertions(+), 91 deletions(-) (limited to 'net-p2p/retroshare') diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest index 679adca73d1c..86f6652df61b 100644 --- a/net-p2p/retroshare/Manifest +++ b/net-p2p/retroshare/Manifest @@ -3,5 +3,5 @@ DIST retroshare-0.6.3.tar.gz 19699359 BLAKE2B 5a7a77b5ab43d44928e08fd1edc3bd6baa DIST retroshare-0.6.4.tar.gz 20018361 BLAKE2B 63a32ee3a22f4df8b9f6cff149be2c9a9cf18ac895456c808885d510b261f683bf57141b8beb4a0206f7e61eb5c88ce505440956ccdf963ad6ad7f7a73679fb3 SHA512 7fcca6479b73cb4d70532fe46bb4cf24332d523b14a198a0e81689d0e00b62ca300d167be5ac282200e97f5fd9dc6b6c3a2c992ab1daa25846db1a404bf616f8 EBUILD retroshare-0.6.3-r1.ebuild 3946 BLAKE2B e4078aa47a2553aa113eacb37aac1772db81c5560423af5abcebd847925853fc6a69faba386711a38a96aaf9e9b728afffc453c2cdc9232c9289a426ea424096 SHA512 3c24cd55ddab91ead27966d354320460f7789cb91970d8d0e1628c7e232ee46420aeb1a86334625c6d3a2d4fe83e56cdfad47f1706141ae1d58531edf353697f EBUILD retroshare-0.6.4.ebuild 3764 BLAKE2B c83c72a6ed62fb842bd615110b2798a1f6b4bb969c528e01361317dadd60c4f16f0f5d97adca5b636a4b685aa058ab0895124859e59314f8a7f674270c0c8442 SHA512 11244e1503df26aa8a0dbc52a16535389c32dd5147efd1f359d2ad249e34b57580d36d68040f9684f17081fab47c6d10231f91910bbe576bb5351a2166a477ae -EBUILD retroshare-0.6.9999.ebuild 3677 BLAKE2B 367bd726db6e098306faa452eefb243b687b315cabd826569b5b4c06da77feb467522df5320a43ef857d9b5ec010d307f083932e43d2d5287706fd9c29782a17 SHA512 4d194c1dc3e0b9000448fa1297d23d873406ec64ed5a30c8571155bf9fd74d815ef115b4df2274e64b12e3b891ae082ae1fb6500accb85bf2e351b1a8557e407 -MISC metadata.xml 1438 BLAKE2B 2ff0a717f2636ca3514e259dd5db03cf80659636852aa0b0ac160249a8314cae98cfd49a576c4afd82bdc0bfc69bad7152c6b3dd0a817fe9f78bc003b538bf51 SHA512 25d01bf264c4bea00ae077cc24766857e0e5a70a1b805482956e5fc03720edbfbf0a4915fd64cb758fe6a0679212325d0d8d66b101c8a4ec31a0ffe6b4f9e489 +EBUILD retroshare-0.6.9999.ebuild 3272 BLAKE2B 6aced4f87258dd105c3661ad2c3a861ec703ee7a6ff98fd575fb17dd94923b069b8ca16c6a6446d6dff69a3f01241ef9e90d768ac9163d103df34130a220087f SHA512 11056a6d98eed45a7716c848ac3eb812bfd7cedeb246a43cd08ff73dd220b5af3be120c91959d716c1e4f64f4eb40914ce628e9f5bb0e5d6e59eebbd36129708 +MISC metadata.xml 1684 BLAKE2B 8308ce1d3e2a433b79b01dcfdca2ab79b614cc48158fa43c8163e27f4d1d978ea831d54c5408ff3f3c4a3d71b55d0e5d3043058165461389c35e6cf76cac9cb2 SHA512 ba50aff77c086400bb4cdb631be9a634aada2b81832ac2895b74149448da431040604dc88fec9ad5d9e9bce39f2bb5b82565056937e3236124b8a42b1ab2ea6d diff --git a/net-p2p/retroshare/metadata.xml b/net-p2p/retroshare/metadata.xml index d634614148a0..6f5d194f45d1 100644 --- a/net-p2p/retroshare/metadata.xml +++ b/net-p2p/retroshare/metadata.xml @@ -14,24 +14,26 @@ Sergey Popov - 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. Enables the CLI version of RetroShare + Enables API via Unix socket support Enables the Feedreader plugin Enables potentially insecure autologin capability via Gnome Keyring Enables the GUI version of RetroShare + Enables settings control via API + Enables GXS database encryption via SQLCipher Enables VOIP plugin + Enables Web interface and API support - https://sourceforge.net/p/retroshare/bugs - retroshare + https://github.com/RetroShare/RetroShare/issues RetroShare/RetroShare diff --git a/net-p2p/retroshare/retroshare-0.6.9999.ebuild b/net-p2p/retroshare/retroshare-0.6.9999.ebuild index 2a62dc7dc3dc..0db2373b5c22 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() { -- cgit v1.2.3