Update py-graphite-web to version 0.9.15 (untested but compiles)

[Jeff Rizzo <riz%tastylime.net@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Jeff Rizzo <riz%tastylime.net@localhost>
Pushed By:	riz
Date:		Fri Dec 4 14:45:25 2015 -0800
Changeset:	ba3e2762a48b4837e7cc07aa119175a0ab5be52e

Modified Files:
	py-graphite-web/Makefile
	py-graphite-web/PLIST
	py-graphite-web/distinfo
Added Files:
	py-graphite-web/patches/patch-setup.py
Removed Files:
	py-graphite-web/patches/patch-config.py

Log Message:
Update py-graphite-web to version 0.9.15 (untested but compiles)

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=ba3e2762a48b4837e7cc07aa119175a0ab5be52e

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 py-graphite-web/Makefile                |  2 +-
 py-graphite-web/PLIST                   | 54 ++++++++++++---------------------
 py-graphite-web/distinfo                |  9 +++---
 py-graphite-web/patches/patch-config.py | 30 ------------------
 py-graphite-web/patches/patch-setup.py  | 31 +++++++++++++++++++
 5 files changed, 57 insertions(+), 69 deletions(-)

diffs:
diff --git a/py-graphite-web/Makefile b/py-graphite-web/Makefile
index 025bad5..5451848 100644
--- a/py-graphite-web/Makefile
+++ b/py-graphite-web/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.12 2015/01/15 09:29:38 fhajny Exp $
 
-DISTNAME=	graphite-web-0.9.12
+DISTNAME=	graphite-web-0.9.15
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	www
 MASTER_SITES=	-https://github.com/graphite-project/graphite-web/archive/${PKGVERSION_NOREV}${EXTRACT_SUFX}
diff --git a/py-graphite-web/PLIST b/py-graphite-web/PLIST
index 285d694..927ecb0 100644
--- a/py-graphite-web/PLIST
+++ b/py-graphite-web/PLIST
@@ -35,36 +35,26 @@ graphite/webapp/content/css/default/sizer.gif
 graphite/webapp/content/css/default/top_left.gif
 graphite/webapp/content/css/default/top_mid.gif
 graphite/webapp/content/css/default/top_right.gif
-graphite/webapp/content/css/jquery.autocomplete.css
 graphite/webapp/content/css/table.css
 graphite/webapp/content/html/completerHelp.html
 graphite/webapp/content/html/searchHelp.html
 graphite/webapp/content/html/timeHelp.html
-graphite/webapp/content/img/I.gif
-graphite/webapp/content/img/L.gif
-graphite/webapp/content/img/Lminus.gif
-graphite/webapp/content/img/Lplus.gif
-graphite/webapp/content/img/T.gif
-graphite/webapp/content/img/Tminus.gif
-graphite/webapp/content/img/Tplus.gif
-graphite/webapp/content/img/arrow1.gif
 graphite/webapp/content/img/blank.gif
-graphite/webapp/content/img/calBt.gif
+graphite/webapp/content/img/calendar.png
 graphite/webapp/content/img/carbon-fiber.png
+graphite/webapp/content/img/clock.png
 graphite/webapp/content/img/clock_16.png
-graphite/webapp/content/img/delete.gif
-graphite/webapp/content/img/error.png
-graphite/webapp/content/img/folder.png
 graphite/webapp/content/img/graphite.png
 graphite/webapp/content/img/graphite_short.png
-graphite/webapp/content/img/indicator.png
 graphite/webapp/content/img/leaf.gif
-graphite/webapp/content/img/line_chart.png
 graphite/webapp/content/img/mini-bottom2.gif
 graphite/webapp/content/img/mini-top2.gif
-graphite/webapp/content/img/save.gif
-graphite/webapp/content/img/searching.gif
-graphite/webapp/content/img/updateGraph.gif
+graphite/webapp/content/img/overview.png
+graphite/webapp/content/img/refresh.png
+graphite/webapp/content/img/save.png
+graphite/webapp/content/img/share.png
+graphite/webapp/content/img/trash.png
+graphite/webapp/content/img/upload.png
 graphite/webapp/content/js/ace/ace.js
 graphite/webapp/content/js/ace/keybinding-vim.js
 graphite/webapp/content/js/ace/mode-c_cpp.js
@@ -532,12 +522,6 @@ graphite/webapp/content/js/ext/resources/images/default/window/right-corners.psd
 graphite/webapp/content/js/ext/resources/images/default/window/top-bottom.png
 graphite/webapp/content/js/ext/resources/images/default/window/top-bottom.psd
 graphite/webapp/content/js/ext/ux/DataViewTransition.js
-graphite/webapp/content/js/jquery.autocomplete.js
-graphite/webapp/content/js/jquery.flot.crosshair.js
-graphite/webapp/content/js/jquery.flot.js
-graphite/webapp/content/js/jquery.flot.selection.js
-graphite/webapp/content/js/jquery.graphite.js
-graphite/webapp/content/js/jquery.js
 graphite/webapp/content/js/scriptaculous/builder.js
 graphite/webapp/content/js/scriptaculous/controls.js
 graphite/webapp/content/js/scriptaculous/dragdrop.js
@@ -638,15 +622,6 @@ ${PYSITELIB}/graphite/events/urls.pyo
 ${PYSITELIB}/graphite/events/views.py
 ${PYSITELIB}/graphite/events/views.pyc
 ${PYSITELIB}/graphite/events/views.pyo
-${PYSITELIB}/graphite/graphlot/__init__.py
-${PYSITELIB}/graphite/graphlot/__init__.pyc
-${PYSITELIB}/graphite/graphlot/__init__.pyo
-${PYSITELIB}/graphite/graphlot/urls.py
-${PYSITELIB}/graphite/graphlot/urls.pyc
-${PYSITELIB}/graphite/graphlot/urls.pyo
-${PYSITELIB}/graphite/graphlot/views.py
-${PYSITELIB}/graphite/graphlot/views.pyc
-${PYSITELIB}/graphite/graphlot/views.pyo
 ${PYSITELIB}/graphite/local_settings.py.example
 ${PYSITELIB}/graphite/logger.py
 ${PYSITELIB}/graphite/logger.pyc
@@ -718,7 +693,6 @@ ${PYSITELIB}/graphite/templates/dashboardHelp.html
 ${PYSITELIB}/graphite/templates/editProfile.html
 ${PYSITELIB}/graphite/templates/event.html
 ${PYSITELIB}/graphite/templates/events.html
-${PYSITELIB}/graphite/templates/graphlot.html
 ${PYSITELIB}/graphite/templates/login.html
 ${PYSITELIB}/graphite/templates/version.html
 ${PYSITELIB}/graphite/thirdparty/__init__.py
@@ -742,6 +716,18 @@ ${PYSITELIB}/graphite/thirdparty/pytz/tzfile.pyo
 ${PYSITELIB}/graphite/thirdparty/pytz/tzinfo.py
 ${PYSITELIB}/graphite/thirdparty/pytz/tzinfo.pyc
 ${PYSITELIB}/graphite/thirdparty/pytz/tzinfo.pyo
+${PYSITELIB}/graphite/url_shortener/__init__.py
+${PYSITELIB}/graphite/url_shortener/__init__.pyc
+${PYSITELIB}/graphite/url_shortener/__init__.pyo
+${PYSITELIB}/graphite/url_shortener/baseconv.py
+${PYSITELIB}/graphite/url_shortener/baseconv.pyc
+${PYSITELIB}/graphite/url_shortener/baseconv.pyo
+${PYSITELIB}/graphite/url_shortener/models.py
+${PYSITELIB}/graphite/url_shortener/models.pyc
+${PYSITELIB}/graphite/url_shortener/models.pyo
+${PYSITELIB}/graphite/url_shortener/views.py
+${PYSITELIB}/graphite/url_shortener/views.pyc
+${PYSITELIB}/graphite/url_shortener/views.pyo
 ${PYSITELIB}/graphite/urls.py
 ${PYSITELIB}/graphite/urls.pyc
 ${PYSITELIB}/graphite/urls.pyo
diff --git a/py-graphite-web/distinfo b/py-graphite-web/distinfo
index 14da94c..0191f20 100644
--- a/py-graphite-web/distinfo
+++ b/py-graphite-web/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.3 2014/03/14 14:26:30 fhajny Exp $
 
-SHA1 (graphite-web-0.9.12.tar.gz) = 5d69c5a691ee34c3ea5013adaa5a79a243bc2e3e
-RMD160 (graphite-web-0.9.12.tar.gz) = 25f91ed55eb6858b0ef6de786c21f949b88ff940
-Size (graphite-web-0.9.12.tar.gz) = 2334147 bytes
+SHA1 (graphite-web-0.9.15.tar.gz) = 680eb942c5c57fa763e949e81cb13e054eed6ca8
+RMD160 (graphite-web-0.9.15.tar.gz) = aa24a757a6046b89e42169cf49f3dd921c5b796a
+SHA512 (graphite-web-0.9.15.tar.gz) = 055c0cf3e98db56ecd37c8926f83f82b38f88edbe795d183967dfe5e09391a8a838265afef6e426686a8dfbddd8e2164e445ca007b3454ec674142bbf8f693e2
+Size (graphite-web-0.9.15.tar.gz) = 2434438 bytes
 SHA1 (patch-bin_build-index.sh) = 13ad11086c620bd65a7cf084a88ae0187fdae2d7
-SHA1 (patch-config.py) = f4501b8aab19ce366b9fd1aa207cac5534e1321a
+SHA1 (patch-setup.py) = 1f215025652d5d45302af8d13ee7ff7a91003cfc
diff --git a/py-graphite-web/patches/patch-config.py b/py-graphite-web/patches/patch-config.py
deleted file mode 100644
index 16f4415..0000000
--- a/py-graphite-web/patches/patch-config.py
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-config.py,v 1.1 2012/08/07 19:43:37 fhajny Exp $
-
-Use proper paths for storage and config example files.
---- setup.py.orig	2012-05-31 20:30:12.000000000 +0000
-+++ setup.py
-@@ -15,11 +15,11 @@ else:
- storage_dirs = []
- 
- for subdir in ('whisper', 'rrd', 'log', 'log/webapp'):
--  storage_dirs.append( ('storage/%s' % subdir, []) )
-+  storage_dirs.append( ('@GRAPHITE_DIR@/%s' % subdir, []) )
- 
- webapp_content = {}
- 
--for root, dirs, files in os.walk('webapp/content'):
-+for root, dirs, files in os.walk('graphite/webapp/content'):
-   for filename in files:
-     filepath = os.path.join(root, filename)
- 
-@@ -29,8 +29,8 @@ for root, dirs, files in os.walk('webapp
-     webapp_content[root].append(filepath)
- 
- 
--conf_files = [ ('conf', glob('conf/*.example')) ]
--examples = [ ('examples', glob('examples/example-*')) ]
-+conf_files = [ ('@PREFIX@/@GRAPHITE_EGDIR@', glob('conf/*.example')) ]
-+examples = [ ('@PREFIX@/@GRAPHITE_EGDIR@', glob('examples/example-*')) ]
- 
- setup(
-   name='graphite-web',
diff --git a/py-graphite-web/patches/patch-setup.py b/py-graphite-web/patches/patch-setup.py
new file mode 100644
index 0000000..ab24901
--- /dev/null
+++ b/py-graphite-web/patches/patch-setup.py
@@ -0,0 +1,31 @@
+$NetBSD: patch-config.py,v 1.1 2012/08/07 19:43:37 fhajny Exp $
+
+Use proper paths for storage and config example files.
+
+--- setup.py.orig	2015-11-27 10:37:16.000000000 -0800
++++ setup.py	2015-12-04 14:33:20.000000000 -0800
+@@ -41,11 +41,11 @@
+ storage_dirs = []
+ 
+ for subdir in ('whisper', 'rrd', 'log', 'log/webapp'):
+-  storage_dirs.append( ('storage/%s' % subdir, []) )
++  storage_dirs.append( ('@GRAPHITE_DIR@/%s' % subdir, []) )
+ 
+ webapp_content = {}
+ 
+-for root, dirs, files in os.walk('webapp/content'):
++for root, dirs, files in os.walk('graphite/webapp/content'):
+   for filename in files:
+     filepath = os.path.join(root, filename)
+ 
+@@ -55,8 +55,8 @@
+     webapp_content[root].append(filepath)
+ 
+ 
+-conf_files = [ ('conf', glob('conf/*.example')) ]
+-examples = [ ('examples', glob('examples/example-*')) ]
++conf_files = [ ('@PREFIX@/@GRAPHITE_EGDIR@', glob('conf/*.example')) ]
++examples = [ ('@PREFIX@/@GRAPHITE_EGDIR@', glob('examples/example-*')) ]
+ 
+ try:
+     setup(