1 |
commit: 85abb811bdd6b6bf04406bd1770ed4c065134758 |
2 |
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Dec 27 01:16:13 2015 +0000 |
4 |
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Dec 27 01:22:51 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85abb811 |
7 |
|
8 |
dev-python/carbon: bump to vn. 0.9.14 |
9 |
|
10 |
updated no-data-files.patch to account for changed state in setup.py |
11 |
|
12 |
Package-Manager: portage-2.2.24 |
13 |
|
14 |
dev-python/carbon/Manifest | 1 + |
15 |
dev-python/carbon/carbon-0.9.14.ebuild | 65 ++++++++++++++++++++++ |
16 |
.../carbon/files/carbon-0.9.14-no-data-files.patch | 32 +++++++++++ |
17 |
3 files changed, 98 insertions(+) |
18 |
|
19 |
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest |
20 |
index f18c232..74c3d2c 100644 |
21 |
--- a/dev-python/carbon/Manifest |
22 |
+++ b/dev-python/carbon/Manifest |
23 |
@@ -1,2 +1,3 @@ |
24 |
DIST carbon-0.9.12.tar.gz 47450 SHA256 df4b521a449b888fc901d11abffc9e7eb070a8670e341caa0e13ab8f3029cddf SHA512 060b3d20cf2bd95be22fba30a24591361c772edaaaa99117616f4a01a31eab9395d84c5eb835408fac2c1bc36b70950e260d56456879489a9ee3248c6c4e3f33 WHIRLPOOL c6021492dc5ed3c9c4cefe173b1e0592b18e6c2d49e48cd74059c4d3822ea0b2cf253bedc9a67f7fa37dd8944e06835a1da959300e3c6e0f1759622b19b0c61e |
25 |
DIST carbon-0.9.13.tar.gz 47509 SHA256 75aecd8114435430e06803ebaf1e9cac81f58fb231fc93d8904d667d971ae6cd SHA512 89c843ac67ed4b68c28273459e5a96594851e5d2694fdefdfb71cebcdc6555d4aac8c45c1c6d2ca61a15405bac7ba3d27836470fe152d5d7a4936bb2d00e6776 WHIRLPOOL 40000d912f3881dc4f197e1290d3e0fd092ec23bc6574a97fa31d0ffa77fa651abc4d4da529e45d88d74ea763f18cde20daf5fd70549d6afd38f4c5b88d1becb |
26 |
+DIST carbon-0.9.14.tar.gz 50285 SHA256 e12539ca855f0777e326028a32fbff5022d75b7c3e6fcc7e4704305a650aee9a SHA512 e70275c0acce17287b3036668e45c75b9da9b54523faca0f5bdceda4b6b98c71ebf773740e85063ee3ea4e0bc64adee913bb7f8eab1f7016eb504b06f0b589e3 WHIRLPOOL 998c6a3d0b6cc9aa86cc9b79719e762610cf47012f2eebfd575a6bac3aeb78b64c34e94c5fedc5c88074400920268890e8b84e2f1b32ee4ba24bdd0bef31602d |
27 |
|
28 |
diff --git a/dev-python/carbon/carbon-0.9.14.ebuild b/dev-python/carbon/carbon-0.9.14.ebuild |
29 |
new file mode 100644 |
30 |
index 0000000..93a5d95 |
31 |
--- /dev/null |
32 |
+++ b/dev-python/carbon/carbon-0.9.14.ebuild |
33 |
@@ -0,0 +1,65 @@ |
34 |
+# Copyright 1999-2015 Gentoo Foundation |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+# $Id$ |
37 |
+ |
38 |
+EAPI=5 |
39 |
+ |
40 |
+PYTHON_COMPAT=( python2_7 ) |
41 |
+ |
42 |
+inherit distutils-r1 |
43 |
+ |
44 |
+DESCRIPTION="Backend data caching and persistence daemon for Graphite" |
45 |
+HOMEPAGE="http://graphite.wikidot.com/" |
46 |
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
47 |
+ |
48 |
+SLOT="0" |
49 |
+LICENSE="Apache-2.0" |
50 |
+KEYWORDS="~amd64 ~x86" |
51 |
+ |
52 |
+# whisper appears to have been missed from listing in install_requires in setup.py |
53 |
+RDEPEND=" |
54 |
+ dev-python/twisted-core[${PYTHON_USEDEP}] |
55 |
+ dev-python/whisper[${PYTHON_USEDEP}] |
56 |
+ dev-python/txAMQP[${PYTHON_USEDEP}]" |
57 |
+ |
58 |
+PATCHES=( |
59 |
+ # Do not install the configuration and data files. We install them |
60 |
+ # somewhere sensible by hand. Patch for this vn. 0.9.14 has been extended |
61 |
+ # due to redhat's init scripts set to install unconditionally in setup.py |
62 |
+ "${FILESDIR}"/${P}-no-data-files.patch |
63 |
+ ) |
64 |
+ |
65 |
+python_prepare_all() { |
66 |
+ # This sets prefix to /opt/graphite. We want FHS-style paths instead. |
67 |
+ rm setup.cfg || die |
68 |
+ distutils-r1_python_prepare_all |
69 |
+} |
70 |
+ |
71 |
+python_install_all() { |
72 |
+ distutils-r1_python_install_all |
73 |
+ |
74 |
+ insinto /etc/carbon |
75 |
+ doins conf/* |
76 |
+ |
77 |
+ dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd} |
78 |
+ |
79 |
+ newinitd "${FILESDIR}"/carbon.initd carbon-cache |
80 |
+ newinitd "${FILESDIR}"/carbon.initd carbon-relay |
81 |
+ newinitd "${FILESDIR}"/carbon.initd carbon-aggregator |
82 |
+ |
83 |
+ newconfd "${FILESDIR}"/carbon.confd carbon-cache |
84 |
+ newconfd "${FILESDIR}"/carbon.confd carbon-relay |
85 |
+ newconfd "${FILESDIR}"/carbon.confd carbon-aggregator |
86 |
+} |
87 |
+ |
88 |
+pkg_postinst() { |
89 |
+ einfo 'This ebuild installs carbon into FHS-style paths.' |
90 |
+ einfo 'You will probably have to set GRAPHITE_CONF_DIR to /etc/carbon' |
91 |
+ einfo 'and GRAPHITE_STORAGE_DIR to /var/lib/carbon to make use of this' |
92 |
+ einfo '(see /etc/carbon/carbon.conf.example).' |
93 |
+ einfo ' ' |
94 |
+ einfo 'OpenRC init script supports multiple instances !' |
95 |
+ einfo 'Example to run an instance b of carbon-cache :' |
96 |
+ einfo ' ln -s /etc/init.d/carbon-cache /etc/init.d/carbon-cache.b' |
97 |
+ einfo ' cp /etc/conf.d/carbon-cache /etc/conf.d/carbon-cache.b' |
98 |
+} |
99 |
|
100 |
diff --git a/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch b/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch |
101 |
new file mode 100644 |
102 |
index 0000000..858d362 |
103 |
--- /dev/null |
104 |
+++ b/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch |
105 |
@@ -0,0 +1,32 @@ |
106 |
+diff -ur carbon-0.9.14.orig/setup.py carbon-0.9.14/setup.py |
107 |
+--- setup.py 2015-11-07 13:50:29.000000000 +0800 |
108 |
++++ setup.py 2015-12-27 08:43:46.575905408 +0800 |
109 |
+@@ -13,20 +13,6 @@ |
110 |
+ setup_kwargs = dict() |
111 |
+ |
112 |
+ |
113 |
+-storage_dirs = [ ('storage/whisper',[]), ('storage/lists',[]), |
114 |
+- ('storage/log',[]), ('storage/rrd',[]) ] |
115 |
+-conf_files = [ ('conf', glob('conf/*.example')) ] |
116 |
+- |
117 |
+-install_files = storage_dirs + conf_files |
118 |
+- |
119 |
+-# Let's include redhat init scripts, despite build platform |
120 |
+-# but won't put them in /etc/init.d/ automatically anymore |
121 |
+-init_scripts = [ ('examples/init.d', ['distro/redhat/init.d/carbon-cache', |
122 |
+- 'distro/redhat/init.d/carbon-relay', |
123 |
+- 'distro/redhat/init.d/carbon-aggregator']) ] |
124 |
+-install_files += init_scripts |
125 |
+- |
126 |
+- |
127 |
+ setup( |
128 |
+ name='carbon', |
129 |
+ version='0.9.14', |
130 |
+@@ -39,7 +25,6 @@ |
131 |
+ package_dir={'' : 'lib'}, |
132 |
+ scripts=glob('bin/*'), |
133 |
+ package_data={ 'carbon' : ['*.xml'] }, |
134 |
+- data_files=install_files, |
135 |
+ install_requires=['twisted', 'txamqp'], |
136 |
+ **setup_kwargs |
137 |
+ ) |