1 |
commit: f13e7efa803147e9f82a01b6f7a6a8193f707e81 |
2 |
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Aug 1 17:53:00 2018 +0000 |
4 |
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Aug 1 17:57:17 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f13e7efa |
7 |
|
8 |
dev-python/django: security bump to 1.11.15 and 2.0.8 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/662580 |
11 |
Package-Manager: Portage-2.3.44, Repoman-2.3.10 |
12 |
|
13 |
dev-python/django/Manifest | 3 ++- |
14 |
.../django/{django-2.0.7.ebuild => django-1.11.15.ebuild} | 12 +++++++----- |
15 |
.../django/{django-2.0.7.ebuild => django-2.0.8.ebuild} | 0 |
16 |
3 files changed, 9 insertions(+), 6 deletions(-) |
17 |
|
18 |
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest |
19 |
index a01632ba4fa..a64a8d232d8 100644 |
20 |
--- a/dev-python/django/Manifest |
21 |
+++ b/dev-python/django/Manifest |
22 |
@@ -1,3 +1,4 @@ |
23 |
DIST Django-1.11.14.tar.gz 7850578 BLAKE2B b858ab51d40812979ec04cffc459ce137a5f5604d105e73c2fdf9e36b07fd5cf12a7f31d6f89607716220328313663f4e99dabfdf40f93b5c829efe533efbc51 SHA512 71dbbad22bf0675a5c9aa36bcf69d6de561cf041b744fa37b407cb021ef342c3245b8001025c0492ce20df664e37ed2d7a5ffdc397761065d088ddb0d9fbe6c8 |
24 |
+DIST Django-1.11.15.tar.gz 7843843 BLAKE2B b7713de8136302d8d95929ed449ab01173e28c0d5d20529eaae9d6bd6d323f53b674a4fb6e8398da4b57a223f10ef63e7961accc8fd777313f18b4e2b0f225ed SHA512 4ea18c59f7c74d0b6deb9d292d5de068c6dcc53d9596f321f5a7e823ff5fe423cc8d69c88bf53e3acd9c36c4ecc4447148243a127d5114a4894b0fd4d449f37e |
25 |
DIST Django-1.8.19.tar.gz 7359244 BLAKE2B 1c7b857f864527cf5b9cac8e08599e1f4f3306a828bcc253e0e59755da6d464592e627eb3743687b0410d308b3d089359dd79af0146b02e6db7f5eca43f04401 SHA512 cec71f4a1aaa3fcfc43a035e9fcd8d6fabde7aade43491f9205942cbeb251ae394e49ec6b5b2403b74c24b069064d44ae6070b151c0c949b940f2d46aa87774e |
26 |
-DIST Django-2.0.7.tar.gz 7988568 BLAKE2B afc3fb9cd3f37b7488ad8eb46eb9ebb540c54b04661a44620951930a352537ee3a3072a604fd2cbbc95ea3fe112ebab25f45f971bc30ad48161eb8cda26db6d3 SHA512 ef42d9046ce3e7b5067c5b85114c0cb5854b0ebb1d3bae526484f11da8abbf04864c83f176e9c6e498c9140b134c9a517968c7bb0bc087c49bf105b2aae8644c |
27 |
+DIST Django-2.0.8.tar.gz 7987343 BLAKE2B ab35f50ce1911cb9603c7ac85e7ab01e6019ce9a2dac4cd733b11f35722368946ff3a130c3c791da4d49cf609b5747b4c5de64e29e27a8e12abb7f9e29cd363b SHA512 ac3cc3f58cb977518c6f549834beb35677c2d5541cfb5723045b98165926e826178cb33737c52a0f999be24bc38b84dde489a5f91d1c8d51b8338aa611acb518 |
28 |
|
29 |
diff --git a/dev-python/django/django-2.0.7.ebuild b/dev-python/django/django-1.11.15.ebuild |
30 |
similarity index 89% |
31 |
copy from dev-python/django/django-2.0.7.ebuild |
32 |
copy to dev-python/django/django-1.11.15.ebuild |
33 |
index 133d40ffb7d..0d97bbcdfd4 100644 |
34 |
--- a/dev-python/django/django-2.0.7.ebuild |
35 |
+++ b/dev-python/django/django-1.11.15.ebuild |
36 |
@@ -3,7 +3,7 @@ |
37 |
|
38 |
EAPI=6 |
39 |
|
40 |
-PYTHON_COMPAT=( python3_{4,5,6} ) |
41 |
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} pypy ) |
42 |
PYTHON_REQ_USE='sqlite?,threads(+)' |
43 |
WEBAPP_NO_AUTO_INSTALL="yes" |
44 |
|
45 |
@@ -36,18 +36,19 @@ DEPEND="${RDEPEND} |
46 |
test? ( |
47 |
$(python_gen_impl_dep sqlite) |
48 |
dev-python/docutils[${PYTHON_USEDEP}] |
49 |
- dev-python/numpy[${PYTHON_USEDEP}] |
50 |
+ dev-python/numpy[$(python_gen_usedep 'python*')] |
51 |
dev-python/pillow[${PYTHON_USEDEP}] |
52 |
dev-python/pyyaml[${PYTHON_USEDEP}] |
53 |
dev-python/mock[${PYTHON_USEDEP}] |
54 |
- )" |
55 |
+ virtual/python-enum34[${PYTHON_USEDEP}] |
56 |
+ )" |
57 |
|
58 |
S="${WORKDIR}/${MY_P}" |
59 |
|
60 |
WEBAPP_MANUAL_SLOT="yes" |
61 |
|
62 |
PATCHES=( |
63 |
- "${FILESDIR}"/${PN}-2.0.7-bashcomp.patch |
64 |
+ "${FILESDIR}"/${PN}-1.9-bashcomp.patch |
65 |
) |
66 |
|
67 |
pkg_setup() { |
68 |
@@ -93,7 +94,8 @@ src_install() { |
69 |
|
70 |
pkg_postinst() { |
71 |
elog "Additional Backend support can be enabled via" |
72 |
- optfeature "MySQL backend support" dev-python/mysqlclient |
73 |
+ optfeature "MySQL backend support in python 2.7 only" dev-python/mysql-python |
74 |
+ optfeature "MySQL backend support in python 2.7 - 3.4" dev-python/mysqlclient |
75 |
optfeature "PostgreSQL backend support" dev-python/psycopg:2 |
76 |
echo "" |
77 |
elog "Other features can be enhanced by" |
78 |
|
79 |
diff --git a/dev-python/django/django-2.0.7.ebuild b/dev-python/django/django-2.0.8.ebuild |
80 |
similarity index 100% |
81 |
rename from dev-python/django/django-2.0.7.ebuild |
82 |
rename to dev-python/django/django-2.0.8.ebuild |