From a88eb1d9b7042912d196e255eeb20e0c77f6cf47 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 1 May 2023 17:20:35 +0100 Subject: gentoo auto-resync : 01:05:2023 - 17:20:35 --- net-analyzer/graphite-web/Manifest | 3 - .../files/graphite-web-1.1.8-pyparsing3.patch | 60 ------------ .../graphite-web/graphite-web-1.1.8-r3.ebuild | 102 --------------------- 3 files changed, 165 deletions(-) delete mode 100644 net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch delete mode 100644 net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild (limited to 'net-analyzer/graphite-web') diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest index dd53345186a1..ff6a4a231cc0 100644 --- a/net-analyzer/graphite-web/Manifest +++ b/net-analyzer/graphite-web/Manifest @@ -1,7 +1,4 @@ AUX graphite-web-1.1.7-fhs-paths.patch 2691 BLAKE2B fbb09dfef58d94ef7099e98134d46122c2a82ab3cb0af4bd0cb92102f0e924c3efe80f481f898c81358722f7ad312a1168310ebbbc731c18ab788e1a81cf04ce SHA512 1a8bd3f62163004993f676a039035880512bb1add5f0cc80193471f2cfa483277bd24dd36b3b2b5c6e8faa6d83a029e59c5ea8cb8b713c6d063fe212b921c6a8 -AUX graphite-web-1.1.8-pyparsing3.patch 2529 BLAKE2B 644b729b439a7fca9b8e2df1bede1cda48323694686a6c05378cb7a6112353add56ede35136e1c4f73611c5606be8345ee926f6e99b8dfac15c5ab72e133ac48 SHA512 8f837db47d66d859c247b96077ad4e44168123409fb43a074ab6f625c9235c010557da56dfa788851c8a0d18b4ad314dae085cf63bcaf8ec97e8e6f33f9f7b4c DIST graphite-web-1.1.10.tar.gz 1192965 BLAKE2B cd60e38a70c124c2be53c12394e994f4772a3fcdbae5fa8f26097e79de3de326ec90d5ee23b4e2e8c696e50d7d7ba897b6bb441a1fc7692d1b6e581c11a3da04 SHA512 fb0a2ed5cfa4a8c12bbb7f64f0c7846b439d8094a0b415e5750fe175bbcc2c047fccad50fdeda7696aee0ed9532eb75948f3a376ee34e188cacf226c02bbb3f9 -DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9 EBUILD graphite-web-1.1.10.ebuild 3151 BLAKE2B 381f6da2fdcd52bf1ebcb227ea1aa60b28903a28e0c3fab95adc6cc85f3490e02f4648724cd29ff60bce32c70618ecca811428d7ac192d8800a4e3f5f1615aaa SHA512 12463dbec6ca7a3bac33ebd67203228a16918e06ce3bdcb4a99736c3f6fea4f5772221291a5c59a5d91494b132ef4761525dc72991fb7b90e5543a0dd7686e5c -EBUILD graphite-web-1.1.8-r3.ebuild 3268 BLAKE2B f1337d6b597690be3f0d29fac629b0945a8f76af49a027cea66db6eec906b1d0768e10e58a400422edf38e77b3429629cae26e2da19930b6f26eb5c03ab7291b SHA512 f7303604d341619bf6f33f842e09d2c2ccb74db735cd1451a006bc6b22e69a55cf2304d835252c31958ae69ec5d374767a12fbeea3bb98a4d3e838aa40f6ffc9 MISC metadata.xml 593 BLAKE2B 35159475d570570bde9acc2dd8d6abdf742d03ced88259125cc474f9ea2b9bfcf80c64da1dd44bcb69e55390d72c11c8aaa3b947f68571940c3b8676e6024387 SHA512 7a07c214a85f09ded5ecb5a353d96fc746c5c67f5c71f7539647651fd1519e78e1a3887a4865e9dab59d9804a9b0d801cc1ee72e0fd7225fe75273790e31e28f diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch deleted file mode 100644 index 6a1c44ff0109..000000000000 --- a/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch +++ /dev/null @@ -1,60 +0,0 @@ -Modified to apply on 1.1.8 release - -From 5de8405307ded14930b3381380e9f91e583172a9 Mon Sep 17 00:00:00 2001 -From: parrotpock <51694161+parrotpock@users.noreply.github.com> -Date: Mon, 15 Nov 2021 17:39:23 +0100 -Subject: [PATCH] Fix pyparsing > 3.0 compatibility issue. (#2727) - -* Fix bool() issue in recursion termination check. - -The behaviour of ParsedResults seems to have changed in the way that -the usage of pop() along with the bool() check on the object interact -wrt checking if there are further elements in the parsed structure to -consume. In version > 3.0 bool() checks whether either the internal -_toklist or _tokdict members contain items left to consume and returns -True if either do, whereas pop with no arguments will only consume from -the underlying list. That means that we would get a True in the if -condition in this code, whereas a subsequent call to pop() would throw -an exception. Calling asList() forces the use of the list representation -in the bool check here and so fixes this issue. - -* Fix pyparsing backwards compatibility issue. - -* Remove upper-bound on pin. - -* Add pyparsing3 test target for versions >= 3.0.6 - -* Remove try/except, use dictionary key index syntax - -Co-authored-by: Ubuntu ---- - webapp/graphite/render/evaluator.py | 2 +- - webapp/graphite/render/grammar_unsafe.py | 2 +- - 4 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/webapp/graphite/render/evaluator.py b/webapp/graphite/render/evaluator.py -index 748626ed0c..12179dcc44 100644 ---- a/webapp/graphite/render/evaluator.py -+++ b/webapp/graphite/render/evaluator.py -@@ -58,7 +58,7 @@ def evaluateTokens(requestContext, tokens, replacements=None, pipedArg=None): - return evaluateTokens(requestContext, tokens.template, arglist) - - if tokens.expression: -- if tokens.expression.pipedCalls: -+ if tokens.expression.pipedCalls.asList(): - # when the expression has piped calls, we pop the right-most call and pass the remaining - # expression into it via pipedArg, to get the same result as a nested call - rightMost = tokens.expression.pipedCalls.pop() -diff --git a/webapp/graphite/render/grammar_unsafe.py b/webapp/graphite/render/grammar_unsafe.py -index f25b5eff8f..2481176b53 100644 ---- a/webapp/graphite/render/grammar_unsafe.py -+++ b/webapp/graphite/render/grammar_unsafe.py -@@ -80,7 +80,7 @@ - - - def setRaw(s, loc, toks): -- toks[0].raw = s[toks[0].start:toks[0].end] -+ toks[0]['raw'] = s[toks[0].start:toks[0].end] - - - call = Group( diff --git a/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild deleted file mode 100644 index ecd178a9d3d0..000000000000 --- a/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_9 ) -DISTUTILS_USE_SETUPTOOLS=no # export USE_SETUPTOOLS to activate - -inherit distutils-r1 prefix - -DESCRIPTION="Enterprise scalable realtime graphing" -HOMEPAGE="https://graphiteapp.org/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+carbon ldap mysql memcached postgres +sqlite" - -DEPEND="" -RDEPEND=" - carbon? ( dev-python/carbon[${PYTHON_USEDEP}] ) - ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] ) - memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) - mysql? ( dev-python/mysqlclient[${PYTHON_USEDEP}] ) - postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] ) - >=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}] - =dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}] - dev-python/cairocffi[${PYTHON_USEDEP}] - dev-python/pyparsing[${PYTHON_USEDEP}] - dev-python/pytz[${PYTHON_USEDEP}] - dev-python/six[${PYTHON_USEDEP}] - dev-python/urllib3[${PYTHON_USEDEP}] - media-libs/fontconfig -" - -PATCHES=( - # Do not install the configuration and data files. We install them - # somewhere sensible by hand. - "${FILESDIR}"/${PN}-1.1.7-fhs-paths.patch - # pyparsing fix, can be dropped from 1.1.9 onwards - "${FILESDIR}"/${PN}-1.1.8-pyparsing3.patch -) - -python_prepare_all() { - # Use a less common name - mv bin/build-index bin/${PN}-build-index || die - # use FHS-style paths - export GRAPHITE_NO_PREFIX=yes - distutils-r1_python_prepare_all - eprefixify \ - conf/graphite.wsgi.example \ - webapp/graphite/local_settings.py.example -} - -python_install_all() { - distutils-r1_python_install_all - keepdir /var/{lib,log}/${PN} - docinto examples - docompress -x "/usr/share/doc/${PF}/examples" - dodoc \ - examples/example-graphite-vhost.conf \ - conf/dashboard.conf.example \ - conf/graphite.wsgi.example -} - -python_install() { - distutils-r1_python_install \ - --install-data="${EPREFIX}"/usr/share/${PN} - - # copy the file once, to keep the timestamps correct, #808863 - if [[ ! -e ${ED}/etc/${PN}/local_settings.py ]] ; then - insinto /etc/${PN} - newins webapp/graphite/local_settings.py.example local_settings.py - fi - pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die - ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py || die - popd > /dev/null || die - - python_optimize -} - -pkg_config() { - "${EROOT}"/usr/bin/django-admin.py migrate \ - --settings=graphite.settings --run-syncdb - "${EROOT}"/usr/bin/${PN}-build-index -} - -pkg_postinst() { - # Only display this for new installs - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "You need to configure ${PN} to run with a WSGI server of your choice." - elog "For example using Apache, you can use www-apache/mod_wsgi," - elog " using Nginx, you can use www-servers/uwsgi." - elog "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}" - elog "See https://graphite.readthedocs.org/en/latest/config-local-settings.html" - elog "Run emerge --config =${PN}-${PVR} if this is a fresh install." - elog "" - elog "If you want to update the search index regularily, you should consider running" - elog "the '${PN}-build-index' script in a crontab." - fi -} -- cgit v1.2.3