Version bump. Drop old.

Package-Manager: portage-2.1.4

8 files changed, 94 insertions, 66 deletions

diff --git a/dev-python/axiom/ChangeLog b/dev-python/axiom/ChangeLog
index 998fd8974449..77ae686f20e6 100644
--- a/dev-python/axiom/ChangeLog
+++ b/dev-python/axiom/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/axiom
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/ChangeLog,v 1.13 2007/12/25 20:18:33 ranger Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/ChangeLog,v 1.14 2008/01/23 01:16:05 hawking Exp $
+
+*axiom-0.5.27 (23 Jan 2008)
+
+  23 Jan 2008; Ali Polatel <hawking@gentoo.org>
+  +files/axiom-0.5.27-sqlite3.patch, -axiom-0.4.0.ebuild,
+  -axiom-0.5.0.ebuild, +axiom-0.5.27.ebuild:
+  Version bump. Drop old.
 
   25 Dec 2007; Brent Baude <ranger@gentoo.org> axiom-0.5.20.ebuild:
   Marked axiom-0.5.20 ~ppc64 for bug 144202
diff --git a/dev-python/axiom/Manifest b/dev-python/axiom/Manifest
index 8b15ef04f2ae..1a7e1b2d813d 100644
--- a/dev-python/axiom/Manifest
+++ b/dev-python/axiom/Manifest
@@ -1,36 +1,42 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX axiom-0.5.20-sqlite3.patch 1303 RMD160 d886aca7dc2bdb737e5d1580778cbc889d969102 SHA1 2a8149a95bc3b3e4856ee8482d0a87776868c7e2 SHA256 04a168a9df2f288a25b4989ddba35c8fd2823902bbe9f5987979f8c12c6188c5
 MD5 e63bdcc46a7b1b97633dd8cf7e509016 files/axiom-0.5.20-sqlite3.patch 1303
 RMD160 d886aca7dc2bdb737e5d1580778cbc889d969102 files/axiom-0.5.20-sqlite3.patch 1303
 SHA256 04a168a9df2f288a25b4989ddba35c8fd2823902bbe9f5987979f8c12c6188c5 files/axiom-0.5.20-sqlite3.patch 1303
-DIST Axiom-0.4.0.tar.gz 66266 RMD160 1b31cd530376db050274b4c8f9fbe0d03a3595c7 SHA1 a2f10068a50910f425fdd94089517ba038de37db SHA256 fcb2138c03668b05e70196960e0faaede5fa8ca0c62b909525b85d878ff1384f
-DIST Axiom-0.5.0.tar.gz 103771 RMD160 16d8b67ba7bb2dddb932cc675e0114d5a6c91a84 SHA1 9ab64f2316f4f174cf8279fbe91e8a0a65f0d948 SHA256 a912b80b65e4f1ed2161a2306c56f147e49cd599964c9b62dfa8e112aa0fad46
+AUX axiom-0.5.27-sqlite3.patch 1303 RMD160 d886aca7dc2bdb737e5d1580778cbc889d969102 SHA1 2a8149a95bc3b3e4856ee8482d0a87776868c7e2 SHA256 04a168a9df2f288a25b4989ddba35c8fd2823902bbe9f5987979f8c12c6188c5
+MD5 e63bdcc46a7b1b97633dd8cf7e509016 files/axiom-0.5.27-sqlite3.patch 1303
+RMD160 d886aca7dc2bdb737e5d1580778cbc889d969102 files/axiom-0.5.27-sqlite3.patch 1303
+SHA256 04a168a9df2f288a25b4989ddba35c8fd2823902bbe9f5987979f8c12c6188c5 files/axiom-0.5.27-sqlite3.patch 1303
 DIST Axiom-0.5.20.tar.gz 153887 RMD160 b78bbb681b3497e91700dab33fbb612cddbd5b06 SHA1 7559626ac706d864f86080192fcd58945bf0ee90 SHA256 2655a1917151211c6f8e291a132588ea453d957ceb72a1d08a4844c11601b53c
