version bump (#103036)

(Portage version: 2.0.53_rc7)

5 files changed, 239 insertions, 15 deletions

diff --git a/dev-python/pyx/ChangeLog b/dev-python/pyx/ChangeLog
index c50e47156f0a..344190423342 100644
--- a/dev-python/pyx/ChangeLog
+++ b/dev-python/pyx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/pyx
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.12 2005/09/03 16:02:11 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.13 2005/11/03 21:05:35 liquidx Exp $
+
+*pyx-0.8.1 (03 Nov 2005)
+
+  03 Nov 2005; Alastair Tse <liquidx@gentoo.org> +files/pyx-0.8.1.patch,
+  +pyx-0.8.1.ebuild:
+  version bump (#103036)
 
   03 Sep 2005; <dang@gentoo.org> pyx-0.7.1.ebuild:
   Marked ~amd64
diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest
index 2378b32b3c8c..530c778059ff 100644
--- a/dev-python/pyx/Manifest
+++ b/dev-python/pyx/Manifest
@@ -1,19 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c3b3bba4d2a4191bec9eef885bbf4151 pyx-0.6.1.ebuild 672
-MD5 9be0a9b000a254e04f1e54f4f173e294 pyx-0.6.3.ebuild 686
-MD5 a6954e3959a109ab2e74d5044c8532e0 pyx-0.7.1.ebuild 982
 MD5 ff73b3faed0adfa5c8aa3d9d542d71db ChangeLog 1703
-MD5 efb565b5394bcf6412b0389c86261a92 metadata.xml 445
 MD5 709e65698a4cd367d0a7260414515a6a files/digest-pyx-0.6.1 61
 MD5 38b4424ad0a10c8e987231286f2edcaa files/digest-pyx-0.6.3 62
 MD5 b1f9c1c64dfbbc629a354643a0dae13e files/digest-pyx-0.7.1 61
+MD5 3f544696b1bfdeda213a4fa0d6afaccb files/digest-pyx-0.8.1 61
 MD5 1e8ad4caf14ac87fdda7709c2d3330df files/pyx-0.7.1.patch 3768
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDGckwomPajV0RnrERAl5dAJ4l0EULuscbdtMddlsoz408t5Q1iACfWmm5
-lGppuVHeHiVo9mkZjAEMsng=
-=HXLj
------END PGP SIGNATURE-----
+MD5 5fd2d4c28b2be8d5b4c3cd64fc1774a6 files/pyx-0.8.1.patch 7431
+MD5 efb565b5394bcf6412b0389c86261a92 metadata.xml 445
+MD5 c3b3bba4d2a4191bec9eef885bbf4151 pyx-0.6.1.ebuild 672
+MD5 9be0a9b000a254e04f1e54f4f173e294 pyx-0.6.3.ebuild 686
+MD5 a6954e3959a109ab2e74d5044c8532e0 pyx-0.7.1.ebuild 982
+MD5 734057ee89981c575098bb7bb072180b pyx-0.8.1.ebuild 984
diff --git a/dev-python/pyx/files/digest-pyx-0.8.1 b/dev-python/pyx/files/digest-pyx-0.8.1
new file mode 100644
index 000000000000..1557d107e34c
--- /dev/null
+++ b/dev-python/pyx/files/digest-pyx-0.8.1
@@ -0,0 +1 @@
+MD5 5e751cef8d62774a6fc659cc9a03c231 PyX-0.8.1.tar.gz 335245
diff --git a/dev-python/pyx/files/pyx-0.8.1.patch b/dev-python/pyx/files/pyx-0.8.1.patch
new file mode 100644
index 000000000000..566fb4ef425c
--- /dev/null
+++ b/dev-python/pyx/files/pyx-0.8.1.patch
@@ -0,0 +1,179 @@
+diff -ruaN PyX-0.8.1/pyx/siteconfig.py PyX-0.8.1.new/pyx/siteconfig.py
+--- PyX-0.8.1/pyx/siteconfig.py	2005-07-14 00:02:12.000000000 +1000
++++ PyX-0.8.1.new/pyx/siteconfig.py	2005-08-19 16:53:35.000000000 +1000
+@@ -1,36 +1,4 @@
+-#!/usr/bin/env python
+-# -*- 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 -ruaN PyX-0.8.1/pyx/siteconfig.py.orig PyX-0.8.1.new/pyx/siteconfig.py.orig
+--- PyX-0.8.1/pyx/siteconfig.py.orig	1970-01-01 10:00:00.000000000 +1000
++++ PyX-0.8.1.new/pyx/siteconfig.py.orig	2005-08-19 16:49:15.000000000 +1000
+@@ -0,0 +1,36 @@
++#!/usr/bin/env python
++# -*- 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__), "..")
++
+diff -ruaN PyX-0.8.1/setup.py PyX-0.8.1.new/setup.py
+--- PyX-0.8.1/setup.py	2005-08-13 22:32:46.000000000 +1000
++++ PyX-0.8.1.new/setup.py	2005-08-19 16:49:02.000000000 +1000
+@@ -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/t1strip", "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.8.1.ebuild b/dev-python/pyx/pyx-0.8.1.ebuild
new file mode 100644
index 000000000000..b2b471cbb964
--- /dev/null
+++ b/dev-python/pyx/pyx-0.8.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.8.1.ebuild,v 1.1 2005/11/03 21:05:35 liquidx Exp $
+
+inherit distutils
+
+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="~x86 ~ppc ~amd64"
+IUSE="doc"
+DEPEND="virtual/python
+	virtual/tetex"
+
+DOCS="AUTHORS CHANGES INSTALL"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-0.8.1.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
+}