[gentoo-commits] repo/gentoo:master commit in: app-misc/goobook/, profiles/, app-misc/goobook/files/

[David Seifert]

commit:     09d570d51ada6ebee46c441b9516258a99701719
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 18 16:42:46 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 16:42:46 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09d570d5

app-misc/goobook: treeclean

Closes: https://bugs.gentoo.org/718974
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 app-misc/goobook/Manifest                        |   1 -
 app-misc/goobook/files/goobook-3.5.1-pyxdg.patch | 105 -----------------------
 app-misc/goobook/goobook-3.5.1-r3.ebuild         |  48 -----------
 app-misc/goobook/metadata.xml                    |  16 ----
 profiles/package.mask                            |   1 -
 5 files changed, 171 deletions(-)

diff --git a/app-misc/goobook/Manifest b/app-misc/goobook/Manifest
deleted file mode 100644
index dd48ed764e9f..000000000000
--- a/app-misc/goobook/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST goobook-3.5.1.tar.gz 38176 BLAKE2B 99a068256ca83e800a2d2e82c88adba85797107dc72edde9fbb3c9790ef38fff627b4db64c21baff14aa8a4c69788c29aeb01dae60533c7f389352aee9401e9c SHA512 58d056d7d76843bc874e55424912bb00068541e674b780511b7753da31f2df9514baa188017dd0a7479b5527cd50c47e35f37afc493bdc973e0eb1624998a611

