| 1 |
idella4 14/04/01 11:17:49 |
| 2 |
|
| 3 |
Modified: bsddb3-6.0.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
install phase tidied, un-needed removal of tests folders removed, test phase revised and fixed for py3 due to flaws in the source code's setup, includes the patch. Fixes Bugs #493500 by Nikoli and #476246 by Patrick |
| 6 |
|
| 7 |
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0xB8072B0D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/bsddb3/bsddb3-6.0.1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: bsddb3-6.0.1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- bsddb3-6.0.1.ebuild 8 Jan 2014 05:47:34 -0000 1.1 |
| 23 |
+++ bsddb3-6.0.1.ebuild 1 Apr 2014 11:17:49 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v 1.1 2014/01/08 05:47:34 patrick Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/bsddb3-6.0.1.ebuild,v 1.2 2014/04/01 11:17:49 idella4 Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} ) |
| 32 |
@@ -20,10 +20,10 @@ |
| 33 |
DEPEND="${RDEPEND} |
| 34 |
dev-python/setuptools[${PYTHON_USEDEP}]" |
| 35 |
|
| 36 |
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") |
| 37 |
+# PYTHON_CFLAGS=("2.* + -fno-strict-aliasing") |
| 38 |
|
| 39 |
-DOCS=( ChangeLog TODO.txt ) |
| 40 |
DISTUTILS_IN_SOURCE_BUILD=1 |
| 41 |
+PATCHES=( "${FILESDIR}"/py3tests.patch ) |
| 42 |
|
| 43 |
src_configure() { |
| 44 |
local DB_VER |
| 45 |
@@ -45,31 +45,24 @@ |
| 46 |
} |
| 47 |
|
| 48 |
python_test() { |
| 49 |
- # https://sourceforge.net/p/pybsddb/bugs/72/ |
| 50 |
+ # py3 tests misfire in the source om running test_all.py |
| 51 |
+ local test |
| 52 |
pushd "${BUILD_DIR}"/../ > /dev/null |
| 53 |
if [[ "${EPYTHON}" == python2* ]]; then |
| 54 |
- "${PYTHON}" build/lib/bsddb3/tests/test_all.py |
| 55 |
- elif [[ "${EPYTHON}" == python3* ]]; then |
| 56 |
- if [[ "${EPYTHON}" == 'python3.3' ]]; then |
| 57 |
- einfo "py3.3 has an internal problem within this ebuild but is known to pass tests" |
| 58 |
- else |
| 59 |
- "${PYTHON}" setup.py build |
| 60 |
- einfo "all 500 tests are run silently and may take a number of minutes to complete" |
| 61 |
- "${PYTHON}" -v test3.py || die |
| 62 |
- fi |
| 63 |
+ einfo "all 500 tests are run silently and may take a number of minutes to complete" |
| 64 |
+ "${PYTHON}" build/lib/bsddb3/tests/test_all.py || die "tests failed under ${EPYTHON}" |
| 65 |
+ elif python_is_python3; then |
| 66 |
+ mv Lib3/bsddb/test/test_all.py . || die |
| 67 |
+ for test in Lib3/bsddb/test/test_* |
| 68 |
+ do |
| 69 |
+ "${PYTHON}" $test || die "tet $test failed under ${EPYTHON}" |
| 70 |
+ einfo "test $test passed OK";einfo "" |
| 71 |
+ done |
| 72 |
fi |
| 73 |
-} |
| 74 |
- |
| 75 |
-python_install() { |
| 76 |
- rm -fr "${ED}$(python_get_sitedir)/bsddb3/tests" |
| 77 |
- |
| 78 |
- if use doc; then |
| 79 |
- dohtml -r docs/html/* || die "dohtml failed" |
| 80 |
- fi |
| 81 |
- distutils-r1_python_install |
| 82 |
+ popd > /dev/null |
| 83 |
} |
| 84 |
|
| 85 |
python_install_all() { |
| 86 |
- local HTML_DOCS=( docs/html/. ) |
| 87 |
+ use doc && local HTML_DOCS=( docs/html/. ) |
| 88 |
distutils-r1_python_install_all |
| 89 |
} |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.100 dev-python/bsddb3/ChangeLog |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/ChangeLog?rev=1.100&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/ChangeLog?rev=1.100&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/bsddb3/ChangeLog?r1=1.99&r2=1.100 |
| 98 |
|
| 99 |
Index: ChangeLog |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v |
| 102 |
retrieving revision 1.99 |
| 103 |
retrieving revision 1.100 |
| 104 |
diff -u -r1.99 -r1.100 |
| 105 |
--- ChangeLog 15 Jan 2014 12:41:37 -0000 1.99 |
| 106 |
+++ ChangeLog 1 Apr 2014 11:17:49 -0000 1.100 |
| 107 |
@@ -1,6 +1,6 @@ |
| 108 |
# ChangeLog for dev-python/bsddb3 |
| 109 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.99 2014/01/15 12:41:37 ago Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/bsddb3/ChangeLog,v 1.100 2014/04/01 11:17:49 idella4 Exp $ |
| 112 |
|
| 113 |
15 Jan 2014; Agostino Sarubbo <ago@g.o> bsddb3-6.0.0.ebuild: |
| 114 |
Stable for sparc, wrt bug #482056 |
| 115 |
@@ -47,7 +47,7 @@ |
| 116 |
|
| 117 |
28 May 2013; Ian Delaney <idella4@g.o> +bsddb3-5.3.0-r1.ebuild, |
| 118 |
bsddb3-5.3.0.ebuild: |
| 119 |
- revbump, migrate -> distutils-r1, tes fail cited wrt Bug #470976 |
| 120 |
+ revbump, migrate -> distutils-r1, test fail cited wrt Bug #470976 |
| 121 |
|
| 122 |
02 Feb 2013; Agostino Sarubbo <ago@g.o> bsddb3-5.3.0.ebuild: |
| 123 |
Add ~arm, wrt bug #449220 |
Archives