summaryrefslogtreecommitdiff
path: root/dev-python/carbon
diff options
context:
space:
mode:
Diffstat (limited to 'dev-python/carbon')
-rw-r--r--dev-python/carbon/Manifest9
-rw-r--r--dev-python/carbon/carbon-0.9.13-r1.ebuild64
-rw-r--r--dev-python/carbon/carbon-0.9.13.ebuild64
-rw-r--r--dev-python/carbon/carbon-1.1.3-r1.ebuild2
-rw-r--r--dev-python/carbon/carbon-1.1.5.ebuild2
-rw-r--r--dev-python/carbon/files/carbon-0.9.12-no-data-files.patch24
-rw-r--r--dev-python/carbon/files/no-data-files.patch26
7 files changed, 4 insertions, 187 deletions
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index feb418e4a78a..c8d4dd3c09a4 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,13 +1,8 @@
-AUX carbon-0.9.12-no-data-files.patch 817 BLAKE2B 33a5f118d62bb5be6e95822490213c431d80982a5d95644031e8d1d3845c1612049abf17e80324efe9421f212fd7fc7f6b98922afca3fb066a14a443d738056e SHA512 549499d5f1963f2eadc9858e0744a1b2b30830e4069f6881d3d912b9709e3cc0f0c3c01730790c975a57209b671c6592c1dd650028a8a63dcab84fe960f5ed58
AUX carbon.confd 119 BLAKE2B 75505b3aedcc65306a1cd16645e349012652a268d838dc1fd32d8a143d18dfca3c9e3233a0bfcdeee22a26592bb49408a3e4708d96796361219f73dc5e32adb4 SHA512 049d2e3c9e9ae9375f485568185b14fb326a85f13a5f40e19a5d26aaecd0b98a61f011dbe4335110b6e3314ec52d308fea8f577df8b29b5d675fd7763a02788f
AUX carbon.initd 1259 BLAKE2B 06d75128329df6efe82b2d2ac2c35bb5f8726b760fc3e34335bea972a8c74070b6f892825b2b34144e15a41833cbbbb0e64d449f1c3326e7fae7b88349e62c48 SHA512 f6ccd3a3abdd8b8e1eff55aa6a0cd0b26e5cd6789ff6f8f795890e61adfac7369c101788a0db2e7d6fdaeace622cf8313a331aa6e0f54e9dda7ec8194351019a
AUX carbon.initd2 1329 BLAKE2B 7990f8ee25f2554ce5997075c7fda4cfc69d73ae060657a917498bed4ef237a6e0b43b522ef15b0587d15c71fdb03a26f562d1147212c50f8d838f97522cc9cd SHA512 08d9a7ddc763bb49763b1c873504b0dfb45763ed871f22632885692f41d5d8c86616677c2669b0b8c2160170a7c507c2415571d300e2045675c7002556a4063e
-AUX no-data-files.patch 881 BLAKE2B 6e8709eebe73d3686ee401a7d5db45471ba1a53b894f733a211b62be5c5c1920dc732fffeaa771a57f03ca692a63d02c55d9efeae3ff393910245cbb15e2f1df SHA512 13c2e946c42bfabc643ec39a0d384b887fb1ceaee9791e0f7c2ed037069492aa80ff4f4b593dbba7253c6e5f553e0a7d1677333a896067219df4206f742d64d7
-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
-EBUILD carbon-0.9.13-r1.ebuild 1843 BLAKE2B a8ba9d28061af7db44af73e714c33b96b61fb90af199fee1ecc6fdd0d6db5034cf876e33cc73b1f8b6826c94c76a62755cb56eb650c2e70353ec2e9c2be9fd9c SHA512 e82fd28ed25b8e10c3f3cba93fe307f209a09a5bdba8ef1b2e1acfd2e696cf45b3c2ed36f0fe9e7ec1e74b4e6a533e93d95c705a42c4575ca1ffea50e117ce75
-EBUILD carbon-0.9.13.ebuild 1838 BLAKE2B 0810875d6f256a3af040a41d8c05104fd2c860d00e50a0ce4f2e19fe97716408e777fb8dbd392d3810549671b3c2ffbf8ba6a9e59556d9c1ed389cf6e9e8f094 SHA512 97502916be13d332389c68b30366ef6b254270cf1b8c702318f18efd2019950ccefae0815d17a467879e60afcb557dbbcb6b412ccc21c9f84e0cede6986a843b
-EBUILD carbon-1.1.3-r1.ebuild 2118 BLAKE2B 8acd4660ff77218fe0b91af19764a5f4f26f9655dac7bc107ecedb6d9165e8e2039336c3e51ab7ec3114cd5efc2affa0c2fcaac5568f74b10085865f02e0145f SHA512 639f188212d18bfd3ff9e12c98a4b3f04e38808f02c9ef4510e9e202ea20764eafca11b5c15cfbeb14c599096bc03cdadbb5445f1e4033855fd1953367dd2271
-EBUILD carbon-1.1.5.ebuild 2029 BLAKE2B 7d1bc83fca553a044ed6ffcb3d17fcedee9b9175718e49350ea7234bdf791d3f8b540f92c48efe9de47254b5947778a566e9cdee9e3de9d5fb1f216828da3d40 SHA512 b457a70ce53fe6fd9afc3b0022db563594d0654d60c8beebe067928a920716ef03aac70c2b187d600b541f0676184eca73818b6afe992c3c7e76272b76306496
+EBUILD carbon-1.1.3-r1.ebuild 2112 BLAKE2B e6a02862ed86e29b81950c3e72817c41361206c46e53767aa6382f9beac45ba806668542d1de3268e8203172b9684989465706dd89259fdd0da8d58f71f08aa4 SHA512 efb25bc72744fd9c7133ffa4090ed25fa84d2262b6d9c418886b62ff1e958327d124b34e1d3dea298f6629fb289ed1fdc290b8e263c9a78aa48a9decb69a3050
+EBUILD carbon-1.1.5.ebuild 2023 BLAKE2B 2aaea9e8f1721ba82473ce1d801db5d3e2ddb2930841324abdceac2ca0b69dc0ab13b998b09917272a20064c5740b02543c4fe446d953ee619b365ea15fba858 SHA512 1e85755445b607f1048c1a790ee8a50df4db1c71af17471c4ea0c7ee7348492df0f86d72e6f3edf6e9d84ab1aa8c1d6d267e3bb7717cde986f5b54c85383728e
MISC metadata.xml 441 BLAKE2B d2e47e40cd430deb50428472c2a1aa280b888429892f59bf49a58b3ace4210005efd9489821c89ec59b72b398ef78510817a552dbbb65f2e64c9725ab0375507 SHA512 b6a65d642333fb19a34c4f1342b58ee9eadb9824f078a7cd9faac06d3d9e731ea67aa138a8e36db797b755dd382873583808aa6460375ebedf61443be962fc5d
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 2cf0631d6fc3..000000000000
--- 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 6bc41708af67..000000000000
--- 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/carbon-1.1.3-r1.ebuild b/dev-python/carbon/carbon-1.1.3-r1.ebuild
index 1a6e761e0a81..9bad63510273 100644
--- a/dev-python/carbon/carbon-1.1.3-r1.ebuild
+++ b/dev-python/carbon/carbon-1.1.3-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
inherit distutils-r1
diff --git a/dev-python/carbon/carbon-1.1.5.ebuild b/dev-python/carbon/carbon-1.1.5.ebuild
index 7aae679f68c9..74d2937c437c 100644
--- a/dev-python/carbon/carbon-1.1.5.ebuild
+++ b/dev-python/carbon/carbon-1.1.5.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-PYTHON_COMPAT=( python{2_7,3_6} ) # 3.7 dropped due to dep-hell
+PYTHON_COMPAT=( python3_6 ) # 3.7 dropped due to dep-hell
inherit distutils-r1
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 129c7189f3b0..000000000000
--- 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 7b0c52f3948b..000000000000
--- 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
- )
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 01:20:14 +0000