[gentoo-commits] repo/gentoo:master commit in: profiles/, gnome-extra/seahorse-nautilus/, gnome-extra/seahorse-nautilus/files/

[gentoo-commits] repo/gentoo:master commit in: profiles/, gnome-extra/seahorse-nautilus/, gnome-extra/seahorse-nautilus/files/

[Matt Turner]

commit:     0dd94082911b204b44cca9f30ba58250e23237d2
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 28 14:08:35 2023 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 28 14:10:06 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dd94082

gnome-extra/seahorse-nautilus: Delete

Closes: https://bugs.gentoo.org/897748
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 gnome-extra/seahorse-nautilus/Manifest             |  2 -
 ...-nautilus-3.11.92-remove-libgnome-keyring.patch | 31 ------------
 gnome-extra/seahorse-nautilus/metadata.xml         | 11 ----
 .../seahorse-nautilus-3.11.92-r1.ebuild            | 59 ----------------------
 .../seahorse-nautilus-3.11.92_p20220906.ebuild     | 50 ------------------
 profiles/package.mask                              |  5 --
 6 files changed, 158 deletions(-)

diff --git a/gnome-extra/seahorse-nautilus/Manifest b/gnome-extra/seahorse-nautilus/Manifest
deleted file mode 100644
index 8e4184ac22a5..000000000000
--- a/gnome-extra/seahorse-nautilus/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST seahorse-nautilus-3.11.92.tar.xz 395304 BLAKE2B f7c741a2d0ae06636ed380c3b8f0006e183bd2eacae87f0c1bfa0d4f1fa0834401a86b7a2b2b21df268ec18b57fbeb6805f30dc20ae43e5456eb05635fda150b SHA512 d3815bfaaf2a5e96beb94abe01fb3f7733e867a04681d4bed540fce58f6556c62534d3217ec0bf1452e848551a42ec703ec241029486d3dcd966c16ff27b87f2
-DIST seahorse-nautilus-3.11.92_p20220906.tar.bz2 177572 BLAKE2B b07fc05ec4b4e04006ce3613bc5847b1540c008604bea90d8972c5a68c335438ada201e5bfae47e46bd8ca274a603fb9dc671ae2ac521c7fcbbef5e4c54e2b7a SHA512 4dd4e3225c6085dbe4b60efeff84c815139e521bb9ba5adb1fe7d33abc815f87045297dce8d4531923e619b3a59f79e92eba8f966bedf2bb6306422f4b8680ec

diff --git a/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch b/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch
deleted file mode 100644
index 5044cd7f26b2..000000000000
--- a/gnome-extra/seahorse-nautilus/files/seahorse-nautilus-3.11.92-remove-libgnome-keyring.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8193f85dc3caeae23e5931c10f52ac9c5324d9d9 Mon Sep 17 00:00:00 2001
-From: Stef Walter <stefw@redhat.com>
-Date: Fri, 8 Jun 2018 12:40:09 +0200
-Subject: [PATCH] Remove libgnome-keyring dependency
-
-It's not needed by seahorse-nautilus
----
- configure.ac | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 471b34d..8d1f39f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -146,13 +146,6 @@ else
- fi
- AC_SUBST(NAUTILUS_EXTENSION_DIR)
- 
--# -----------------------------------------------------------------------------
--# Keyring
--
--PKG_CHECK_MODULES([GNOME_KEYRING], [gnome-keyring-1])
--SEAHORSE_CFLAGS="$SEAHORSE_CFLAGS $GNOME_KEYRING_CFLAGS"
--SEAHORSE_LIBS="$SEAHORSE_LIBS $GNOME_KEYRING_LIBS"
--
- # -----------------------------------------------------------------------------
- # DBus
- 
--- 
-2.14.4
-