-EBUILD axiom-0.4.0.ebuild 791 RMD160 48d817e6505a70ca7806df78febb3a28609f7d9f SHA1 0ad9aa06f9e9ac8e2d102543a02a75b5852217ec SHA256 b6e9ecb5d4e522914505d88709ff810af8cb08610371952005a930053fd0bc06
-MD5 d1a8d63c20f1ed9caae50cbe7c1312a6 axiom-0.4.0.ebuild 791
-RMD160 48d817e6505a70ca7806df78febb3a28609f7d9f axiom-0.4.0.ebuild 791
-SHA256 b6e9ecb5d4e522914505d88709ff810af8cb08610371952005a930053fd0bc06 axiom-0.4.0.ebuild 791
-EBUILD axiom-0.5.0.ebuild 865 RMD160 a08b84223f0c30c2bbab3cd4fcd00eb704a88812 SHA1 6719d3ea4a8e10a5987ca9d8062acd0bdd5f3995 SHA256 17a25b8273a418e2bc321b0087943f6c3c47949acc161724ef85da746bfd03a2
-MD5 55af810cfa4dada74417705b8d2642c2 axiom-0.5.0.ebuild 865
-RMD160 a08b84223f0c30c2bbab3cd4fcd00eb704a88812 axiom-0.5.0.ebuild 865
-SHA256 17a25b8273a418e2bc321b0087943f6c3c47949acc161724ef85da746bfd03a2 axiom-0.5.0.ebuild 865
+DIST Axiom-0.5.27.tar.gz 163648 RMD160 36478cd4e6035f987e6bf23a16525dbb535c7bc1 SHA1 6fc6d98abf82357a1be8e5e2f4fc161427793efa SHA256 19889cca81ea7e2cb5bf4f82d9e9e352e42fa2c8f54ff7305cc68376d5324dfc
 EBUILD axiom-0.5.20.ebuild 986 RMD160 fe7e2b5cdc01d3fb103dc4dd3d59c5252963af54 SHA1 37e43e5c0c2e5f68ea1f4708b28e405b99cd9e4c SHA256 5c7bf04d1697c3e53fe037371abb4ced6ca36fde41c93ef0876ce4db07a5ffc9
 MD5 d7db7a013e36e83b7b0cc7188038ce74 axiom-0.5.20.ebuild 986
 RMD160 fe7e2b5cdc01d3fb103dc4dd3d59c5252963af54 axiom-0.5.20.ebuild 986
 SHA256 5c7bf04d1697c3e53fe037371abb4ced6ca36fde41c93ef0876ce4db07a5ffc9 axiom-0.5.20.ebuild 986
-MISC ChangeLog 1884 RMD160 8b878f9f9372bafe6eee77613ac6d47658316882 SHA1 fec4199ed855be1b317225c5ee3df50ddb70b244 SHA256 4fd89f20af6c08a962e2c7f2462560c99503a82afd9fda0dd505682a69d2f878
-MD5 47433b5d089b1fa525e2dab2ffd6a81c ChangeLog 1884
-RMD160 8b878f9f9372bafe6eee77613ac6d47658316882 ChangeLog 1884
-SHA256 4fd89f20af6c08a962e2c7f2462560c99503a82afd9fda0dd505682a69d2f878 ChangeLog 1884
+EBUILD axiom-0.5.27.ebuild 987 RMD160 f59889794ed562aeca055c2726e4596cef219896 SHA1 e2ed4022bc80d384f9f325ba8aaa4b6a5631125f SHA256 a15bc4241ce59b93e4095c9735a728d35363faab62f88b000567dfcafe4c0532
+MD5 536834967f71853907e370ee9be14c4f axiom-0.5.27.ebuild 987
+RMD160 f59889794ed562aeca055c2726e4596cef219896 axiom-0.5.27.ebuild 987
+SHA256 a15bc4241ce59b93e4095c9735a728d35363faab62f88b000567dfcafe4c0532 axiom-0.5.27.ebuild 987
+MISC ChangeLog 2092 RMD160 26ece95dcc5fe0326985e90e8f0fd24e499fb5c9 SHA1 771b94693dc5c82b15180fd6f53efacd07404be5 SHA256 baee1d03b3f70494b289cc55d97dbf190bda2153e029b45fe5fc07f73969e092
+MD5 abb0453ca5d46c7af3fc1b7f4a36c774 ChangeLog 2092
+RMD160 26ece95dcc5fe0326985e90e8f0fd24e499fb5c9 ChangeLog 2092
+SHA256 baee1d03b3f70494b289cc55d97dbf190bda2153e029b45fe5fc07f73969e092 ChangeLog 2092
 MISC metadata.xml 643 RMD160 db810d4f65c9ce6e27f2adc69d50bd09fedaa7e0 SHA1 62a214107d46babc94550751d83fcce57978121c SHA256 083eac150ece10d9e2b24312148702afc34c210aa4a8726135c920fa6353f8de
 MD5 802ad1b55865e3db7bd222d60f78af6d metadata.xml 643
 RMD160 db810d4f65c9ce6e27f2adc69d50bd09fedaa7e0 metadata.xml 643
 SHA256 083eac150ece10d9e2b24312148702afc34c210aa4a8726135c920fa6353f8de metadata.xml 643
