Version bump.

Package-Manager: portage-2.1.4.4

6 files changed, 64 insertions, 66 deletions

diff --git a/dev-python/apsw/ChangeLog b/dev-python/apsw/ChangeLog
index 314e28c12386..b4d82dd4c41b 100644
--- a/dev-python/apsw/ChangeLog
+++ b/dev-python/apsw/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/apsw
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/ChangeLog,v 1.8 2008/07/06 19:03:52 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/ChangeLog,v 1.9 2008/08/15 17:46:13 mrness Exp $
+
+*apsw-3.5.9.2 (15 Aug 2008)
+
+  15 Aug 2008; Alin Năstac <mrness@gentoo.org>
+  +files/apsw-3.5.9.2-gentoo.patch, -apsw-3.3.5.1.ebuild,
+  -apsw-3.3.10.1.ebuild, +apsw-3.5.9.2.ebuild:
+  Version bump.
 
   06 Jul 2008; Christian Faulhammer <opfer@gentoo.org> apsw-3.3.13.1.ebuild:
   stable x86, bug 230377
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 34c7380c2e5c..a993eb3e6bc9 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,18 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST apsw-3.3.10-r1.zip 87604 RMD160 94f86cd9399105bf7ae8ce679ddcf96fdf94eed4 SHA1 67b76ed87ed25a2e2dfaf411eace2abf9d5feb76 SHA256 9706a5043b4a9535f400aa3d9cb48ec795f38e7ac9424edb92fe009a2ee4eb89
+AUX apsw-3.5.9.2-gentoo.patch 508 RMD160 45bbcf7e0e64724224aeb04da771e132bc75fc4e SHA1 33f3ca3e2adcd5e97d6280a76d2882f939bc7aa2 SHA256 7b9a6d7a356ec4f3287cd43faea5b72bbf9ddf1da435230c0e8c758ae8f1f508
 DIST apsw-3.3.13-r1.zip 86905 RMD160 2660140814d5d9bd027100a6054ccf6c0dbb7b53 SHA1 fde946d23c12683bd190ffb8193e29f3c8c8fee4 SHA256 3895ca28ef50fa134518ff17537a0961061d2457d89cb595f5b41a47541ab0be
-DIST apsw-3.3.5-r1.zip 48493 RMD160 35507908a8761737867ea5bcc76c9022ad54606d SHA1 71f04dd1e1145f3bc32c90633559a6b099a47bb3 SHA256 1aa29edff085aa2abb867d150674d6e24cfb2bbbf3419a7b804efb6415e9241d
-EBUILD apsw-3.3.10.1.ebuild 773 RMD160 7e57be24f5908f6058388b211d0f85d8fab91b53 SHA1 30be41e8d2b0e5e93833c28f5ba3e6df52e7f384 SHA256 12d631f43d60d4e57522eb2c9bc394dcb4d403554744ae15e25b8c22dfcc3a2e
+DIST apsw-3.5.9-r2.zip 105305 RMD160 e0e225c3eda4e4d8c97d2f5fe5f0fe14438cf1b4 SHA1 5f40ba3f0132d90b7a8bf22739029e0793ef3c2c SHA256 e6e823d40e72f3fde36b4bf30d394c5d5f333f55a6174ac5ebd259221df9a512
 EBUILD apsw-3.3.13.1.ebuild 812 RMD160 a5581672ad7471b9452bc0e87a21a7cd42931713 SHA1 98018dec354756540b442b26cf62700348df3d42 SHA256 acfb16f59a862556d6d66b4eff962fb6a322dfbe9fcf400dc39f0078db8d465a
-EBUILD apsw-3.3.5.1.ebuild 639 RMD160 ea3b98df29c3797763ec2f6634ccd540d7103ce1 SHA1 84b4fdb43b5249b92aecff320dd0c673d51b00cc SHA256 2c1d4522bce4330e15965fede572831274e6530692b677c5600045c1028e3f28
-MISC ChangeLog 1190 RMD160 dea321019d72ca1fc3b67a6ab1661c8d51a7b785 SHA1 2d81d60f7deda619be672083df0d7356d745c8bd SHA256 bd034bc30d8d5d0c616ada97f82c0f95c8ed47e7f51a2b3c220331f5227f20be
+EBUILD apsw-3.5.9.2.ebuild 867 RMD160 cc4eec18f0c6e57df95a61e8ef1ff16372ec7f52 SHA1 48e8b5226763ae451fe98d73aed3d621b5457383 SHA256 a0613577e35449dc40b20722f19113a1c2c8fc23fe6d85d15277ba6f8ddcd5b1
+MISC ChangeLog 1390 RMD160 9444e75908f57b493bb1c76aa835e328b93734ce SHA1 e40c97c55c44b11589e546aa8f7e28066e052e21 SHA256 1bd9d4377d75072d3b54928c753b32187ea14782b6a220f270b894f6060eda03
 MISC metadata.xml 521 RMD160 46536dbaba8b078be569ccd226937c9ba8ae6e27 SHA1 79604d199b1674bdbf823380e6aac6f325ff3252 SHA256 d860d4be70d9a1797a97977de55a00abdb0dd58a6bb06afd94f90de5ac97d88e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkhxF1AACgkQNQqtfCuFneNg1QCfUm7WZBUoC3FcOUNgorjQqrve
