| 1 |
grobian 15/03/04 19:57:48 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: diamond-4.0-r1.ebuild |
| 5 |
Removed: diamond-4.0.ebuild |
| 6 |
Log: |
| 7 |
Fix handlers seemingly ignoring their config |
| 8 |
|
| 9 |
(Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.5 app-admin/diamond/ChangeLog |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/ChangeLog?rev=1.5&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/ChangeLog?rev=1.5&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/ChangeLog?r1=1.4&r2=1.5 |
| 17 |
|
| 18 |
Index: ChangeLog |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v |
| 21 |
retrieving revision 1.4 |
| 22 |
retrieving revision 1.5 |
| 23 |
diff -u -r1.4 -r1.5 |
| 24 |
--- ChangeLog 2 Mar 2015 13:19:23 -0000 1.4 |
| 25 |
+++ ChangeLog 4 Mar 2015 19:57:48 -0000 1.5 |
| 26 |
@@ -1,6 +1,12 @@ |
| 27 |
# ChangeLog for app-admin/diamond |
| 28 |
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.4 2015/03/02 13:19:23 grobian Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.5 2015/03/04 19:57:48 grobian Exp $ |
| 31 |
+ |
| 32 |
+*diamond-4.0-r1 (04 Mar 2015) |
| 33 |
+ |
| 34 |
+ 04 Mar 2015; Fabian Groffen <grobian@g.o> +diamond-4.0-r1.ebuild, |
| 35 |
+ -diamond-4.0.ebuild: |
| 36 |
+ Fix handlers seemingly ignoring their config |
| 37 |
|
| 38 |
02 Mar 2015; Fabian Groffen <grobian@g.o> diamond-4.0.ebuild, |
| 39 |
diamond-9999.ebuild: |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 app-admin/diamond/diamond-4.0-r1.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: diamond-4.0-r1.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2015 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild,v 1.1 2015/03/04 19:57:48 grobian Exp $ |
| 53 |
|
| 54 |
EAPI=5 |
| 55 |
|
| 56 |
if [[ ${PV} = 9999* ]]; then |
| 57 |
inherit git-r3 |
| 58 |
EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git" |
| 59 |
S=${WORKDIR}/diamond-${PV} |
| 60 |
else |
| 61 |
SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz" |
| 62 |
KEYWORDS="~x86 ~amd64" |
| 63 |
S=${WORKDIR}/Diamond-${PV} |
| 64 |
fi |
| 65 |
|
| 66 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
| 67 |
|
| 68 |
inherit distutils-r1 |
| 69 |
|
| 70 |
DESCRIPTION="Python daemon that collects and publishes system metrics" |
| 71 |
HOMEPAGE="https://github.com/python-diamond/Diamond" |
| 72 |
|
| 73 |
LICENSE="MIT" |
| 74 |
SLOT="0" |
| 75 |
IUSE="test mongo mysql snmp redis" |
| 76 |
|
| 77 |
RDEPEND="dev-python/configobj |
| 78 |
dev-python/setproctitle |
| 79 |
mongo? ( dev-python/pymongo ) |
| 80 |
mysql? ( dev-python/mysql-python ) |
| 81 |
snmp? ( dev-python/pysnmp ) |
| 82 |
redis? ( dev-python/redis-py )" |
| 83 |
DEPEND="${RDEPEND} |
| 84 |
test? ( dev-python/mock )" |
| 85 |
|
| 86 |
src_prepare() { |
| 87 |
# adjust for Prefix |
| 88 |
sed -i \ |
| 89 |
-e '/default="\/etc\/diamond\/diamond.conf"/s:=":="'"${EPREFIX}"':' \ |
| 90 |
bin/diamond* \ |
| 91 |
|| die |
| 92 |
|
| 93 |
# fix necessary to make handlers honour their config, simple sed |
| 94 |
# doing the same as upstream |
| 95 |
# https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch |
| 96 |
sed -i \ |
| 97 |
-e '/cls_name =/s/\.__class__//' \ |
| 98 |
src/diamond/utils/classes.py \ |
| 99 |
|| die |
| 100 |
|
| 101 |
distutils-r1_src_prepare |
| 102 |
} |
| 103 |
|
| 104 |
python_test() { |
| 105 |
"${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" |
| 106 |
} |
| 107 |
|
| 108 |
python_install() { |
| 109 |
export VIRTUAL_ENV=1 |
| 110 |
distutils-r1_python_install |
| 111 |
mv "${ED}"/usr/etc "${ED}"/ || die |
| 112 |
rm "${ED}"/etc/diamond/*.windows # won't need these |
| 113 |
sed -i \ |
| 114 |
-e '/pid_file =/s:/var/run:/run:' \ |
| 115 |
"${ED}"/etc/diamond/diamond.conf.example || die |
| 116 |
} |
| 117 |
|
| 118 |
src_install() { |
| 119 |
distutils-r1_src_install |
| 120 |
newinitd "${FILESDIR}"/${PN}.initd ${PN} |
| 121 |
newconfd "${FILESDIR}"/${PN}.confd ${PN} |
| 122 |
keepdir /var/log/diamond |
| 123 |
} |
Archives