-MD5 fd17d0fdc343229cdc4e847bc4177d65 files/digest-axiom-0.4.0 232
-RMD160 d0ce42ddf527e1a64a1575777eb23b0e92a3ee07 files/digest-axiom-0.4.0 232
-SHA256 38ede43ff3254cfa010eac15b99ecbd4e1334ac0a0b201b428d9aef4051505b4 files/digest-axiom-0.4.0 232
-MD5 755f0ca6c3040d091d248bb19e302859 files/digest-axiom-0.5.0 235
-RMD160 2907eb5dedbf687edfba93923f2ae260288818c4 files/digest-axiom-0.5.0 235
-SHA256 5a2476443e0f771e140cc4a840cc881c85dfdb4a96af5db7427b13835db41dc0 files/digest-axiom-0.5.0 235
 MD5 92fcf250bb5e638593e52fa75d07da93 files/digest-axiom-0.5.20 238
 RMD160 6bf28ba3f91a8d8654bb1f427dc89f475d7da2b9 files/digest-axiom-0.5.20 238
 SHA256 de929048e6dd99d5725b23d2bd37fe027398e28dde94e5fd3008e99fd77a5bfa files/digest-axiom-0.5.20 238
+MD5 5e4e00a77f37ed55cbc1796b02048f21 files/digest-axiom-0.5.27 238
+RMD160 81b1e031e33991c7483b0174d7f329a62c0be46f files/digest-axiom-0.5.27 238
+SHA256 652a0c2b61cdbd3a08dc90bc2b8b61aca51aa1a5e3b9f4a4cc3b5dd888b88e4e files/digest-axiom-0.5.27 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHlpVIQU4yORhF8iARAkI4AJ924fenkFL5gULdivzv6hER0TLj+gCgvMIF
+F+40p0SzM+6hm8jsw1Nhxrk=
+=LU0f
+-----END PGP SIGNATURE-----
diff --git a/dev-python/axiom/axiom-0.4.0.ebuild b/dev-python/axiom/axiom-0.4.0.ebuild
deleted file mode 100644
index 6ce4e40148fd..000000000000
--- a/dev-python/axiom/axiom-0.4.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/axiom-0.4.0.ebuild,v 1.7 2006/08/02 03:33:26 tgall Exp $
-
-inherit distutils eutils
-
-DESCRIPTION="Axiom is an object database implemented on top of SQLite."
-HOMEPAGE="http://divmod.org/trac/wiki/DivmodAxiom"
-SRC_URI="mirror://gentoo/Axiom-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~ia64 ~ppc64 ~x86"
-IUSE=""
-
-DEPEND=">=dev-lang/python-2.4
-	>=dev-db/sqlite-3.2.7
-	>=dev-python/twisted-2.2
-	>=dev-python/pysqlite-2.0
-	=dev-python/epsilon-0.4*"
-
-S="${WORKDIR}/Axiom-${PV}"
-
-DOCS="NAME.txt"
-
-src_compile() {
-	# skip this, or epsilon will install the temporary "build" dir
-	true
-}
-
-src_test() {
-	trial axiom || die "trial failed"
-}
diff --git a/dev-python/axiom/axiom-0.5.0.ebuild b/dev-python/axiom/axiom-0.5.27.ebuild
index b35451a087ea..60b38777df4c 100644
--- a/dev-python/axiom/axiom-0.5.0.ebuild
+++ b/dev-python/axiom/axiom-0.5.27.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/axiom-0.5.0.ebuild,v 1.2 2007/01/14 21:52:59 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/axiom/axiom-0.5.27.ebuild,v 1.1 2008/01/23 01:16:05 hawking Exp $
 
 inherit distutils eutils
 
@@ -12,14 +12,14 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~ia64 ~x86"
+KEYWORDS="~ia64 ~ppc64 ~x86"
 IUSE=""
 
-DEPEND=">=dev-lang/python-2.4
+DEPEND="|| ( >=dev-lang/python-2.5
+	( >=dev-lang/python-2.4 >=dev-python/pysqlite-2.0 ) )
 	>=dev-db/sqlite-3.2.1
 	>=dev-python/twisted-2.4
 	>=dev-python/twisted-conch-0.7.0-r1
-	>=dev-python/pysqlite-2.0
 	=dev-python/epsilon-0.5*"
 RDEPEND="${DEPEND}"
 
@@ -27,6 +27,12 @@ S=${WORKDIR}/${MY_P}
 
 DOCS="NAME.txt"
 
