gentoo resync : 03.03.2021

4 files changed, 3 insertions, 91 deletions

diff --git a/dev-python/pyxdg/Manifest b/dev-python/pyxdg/Manifest
index b0032946ce87..dafe2b44121c 100644
--- a/dev-python/pyxdg/Manifest
+++ b/dev-python/pyxdg/Manifest
@@ -1,6 +1,3 @@
-AUX pyxdg-0.26-python384.patch 1782 BLAKE2B 61eccc53300424879b2ff88d0f8e11654616dddf045d7edc3a67a8edf063b8517676276be6a9ee94de69243524cd46dd082846a13f2304b84d26a6f5bb31944f SHA512 e6d1af2b0fe52c85751e6e468576533bf0e718e58b74623fe7e84e2004f7a19353dc16591fe054cb78719318f1f5a70e96f4a009a292f1f8112592ea938eca5f
-DIST pyxdg-rel-0.26.tar.gz 68435 BLAKE2B a95948db17da9909554e82c0ccf590c3f94ec26d1e34d5ba335868233a649368c08ef30cc19e878310ef038e5bdb6d18cd0e15e9413d9c54b70931f25844ee8c SHA512 0c11bccb74b8c0d98f3c63c318d35d08e1c3bbea128bf7b82792e1bdc0a60c8c4d6414b0612b19296cfb48f7951dfc6dd55ac8d23238e370e7faf6c4f64d1fb6
 DIST pyxdg-rel-0.27.tar.gz 75385 BLAKE2B 44c275ad7f698ffea6963f67bdce46e4faed5c7ae7f6a5aeb03f31dba6358c07263ea826458982cc4f88c0e163c2732f5b498a8d38b5881433e5321cfb181ac6 SHA512 fa3b046ce741574a6c71ef9d1e57752f6c9775431110f6ea38dc851780b5e1f9033eabeb15c67c91bc9bef68bf8f545a25ef856c60e16ab2c4fcbbb053d8341e
-EBUILD pyxdg-0.26-r2.ebuild 772 BLAKE2B d6a1c8211106340b4e44c8f97e4771b7f0152a541f587120366383d83e0cafb8957d1a3458e3a1012dd0ca3a8f4b8d38a73c555a7b74c1401b6abbd40669471d SHA512 62968a0c31b5b100f5f902feaa8ca5d57899ff46fadcad52da9b9f0f0f01155a8ab740fb4239649f6656b708a861acdb847472ab0f353d51e99d74d4c60aa3b0
-EBUILD pyxdg-0.27.ebuild 608 BLAKE2B 67f6e00541a4c7fe64343d388764b715d4d3b4b91469d1bad311163233a42c08becce68629ee9b2722927be7857a6f91fb3592e413c6a3ef47915a10c0d650b3 SHA512 24d29f963acf3376a31a44b32f04cd81d09039a6ea5fb565963b42b7ff91da5b85919a693ea6c1224c96f04c00cdc3e6d316cb9ba2c72074ce6b7fcab8c5a455
+EBUILD pyxdg-0.27.ebuild 601 BLAKE2B 457a53f6e5d5c14d8b20474453fde8c51fc76ed177f5e7464a332c6d665b96ca7753cd6e900c49508568839e20e65a1d3fd6d1c409ebc6ab2d3cdbbd31bca5e3 SHA512 4d8f7de9a00845b32b9b589395629fa62270619e1a95a2a4863edee55c87ed1ceb52f951f53adbdcd57e8b12ff4ec3d937ecd70f88b3c8fff435ff6e5aa37c2e
 MISC metadata.xml 512 BLAKE2B 134a7a97dc07dfa10dfc1f9684a0d9ef1cf059966ca3a569762dd277145d19dabf02987553ef6ec60083cf7ea5dd754ff64a735ac4cff8045415657c0a5b1f33 SHA512 c1f7bdaca58f1e63fa5906edd0d626413174742e68da597ab28350fc1f917d9c9c77d0fe7ec0aadd008525cdfc1fa71ff3558bb738f60d129be198844549a39f
