From fcc5224904648a8e6eb528d7603154160a20022f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 2 Feb 2022 01:39:05 +0000 Subject: gentoo resync : 02.02.2022 --- net-analyzer/graphite-web/Manifest | 1 - .../files/graphite-web-1.1.5-fhs-paths.patch | 63 ---------------------- 2 files changed, 64 deletions(-) delete mode 100644 net-analyzer/graphite-web/files/graphite-web-1.1.5-fhs-paths.patch (limited to 'net-analyzer/graphite-web') diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest index f79bf7df1654..6e022b873ac7 100644 --- a/net-analyzer/graphite-web/Manifest +++ b/net-analyzer/graphite-web/Manifest @@ -1,4 +1,3 @@ -AUX graphite-web-1.1.5-fhs-paths.patch 2712 BLAKE2B f3a05cd9a732ee69d52a62ac5164b3e8bdc5e1d29d3474167c2873f4322a882509f60908731a081f971c01681094f2b6a772a4fcf159ade85ac651f7b0d90c1c SHA512 b383da7aebf0c38b557ac07b0ba4ecd22c41bb9f3318a9f491b37f495a8d2ad5cd8d677076c15958d6326aa1a46574c01a8f5a9cd64fb77ac30fc4d630e8f532 AUX graphite-web-1.1.7-fhs-paths.patch 2691 BLAKE2B fbb09dfef58d94ef7099e98134d46122c2a82ab3cb0af4bd0cb92102f0e924c3efe80f481f898c81358722f7ad312a1168310ebbbc731c18ab788e1a81cf04ce SHA512 1a8bd3f62163004993f676a039035880512bb1add5f0cc80193471f2cfa483277bd24dd36b3b2b5c6e8faa6d83a029e59c5ea8cb8b713c6d063fe212b921c6a8 AUX graphite-web-1.1.8-pyparsing3.patch 2529 BLAKE2B 644b729b439a7fca9b8e2df1bede1cda48323694686a6c05378cb7a6112353add56ede35136e1c4f73611c5606be8345ee926f6e99b8dfac15c5ab72e133ac48 SHA512 8f837db47d66d859c247b96077ad4e44168123409fb43a074ab6f625c9235c010557da56dfa788851c8a0d18b4ad314dae085cf63bcaf8ec97e8e6f33f9f7b4c DIST graphite-web-1.1.8.tar.gz 1177214 BLAKE2B 20e058feff0fa7f12393cfd41acca7cf05ff6a3995aa5f6547764fae3b8824e8b424efb8d5d47227eb2b5591ae6b45ab960da30f810acb4f1fbd0b9ae78ec47b SHA512 4637a541e61f56c1ac69bf18e7eab88ecf93f59099dc3e8022d8bf8fb1b204672bc0a1b5302e5031701714db17aabb316ba40f4cfabb2bf4fb0dedb8f412e4a9 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..000000000000 --- 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': '', -- cgit v1.2.3