-Dq8An2Ycsp0blHQgNNp5SjttrM2mqJOy
-=tuiX
+iEYEARECAAYFAkilwPUACgkQPrHvTlXvhtvnQACeLEc7qiJIgGZR1AGyBcEp26Mr
+lfsAn3R+JtAlPE+9dwMxxHuYCq1YZwIk
+=RhhN
 -----END PGP SIGNATURE-----
diff --git a/dev-python/apsw/apsw-3.3.10.1.ebuild b/dev-python/apsw/apsw-3.3.10.1.ebuild
deleted file mode 100644
index aa049f40407f..000000000000
--- a/dev-python/apsw/apsw-3.3.10.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.3.10.1.ebuild,v 1.1 2007/02/14 20:49:24 dev-zero Exp $
-
-inherit distutils versionator
-
-MY_P=${PN}-$(replace_version_separator 3 -r)
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://www.rogerbinns.com/apsw.html"
-SRC_URI="mirror://sourceforge/bitpim/${MY_P}.zip"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/python
-	>=dev-db/sqlite-3.3.10"
-DEPEND="app-arch/unzip
-	${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
-	distutils_src_install
-	dohtml apsw.html
-}
-
-src_test() {
-	PYTHONPATH="$(ls -d build/lib.*)" "${python}" tests.py || die "tests failed"
-}
diff --git a/dev-python/apsw/apsw-3.3.5.1.ebuild b/dev-python/apsw/apsw-3.3.5.1.ebuild
deleted file mode 100644
index 9ce3842b20a6..000000000000
--- a/dev-python/apsw/apsw-3.3.5.1.ebuild
+++ /dev/null
@@ -1,25 +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/apsw/apsw-3.3.5.1.ebuild,v 1.4 2006/09/17 13:12:15 mrness Exp $
-
-inherit distutils
-
-MY_ORIG_PV="${PV%.*}-r${PV##*.}"
-
-DESCRIPTION="APSW - Another Python SQLite Wrapper"
-HOMEPAGE="http://www.rogerbinns.com/apsw.html"
-SRC_URI="mirror://sourceforge/bitpim/${PN}-${MY_ORIG_PV}.zip"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 x86"
-IUSE=""
-
-RDEPEND="dev-lang/python
-	>=dev-db/sqlite-3.3.5"
-DEPEND="app-arch/unzip
-	${RDEPEND}"
-
-S="${WORKDIR}/${PN}-${MY_ORIG_PV}"
-
-PYTHON_MODNAME="apsw"
diff --git a/dev-python/apsw/apsw-3.5.9.2.ebuild b/dev-python/apsw/apsw-3.5.9.2.ebuild
new file mode 100644
index 000000000000..25169420c125
--- /dev/null
+++ b/dev-python/apsw/apsw-3.5.9.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.5.9.2.ebuild,v 1.1 2008/08/15 17:46:13 mrness Exp $
+
+inherit eutils distutils versionator
+
+MY_PV=$(replace_version_separator 3 -r)
+
+DESCRIPTION="APSW - Another Python SQLite Wrapper"
+HOMEPAGE="http://code.google.com/p/apsw/"
+SRC_URI="http://apsw.googlecode.com/files/${PN}-${MY_PV}.zip"
+
+LICENSE="as-is"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/python
+	>=dev-db/sqlite-3.5.9"
+DEPEND="app-arch/unzip
+	${RDEPEND}"
+
+S="${WORKDIR}/${PN}-${MY_PV}"
+
+src_unpack() {
+	distutils_src_unpack
+	epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_install() {
+	distutils_src_install
+	dohtml apsw.html
+}
+
+src_test() {
+	PYTHONPATH="$(ls -d build/lib.*)" "${python}" tests.py || die "tests failed"
+}
diff --git a/dev-python/apsw/files/apsw-3.5.9.2-gentoo.patch b/dev-python/apsw/files/apsw-3.5.9.2-gentoo.patch
new file mode 100644
index 000000000000..d1e50964153a
--- /dev/null
+++ b/dev-python/apsw/files/apsw-3.5.9.2-gentoo.patch
@@ -0,0 +1,12 @@
+diff -ur apsw-3.5.9-r2.orig/setup.py apsw-3.5.9-r2/setup.py
+--- apsw-3.5.9-r2.orig/setup.py	2008-07-07 03:37:42.000000000 +0000
++++ apsw-3.5.9-r2/setup.py	2008-08-15 17:31:07.000000000 +0000
+@@ -19,7 +19,7 @@
+ # If you compiled SQLite omitting functionality then specify the same
+ # defines here.  For example this exlcudes loadable extensions.
+ #
+-# define_macros.append( ('SQLITE_OMIT_LOAD_EXTENSION', '1') )
++define_macros.append( ('SQLITE_OMIT_LOAD_EXTENSION', '1') )
+ 
+ include_dirs=[]
+ library_dirs=[]