+src_unpack() {
+	distutils_src_unpack
+
+	epatch "${FILESDIR}/${P}-sqlite3.patch"
+}
+
 src_compile() {
 	# skip this, or epsilon will install the temporary "build" dir
 	true
diff --git a/dev-python/axiom/files/axiom-0.5.27-sqlite3.patch b/dev-python/axiom/files/axiom-0.5.27-sqlite3.patch
new file mode 100644
index 000000000000..8913a1e70d80
--- /dev/null
+++ b/dev-python/axiom/files/axiom-0.5.27-sqlite3.patch
@@ -0,0 +1,45 @@
+--- axiom/_pysqlite2.py	2006-07-05 18:31:18.000000000 +0300
++++ axiom/_pysqlite2.py	2007-11-02 05:10:45.000000000 +0200
+@@ -8,7 +8,11 @@
+ """
+ import time
+ 
+-from pysqlite2 import dbapi2
++# Use python2.5's sqlite3 if avaliable
++try:
++    from sqlite3 import dbapi2
++except:
++    from pysqlite2 import dbapi2
+ 
+ from twisted.python import log
+ 
+--- axiom/test/test_pysqlite2.py	2006-07-02 19:23:40.000000000 +0300
++++ axiom/test/test_pysqlite2.py	2007-11-02 05:39:44.000000000 +0200
+@@ -2,7 +2,11 @@
+ Test cases for PySQLite2-specific parts of the backend.
+ """
+ 
+-from pysqlite2.dbapi2 import OperationalError
++# Use python2.5's sqlite3 if avaliable
++try:
++    from sqlite3.dbapi2 import OperationalError
++except:
++    from pysqlite2.dbapi2 import OperationalError
+ 
+ from twisted.trial.unittest import TestCase
+ 
+--- axiom/test/test_xatop.py	2007-02-23 02:09:19.000000000 +0200
++++ axiom/test/test_xatop.py	2007-11-02 05:38:48.000000000 +0200
+@@ -9,7 +9,11 @@
+ from axiom import attributes, item, store, errors
+ from axiom.errors import ItemNotFound
+ 
+-from pysqlite2.dbapi2 import sqlite_version_info
++# Use python2.5's sqlite3 if avaliable
++try:
++    from sqlite3.dbapi2 import sqlite_version_info
++except:
++    from pysqlite2.dbapi2 import sqlite_version_info
+ 
+ 
+ class RevertException(Exception):
diff --git a/dev-python/axiom/files/digest-axiom-0.4.0 b/dev-python/axiom/files/digest-axiom-0.4.0
deleted file mode 100644
index 2041d2a372fc..000000000000
--- a/dev-python/axiom/files/digest-axiom-0.4.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d5427672a5e1f68ce32889c6610d7271 Axiom-0.4.0.tar.gz 66266
-RMD160 1b31cd530376db050274b4c8f9fbe0d03a3595c7 Axiom-0.4.0.tar.gz 66266
-SHA256 fcb2138c03668b05e70196960e0faaede5fa8ca0c62b909525b85d878ff1384f Axiom-0.4.0.tar.gz 66266
diff --git a/dev-python/axiom/files/digest-axiom-0.5.0 b/dev-python/axiom/files/digest-axiom-0.5.0
deleted file mode 100644
index d6ba246245d2..000000000000
--- a/dev-python/axiom/files/digest-axiom-0.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 17d9dbee34f65fba0bdac66dda3a386b Axiom-0.5.0.tar.gz 103771
-RMD160 16d8b67ba7bb2dddb932cc675e0114d5a6c91a84 Axiom-0.5.0.tar.gz 103771
-SHA256 a912b80b65e4f1ed2161a2306c56f147e49cd599964c9b62dfa8e112aa0fad46 Axiom-0.5.0.tar.gz 103771
diff --git a/dev-python/axiom/files/digest-axiom-0.5.27 b/dev-python/axiom/files/digest-axiom-0.5.27
new file mode 100644
index 000000000000..44ceeff31ad0
--- /dev/null
+++ b/dev-python/axiom/files/digest-axiom-0.5.27
@@ -0,0 +1,3 @@
+MD5 61e9d55dbe5fe290ab5ab36be2f01236 Axiom-0.5.27.tar.gz 163648
+RMD160 36478cd4e6035f987e6bf23a16525dbb535c7bc1 Axiom-0.5.27.tar.gz 163648
+SHA256 19889cca81ea7e2cb5bf4f82d9e9e352e42fa2c8f54ff7305cc68376d5324dfc Axiom-0.5.27.tar.gz 163648