public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/files/, profiles/, net-analyzer/graphite-web/
@ 2023-05-14 16:19 David Seifert
  0 siblings, 0 replies; only message in thread
From: David Seifert @ 2023-05-14 16:19 UTC (permalink / raw
  To: gentoo-commits

commit:     ed9967b682d3ba522b76c6b8e4d31d42883ab49e
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 16:19:06 2023 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun May 14 16:19:06 2023 +0000
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 <soap <AT> 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..000000000000
--- 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..000000000000
--- 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..000000000000
--- 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"
-HOMEPAGE="https://graphiteapp.org/"
-
-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-4[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."
-		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
-}

diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml
deleted file mode 100644
index 17a4a3975091..000000000000
--- a/net-analyzer/graphite-web/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>grobian@gentoo.org</email>
-		<name>Fabian Groffen</name>
-	</maintainer>
-	<use>
-		<flag name="memcached">Enable memcached support</flag>
-		<flag name="carbon">Enable carbon support</flag>
-	</use>
-	<upstream>
-		<remote-id type="pypi">graphite-web</remote-id>
-		<remote-id type="github">graphite-project/graphite-web</remote-id>
-		<bugs-to>https://github.com/graphite-project/graphite-web/issues</bugs-to>
-	</upstream>
-</pkgmetadata>

diff --git a/profiles/package.mask b/profiles/package.mask
index 72b611cd8a7b..08122a330464 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -290,7 +290,6 @@ dev-python/picklemagic
 # replaced by app-metrics/carbonapi-web.
 # Removal on 2023-05-13.  Bug #897056.
 dev-python/django-tagging
-net-analyzer/graphite-web
 
 # Eray Aslan <eras@gentoo.org> (2023-04-12)
 # Mask experimental software


^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2023-05-14 16:19 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-14 16:19 [gentoo-commits] repo/gentoo:master commit in: net-analyzer/graphite-web/files/, profiles/, net-analyzer/graphite-web/ David Seifert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox