[gentoo-commits] repo/gentoo:master commit in: profiles/, net-im/ricochet/

[gentoo-commits] repo/gentoo:master commit in: profiles/, net-im/ricochet/

[Florian Schmaus]

commit:     fff0cb58bf68c185bbff8210ab14714e1cce316d
Author:     Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Mon Oct  2 11:30:23 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Mon Oct  2 11:36:50 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fff0cb58

net-im/ricochet: treeclean

Closes: https://bugs.gentoo.org/830477
Closes: https://bugs.gentoo.org/913004
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 net-im/ricochet/Manifest              |  1 -
 net-im/ricochet/metadata.xml          | 15 --------
 net-im/ricochet/ricochet-1.1.4.ebuild | 57 ------------------------------
 net-im/ricochet/ricochet-9999.ebuild  | 65 -----------------------------------
 profiles/package.mask                 |  8 -----
 5 files changed, 146 deletions(-)

diff --git a/net-im/ricochet/Manifest b/net-im/ricochet/Manifest
deleted file mode 100644
index 5b3657813636..000000000000
--- a/net-im/ricochet/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ricochet-1.1.4.tar.gz 1292671 BLAKE2B 15a71496b01992060fbdbedb0c73365aa250d9e6c4b5bb6223cbcd727a1cf062b1b9cd094d17ae33471e6095a071b1ea6d553a1bb2168974d45486995e204e9b SHA512 9f20fe8e34ea1d8d5b252eee1e164f0a97bf5b3818e864270ea79c0f018b229ec04b1b27acf44415bb646d48b9d1a0ada455a4f77fafdb6e4d21e62292b778a1

diff --git a/net-im/ricochet/metadata.xml b/net-im/ricochet/metadata.xml
deleted file mode 100644
index c4af8f701ab9..000000000000
--- a/net-im/ricochet/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person" proxied="yes">
-		<email>lucianposton@pm.me</email>
-		<name>Lucian Poston</name>
-	</maintainer>
-	<maintainer type="project" proxied="proxy">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">ricochet-im/ricochet</remote-id>
-	</upstream>
-</pkgmetadata>

diff --git a/net-im/ricochet/ricochet-1.1.4.ebuild b/net-im/ricochet/ricochet-1.1.4.ebuild
deleted file mode 100644
index 016274c26dde..000000000000
--- a/net-im/ricochet/ricochet-1.1.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ricochet-im/ricochet"
-else
-	SRC_URI="https://github.com/ricochet-im/ricochet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Privacy-focused instant messaging through Tor hidden services"
-HOMEPAGE="https://ricochet.im"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug hardened"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwidgets:5
-	net-vpn/tor"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_configure() {
-	local qmakeargs=( 'DEFINES+=RICOCHET_NO_PORTABLE' )
-	qmakeargs+=( $(usex debug 'CONFIG+=debug' 'CONFIG+=release') )
-	qmakeargs+=( $(usex hardened 'CONFIG+=hardened' 'CONFIG+=no-hardened') )
-
-	eqmake5 "${qmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/net-im/ricochet/ricochet-9999.ebuild b/net-im/ricochet/ricochet-9999.ebuild
deleted file mode 100644
index 2caa9d50609c..000000000000
--- a/net-im/ricochet/ricochet-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils xdg-utils
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/ricochet-im/ricochet"
-else
-	SRC_URI="https://github.com/ricochet-im/ricochet/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Privacy-focused instant messaging through Tor hidden services"
-HOMEPAGE="https://ricochet.im"
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="debug hardened"
-
-RDEPEND="
-	dev-libs/openssl:0=
-	dev-libs/protobuf:0=
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	dev-qt/qtgui:5
-	dev-qt/qtmultimedia:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtquickcontrols:5
-	dev-qt/qtwidgets:5
-	net-vpn/tor"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-qt/linguist-tools:5
-	virtual/pkgconfig"
-
-src_prepare() {
-	default
-
-	# workaround bug https://github.com/ricochet-im/ricochet/issues/582
-	cp contrib/usr.bin.ricochet-apparmor contrib/usr.bin.ricochet
-}
-
-src_configure() {
-	local qmakeargs=( 'DEFINES+=RICOCHET_NO_PORTABLE' )
-	qmakeargs+=( 'DEFINES+=APPARMOR' )
-	qmakeargs+=( $(usex debug 'CONFIG+=debug' 'CONFIG+=release') )
-	qmakeargs+=( $(usex hardened 'CONFIG+=hardened' 'CONFIG+=no-hardened') )
-
-	eqmake5 "${qmakeargs[@]}"
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 647fbfd7c812..13560dea4a2a 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -252,14 +252,6 @@ net-wireless/gnome-bluetooth:2
 # Use the newer slot instead.  Masked for removal on 2023-09-29.
 dev-ruby/twitter:7
 
-# Sam James <sam@gentoo.org> (2023-08-29)
-# Obsolete as of September 2021 when legacy Tor hidden services stopped
-# working. Now fails to build with latest protobuf too. No upstream activity
-# since 2017. Alternatives (unvetted) are 'cwtch' and 'ricochet-refreshed' but
-# neither are packaged.
-# Removal on 2023-09-28.  Bug #830477, bug #913004.
-net-im/ricochet
-
 # Sam James <sam@gentoo.org> (2023-08-04)
 # Stricter behavior which causes some packages to fail, see bug #911721.
 =dev-util/pkgconf-2.0.0