Cleanup, getting ready for stabilization, ppc64 went for ~ppc64 because of gnuplot

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 29 insertions, 23 deletions

diff --git a/dev-python/gnuplot-py/ChangeLog b/dev-python/gnuplot-py/ChangeLog
index 71cfb00e137b..cb57a85bcb44 100644
--- a/dev-python/gnuplot-py/ChangeLog
+++ b/dev-python/gnuplot-py/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/gnuplot-py
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/ChangeLog,v 1.30 2008/10/06 16:10:39 hawking Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/ChangeLog,v 1.31 2009/02/26 10:17:50 bicatali Exp $
+
+  26 Feb 2009; Sébastien Fabbro <bicatali@gentoo.org>
+  gnuplot-py-1.7-r2.ebuild, gnuplot-py-1.8.ebuild:
+  Cleanup, getting ready for stabilization, ppc64 went for ~ppc64 because of
+  gnuplot
 
   06 Oct 2008; Ali Polatel <hawking@gentoo.org> gnuplot-py-1.7-r2.ebuild,
   gnuplot-py-1.8.ebuild:
diff --git a/dev-python/gnuplot-py/Manifest b/dev-python/gnuplot-py/Manifest
index d19256da1d83..be71868eeb4b 100644
--- a/dev-python/gnuplot-py/Manifest
+++ b/dev-python/gnuplot-py/Manifest
@@ -5,14 +5,14 @@ AUX gnuplot-py-1.7-mousesupport.patch 2596 RMD160 6f0ecce4c488a505c26f9d4bb558d6
 AUX gnuplot-py-1.7-numpy.patch 19184 RMD160 dd9c1749025afae0e2956fddc905d493dcc752a8 SHA1 3f01479d1f726110ff29abfd624b2a982b3d5720 SHA256 62765d98bdbf75607e3121a6d39aea0c22512bd255fd25cd043b86d1fe29a580
 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 841 RMD160 6e99d20c6aad77b98c433776a1706713f7604373 SHA1 d5bf92a3aab732a3ff70ba8741584a4abac1c6c7 SHA256 0b60921d8921137f5108f1e54b5311b0a068bd48fc136393b1fdb8d61fba198d
-EBUILD gnuplot-py-1.8.ebuild 900 RMD160 af3859a62e53190b94e8d3aaab6ca50880c2c045 SHA1 ca82a1fecbff9ea6df8b627758fb3d7ee578548a SHA256 319fbcb76ff4509aac94b54abc70544a491dfaf159c7d5ccf441e036132eb338
-MISC ChangeLog 4069 RMD160 be9b9db5e7f2fd2977b0a33502126279bb0865dc SHA1 d456178e5c24acca885168d4cbbcb6ee8be29103 SHA256 686522b46289e03e304a64946c215364c5b05d647607087af799a4b620e10fb3
+EBUILD gnuplot-py-1.7-r2.ebuild 844 RMD160 ed64bb05fb4fe989c377a9405f0cba5dbbdf63fc SHA1 e39b56e9e99bf9b64b884f18cee0b2c76ac1e68b SHA256 0901e33ac27b5fb25ae91286d3020a63434998c60e0ae5be8611b4177f6ee266
+EBUILD gnuplot-py-1.8.ebuild 1042 RMD160 be74e76e1df8f61414cf514e7c82d2388e00623b SHA1 c14ea081f43cbcf4e65f0f9a9b6fa8345aba2a02 SHA256 cb2e1d5cd54587760e367ba985b8671b7a81f4104ce1725d7a481acb97bddd8f
+MISC ChangeLog 4264 RMD160 52758faa01828c3ce7d24d6a0c611815bdb10db0 SHA1 70adf74b17f9800f79ed279786f912641c908b32 SHA256 e4a3a9b885de69895a09603ff8b2f3098569999ec014aa90f4d3f9a1713923d5
 MISC metadata.xml 740 RMD160 0a10c200c1ff9c0d0933aba44870d76cc02b7c86 SHA1 0222edc096aee9a26f6eb3b63b9e716386ebfd0e SHA256 a4f5934cccff443ec949e965bf392f64382217212100229bfb1e0ec3973d90b5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.10 (GNU/Linux)
 
-iEYEARECAAYFAkk8I/sACgkQ67wieSYcaxdQkwCg4b5Ag1pmWjc6v7qGN86wmuoE
-zRUAoOwlmZXMExulkmof9rM7vuH1YevC
-=VUfe
+iEYEARECAAYFAkmmbFoACgkQ1ycZbhPLE2CL3QCfVize7YhPwNFr43UD5sdCzVfU
+wgcAmweFDW/Ix0I1tWXnrEklECclF2jF
+=/bV6
 -----END PGP SIGNATURE-----
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.7-r2.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.7-r2.ebuild
index 31e41577682c..ac7a43b0d517 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.7-r2.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.7-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2008 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/gnuplot-py/gnuplot-py-1.7-r2.ebuild,v 1.10 2008/12/07 19:28:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.7-r2.ebuild,v 1.11 2009/02/26 10:17:50 bicatali Exp $
 
 inherit distutils eutils
 
@@ -10,7 +10,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"
 IUSE=""
 
 DEPEND="virtual/python
diff --git a/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild b/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild
index b2ad448a7166..de16daf3456a 100644
--- a/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild
+++ b/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2008 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/gnuplot-py/gnuplot-py-1.8.ebuild,v 1.3 2008/12/07 19:28:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gnuplot-py/gnuplot-py-1.8.ebuild,v 1.4 2009/02/26 10:17:50 bicatali Exp $
 
+EAPI=2
 inherit distutils eutils
 
 DESCRIPTION="A python wrapper for Gnuplot"
@@ -13,22 +14,22 @@ SLOT="0"
 KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd"
 IUSE="doc"
 
-DEPEND="virtual/python
-	dev-python/numpy"
-RDEPEND="sci-visualization/gnuplot
-	${DEPEND}"
+DEPEND="dev-python/numpy"
+RDEPEND="${DEPEND}
+	sci-visualization/gnuplot"
 
 PYTHON_MODNAME="Gnuplot"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/${PN}-1.7-mousesupport.patch"
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7-mousesupport.patch
 }
 
 src_install() {
 	distutils_src_install
-	dodoc {ANNOUNCE,CREDITS,NEWS,TODO,FAQ}.txt
+	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
 	if use doc; then
 		insinto /usr/share/doc/${PF}/html
 		doins -r doc/Gnuplot/* || die "doc install failed"