Drop old, add prefix keywords

(Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key 895192F9)

7 files changed, 8 insertions, 352 deletions

diff --git a/dev-python/pyx/ChangeLog b/dev-python/pyx/ChangeLog
index 409f66cf9bf7..2b130d799609 100644
--- a/dev-python/pyx/ChangeLog
+++ b/dev-python/pyx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/pyx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.31 2013/01/27 14:25:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/ChangeLog,v 1.32 2013/02/02 14:00:01 xarthisius Exp $
+
+  02 Feb 2013; Kacper Kowalik <xarthisius@gentoo.org> -files/pyx-0.10.patch,
+  -pyx-0.10-r1.ebuild, -pyx-0.11.1.ebuild, -pyx-0.12.1.ebuild, -pyx-0.12.ebuild,
+  pyx-0.12.1-r1.ebuild:
+  Drop old, add prefix keywords
 
 *pyx-0.12.1-r1 (27 Jan 2013)
 
diff --git a/dev-python/pyx/files/pyx-0.10.patch b/dev-python/pyx/files/pyx-0.10.patch
deleted file mode 100644
index d7be7ec78b5b..000000000000
--- a/dev-python/pyx/files/pyx-0.10.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-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.10-r1.ebuild b/dev-python/pyx/pyx-0.10-r1.ebuild
deleted file mode 100644
index cc8ee3ed56f6..000000000000
--- a/dev-python/pyx/pyx-0.10-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.10-r1.ebuild,v 1.4 2011/01/02 09:23:38 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-MY_P="${P/pyx/PyX}"
-
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="http://pyx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 x86"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES INSTALL"
-
-src_prepare() {
-	distutils_src_prepare
-
-	epatch "${FILESDIR}"/${P}.patch
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-
-	sed -i -e 's/^texipc =.*/texipc = 1/' pyxrc || die
-}
-
-src_compile() {
-	distutils_src_compile
-
-	if use doc; then
-		cd "${S}/faq"
-		VARTEXFONTS="${T}"/fonts 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
-}
diff --git a/dev-python/pyx/pyx-0.11.1.ebuild b/dev-python/pyx/pyx-0.11.1.ebuild
deleted file mode 100644
index 0f5e11bb40fd..000000000000
--- a/dev-python/pyx/pyx-0.11.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.11.1.ebuild,v 1.1 2011/07/29 22:54:35 bicatali Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-MY_P="${P/pyx/PyX}"
-
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="http://pyx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES"
-
-src_prepare() {
-	distutils_src_prepare
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		cd "${S}/faq"
-		VARTEXFONTS="${T}"/fonts make pdf
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dodoc faq/pyxfaq.pdf
-}
diff --git a/dev-python/pyx/pyx-0.12.1-r1.ebuild b/dev-python/pyx/pyx-0.12.1-r1.ebuild
index 31410845a083..277ff8ee9965 100644
--- a/dev-python/pyx/pyx-0.12.1-r1.ebuild
+++ b/dev-python/pyx/pyx-0.12.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.12.1-r1.ebuild,v 1.1 2013/01/27 14:25:26 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.12.1-r1.ebuild,v 1.2 2013/02/02 14:00:01 xarthisius Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 RDEPEND="virtual/tex-base"
diff --git a/dev-python/pyx/pyx-0.12.1.ebuild b/dev-python/pyx/pyx-0.12.1.ebuild
deleted file mode 100644
index df2ad65ed50f..000000000000
--- a/dev-python/pyx/pyx-0.12.1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.12.1.ebuild,v 1.2 2013/01/27 14:25:26 idella4 Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-MY_P="${P/pyx/PyX}"
-
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="http://pyx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES"
-
-src_prepare() {
-	distutils_src_prepare
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		cd "${S}/faq"
-		VARTEXFONTS="${T}"/fonts make pdf
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dodoc faq/pyxfaq.pdf
-}
diff --git a/dev-python/pyx/pyx-0.12.ebuild b/dev-python/pyx/pyx-0.12.ebuild
deleted file mode 100644
index 73fec19c16bd..000000000000
--- a/dev-python/pyx/pyx-0.12.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyx/pyx-0.12.ebuild,v 1.1 2012/10/29 08:42:33 patrick Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* *-jython"
-
-inherit distutils eutils
-
-MY_P="${P/pyx/PyX}"
-
-DESCRIPTION="Python package for the generation of encapsulated PostScript figures"
-HOMEPAGE="http://pyx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/pyx/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-IUSE="doc"
-
-RDEPEND="virtual/tex-base"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS="AUTHORS CHANGES"
-
-src_prepare() {
-	distutils_src_prepare
-	sed -i \
-		-e 's/^build_t1code=.*/build_t1code=1/' \
-		-e 's/^build_pykpathsea=.*/build_pykpathsea=1/' \
-		setup.cfg || die "setup.cfg fix failed"
-}
-
-src_compile() {
-	distutils_src_compile
-	if use doc; then
-		cd "${S}/faq"
-		VARTEXFONTS="${T}"/fonts make pdf
-	fi
-}
-
-src_install() {
-	distutils_src_install
-	use doc && dodoc faq/pyxfaq.pdf
-}