Delete older ebuild.

diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index f269f04af7c08d3156ae8d0a68ecfa403760cfb3..78fb8efcf99d3db8b3d4194ccc496d2cc9c2bed8 100644 (file)
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -1,8 +1,5 @@
-AUX lxml-2.2.4-python-2.7.patch 807 RMD160 8322eef2a2a6e0ab8032fa3a59fe2300cc673c2a SHA1 929cc7a45de1d02876b7d7981629e11f449b4776 SHA256 a4d5e00fbebc19b15c308b2f77ff3e5aa908c7c1b9f5a6f79c1a46b3a26269f2
 AUX lxml-2.2.4-python-3.patch 1270 RMD160 16a79e8e05ee0f0f682340bde63d3e3c6cb8819b SHA1 f03dedccab36df33ba1d043f9378730240d7b00f SHA256 a254619109f84b06e188ea2b148ce3ebe5a9cc81da73eb746a85731ee91c882b
-DIST lxml-2.2.4.tgz 2964382 RMD160 b7abdd8faee1ef1b2f1868fb188a2faea25a012e SHA1 da97ed375268363ad40501bcfc6980a6c5100d5e SHA256 5b21daabdfcd3c7b6498bf9074d5bd2217665d792e21ecc573d572f7eadc4ab7
 DIST lxml-2.2.6.tgz 2923134 RMD160 6f8cded975cf10b1dd79db22a9f912eaea86363c SHA1 340d8cee8b787e9b2d2ab8ba2ab268460efa9232 SHA256 7fd36e4a56360cd5d7319e357b04a90e2c6b836ea220c88f9451c300ae33cc5e
-EBUILD lxml-2.2.4.ebuild 2196 RMD160 6f0dd55930e353f669f1d7abd9e9a88e8b763538 SHA1 fd08ab1b34e41cf2771450dd672d249cebc56095 SHA256 902dc68768624a4e32022a2bbb3f73788175395210eabf2daa227cfebc5679c2
 EBUILD lxml-2.2.6.ebuild 2167 RMD160 4c7ed474131ebd962795f85598d4079c61ba5eb8 SHA1 013631ca15322b532eaf743a0f1061897807d47f SHA256 e961d0814032a5594cb6802492cb740973025b11ee4e7bdcda6a6727cb4f182e
 MISC ChangeLog 10720 RMD160 a1e27dc6e72ef390fdd2e491840feb13d5fa34e8 SHA1 f3be3a39858ebb5a62f2928824993378de4a4816 SHA256 258566c293d50b9692c076fa43ba8dc9071c0b58206a6a2ef5535b82f167d671
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4

diff --git a/dev-python/lxml/files/lxml-2.2.4-python-2.7.patch b/dev-python/lxml/files/lxml-2.2.4-python-2.7.patch
deleted file mode 100644 (file)
index 540e8b6..0000000
--- a/dev-python/lxml/files/lxml-2.2.4-python-2.7.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- test.py
-+++ test.py
-@@ -75,6 +75,11 @@
-     set
- except NameError:
-     from sets import Set as set
-+try:
-+    # Python >=2.7 and >=3.2
-+    from unittest.runner import _TextTestResult
-+except ImportError:
-+    from unittest import _TextTestResult
- 
- __metaclass__ = type
- 
-@@ -302,14 +307,14 @@
-     return results
- 
- 
--class CustomTestResult(unittest._TextTestResult):
-+class CustomTestResult(_TextTestResult):
-     """Customised TestResult.
- 
-     It can show a progress bar, and displays tracebacks for errors and failures
-     as soon as they happen, in addition to listing them all at the end.
-     """
- 
--    __super = unittest._TextTestResult
-+    __super = _TextTestResult
-     __super_init = __super.__init__
-     __super_startTest = __super.startTest
-     __super_stopTest = __super.stopTest

