| 1 |
mgorny 13/03/28 10:51:19 |
| 2 |
|
| 3 |
Modified: webob-1.0.8-r1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix the -r1 backport by syncing up to the fresh ebuild. Fixes bug #463572. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha170/cvs/Linux x86_64, signed Manifest commit with key 9627F456F9DA7643!) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-python/webob/webob-1.0.8-r1.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/webob/webob-1.0.8-r1.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/webob/webob-1.0.8-r1.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/webob/webob-1.0.8-r1.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: webob-1.0.8-r1.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.0.8-r1.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- webob-1.0.8-r1.ebuild 25 Mar 2013 15:28:35 -0000 1.1 |
| 23 |
+++ webob-1.0.8-r1.ebuild 28 Mar 2013 10:51:19 -0000 1.2 |
| 24 |
@@ -1,14 +1,15 @@ |
| 25 |
# Copyright 1999-2013 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.0.8-r1.ebuild,v 1.1 2013/03/25 15:28:35 prometheanfire Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/webob-1.0.8-r1.ebuild,v 1.2 2013/03/28 10:51:19 mgorny Exp $ |
| 29 |
|
| 30 |
-EAPI="5" |
| 31 |
-PYTHON_COMPAT=( python2_{5,6,7} ) |
| 32 |
+EAPI=5 |
| 33 |
|
| 34 |
-inherit distutils-r1 eutils |
| 35 |
+PYTHON_COMPAT=( python{2_6,2_7} ) |
| 36 |
|
| 37 |
-MY_PN="WebOb" |
| 38 |
-MY_P="${MY_PN}-${PV}" |
| 39 |
+inherit distutils-r1 |
| 40 |
+ |
| 41 |
+MY_PN=WebOb |
| 42 |
+MY_P=${MY_PN}-${PV} |
| 43 |
|
| 44 |
DESCRIPTION="WSGI request and response object" |
| 45 |
HOMEPAGE="http://webob.org/ http://pypi.python.org/pypi/WebOb" |
| 46 |
@@ -17,31 +18,32 @@ |
| 47 |
LICENSE="MIT" |
| 48 |
SLOT="0" |
| 49 |
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" |
| 50 |
-IUSE="doc" |
| 51 |
+IUSE="doc" # test" |
| 52 |
|
| 53 |
DEPEND="app-arch/unzip |
| 54 |
- dev-python/setuptools |
| 55 |
- doc? ( dev-python/sphinx )" |
| 56 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
| 57 |
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" |
| 58 |
+# test? ( dev-python/nose[${PYTHON_USEDEP}] |
| 59 |
+# dev-python/webtest[${PYTHON_USEDEP}] )" |
| 60 |
RDEPEND="" |
| 61 |
|
| 62 |
-S="${WORKDIR}/${MY_P}" |
| 63 |
+# Almost impossible to solve circ-dep with dev-python/webtest. |
| 64 |
+# (due to different PYTHON_COMPAT) |
| 65 |
+RESTRICT=test |
| 66 |
|
| 67 |
-src_compile() { |
| 68 |
- distutils-r1_python_compile |
| 69 |
+S=${WORKDIR}/${MY_P} |
| 70 |
|
| 71 |
+python_compile_all() { |
| 72 |
if use doc; then |
| 73 |
- einfo "Generation of documentation" |
| 74 |
- "$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed" |
| 75 |
+ "${PYTHON}" setup.py build_sphinx || die |
| 76 |
fi |
| 77 |
} |
| 78 |
|
| 79 |
-src_install() { |
| 80 |
- distutils-r1_python_install |
| 81 |
+python_test() { |
| 82 |
+ nosetests -w tests || die "Tests fail with ${EPYTHON}" |
| 83 |
+} |
| 84 |
|
| 85 |
- if use doc; then |
| 86 |
- pushd build/sphinx/html > /dev/null |
| 87 |
- insinto /usr/share/doc/${PF}/html |
| 88 |
- doins -r [a-z]* _static || die "Installation of documentation failed" |
| 89 |
- popd > /dev/null |
| 90 |
- fi |
| 91 |
+python_install_all() { |
| 92 |
+ use doc && local HTML_DOCS=( build/sphinx/html/. ) |
| 93 |
+ distutils-r1_python_install_all |
| 94 |
} |
| 95 |
|
| 96 |
|
| 97 |
|
| 98 |
1.69 dev-python/webob/ChangeLog |
| 99 |
|
| 100 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/webob/ChangeLog?rev=1.69&view=markup |
| 101 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/webob/ChangeLog?rev=1.69&content-type=text/plain |
| 102 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/webob/ChangeLog?r1=1.68&r2=1.69 |
| 103 |
|
| 104 |
Index: ChangeLog |
| 105 |
=================================================================== |
| 106 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/webob/ChangeLog,v |
| 107 |
retrieving revision 1.68 |
| 108 |
retrieving revision 1.69 |
| 109 |
diff -u -r1.68 -r1.69 |
| 110 |
--- ChangeLog 27 Mar 2013 14:09:05 -0000 1.68 |
| 111 |
+++ ChangeLog 28 Mar 2013 10:51:19 -0000 1.69 |
| 112 |
@@ -1,6 +1,9 @@ |
| 113 |
# ChangeLog for dev-python/webob |
| 114 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 115 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/ChangeLog,v 1.68 2013/03/27 14:09:05 ago Exp $ |
| 116 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/webob/ChangeLog,v 1.69 2013/03/28 10:51:19 mgorny Exp $ |
| 117 |
+ |
| 118 |
+ 28 Mar 2013; Michał Górny <mgorny@g.o> webob-1.0.8-r1.ebuild: |
| 119 |
+ Fix the -r1 backport by syncing up to the fresh ebuild. Fixes bug #463572. |
| 120 |
|
| 121 |
27 Mar 2013; Agostino Sarubbo <ago@g.o> webob-1.2.3.ebuild: |
| 122 |
Stable for arm, wrt bug #456614 |
Archives