gentoo resync : 30.06.2018

6 files changed, 118 insertions, 127 deletions

diff --git a/net-analyzer/graphite-web/Manifest b/net-analyzer/graphite-web/Manifest
index d196f145df8a..83cddef7a949 100644
--- a/net-analyzer/graphite-web/Manifest
+++ b/net-analyzer/graphite-web/Manifest
@@ -1,9 +1,9 @@
 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 2360 BLAKE2B 7ca032f15121f2cedd6478bb137517798ad38a08d21cf1f20063241006aea1ae4f2ca96ecc39e039e6157d9d918c2dd0adbdbb54ff4bf561e909a4905f837209 SHA512 fac8caf178ab80785e7d4d55d233f9219cc217cc75f5ac3b303a77a4e91b234010f9f15896c25e0d88b515006fbcc8c0ebad18ad2fcab60def5c07774185ec5f
+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 3418 BLAKE2B 7c884d1866210c4be2c884663dedea1ede3b9dc8fd3b0189e7cc07c063292420df118e6b578dbe7be97beb7812c45d5630c37c129ec6ac01df3a60708dfa5fb0 SHA512 6ec67b34b46994ab4e9761bcf72b58ec5f62609353ef1349a26ef2580a9bff16c1737423c9073add748a141002f235a019ee5f6f36d98f8e43f2b7eafa00675a
-EBUILD graphite-web-1.1.3.ebuild 3565 BLAKE2B 0e4b9e66e0aea873e5b024ea12ed3489e74f6e97491d4a76216687fcb84b34a0a6e1e90e099f543e3315f6386f188877043002926e0d5995db36590c8ebf0e87 SHA512 42cc064625b047b4a9c6ce224084759924c3165c3231f0f917eead87f4c067ce3b22bef7841d5045f5b5876306bb1be1a86a02b802fd6e68937f862320698fa7
-MISC metadata.xml 446 BLAKE2B a0d9086db1e991d5ec91bda9c99ba49f6068ffc3c04117dfe974a41ad0ba6d00e0ff15ce931996e3fce3519f873ae8c3ee1be403c0e4e38758e5cd2183ec6e03 SHA512 7a94e8f66bf14b0d74b4825908282db8bf8155d14c21fda79aa3815cc0b0aa70c2ebfbc69e3239d9fd1bec02f072b9423cc54cc4d0d605fa5febb39651b25f3d
+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-1.1.3-fhs-paths.patch b/net-analyzer/graphite-web/files/graphite-web-1.1.3-fhs-paths.patch
index 39d325984245..aa6ea74ff93f 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.3-fhs-paths.patch
@@ -10,11 +10,12 @@ Install FHS-style paths
  from graphite.wsgi import application
 --- a/setup.py
 +++ b/setup.py
-@@ -59,8 +59,7 @@
+@@ -59,8 +59,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,
 +      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'],
@@ -36,7 +37,7 @@ Install FHS-style paths
  #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'
++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
  
@@ -51,3 +52,12 @@ Install FHS-style paths
  #
  # 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-0.9.13-r3.ebuild b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
index 437a290d1014..f0fed573df9f 100644
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
+++ b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1 python-utils-r1 prefix
 
 DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="http://graphite.readthedocs.org/"
+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"
 
diff --git a/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
new file mode 100644
index 000000000000..1f67a202f1ff
--- /dev/null
+++ b/net-analyzer/graphite-web/graphite-web-1.1.3-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
+
+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"
+
+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/mysql-python[${PYTHON_USEDEP}]
+			dev-python/mysqlclient[${PYTHON_USEDEP}]
+		)
+	)
+	postgres? ( dev-python/psycopg:2[${PYTHON_USEDEP}] )
+	>=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}]
+	<dev-python/django-1.11.99[sqlite?,${PYTHON_USEDEP}]
+	>=dev-python/django-tagging-0.4.3[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	dev-python/pyparsing[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/scandir[${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.3-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
+}
+
+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 "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/graphite-web-1.1.3.ebuild b/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
deleted file mode 100644
index e8d0e6ccfcbe..000000000000
--- a/net-analyzer/graphite-web/graphite-web-1.1.3.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5,6}} )
-
-inherit distutils-r1 python-utils-r1 prefix
-
-DESCRIPTION="Enterprise scalable realtime graphing"
-HOMEPAGE="http://graphite.readthedocs.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+carbon mysql memcached postgres +sqlite"
-#ldap - needs bump of python-ldap to latest
-# ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )
-
-DEPEND=""
-RDEPEND="
-	carbon? ( dev-python/carbon[${PYTHON_USEDEP}] )
-	mysql? (
-		|| (
-			dev-python/mysql-python[${PYTHON_USEDEP}]
-			dev-python/mysqlclient[${PYTHON_USEDEP}]
-		)
-	)
-	memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] )
-	postgres? (
-		dev-python/psycopg:2[${PYTHON_USEDEP}]
-	)
-	dev-lang/python[sqlite?]
-	dev-python/cairocffi[${PYTHON_USEDEP}]
-	>=dev-python/django-1.8[sqlite?,${PYTHON_USEDEP}]
-	<dev-python/django-1.11.99[sqlite?,${PYTHON_USEDEP}]
-	>=dev-python/django-tagging-0.4.3[${PYTHON_USEDEP}]
-	dev-python/pyparsing[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/scandir[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]
-	dev-python/twisted[${PYTHON_USEDEP}]
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/whisper[${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.3-fhs-paths.patch
-)
-
-src_prepare() {
-	# use FHS-style paths
-	export GRAPHITE_NO_PREFIX=yes
-	# make sure we don't use bundled stuff
-	rm -Rf webapp/graphite/thirdparty
-	distutils-r1_src_prepare
-	eprefixify \
-		conf/graphite.wsgi.example \
-		webapp/graphite/local_settings.py.example
-}
-
-python_install() {
-	distutils-r1_python_install \
-		--install-data="${EPREFIX}"/usr/share/${PN}
-
-	# make manage.py available from an easier location/name
-	# (missing from tarball)
-	dodir /usr/bin
-	cat > "${ED}"/usr/bin/${PN}-manage <<- EOS
-		#!/usr/bin/env python
-		import os
-		import sys
-
-		if __name__ == "__main__":
-		    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "graphite.settings")
-
-		    from django.core.management import execute_from_command_line
-
-		    execute_from_command_line(sys.argv)
-	EOS
-	#mv "${D}"/$(python_get_sitedir)/graphite/manage.py \
-	#	"${ED}"/usr/bin/${PN}-manage || die
-	chmod 0755 "${ED}"/usr/bin/${PN}-manage || die
-	python_fix_shebang "${ED}"/usr/bin/${PN}-manage
-
-	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
-	popd > /dev/null || die
-
-	insinto /usr/share/doc/${PF}/examples
-	doins \
-		examples/example-graphite-vhost.conf \
-		conf/dashboard.conf.example \
-		conf/graphite.wsgi.example
-}
-
-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."
-}
diff --git a/net-analyzer/graphite-web/metadata.xml b/net-analyzer/graphite-web/metadata.xml
index 851f07a3b532..d4f9fa582626 100644
--- a/net-analyzer/graphite-web/metadata.xml
+++ b/net-analyzer/graphite-web/metadata.xml
@@ -11,5 +11,7 @@
 	</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>