diff --git a/gnome-extra/seahorse-nautilus/metadata.xml b/gnome-extra/seahorse-nautilus/metadata.xml
deleted file mode 100644
index bb1a1d68e00c..000000000000
--- a/gnome-extra/seahorse-nautilus/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-  <maintainer type="project">
-    <email>gnome@gentoo.org</email>
-    <name>Gentoo GNOME Desktop</name>
-  </maintainer>
-  <upstream>
-    <remote-id type="gnome-gitlab">GNOME/seahorse-nautilus</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92-r1.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92-r1.ebuild
deleted file mode 100644
index 7b598f4c6bd7..000000000000
--- a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-GNOME2_LA_PUNT="yes"
-GNOME2_EAUTORECONF="yes"
-
-inherit gnome2
-
-DESCRIPTION="Nautilus extension for encrypting and decrypting files with GnuPG"
-HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-COMMON_DEPEND="
-	>=app-crypt/gpgme-1.0.0
-	>=app-crypt/gcr-3.4:0=[gtk]
-	>=dev-libs/dbus-glib-0.35
-	>=dev-libs/glib-2.28:2
-	gnome-base/gnome-keyring
-	>=gnome-base/nautilus-3
-	x11-libs/gtk+:3
-	>=x11-libs/libcryptui-3.9.90
-	>=x11-libs/libnotify-0.3:=
-	>=app-crypt/gnupg-1.4
-"
-# seahorse-nautilus was formerly part of seahorse-plugins
-RDEPEND="${COMMON_DEPEND}
-	!app-crypt/seahorse-plugins[nautilus]
-"
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	# Do not let configure mangle CFLAGS
-	sed -e '/^[ \t]*CFLAGS="$CFLAGS \(-g\|-O0\)/d' -i configure.ac configure ||
-		die "sed failed"
-
-	# Fix icon location, upstream bug #719763
-	sed -i 's/pixmaps\/seahorse-plugins\/48x48/pixmaps\/cryptui\/48x48/' \
-		tool/seahorse-notification.c || die
-
-	# Doesn't really need libgnome-keyring (from Fedora, fixed in
-	# 'master')
-	eapply "${FILESDIR}"/${P}-remove-libgnome-keyring.patch # needs eautoreconf
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-gpg-check \
-		--enable-libnotify
-}

diff --git a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92_p20220906.ebuild b/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92_p20220906.ebuild
deleted file mode 100644
index 45d538289f70..000000000000
--- a/gnome-extra/seahorse-nautilus/seahorse-nautilus-3.11.92_p20220906.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit meson xdg
-
-DESCRIPTION="Nautilus extension for encrypting and decrypting files with GnuPG"
-HOMEPAGE="https://gitlab.gnome.org/GNOME/seahorse-nautilus"
-COMMIT="2cc2a06148604b2f118ef460527b03d27530f6d4"
-SHORT_COMMIT="2cc2a06"
-SRC_URI="https://gitlab.gnome.org/GNOME/${PN}/-/archive/${COMMIT}/${PN}-${SHORT_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	>=app-crypt/gpgme-1.0.0
-	>=app-crypt/gcr-3.4:0=[gtk]
-	>=dev-libs/dbus-glib-0.35
-	>=dev-libs/glib-2.28:2
-	gnome-base/gnome-keyring
-	>=gnome-base/nautilus-43
-	x11-libs/gtk+:3
-	>=x11-libs/libcryptui-3.9.90
-	>=x11-libs/libnotify-0.3:=
-	>=app-crypt/gnupg-1.4
-"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-src_prepare() {
-	default
-	# Fix icon location, https://gitlab.gnome.org/GNOME/seahorse-nautilus/-/issues/10
-	sed -i 's/pixmaps\/seahorse-plugins\/48x48/pixmaps\/cryptui\/48x48/' \
-		tool/seahorse-notification.c || die
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dcheck-compatible-gpg=false
-		-Dlibnotify=true
-	)
-	meson_src_configure
-}

diff --git a/profiles/package.mask b/profiles/package.mask
index 78d5610b79cc..021e8d0a94b1 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -252,11 +252,6 @@ sys-power/dptfxtract
 # Masked for further testing.
 >=dev-python/cython-3
 
-# Matt Turner <mattst88@gentoo.org> (2023-02-25)
-# Packages are unmaintained and archived upstream.
-# Removal on 2023-03-27. Bug #897748
-gnome-extra/seahorse-nautilus
-
 # Ben Kohler <bkohler@gentoo.org> (2023-01-30)
 # Breaks too many revdeps for now
 =app-text/discount-3*