1 |
commit: 5b18944507b1f91a67ba4a77d20be0d428425654 |
2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Apr 27 15:16:28 2016 +0000 |
4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Apr 27 15:16:57 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b189445 |
7 |
|
8 |
net-analyzer/graphite-web: add dep on django, for it doesn't work with 1.9 |
9 |
|
10 |
Package-Manager: portage-2.2.26 |
11 |
|
12 |
.../graphite-web/graphite-web-0.9.13-r1.ebuild | 99 ---------------------- |
13 |
.../graphite-web/graphite-web-0.9.13-r2.ebuild | 99 ---------------------- |
14 |
.../graphite-web/graphite-web-0.9.13-r3.ebuild | 3 +- |
15 |
3 files changed, 2 insertions(+), 199 deletions(-) |
16 |
|
17 |
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r1.ebuild b/net-analyzer/graphite-web/graphite-web-0.9.13-r1.ebuild |
18 |
deleted file mode 100644 |
19 |
index 51720e9..0000000 |
20 |
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r1.ebuild |
21 |
+++ /dev/null |
22 |
@@ -1,99 +0,0 @@ |
23 |
-# Copyright 1999-2015 Gentoo Foundation |
24 |
-# Distributed under the terms of the GNU General Public License v2 |
25 |
-# $Id$ |
26 |
- |
27 |
-EAPI=5 |
28 |
-PYTHON_COMPAT=( python2_7 ) |
29 |
- |
30 |
-inherit distutils-r1 python-utils-r1 prefix |
31 |
- |
32 |
-DESCRIPTION="Enterprise scalable realtime graphing" |
33 |
-HOMEPAGE="http://graphite.readthedocs.org/" |
34 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
35 |
- https://raw.githubusercontent.com/graphite-project/graphite-web/522d84fed687bd946878e48d85982d59f7bd1267/webapp/content/img/share.png -> ${P}-share.png" |
36 |
- |
37 |
-LICENSE="Apache-2.0" |
38 |
-SLOT="0" |
39 |
-KEYWORDS="~amd64 ~x86" |
40 |
-IUSE="ldap mysql memcached +sqlite" |
41 |
- |
42 |
-DEPEND="" |
43 |
-RDEPEND="dev-lang/python[sqlite?] |
44 |
- || ( >=dev-python/django-1.4[sqlite?,mysql?,${PYTHON_USEDEP}] |
45 |
- ( >=dev-python/django-1.6[sqlite?,${PYTHON_USEDEP}] |
46 |
- mysql? ( || ( dev-python/mysql-python dev-python/mysqlclient ) ) ) ) |
47 |
- >=dev-python/twisted-core-10.0[${PYTHON_USEDEP}] |
48 |
- >=dev-python/django-tagging-0.3.1[${PYTHON_USEDEP}] |
49 |
- dev-python/pycairo[${PYTHON_USEDEP}] |
50 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
51 |
- dev-python/pytz[${PYTHON_USEDEP}] |
52 |
- dev-python/pyparsing[${PYTHON_USEDEP}] |
53 |
- dev-python/txAMQP[${PYTHON_USEDEP}] |
54 |
- dev-python/carbon[${PYTHON_USEDEP}] |
55 |
- dev-python/whisper[${PYTHON_USEDEP}] |
56 |
- media-libs/fontconfig |
57 |
- memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) |
58 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )" |
59 |
- |
60 |
-PATCHES=( |
61 |
- # Do not install the configuration and data files. We install them |
62 |
- # somewhere sensible by hand. |
63 |
- "${FILESDIR}"/${P}-fhs-paths.patch |
64 |
- "${FILESDIR}"/${P}-system-libs.patch |
65 |
-) |
66 |
- |
67 |
-EXAMPLES=( |
68 |
- examples/example-graphite-vhost.conf |
69 |
-) |
70 |
- |
71 |
-src_prepare() { |
72 |
- # use FHS-style paths |
73 |
- rm setup.cfg || die |
74 |
- # make sure we don't use bundled stuff |
75 |
- rm -Rf webapp/graphite/thirdparty |
76 |
- distutils-r1_src_prepare |
77 |
- eprefixify \ |
78 |
- conf/graphite.wsgi.example \ |
79 |
- webapp/graphite/local_settings.py.example |
80 |
-} |
81 |
- |
82 |
-python_install() { |
83 |
- distutils-r1_python_install \ |
84 |
- --install-data="${EPREFIX}"/usr/share/${PN} |
85 |
- |
86 |
- # make manage.py available from an easier location/name |
87 |
- dodir /usr/bin |
88 |
- mv "${D}"/$(python_get_sitedir)/graphite/manage.py \ |
89 |
- "${ED}"/usr/bin/${PN}-manage || die |
90 |
- chmod 0755 "${ED}"/usr/bin/${PN}-manage || die |
91 |
- python_fix_shebang "${ED}"/usr/bin/${PN}-manage |
92 |
- |
93 |
- # shortener image isn't included for some reason |
94 |
- cp "${DISTDIR}"/"${P}"-share.png "${ED}"/usr/share/${PN}/webapp/content/img/ |
95 |
- |
96 |
- insinto /etc/${PN} |
97 |
- newins webapp/graphite/local_settings.py.example local_settings.py |
98 |
- pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die |
99 |
- ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py |
100 |
- popd > /dev/null || die |
101 |
- doins conf/dashboard.conf.example |
102 |
- doins conf/graphite.wsgi.example |
103 |
-} |
104 |
- |
105 |
-pkg_config() { |
106 |
- "${ROOT}"/usr/bin/${PN}-manage syncdb --noinput |
107 |
- local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/local_settings.py 2>/dev/null) |
108 |
- if [[ -n ${idx} ]] ; then |
109 |
- idx=${idx##*=} |
110 |
- idx=$(echo ${idx}) |
111 |
- eval "idx=${idx}" |
112 |
- touch "${ROOT}"/"${idx}"/index |
113 |
- fi |
114 |
-} |
115 |
- |
116 |
-pkg_postinst() { |
117 |
- einfo "You will need to ${PN} it with Apache (mod_wsgi) or nginx (uwsgi)." |
118 |
- einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}" |
119 |
- einfo "See http://graphite.readthedocs.org/en/latest/config-local-settings.html" |
120 |
- einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install." |
121 |
-} |
122 |
|
123 |
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r2.ebuild b/net-analyzer/graphite-web/graphite-web-0.9.13-r2.ebuild |
124 |
deleted file mode 100644 |
125 |
index 134bc3f..0000000 |
126 |
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r2.ebuild |
127 |
+++ /dev/null |
128 |
@@ -1,99 +0,0 @@ |
129 |
-# Copyright 1999-2015 Gentoo Foundation |
130 |
-# Distributed under the terms of the GNU General Public License v2 |
131 |
-# $Id$ |
132 |
- |
133 |
-EAPI=5 |
134 |
-PYTHON_COMPAT=( python2_7 ) |
135 |
- |
136 |
-inherit distutils-r1 python-utils-r1 prefix |
137 |
- |
138 |
-DESCRIPTION="Enterprise scalable realtime graphing" |
139 |
-HOMEPAGE="http://graphite.readthedocs.org/" |
140 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz |
141 |
- https://raw.githubusercontent.com/graphite-project/graphite-web/522d84fed687bd946878e48d85982d59f7bd1267/webapp/content/img/share.png -> ${P}-share.png" |
142 |
- |
143 |
-LICENSE="Apache-2.0" |
144 |
-SLOT="0" |
145 |
-KEYWORDS="~amd64 ~x86" |
146 |
-IUSE="ldap mysql memcached +sqlite" |
147 |
- |
148 |
-DEPEND="" |
149 |
-RDEPEND="dev-lang/python[sqlite?] |
150 |
- || ( >=dev-python/django-1.4[sqlite?,mysql?,${PYTHON_USEDEP}] |
151 |
- ( >=dev-python/django-1.6[sqlite?,${PYTHON_USEDEP}] |
152 |
- mysql? ( || ( dev-python/mysql-python dev-python/mysqlclient ) ) ) ) |
153 |
- >=dev-python/twisted-core-10.0[${PYTHON_USEDEP}] |
154 |
- >=dev-python/django-tagging-0.3.1[${PYTHON_USEDEP}] |
155 |
- dev-python/pycairo[${PYTHON_USEDEP}] |
156 |
- dev-python/zope-interface[${PYTHON_USEDEP}] |
157 |
- dev-python/pytz[${PYTHON_USEDEP}] |
158 |
- dev-python/pyparsing[${PYTHON_USEDEP}] |
159 |
- dev-python/txAMQP[${PYTHON_USEDEP}] |
160 |
- dev-python/carbon[${PYTHON_USEDEP}] |
161 |
- dev-python/whisper[${PYTHON_USEDEP}] |
162 |
- media-libs/fontconfig |
163 |
- memcached? ( dev-python/python-memcached[${PYTHON_USEDEP}] ) |
164 |
- ldap? ( dev-python/python-ldap[${PYTHON_USEDEP}] )" |
165 |
- |
166 |
-PATCHES=( |
167 |
- # Do not install the configuration and data files. We install them |
168 |
- # somewhere sensible by hand. |
169 |
- "${FILESDIR}"/${P}-fhs-paths.patch |
170 |
- "${FILESDIR}"/${P}-system-libs.patch |
171 |
-) |
172 |
- |
173 |
-EXAMPLES=( |
174 |
- examples/example-graphite-vhost.conf |
175 |
- conf/dashboard.conf.example |
176 |
- conf/graphite.wsgi.example |
177 |
-) |
178 |
- |
179 |
-src_prepare() { |
180 |
- # use FHS-style paths |
181 |
- rm setup.cfg || die |
182 |
- # make sure we don't use bundled stuff |
183 |
- rm -Rf webapp/graphite/thirdparty |
184 |
- distutils-r1_src_prepare |
185 |
- eprefixify \ |
186 |
- conf/graphite.wsgi.example \ |
187 |
- webapp/graphite/local_settings.py.example |
188 |
-} |
189 |
- |
190 |
-python_install() { |
191 |
- distutils-r1_python_install \ |
192 |
- --install-data="${EPREFIX}"/usr/share/${PN} |
193 |
- |
194 |
- # make manage.py available from an easier location/name |
195 |
- dodir /usr/bin |
196 |
- mv "${D}"/$(python_get_sitedir)/graphite/manage.py \ |
197 |
- "${ED}"/usr/bin/${PN}-manage || die |
198 |
- chmod 0755 "${ED}"/usr/bin/${PN}-manage || die |
199 |
- python_fix_shebang "${ED}"/usr/bin/${PN}-manage |
200 |
- |
201 |
- # shortener image isn't included for some reason |
202 |
- cp "${DISTDIR}"/"${P}"-share.png "${ED}"/usr/share/${PN}/webapp/content/img/ |
203 |
- |
204 |
- insinto /etc/${PN} |
205 |
- newins webapp/graphite/local_settings.py.example local_settings.py |
206 |
- pushd "${D}"/$(python_get_sitedir)/graphite > /dev/null || die |
207 |
- ln -s ../../../../../etc/${PN}/local_settings.py local_settings.py |
208 |
- popd > /dev/null || die |
209 |
-} |
210 |
- |
211 |
-pkg_config() { |
212 |
- "${ROOT}"/usr/bin/${PN}-manage syncdb --noinput |
213 |
- local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/local_settings.py 2>/dev/null) |
214 |
- if [[ -n ${idx} ]] ; then |
215 |
- idx=${idx##*=} |
216 |
- idx=$(echo ${idx}) |
217 |
- eval "idx=${idx}" |
218 |
- touch "${ROOT}"/"${idx}"/index |
219 |
- fi |
220 |
-} |
221 |
- |
222 |
-pkg_postinst() { |
223 |
- einfo "You will need to ${PN} it with Apache (mod_wsgi) or nginx (uwsgi)." |
224 |
- einfo "Don't forget to edit local_settings.py in ${EPREFIX}/etc/${PN}" |
225 |
- einfo "See http://graphite.readthedocs.org/en/latest/config-local-settings.html" |
226 |
- einfo "Run emerge --config =${PN}-${PVR} if this is a fresh install." |
227 |
-} |
228 |
|
229 |
diff --git a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild |
230 |
index 9e20d1f..e1f8001 100644 |
231 |
--- a/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild |
232 |
+++ b/net-analyzer/graphite-web/graphite-web-0.9.13-r3.ebuild |
233 |
@@ -33,6 +33,7 @@ RDEPEND=" |
234 |
) |
235 |
>=dev-python/twisted-core-10.0[${PYTHON_USEDEP}] |
236 |
>=dev-python/django-tagging-0.3.1[${PYTHON_USEDEP}] |
237 |
+ <dev-python/django-1.9[${PYTHON_USEDEP}] |
238 |
dev-python/pycairo[${PYTHON_USEDEP}] |
239 |
dev-python/zope-interface[${PYTHON_USEDEP}] |
240 |
dev-python/pytz[${PYTHON_USEDEP}] |
241 |
@@ -91,7 +92,7 @@ python_install() { |
242 |
|
243 |
pkg_config() { |
244 |
"${ROOT}"/usr/bin/${PN}-manage syncdb --noinput |
245 |
- local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/local_settings.py 2>/dev/null) |
246 |
+ local idx=$(grep 'INDEX_FILE =' "${EROOT}"/etc/graphite-web/local_settings.py 2>/dev/null) |
247 |
if [[ -n ${idx} ]] ; then |
248 |
idx=${idx##*=} |
249 |
idx=$(echo ${idx}) |