| 1 |
arfrever 10/06/26 04:41:35 |
| 2 |
|
| 3 |
Modified: pastedeploy-1.3.3.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Fix building with USE="doc" (bug #318759). |
| 6 |
(Portage version: HEAD/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.7 dev-python/pastedeploy/pastedeploy-1.3.3.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild?rev=1.7&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild?rev=1.7&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild?r1=1.6&r2=1.7 |
| 14 |
|
| 15 |
Index: pastedeploy-1.3.3.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild,v |
| 18 |
retrieving revision 1.6 |
| 19 |
retrieving revision 1.7 |
| 20 |
diff -u -r1.6 -r1.7 |
| 21 |
--- pastedeploy-1.3.3.ebuild 6 Feb 2010 15:38:04 -0000 1.6 |
| 22 |
+++ pastedeploy-1.3.3.ebuild 26 Jun 2010 04:41:35 -0000 1.7 |
| 23 |
@@ -1,10 +1,11 @@ |
| 24 |
# Copyright 1999-2010 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild,v 1.6 2010/02/06 15:38:04 arfrever Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/pastedeploy-1.3.3.ebuild,v 1.7 2010/06/26 04:41:35 arfrever Exp $ |
| 28 |
|
| 29 |
-EAPI="2" |
| 30 |
+EAPI="3" |
| 31 |
PYTHON_DEPEND="2" |
| 32 |
SUPPORT_PYTHON_ABIS="1" |
| 33 |
+DISTUTILS_SRC_TEST="nosetests" |
| 34 |
|
| 35 |
inherit eutils distutils multilib |
| 36 |
|
| 37 |
@@ -22,33 +23,36 @@ |
| 38 |
|
| 39 |
RDEPEND="" |
| 40 |
DEPEND="dev-python/setuptools |
| 41 |
- doc? ( dev-python/buildutils dev-python/pygments dev-python/pudge ) |
| 42 |
- test? ( dev-python/nose dev-python/py )" |
| 43 |
+ doc? ( dev-python/pygments dev-python/sphinx )" |
| 44 |
RESTRICT_PYTHON_ABIS="3.*" |
| 45 |
|
| 46 |
S="${WORKDIR}/${MY_P}" |
| 47 |
|
| 48 |
PYTHON_MODNAME="paste/deploy" |
| 49 |
|
| 50 |
-src_compile() { |
| 51 |
- distutils_src_compile |
| 52 |
- if use doc; then |
| 53 |
- einfo "Generating docs as requested..." |
| 54 |
- PYTHONPATH=. "$(PYTHON -f)" setup.py pudge || die "Generation of documentation failed" |
| 55 |
- fi |
| 56 |
-} |
| 57 |
+src_prepare() { |
| 58 |
+ distutils_src_prepare |
| 59 |
|
| 60 |
-src_test() { |
| 61 |
# Delete broken test. |
| 62 |
rm -f tests/test_config_middleware.py |
| 63 |
+} |
| 64 |
+ |
| 65 |
+src_compile() { |
| 66 |
+ distutils_src_compile |
| 67 |
|
| 68 |
- testing() { |
| 69 |
- PYTHONPATH="build-${PYTHON_ABI}/lib" nosetests-${PYTHON_ABI} |
| 70 |
- } |
| 71 |
- python_execute_function testing |
| 72 |
+ if use doc; then |
| 73 |
+ einfo "Generation of documentation" |
| 74 |
+ PYTHONPATH="." "$(PYTHON -f)" setup.py build_sphinx || die "Generation of documentation failed" |
| 75 |
+ fi |
| 76 |
} |
| 77 |
|
| 78 |
src_install() { |
| 79 |
distutils_src_install |
| 80 |
- use doc && dohtml -r docs/html/* |
| 81 |
+ |
| 82 |
+ if use doc; then |
| 83 |
+ pushd build/sphinx/html > /dev/null |
| 84 |
+ docinto html |
| 85 |
+ cp -R [a-z]* _static "${ED}usr/share/doc/${PF}/html" || die "Installation of documentation failed" |
| 86 |
+ popd > /dev/null |
| 87 |
+ fi |
| 88 |
} |
| 89 |
|
| 90 |
|
| 91 |
|
| 92 |
1.9 dev-python/pastedeploy/ChangeLog |
| 93 |
|
| 94 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastedeploy/ChangeLog?rev=1.9&view=markup |
| 95 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastedeploy/ChangeLog?rev=1.9&content-type=text/plain |
| 96 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-python/pastedeploy/ChangeLog?r1=1.8&r2=1.9 |
| 97 |
|
| 98 |
Index: ChangeLog |
| 99 |
=================================================================== |
| 100 |
RCS file: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/ChangeLog,v |
| 101 |
retrieving revision 1.8 |
| 102 |
retrieving revision 1.9 |
| 103 |
diff -u -r1.8 -r1.9 |
| 104 |
--- ChangeLog 11 Oct 2009 08:27:30 -0000 1.8 |
| 105 |
+++ ChangeLog 26 Jun 2010 04:41:35 -0000 1.9 |
| 106 |
@@ -1,6 +1,10 @@ |
| 107 |
# ChangeLog for dev-python/pastedeploy |
| 108 |
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
| 109 |
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/ChangeLog,v 1.8 2009/10/11 08:27:30 grobian Exp $ |
| 110 |
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pastedeploy/ChangeLog,v 1.9 2010/06/26 04:41:35 arfrever Exp $ |
| 112 |
+ |
| 113 |
+ 26 Jun 2010; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o> |
| 114 |
+ pastedeploy-1.3.3.ebuild: |
| 115 |
+ Fix building with USE="doc" (bug #318759). |
| 116 |
|
| 117 |
11 Oct 2009; Fabian Groffen <grobian@g.o> pastedeploy-1.3.3.ebuild: |
| 118 |
Merge from Prefix |
Archives