gentoo resync : 13.06.2020

3 files changed, 103 insertions, 5 deletions

diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index a26ac123e118..40b68e00a617 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,5 +1,7 @@
-AUX graphite-web-1.1.3-fhs-paths.patch 2714 BLAKE2B 3c2e4a73e32626ba28ee1c3f5697e95f52e3cdcb88f137ff1e42581b9daf75521dd1d3d452e1be7157658914a50116b58b35c39551260be54b385bd50c0e1ef0 SHA512 1f3ca2def8e757a2f86acc58636fccda55ae81977d6b435e4cb44eecdbb613b1791eb286ca46b97a832ce80cce3bedd52dd8ba74a9566ce3b71b998b5e6ca438
 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
 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
 EBUILD graphite-web-1.1.5-r1.ebuild 2966 BLAKE2B ad0ebbd4068438719af7d8df197d938cadf89b8b92b9927e467e47adea7a8dbb5a6289e9ec2770a9796ba4825cc5ef6b39576fe6a2f5920d1dda9e63d28fd024 SHA512 010668dae9fd625d8b31a6db6d64fd0d3f860d6f208ecb951440ac7406b1376937d492a3719b6bb4d6e1605f1e691752cd32ab82c846fd27c4cf4a596b217fd7
+EBUILD graphite-web-1.1.7.ebuild 3038 BLAKE2B 8afc7e4e19c8815dc74fae76e59bc08a0d7432149f97d192188f7d5d415bf342cd1ccbfa74e4fee36dfc739c0e791352aca3f96538a4009bf822ae517f0875b7 SHA512 6b37ec3bbd1c2287051435cf55af36c90825d4c3b62ab1b5d256a481886464c3ffac881cf7fd7f04c388875473bf5d724e376aa552de1f2bdd9f77cb2b179cad
 MISC metadata.xml 592 BLAKE2B 1c284eea68c1db410d55439c14dbf245651157c8f3cb2c77357e50ad8d4426e1c2faf8bd767095f49e9a711e84bbe8b5223aa26529d6dd9cd8dd08c3d8c7c75a SHA512 e9be9344db6989ed9d1d649fff05c4d05c72528097c6d921b5d0d31f9be65d1cfb02071356101f46ffddfa5b7a91785995ad59e15ba0fd78b75d785959051a98
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
index aa6ea74ff93f..6550f083039e 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 000000000000..74a4e43dac93
--- /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
+	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
+
+	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
+}