From e3872864be25f7421015bef2732fa57c0c9fb726 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Aug 2018 08:53:53 +0100 Subject: gentoo resync : 04.08.2018 --- net-analyzer/graphite-web/Manifest | 5 - .../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, 289 deletions(-) delete mode 100644 net-analyzer/graphite-web/files/graphite-web-0.9.13-fhs-paths.patch delete mode 100644 net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch delete mode 100644 net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild (limited to 'net-analyzer/graphite-web') diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest index 83cddef7a949..e16ca9d5d9af 100644 --- a/net-analyzer/graphite-web/Manifest +++ b/net-analyzer/graphite-web/Manifest @@ -1,9 +1,4 @@ -AUX graphite-web-0.9.13-fhs-paths.patch 3183 BLAKE2B 0ef1c5e5c171cd1823a3d52d11d5e4b426f82b26636bd0f250514653f7bc0ddb4da9d698562aabac5711bf3d8a2cf5c8d64c2eb7cd7ad79dc495da6e3339d09e SHA512 18ec1ef401c2e3d1209ed3a2a796dfc94088ea7324ae28c3afddd8c857a83ff00afcb5ef0673b838eedae433893b12b57283c9d4a0e53f90b5063ae4f36abcf2 -AUX graphite-web-0.9.13-system-libs.patch 3379 BLAKE2B 28fbbd23365d67891b6b818a77a07c9eabafd8c519764d2ee6227a07e42a410800f868753f9c46677269a4c9e978bfb6024ae9551d2830742e5d1cb17998c59b SHA512 df4b95dfa6f6a58ba2e8aeb7b3d3e26e5d122718b88e2ec747676fcbb0539190ebc9e7938b3d34a73f0018e121ce297faa50af839f138ce5b21116777fcb7748 AUX graphite-web-1.1.3-fhs-paths.patch 2714 BLAKE2B 3c2e4a73e32626ba28ee1c3f5697e95f52e3cdcb88f137ff1e42581b9daf75521dd1d3d452e1be7157658914a50116b58b35c39551260be54b385bd50c0e1ef0 SHA512 1f3ca2def8e757a2f86acc58636fccda55ae81977d6b435e4cb44eecdbb613b1791eb286ca46b97a832ce80cce3bedd52dd8ba74a9566ce3b71b998b5e6ca438 -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 3f9de216bd55e4e8de7391087e9b876a16e4f137fd60932a6d5855804c3d9868422645177776258e74486b97ec7a853b63a6d89b1de9b325bcb50ad694208436 -EBUILD graphite-web-0.9.13-r3.ebuild 3410 BLAKE2B 867e9e5acb08071ea9a5e5868a1f02e39f94738b7764653ac91188731048ce35d6e730bdc1c01540c09191b200501fbfe3afdeae8348ddfbfc70fcd17bd9d318 SHA512 7ca08399bfa996c63b2898122b6f60f720a3526ed9355e018346a1da15ffa3111c5912b5f31cca4881a6f725e74b549f376e035525d55e8b2b767671ade72b06 EBUILD graphite-web-1.1.3-r1.ebuild 2962 BLAKE2B a70de2670532ce0292ae6c5fcfeef6a77702ac5bdbd17cf9fe31d1f04dad6ae67e264ad4083290105e253916634742c00807acae61741cb486a7fb9397ee2302 SHA512 1fc184393bff1f5d9689ff6d82b556516c5591244205f1278df107b1383d401d3a6ae5d8d505f8db72d1c55c902ff189a18d1e5c863fc46acde8f533a7e8e45f MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98 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 ecfce96e0536..000000000000 --- 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' # Search index file - - ##################################### - # Email Configuration # ---- graphite-web-0.9.13/webapp/graphite/manage.py -+++ graphite-web-0.9.13/webapp/graphite/manage.py -@@ -6,7 +6,7 @@ - - - if __name__ == "__main__": -- os.environ.setdefault("DJANGO_SETTINGS_MODULE", "settings") -+ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "graphite.settings") - - from django.core.management import execute_from_command_line - diff --git a/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch b/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch deleted file mode 100644 index be5bbb9ab761..000000000000 --- a/net-analyzer/graphite-web/files/graphite-web-0.9.13-system-libs.patch +++ /dev/null @@ -1,100 +0,0 @@ -From 1ca73dd4ec442d6ada765e5375efee84bbc7522b Mon Sep 17 00:00:00 2001 -From: Jamie Nguyen <j@jamielinux.com> -Date: Mon, 29 Sep 2014 09:53:22 +0100 -Subject: [PATCH] Force use of system libraries - ---- - setup.py | 2 -- - webapp/graphite/cli/parser.py | 2 +- - webapp/graphite/render/attime.py | 5 +---- - webapp/graphite/render/glyph.py | 5 +---- - webapp/graphite/render/grammar.py | 2 +- - webapp/graphite/render/views.py | 5 +---- - 6 files changed, 5 insertions(+), 16 deletions(-) - -diff --git a/setup.py b/setup.py -index 4dc0ce0..1b910d1 100644 ---- a/setup.py -+++ b/setup.py -@@ -54,8 +54,6 @@ setup( - 'graphite.graphlot', - 'graphite.events', - 'graphite.version', -- 'graphite.thirdparty', -- 'graphite.thirdparty.pytz', - ], - package_data={'graphite' : - ['templates/*', 'local_settings.py.example']}, -diff --git a/webapp/graphite/cli/parser.py b/webapp/graphite/cli/parser.py -index ec1a435..7d7d48d 100644 ---- a/webapp/graphite/cli/parser.py -+++ b/webapp/graphite/cli/parser.py -@@ -12,7 +12,7 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License.""" - --from graphite.thirdparty.pyparsing import * -+from pyparsing import * - - grammar = Forward() - -diff --git a/webapp/graphite/render/attime.py b/webapp/graphite/render/attime.py -index 55a644c..8adde3f 100644 ---- a/webapp/graphite/render/attime.py -+++ b/webapp/graphite/render/attime.py -@@ -16,10 +16,7 @@ from datetime import datetime,timedelta - from time import daylight - from django.conf import settings - --try: # See if there is a system installation of pytz first -- import pytz --except ImportError: # Otherwise we fall back to Graphite's bundled version -- from graphite.thirdparty import pytz -+import pytz - - - months = ['jan','feb','mar','apr','may','jun','jul','aug','sep','oct','nov','dec'] -diff --git a/webapp/graphite/render/glyph.py b/webapp/graphite/render/glyph.py -index a2cc893..c6f31f1 100644 ---- a/webapp/graphite/render/glyph.py -+++ b/webapp/graphite/render/glyph.py -@@ -22,10 +22,7 @@ from graphite.render.datalib import TimeSeries - from graphite.util import json - - --try: # See if there is a system installation of pytz first -- import pytz --except ImportError: # Otherwise we fall back to Graphite's bundled version -- from graphite.thirdparty import pytz -+import pytz - - INFINITY = float('inf') - -diff --git a/webapp/graphite/render/grammar.py b/webapp/graphite/render/grammar.py -index 07e3e4b..2b0ba41 100644 ---- a/webapp/graphite/render/grammar.py -+++ b/webapp/graphite/render/grammar.py -@@ -1,4 +1,4 @@ --from graphite.thirdparty.pyparsing import * -+from pyparsing import * - - ParserElement.enablePackrat() - grammar = Forward() -diff --git a/webapp/graphite/render/views.py b/webapp/graphite/render/views.py -index 186232e..cd747a7 100644 ---- a/webapp/graphite/render/views.py -+++ b/webapp/graphite/render/views.py -@@ -25,10 +25,7 @@ try: - except ImportError: - import pickle - --try: # See if there is a system installation of pytz first -- import pytz --except ImportError: # Otherwise we fall back to Graphite's bundled version -- from graphite.thirdparty import pytz -+import pytz - - from graphite.util import getProfileByUsername, json, unpickle - from graphite.remote_storage import HTTPConnectionWithTimeout --- -1.9.3 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 deleted file mode 100644 index f0fed573df9f..000000000000 --- a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild +++ /dev/null @@ -1,108 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -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 - 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/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/graphite-web/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 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." -} -- cgit v1.2.3