grobian 15/08/03 17:59:54 Modified: diamond-9999.ebuild diamond-4.0-r1.ebuild ChangeLog Log: Pull in fixes for psutil-3 usage, useful on non-Linux only (Portage version: 2.2.20-prefix/cvs/SunOS i386, signed Manifest commit with key 0x5F75F607C5C74E89)
Revision Changes Path 1.6 app-admin/diamond/diamond-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/diamond-9999.ebuild?rev=1.6&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/diamond-9999.ebuild?rev=1.6&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/diamond-9999.ebuild?r1=1.5&r2=1.6 Index: diamond-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-9999.ebuild,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- diamond-9999.ebuild 29 Jul 2015 19:18:33 -0000 1.5 +++ diamond-9999.ebuild 3 Aug 2015 17:59:54 -0000 1.6 @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.5 2015/07/29 19:18:33 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-9999.ebuild,v 1.6 2015/08/03 17:59:54 grobian Exp $ EAPI=5 @@ -30,7 +30,8 @@ mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) - redis? ( dev-python/redis-py )" + redis? ( dev-python/redis-py ) + !kernel_linux? ( >=dev-python/psutil-3 )" DEPEND="${RDEPEND} test? ( dev-python/mock )" 1.4 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.4&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild?rev=1.4&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild?r1=1.3&r2=1.4 Index: diamond-4.0-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- diamond-4.0-r1.ebuild 29 Jul 2015 19:18:33 -0000 1.3 +++ diamond-4.0-r1.ebuild 3 Aug 2015 17:59:54 -0000 1.4 @@ -1,6 +1,6 @@ # 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.3 2015/07/29 19:18:33 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/diamond-4.0-r1.ebuild,v 1.4 2015/08/03 17:59:54 grobian Exp $ EAPI=5 @@ -16,7 +16,7 @@ PYTHON_COMPAT=( python2_7 ) -inherit distutils-r1 +inherit distutils-r1 eutils DESCRIPTION="Python daemon that collects and publishes system metrics" HOMEPAGE="https://github.com/python-diamond/Diamond"; @@ -30,7 +30,8 @@ mongo? ( dev-python/pymongo ) mysql? ( dev-python/mysql-python ) snmp? ( dev-python/pysnmp ) - redis? ( dev-python/redis-py )" + redis? ( dev-python/redis-py ) + !kernel_linux? ( >=dev-python/psutil-3 )" DEPEND="${RDEPEND} test? ( dev-python/mock )" @@ -49,6 +50,8 @@ src/diamond/utils/classes.py \ || die + epatch "${FILESDIR}"/${P}-psutil.patch + distutils-r1_src_prepare } 1.10 app-admin/diamond/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/ChangeLog?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/ChangeLog?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-admin/diamond/ChangeLog?r1=1.9&r2=1.10 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ChangeLog 29 Jul 2015 19:18:33 -0000 1.9 +++ ChangeLog 3 Aug 2015 17:59:54 -0000 1.10 @@ -1,6 +1,10 @@ # 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.9 2015/07/29 19:18:33 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/diamond/ChangeLog,v 1.10 2015/08/03 17:59:54 grobian Exp $ + + 03 Aug 2015; Fabian Groffen <grob...@gentoo.org> + +files/diamond-4.0-psutil.patch, diamond-4.0-r1.ebuild, diamond-9999.ebuild: + Pull in fixes for psutil-3 usage, useful on non-Linux only 29 Jul 2015; Fabian Groffen <grob...@gentoo.org> diamond-4.0-r1.ebuild, diamond-9999.ebuild:
