* [gentoo-commits] repo/gentoo:master commit in: dev-python/carbon/files/, dev-python/carbon/
@ 2016-05-03 13:21 Patrick Lauer
0 siblings, 0 replies; 4+ messages in thread
From: Patrick Lauer @ 2016-05-03 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 3a4d27ad1fe202a62851a317af7f1784c685939d
Author: Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Tue May 3 13:20:46 2016 +0000
Commit: Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Tue May 3 13:20:46 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a4d27ad
dev-python/carbon: Fix relay-rules check in init script
Package-Manager: portage-2.2.28
dev-python/carbon/carbon-0.9.13-r1.ebuild | 65 +++++++++++++++++++++++++++++++
dev-python/carbon/carbon-0.9.14-r1.ebuild | 65 +++++++++++++++++++++++++++++++
dev-python/carbon/carbon-0.9.15-r1.ebuild | 65 +++++++++++++++++++++++++++++++
dev-python/carbon/files/carbon.initd2 | 53 +++++++++++++++++++++++++
4 files changed, 248 insertions(+)
diff --git a/dev-python/carbon/carbon-0.9.13-r1.ebuild b/dev-python/carbon/carbon-0.9.13-r1.ebuild
new file mode 100644
index 0000000..a38c39e
--- /dev/null
+++ b/dev-python/carbon/carbon-0.9.13-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+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.14-r1.ebuild b/dev-python/carbon/carbon-0.9.14-r1.ebuild
new file mode 100644
index 0000000..cd241d9
--- /dev/null
+++ b/dev-python/carbon/carbon-0.9.14-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+
+# whisper appears to have been missed from listing in install_requires in setup.py
+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. Patch for this vn. 0.9.14 has been extended
+ # due to redhat's init scripts set to install unconditionally in setup.py
+ "${FILESDIR}"/${P}-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.15-r1.ebuild b/dev-python/carbon/carbon-0.9.15-r1.ebuild
new file mode 100644
index 0000000..37560df
--- /dev/null
+++ b/dev-python/carbon/carbon-0.9.15-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~x64-solaris"
+
+# whisper appears to have been missed from listing in install_requires in setup.py
+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. Patch for this vn. 0.9.14 has been extended
+ # due to redhat's init scripts set to install unconditionally in setup.py
+ "${FILESDIR}"/${PN}-0.9.14-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/files/carbon.initd2 b/dev-python/carbon/files/carbon.initd2
new file mode 100644
index 0000000..1dea421
--- /dev/null
+++ b/dev-python/carbon/files/carbon.initd2
@@ -0,0 +1,53 @@
+#!/sbin/runscript
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+export GRAPHITE_CONF_DIR=/etc/carbon
+export GRAPHITE_STORAGE_DIR=/var/lib/carbon
+
+INSTANCE=${SVCNAME/#*.}
+if [ "${INSTANCE}" == "${SVCNAME}" ]; then
+ INSTANCE="a"
+fi
+
+PIDFILE="/var/run/${SVCNAME}.pid"
+PROGRAMNAME=${SVCNAME/.*}
+
+CARBON_CONFIG=${CARBON_CONFIG:-/etc/carbon/carbon.conf}
+
+depend() {
+ use net
+}
+
+
+start_pre() {
+ if [ ! -f ${CARBON_CONFIG} ] ; then
+ eend "Missing ${CARBON_CONFIG}"
+ fi
+ case "${PROGRAMNAME}" in
+ "carbon-relay" )
+ if `grep -q "^RELAY_METHOD = rules$" ${CARBON_CONFIG}`; then
+ [ -f /etc/carbon/relay-rules.conf ] || eend "Missing relay-rules.conf"
+ fi
+ ;;
+ "carbon-aggregator" )
+ [ -f /etc/carbon/aggregation-rules.conf ] || eend "Missing missing aggregation-rules.conf"
+ ;;
+ esac
+}
+
+start() {
+ ebegin "Starting ${PROGRAMNAME} instance ${INSTANCE}"
+ start-stop-daemon --start --exec /usr/bin/${PROGRAMNAME}.py \
+ --pidfile ${PIDFILE} \
+ -- --pidfile ${PIDFILE} --instance ${INSTANCE} \
+ --logdir /var/log/carbon/ --config ${CARBON_CONFIG} start >/dev/null
+ eend $? "Failed to start ${SVCNAME}"
+}
+
+stop() {
+ ebegin "Stopping ${PROGRAMNAME} instance ${INSTANCE}"
+ start-stop-daemon --stop \
+ --pidfile ${PIDFILE}
+ eend $? "Failed to stop ${SVCNAME}"
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/carbon/files/, dev-python/carbon/
@ 2021-11-14 8:46 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2021-11-14 8:46 UTC (permalink / raw
To: gentoo-commits
commit: 6dfa321bac3ff66ae8c0c99735510dc0cf73b4b8
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 14 08:37:32 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 14 08:46:32 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6dfa321b
dev-python/carbon: Remove old
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
dev-python/carbon/Manifest | 1 -
dev-python/carbon/carbon-1.1.7.ebuild | 62 -----------------------------------
dev-python/carbon/files/carbon.initd | 51 ----------------------------
3 files changed, 114 deletions(-)
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index cde50d25126e..538ec9058f80 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,2 +1 @@
-DIST carbon-1.1.7.tar.gz 73380 BLAKE2B 8f9c807bc5e1c6fc020ae31179b6c0c11724b1110def323f92e158c5cf7c88291686bdc7f9078fb9234e5f2877fd745f7ec581533fa9a77e0307bf56f8ba60e0 SHA512 f0c5c64fa02cfd5940a7b23dbb3f2af27f67595e301ae719f4e2e9cdb48d4a5673d36a60adc8d338a55202f8e89873a7539c960cc16649903305191c6b0fc875
DIST carbon-1.1.8.tar.gz 72452 BLAKE2B d76a281925645ebf6f74ff83f8ea6a52016f29ae0e35143e48e9aa0f2fcc267ceee1b5040ad756bbab8b2c1ffde5040231b8e0b581bd177bfb31ddf33fab7933 SHA512 b679d0329a5c8701af8aad3bdc51d64fbab7d05214c09368a218f1c925593002596a04b50fd2aadf26bd21ea7ef4b8262ae7f8169ef0d6ee40dccbc933539161
diff --git a/dev-python/carbon/carbon-1.1.7.ebuild b/dev-python/carbon/carbon-1.1.7.ebuild
deleted file mode 100644
index 906b0342f044..000000000000
--- a/dev-python/carbon/carbon-1.1.7.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-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"
-
-# whisper appears to have been missed from listing in install_requires in setup.py
-RDEPEND="
- dev-python/twisted[${PYTHON_USEDEP}]
- dev-python/cachetools[${PYTHON_USEDEP}]
- dev-python/urllib3[${PYTHON_USEDEP}]
- =dev-python/whisper-${PV}*[${PYTHON_USEDEP}]"
-
-python_prepare_all() {
- # Do not install the configuration and data files. We install them
- # somewhere sensible by hand.
- sed -i -e '/data_files=install_files,/d' setup.py || die
- # We want FHS-style paths instead of /opt/graphite
- export GRAPHITE_NO_PREFIX=yes
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- distutils-r1_python_install_all
-
- insinto /etc/carbon
- doins conf/*
-
- keepdir /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/files/carbon.initd b/dev-python/carbon/files/carbon.initd
deleted file mode 100644
index a33a70c60f93..000000000000
--- a/dev-python/carbon/files/carbon.initd
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-export GRAPHITE_CONF_DIR=/etc/carbon
-export GRAPHITE_STORAGE_DIR=/var/lib/carbon
-
-INSTANCE=${SVCNAME/#*.}
-if [ "${INSTANCE}" == "${SVCNAME}" ]; then
- INSTANCE="a"
-fi
-
-PIDFILE="/var/run/${SVCNAME}.pid"
-PROGRAMNAME=${SVCNAME/.*}
-
-CARBON_CONFIG=${CARBON_CONFIG:-/etc/carbon/carbon.conf}
-
-depend() {
- use net
-}
-
-
-start_pre() {
- if [ ! -f ${CARBON_CONFIG} ] ; then
- eend "Missing ${CARBON_CONFIG}"
- fi
- case "${PROGRAMNAME}" in
- "carbon-relay" )
- [ -f /etc/carbon/relay-rules.conf ] || eend "Missing relay-rules.conf"
- ;;
- "carbon-aggregator" )
- [ -f /etc/carbon/aggregation-rules.conf ] || eend "Missing missing aggregation-rules.conf"
- ;;
- esac
-}
-
-start() {
- ebegin "Starting ${PROGRAMNAME} instance ${INSTANCE}"
- start-stop-daemon --start --exec /usr/bin/${PROGRAMNAME}.py \
- --pidfile ${PIDFILE} \
- -- --pidfile ${PIDFILE} --instance ${INSTANCE} \
- --logdir /var/log/carbon/ --config ${CARBON_CONFIG} start >/dev/null
- eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
- ebegin "Stopping ${PROGRAMNAME} instance ${INSTANCE}"
- start-stop-daemon --stop \
- --pidfile ${PIDFILE}
- eend $? "Failed to stop ${SVCNAME}"
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/carbon/files/, dev-python/carbon/
@ 2020-01-27 10:13 Michał Górny
0 siblings, 0 replies; 4+ messages in thread
From: Michał Górny @ 2020-01-27 10:13 UTC (permalink / raw
To: gentoo-commits
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
- )
-
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-python/carbon/files/, dev-python/carbon/
@ 2015-12-27 1:23 Ian Delaney
0 siblings, 0 replies; 4+ messages in thread
From: Ian Delaney @ 2015-12-27 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 85abb811bdd6b6bf04406bd1770ed4c065134758
Author: Ian Delaney <idella4 <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 01:16:13 2015 +0000
Commit: Ian Delaney <idella4 <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 01:22:51 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85abb811
dev-python/carbon: bump to vn. 0.9.14
updated no-data-files.patch to account for changed state in setup.py
Package-Manager: portage-2.2.24
dev-python/carbon/Manifest | 1 +
dev-python/carbon/carbon-0.9.14.ebuild | 65 ++++++++++++++++++++++
.../carbon/files/carbon-0.9.14-no-data-files.patch | 32 +++++++++++
3 files changed, 98 insertions(+)
diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest
index f18c232..74c3d2c 100644
--- a/dev-python/carbon/Manifest
+++ b/dev-python/carbon/Manifest
@@ -1,2 +1,3 @@
DIST carbon-0.9.12.tar.gz 47450 SHA256 df4b521a449b888fc901d11abffc9e7eb070a8670e341caa0e13ab8f3029cddf SHA512 060b3d20cf2bd95be22fba30a24591361c772edaaaa99117616f4a01a31eab9395d84c5eb835408fac2c1bc36b70950e260d56456879489a9ee3248c6c4e3f33 WHIRLPOOL c6021492dc5ed3c9c4cefe173b1e0592b18e6c2d49e48cd74059c4d3822ea0b2cf253bedc9a67f7fa37dd8944e06835a1da959300e3c6e0f1759622b19b0c61e
DIST carbon-0.9.13.tar.gz 47509 SHA256 75aecd8114435430e06803ebaf1e9cac81f58fb231fc93d8904d667d971ae6cd SHA512 89c843ac67ed4b68c28273459e5a96594851e5d2694fdefdfb71cebcdc6555d4aac8c45c1c6d2ca61a15405bac7ba3d27836470fe152d5d7a4936bb2d00e6776 WHIRLPOOL 40000d912f3881dc4f197e1290d3e0fd092ec23bc6574a97fa31d0ffa77fa651abc4d4da529e45d88d74ea763f18cde20daf5fd70549d6afd38f4c5b88d1becb
+DIST carbon-0.9.14.tar.gz 50285 SHA256 e12539ca855f0777e326028a32fbff5022d75b7c3e6fcc7e4704305a650aee9a SHA512 e70275c0acce17287b3036668e45c75b9da9b54523faca0f5bdceda4b6b98c71ebf773740e85063ee3ea4e0bc64adee913bb7f8eab1f7016eb504b06f0b589e3 WHIRLPOOL 998c6a3d0b6cc9aa86cc9b79719e762610cf47012f2eebfd575a6bac3aeb78b64c34e94c5fedc5c88074400920268890e8b84e2f1b32ee4ba24bdd0bef31602d
diff --git a/dev-python/carbon/carbon-0.9.14.ebuild b/dev-python/carbon/carbon-0.9.14.ebuild
new file mode 100644
index 0000000..93a5d95
--- /dev/null
+++ b/dev-python/carbon/carbon-0.9.14.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Backend data caching and persistence daemon for Graphite"
+HOMEPAGE="http://graphite.wikidot.com/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+
+# whisper appears to have been missed from listing in install_requires in setup.py
+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. Patch for this vn. 0.9.14 has been extended
+ # due to redhat's init scripts set to install unconditionally in setup.py
+ "${FILESDIR}"/${P}-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.14-no-data-files.patch b/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch
new file mode 100644
index 0000000..858d362
--- /dev/null
+++ b/dev-python/carbon/files/carbon-0.9.14-no-data-files.patch
@@ -0,0 +1,32 @@
+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
+ )
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-14 8:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-03 13:21 [gentoo-commits] repo/gentoo:master commit in: dev-python/carbon/files/, dev-python/carbon/ Patrick Lauer
-- strict thread matches above, loose matches on Subject: below --
2021-11-14 8:46 Michał Górny
2020-01-27 10:13 Michał Górny
2015-12-27 1:23 Ian Delaney
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox