summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/py-rrdtool/ChangeLog9
-rw-r--r--dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild11
-rw-r--r--dev-python/py-rrdtool/py-rrdtool-1.0_beta1.ebuild12
3 files changed, 20 insertions, 12 deletions
diff --git a/dev-python/py-rrdtool/ChangeLog b/dev-python/py-rrdtool/ChangeLog
index e56edbd17830..42864035878d 100644
--- a/dev-python/py-rrdtool/ChangeLog
+++ b/dev-python/py-rrdtool/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for dev-python/py-rrdtool
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/ChangeLog,v 1.15 2007/11/24 09:47:35 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/ChangeLog,v 1.16 2009/02/18 14:53:20 pva Exp $
+
+ 18 Feb 2009; Peter Volkov <pva@gentoo.org> py-rrdtool-0.2.1-r1.ebuild,
+ py-rrdtool-1.0_beta1.ebuild:
+ Fixed collision with rrdtool by requiring it to be build without python
+ bindings.
24 Nov 2007; Samuli Suominen <drac@gentoo.org>
py-rrdtool-1.0_beta1.ebuild:
diff --git a/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild b/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild
index 73c329632250..d3a4682dd7b6 100644
--- a/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild
+++ b/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild,v 1.7 2006/11/20 19:31:53 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/py-rrdtool-0.2.1-r1.ebuild,v 1.8 2009/02/18 14:53:20 pva Exp $
+EAPI="2"
inherit eutils distutils
-IUSE=""
DESCRIPTION="Python wrapper for RRDtool"
SRC_URI="mirror://sourceforge/py-rrdtool/${P}.tar.gz"
HOMEPAGE="http://sourceforge.net/projects/py-rrdtool/"
@@ -12,12 +12,13 @@ HOMEPAGE="http://sourceforge.net/projects/py-rrdtool/"
KEYWORDS="~ia64 ppc x86"
LICENSE="LGPL-2.1"
SLOT="0"
+IUSE=""
DEPEND="virtual/python
- >=net-analyzer/rrdtool-1.2"
+ >=net-analyzer/rrdtool-1.2[-python]"
src_unpack() {
unpack ${A}
cd "${S}"
- epatch ${FILESDIR}/${PN}-rrdtool12.patch
+ epatch "${FILESDIR}/${PN}-rrdtool12.patch"
}
diff --git a/dev-python/py-rrdtool/py-rrdtool-1.0_beta1.ebuild b/dev-python/py-rrdtool/py-rrdtool-1.0_beta1.ebuild
index 94a9bd8a0579..ea6ced7260f3 100644
--- a/dev-python/py-rrdtool/py-rrdtool-1.0_beta1.ebuild
+++ b/dev-python/py-rrdtool/py-rrdtool-1.0_beta1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/py-rrdtool-1.0_beta1.ebuild,v 1.2 2007/11/24 09:47:35 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py-rrdtool/py-rrdtool-1.0_beta1.ebuild,v 1.3 2009/02/18 14:53:20 pva Exp $
-inherit eutils distutils
+EAPI="2"
+inherit distutils
-IUSE=""
DESCRIPTION="Python wrapper for RRDtool"
SRC_URI="mirror://sourceforge/py-rrdtool/${P/_beta/b}.tar.gz"
HOMEPAGE="http://sourceforge.net/projects/py-rrdtool/"
@@ -12,8 +12,10 @@ HOMEPAGE="http://sourceforge.net/projects/py-rrdtool/"
KEYWORDS="~amd64 ~ia64 ~ppc ~x86"
LICENSE="LGPL-2.1"
SLOT="0"
+IUSE=""
DEPEND="virtual/python
- >=net-analyzer/rrdtool-1.2"
+ >=net-analyzer/rrdtool-1.2[-python]"
+RDEPEND="${DEPEND}"
S=${WORKDIR}/${P/_beta/b}