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

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

[Matt Thode]

commit:     69e67d2d995c176b6bef8f45c47e8d60202f65be
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 10 18:10:38 2016 +0000
Commit:     Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Mon Oct 10 18:10:38 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69e67d2d

dev-python/carbon: remove bashisms in init for bug 589084

Package-Manager: portage-2.3.0

 dev-python/carbon/files/carbon.initd2 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-python/carbon/files/carbon.initd2 b/dev-python/carbon/files/carbon.initd2
index e7f1f1e..ff15097 100644
--- a/dev-python/carbon/files/carbon.initd2
+++ b/dev-python/carbon/files/carbon.initd2
@@ -5,13 +5,13 @@
 export GRAPHITE_CONF_DIR=/etc/carbon
 export GRAPHITE_STORAGE_DIR=/var/lib/carbon
 
-INSTANCE=${SVCNAME/#*.}
-if [ "${INSTANCE}" == "${SVCNAME}" ]; then
+INSTANCE=${SVCNAME#*.}
+if [ "${INSTANCE}" = "${SVCNAME}" ]; then
 	INSTANCE="a"
 fi
 
 PIDFILE="/var/run/${SVCNAME}.pid"
-PROGRAMNAME=${SVCNAME/.*}
+PROGRAMNAME=${SVCNAME%%.*}
 
 CARBON_CONFIG=${CARBON_CONFIG:-/etc/carbon/carbon.conf}
 

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

[Andreas Sturmlechner]

commit:     e0cec6c46475e867976403ebd8d914ab4ee89e24
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Fri Mar  1 17:52:39 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 15:27:11 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0cec6c4

dev-python/carbon: remove unused patch

Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/11200
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../carbon/files/carbon-0.9.14-no-data-files.patch | 32 ----------------------
 1 file changed, 32 deletions(-)

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
deleted file mode 100644
index 858d362d296..00000000000
--- a/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff -ur carbon-0.9.14.orig/setup.py carbon-0.9.14/setup.py
---- setup.py	2015-11-07 13:50:29.000000000 +0800
-+++ setup.py	2015-12-27 08:43:46.575905408 +0800
-@@ -13,20 +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
--
--# Let's include redhat init scripts, despite build platform
--# but won't put them in /etc/init.d/ automatically anymore
--init_scripts = [ ('examples/init.d', ['distro/redhat/init.d/carbon-cache',
--                                      'distro/redhat/init.d/carbon-relay',
--                                      'distro/redhat/init.d/carbon-aggregator']) ]
--install_files += init_scripts
--
--
- setup(
-   name='carbon',
-   version='0.9.14',
-@@ -39,7 +25,6 @@
-   package_dir={'' : 'lib'},
-   scripts=glob('bin/*'),
-   package_data={ 'carbon' : ['*.xml'] },
--  data_files=install_files,
-   install_requires=['twisted', 'txamqp'],
-   **setup_kwargs
- )