[gentoo-commits] repo/gentoo:master commit in: sys-auth/authenticator/files/, profiles/, profiles/updates/, ...

[David Seifert]

commit:     e1e4d40dd9be94315390db4bdffcc697197e5890
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Tue Mar 30 09:24:16 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Mar 30 09:24:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1e4d40d

sys-auth/authenticator: Remove last-rited pkg

Closes: https://github.com/gentoo/gentoo/pull/20163
Closes: https://bugs.gentoo.org/683358
Closes: https://bugs.gentoo.org/696476
Closes: https://bugs.gentoo.org/741936
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 profiles/package.mask                              |  5 --
 profiles/updates/3Q-2018                           |  1 -
 sys-auth/authenticator/Manifest                    |  1 -
 .../authenticator/authenticator-0.2.4-r1.ebuild    | 73 ----------------------
 sys-auth/authenticator/authenticator-9999.ebuild   | 69 --------------------
 ...authenticator-0.2.4-disable-failing-tests.patch | 16 -----
 ...or-0.2.4-support-use-of-gdlib-from-system.patch | 23 -------
 sys-auth/authenticator/metadata.xml                | 11 ----
 8 files changed, 199 deletions(-)

diff --git a/profiles/package.mask b/profiles/package.mask
index cd33d3fbecc..b20e9932cbb 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -371,11 +371,6 @@ dev-ml/core_extended
 # Masked for removal in 30 days.
 media-gfx/openexr_viewers
 
-# David Seifert <soap@g.o> (2021-02-25)
-# Unmaintained, python 3.7 only, relies on wrong libgd, which isn't
-# packaged.  Removal on 2021-03-27.  Bug #683358, #696476, #741936.
-sys-auth/authenticator
-
 # Sam James <sam@g.o> (2021-02-18)
 # 0.9.27 included a regression wrt deletes
 # bug #768948

diff --git a/profiles/updates/3Q-2018 b/profiles/updates/3Q-2018
index a78539b959a..d5265767d8f 100644
--- a/profiles/updates/3Q-2018
+++ b/profiles/updates/3Q-2018
@@ -1,3 +1,2 @@
 move app-crypt/sbsigntool app-crypt/sbsigntools
 move x11-apps/radeontop app-misc/radeontop
-move gnome-extra/authenticator sys-auth/authenticator

diff --git a/sys-auth/authenticator/Manifest b/sys-auth/authenticator/Manifest
deleted file mode 100644
index c7653aef711..00000000000
--- a/sys-auth/authenticator/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST authenticator-0.2.4.tar.gz 142444 BLAKE2B 2df1462452d5aaead51af111359120c8a464058730129fd984dd568c709c58f6940a34b996d3b5435b78bd87b433a29735d3fd8e9629b512915720063b49b1a1 SHA512 16b942d24a1136350f78de92a287dcc6b52e9347cd0b73e8310b87c6c24b7075aebe909fe20d80532f7fa1b54d332b8b62fd2fc7d26ce15888fd47bb686520e2

