(#138631) Bump.

Package-Manager: portage-2.1.2_pre1

5 files changed, 209 insertions, 15 deletions

diff --git a/dev-python/pyx/ChangeLog b/dev-python/pyx/ChangeLog
index bfa31c2b2d5a..d9134cade260 100644
--- a/dev-python/pyx/ChangeLog
+++ b/dev-python/pyx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyx
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.17 2006/08/04 13:41:59 nigoro Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.18 2006/09/24 02:03:36 dberkholz Exp $
+
+*pyx-0.9 (24 Sep 2006)
+
+  24 Sep 2006; Donnie Berkholz <dberkholz@gentoo.org>; +files/pyx-0.9.patch,
+  +pyx-0.9.ebuild:
+  (#138631) Bump.
 
   04 Aug 2006; Yuta SATOH <nigoro@gentoo.org> pyx-0.8.1.ebuild:
   added ~ppc64, bug #142741
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 17170704e1bb..1053be2f51b6 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX pyx-0.7.1.patch 3768 RMD160 89cc0129c4edf0b257685633ccad2afb8ac1db61 SHA1 4ddd44cdeb45789d8aa14f50024c2a2b4bc8ce69 SHA256 2af5541e3a86d80f10b160819a7fbd03171c5c7ca88fa887ce1e78ab1c0ceff7
 MD5 1e8ad4caf14ac87fdda7709c2d3330df files/pyx-0.7.1.patch 3768
 RMD160 89cc0129c4edf0b257685633ccad2afb8ac1db61 files/pyx-0.7.1.patch 3768
@@ -9,10 +6,15 @@ AUX pyx-0.8.1.patch 7431 RMD160 3917be17202085c222867178086794a7bc33d10e SHA1 72
 MD5 5fd2d4c28b2be8d5b4c3cd64fc1774a6 files/pyx-0.8.1.patch 7431
 RMD160 3917be17202085c222867178086794a7bc33d10e files/pyx-0.8.1.patch 7431
 SHA256 246bd0a5d0a3705454e5bdc7e15ab80b9f848f6064a28574eb3ca9c100bb8a37 files/pyx-0.8.1.patch 7431
+AUX pyx-0.9.patch 5613 RMD160 6d27953bac2d88f5fc2b3647f458d6d84fe4e50b SHA1 1ca5e717ca349723ecd714a3cbbde47907c1cdbf SHA256 d529acfc9f35b7b501064e31a036b7f3fbe37745d65c6ab1e00c2ac44f92de69
+MD5 f3ca38843a083d58d2da162148ee2b4c files/pyx-0.9.patch 5613
+RMD160 6d27953bac2d88f5fc2b3647f458d6d84fe4e50b files/pyx-0.9.patch 5613
+SHA256 d529acfc9f35b7b501064e31a036b7f3fbe37745d65c6ab1e00c2ac44f92de69 files/pyx-0.9.patch 5613
 DIST PyX-0.6.1.tar.gz 998392 RMD160 99900450353c0ccb1ec53b778a700877df51215a SHA1 98a731d781053283b26806d3434e5c03c62bb861 SHA256 051aaf670c3b73e93b137369c0a3cb08abae452713ecb79f4f0708816e50268d
 DIST PyX-0.6.3.tar.gz 1323242 RMD160 c7bf85dfa4cb9a4ab1b3e328be53b0586e6973dd SHA1 393b2adf7ee4ad9be36642a25ed952b23408e294 SHA256 c34836fe74761bcc4cb48764974e1c68339096b89764449c849245103d15356d
 DIST PyX-0.7.1.tar.gz 278059 RMD160 52c7b44a5d3495368452156a796c352fac7c26b1 SHA1 55b35f0eca4a1ce1d86880b52099321cbb2cebf9 SHA256 1b0763d0650d7ddb8c029d90704889afe0d799ee91053773159cf4b2bdb5b992
 DIST PyX-0.8.1.tar.gz 335245 RMD160 58516fb366d84cca2aa23a2d97a5e902e895f8bb SHA1 ae6c030b43cd160a9e7233ad871fd2f54e4eb738 SHA256 f68c98ca24961172341cbea349fddbccdbc9019be65b1f95b00b12a852fc3a8a
+DIST PyX-0.9.tar.gz 351451 RMD160 095148e1cf5af028724ba3abf52794741e72d084 SHA1 79daf941f0ad36126471567879aaf6f94d21ccc4 SHA256 01430a4216350febb438e6520665cdcb11202db8ce879691844fe7f696952fec
 EBUILD pyx-0.6.1.ebuild 672 RMD160 7f332571629eb2c3f10050d33d4e760bae4599a0 SHA1 200965f5b2e406bf25ba016aec3c0b64890bb8f3 SHA256 7f282720cf10a2a5ea24fb7b49f9c12a32355ad87aec751aaa9c6f9882cfe1bb
 MD5 c3b3bba4d2a4191bec9eef885bbf4151 pyx-0.6.1.ebuild 672
 RMD160 7f332571629eb2c3f10050d33d4e760bae4599a0 pyx-0.6.1.ebuild 672
@@ -29,10 +31,14 @@ EBUILD pyx-0.8.1.ebuild 1004 RMD160 1b401acea9d36a3e4b468bc2208a0c595f2ac48f SHA
 MD5 56c363bbe2e2fb333eb1542296660607 pyx-0.8.1.ebuild 1004
 RMD160 1b401acea9d36a3e4b468bc2208a0c595f2ac48f pyx-0.8.1.ebuild 1004
 SHA256 4c5d65f4c9b10351555e8d57f92718c01af9e8d44d10ea9a9710011452814360 pyx-0.8.1.ebuild 1004
-MISC ChangeLog 2228 RMD160 93c593b1e20a59039e8988de6b08b15259c53727 SHA1 41cac05d730a77f7aa1c944a9bbba0d8a3253f8b SHA256 1b37b22e7022f5eeb9884674b9902f0aa1068e8531fb3d457ef755409acebb1e
-MD5 3a650986e393cc077d586d696c1cfb0d ChangeLog 2228
-RMD160 93c593b1e20a59039e8988de6b08b15259c53727 ChangeLog 2228
-SHA256 1b37b22e7022f5eeb9884674b9902f0aa1068e8531fb3d457ef755409acebb1e ChangeLog 2228
+EBUILD pyx-0.9.ebuild 998 RMD160 26bc66cb065ff48efe8dfb51916d05eb4b628dd0 SHA1 d89727810c295bc08ada001516594108685dca8d SHA256 d32438f0340e9056f448a3c7cbaebbcf6f5276b8fd1ea9191f64b7005c2c9265
+MD5 f22612c77ade330d1f401d05d42b8377 pyx-0.9.ebuild 998
+RMD160 26bc66cb065ff48efe8dfb51916d05eb4b628dd0 pyx-0.9.ebuild 998
+SHA256 d32438f0340e9056f448a3c7cbaebbcf6f5276b8fd1ea9191f64b7005c2c9265 pyx-0.9.ebuild 998
+MISC ChangeLog 2370 RMD160 e73033c4e52cd8c5928448d4152767cc5ac3f219 SHA1 8ff63aeac01d0a51c66e4f67fa5ba30ae3e3a0cd SHA256 6c73f68d399d733b414a63df788562f1f816adc4d67f5594245babf617be8587
+MD5 54e8f0838edfee2f8e99e8297251840f ChangeLog 2370
+RMD160 e73033c4e52cd8c5928448d4152767cc5ac3f219 ChangeLog 2370
+SHA256 6c73f68d399d733b414a63df788562f1f816adc4d67f5594245babf617be8587 ChangeLog 2370
 MISC metadata.xml 445 RMD160 252fccf06432748c4a5bb1ee9ba35475bfea716d SHA1 03d96e4d1edc5f6d74a891cc9f449b5273debaf9 SHA256 c25b950b71c3fa07bca83ec30403ba0647cfc116db7020eb60b41ffaedb753ef
 MD5 efb565b5394bcf6412b0389c86261a92 metadata.xml 445
 RMD160 252fccf06432748c4a5bb1ee9ba35475bfea716d metadata.xml 445
@@ -49,10 +55,6 @@ SHA256 30b6ee95b0f47c8e976e804e10729a535d488c1f3d27ebf51edfdfa4ea1c7415 files/di
 MD5 eddbb196a5a99eaf01ea0bbe35dafa32 files/digest-pyx-0.8.1 229
 RMD160 812a80b344dbaf4e6c6ec5fa7ce67d9e2ce52b68 files/digest-pyx-0.8.1 229
 SHA256 bce61e0bea37f5b1f6968cd3f7f5db1dd98eeedfa419d841e43bc7d5891903d3 files/digest-pyx-0.8.1 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFE007J60LfUIagIAkRAgUNAJ9VDL47IpeYho7mIqGV+ly5o9PEXgCfaZcG
-TNB3dqsvy16ia5mlQXXC/wM=
-=QWul
------END PGP SIGNATURE-----
+MD5 5af89feee095ab343d2cbf78f6572459 files/digest-pyx-0.9 223
+RMD160 25b7b8b9e400d924c855dcb9479333948af7e9ad files/digest-pyx-0.9 223
+SHA256 b15a5ce5f45cfd8b9fcf092a7a81d22946f3c3ccec3111ae7016fe6cccea58e3 files/digest-pyx-0.9 223
diff --git a/dev-python/pyx/files/digest-pyx-0.9 b/dev-python/pyx/files/digest-pyx-0.9
new file mode 100644
index 000000000000..2a0957a10191
--- /dev/null
+++ b/dev-python/pyx/files/digest-pyx-0.9
@@ -0,0 +1,3 @@
+MD5 c90c59e257e713cae1dc99677100ffeb PyX-0.9.tar.gz 351451
+RMD160 095148e1cf5af028724ba3abf52794741e72d084 PyX-0.9.tar.gz 351451
+SHA256 01430a4216350febb438e6520665cdcb11202db8ce879691844fe7f696952fec PyX-0.9.tar.gz 351451
diff --git a/dev-python/pyx/files/pyx-0.9.patch b/dev-python/pyx/files/pyx-0.9.patch
new file mode 100644
index 000000000000..d7be7ec78b5b
--- /dev/null
+++ b/dev-python/pyx/files/pyx-0.9.patch
@@ -0,0 +1,138 @@
+diff -urN PyX-0.9.orig/pyx/siteconfig.py PyX-0.9/pyx/siteconfig.py
+--- PyX-0.9.orig/pyx/siteconfig.py	2006-09-23 18:35:45.000000000 -0700
++++ PyX-0.9/pyx/siteconfig.py	2006-09-23 18:36:28.000000000 -0700
+@@ -1,35 +1,3 @@
+-# -*- coding: ISO-8859-1 -*-
+-#
+-#
+-# Copyright (C) 2004-2005 André Wobst <wobsta@users.sourceforge.net>
+-#
+-# This file is part of PyX (http://pyx.sourceforge.net/).
+-#
+-# PyX is free software; you can redistribute it and/or modify
+-# it under the terms of the GNU General Public License as published by
+-# the Free Software Foundation; either version 2 of the License, or
+-# (at your option) any later version.
+-#
+-# PyX is distributed in the hope that it will be useful,
+-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+-# GNU General Public License for more details.
+-#
+-# You should have received a copy of the GNU General Public License
+-# along with PyX; if not, write to the Free Software
+-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+-
+-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-# This file configures PyX search paths relative to the current
+-# position, e.g. for local usage. When installing PyX via distutils
+-# the contents of this file is not copied to the PyX installation.
+-# Instead the correct information about the paths from the installation
+-# process are used.
+-# !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+-
+-import os
+-
+-lfsdir = os.path.join(os.path.dirname(__file__), "lfs")
+-sharedir = os.path.join(os.path.dirname(__file__), "..", "contrib")
+-pyxrcdir = os.path.join(os.path.dirname(__file__), "..")
+-
++lfsdir = "/usr/share/pyx"
++sharedir = "/usr/share/pyx"
++pyxrcdir = "/etc/pyxrc"
+diff -urN PyX-0.9.orig/setup.py PyX-0.9/setup.py
+--- PyX-0.9.orig/setup.py	2006-09-23 18:35:45.000000000 -0700
++++ PyX-0.9/setup.py	2006-09-23 18:37:02.000000000 -0700
+@@ -77,84 +77,6 @@
+ # we put the global pyxrc into the share directory as well.
+ adddatafiles("pyxrcdir", os.name != "nt" and "/etc" or "share/pyx", ["pyxrc"])
+ 
+-################################################################################
+-# extend install commands to overwrite siteconfig.py during build and install
+-#
+-
+-
+-class pyx_build_py(build_py):
+-
+-    def build_module(self, module, module_file, package):
+-        if package == "pyx" and module == "siteconfig":
+-            # generate path information as the original build_module does it
+-            outfile = self.get_module_outfile(self.build_lib, [package], module)
+-            outdir = os.path.dirname(outfile)
+-            self.mkpath(outdir)
+-
+-            if log:
+-                log.info("creating proper %s" % outfile)
+-
+-            # create the additional relative path parts to be inserted into the
+-            # os.path.join methods in the original siteconfig.py
+-            indir = os.path.dirname(module_file)
+-            addjoinstring = ", ".join(["'..'" for d in outdir.split(os.path.sep)] +
+-                                      ["'%s'" % d for d in indir.split(os.path.sep)])
+-
+-            # write a modifed version of siteconfig.py
+-            fin = open(module_file, "r")
+-            fout = open(outfile, "w")
+-            for line in fin.readlines():
+-                fout.write(line.replace("os.path.join(os.path.dirname(__file__), ",
+-                                        "os.path.join(os.path.dirname(__file__), %s, " % addjoinstring))
+-            fin.close()
+-            fout.close()
+-        else:
+-            return build_py.build_module(self, module, module_file, package)
+-
+-
+-class pyx_install_data(install_data):
+-
+-    def run(self):
+-        self.siteconfiglines = []
+-        for dir, files in self.data_files:
+-            # append siteconfiglines by "<siteconfigname> = <dir>"
+-
+-            # get the install directory
+-            # (the following four lines are copied from within the install_data.run loop)
+-            dir = convert_path(dir)
+-            if not os.path.isabs(dir):
+-                dir = os.path.join(self.install_dir, dir)
+-            elif self.root:
+-                dir = change_root(self.root, dir)
+-
+-            self.siteconfiglines.append("%s = '%s'\n" % (siteconfignames[files], dir))
+-
+-        install_data.run(self)
+-
+-
+-class pyx_install_lib(install_lib):
+-
+-    def run(self):
+-        # siteconfig.py depends on install_data:
+-        self.run_command('install_data')
+-        install_lib.run(self)
+-
+-    def install(self):
+-        # first we perform the tree_copy
+-        result = install_lib.install(self)
+-
+-        # siteconfiglines have been created by install_data
+-        siteconfiglines = self.distribution.command_obj["install_data"].siteconfiglines
+-
+-        # such that we can easily overwrite siteconfig.py
+-        outfile = os.path.join(self.install_dir, "pyx", "siteconfig.py")
+-        if log:
+-            log.info("creating proper %s" % outfile)
+-        f = open(outfile, "w")
+-        f.writelines(siteconfiglines)
+-        f.close()
+-
+-        return result
+ 
+ ################################################################################
+ # additional package metadata (only available in Python 2.3 and above)
+@@ -193,7 +115,4 @@
+       packages=["pyx", "pyx/graph", "pyx/graph/axis", "pyx/font", "pyx/pykpathsea"],
+       ext_modules=ext_modules,
+       data_files=data_files,
+-      cmdclass = {"build_py": pyx_build_py,
+-                  "install_data": pyx_install_data,
+-                  "install_lib": pyx_install_lib},
+       **addargs)
diff --git a/dev-python/pyx/pyx-0.9.ebuild b/dev-python/pyx/pyx-0.9.ebuild
new file mode 100644
index 000000000000..c9e84456a869
--- /dev/null
+++ b/dev-python/pyx/pyx-0.9.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.9.ebuild,v 1.1 2006/09/24 02:03:36 dberkholz Exp $
+
+inherit distutils eutils
+
+MY_P=${P/pyx/PyX}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
+SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
+HOMEPAGE="http://pyx.sourceforge.net/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="doc"
+DEPEND="virtual/python
+	virtual/tetex"
+
+DOCS="AUTHORS CHANGES INSTALL"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}.patch
+}
+
+src_compile() {
+	distutils_src_compile
+
+	if use doc; then
+		cd ${S}/faq
+		make pdf
+	fi
+}
+
+src_install() {
+	distutils_src_install
+
+	if use doc; then
+		# The manual is not currently done because it needs mkhowto
+		# that's not currently available on our python ebuild
+		insinto /usr/share/doc/${P}/
+		doins faq/pyxfaq.pdf
+	fi
+}