grobian 15/03/04 19:57:48 Modified: ChangeLog Added: diamond-4.0-r1.ebuild Removed: diamond-4.0.ebuild Log: Fix handlers seemingly ignoring their config (Portage version: 2.2.14-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path 1.5 app-admin/diamond/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/ChangeLog?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/ChangeLog?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/ChangeLog?r1=1.4&r2=1.5 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- ChangeLog 2 Mar 2015 13:19:23 -0000 1.4 +++ ChangeLog 4 Mar 2015 19:57:48 -0000 1.5 @@ -1,6 +1,12 @@ # ChangeLog for app-admin/diamond # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.4 2015/03/02 13:19:23 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.5 2015/03/04 19:57:48 grobian Exp $ + +*diamond-4.0-r1 (04 Mar 2015) + + 04 Mar 2015; Fabian Groffen <[email protected]> +diamond-4.0-r1.ebuild, + -diamond-4.0.ebuild: + Fix handlers seemingly ignoring their config 02 Mar 2015; Fabian Groffen <[email protected]> diamond-4.0.ebuild, diamond-9999.ebuild: 1.1 app-admin/diamond/diamond-4.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild?rev=1.1&content-type=text/plain Index: diamond-4.0-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild,v 1.1 2015/03/04 19:57:48 grobian Exp $ EAPI=5 if [[ ${PV} = 9999* ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/python-diamond/Diamond.git"; S=${WORKDIR}/diamond-${PV} else SRC_URI="https://github.com/python-diamond/Diamond/archive/v${PV}.tar.gz -> python-diamond-${PV}.tar.gz" KEYWORDS="~x86 ~amd64" S=${WORKDIR}/Diamond-${PV} fi PYTHON_COMPAT=( python{2_6,2_7} ) inherit distutils-r1 DESCRIPTION="Python daemon that collects and publishes system metrics" HOMEPAGE="https://github.com/python-diamond/Diamond"; LICENSE="MIT" SLOT="0" IUSE="test mongo mysql snmp redis" RDEPEND="dev-python/configobj dev-python/setproctitle mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) redis? ( dev-python/redis-py )" DEPEND="${RDEPEND} test? ( dev-python/mock )" src_prepare() { # adjust for Prefix sed -i \ -e '/default="\/etc\/diamond\/diamond.conf"/s:=":="'"${EPREFIX}"':' \ bin/diamond* \ || die # fix necessary to make handlers honour their config, simple sed # doing the same as upstream # https://github.com/python-diamond/Diamond/commit/3cb29eedd117d2e4146823a5c5811d16cc77206a.patch sed -i \ -e '/cls_name =/s/\.__class__//' \ src/diamond/utils/classes.py \ || die distutils-r1_src_prepare } python_test() { "${PYTHON}" ./test.py || die "Tests fail with ${PYTHON}" } python_install() { export VIRTUAL_ENV=1 distutils-r1_python_install mv "${ED}"/usr/etc "${ED}"/ || die rm "${ED}"/etc/diamond/*.windows # won't need these sed -i \ -e '/pid_file =/s:/var/run:/run:' \ "${ED}"/etc/diamond/diamond.conf.example || die } src_install() { distutils-r1_src_install newinitd "${FILESDIR}"/${PN}.initd ${PN} newconfd "${FILESDIR}"/${PN}.confd ${PN} keepdir /var/log/diamond }
