From e01d1c385410eed5d006ffa9480d0ca71a3caf44 Mon Sep 17 00:00:00 2001 From: Bryan Østergaard Date: Mon, 20 Dec 2004 14:10:17 +0000 Subject: Remove old ebuilds and bump version, new ebuild by Fernando Serboncini . --- dev-python/pyx/ChangeLog | 9 ++- dev-python/pyx/Manifest | 21 ++++--- dev-python/pyx/files/digest-pyx-0.3.1 | 1 - dev-python/pyx/files/digest-pyx-0.5.1 | 1 - dev-python/pyx/files/digest-pyx-0.7.1 | 1 + dev-python/pyx/files/pyx-0.7.1.patch | 101 ++++++++++++++++++++++++++++++++++ dev-python/pyx/pyx-0.3.1.ebuild | 36 ------------ dev-python/pyx/pyx-0.5.1.ebuild | 29 ---------- dev-python/pyx/pyx-0.7.1.ebuild | 45 +++++++++++++++ 9 files changed, 165 insertions(+), 79 deletions(-) delete mode 100644 dev-python/pyx/files/digest-pyx-0.3.1 delete mode 100644 dev-python/pyx/files/digest-pyx-0.5.1 create mode 100644 dev-python/pyx/files/digest-pyx-0.7.1 create mode 100644 dev-python/pyx/files/pyx-0.7.1.patch delete mode 100644 dev-python/pyx/pyx-0.3.1.ebuild delete mode 100644 dev-python/pyx/pyx-0.5.1.ebuild create mode 100644 dev-python/pyx/pyx-0.7.1.ebuild (limited to 'dev-python/pyx') diff --git a/dev-python/pyx/ChangeLog b/dev-python/pyx/ChangeLog index 314f48e31a77..2fb959af4360 100644 --- a/dev-python/pyx/ChangeLog +++ b/dev-python/pyx/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for dev-python/pyx # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.9 2004/09/11 22:30:56 lucass Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.10 2004/12/20 14:10:17 kloeri Exp $ + +*pyx-0.7.1 (20 Dec 2004) + + 20 Dec 2004; Bryan Østergaard +files/pyx-0.7.1.patch, + -pyx-0.3.1.ebuild, -pyx-0.5.1.ebuild, +pyx-0.7.1.ebuild: + Remove old ebuilds and bump version, new ebuild by Fernando Serboncini + . *pyx-0.6.3 (12 Sep 2004) diff --git a/dev-python/pyx/Manifest b/dev-python/pyx/Manifest index 6a0d0603c51a..9a4652d48da7 100644 --- a/dev-python/pyx/Manifest +++ b/dev-python/pyx/Manifest @@ -1,20 +1,19 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 a23b8aa105c39cce69c30724f89445b8 pyx-0.5.1.ebuild 667 -MD5 c3b3bba4d2a4191bec9eef885bbf4151 pyx-0.6.1.ebuild 672 -MD5 6e8b67bf966b7d105ab24d117c99db8f pyx-0.3.1.ebuild 676 -MD5 2f1378d8710e2b777332ba1a4f4bc44f ChangeLog 1270 -MD5 efb565b5394bcf6412b0389c86261a92 metadata.xml 445 +MD5 b04a534270696c7c08f1ef168fcb06a0 ChangeLog 1531 +MD5 09e01ad7a6f5b371601f0ac4f6b9ffba pyx-0.7.1.ebuild 977 MD5 9be0a9b000a254e04f1e54f4f173e294 pyx-0.6.3.ebuild 686 -MD5 46a94096ae827068a9488dbb0a2e4197 files/digest-pyx-0.3.1 61 -MD5 046929f755c91e49463c8d511e6ed84b files/digest-pyx-0.5.1 61 -MD5 709e65698a4cd367d0a7260414515a6a files/digest-pyx-0.6.1 61 +MD5 efb565b5394bcf6412b0389c86261a92 metadata.xml 445 +MD5 c3b3bba4d2a4191bec9eef885bbf4151 pyx-0.6.1.ebuild 672 +MD5 1e8ad4caf14ac87fdda7709c2d3330df files/pyx-0.7.1.patch 3768 MD5 38b4424ad0a10c8e987231286f2edcaa files/digest-pyx-0.6.3 62 +MD5 709e65698a4cd367d0a7260414515a6a files/digest-pyx-0.6.1 61 +MD5 b1f9c1c64dfbbc629a354643a0dae13e files/digest-pyx-0.7.1 61 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFBQ32/2jLqHNfbg2URAvjnAJ0TFOpqIoZc7vwBA8zHZWhf75gLgQCfV0os -mPw806JVKf+eEN0J1cDChOw= -=Eb3F +iD8DBQFBxt1eugEuf3OQ0akRAjh3AJ4gQkVPC1P/P2tmI+bWWrNNhl7AjQCfRaNE +Ad7UDyp1rDhxgqME4GU3pgc= +=psSQ -----END PGP SIGNATURE----- diff --git a/dev-python/pyx/files/digest-pyx-0.3.1 b/dev-python/pyx/files/digest-pyx-0.3.1 deleted file mode 100644 index 272cb104f776..000000000000 --- a/dev-python/pyx/files/digest-pyx-0.3.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 a01184011b3cec0e4c0086d42b065e01 PyX-0.3.1.tar.gz 658655 diff --git a/dev-python/pyx/files/digest-pyx-0.5.1 b/dev-python/pyx/files/digest-pyx-0.5.1 deleted file mode 100644 index 54643160d402..000000000000 --- a/dev-python/pyx/files/digest-pyx-0.5.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 b8538dc1fdb6618cc7057a64a71d92b4 PyX-0.5.1.tar.gz 605892 diff --git a/dev-python/pyx/files/digest-pyx-0.7.1 b/dev-python/pyx/files/digest-pyx-0.7.1 new file mode 100644 index 000000000000..e14583cb14d5 --- /dev/null +++ b/dev-python/pyx/files/digest-pyx-0.7.1 @@ -0,0 +1 @@ +MD5 5ee6e9f24e27ef8ac4c715420136d747 PyX-0.7.1.tar.gz 278059 diff --git a/dev-python/pyx/files/pyx-0.7.1.patch b/dev-python/pyx/files/pyx-0.7.1.patch new file mode 100644 index 000000000000..c682c8bf4827 --- /dev/null +++ b/dev-python/pyx/files/pyx-0.7.1.patch @@ -0,0 +1,101 @@ +--- setup.py 2004-05-12 05:13:55.000000000 -0300 ++++ setup.new.py 2004-12-19 23:47:03.810170032 -0200 +@@ -56,49 +56,6 @@ + ("/etc", ["pyxrc"])] + + # +-# pyx_build_py +-# +-# pyx/siteconfig.py is not copied from the source directory, +-# but generated from the directory data obtained from install_data +-# +- +-class pyx_build_py(build_py): +- +- def run(self): +- # siteconfig depends on install_data: +- self.run_command('install_data') +- build_py.run(self) +- +- 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) +- dir = os.path.dirname(outfile) +- self.mkpath(dir) +- +- # we do not copy pyx/siteconfig.py, but generate it +- # using the pyx_install_data instance +- install_data = self.distribution.command_obj["install_data"] +- f = open(outfile, "w") +- f.write("lfsdir = %r\n" % install_data.pyx_lfsdir) +- f.write("sharedir = %r\n" % install_data.pyx_sharedir) +- f.write("pyxrc = %r\n" % install_data.pyx_pyxrc) +- f.close() +- else: +- return build_py.build_module(self, module, module_file, package) +- +-# +-# install_data +-# +- +-class pyx_install_data(install_data): +- +- def run(self): +- install_data.run(self) +- self.pyx_lfsdir = self.pyx_sharedir = os.path.join(self.install_dir, "share", "pyx") +- self.pyx_pyxrc = os.path.join(self.root or "/", "etc", "pyxrc") +- +-# + # additional package metadata (only available in Python 2.3 and above) + # + +@@ -135,6 +92,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}, + **addargs) +--- pyx/siteconfig.py 2004-12-20 00:21:36.982999856 -0200 ++++ siteconfig.new.py 2004-12-20 00:21:33.312557848 -0200 +@@ -1,36 +1,5 @@ + #!/usr/bin/env python + # -*- coding: ISO-8859-1 -*- +-# +-# +-# Copyright (C) 2004 André Wobst +-# +-# 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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") +-pyxrc = os.path.join(os.path.dirname(__file__), "..", "pyxrc") +- ++lfsdir = "/usr/share/pyx" ++sharedir = "/usr/share/pyx" ++pyxrc = "/etc/pyxrc" diff --git a/dev-python/pyx/pyx-0.3.1.ebuild b/dev-python/pyx/pyx-0.3.1.ebuild deleted file mode 100644 index af2b57a1c0f8..000000000000 --- a/dev-python/pyx/pyx-0.3.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.3.1.ebuild,v 1.9 2004/06/25 01:47:15 agriffis Exp $ - -IUSE="" - -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/" - -DEPEND=">=dev-lang/python-2.2 - virtual/tetex" - -SLOT="0" -KEYWORDS="x86" -LICENSE="GPL-2" - - -src_install() { - - DOCS="manual/manual.ps" - distutils_src_install - - insinto /usr/share/doc/${PF}/examples - doins examples/* - -} - - - - diff --git a/dev-python/pyx/pyx-0.5.1.ebuild b/dev-python/pyx/pyx-0.5.1.ebuild deleted file mode 100644 index 78c7e6cb9fa9..000000000000 --- a/dev-python/pyx/pyx-0.5.1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.5.1.ebuild,v 1.4 2004/09/11 22:30:56 lucass Exp $ - -IUSE="" - -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/" - -DEPEND=">=dev-lang/python-2.2 - virtual/tetex" - -SLOT="0" -KEYWORDS="x86" -LICENSE="GPL-2" - -src_install() { - DOCS="manual/manual.ps" - distutils_src_install - - insinto /usr/share/doc/${PF}/examples - doins examples/* -} diff --git a/dev-python/pyx/pyx-0.7.1.ebuild b/dev-python/pyx/pyx-0.7.1.ebuild new file mode 100644 index 000000000000..34263f61db7d --- /dev/null +++ b/dev-python/pyx/pyx-0.7.1.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2004 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.7.1.ebuild,v 1.1 2004/12/20 14:10:17 kloeri 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" +IUSE="doc" +DEPEND="virtual/python + virtual/tetex" + +DOCS="AUTHORS CHANGES INSTALL" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-0.7.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 +} -- cgit v1.2.3-65-gdbad