summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakov Smolić <jsmolic@gentoo.org>2023-04-03 19:38:41 +0200
committerJakov Smolić <jsmolic@gentoo.org>2023-04-03 19:38:52 +0200
commit14409377a35ddb8f64f317ae6e2b03e186446a32 (patch)
tree9746f5779435a10c371c05b3949297790ecc017f
parentx11-apps/xdbedizzy: treeclean (diff)
downloadgentoo-14409377a35ddb8f64f317ae6e2b03e186446a32.tar.gz
gentoo-14409377a35ddb8f64f317ae6e2b03e186446a32.tar.bz2
gentoo-14409377a35ddb8f64f317ae6e2b03e186446a32.zip
app-admin/gixy: treeclean
Closes: https://bugs.gentoo.org/896468 Closes: https://bugs.gentoo.org/825062 Closes: https://bugs.gentoo.org/865269 Closes: https://bugs.gentoo.org/878685 Signed-off-by: Jakov Smolić <jsmolic@gentoo.org>
-rw-r--r--app-admin/gixy/Manifest1
-rw-r--r--app-admin/gixy/files/gixy-0.1.20-backports.patch76
-rw-r--r--app-admin/gixy/gixy-0.1.20-r1.ebuild28
-rw-r--r--app-admin/gixy/metadata.xml11
-rw-r--r--profiles/package.mask7
5 files changed, 0 insertions, 123 deletions
diff --git a/app-admin/gixy/Manifest b/app-admin/gixy/Manifest
deleted file mode 100644
index 76808251a8df..000000000000
--- a/app-admin/gixy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST gixy-0.1.20.tar.gz 710691 BLAKE2B 09043925d950a9a35de4df91ef3c2f9e5ca4458227320555a109e50d0838fb10ae22d086cdfc39c0d76bcd051c1a7e1d5e291354cc457cff398be8d164cbfde6 SHA512 d666e758c2746c201a11b67b4b99cee1bd3406085eb1c0aa9ae520b72d3a1273e09e3475226a6e54fbfbcefe65b3be0fc877e66cbaa81f384f757767852bc08e
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/profiles/package.mask b/profiles/package.mask
index e57ab875bf8b..b7db461b44dc 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -348,13 +348,6 @@ dev-ruby/sass-rails:5.0
# Bug #900412, removal on 2023-04-08.
x11-plugins/purple-hangouts
-# Jakov Smolić <jsmolic@gentoo.org> (2023-03-04)
-# Depends on deprecated dev-python/nose, no python3.11
-# support, unmaintained upstream. Bugs #896468, #878685,
-# #865269, #825062
-# Removal on 2023-04-04.
-app-admin/gixy
-
# Mike Pagano <mpagano@gentoo.org> (2023-02-27)
# Mask =www-servers/nginx-unit-1.29.0-r1 for testing
=www-servers/nginx-unit-1.29.0-r1