gentoo auto-resync : 03:04:2023 - 23:21:12

7 files changed, 2 insertions, 121 deletions

diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 56a5acadd796..459ab3219edb 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
deleted file mode 100644
index 7916990ee0a9..000000000000
--- a/app-admin/gixy/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-AUX gixy-0.1.20-backports.patch 2169 BLAKE2B 1e34947b01988a676fd0bbc597613722fa98dc05011cd3dcf11fbc1315ae26fe536f34215a5f89bff414e458c75675631d78bf153ef4e9e4b5305c83a77c0129 SHA512 597f61611ac805f756c8020f823467a11260e4e09bb5c0499dd7ce4f203f89510fdbf0a5a5391856f122fefc5c32e5b3bb2e5feca155c79735b22d79a6001942
-DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
-EBUILD gixy-0.1.20-r1.ebuild 724 BLAKE2B 2a360ef029e5ce6408d5cef34188b8275281ca7cff518b8a8178ab7e4d51cff166219c910f08a27f0ca260a730098bb04a0d616d07c3dcf81c892a4bccae4cc0 SHA512 fbd7839b90940e53d4240dbb6a63796d9814df5c5ffedba6226721e42d02ec11e9f2bcad8996796eb97d5382dc2ac0ba7730d76db024dce39192687413d1e3d2
-MISC metadata.xml 324 BLAKE2B f6f81a115f0e155af5bb5031ddf6e8fb5cdc293c83fd93c4fddc38b06074866b5755f76ec4836cc0736550142e2f3e6c41f105ddb32069862a984a39fa0345f3 SHA512 161132676a924c42219b89d8c994159c4e89cb44d5f7598652ad42e5b19ae799185e430adb9a266410ef1f8dd5ae9f39b8385bbc9aa9bfbf8285d399ac0d07d0
diff --git a/app-admin/gixy/files/gixy-0.1.20-backports.patch b/app-admin/gixy/files/gixy-0.1.20-backports.patch
deleted file mode 100644
index 36c9cb693577..000000000000
--- a/app-admin/gixy/files/gixy-0.1.20-backports.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-diff --git a/gixy/core/regexp.py b/gixy/core/regexp.py
-index 7a96187..f360604 100644
---- a/gixy/core/regexp.py
-+++ b/gixy/core/regexp.py
-@@ -3,7 +3,11 @@ import logging
- import re
- import random
- import itertools
--from cached_property import cached_property
-+
-+try:
-+    from functools import cached_property
-+except ImportError:
-+    from cached_property import cached_property
- 
- import gixy.core.sre_parse.sre_parse as sre_parse
- 
-diff --git a/gixy/directives/block.py b/gixy/directives/block.py
-index 5e5b1ed..cc9bcb0 100644
---- a/gixy/directives/block.py
-+++ b/gixy/directives/block.py
-@@ -1,4 +1,7 @@
--from cached_property import cached_property
-+try:
-+    from functools import cached_property
-+except ImportError:
-+    from cached_property import cached_property
- 
- from gixy.directives.directive import Directive
- from gixy.core.variable import Variable
-diff --git a/gixy/parser/raw_parser.py b/gixy/parser/raw_parser.py
-index 6a30b7f..0f43308 100644
---- a/gixy/parser/raw_parser.py
-+++ b/gixy/parser/raw_parser.py
-@@ -1,7 +1,11 @@
- import logging
- import codecs
- import six
--from cached_property import cached_property
-+
-+try:
-+    from functools import cached_property
-+except ImportError:
-+    from cached_property import cached_property
- 
- from pyparsing import (
-     Literal, Suppress, White, Word, alphanums, Forward, Group, Optional, Combine,
-diff --git a/requirements.txt b/requirements.txt
-index dbf6d5f..47a1b54 100644
---- a/requirements.txt
-+++ b/requirements.txt
-@@ -1,6 +1,6 @@
- pyparsing>=1.5.5
--cached-property>=1.2.0
-+cached-property>=1.2.0;python_version<"3.8"
- argparse>=1.4.0
- six>=1.1.0
- Jinja2>=2.8
--ConfigArgParse>=0.11.0
-\ No newline at end of file
-+ConfigArgParse>=0.11.0
-diff --git a/setup.py b/setup.py
-index e4314a6..e57842b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -18,8 +18,8 @@ setup(
-     url='https://github.com/yandex/gixy',
-     install_requires=[
-         'pyparsing>=1.5.5',
--        'cached-property>=1.2.0',
--        'argparse>=1.4.0',
-+        'cached-property>=1.2.0;python_version<"3.8"',
-+        'argparse>=1.4.0;python_version<"3.2"',
-         'six>=1.1.0',
-         'Jinja2>=2.8',
-         'ConfigArgParse>=0.11.0'
diff --git a/app-admin/gixy/gixy-0.1.20-r1.ebuild b/app-admin/gixy/gixy-0.1.20-r1.ebuild
deleted file mode 100644
index 57fe1ddc0203..000000000000
--- a/app-admin/gixy/gixy-0.1.20-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-inherit distutils-r1
-
-DESCRIPTION="Nginx configuration static analyzer"
-HOMEPAGE="https://github.com/yandex/gixy"
-# Use GitHub source insted PyPi to get tarball with tests
-SRC_URI="https://github.com/yandex/gixy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/pyparsing-1.5.5[${PYTHON_USEDEP}]
-	>=dev-python/ConfigArgParse-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.1.0[${PYTHON_USEDEP}]"
-
-distutils_enable_tests nose
-
-PATCHES=(
-	"${FILESDIR}"/${P}-backports.patch
-)
diff --git a/app-admin/gixy/metadata.xml b/app-admin/gixy/metadata.xml
deleted file mode 100644
index 90dabf33f4e3..000000000000
--- a/app-admin/gixy/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="person">
-		<email>jsmolic@gentoo.org</email>
-		<name>Jakov Smolić</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">yandex/gixy</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-admin/rsyslog/Manifest b/app-admin/rsyslog/Manifest
index a75538972367..5742a482b302 100644
--- a/app-admin/rsyslog/Manifest
+++ b/app-admin/rsyslog/Manifest
@@ -18,5 +18,5 @@ DIST rsyslog-doc-8.2302.0.tar.gz 6586882 BLAKE2B bd79d53670234df46fae79234e03bbe
 EBUILD rsyslog-8.2208.0-r2.ebuild 13135 BLAKE2B 84fdc7404bb080cc57d8cc5e260df6646d6c84af17bad0e0eac1394f7556088dd45650422d9fb98bba64e9583baad5d047f223c5f58d893aa5893e2f4acc375f SHA512 5309c9083aae3407ab2f57849508a8e1b9e2b7e4a268f52c53977a3ee4b30a0a9670ede9b050eedc88cbcbad73f17e5896e3c234dd3fe938c61ebdd0017c2d06
 EBUILD rsyslog-8.2210.0-r2.ebuild 13176 BLAKE2B 8a99355f5ae45c15f1e39b19cbc0d3ca4d08d20ccca21d381eb49d21d437109325a4572c4e08cac21167720548830fa0a8d390d6452afae97d79e858cc22f08b SHA512 4ae5f2a663f2dab7afe5133d4e7d7528c2078091da97b93753563c4e0619175f156f762199ddfd1cef87f3486b13d6ab22774e2a473e2124f7362edea3df6dec
 EBUILD rsyslog-8.2212.0-r1.ebuild 13139 BLAKE2B af709abeded1a831b1289b322ad135d898dfcaf5ae1508924d1190f5e6f1d9fc66a5fd8eb65db515d3f219a0b116e5ec30d5955ef49e4194353640dc410598ac SHA512 3621b8b40cc3fc38fc1eb3168e4e270e693f155ea7d61f4ae96fea07c9d3a95b729ab3806ec39a06a864fa0c6cb7db5891512670ca792f5eb5ab7c4e3ff7a96d
-EBUILD rsyslog-8.2302.0.ebuild 13139 BLAKE2B af709abeded1a831b1289b322ad135d898dfcaf5ae1508924d1190f5e6f1d9fc66a5fd8eb65db515d3f219a0b116e5ec30d5955ef49e4194353640dc410598ac SHA512 3621b8b40cc3fc38fc1eb3168e4e270e693f155ea7d61f4ae96fea07c9d3a95b729ab3806ec39a06a864fa0c6cb7db5891512670ca792f5eb5ab7c4e3ff7a96d
+EBUILD rsyslog-8.2302.0.ebuild 13138 BLAKE2B 37b836b1b6a20b3dff9dd55c2a368f98a0782fae08d71858e39b71c6f0bd2d69ae9ed05aa7b65fa9bdefb1149e2a8133c16f741cad3712a2ae37228fa0c5feaf SHA512 411920538b46bdf0fb3389dd3631e3ce3a084346e02ae7b41b3a264058d7d6223ee51d0d76765ab9c5c22bd5b0b53fae8ed43c114f2303c35840fd9440288149
 MISC metadata.xml 4688 BLAKE2B 61d9ef924def00bed85b9b164e95ae8f512e51a0f0090b61a5737ee93b21db69db642867ddb6076fda757ae10748b9172de42754839d01859529aec70760d04f SHA512 01bedda2baeefccffc765550ab2f8aa29235e7a3a3fc8b765beb205518785da9fb5905037ad9e8e6ba9385d2f009d260260e3c207bbf1eea5a5ce4834a004365
diff --git a/app-admin/rsyslog/rsyslog-8.2302.0.ebuild b/app-admin/rsyslog/rsyslog-8.2302.0.ebuild
index 0d3d01886462..862d4e3f782f 100644
--- a/app-admin/rsyslog/rsyslog-8.2302.0.ebuild
+++ b/app-admin/rsyslog/rsyslog-8.2302.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]]; then
 
 	inherit git-r3
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc64 ~riscv ~sparc ~x86"
 
 	SRC_URI="
 		https://www.rsyslog.com/files/download/${PN}/${P}.tar.gz