diff --git a/dev-python/pyxdg/files/pyxdg-0.26-python384.patch b/dev-python/pyxdg/files/pyxdg-0.26-python384.patch
deleted file mode 100644
index def4a835f036..000000000000
--- a/dev-python/pyxdg/files/pyxdg-0.26-python384.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 9b913229ace838958e51a16cabc41905a2460f7b Mon Sep 17 00:00:00 2001
-From: Conrad Kostecki <conrad@kostecki.com>
-Date: Tue, 25 Aug 2020 00:24:53 +0200
-Subject: [PATCH] Fix compatibility with >=python-3.8.4
-
-Signed-off-by: Conrad Kostecki <conrad@kostecki.com>
----
- xdg/Menu.py | 16 ++++++++++++++--
- 1 file changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/xdg/Menu.py b/xdg/Menu.py
-index 1d03cad..ee406bd 100644
---- a/xdg/Menu.py
-+++ b/xdg/Menu.py
-@@ -21,6 +21,7 @@ def print_menu(menu, tab=0):
- import locale
- import subprocess
- import ast
-+import sys
- try:
-     import xml.etree.cElementTree as etree
- except ImportError:
-@@ -35,6 +36,17 @@ def print_menu(menu, tab=0):
- import xdg.Config
- 
- 
-+def _ast_const(name):
-+    if sys.version_info >= (3, 4):
-+        name = ast.literal_eval(name)
-+        if sys.version_info >= (3, 8):
-+            return ast.Constant(name)
-+        else:
-+            return ast.NameConstant(name)
-+    else:
-+        return ast.Name(id=name, ctx=ast.Load())
-+
-+
- def _strxfrm(s):
-     """Wrapper around locale.strxfrm that accepts unicode strings on Python 2.
- 
-@@ -754,7 +766,7 @@ def parse_rule(self, node):
-         if expr:
-             tree.body = expr
-         else:
--            tree.body = ast.Name('False', ast.Load())
-+            tree.body = _ast_const('False')
-         ast.fix_missing_locations(tree)
-         return Rule(type, tree)
- 
-@@ -781,7 +793,7 @@ def parse_rule_node(self, node):
-             expr = self.parse_bool_op(node, ast.Or())
-             return ast.UnaryOp(ast.Not(), expr) if expr else None
-         elif tag == 'All':
--            return ast.Name('True', ast.Load())
-+            return _ast_const('True')
-         elif tag == 'Category':
-             category = node.text
-             return ast.Compare(
diff --git a/dev-python/pyxdg/pyxdg-0.26-r2.ebuild b/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
deleted file mode 100644
index 0fb2dd272cca..000000000000
--- a/dev-python/pyxdg/pyxdg-0.26-r2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_SETUPTOOLS="no"
-MY_P="${PN}-rel-${PV}"
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-inherit distutils-r1
-
-DESCRIPTION="A Python module to deal with freedesktop.org specifications"
-HOMEPAGE="https://freedesktop.org/wiki/Software/pyxdg https://cgit.freedesktop.org/xdg/pyxdg/"
-SRC_URI="https://github.com/takluyver/${PN}/archive/rel-${PV}.tar.gz -> ${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( x11-themes/hicolor-icon-theme )"
-
-PATCHES=( "${FILESDIR}/${P}-python384.patch" )
-
-distutils_enable_tests nose
diff --git a/dev-python/pyxdg/pyxdg-0.27.ebuild b/dev-python/pyxdg/pyxdg-0.27.ebuild
index 1b21277a80e8..1b1a33faa9e9 100644
--- a/dev-python/pyxdg/pyxdg-0.27.ebuild
+++ b/dev-python/pyxdg/pyxdg-0.27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,6 +15,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
 
 distutils_enable_tests nose