gentoo resync : 12.03.2021

3 files changed, 2 insertions, 155 deletions

diff --git a/net-p2p/retroshare/Manifest b/net-p2p/retroshare/Manifest
index a06477034a02..56d21c8e0c42 100644
--- a/net-p2p/retroshare/Manifest
+++ b/net-p2p/retroshare/Manifest
@@ -1,5 +1,4 @@
 AUX retroshare-0.6.5-qt-5.15.patch 2927 BLAKE2B a6e24b46af2df2592b482492b3c53049c4d089f8e4c4f6dd1d3a262945284353b1fde488c141bbae335851108887d2bda6c2e37aa91410885b1448dcfb300e4b SHA512 1b5c2debf192b9801a95d6640c079c7c3d2535cd59ca10f712e8123b1b35781cb7c0ef3fc2ff876c5582bbdb1b1c8efe7ffc666f4cfa365c1c429dd67a83ea37
 DIST retroshare-0.6.5.tar.gz 29377995 BLAKE2B 3a8909227080702e42e59b42301e873d4ece806e014a959080a3ae9df7d11564a6e6d915087a9ddd6d5c66d1e5c43895fa24dea8c0042fdce391c384a54182ee SHA512 a65fefb6baff42a81880a401c9005f73ac8180a247dd992a350f9bf5bac366ee6e809bf93cbbc31e80646156147a1d434306dadfbed1f69879ab61cfae3fddeb
-EBUILD retroshare-0.6.5-r2.ebuild 4113 BLAKE2B 3e4237edb5030f9bed6a9e5c719b757250000eff138d5f15bb4cf866d16d77efe6823959089f666cc664e970257f80a8340bd5c9b8bacd7badfa5fa53fa45ce8 SHA512 5e3960267843613659ca415382d19fe2d2290e1323c33b0ec064250648c9165f30690e1fe5a017f2b68e221a1aa8ac56f783831f86d0b69cff814b279eb1fbd1
-EBUILD retroshare-0.6.5.ebuild 4113 BLAKE2B 8b7711204faba503a21083b93575069de216bd9035e344c9314387600e076d996dc3a26bcff78675a4ecaa282b0c8812ba4407010083e4083aac5cfd1e086f1d SHA512 3194e2f6b63233c981dac0451f47ee6a33a7e407063b25f08686d9e01b6f56f9eca2afde3ddcfaae46780f9f9d46f686ebc846fc235763b108d58e437514bcda
+EBUILD retroshare-0.6.5-r2.ebuild 4111 BLAKE2B 46bc75e3ef9e5630c1c1a1f9cf8d4cc7e7fdfb9bbbf9f4aedfb4fdfb20e6a629c7232a8702a5d85f33e9402d338c6506acd1678a2344d3985c3c3ec4d0e92203 SHA512 900299068206db39cd8988a54c86fec54ef744df13875214ac6ad16b6d516ed5f2f87eac5935a41b53e0270b9cf008803cdff70e17b034e57e87e2274026e256
 MISC metadata.xml 1584 BLAKE2B 35f66764610422f5ae44273f336d84668035cea9458da32e4af81edf162ce1c83b4e6d4d4d7d17a27a2b9ed4bcef7caff9efbd05b8bcee2bb00d33860fa4b63e SHA512 353333842e9c3335e57795447850dfe56ac29865c27232080b97f293d2c1fda89c9d1a47942861428f3b2a69f8fca5b7389f9a15b3fcfa8bd89b7ea8314f3114
diff --git a/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild b/net-p2p/retroshare/retroshare-0.6.5-r2.ebuild
index 51d46eb7ff23..d4bd286e78e4 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="
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 b2c53a2a2839..000000000000
--- 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
-}