[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/files/, profiles/, net-analyzer/graphite-web/
commit: ed9967b682d3ba522b76c6b8e4d31d42883ab49e
Author: David Seifert gentoo org>
AuthorDate: Sun May 14 16:19:06 2023 +
Commit: David Seifert gentoo org>
CommitDate: Sun May 14 16:19:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed9967b6
net-analyzer/graphite-web: treeclean
Closes: https://bugs.gentoo.org/897056
Signed-off-by: David Seifert gentoo.org>
net-analyzer/graphite-web/Manifest | 1 -
.../files/graphite-web-1.1.7-fhs-paths.patch | 63 -
.../graphite-web/graphite-web-1.1.10.ebuild| 100 -
net-analyzer/graphite-web/metadata.xml | 17
profiles/package.mask | 1 -
5 files changed, 182 deletions(-)
diff --git a/net-analyzer/graphite-web/Manifest
b/net-analyzer/graphite-web/Manifest
deleted file mode 100644
index 3bf70f518a86..
--- a/net-analyzer/graphite-web/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST graphite-web-1.1.10.tar.gz 1192965 BLAKE2B
cd60e38a70c124c2be53c12394e994f4772a3fcdbae5fa8f26097e79de3de326ec90d5ee23b4e2e8c696e50d7d7ba897b6bb441a1fc7692d1b6e581c11a3da04
SHA512
fb0a2ed5cfa4a8c12bbb7f64f0c7846b439d8094a0b415e5750fe175bbcc2c047fccad50fdeda7696aee0ed9532eb75948f3a376ee34e188cacf226c02bbb3f9
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch
b/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch
deleted file mode 100644
index 6550f083039e..
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Install FHS-style paths
-
a/conf/graphite.wsgi.example
-+++ b/conf/graphite.wsgi.example
-@@ -1,4 +1,4 @@
- import sys
--sys.path.append('/opt/graphite/webapp')
-+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
-
- from graphite.wsgi import application
a/setup.py
-+++ b/setup.py
-@@ -115,8 +115,8 @@
- ],
- package_data={'graphite' :
- ['templates/*', 'local_settings.py.example']},
-- scripts=glob('bin/*'),
-- data_files=list(webapp_content.items()) + storage_dirs + conf_files +
examples,
-+ scripts=['bin/graphite-web-build-index'],
-+ data_files=list(webapp_content.items()),
- install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz',
- 'pyparsing', 'cairocffi', 'urllib3', 'scandir',
'six'],
- classifiers=[
a/webapp/graphite/local_settings.py.example
-+++ b/webapp/graphite/local_settings.py.example
-@@ -101,6 +101,7 @@
- # Change only GRAPHITE_ROOT if your install is merely shifted from
/opt/graphite
- # to somewhere else
- #GRAPHITE_ROOT = '/opt/graphite'
-+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
-
- # Most installs done outside of a separate tree such as /opt/graphite will
- # need to change these settings. Note that the default settings for each
-@@ -110,6 +111,11 @@
- #STATIC_ROOT = '/opt/graphite/static'
- #LOG_DIR = '/opt/graphite/storage/log/webapp'
- #INDEX_FILE = '/opt/graphite/storage/index' # Search index file
-+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
-+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
-+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
-+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
-+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search
index file
-
- # To further or fully customize the paths, modify the following. Note that the
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
-@@ -127,6 +133,8 @@
- #CERES_DIR = '/opt/graphite/storage/ceres'
- #WHISPER_DIR = '/opt/graphite/storage/whisper'
- #RRD_DIR = '/opt/graphite/storage/rrd'
-+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
-+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
- #
- # Data directories using the "Standard" metrics finder (i.e. not Ceres)
- #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above
variables
-@@ -244,7 +244,7 @@
- #
- #DATABASES = {
- #'default': {
--#'NAME': '/opt/graphite/storage/graphite.db',
-+#'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db',
- #'ENGINE': 'django.db.backends.sqlite3',
- #'USER': '',
- #'PASSWORD': '',
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
deleted file mode 100644
index 3488db936e23..
--- a/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{9..10} )
-DISTUTILS_USE_SETUPTOOLS=no # export USE_SETUPTOOLS to activate
-PYPI_NO_NORMALIZE=1
-
-inherit distutils-r1 prefix pypi
-
-DESCRIPTION="Enterprise scalable realtime graphing"
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/files/, net-analyzer/graphite-web/
commit: 1449db64cb6c43cf473edd6b1823571f9cdf9043
Author: Sam James gentoo org>
AuthorDate: Mon May 1 12:40:27 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon May 1 12:48:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1449db64
net-analyzer/graphite-web: drop 1.1.8-r3
Signed-off-by: Sam James gentoo.org>
net-analyzer/graphite-web/Manifest | 1 -
.../files/graphite-web-1.1.8-pyparsing3.patch | 60
.../graphite-web/graphite-web-1.1.8-r3.ebuild | 102 -
3 files changed, 163 deletions(-)
diff --git a/net-analyzer/graphite-web/Manifest
b/net-analyzer/graphite-web/Manifest
index 28489bc090a5..3bf70f518a86 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,2 +1 @@
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
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..
--- 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+parrotp...@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..
--- 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"
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: c3d2fb45629514c2caec1c061ca12b7a8d2ae67e
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Jul 2 16:38:07 2022 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Jul 2 16:38:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d2fb45
net-analyzer/graphite-web-1.1.10: version bump, support for Python 3.10
Closes: https://bugs.gentoo.org/846107
Signed-off-by: Fabian Groffen gentoo.org>
net-analyzer/graphite-web/Manifest | 1 +
.../graphite-web/graphite-web-1.1.10.ebuild| 100 +
2 files changed, 101 insertions(+)
diff --git a/net-analyzer/graphite-web/Manifest
b/net-analyzer/graphite-web/Manifest
index d34c717db751..28489bc090a5 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1 +1,2 @@
+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
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
new file mode 100644
index ..ca42298c3bf5
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.10.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{7..10} )
+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
+)
+
+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."
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 3fff85c120c9f41653401f2a2fc3c2f601c005f0
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Feb 4 09:25:53 2022 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Feb 4 09:26:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fff85c1
net-analyzer/graphite-web-1.1.8-r3: revbump to correct django dep
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen gentoo.org>
.../{graphite-web-1.1.8-r2.ebuild => graphite-web-1.1.8-r3.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild
similarity index 98%
rename from net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild
rename to net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild
index 933b28b75a8c..ba068f3f4c1a 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.8-r3.ebuild
@@ -24,6 +24,7 @@ RDEPEND="
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}]
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/files/
commit: 4f00223e57eb3cedf306fc11b267d508a462a7be
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Jan 30 13:55:09 2022 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Jan 30 13:55:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f00223e
net-analyzer/graphite-web: drop obsolete patch (PR #23758)
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Fabian Groffen gentoo.org>
.../files/graphite-web-1.1.5-fhs-paths.patch | 63 --
1 file changed, 63 deletions(-)
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
deleted file mode 100644
index 4cbbe7213b35..
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Install FHS-style paths
-
a/conf/graphite.wsgi.example
-+++ b/conf/graphite.wsgi.example
-@@ -1,4 +1,4 @@
- import sys
--sys.path.append('/opt/graphite/webapp')
-+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
-
- from graphite.wsgi import application
a/setup.py
-+++ b/setup.py
-@@ -107,8 +107,8 @@
- ],
- package_data={'graphite' :
- ['templates/*', 'local_settings.py.example']},
-- scripts=glob('bin/*'),
-- data_files=list(webapp_content.items()) + storage_dirs + conf_files +
examples,
-+ scripts=['bin/graphite-web-build-index'],
-+ data_files=list(webapp_content.items()),
- install_requires=['Django>=1.8,<2.1', 'django-tagging==0.4.3', 'pytz',
'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
- classifiers=[
- 'Intended Audience :: Developers',
a/webapp/graphite/local_settings.py.example
-+++ b/webapp/graphite/local_settings.py.example
-@@ -101,6 +101,7 @@
- # Change only GRAPHITE_ROOT if your install is merely shifted from
/opt/graphite
- # to somewhere else
- #GRAPHITE_ROOT = '/opt/graphite'
-+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
-
- # Most installs done outside of a separate tree such as /opt/graphite will
- # need to change these settings. Note that the default settings for each
-@@ -110,6 +111,11 @@
- #STATIC_ROOT = '/opt/graphite/static'
- #LOG_DIR = '/opt/graphite/storage/log/webapp'
- #INDEX_FILE = '/opt/graphite/storage/index' # Search index file
-+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
-+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
-+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
-+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
-+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search
index file
-
- # To further or fully customize the paths, modify the following. Note that the
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
-@@ -127,6 +133,8 @@
- #CERES_DIR = '/opt/graphite/storage/ceres'
- #WHISPER_DIR = '/opt/graphite/storage/whisper'
- #RRD_DIR = '/opt/graphite/storage/rrd'
-+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
-+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
- #
- # Data directories using the "Standard" metrics finder (i.e. not Ceres)
- #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above
variables
-@@ -244,7 +244,7 @@
- #
- #DATABASES = {
- #'default': {
--#'NAME': '/opt/graphite/storage/graphite.db',
-+#'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db',
- #'ENGINE': 'django.db.backends.sqlite3',
- #'USER': '',
- #'PASSWORD': '',
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: ffa0b5efc22797f863a1c511c4904aecbfe046df
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Jan 7 09:04:23 2022 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Jan 7 09:04:39 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffa0b5ef
net-analyzer/graphite-web-1.1.8-r2: fix python pre-compiled files
Closes: https://bugs.gentoo.org/808863
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen gentoo.org>
.../{graphite-web-1.1.8-r1.ebuild => graphite-web-1.1.8-r2.ebuild} | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.8-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild
similarity index 93%
rename from net-analyzer/graphite-web/graphite-web-1.1.8-r1.ebuild
rename to net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild
index 2fa1a1ef5fed..933b28b75a8c 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.8-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.8-r2.ebuild
@@ -67,8 +67,11 @@ python_install() {
distutils-r1_python_install \
--install-data="${EPREFIX}"/usr/share/${PN}
- insinto /etc/${PN}
- newins webapp/graphite/local_settings.py.example local_settings.py
+ # 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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 384bdf68aa06b676e324c6b9c84a1d4e6bdaecc3
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Jan 6 16:22:47 2022 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Jan 6 16:23:00 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=384bdf68
net-analyzer/graphite-web-1.1.8-r1: revbump to drop pyparsing restriction
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Fabian Groffen gentoo.org>
.../{graphite-web-1.1.8.ebuild => graphite-web-1.1.8-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.8.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.8-r1.ebuild
similarity index 98%
rename from net-analyzer/graphite-web/graphite-web-1.1.8.ebuild
rename to net-analyzer/graphite-web/graphite-web-1.1.8-r1.ebuild
index d3392bd0c712..2fa1a1ef5fed 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.8.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.8-r1.ebuild
@@ -26,7 +26,7 @@ RDEPEND="
>=dev-python/django-1.11.19[sqlite?,${PYTHON_USEDEP}]
>=dev-python/django-tagging-0.4.6[${PYTHON_USEDEP}]
dev-python/cairocffi[${PYTHON_USEDEP}]
-
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
commit: a71dd49cbd39fe665d469ff392d31816436610a1 Author: Fabian Groffen gentoo org> AuthorDate: Thu Jan 6 08:07:42 2022 + Commit: Fabian Groffen gentoo org> CommitDate: Thu Jan 6 08:07:42 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a71dd49c net-analyzer/graphite-web-1.1.8: version bump, fix pyparsing interaction Closes: https://bugs.gentoo.org/829727 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Fabian Groffen gentoo.org> net-analyzer/graphite-web/Manifest | 3 +- .../files/graphite-web-1.1.8-pyparsing3.patch | 60 ++ .../graphite-web/graphite-web-1.1.5-r1.ebuild | 93 -- ...-web-1.1.7.ebuild => graphite-web-1.1.8.ebuild} | 6 +- 4 files changed, 65 insertions(+), 97 deletions(-) diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest index 7a5d3aca5d0a..d34c717db751 100644 --- a/net-analyzer/graphite-web/Manifest +++ b/net-analyzer/graphite-web/Manifest @@ -1,2 +1 @@ -DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B 94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5 SHA512 b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb -DIST graphite-web-1.1.7.tar.gz 1173818 BLAKE2B e2373360897c1447d60cbf84e5d0dd280130730f617ba12cf0195ed2539f55bcfe8a1cb3b6b9e4f9540a6f08ecb7870072aa61447012baa5553878ebf417937f SHA512 eb0a1de35d3535bd1fdc4e6edc6fe50fd6c8789fef4807eb4cd30d6b20e91e09d21daedb80f55339a8c05325db8fe1038e7a461bf155e41555dee60160d5b241 +DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9 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 new file mode 100644 index ..6a1c44ff0109 --- /dev/null +++ b/net-analyzer/graphite-web/files/graphite-web-1.1.8-pyparsing3.patch @@ -0,0 +1,60 @@ +Modified to apply on 1.1.8 release + +From 5de8405307ded14930b3381380e9f91e583172a9 Mon Sep 17 00:00:00 2001 +From: parrotpock <51694161+parrotp...@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.5-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild deleted file mode
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: b19dd5c5aed07dd84c3515ccb56471b449fa9849
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Jun 5 19:19:27 2021 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Jun 5 19:19:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b19dd5c5
net-analyzer/graphite-web-1.1.7: enable python3.9 now deps are sorted
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
net-analyzer/graphite-web/graphite-web-1.1.7.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
index 8e52c1895dc..53bd930f12a 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -1,9 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
- # 1.1.7 supports up to 3.9, so it's a matter of deps
+PYTHON_COMPAT=( python3_{7..9} )
DISTUTILS_USE_SETUPTOOLS=no # export USE_SETUPTOOLS to activate
inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: a621519a8314153d9237e7f8809f3ae19b501c77
Author: Fabian Groffen gentoo org>
AuthorDate: Mon Nov 2 09:27:30 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Mon Nov 2 09:50:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a621519a
net-analyzer/graphite-web-1.1.7: set DISTUTILS_USE_SETUPTOOLS
Closes: https://bugs.gentoo.org/751685
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
net-analyzer/graphite-web/graphite-web-1.1.7.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
index 2cdf6cbba79..96b7920163d 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -4,6 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
# 1.1.7 supports up to 3.9, so it's a matter of deps
+DISTUTILS_USE_SETUPTOOLS=no # export USE_SETUPTOOLS to activate
inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: eb3e00242c8bf57a2cd677bae5dcbf906ded
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Nov 1 08:40:30 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Nov 1 08:40:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3e0024
net-analyzer/graphite-web: allow python3.8 now python-memcached got support
Closes: https://bugs.gentoo.org/718418
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Fabian Groffen gentoo.org>
net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild | 2 +-
net-analyzer/graphite-web/graphite-web-1.1.7.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
index 35eb0f1c76f..4eb15c40b8c 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} ) # 3.8 dropped due to dep on python-memcached
+PYTHON_COMPAT=( python3_{6,7,8} )
inherit distutils-r1 prefix
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
index 74a4e43dac9..2cdf6cbba79 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_{6,7} ) # 3.8 dropped due to dep on python-memcached
+PYTHON_COMPAT=( python3_{6,7,8} )
# 1.1.7 supports up to 3.9, so it's a matter of deps
inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
commit: 09be558617aa84cf5b146a95c22d4584ff824f5a
Author: Fabian Groffen gentoo org>
AuthorDate: Sun May 31 09:32:30 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun May 31 09:32:30 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09be5586
net-analyzer/graphite-web-1.1.7: version bump with support for Django 3
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Fabian Groffen gentoo.org>
net-analyzer/graphite-web/Manifest | 1 +
...hs.patch => graphite-web-1.1.7-fhs-paths.patch} | 8 +-
.../graphite-web/graphite-web-1.1.7.ebuild | 96 ++
3 files changed, 101 insertions(+), 4 deletions(-)
diff --git a/net-analyzer/graphite-web/Manifest
b/net-analyzer/graphite-web/Manifest
index b2a84682aab..7a5d3aca5d0 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1 +1,2 @@
DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B
94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5
SHA512
b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
+DIST graphite-web-1.1.7.tar.gz 1173818 BLAKE2B
e2373360897c1447d60cbf84e5d0dd280130730f617ba12cf0195ed2539f55bcfe8a1cb3b6b9e4f9540a6f08ecb7870072aa61447012baa5553878ebf417937f
SHA512
eb0a1de35d3535bd1fdc4e6edc6fe50fd6c8789fef4807eb4cd30d6b20e91e09d21daedb80f55339a8c05325db8fe1038e7a461bf155e41555dee60160d5b241
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
b/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch
similarity index 92%
rename from net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
rename to net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch
index aa6ea74ff93..6550f083039 100644
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.7-fhs-paths.patch
@@ -10,17 +10,17 @@ Install FHS-style paths
from graphite.wsgi import application
--- a/setup.py
+++ b/setup.py
-@@ -59,8 +59,8 @@
+@@ -115,8 +115,8 @@
],
package_data={'graphite' :
['templates/*', 'local_settings.py.example']},
- scripts=glob('bin/*'),
-+ scripts=['bin/graphite-web-build-index'],
- data_files=list(webapp_content.items()) + storage_dirs + conf_files +
examples,
++ scripts=['bin/graphite-web-build-index'],
+ data_files=list(webapp_content.items()),
- install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3',
'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+ install_requires=['Django>=1.8,<3.1', 'django-tagging==0.4.3', 'pytz',
+ 'pyparsing', 'cairocffi', 'urllib3', 'scandir',
'six'],
classifiers=[
- 'Intended Audience :: Developers',
--- a/webapp/graphite/local_settings.py.example
+++ b/webapp/graphite/local_settings.py.example
@@ -101,6 +101,7 @@
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
new file mode 100644
index 000..74a4e43dac9
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.7.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python3_{6,7} ) # 3.8 dropped due to dep on python-memcached
+ # 1.1.7 supports up to 3.9, so it's a matter of deps
+
+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
+)
+
+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
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 8572bec1b953cb0fbdf348097b62b140208500cc
Author: Fabian Groffen gentoo org>
AuthorDate: Sat May 9 10:27:19 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat May 9 10:27:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8572bec1
net-analyzer/graphite-web-1.1.5-r1: add support for Python-3.7
Drop dep on scandir, as the built-in version from Python-3.5+ is tried
first, so we don't need the dep (which additionally doesn't support
Python-3.8 yet).
Can't add support for Python-3.8 due to python-memcached.
Bug: https://bugs.gentoo.org/718418
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen gentoo.org>
net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
index 3d688856dc8..35eb0f1c76f 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_6 ) # 3.{7,8} dropped due to dep-hell
+PYTHON_COMPAT=( python3_{6,7} ) # 3.8 dropped due to dep on python-memcached
inherit distutils-r1 prefix
@@ -27,7 +27,6 @@ RDEPEND="
dev-python/cairocffi[${PYTHON_USEDEP}]
dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/scandir[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
dev-python/urllib3[${PYTHON_USEDEP}]
media-libs/fontconfig
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 73507ec0d077ce6841f33d1661e255b85bd2
Author: Fabian Groffen gentoo org>
AuthorDate: Sat Apr 25 18:03:08 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sat Apr 25 18:03:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73507ec0
net-analyzer/graphite-web: drop obsolete dep for dev-python/mysql-python
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen gentoo.org>
net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild | 9 ++---
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
index f0dbbc3d667..3d688856dc8 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python3_6 ) # 3.7 dropped due to dep-hell
+PYTHON_COMPAT=( python3_6 ) # 3.{7,8} dropped due to dep-hell
inherit distutils-r1 prefix
@@ -20,12 +20,7 @@ RDEPEND="
carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
- mysql? (
- || (
- dev-python/mysql-python[${PYTHON_USEDEP}]
- dev-python/mysqlclient[${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}]
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 6b116a0dc9c0f424756c05d1f4b583c233981f3a
Author: Fabian Groffen gentoo org>
AuthorDate: Fri Mar 6 07:36:01 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Fri Mar 6 07:36:01 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b116a0d
net-analyzer/graphite-web: update django deps now we're py3 only
Closes: https://bugs.gentoo.org/711626
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Fabian Groffen gentoo.org>
.../{graphite-web-1.1.5.ebuild => graphite-web-1.1.5-r1.ebuild}| 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
similarity index 96%
rename from net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
rename to net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
index 25a6afa9f35..f0dbbc3d667 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5-r1.ebuild
@@ -27,8 +27,7 @@ RDEPEND="
)
)
postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- >=dev-python/django-1.8[sqlite?,${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}]
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: b0b22a8a24d0b65709feca02971a0fa73d198f80
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Feb 12 10:50:53 2020 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Feb 12 10:50:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b22a8a
net-analyzer/graphite-web-1.1.3-r1: drop old (old django dep)
Closes: https://bugs.gentoo.org/709320
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Fabian Groffen gentoo.org>
net-analyzer/graphite-web/Manifest | 1 -
.../graphite-web/graphite-web-1.1.3-r1.ebuild | 100 -
2 files changed, 101 deletions(-)
diff --git a/net-analyzer/graphite-web/Manifest
b/net-analyzer/graphite-web/Manifest
index 4f5f75d3c2b..b2a84682aab 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,2 +1 @@
-DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B
f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a
SHA512
3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d986842264516258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B
94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5
SHA512
b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
deleted file mode 100644
index cd145d29ab6..000
--- a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_6 )
-
-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/mysql-python[${PYTHON_USEDEP}]
- dev-python/mysqlclient[${PYTHON_USEDEP}]
- )
- )
- postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
- >=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}]
- =dev-python/django-tagging-0.4.3[${PYTHON_USEDEP}]
- dev-python/cairocffi[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/scandir[${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.3-fhs-paths.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}
-
- insinto /etc/${PN}
- newins webapp/graphite/local_settings.py.example local_settings.py
- pushd "${D}/$(python_get_sitedir)"/graphite > /dev/null || die
- ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py ||
die
- popd > /dev/null || die
-}
-
-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
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 8413ab1a3c7654792014d63ce90d7b4d79aff773
Author: Michał Górny gentoo org>
AuthorDate: Sat Jan 25 20:40:09 2020 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Jan 25 20:54:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8413ab1a
net-analyzer/graphite-web: Remove Python 2
Signed-off-by: Michał Górny gentoo.org>
net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild | 2 +-
net-analyzer/graphite-web/graphite-web-1.1.5.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
index 15d71752cb7..cd145d29ab6 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1 prefix
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
index 4b7b3208892..25a6afa9f35 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-PYTHON_COMPAT=( python{2_7,3_6} ) # 3.7 dropped due to dep-hell
+PYTHON_COMPAT=( python3_6 ) # 3.7 dropped due to dep-hell
inherit distutils-r1 prefix
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: e5454365db759e28c3d6fe10f6f6bd04ff285544
Author: David Seifert gentoo org>
AuthorDate: Sun Dec 29 09:55:23 2019 +
Commit: David Seifert gentoo org>
CommitDate: Sun Dec 29 09:55:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5454365
net-analyzer/graphite-web: [QA] Remove explicit python-utils-r1 inherit
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert gentoo.org>
net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild | 2 +-
net-analyzer/graphite-web/graphite-web-1.1.5.ebuild| 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
index f28381633f8..31b50ea3cd5 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python{2_7,3_{5,6}} )
-inherit distutils-r1 python-utils-r1 prefix
+inherit distutils-r1 prefix
DESCRIPTION="Enterprise scalable realtime graphing"
HOMEPAGE="https://graphiteapp.org/;
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
index f52246ead38..cf9bb71329e 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python{2_7,3_{5,6}} ) # 3.7 dropped due to dep-hell
-inherit distutils-r1 python-utils-r1 prefix
+inherit distutils-r1 prefix
DESCRIPTION="Enterprise scalable realtime graphing"
HOMEPAGE="https://graphiteapp.org/;
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
commit: 48520c2867a182b1983a3e75b7024ab8c97b95e2
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Jan 23 13:52:23 2019 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Jan 23 13:52:39 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48520c28
net-analyzer/graphite-web: version bump
Signed-off-by: Fabian Groffen gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
net-analyzer/graphite-web/Manifest | 1 +
.../files/graphite-web-1.1.5-fhs-paths.patch | 63 +
.../graphite-web/graphite-web-1.1.5.ebuild | 100 +
3 files changed, 164 insertions(+)
diff --git a/net-analyzer/graphite-web/Manifest
b/net-analyzer/graphite-web/Manifest
index 15fe0c57bdd..4f5f75d3c2b 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1 +1,2 @@
DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B
f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a
SHA512
3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d986842264516258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
+DIST graphite-web-1.1.5.tar.gz 1173809 BLAKE2B
94a1b4deab3159d3bde2d3c8b6f9664f39942cb1b815ce042b196be3c0e769ee1acac4b619135e9471360849308b90e02e1df4f7d6b7d0ef31e46d38ee2425e5
SHA512
b2097609ca77a40e6e7d83a3141335e2208d69e7f4edbac8ce3505ed9dd654589836a3b3498bfb7f7585332bceeb8e367f0c10f3cf6afdb5ad6b96377338a7bb
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
new file mode 100644
index 000..4cbbe7213b3
--- /dev/null
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch
@@ -0,0 +1,63 @@
+Install FHS-style paths
+
+--- a/conf/graphite.wsgi.example
b/conf/graphite.wsgi.example
+@@ -1,4 +1,4 @@
+ import sys
+-sys.path.append('/opt/graphite/webapp')
++sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
+
+ from graphite.wsgi import application
+--- a/setup.py
b/setup.py
+@@ -107,8 +107,8 @@
+ ],
+ package_data={'graphite' :
+ ['templates/*', 'local_settings.py.example']},
+- scripts=glob('bin/*'),
+- data_files=list(webapp_content.items()) + storage_dirs + conf_files +
examples,
++ scripts=['bin/graphite-web-build-index'],
++ data_files=list(webapp_content.items()),
+ install_requires=['Django>=1.8,<2.1', 'django-tagging==0.4.3', 'pytz',
'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+ classifiers=[
+ 'Intended Audience :: Developers',
+--- a/webapp/graphite/local_settings.py.example
b/webapp/graphite/local_settings.py.example
+@@ -101,6 +101,7 @@
+ # Change only GRAPHITE_ROOT if your install is merely shifted from
/opt/graphite
+ # to somewhere else
+ #GRAPHITE_ROOT = '/opt/graphite'
++GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
+
+ # Most installs done outside of a separate tree such as /opt/graphite will
+ # need to change these settings. Note that the default settings for each
+@@ -110,6 +111,11 @@
+ #STATIC_ROOT = '/opt/graphite/static'
+ #LOG_DIR = '/opt/graphite/storage/log/webapp'
+ #INDEX_FILE = '/opt/graphite/storage/index' # Search index file
++CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
++STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
++STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
++LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
++INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search
index file
+
+ # To further or fully customize the paths, modify the following. Note that the
+ # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
+@@ -127,6 +133,8 @@
+ #CERES_DIR = '/opt/graphite/storage/ceres'
+ #WHISPER_DIR = '/opt/graphite/storage/whisper'
+ #RRD_DIR = '/opt/graphite/storage/rrd'
++WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
++RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
+ #
+ # Data directories using the "Standard" metrics finder (i.e. not Ceres)
+ #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above
variables
+@@ -244,7 +244,7 @@
+ #
+ #DATABASES = {
+ #'default': {
+-#'NAME': '/opt/graphite/storage/graphite.db',
++#'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db',
+ #'ENGINE': 'django.db.backends.sqlite3',
+ #'USER': '',
+ #'PASSWORD': '',
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
new file mode 100644
index 000..b0cada7cd87
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.5.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: f9f3a84fbb4222f389779e9f434a5c2a2712eb0c
Author: Fabian Groffen gentoo org>
AuthorDate: Thu Aug 16 10:13:17 2018 +
Commit: Fabian Groffen gentoo org>
CommitDate: Thu Aug 16 10:13:17 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f3a84f
net-analyzer/graphite-web: add stronger hint about wsgi install
Closes: https://bugs.gentoo.org/618030
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
index 1f67a202f1f..28df7679980 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
@@ -88,6 +88,8 @@ 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."
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
commit: 4f40c918a652f6ecb28c94c06165f7c5d2914f98
Author: Virgil Dupras gentoo org>
AuthorDate: Sun Jul 22 17:09:10 2018 +
Commit: Virgil Dupras gentoo org>
CommitDate: Sun Jul 22 17:10:14 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f40c918
net-analyzer/graphite-web: remove old
Package-Manager: Portage-2.3.43, Repoman-2.3.10
net-analyzer/graphite-web/Manifest | 2 -
.../files/graphite-web-0.9.13-fhs-paths.patch | 76 ---
.../files/graphite-web-0.9.13-system-libs.patch| 100 ---
.../graphite-web/graphite-web-0.9.13-r3.ebuild | 108 -
4 files changed, 286 deletions(-)
diff --git a/net-analyzer/graphite-web/Manifest
b/net-analyzer/graphite-web/Manifest
index b794186eb09..15fe0c57bdd 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,3 +1 @@
-DIST graphite-web-0.9.13-share.png 325 BLAKE2B
390d5de23ae8300ca042e9c259fb7f892a4fd69ee8225d171b1f32b4215188fdd7a5c4f8e65fb3eae64cf154044ddb03c4490a8318ef8dc5934f3d5c04aeb6bb
SHA512
19dc9139e97a99bf06fded2958bc52bc856fa11d0dc50f57e6c54214373795534cb74883ab5da7a05e2ddb69a2870d3b02dcf2ab0628bdf289f1ffd925e044e2
-DIST graphite-web-0.9.13.tar.gz 2182781 BLAKE2B
c4db10fbdfd45efb683862967e743de5d96a6342ade85548c43f3072fbc7f15d32a606979800e1c46ce8c81611121fa91ed873d57a184c92cc3167a7c5ac531e
SHA512
5e2cc84ec57e1fa0ecff8c9671d8753655a8ce2c07ce2f446451ceaad7679b0cefe932de45315be360b8f13eb25cd25ef179814f340c2c42b0e7048a3d4f4a96
DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B
f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a
SHA512
3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d986842264516258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
diff --git
a/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
b/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
deleted file mode 100644
index ecfce96e053..000
--- a/net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Install FHS-style paths
-
graphite-web-0.9.13/conf/graphite.wsgi.example
-+++ graphite-web-0.9.13/conf/graphite.wsgi.example
-@@ -1,5 +1,5 @@
- import os, sys
--sys.path.append('/opt/graphite/webapp')
-+sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
- os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'graphite.settings')
-
- import django
graphite-web-0.9.13/setup.py
-+++ graphite-web-0.9.13/setup.py
-@@ -59,7 +59,6 @@
- ],
- package_data={'graphite' :
- ['templates/*', 'local_settings.py.example']},
-- scripts=glob('bin/*'),
-- data_files=webapp_content.items() + storage_dirs + conf_files + examples,
-+ data_files=webapp_content.items(),
- **setup_kwargs
- )
graphite-web-0.9.13/webapp/graphite/local_settings.py.example
-+++ graphite-web-0.9.13/webapp/graphite/local_settings.py.example
-@@ -54,14 +54,14 @@
- #
- # Change only GRAPHITE_ROOT if your install is merely shifted from
/opt/graphite
- # to somewhere else
--#GRAPHITE_ROOT = '/opt/graphite'
-+GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
-
- # Most installs done outside of a separate tree such as /opt/graphite will
only
- # need to change these three settings. Note that the default settings for each
- # of these is relative to GRAPHITE_ROOT
--#CONF_DIR = '/opt/graphite/conf'
--#STORAGE_DIR = '/opt/graphite/storage'
--#CONTENT_DIR = '/opt/graphite/webapp/content'
-+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
-+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
-+CONTENT_DIR = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
-
- # To further or fully customize the paths, modify the following. Note that the
- # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
-@@ -69,6 +69,8 @@
- ## Webapp config files
- #DASHBOARD_CONF = '/opt/graphite/conf/dashboard.conf'
- #GRAPHTEMPLATES_CONF = '/opt/graphite/conf/graphTemplates.conf'
-+DASHBOARD_CONF = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/dashboard.conf'
-+GRAPHTEMPLATES_CONF =
'@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web/graphTemplates.conf'
-
- ## Data directories
- # NOTE: If any directory is unreadable in DATA_DIRS it will break metric
browsing
-@@ -77,7 +79,11 @@
- #DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
- #LOG_DIR = '/opt/graphite/storage/log/webapp'
- #INDEX_FILE = '/opt/graphite/storage/index' # Search index file
--
-+WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
-+RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
-+DATA_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above variables
-+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web/'
-+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index'
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/files/, net-analyzer/graphite-web/
commit: d4c60400f9bcd7871e8aa78426f86904d1099118
Author: Louis Sautier gentoo org>
AuthorDate: Mon Jun 25 10:11:53 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Mon Jun 25 21:24:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4c60400
net-analyzer/graphite-web: fix deps, re-add USE=ldap, misc.
* Sort dependencies.
* Do not require python[sqlite], it is never directly used.
* Do not require twisted or txAMQP, they are not directly
used by graphite-web.
* Do not require zope-interface, it was removed in
https://github.com/graphite-project/graphite-web/commit/bed2d5b82d128b751ea080d86a4ccb9c27bb6c58
* Do not require whisper. It is optional and in the future we could
probably use carbon with ceres instead of whisper.
* pytz and pyparsing are not bundled any more, remove the call to rm.
* Use python_prepare_all instead of src_prepare.
* Install examples only once in the _all function. Use dodoc instead of
doins. Do not compress them.
* Use the recommended way to configure the app instead of re-creating
manage.py.
* Do not remove build-index from install but rename it.
* Run build-index during pkg_config() instead of just creating an empty
file. This allows us to drop the complex python file parsing.
* Mention build-index in the postinst message. Only display the message
for new installs. Use elog instead of einfo.
* Create the /var/{lib,log}/graphite-web directories which are
referenced in local_settings.py.
* Add the example database location to the FHS-style settings patch.
* Fix STATIC_ROOT in the FHS-style settings patch.
* Add missing || die to the ln call.
* bump to EAPI=7.
Closes: https://github.com/gentoo/gentoo/pull/8962
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../files/graphite-web-1.1.3-fhs-paths.patch | 14 ++-
.../graphite-web/graphite-web-1.1.3-r1.ebuild | 98 +
.../graphite-web/graphite-web-1.1.3.ebuild | 119 -
3 files changed, 110 insertions(+), 121 deletions(-)
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
index 39d32598424..aa6ea74ff93 100644
--- a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
@@ -10,11 +10,12 @@ Install FHS-style paths
from graphite.wsgi import application
--- a/setup.py
+++ b/setup.py
-@@ -59,8 +59,7 @@
+@@ -59,8 +59,8 @@
],
package_data={'graphite' :
['templates/*', 'local_settings.py.example']},
- scripts=glob('bin/*'),
++ scripts=['bin/graphite-web-build-index'],
- data_files=list(webapp_content.items()) + storage_dirs + conf_files +
examples,
+ data_files=list(webapp_content.items()),
install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3',
'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
@@ -36,7 +37,7 @@ Install FHS-style paths
#INDEX_FILE = '/opt/graphite/storage/index' # Search index file
+CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
+STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
-+STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
++STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp/content'
+LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
+INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search
index file
@@ -51,3 +52,12 @@ Install FHS-style paths
#
# Data directories using the "Standard" metrics finder (i.e. not Ceres)
#STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above
variables
+@@ -244,7 +244,7 @@
+ #
+ #DATABASES = {
+ #'default': {
+-#'NAME': '/opt/graphite/storage/graphite.db',
++#'NAME': '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/graphite.db',
+ #'ENGINE': 'django.db.backends.sqlite3',
+ #'USER': '',
+ #'PASSWORD': '',
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
new file mode 100644
index 000..1f67a202f1f
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 python-utils-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? (
+
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 71a8fb5b33bd6d2b7075976ce5737889ddb28c97
Author: Louis Sautier gmail com>
AuthorDate: Sun Jun 10 20:44:14 2018 +
Commit: Louis Sautier gentoo org>
CommitDate: Mon Jun 25 21:24:34 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71a8fb5b
net-analyzer/graphite-web: update HOMEPAGE, add GitHub to metadata.xml
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild | 4 ++--
net-analyzer/graphite-web/graphite-web-1.1.3.ebuild | 2 +-
net-analyzer/graphite-web/metadata.xml | 2 ++
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
index 437a290d101..f0fed573df9 100644
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 python-utils-r1 prefix
DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="http://graphite.readthedocs.org/;
+HOMEPAGE="https://graphiteapp.org/;
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
https://raw.githubusercontent.com/graphite-project/graphite-web/522d84fed687bd946878e48d85982d59f7bd1267/webapp/content/img/share.png
-> ${P}-share.png"
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
index e8d0e6ccfcb..a51361a091c 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
inherit distutils-r1 python-utils-r1 prefix
DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="http://graphite.readthedocs.org/;
+HOMEPAGE="https://graphiteapp.org/;
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
diff --git a/net-analyzer/graphite-web/metadata.xml
b/net-analyzer/graphite-web/metadata.xml
index 851f07a3b53..d4f9fa58262 100644
--- a/net-analyzer/graphite-web/metadata.xml
+++ b/net-analyzer/graphite-web/metadata.xml
@@ -11,5 +11,7 @@
graphite-web
+ graphite-project/graphite-web
+
https://github.com/graphite-project/graphite-web/issues
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 112d6bb5c8696354f96dcd4d32d1f3d62e3c1dfe
Author: Fabian Groffen gentoo org>
AuthorDate: Tue Jun 12 11:01:31 2018 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue Jun 12 11:01:31 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=112d6bb5
net-analyzer/graphite-web: remove false-positive unneeded empty line
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-analyzer/graphite-web/graphite-web-1.1.3.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
index 7ca11c643e1..e8d0e6ccfcb 100644
--- a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
@@ -75,7 +75,6 @@ python_install() {
import os
import sys
-
if __name__ == "__main__":
os.environ.setdefault("DJANGO_SETTINGS_MODULE",
"graphite.settings")
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/, net-analyzer/graphite-web/files/
commit: 048bbf243d0ac6536b57a14fadcba5770383b681
Author: Fabian Groffen gentoo org>
AuthorDate: Tue Jun 12 09:52:09 2018 +
Commit: Fabian Groffen gentoo org>
CommitDate: Tue Jun 12 10:35:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=048bbf24
net-analyzer/graphite-web: version bump to 1.1.3
Package-Manager: Portage-2.3.40, Repoman-2.3.9
net-analyzer/graphite-web/Manifest | 1 +
.../files/graphite-web-1.1.3-fhs-paths.patch | 53 +
.../graphite-web/graphite-web-1.1.3.ebuild | 120 +
3 files changed, 174 insertions(+)
diff --git a/net-analyzer/graphite-web/Manifest
b/net-analyzer/graphite-web/Manifest
index 56d125f06cf..b794186eb09 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,2 +1,3 @@
DIST graphite-web-0.9.13-share.png 325 BLAKE2B
390d5de23ae8300ca042e9c259fb7f892a4fd69ee8225d171b1f32b4215188fdd7a5c4f8e65fb3eae64cf154044ddb03c4490a8318ef8dc5934f3d5c04aeb6bb
SHA512
19dc9139e97a99bf06fded2958bc52bc856fa11d0dc50f57e6c54214373795534cb74883ab5da7a05e2ddb69a2870d3b02dcf2ab0628bdf289f1ffd925e044e2
DIST graphite-web-0.9.13.tar.gz 2182781 BLAKE2B
c4db10fbdfd45efb683862967e743de5d96a6342ade85548c43f3072fbc7f15d32a606979800e1c46ce8c81611121fa91ed873d57a184c92cc3167a7c5ac531e
SHA512
5e2cc84ec57e1fa0ecff8c9671d8753655a8ce2c07ce2f446451ceaad7679b0cefe932de45315be360b8f13eb25cd25ef179814f340c2c42b0e7048a3d4f4a96
+DIST graphite-web-1.1.3.tar.gz 1171342 BLAKE2B
f18c84d707f93d897553ec05d7b910a3dba97c6068498d1b216f178ea8a1f64baf59bb572b433a56f5e417a2873c018a38a19c3b8c765f667d7c3fbb38b9ed0a
SHA512
3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d986842264516258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436
diff --git a/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
new file mode 100644
index 000..39d32598424
--- /dev/null
+++ b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
@@ -0,0 +1,53 @@
+Install FHS-style paths
+
+--- a/conf/graphite.wsgi.example
b/conf/graphite.wsgi.example
+@@ -1,4 +1,4 @@
+ import sys
+-sys.path.append('/opt/graphite/webapp')
++sys.path.append('@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web/webapp')
+
+ from graphite.wsgi import application
+--- a/setup.py
b/setup.py
+@@ -59,8 +59,7 @@
+ ],
+ package_data={'graphite' :
+ ['templates/*', 'local_settings.py.example']},
+- scripts=glob('bin/*'),
+- data_files=list(webapp_content.items()) + storage_dirs + conf_files +
examples,
++ data_files=list(webapp_content.items()),
+ install_requires=['Django>=1.8,<1.11.99', 'django-tagging==0.4.3',
'pytz', 'pyparsing', 'cairocffi', 'urllib3', 'scandir', 'six'],
+ classifiers=[
+ 'Intended Audience :: Developers',
+--- a/webapp/graphite/local_settings.py.example
b/webapp/graphite/local_settings.py.example
+@@ -101,6 +101,7 @@
+ # Change only GRAPHITE_ROOT if your install is merely shifted from
/opt/graphite
+ # to somewhere else
+ #GRAPHITE_ROOT = '/opt/graphite'
++GRAPHITE_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
+
+ # Most installs done outside of a separate tree such as /opt/graphite will
+ # need to change these settings. Note that the default settings for each
+@@ -110,6 +111,11 @@
+ #STATIC_ROOT = '/opt/graphite/static'
+ #LOG_DIR = '/opt/graphite/storage/log/webapp'
+ #INDEX_FILE = '/opt/graphite/storage/index' # Search index file
++CONF_DIR = '@GENTOO_PORTAGE_EPREFIX@/etc/graphite-web'
++STORAGE_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon'
++STATIC_ROOT = '@GENTOO_PORTAGE_EPREFIX@/usr/share/graphite-web'
++LOG_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/log/graphite-web'
++INDEX_FILE = '@GENTOO_PORTAGE_EPREFIX@/var/lib/graphite-web/index' # Search
index file
+
+ # To further or fully customize the paths, modify the following. Note that the
+ # default settings for each of these are relative to CONF_DIR and STORAGE_DIR
+@@ -127,6 +133,8 @@
+ #CERES_DIR = '/opt/graphite/storage/ceres'
+ #WHISPER_DIR = '/opt/graphite/storage/whisper'
+ #RRD_DIR = '/opt/graphite/storage/rrd'
++WHISPER_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/whisper'
++RRD_DIR = '@GENTOO_PORTAGE_EPREFIX@/var/lib/carbon/rrd'
+ #
+ # Data directories using the "Standard" metrics finder (i.e. not Ceres)
+ #STANDARD_DIRS = [WHISPER_DIR, RRD_DIR] # Default: set from the above
variables
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
new file mode 100644
index 000..7ca11c643e1
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+inherit distutils-r1 python-utils-r1
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: f943ab2af7b4aabfd94af00968e67ad0ca152282 Author: David Seifert gentoo org> AuthorDate: Sun Nov 26 12:38:13 2017 + Commit: David Seifert gentoo org> CommitDate: Sun Nov 26 23:09:56 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f943ab2a net-analyzer/graphite-web: [QA] Consistent whitespace in metadata.xml net-analyzer/graphite-web/metadata.xml | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml index 51189851a34..851f07a3b53 100644 --- a/net-analyzer/graphite-web/metadata.xml +++ b/net-analyzer/graphite-web/metadata.xml @@ -1,15 +1,15 @@ http://www.gentoo.org/dtd/metadata.dtd;> - -grob...@gentoo.org -Fabian Groffen - - -Enable memcached support + + grob...@gentoo.org + Fabian Groffen + + + Enable memcached support Enable carbon support - - -graphite-web - + + + graphite-web +
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 38ec1e691b783a31e43cb0df42fd89d0f4e0de55
Author: Patrick Lauer gentoo org>
AuthorDate: Tue May 3 13:05:54 2016 +
Commit: Patrick Lauer gentoo org>
CommitDate: Tue May 3 13:06:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38ec1e69
net-analyzer/graphite-web: Fix wording in pkg_postinst
Package-Manager: portage-2.2.28
net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
index e1f8001..544dd8d 100644
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
@@ -102,7 +102,7 @@ pkg_config() {
}
pkg_postinst() {
- einfo "You will need to ${PN} it with Apache (mod_wsgi) or nginx
(uwsgi)."
+ einfo "You need to configure ${PN} to run with a WSGI server of your
choice."
einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
einfo "See
http://graphite.readthedocs.org/en/latest/config-local-settings.html;
einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install."
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 5b18944507b1f91a67ba4a77d20be0d428425654
Author: Fabian Groffen gentoo org>
AuthorDate: Wed Apr 27 15:16:28 2016 +
Commit: Fabian Groffen gentoo org>
CommitDate: Wed Apr 27 15:16:57 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b189445
net-analyzer/graphite-web: add dep on django, for it doesn't work with 1.9
Package-Manager: portage-2.2.26
.../graphite-web/graphite-web-0.9.13-r1.ebuild | 99 --
.../graphite-web/graphite-web-0.9.13-r2.ebuild | 99 --
.../graphite-web/graphite-web-0.9.13-r3.ebuild | 3 +-
3 files changed, 2 insertions(+), 199 deletions(-)
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r1.ebuild
b/net-analyzer/graphite-web/graphite-web-0.9.13-r1.ebuild
deleted file mode 100644
index 51720e9..000
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r1.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 python-utils-r1 prefix
-
-DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="http://graphite.readthedocs.org/;
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
-
https://raw.githubusercontent.com/graphite-project/graphite-web/522d84fed687bd946878e48d85982d59f7bd1267/webapp/content/img/share.png
-> ${P}-share.png"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ldap mysql memcached +sqlite"
-
-DEPEND=""
-RDEPEND="dev-lang/python[sqlite?]
- || ( >=dev-python/django-1.4[sqlite?,mysql?,${PYTHON_USEDEP}]
- ( >=dev-python/django-1.6[sqlite?,${PYTHON_USEDEP}]
- mysql? ( || ( dev-python/mysql-python dev-python/mysqlclient )
) ) )
- >=dev-python/twisted-core-10.0[${PYTHON_USEDEP}]
- >=dev-python/django-tagging-0.3.1[${PYTHON_USEDEP}]
- dev-python/pycairo[${PYTHON_USEDEP}]
- dev-python/zope-interface[${PYTHON_USEDEP}]
- dev-python/pytz[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- dev-python/txAMQP[${PYTHON_USEDEP}]
- dev-python/carbon[${PYTHON_USEDEP}]
- dev-python/whisper[${PYTHON_USEDEP}]
- media-libs/fontconfig
- memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
-
-PATCHES=(
- # Do not install the configuration and data files. We install them
- # somewhere sensible by hand.
- "${FILESDIR}"/${P}-fhs-paths.patch
- "${FILESDIR}"/${P}-system-libs.patch
-)
-
-EXAMPLES=(
- examples/example-graphite-vhost.conf
-)
-
-src_prepare() {
- # use FHS-style paths
- rm setup.cfg || die
- # make sure we don't use bundled stuff
- rm -Rf webapp/graphite/thirdparty
- distutils-r1_src_prepare
- eprefixify \
- conf/graphite.wsgi.example \
- webapp/graphite/local_settings.py.example
-}
-
-python_install() {
- distutils-r1_python_install \
- --install-data="${EPREFIX}"/usr/share/${PN}
-
- # make manage.py available from an easier location/name
- dodir /usr/bin
- mv "${D}"/$(python_get_sitedir)/graphite/manage.py \
- "${ED}"/usr/bin/${PN}-manage || die
- chmod 0755 "${ED}"/usr/bin/${PN}-manage || die
- python_fix_shebang "${ED}"/usr/bin/${PN}-manage
-
- # shortener image isn't included for some reason
- cp "${DISTDIR}"/"${P}"-share.png
"${ED}"/usr/share/${PN}/webapp/content/img/
-
- insinto /etc/${PN}
- newins webapp/graphite/local_settings.py.example local_settings.py
- pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die
- ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py
- popd > /dev/null || die
- doins conf/dashboard.conf.example
- doins conf/graphite.wsgi.example
-}
-
-pkg_config() {
- "${ROOT}"/usr/bin/${PN}-manage syncdb --noinput
- local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/local_settings.py
2>/dev/null)
- if [[ -n ${idx} ]] ; then
- idx=${idx##*=}
- idx=$(echo ${idx})
- eval "idx=${idx}"
- touch "${ROOT}"/"${idx}"/index
- fi
-}
-
-pkg_postinst() {
- einfo "You will need to ${PN} it with Apache (mod_wsgi) or nginx
(uwsgi)."
- einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
- einfo "See
http://graphite.readthedocs.org/en/latest/config-local-settings.html;
- einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install."
-}
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r2.ebuild
b/net-analyzer/graphite-web/graphite-web-0.9.13-r2.ebuild
deleted file mode 100644
index 134bc3f..000
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: 86c4cf43974d7ac942816592f2dc2b18b6296350
Author: Matthew Thode gentoo org>
AuthorDate: Mon Apr 11 03:11:26 2016 +
Commit: Matt Thode gentoo org>
CommitDate: Mon Apr 11 03:11:26 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c4cf43
net-analyzer/graphite-web: update for bug 556732
Package-Manager: portage-2.2.26
.../graphite-web/graphite-web-0.9.13-r3.ebuild | 108 +
net-analyzer/graphite-web/metadata.xml | 1 +
2 files changed, 109 insertions(+)
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
new file mode 100644
index 000..9e20d1f
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 python-utils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="http://graphite.readthedocs.org/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+
https://raw.githubusercontent.com/graphite-project/graphite-web/522d84fed687bd946878e48d85982d59f7bd1267/webapp/content/img/share.png
-> ${P}-share.png"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+carbon ldap mysql memcached postgres +sqlite"
+
+DEPEND=""
+RDEPEND="
+ dev-lang/python[sqlite?]
+ sqlite? ( >=dev-python/django-1.4[sqlite?,${PYTHON_USEDEP}] )
+ mysql? ( >=dev-python/django-1.4[${PYTHON_USEDEP}]
+ || (
+ dev-python/mysql-python[${PYTHON_USEDEP}]
+ dev-python/mysqlclient[${PYTHON_USEDEP}]
+ )
+ )
+ postgres? (
+ >=dev-python/django-1.4[${PYTHON_USEDEP}]
+ dev-python/psycopg:2[${PYTHON_USEDEP}]
+ )
+ >=dev-python/twisted-core-10.0[${PYTHON_USEDEP}]
+ >=dev-python/django-tagging-0.3.1[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/txAMQP[${PYTHON_USEDEP}]
+ carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
+ dev-python/whisper[${PYTHON_USEDEP}]
+ media-libs/fontconfig
+ memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ # Do not install the configuration and data files. We install them
+ # somewhere sensible by hand.
+ "${FILESDIR}"/${P}-fhs-paths.patch
+ "${FILESDIR}"/${P}-system-libs.patch
+)
+
+EXAMPLES=(
+ examples/example-graphite-vhost.conf
+ conf/dashboard.conf.example
+ conf/graphite.wsgi.example
+)
+
+src_prepare() {
+ # use FHS-style paths
+ rm setup.cfg || die
+ # make sure we don't use bundled stuff
+ rm -Rf webapp/graphite/thirdparty
+ distutils-r1_src_prepare
+ eprefixify \
+ conf/graphite.wsgi.example \
+ webapp/graphite/local_settings.py.example
+}
+
+python_install() {
+ distutils-r1_python_install \
+ --install-data="${EPREFIX}"/usr/share/${PN}
+
+ # make manage.py available from an easier location/name
+ dodir /usr/bin
+ mv "${D}"/$(python_get_sitedir)/graphite/manage.py \
+ "${ED}"/usr/bin/${PN}-manage || die
+ chmod 0755 "${ED}"/usr/bin/${PN}-manage || die
+ python_fix_shebang "${ED}"/usr/bin/${PN}-manage
+
+ # shortener image isn't included for some reason
+ cp "${DISTDIR}"/"${P}"-share.png
"${ED}"/usr/share/${PN}/webapp/content/img/
+
+ insinto /etc/${PN}
+ newins webapp/graphite/local_settings.py.example local_settings.py
+ pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die
+ ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py
+ popd > /dev/null || die
+}
+
+pkg_config() {
+ "${ROOT}"/usr/bin/${PN}-manage syncdb --noinput
+ local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/local_settings.py
2>/dev/null)
+ if [[ -n ${idx} ]] ; then
+ idx=${idx##*=}
+ idx=$(echo ${idx})
+ eval "idx=${idx}"
+ touch "${ROOT}"/"${idx}"/index
+ fi
+}
+
+pkg_postinst() {
+ einfo "You will need to ${PN} it with Apache (mod_wsgi) or nginx
(uwsgi)."
+ einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+ einfo "See
http://graphite.readthedocs.org/en/latest/config-local-settings.html;
+ einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+}
diff --git a/net-analyzer/graphite-web/metadata.xml
b/net-analyzer/graphite-web/metadata.xml
index 14056ae..5118985 100644
--- a/net-analyzer/graphite-web/metadata.xml
+++
[gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/
commit: a91187579584c042cdb7de09df71dcdbff5813fc
Author: Fabian Groffen gentoo org>
AuthorDate: Sun Jan 31 16:26:53 2016 +
Commit: Fabian Groffen gentoo org>
CommitDate: Sun Jan 31 16:27:22 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9118757
net-analyzer/graphite-web: revbump for changed examples installation, bug
#556852
Package-Manager: portage-2.2.26
.../graphite-web/graphite-web-0.9.13-r2.ebuild | 99 ++
1 file changed, 99 insertions(+)
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r2.ebuild
b/net-analyzer/graphite-web/graphite-web-0.9.13-r2.ebuild
new file mode 100644
index 000..134bc3f
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-0.9.13-r2.ebuild
@@ -0,0 +1,99 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 python-utils-r1 prefix
+
+DESCRIPTION="Enterprise scalable realtime graphing"
+HOMEPAGE="http://graphite.readthedocs.org/;
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
+
https://raw.githubusercontent.com/graphite-project/graphite-web/522d84fed687bd946878e48d85982d59f7bd1267/webapp/content/img/share.png
-> ${P}-share.png"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="ldap mysql memcached +sqlite"
+
+DEPEND=""
+RDEPEND="dev-lang/python[sqlite?]
+ || ( >=dev-python/django-1.4[sqlite?,mysql?,${PYTHON_USEDEP}]
+ ( >=dev-python/django-1.6[sqlite?,${PYTHON_USEDEP}]
+ mysql? ( || ( dev-python/mysql-python dev-python/mysqlclient )
) ) )
+ >=dev-python/twisted-core-10.0[${PYTHON_USEDEP}]
+ >=dev-python/django-tagging-0.3.1[${PYTHON_USEDEP}]
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/zope-interface[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pyparsing[${PYTHON_USEDEP}]
+ dev-python/txAMQP[${PYTHON_USEDEP}]
+ dev-python/carbon[${PYTHON_USEDEP}]
+ dev-python/whisper[${PYTHON_USEDEP}]
+ media-libs/fontconfig
+ memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
+ ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )"
+
+PATCHES=(
+ # Do not install the configuration and data files. We install them
+ # somewhere sensible by hand.
+ "${FILESDIR}"/${P}-fhs-paths.patch
+ "${FILESDIR}"/${P}-system-libs.patch
+)
+
+EXAMPLES=(
+ examples/example-graphite-vhost.conf
+ conf/dashboard.conf.example
+ conf/graphite.wsgi.example
+)
+
+src_prepare() {
+ # use FHS-style paths
+ rm setup.cfg || die
+ # make sure we don't use bundled stuff
+ rm -Rf webapp/graphite/thirdparty
+ distutils-r1_src_prepare
+ eprefixify \
+ conf/graphite.wsgi.example \
+ webapp/graphite/local_settings.py.example
+}
+
+python_install() {
+ distutils-r1_python_install \
+ --install-data="${EPREFIX}"/usr/share/${PN}
+
+ # make manage.py available from an easier location/name
+ dodir /usr/bin
+ mv "${D}"/$(python_get_sitedir)/graphite/manage.py \
+ "${ED}"/usr/bin/${PN}-manage || die
+ chmod 0755 "${ED}"/usr/bin/${PN}-manage || die
+ python_fix_shebang "${ED}"/usr/bin/${PN}-manage
+
+ # shortener image isn't included for some reason
+ cp "${DISTDIR}"/"${P}"-share.png
"${ED}"/usr/share/${PN}/webapp/content/img/
+
+ insinto /etc/${PN}
+ newins webapp/graphite/local_settings.py.example local_settings.py
+ pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die
+ ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py
+ popd > /dev/null || die
+}
+
+pkg_config() {
+ "${ROOT}"/usr/bin/${PN}-manage syncdb --noinput
+ local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/local_settings.py
2>/dev/null)
+ if [[ -n ${idx} ]] ; then
+ idx=${idx##*=}
+ idx=$(echo ${idx})
+ eval "idx=${idx}"
+ touch "${ROOT}"/"${idx}"/index
+ fi
+}
+
+pkg_postinst() {
+ einfo "You will need to ${PN} it with Apache (mod_wsgi) or nginx
(uwsgi)."
+ einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}"
+ einfo "See
http://graphite.readthedocs.org/en/latest/config-local-settings.html;
+ einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install."
+}