diff --git a/dev-python/lxml/lxml-2.2.4.ebuild b/dev-python/lxml/lxml-2.2.4.ebuild
deleted file mode 100644 (file)
index 87d0f9b..0000000
--- a/dev-python/lxml/lxml-2.2.4.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-2.2.4.ebuild,v 1.11 2010/03/06 20:01:06 armin76 Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils eutils flag-o-matic
-
-DESCRIPTION="A Pythonic binding for the libxml2 and libxslt libraries"
-HOMEPAGE="http://codespeak.net/lxml/ http://pypi.python.org/pypi/lxml"
-SRC_URI="http://codespeak.net/lxml/${P}.tgz"
-
-LICENSE="BSD ElementTree GPL-2 PSF-2.4"
-SLOT="0"
-KEYWORDS="amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads"
-
-RDEPEND=">=dev-libs/libxml2-2.7.2
-               >=dev-libs/libxslt-1.1.15
-               >=dev-python/beautifulsoup-3.0.8"
-DEPEND="${RDEPEND}
-       >=dev-python/setuptools-0.6_rc5"
-# lxml tarball contains files pregenerated by Cython.
-
-pkg_setup() {
-       # Tests fail with some optimizations.
-       replace-flags -O[2-9s]* -O1
-}
-
-src_prepare() {
-       distutils_src_prepare
-
-       # Disable broken tests.
-       sed -e "/elementsoup\.txt/d" -i src/lxml/html/tests/test_elementsoup.py || die "sed failed"
-
-       epatch "${FILESDIR}/${P}-python-2.7.patch"
-       epatch "${FILESDIR}/${P}-python-3.patch"
-}
-
-src_compile() {
-       local myconf
-       use threads || myconf+=" --without-threading"
-       distutils_src_compile ${myconf}
-}
-
-src_test() {
-       testing() {
-               # Tests are broken with Python 3.
-               [[ "${PYTHON_ABI}" == 3.* ]] && return
-
-               local module
-               for module in lxml/etree lxml/objectify; do
-                       ln -fs "../../$(ls -d build-${PYTHON_ABI}/lib.*)/${module}.so" "src/${module}.so" || die "ln -fs src/${module} failed"
-               done
-
-               local return_status="0" test
-               for test in test.py selftest.py selftest2.py; do
-                       einfo "Running ${test}"
-                       if ! PYTHONPATH="$(ls -d build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" "${test}"; then
-                               eerror "${test} failed with Python ${PYTHON_ABI}"
-                               return_status="1"
-                       fi
-               done
-
-               return "${return_status}"
-       }
-       python_execute_function testing
-}
-
-src_install() {
-       distutils_src_install
-
-       if use doc; then
-               dohtml -r doc/html/*
-               dodoc *.txt
-               docinto doc
-               dodoc doc/*.txt
-       fi
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}/examples
-               doins -r samples/*
-       fi
-}

diff --git a/dev-python/pysqlite/Manifest b/dev-python/pysqlite/Manifest
index 91273ba04c88a133cc8f1fc66cb6c1666a52fc30..6a2638ce55c72a42ed6c6c1926b17b78c3739e60 100644 (file)
--- a/dev-python/pysqlite/Manifest
+++ b/dev-python/pysqlite/Manifest
@@ -1,8 +1,6 @@
 DIST pysqlite-1.0.1.tar.gz 41099 RMD160 b608b81de56d1b549e03cd8d97e8c929fbe598c0 SHA1 720458a0ebb5b4fa145a3048444611a450204122 SHA256 9ceed0af9e94b2f8701d4f36d7e86715d8ca64283e0b311e1816c031c3658f08
-DIST pysqlite-2.5.6.tar.gz 72559 RMD160 8174ecfbee2f9526f7a1100b1afa78f3786916dd SHA1 79b5c4067c0ca237240eb32e6fde7ed84636d13d SHA256 108febfe37a1722b812f94d0398e806ec70aedd07bf13d0c98534b850b5cac24
 DIST pysqlite-2.6.0.tar.gz 74456 RMD160 4aa208fc78cc0395c5872c609a5b0f713e064129 SHA1 d26bdb1027b03c4385c30dd89cc2f317694c558d SHA256 354290bd1b18bb69e11946b2d913fd9b15c2a4aa7de2e8565d299492db773721
 EBUILD pysqlite-1.0.1.ebuild 875 RMD160 eeeece77e76573f65c7252aa8fbb4dc1077180e0 SHA1 bbdccfc4e7f80f8154432d110fd2da01fbb8e388 SHA256 88408b3a006df95ef3d6261e36f84843a0eb5548774419ef8e4f4e9477235baa
-EBUILD pysqlite-2.5.6.ebuild 1623 RMD160 634e1044665cf680ca6671b7c8cca7112175356d SHA1 56985bcaf57473251cda06eb5ebacfcba4ea6ede SHA256 db6a4c4335e7e25e6ff5314c21355fcf9511d9ae023892804e910e5932679edb
 EBUILD pysqlite-2.6.0.ebuild 1585 RMD160 81e695325f438445a2485dd6fde756580ea28cc7 SHA1 51673eef581c170ad7223b394cb8005e33f8a977 SHA256 d2f264bb3865504a2fb1471d712b59be7d1c41e1ea5d0c4e829c54350812b94c
 MISC ChangeLog 15011 RMD160 ccec67fd0cee5dd08e181f63ae061940524cd7e6 SHA1 5212ff6ddf7e5dae598ae9eb0f2c10e05377e6a3 SHA256 bbb99352862565d18ab7a652a6c1b994e2bbe8fb7f8f9cf47232f153dba5195b
 MISC metadata.xml 159 RMD160 900a8c55d7a7d2f6312594769aaf941bf9e99c7f SHA1 c8e604d56dae898258b5254d78cfeac0b981e288 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4

diff --git a/dev-python/pysqlite/pysqlite-2.5.6.ebuild b/dev-python/pysqlite/pysqlite-2.5.6.ebuild
deleted file mode 100644 (file)
index 4585eaa..0000000
--- a/dev-python/pysqlite/pysqlite-2.5.6.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pysqlite/pysqlite-2.5.6.ebuild,v 1.7 2010/01/16 15:03:54 armin76 Exp $
-
-EAPI="2"
-SUPPORT_PYTHON_ABIS="1"
-
-inherit distutils
-
-DESCRIPTION="Python wrapper for the local database Sqlite"
-HOMEPAGE="http://code.google.com/p/pysqlite/ http://pypi.python.org/pypi/pysqlite"
-SRC_URI="http://pypi.python.org/packages/source/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="pysqlite"
-SLOT="2"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
-IUSE="examples"
-
-DEPEND=">=dev-db/sqlite-3.1"
-RDEPEND=${DEPEND}
-RESTRICT_PYTHON_ABIS="3.*"
-
-PYTHON_MODNAME="pysqlite2"
-
-src_prepare() {
-       distutils_src_prepare
-
-       # Don't install pysqlite2.test.
-       sed -i -e 's/, "pysqlite2.test"//' setup.py || die "sed setup.py failed"
-
-       # Fix encoding.
-       sed -i -e "s/\(coding: \)ISO-8859-1/\1utf-8/" lib/{__init__.py,dbapi2.py} || die "sed lib/{__init__.py,dbapi2.py} failed"
-
-       # Workaround to make tests work without installing them.
-       sed -i -e "s/pysqlite2.test/test/" lib/test/__init__.py || die "sed lib/test/__init__.py failed"
-}
-
-src_test() {
-       cd lib
-       testing() {
-               PYTHONPATH="$(ls -d ../build-${PYTHON_ABI}/lib.*)" "$(PYTHON)" -c "from test import test;import sys;sys.exit(test())"
-       }
-       python_execute_function testing
-}
-
-src_install() {
-       [[ -z "${ED}" ]] && local ED="${D}"
-       distutils_src_install
-
-       rm -rf "${ED}usr/pysqlite2-doc"
-
-       if use examples; then
-               insinto /usr/share/doc/${PF}
-               doins -r doc/includes/sqlite3
-       fi
-}