[gentoo-commits] repo/gentoo:master commit in: dev-python/carbon/files/, dev-python/carbon/

[Michał Górny]

commit:     80e0c2b03de04481d30491a15eb27f6a2ba64a5a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 27 09:56:35 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 27 10:13:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80e0c2b0

dev-python/carbon: Remove old (py2)

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 dev-python/carbon/Manifest                         |  1 -
 dev-python/carbon/carbon-0.9.13-r1.ebuild          | 64 ----------------------
 dev-python/carbon/carbon-0.9.13.ebuild             | 64 ----------------------
 .../carbon/files/carbon-0.9.12-no-data-files.patch | 24 --------
 dev-python/carbon/files/no-data-files.patch        | 26 ---------
 5 files changed, 179 deletions(-)

diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index fa40bf95a4d..d1f93f5e77a 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,3 +1,2 @@
-DIST carbon-0.9.13.tar.gz 47509 BLAKE2B 0f967d81846139164278b99aa31237c8065b7d60a13c9a6153cf3904dae52bf0e8e502d156a178f1dfdbe098236d97f8982fc10e6442351270d103adef2bd74e SHA512 89c843ac67ed4b68c28273459e5a96594851e5d2694fdefdfb71cebcdc6555d4aac8c45c1c6d2ca61a15405bac7ba3d27836470fe152d5d7a4936bb2d00e6776
 DIST carbon-1.1.3.tar.gz 68824 BLAKE2B b5e532fa0d0d8dc8ab8c3c555dea6bb3b918cd5b516ea4c754f9b3cd37230f54b63d202cfead9ec4242ebf78031c2671050354dccccde2980c4101b9699b1393 SHA512 0cfa9260484de147660110b7d2cc7e41bcbd7751c80bd5c557534b2a52c2183fdba94d40f8654fe54f593b2ab34581b2480e96c8a6dde4d47de783153a2cbe65
 DIST carbon-1.1.5.tar.gz 72365 BLAKE2B 304e515fd3cae806e141d0a76983d13967885a7e57c310d86c0c83560aa306a573676fb0135fceccf14cc7ed42d8a9dcb7869ab0d6ac3b2fc00c2fb088011873 SHA512 1b3a0a0d4005e2ec8d5bca062b41f0e18329c1bc4d3a4b3eca5e8f7c94c20387281392eefceaca90294e51860eabecca242c487068433119f1f249f8659ed560

diff --git a/dev-python/carbon/carbon-0.9.13-r1.ebuild b/dev-python/carbon/carbon-0.9.13-r1.ebuild
deleted file mode 100644
index 2cf0631d6fc..00000000000
--- a/dev-python/carbon/carbon-0.9.13-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/whisper[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	"${FILESDIR}"/${PN}-0.9.12-no-data-files.patch
-	)
-
-python_prepare_all() {
-	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd2 carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}

diff --git a/dev-python/carbon/carbon-0.9.13.ebuild b/dev-python/carbon/carbon-0.9.13.ebuild
deleted file mode 100644
index 6bc41708af6..00000000000
--- a/dev-python/carbon/carbon-0.9.13.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Backend data caching and persistence daemon for Graphite"
-HOMEPAGE="https://graphiteapp.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Apache-2.0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	dev-python/twisted-core[${PYTHON_USEDEP}]
-	dev-python/whisper[${PYTHON_USEDEP}]
-	dev-python/txAMQP[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	# Do not install the configuration and data files. We install them
-	# somewhere sensible by hand.
-	"${FILESDIR}"/${PN}-0.9.12-no-data-files.patch
-	)
-
-python_prepare_all() {
-	# This sets prefix to /opt/graphite. We want FHS-style paths instead.
-	rm setup.cfg || die
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /etc/carbon
-	doins conf/*
-
-	dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd}
-
-	newinitd "${FILESDIR}"/carbon.initd carbon-cache
-	newinitd "${FILESDIR}"/carbon.initd carbon-relay
-	newinitd "${FILESDIR}"/carbon.initd carbon-aggregator
-
-	newconfd "${FILESDIR}"/carbon.confd carbon-cache
-	newconfd "${FILESDIR}"/carbon.confd carbon-relay
-	newconfd "${FILESDIR}"/carbon.confd carbon-aggregator
-}
-
-pkg_postinst() {
-	einfo 'This ebuild installs carbon into FHS-style paths.'
-	einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon'
-	einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this'
-	einfo '(see /etc/carbon/carbon.conf.example).'
-	einfo ' '
-	einfo 'OpenRC init script supports multiple instances !'
-	einfo 'Example to run an instance b of carbon-cache :'
-	einfo '    ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b'
-	einfo '    cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b'
-}

diff --git a/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch b/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch
deleted file mode 100644
index 129c7189f3b..00000000000
--- a/dev-python/carbon/files/carbon-0.9.12-no-data-files.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur carbon-0.9.12.orig/setup.py carbon-0.9.12/setup.py
---- /setup.py	2013-08-22 00:53:16.000000000 +0800
-+++ /setup.py	2014-01-26 11:20:59.705864697 +0800
-@@ -13,12 +13,6 @@
-   setup_kwargs = dict()
- 
- 
--storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
--                 ('storage/log',[]), ('storage/rrd',[]) ]
--conf_files = [ ('conf', glob('conf/*.example')) ]
--
--install_files = storage_dirs + conf_files
--
- # If we are building on RedHat, let's use the redhat init scripts.
- if platform.dist()[0] == 'redhat':
-     init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache',
-@@ -39,7 +33,6 @@
-   package_dir={'' : 'lib'},
-   scripts=glob('bin/*'),
-   package_data={ 'carbon' : ['*.xml'] },
--  data_files=install_files,
-   install_requires=['twisted', 'txamqp'],
-   **setup_kwargs
- )

diff --git a/dev-python/carbon/files/no-data-files.patch b/dev-python/carbon/files/no-data-files.patch
deleted file mode 100644
index 7b0c52f3948..00000000000
--- a/dev-python/carbon/files/no-data-files.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Do not install the empty storage dirs and config files to the wrong
-location (the ebuild installs them to the right location by hand).
-
-See Gentoo bug #417221.
-
---- setup.py
-+++ setup.py
-@@ -12,9 +12,6 @@
-   setup_kwargs = dict()
- 
- 
--storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]),
--                 ('storage/log',[]), ('storage/rrd',[]) ]
--conf_files = [ ('conf', glob('conf/*.example')) ]
- #XXX Need a way to have these work for bdist_rpm but be left alone for everything else
- #init_scripts = [ ('/etc/init.d', ['distro/redhat/init.d/carbon-cache',
- #                                  'distro/redhat/init.d/carbon-relay',
-@@ -32,7 +29,6 @@
-   package_dir={'' : 'lib'},
-   scripts=glob('bin/*'),
-   package_data={ 'carbon' : ['*.xml'] },
--  data_files=storage_dirs + conf_files, # + init_scripts,
-   install_requires=['twisted', 'txamqp'],
-   **setup_kwargs
- )
-