<@ Arfrever> grobian: Please merge changes from gnuplot-py-1.8-r1.ebuild to gnuplot-py-1.8.ebuild and remove gnuplot-py-1.8-r1.ebuild.

(Portage version: 2.2.00.15842-prefix/cvs/Darwin powerpc)

3 files changed, 9 insertions, 48 deletions

diff --git a/dev-python/gnuplot-py/ChangeLog b/dev-python/gnuplot-py/ChangeLog
index bd73e5dbc139..bd3ca7657148 100644
--- a/dev-python/gnuplot-py/ChangeLog
+++ b/dev-python/gnuplot-py/ChangeLog
@@ -1,12 +1,10 @@
 # ChangeLog for dev-python/gnuplot-py
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/ChangeLog,v 1.39 2010/04/30 15:19:46 grobian Exp $
-
-*gnuplot-py-1.8-r1 (30 Apr 2010)
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/ChangeLog,v 1.40 2010/04/30 17:21:04 grobian Exp $
 
   30 Apr 2010; Fabian Groffen <grobian@gentoo.org>
-  +gnuplot-py-1.8-r1.ebuild:
-  Revbump for EAPI=3, added Prefix keywords
+  gnuplot-py-1.8.ebuild:
+  Bump to EAPI=3, added Prefix keywords
 
   20 Mar 2009; Brent Baude <ranger@gentoo.org> ChangeLog:
   stable ppc, bug 259444
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
deleted file mode 100644
index f7311f0358f1..000000000000
--- a/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.8-r1.ebuild,v 1.1 2010/04/30 15:19:46 grobian Exp $
-
-EAPI="3"
-inherit distutils eutils
-
-DESCRIPTION="A python wrapper for Gnuplot"
-HOMEPAGE="http://gnuplot-py.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-IUSE="doc"
-
-DEPEND="dev-python/numpy"
-RDEPEND="${DEPEND}
-	sci-visualization/gnuplot"
-
-PYTHON_MODNAME="Gnuplot"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7-mousesupport.patch
-}
-
-src_install() {
-	distutils_src_install
-	dodoc ANNOUNCE.txt CREDITS.txt NEWS.txt TODO.txt FAQ.txt
-	dodir /usr/share/doc/${PF}/examples
-	mv "${ED}"/usr/$(get_libdir)/python*/site-packages/Gnuplot/{test,demo}.py \
-		"${ED}"/usr/share/doc/${PF}/examples || die
-	if use doc; then
-		insinto /usr/share/doc/${PF}/html
-		doins -r doc/Gnuplot/* || die "doc install failed"
-	fi
-}
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild
index 8870efe5f805..bdadb357aed8 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild,v 1.9 2009/03/20 13:37:52 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild,v 1.10 2010/04/30 17:21:04 grobian Exp $
 
-EAPI=2
+EAPI="3"
 inherit distutils eutils
 
 DESCRIPTION="A python wrapper for Gnuplot"
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ia64 ppc ppc64 s390 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 IUSE="doc"
 
 DEPEND="dev-python/numpy"
@@ -28,8 +28,8 @@ src_install() {
 	distutils_src_install
 	dodoc ANNOUNCE.txt CREDITS.txt NEWS.txt TODO.txt FAQ.txt
 	dodir /usr/share/doc/${PF}/examples
-	mv "${D}"/usr/$(get_libdir)/python*/site-packages/Gnuplot/{test,demo}.py \
-		"${D}"/usr/share/doc/${PF}/examples || die
+	mv "${ED}"/usr/$(get_libdir)/python*/site-packages/Gnuplot/{test,demo}.py \
+		"${ED}"/usr/share/doc/${PF}/examples || die
 	if use doc; then
 		insinto /usr/share/doc/${PF}/html
 		doins -r doc/Gnuplot/* || die "doc install failed"