1 |
commit: ce03630f05278e2f0d559cd7136cc0287ed0d835 |
2 |
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com> |
3 |
AuthorDate: Fri Apr 27 18:08:51 2018 +0000 |
4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Apr 29 10:29:23 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce03630f |
7 |
|
8 |
dev-python/flask: git-2->git-r3, unify ebuilds |
9 |
|
10 |
dev-python/flask-9999 does not install properly due to flask/json not |
11 |
being found, issue exists without my changes as well. |
12 |
|
13 |
Package-Manager: Portage-2.3.31, Repoman-2.3.9 |
14 |
|
15 |
dev-python/flask/flask-0.12.2.ebuild | 25 +++++++++++++----------- |
16 |
dev-python/flask/flask-9999.ebuild | 38 +++++++++++++++++++++--------------- |
17 |
2 files changed, 36 insertions(+), 27 deletions(-) |
18 |
|
19 |
diff --git a/dev-python/flask/flask-0.12.2.ebuild b/dev-python/flask/flask-0.12.2.ebuild |
20 |
index 498dd328b2f..a6175a6ac4c 100644 |
21 |
--- a/dev-python/flask/flask-0.12.2.ebuild |
22 |
+++ b/dev-python/flask/flask-0.12.2.ebuild |
23 |
@@ -7,30 +7,33 @@ PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy{,3} ) |
24 |
|
25 |
inherit distutils-r1 |
26 |
|
27 |
-MY_PN="Flask" |
28 |
-MY_P="${MY_PN}-${PV}" |
29 |
- |
30 |
DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions" |
31 |
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" |
32 |
HOMEPAGE="https://github.com/pallets/flask/" |
33 |
+MY_PN="Flask" |
34 |
+MY_P="${MY_PN}-${PV}" |
35 |
+if [[ ${PV} == *9999* ]]; then |
36 |
+ EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git" |
37 |
+ inherit git-r3 |
38 |
+else |
39 |
+ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" |
40 |
+ KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux" |
41 |
+ S="${WORKDIR}/${MY_P}" |
42 |
+fi |
43 |
|
44 |
LICENSE="BSD" |
45 |
SLOT="0" |
46 |
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux" |
47 |
IUSE="doc examples test" |
48 |
|
49 |
-RDEPEND=">=dev-python/blinker-1[${PYTHON_USEDEP}] |
50 |
- >=dev-python/werkzeug-0.7[${PYTHON_USEDEP}] |
51 |
- >=dev-python/jinja-2.4[${PYTHON_USEDEP}] |
52 |
+RDEPEND=">=dev-python/click-2[${PYTHON_USEDEP}] |
53 |
+ >=dev-python/blinker-1[${PYTHON_USEDEP}] |
54 |
>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}] |
55 |
- >=dev-python/click-2[${PYTHON_USEDEP}]" |
56 |
+ >=dev-python/jinja-2.4[${PYTHON_USEDEP}] |
57 |
+ >=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]" |
58 |
DEPEND="${RDEPEND} |
59 |
dev-python/setuptools[${PYTHON_USEDEP}] |
60 |
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
61 |
test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
62 |
|
63 |
-S="${WORKDIR}/${MY_P}" |
64 |
- |
65 |
python_prepare_all() { |
66 |
# Prevent un-needed d'loading |
67 |
sed -e "s/ 'sphinx.ext.intersphinx',//" -i docs/conf.py || die |
68 |
|
69 |
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild |
70 |
index 0b68b4717e5..3329ccaa5a9 100644 |
71 |
--- a/dev-python/flask/flask-9999.ebuild |
72 |
+++ b/dev-python/flask/flask-9999.ebuild |
73 |
@@ -1,43 +1,49 @@ |
74 |
-# Copyright 1999-2017 Gentoo Foundation |
75 |
+# Copyright 1999-2018 Gentoo Foundation |
76 |
# Distributed under the terms of the GNU General Public License v2 |
77 |
|
78 |
-EAPI="5" |
79 |
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
80 |
+EAPI=6 |
81 |
|
82 |
-inherit distutils-r1 git-2 |
83 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
84 |
|
85 |
-EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git" |
86 |
+inherit distutils-r1 |
87 |
|
88 |
DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions" |
89 |
+HOMEPAGE="https://pypi.org/project/Flask/" |
90 |
MY_PN="Flask" |
91 |
MY_P="${MY_PN}-${PV}" |
92 |
-SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" |
93 |
-HOMEPAGE="https://pypi.org/project/Flask/" |
94 |
+if [[ ${PV} == *9999* ]]; then |
95 |
+ EGIT_REPO_URI="https://github.com/mitsuhiko/flask.git" |
96 |
+ inherit git-r3 |
97 |
+else |
98 |
+ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" |
99 |
+ KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
100 |
+ S="${WORKDIR}/${MY_P}" |
101 |
+fi |
102 |
|
103 |
LICENSE="BSD" |
104 |
SLOT="0" |
105 |
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" |
106 |
-IUSE="examples test" |
107 |
+IUSE="doc examples test" |
108 |
|
109 |
RDEPEND="dev-python/blinker[${PYTHON_USEDEP}] |
110 |
>=dev-python/itsdangerous-0.21[${PYTHON_USEDEP}] |
111 |
>=dev-python/jinja-2.4[${PYTHON_USEDEP}] |
112 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
113 |
>=dev-python/werkzeug-0.7[${PYTHON_USEDEP}]" |
114 |
DEPEND="${RDEPEND} |
115 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
116 |
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
117 |
test? ( dev-python/pytest[${PYTHON_USEDEP}] )" |
118 |
|
119 |
-S="${WORKDIR}/${MY_P}" |
120 |
-#if LIVE |
121 |
-SRC_URI= |
122 |
-KEYWORDS= |
123 |
-#endif |
124 |
+python_compile_all() { |
125 |
+ use doc && emake -C docs html |
126 |
+} |
127 |
|
128 |
python_test() { |
129 |
py.test tests || die "Testing failed with ${EPYTHON}" |
130 |
} |
131 |
|
132 |
python_install_all() { |
133 |
- use examples && local EXAMPLES=( examples/. ) |
134 |
+ use examples && dodoc -r examples |
135 |
+ use doc && HTML_DOCS=( docs/_build/html/. ) |
136 |
+ |
137 |
distutils-r1_python_install_all |
138 |
} |