diff --git a/app-misc/goobook/files/goobook-3.5.1-pyxdg.patch b/app-misc/goobook/files/goobook-3.5.1-pyxdg.patch
deleted file mode 100644
index e40bc051295f..000000000000
--- a/app-misc/goobook/files/goobook-3.5.1-pyxdg.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 391c081199f9cba5026460fbffba43c03602fa13 Mon Sep 17 00:00:00 2001
-From: Jan Baier <jbaier@××××.cz>
-Date: Mon, 22 Mar 2021 15:04:38 +0100
-Subject: [PATCH] Switch from xdg to pyxdg
-
-As both of them provides the xdg and cannot be installed at the same
-time, pyxdg should be used as it is older, has more features (xdg is a
-subset of pyxdg) and is more used. This change should resolve conflicts
-like https://github.com/srstevenson/xdg/issues/35
-
-Fixes #96
----
- CHANGES.rst       |  6 ++++++
- Pipfile           |  2 +-
- goobook/config.py | 16 ++++++++--------
- setup.py          |  4 ++--
- 4 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/goobook/config.py b/goobook/config.py
-index c948469..05589b1 100644
---- a/goobook/config.py
-+++ b/goobook/config.py
-@@ -10,7 +10,7 @@ import configparser
- import logging
- 
- import oauth2client.client
--import xdg
-+from xdg import BaseDirectory
- 
- from goobook.storage import Storage
- 
-@@ -61,8 +61,8 @@ def read_config(config_file=None):
-     if config_file:  # config file explicitly given on the commandline
-         config_file = os.path.expanduser(config_file)
-     else:  # search for goobookrc in XDG dirs and homedir
--        config_files = [dir_ / "goobookrc" for dir_ in [xdg.XDG_CONFIG_HOME] +
--                        xdg.XDG_CONFIG_DIRS] + [LEGACY_CONFIG_FILE]
-+        config_files = [dir_ / "goobookrc" for dir_ in [pathlib.Path(BaseDirectory.xdg_config_home)] +
-+                        [pathlib.Path(p) for p in BaseDirectory.xdg_config_dirs]] + [LEGACY_CONFIG_FILE]
-         log.debug("config file search path: %s", config_files)
-         for config_file_ in config_files:
-             if config_file_.exists():
-@@ -93,7 +93,7 @@ def read_config(config_file=None):
-     if config.cache_filename:  # If explicitly specified in config file
-         config.cache_filename = realpath(expanduser(config.cache_filename))
-     else:  # search for goobook_cache in XDG dirs and homedir
--        cache_files = [xdg.XDG_CACHE_HOME / "goobook_cache", LEGACY_CACHE_FILE]
-+        cache_files = [pathlib.Path(BaseDirectory.xdg_cache_home) / "goobook_cache", LEGACY_CACHE_FILE]
-         log.debug("cache file search path: %s", cache_files)
-         for cache_file in cache_files:
-             cache_file = cache_file.resolve()
-@@ -101,7 +101,7 @@ def read_config(config_file=None):
-                 log.debug("found cache file: %s", cache_file)
-                 break
-         else:  # If there is none, create in XDG_CACHE_HOME
--            cache_file = xdg.XDG_CACHE_HOME / "goobook_cache"
-+            cache_file = pathlib.Path(BaseDirectory.xdg_cache_home) / "goobook_cache"
-             log.debug("no cache file found, will use %s", cache_file)
-         config.cache_filename = str(cache_file)
- 
-@@ -110,8 +110,8 @@ def read_config(config_file=None):
-         config.oauth_db_filename = realpath(expanduser(config.oauth_db_filename))
-         auth_file = pathlib.Path(config.oauth_db_filename)
-     else:  # search for goobook_auth.json in XDG dirs and homedir
--        auth_files = [dir_ / "goobook_auth.json" for dir_ in [xdg.XDG_DATA_HOME] +
--                      xdg.XDG_DATA_DIRS] + [LEGACY_AUTH_FILE]
-+        auth_files = [dir_ / "goobook_auth.json" for dir_ in [pathlib.Path(BaseDirectory.xdg_data_home)] +
-+                      [pathlib.Path(p) for p in BaseDirectory.xdg_data_dirs]] + [LEGACY_AUTH_FILE]
-         log.debug("auth file search path: %s", auth_files)
-         for auth_file in auth_files:
-             auth_file = auth_file.resolve()
-@@ -119,7 +119,7 @@ def read_config(config_file=None):
-                 log.debug("found auth file: %s", auth_file)
-                 break
-         else:  # If there is none, create in XDG_DATA_HOME
--            auth_file = xdg.XDG_DATA_HOME / "goobook_auth.json"
-+            auth_file = pathlib.Path(BaseDirectory.xdg_data_home) / "goobook_auth.json"
-             log.debug("no auth file found, will use %s", auth_file)
-         config.oauth_db_filename = str(auth_file)
- 
-diff --git a/setup.py b/setup.py
-index e2bed5c..4a6c764 100755
---- a/setup.py
-+++ b/setup.py
-@@ -12,7 +12,7 @@ NEWS = open(os.path.join(HERE, 'CHANGES.rst')).read()
- 
- setuptools.setup(
-     name='goobook',
--    version='3.5.1',
-+    version='3.6',
-     description='Search your google contacts from the command-line or mutt.',
-     long_description=README + '\n\n' + NEWS,
-     long_description_content_type="text/x-rst",
-@@ -39,7 +39,7 @@ setuptools.setup(
-         'google-api-python-client>=1.7.12',
-         'simplejson>=3.16.0',
-         'oauth2client>=1.5.0,<5.0.0dev',
--        'xdg>=4.0.1'
-+        'pyxdg>=0.26'
-     ],
-     extras_require={
-     },
--- 
-GitLab
-

diff --git a/app-misc/goobook/goobook-3.5.1-r3.ebuild b/app-misc/goobook/goobook-3.5.1-r3.ebuild
deleted file mode 100644
index 1ddc2c09d924..000000000000
--- a/app-misc/goobook/goobook-3.5.1-r3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_10 )
-inherit distutils-r1 readme.gentoo-r1 pypi
-
-DESCRIPTION="Access your Google contacts from the command line"
-HOMEPAGE="https://gitlab.com/goobook/goobook"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/google-api-python-client-1.7.12[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-3.16.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	<dev-python/oauth2client-5[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# https://gitlab.com/goobook/goobook/-/merge_requests/13
-	"${FILESDIR}"/${P}-pyxdg.patch
-)
-
-DISABLE_AUTOFORMATTING=1
-DOC_CONTENTS="
-To setup initial authentication, execute:
-
-~ $ goobook authenticate
-
-If you want to use goobook from mutt, add this in your .muttrc file:
-	set query_command=\"goobook query '%s'\"
-to query address book.
-
-You may find more information and advanced configuration tips at
-https://pypi.org/project/${PN}/${PV} in \"Configure/Mutt\" section"
-
-src_install() {
-	distutils-r1_src_install
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}

diff --git a/app-misc/goobook/metadata.xml b/app-misc/goobook/metadata.xml
deleted file mode 100644
index cc7896d7b32b..000000000000
--- a/app-misc/goobook/metadata.xml
+++ /dev/null
@@ -1,16 +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">
-    <name>Kalin KOZHUHAROV</name>
-    <email>kalin@××××××××.net</email>
-  </maintainer>
-  <maintainer type="project" proxied="proxy">
-    <email>proxy-maint@g.o</email>
-    <name>Proxy Maintainers</name>
-  </maintainer>
-  <stabilize-allarches/>
-  <upstream>
-    <remote-id type="pypi">goobook</remote-id>
-  </upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index fde141de635a..9a04601e3610 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -286,7 +286,6 @@ acct-group/jabber
 # The other listed packages are its reverse dependencies.
 # Removal on 2023-03-05.  Bug #718972.
 app-misc/gcalcli
-app-misc/goobook
 
 # Michał Górny <mgorny@g.o> (2023-02-02)
 # dev-python/citeproc-py requires dev-python/nose and is not maintained