From d0afcfbc3e06d4cb28a06c95e04c8de1974378b3 Mon Sep 17 00:00:00 2001 From: Ian Delaney Date: Tue, 6 Jan 2015 10:29:41 +0000 Subject: [PATCH] bump, rm old Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB8072B0D --- dev-python/carbon/ChangeLog | 11 +++- dev-python/carbon/Manifest | 18 +++---- dev-python/carbon/carbon-0.9.10-r1.ebuild | 52 ------------------- dev-python/carbon/carbon-0.9.10.ebuild | 51 ------------------ ...bon-0.9.12.ebuild => carbon-0.9.13.ebuild} | 25 ++++++--- dev-python/carbon/carbon-0.9.9-r2.ebuild | 29 ----------- 6 files changed, 35 insertions(+), 151 deletions(-) delete mode 100644 dev-python/carbon/carbon-0.9.10-r1.ebuild delete mode 100644 dev-python/carbon/carbon-0.9.10.ebuild rename dev-python/carbon/{carbon-0.9.12.ebuild => carbon-0.9.13.ebuild} (60%) delete mode 100644 dev-python/carbon/carbon-0.9.9-r2.ebuild diff --git a/dev-python/carbon/ChangeLog b/dev-python/carbon/ChangeLog index 43a2a4e0b61d..9334df9e3400 100644 --- a/dev-python/carbon/ChangeLog +++ b/dev-python/carbon/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/carbon -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/ChangeLog,v 1.7 2014/02/19 16:27:36 ultrabug Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/ChangeLog,v 1.8 2015/01/06 10:29:15 idella4 Exp $ + +*carbon-0.9.13 (06 Jan 2015) + + 06 Jan 2015; Ian Delaney +carbon-0.9.13.ebuild, + -carbon-0.9.10-r1.ebuild, -carbon-0.9.10.ebuild, -carbon-0.9.12.ebuild, + -carbon-0.9.9-r2.ebuild: + bump, rm old *carbon-0.9.12-r1 (19 Feb 2014) diff --git a/dev-python/carbon/Manifest b/dev-python/carbon/Manifest index 79618a1967d0..e84414e6f45f 100644 --- a/dev-python/carbon/Manifest +++ b/dev-python/carbon/Manifest @@ -5,20 +5,16 @@ AUX carbon-0.9.12-no-data-files.patch 817 SHA256 e0f40bb173b4687238a6bf003baab74 AUX carbon.confd 119 SHA256 d03e9aad2764b4b5d55a10a0802fcbd0047408c6fd520abd768c230abc858ec7 SHA512 049d2e3c9e9ae9375f485568185b14fb326a85f13a5f40e19a5d26aaecd0b98a61f011dbe4335110b6e3314ec52d308fea8f577df8b29b5d675fd7763a02788f WHIRLPOOL e04bc43c0270fcf3d8eccda61066da1183722d1f8ebddae7c2e02abaac45a33cd7e9969d660c88f4e56854770d610574932009c4078c781dd52dccbfb4ba9d2c AUX carbon.initd 1371 SHA256 be3c58d980729e3ea5d4cfde0e721d1dfeb9ad23015ccd3df63147dfcc21aa74 SHA512 52f2dfe970b5270900db815cfc52036d4ced105c30af5725705e147b9e0c25fada3da7ab937ba55f6d22229ac52ddb24bbcdd9d1cc90edb5ebe94cc612ae4e46 WHIRLPOOL 4567d60494a6a9502934d880c75bf08ce7b130c5c1f6f75b8820448d2585eb379a71220faf4235b076e27272ed339d8b9310bfdd77e6ab9befe667f42b9853d7 AUX no-data-files.patch 881 SHA256 d8d5b61c21df35042a51433d72495040cfa172f82fbe4b2ef5e54fb8b41cff63 SHA512 13c2e946c42bfabc643ec39a0d384b887fb1ceaee9791e0f7c2ed037069492aa80ff4f4b593dbba7253c6e5f553e0a7d1677333a896067219df4206f742d64d7 WHIRLPOOL ca8040abfdefb1ff6ecb8737de40f303cb869c618dca41f0d09d1c065e60c65a17709adadce057b8c779a0dfa24a3ea6df045e858681bf207f6db6be7fe6ac06 -DIST carbon-0.9.10.tar.gz 42208 SHA256 f1a1d61a0bf9e2ff3c42c01310a59572e527139c7ce73bdbeb25d8813b78d2b9 SHA512 cc1ea301453c88a40e025f9039f375acd17c42c22c4022bba1fde7fe69dec601d0bafd2611d758d80957e0e9de0fe47d2b87a8320a0e9b6a83e764e0b1d3bed9 WHIRLPOOL c1f814cd5c9e0e0e83a8690870bed6005f0e1aabfb6c62bf905cd093333e940aedc260d6a1547033c3e43e4014104dcdc301a5c959b5b8965f421849ac425140 DIST carbon-0.9.12.tar.gz 47450 SHA256 df4b521a449b888fc901d11abffc9e7eb070a8670e341caa0e13ab8f3029cddf SHA512 060b3d20cf2bd95be22fba30a24591361c772edaaaa99117616f4a01a31eab9395d84c5eb835408fac2c1bc36b70950e260d56456879489a9ee3248c6c4e3f33 WHIRLPOOL c6021492dc5ed3c9c4cefe173b1e0592b18e6c2d49e48cd74059c4d3822ea0b2cf253bedc9a67f7fa37dd8944e06835a1da959300e3c6e0f1759622b19b0c61e -DIST carbon-0.9.9.tar.gz 39813 SHA256 b3d42e3b93c09a82646168d7439e25cfc52143d77eba8a1f8ed45e415bb3b5cb SHA512 9768f25590a645ac648ee04fc71e0de4a882be1a8fdd2e15c2ada2bf6a6b1a2fe750dea6140b1dba5d65ee76a0c41a9e31a18d45a7826d484cca2b4cf7902619 WHIRLPOOL 29d54db219e0bf80e2d7b49c0a3e7bdbe12ecf4619f941806ab75b14204c79f5189537f5a835af49fdfd961d4493b6e9c6b176c0448df73e33a7e8a0c478d868 -EBUILD carbon-0.9.10-r1.ebuild 1370 SHA256 5cfa612f0be8161c2fc59f9a1e6dc1c260a0a932f55f5ff3595e5c91d453f88a SHA512 a36694d7e60f19bb60ecabbc82bc69565420628fb310f507b79f54cd42fe968da8f5b51ba94f70cf2d82b6246b1a2ddb18d0aa929e45f68b2dc693310b6f74ae WHIRLPOOL efd2b64744887a2ad41c2bd4ba5c57b89831495a0ccc95ecf8e5880579099b7c2d9c9c62b5f047ae9db83c4288755d385392e5b7f659dd6b0decb498c7387116 -EBUILD carbon-0.9.10.ebuild 1331 SHA256 d5fb40302d3fb6a73e7c7cc3ddb835be35788c6cab064d2c1a8698459ddd1ec7 SHA512 520fdaeb3e95de8d35aa33597a78ca18299c1e1c25e5e83f7c67f564dcc3441bd57e87e8db16e06f88371e53a5e925bb32919600fd5c0bd6e18e507c8e7b3196 WHIRLPOOL ca05c0112a0796a6793934a64fe42633918844d1acd56faef8e4dad9d2f9da52e298683ac786b8e72143bb9467a79e4289572fbf46afbd42b784704a754f0ef5 +DIST carbon-0.9.13.tar.gz 47509 SHA256 75aecd8114435430e06803ebaf1e9cac81f58fb231fc93d8904d667d971ae6cd SHA512 89c843ac67ed4b68c28273459e5a96594851e5d2694fdefdfb71cebcdc6555d4aac8c45c1c6d2ca61a15405bac7ba3d27836470fe152d5d7a4936bb2d00e6776 WHIRLPOOL 40000d912f3881dc4f197e1290d3e0fd092ec23bc6574a97fa31d0ffa77fa651abc4d4da529e45d88d74ea763f18cde20daf5fd70549d6afd38f4c5b88d1becb EBUILD carbon-0.9.12-r1.ebuild 1980 SHA256 ea9b975144d1b186bdc83ec1d6ce9ca83d83279c46a0e823126a43065239bbb5 SHA512 c82c33259e20c2b283be0d6eee81b7005b9f37897f9ca2ec681495d8105bb07472f25b01b424413161dee7dd144a39387b5aed92e962153bff562fb6117d34fc WHIRLPOOL 4d68037cca89d5eb2fab5e771c321f20ca5fb4e12de4d9bc10bb03b8976740437973f635d2b193eae06309f54f1dcdb4cfb0c3f6690caeaaede06285ee8de153 -EBUILD carbon-0.9.12.ebuild 1391 SHA256 208d16c7d93210cc051d11667f512e0a6e940b76731538d0f22bb4c6fd3782e2 SHA512 1025fa90f04beb068ac6ed98282a0e24207305cdbe429ad5e46550cd976455e761681636eb829a369b0d05790dffd20ea4ab5c2b5b4ffe43adac32da2e0b73a7 WHIRLPOOL dd964b5774c1a180fb4caaff931e3d22eddf431b05b5356177b4191d121be8a437d51a397ad091a65c8f76f3c53af366dbcad2c0355840cd18ca897d0066fefb -EBUILD carbon-0.9.9-r2.ebuild 727 SHA256 cec122b523e4166e19b1014ee3803491fae559aa366bf866785e606fab32add2 SHA512 7baa8c93a8ff233c9bd8c7e42293c7f5ac5c1cce536c3d35d5148763986e256779b532d038a3dc73f7367558cdc9688f6ea791d581913b069df689e46fc2cc0e WHIRLPOOL e8e2eb6850c3a837347f22eb3df3eb44bde1d3b4d5aa2f9f79fda5d271bf32adad864ca16f79592db6138a85a4fe4101e48bc9471a20f617b06b49105626dfd7 -MISC ChangeLog 1577 SHA256 dca991eba9eb3908877a38b237168984e658c6d9329caf37a173117565a3a05b SHA512 324dec353302fec300b48138e9e2180b2ec3e21e75f38ffbdda991994f1724dc61d1d5cf41c82b319613abec7b061a38aff7d5465b21d45ba6eb9a450632db2f WHIRLPOOL e6c567882d13dc1a774f81ee3ef34549023e54f3cc5080ebec5a66c03f0c6675eb9f0e08b2c84c5c052d571fbaa372a60db7d96906a785e11218cc43bb519057 +EBUILD carbon-0.9.13.ebuild 1961 SHA256 88884e3d75aa9322a8744ee13f2efff1d15c53737754b4fbf7e15934c6fc0d2d SHA512 96396bc9dd76d65da7f21fc90626063e988fcfa9c287b6128aeab05489de84ed29565df749eb1809d62cc2ce81df5e8ef66e715993229864ccc7bd15de93e023 WHIRLPOOL 02f665fc5a2cec8b29bd5df6915829271626bb87abed29f6ea1b0fa1c6c1cc9e4725247a486eda2ff684f4755fc3338e20cbd4d5644951cbae9a47d85e8bc6e9 +MISC ChangeLog 1794 SHA256 beb808cb482a1b8d10331cbe9ab0b656eb1bb7596d9bfd394acc59b10f8848ef SHA512 507d320866b3e9f186a8b6d5bdadd89fd14173c546d560b7246baf91e4bfca00cbaaa7eddf3aad7ea0e8df13574d74a0a4f74d1ef67fea46f8e3791133316abd WHIRLPOOL 400cc9de102d97baa7eabe728e15c8b78f5eb50a1399005dff35a291fa2be01c23179c38c0899cedb75d3c87037c8b7d9164f71e99e74834db689df9d55a49dc MISC metadata.xml 234 SHA256 9b781d9e32a98333895dc005648643f5355d04bdd8cf7c7d05c1659b050ccc1c SHA512 73cf93f1f60626cef0eb052ce9be4ec3ebd2b0eb9ca4fbdee5e0e79312100983dfa4b03da2f67a737fab381f7524af74ac602a0e8bbfd7278cfbc5a557276898 WHIRLPOOL df20df5cb0411c10dec6733216839ca73dc0db4be703c2f7250a5db710082cf9a4de3b9aaa1833d50a834e0a4cef260b30094e671e54919d024cc456c726005b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iF4EAREIAAYFAlME234ACgkQKiQSS7ZY+hNsbwEAhjVTiG097pwF3OpVc4NtnNpD -9We2+Hlae1aTZRmb6GYA/3TNCatvvvqbmr4donNsTD0mQy6Lk9l0q2p9n5oQuyAl -=wo8P +iEYEAREIAAYFAlSruQwACgkQso7CE7gHKw2OTACcDXvVBiYCdFdGt9hXB0LMDsQh +tCEAoKcEHC9P1FmhxAVCC8AlPakCuGZF +=MzGX -----END PGP SIGNATURE----- diff --git a/dev-python/carbon/carbon-0.9.10-r1.ebuild b/dev-python/carbon/carbon-0.9.10-r1.ebuild deleted file mode 100644 index 81938e887a9b..000000000000 --- a/dev-python/carbon/carbon-0.9.10-r1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.10-r1.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $ - -EAPI=5 - -PYTHON_COMPAT=( python{2_6,2_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="${DEPEND} - dev-python/twisted-core - 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}"/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} -} - -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).' -} diff --git a/dev-python/carbon/carbon-0.9.10.ebuild b/dev-python/carbon/carbon-0.9.10.ebuild deleted file mode 100644 index e0f9a7f5af13..000000000000 --- a/dev-python/carbon/carbon-0.9.10.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.10.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $ - -EAPI="4" - -PYTHON_DEPEND="2" -RESTRICT_PYTHON_ABIS="3.*" -SUPPORT_PYTHON_ABIS="1" -inherit distutils eutils - -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" - -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - dev-python/twisted-core - dev-python/whisper - dev-python/txAMQP" - -src_prepare() { - # This sets prefix to /opt/graphite. We want FHS-style paths instead. - rm setup.cfg || die - # Do not install the configuration and data files. We install them - #somewhere sensible by hand. - epatch "${FILESDIR}/no-data-files.patch" - - distutils_src_prepare -} - -src_install() { - distutils_src_install - - insinto /etc/carbon - doins conf/* - - dodir /var/log/carbon /var/lib/carbon/{whisper,lists,rrd} -} - -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).' -} diff --git a/dev-python/carbon/carbon-0.9.12.ebuild b/dev-python/carbon/carbon-0.9.13.ebuild similarity index 60% rename from dev-python/carbon/carbon-0.9.12.ebuild rename to dev-python/carbon/carbon-0.9.13.ebuild index d71d4eacd610..2aa15c3e84e5 100644 --- a/dev-python/carbon/carbon-0.9.12.ebuild +++ b/dev-python/carbon/carbon-0.9.13.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.12.ebuild,v 1.1 2014/01/26 04:35:05 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.13.ebuild,v 1.1 2015/01/06 10:29:15 idella4 Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7} ) +PYTHON_COMPAT=( python2_7 ) inherit distutils-r1 @@ -18,15 +18,15 @@ KEYWORDS="~amd64 ~x86" IUSE="" DEPEND="" -RDEPEND="${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}"/${P}-no-data-files.patch + # somewhere sensible by hand. + "${FILESDIR}"/${PN}-0.9.12-no-data-files.patch ) python_prepare_all() { @@ -42,6 +42,14 @@ python_install_all() { 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() { @@ -49,4 +57,9 @@ pkg_postinst() { 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.9-r2.ebuild b/dev-python/carbon/carbon-0.9.9-r2.ebuild deleted file mode 100644 index 721e6aad8990..000000000000 --- a/dev-python/carbon/carbon-0.9.9-r2.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/carbon/carbon-0.9.9-r2.ebuild,v 1.2 2013/08/03 09:45:48 mgorny Exp $ - -EAPI="3" - -PYTHON_DEPEND="2" -RESTRICT_PYTHON_ABIS="3.*" - -inherit python distutils - -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" - -LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~x86" -SLOT="0" -IUSE="" - -DEPEND="" -RDEPEND="${DEPEND} - dev-python/twisted-core - dev-python/txAMQP" - -src_prepare() { - sed -i -e "s:/opt/graphite:$(python_get_sitedir):" setup.cfg || die "Failed to fix install location" - -} -- 2.26.2