diff --git a/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild b/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
deleted file mode 100644
index c9af80e39d1..00000000000
--- a/sys-auth/authenticator/authenticator-0.2.4-r1.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-inherit gnome2-utils meson python-single-r1 virtualx xdg-utils
-
-DESCRIPTION="Two-factor authentication code generator for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/World/Authenticator"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://gitlab.gnome.org/World/Authenticator"
-else
-	SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Authenticator-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	${PYTHON_DEPS}
-	app-crypt/libsecret
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/gd
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	test? ( x11-apps/xhost )"
-PATCHES=(
-	"${FILESDIR}/${P}-disable-failing-tests.patch"
-	"${FILESDIR}/${P}-support-use-of-gdlib-from-system.patch"
-)
-
-src_prepare() {
-	default
-
-	sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang."
-
-	rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder."
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-src_test() {
-	xdg_environment_reset
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/sys-auth/authenticator/authenticator-9999.ebuild b/sys-auth/authenticator/authenticator-9999.ebuild
deleted file mode 100644
index cd26304aacf..00000000000
--- a/sys-auth/authenticator/authenticator-9999.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_7 )
-inherit gnome2-utils meson python-single-r1 virtualx xdg-utils
-
-DESCRIPTION="Two-factor authentication code generator for GNOME"
-HOMEPAGE="https://gitlab.gnome.org/World/Authenticator"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	SRC_URI=""
-	EGIT_REPO_URI="https://gitlab.gnome.org/World/Authenticator"
-else
-	SRC_URI="https://gitlab.gnome.org/World/Authenticator/-/archive/${PV}/Authenticator-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/Authenticator-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-2+"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-IUSE="test"
-RESTRICT="!test? ( test )"
-RDEPEND="
-	${PYTHON_DEPS}
-	app-crypt/libsecret
-	$(python_gen_cond_dep '
-		dev-python/pillow[${PYTHON_MULTI_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyotp[${PYTHON_MULTI_USEDEP}]
-		dev-python/python-gnupg[${PYTHON_MULTI_USEDEP}]
-		dev-python/pyzbar[${PYTHON_MULTI_USEDEP}]
-	')
-	media-libs/gd
-	x11-libs/gtk+:3
-"
-DEPEND="${RDEPEND}
-	test? ( x11-apps/xhost )"
-
-src_prepare() {
-	default
-
-	sed -i -e "1s:#!/usr/bin/env python3:#!${PYTHON}:" "authenticator.py.in" || die "Could not fix shebang."
-
-	rm -r "subprojects/libgd" || die "Could not remove the subproject libgd folder."
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-	gnome2_schemas_savelist
-}
-
-src_test() {
-	xdg_environment_reset
-	virtx meson_src_test
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-}

diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch b/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch
deleted file mode 100644
index 38b4b95464a..00000000000
--- a/sys-auth/authenticator/files/authenticator-0.2.4-disable-failing-tests.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/data/meson.build b/data/meson.build
-index b646c11..884c5d0 100644
---- a/data/meson.build
-+++ b/data/meson.build
-@@ -50,10 +50,3 @@ endif
- 
- appstreamcli = find_program('appstream-util', required:false)
- 
--if appstreamcli.found()
--  test (
--    'Validate appdata file',
--    appstreamcli,
--    args: ['validate-relax', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
--  )
--endif
-

diff --git a/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch b/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch
deleted file mode 100644
index ffbde3cf2f0..00000000000
--- a/sys-auth/authenticator/files/authenticator-0.2.4-support-use-of-gdlib-from-system.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff --git a/meson.build b/meson.build
-index ed9c48e..6b20bf0 100644
---- a/meson.build
-+++ b/meson.build
-@@ -35,16 +35,7 @@ SERVICES_DIR = join_paths(get_option('datadir'), 'dbus-1', 'services')
- SEARCH_PROVIDER_DIR = join_paths(get_option('datadir'), 'gnome-shell', 'search-providers')
- LIBEXEC_DIR = join_paths(get_option('prefix'), get_option('libexecdir'))
- 
--subproject('libgd',
--  default_options: [
--    'with-introspection=true',
--    'with-notification=true',
--    'static=false',
--    'pkgdatadir=' + DATA_DIR,
--    'pkglibdir=' + LIB_DIR
--  ]
--)
--
-+libgd_dep = dependency('gdlib', required : true)
- 
- 
- # Configuration params
-

diff --git a/sys-auth/authenticator/metadata.xml b/sys-auth/authenticator/metadata.xml
deleted file mode 100644
index 110647d0e28..00000000000
--- a/sys-auth/authenticator/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<!-- maintainer-needed -->
-	<upstream>
-		<maintainer>
-			<name>Bilal Elmoussaoui</name>
-		</maintainer>
-		<bugs-to>https://gitlab.gnome.org/World/Authenticator/issues</bugs-to>
-	</upstream>
-</pkgmetadata>