summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-12-11 01:10:55 +0000
committerArfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>2009-12-11 01:10:55 +0000
commit66d4ea8899f2def91329596d4ecdc1579956bdf3 (patch)
tree3f7a3f80f64f69a8db3983d2ab5f5a9117d90a82 /dev-python/apsw
parentVersion bump and old version cleanup (diff)
downloadhistorical-66d4ea8899f2def91329596d4ecdc1579956bdf3.tar.gz
historical-66d4ea8899f2def91329596d4ecdc1579956bdf3.tar.bz2
historical-66d4ea8899f2def91329596d4ecdc1579956bdf3.zip
Fix tests (bug #295063).
Package-Manager: portage-15027-svn/cvs/Linux x86_64
Diffstat (limited to 'dev-python/apsw')
-rw-r--r--dev-python/apsw/ChangeLog6
-rw-r--r--dev-python/apsw/Manifest15
-rw-r--r--dev-python/apsw/apsw-3.6.20.1.ebuild10
-rw-r--r--dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch11
4 files changed, 27 insertions, 15 deletions
diff --git a/dev-python/apsw/ChangeLog b/dev-python/apsw/ChangeLog
index db5aec01e4f4..a18a5a0d59bc 100644
--- a/dev-python/apsw/ChangeLog
+++ b/dev-python/apsw/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-python/apsw
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/ChangeLog,v 1.21 2009/12/07 10:30:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/ChangeLog,v 1.22 2009/12/11 01:10:54 arfrever Exp $
+
+ 11 Dec 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+ apsw-3.6.20.1.ebuild, +files/apsw-3.6.20.1-fix_tests.patch:
+ Fix tests (bug #295063).
07 Dec 2009; Mike Frysinger <vapier@gentoo.org> apsw-3.6.18.1.ebuild,
apsw-3.6.19.1.ebuild, apsw-3.6.20.1.ebuild:
diff --git a/dev-python/apsw/Manifest b/dev-python/apsw/Manifest
index 43cc24277d03..06d815700536 100644
--- a/dev-python/apsw/Manifest
+++ b/dev-python/apsw/Manifest
@@ -1,18 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX apsw-3.6.20.1-fix_tests.patch 336 RMD160 000fca2da306de12102e7b5e6c082ffb6292f36d SHA1 b9e203462a78f6709519cac3e15ad0974294309c SHA256 87cafad98bbdeeed0cfe82ca98b2f7fa9768793535abb1bc7562de8c52f2adb1
DIST apsw-3.6.18-r1.zip 427261 RMD160 900ada3eaf46691cf27d7c304af5e8a4ff730b04 SHA1 a3c51e19a563665a27c7984021aa6f0d46f00ad4 SHA256 b078b209d942c149248139f7a8c1a45418ebade637479c3fff8a6c6bb20cb747
DIST apsw-3.6.19-r1.zip 501148 RMD160 b78bf93f663b1026d6b1aa122c41ffbcd5c134df SHA1 af4ae7a128707443f9835ba05290cb8ad675c75c SHA256 b27af6c859f2e2b11a35a6e536d5322fcef3abd9f2273a5b37bd7c214ced93d7
DIST apsw-3.6.20-r1.zip 529555 RMD160 1b7abc1d3ed709ae73b2fca6c0859b13d6b79fe7 SHA1 09ff8a7c76ea02f22e99e2dfdf42d315244a8412 SHA256 3c1eb0ae8068268cb6f5a616e9167102a60a41e940d4fae20c446836ebf8c9ae
EBUILD apsw-3.6.18.1.ebuild 929 RMD160 3d84fc2acab91a6f042fd51a41aefc5014ab62f0 SHA1 b7eeb0e5a6440884b9b68d30a3e044e7801e772b SHA256 d52d3902fd0820f4f8ffe086da1e7048eda3cbefd38354536d2dbaf863997463
EBUILD apsw-3.6.19.1.ebuild 932 RMD160 8c7ba5254e07fe385f14d34d360c97c246a87391 SHA1 796b38cccaf9bd0c9da4cd2fb54ade2ca551396e SHA256 309cbffa4620d98dd97bd5df9afacff5c43a013983597c896371b8b16e73837e
-EBUILD apsw-3.6.20.1.ebuild 932 RMD160 cc502c09a757bb32c02f722d91fa8d97c4573c0b SHA1 1d2a60d6f3913a194835940722ec062e1a054cc9 SHA256 ec0b05db6c31c4d4a09307ece696fee79063b6b693e1bbc9f0c7c674ead844a3
-MISC ChangeLog 2972 RMD160 8db46ed63f453ee78d145463e9d838240db49df9 SHA1 6e64795f6aa9bcc3b7e938ddca1a9112fa8a5697 SHA256 d17b710c50621e6ed172db9751621be8a623d155f5717cd65d266604c5d40881
+EBUILD apsw-3.6.20.1.ebuild 1027 RMD160 f06b9bd39303394f98b1de0d84b4f9d079b77a59 SHA1 29dce500eb0dedbe4c4836d64adcb75f89a0e535 SHA256 e973cee194bdd56d569ee02592dadb6a23acb77664670ae08f08c97d4e4d0606
+MISC ChangeLog 3137 RMD160 07c3a627ae4892cb9b282079b8ab1b04bb498bd8 SHA1 774bc3605345549d63236bd03f6412199478ffea SHA256 d2f76a065fc91de975c4bb613f89060fe46babc812bbd0c0b3afb9aa2b147f03
MISC metadata.xml 521 RMD160 46536dbaba8b078be569ccd226937c9ba8ae6e27 SHA1 79604d199b1674bdbf823380e6aac6f325ff3252 SHA256 d860d4be70d9a1797a97977de55a00abdb0dd58a6bb06afd94f90de5ac97d88e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.13 (GNU/Linux)
-
-iEYEARECAAYFAksc2WAACgkQlPl3HsVfCDqmewCghU9UPPvQRNbFvzMXeMh2UwZN
-3o0An3Tci5QG0s+Htj+y9uF2Gdx9MbYS
-=z7HI
------END PGP SIGNATURE-----
diff --git a/dev-python/apsw/apsw-3.6.20.1.ebuild b/dev-python/apsw/apsw-3.6.20.1.ebuild
index 10a25137b5b5..af5ff8b81655 100644
--- a/dev-python/apsw/apsw-3.6.20.1.ebuild
+++ b/dev-python/apsw/apsw-3.6.20.1.ebuild
@@ -1,11 +1,11 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.6.20.1.ebuild,v 1.2 2009/12/07 10:30:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/apsw/apsw-3.6.20.1.ebuild,v 1.3 2009/12/11 01:10:54 arfrever Exp $
EAPI="2"
SUPPORT_PYTHON_ABIS="1"
-inherit distutils versionator
+inherit distutils eutils versionator
MY_PV="$(replace_version_separator 3 -r)"
@@ -24,6 +24,12 @@ DEPEND="${RDEPEND}
S="${WORKDIR}/${PN}-${MY_PV}"
+src_prepare() {
+ distutils_src_prepare
+
+ epatch "${FILESDIR}/${P}-fix_tests.patch"
+}
+
src_compile() {
distutils_src_compile --omit=LOAD_EXTENSION
}
diff --git a/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch b/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch
new file mode 100644
index 000000000000..3bbce88500be
--- /dev/null
+++ b/dev-python/apsw/files/apsw-3.6.20.1-fix_tests.patch
@@ -0,0 +1,11 @@
+--- tests.py
++++ tests.py
+@@ -5480,7 +5480,7 @@
+ testnasty()
+
+ # What happens if db cannot be opened?
+- s.process_args(args=["/"])
++ s.process_args(args=["src"])
+ reset()
+ cmd("select * from sqlite_master;\n.bail on\nselect 3;\n")
+ self.assertRaises(apsw.CantOpenError, s.cmdloop)