<@ 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.

Package-Manager: portage-2.2.00.15842-prefix/cvs/Darwin powerpc

4 files changed, 11 insertions, 51 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/Manifest b/dev-python/gnuplot-py/Manifest
index a6967341579c..b625b6ab455f 100644
--- a/dev-python/gnuplot-py/Manifest
+++ b/dev-python/gnuplot-py/Manifest
@@ -3,7 +3,6 @@ AUX gnuplot-py-1.7-numpy.patch 19184 RMD160 dd9c1749025afae0e2956fddc905d493dcc7
 DIST gnuplot-py-1.7.tar.gz 107278 RMD160 0d0f465f0dad0e3ff35f6bdea5fc6ea9ab1b245f SHA1 363bf3db4b4c523f62725932f1ec6c1e9fa8c58e SHA256 78e8716324b654337801fd68212cc2184a81313421086df301718c19bb49e216
 DIST gnuplot-py-1.8.tar.gz 118828 RMD160 0a06385a38e8b34d60d95e37b5d0a13dc682d520 SHA1 1fab2850cd1881f4ede1f7978a8746af2aff9bb2 SHA256 ab339be7847d30a8acfd616f27b5021bfde0999b7bf2d68400fbe62c53106e21
 EBUILD gnuplot-py-1.7-r2.ebuild 844 RMD160 ed64bb05fb4fe989c377a9405f0cba5dbbdf63fc SHA1 e39b56e9e99bf9b64b884f18cee0b2c76ac1e68b SHA256 0901e33ac27b5fb25ae91286d3020a63434998c60e0ae5be8611b4177f6ee266
-EBUILD gnuplot-py-1.8-r1.ebuild 1105 RMD160 195960357627bc7fe1e35fc20671884ecfc464e5 SHA1 1ab3a0aa54ae92bd1da0b144201c0146ef2f32aa SHA256 8ebafce97e18cdccf9f1a7509c3e59a5353f12dbf254338853840fc858a44671
-EBUILD gnuplot-py-1.8.ebuild 1034 RMD160 eb4971b4721a8e0b8083dc60ed40acacd7e9cd26 SHA1 bdadf4352f33188e225400354a2cef9451924996 SHA256 9d72b566bfa7ee0ac2d66f555a14ca3bfb49c59634ee12efd0933921baf50dfb
-MISC ChangeLog 5116 RMD160 1bb30e0ce69958f818d989a4ccf7a4d145b9cff9 SHA1 facf9bc9a6b5c28bd16ec5f3f5ca4e4cbb0b338f SHA256 f78ffc61dd5e2d4ffd33116f16f34f30215e9fe6a3947397b7e4453f980c9257
+EBUILD gnuplot-py-1.8.ebuild 1097 RMD160 c6054aa9790836f6a1dc516124200f4ece903e7e SHA1 be37238e1fa8820c18a4c0b3f1f7d1c078428093 SHA256 c53bb1724759fa111b713044bceea43001750984656e3139f2d0e855e81580e2
+MISC ChangeLog 5074 RMD160 5ea555a97b822015abc2bf174e5da527d2631d50 SHA1 d245b405799afcbf0a293fa2694af81627d840d6 SHA256 80ec3644b889183b4d1130cc906ebfbc647bc8fc50c7ea614e69830bf989b71a
 MISC metadata.xml 740 RMD160 0a10c200c1ff9c0d0933aba44870d76cc02b7c86 SHA1 0222edc096aee9a26f6eb3b63b9e716386ebfd0e SHA256 a4f5934cccff443ec949e965bf392f64382217212100229bfb1e0ec3973d90b5
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"