Gentoo Archives: gentoo-commits

From: "Jorge Manuel B. S. Vicetto" <jmbsvicetto@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/jmbsvicetto:master commit in: dev-python/pyicu/, www-apps/dokuwiki/, sci-geosciences/osm-gps-map/files/, ...
Date: Wed, 01 Jul 2015 17:24:50
Message-Id: 1435771272.ee4f7cddbd87d561307eb64db84df12956701004.jmbsvicetto@gentoo
1 commit: ee4f7cddbd87d561307eb64db84df12956701004
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jul 1 17:21:12 2015 +0000
4 Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
5 CommitDate: Wed Jul 1 17:21:12 2015 +0000
6 URL: https://gitweb.gentoo.org/dev/jmbsvicetto.git/commit/?id=ee4f7cdd
7
8 Drop depend.php from inherit - fixes bug 552858.
9
10 Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
11
12 app-misc/gramps/Manifest | 2 +
13 app-misc/gramps/files/gramps-resourcepath.patch | 11 +++
14 app-misc/gramps/files/gramps-use_bsddb3.patch | 11 +++
15 app-misc/gramps/gramps-3.4.9.ebuild | 78 +++++++++++++++++++
16 app-misc/gramps/gramps-4.1.3.ebuild | 51 +++++++++++++
17 dev-python/pyicu/Manifest | 1 +
18 dev-python/pyicu/metadata.xml | 8 ++
19 dev-python/pyicu/pyicu-1.9.2.ebuild | 50 ++++++++++++
20 sci-geosciences/osm-gps-map/Manifest | 2 +
21 .../files/osm-gps-map-fix-introspection.patch | 10 +++
22 .../osm-gps-map/osm-gps-map-0.7.3.ebuild | 88 ++++++++++++++++------
23 .../osm-gps-map/osm-gps-map-1.0.1.ebuild | 82 ++++++++++++++++++++
24 www-apps/dokuwiki/dokuwiki-20140505e.ebuild | 4 +-
25 www-apps/dokuwiki/dokuwiki-20140929d.ebuild | 6 +-
26 14 files changed, 374 insertions(+), 30 deletions(-)
27
28 diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
29 new file mode 100644
30 index 0000000..fa39b9f
31 --- /dev/null
32 +++ b/app-misc/gramps/Manifest
33 @@ -0,0 +1,2 @@
34 +DIST gramps-3.4.9.tar.gz 10190446 SHA256 402a8616efeda730d10941690edb6dfb2719c3f7383e376a404577412676a8f3 SHA512 f15481b3791a98568a0a7f734ef5eb9a1149cf76c5e83f1270eee41bcf3518713391cb271a54177e6e6bbaf78da098d7a7a2a807266c971c1331dbb9d29d5fbb WHIRLPOOL 834777cb20ee7a3ef7a2397eef5a0e70caab02666cf127ba01f6310ac68463ea67733883cd3ca63676b9541dc104da818986d7b249950ae6a30415f5fa1bddee
35 +DIST gramps-4.1.3.tar.gz 17244017 SHA256 25501a01419c9a13e70574c57543e7bbac5d3b59760fac8027196a39e029fe8e SHA512 f52210f5e15ef3435d503f6b96b5a3960a4c6a4e3358d981514a2880801efdd6623eaed8237e5d9a08c26608670f6649967bb0e18500c480541d1e4866d668a8 WHIRLPOOL 08612469fd974aa304d47474c0127c3f660606261f2f3f682745bf46a0845242080bf454b2f77b5eb47985c80e1ffa5c0ad75cd97f0d3679515d015bac1e36a5
36
37 diff --git a/app-misc/gramps/files/gramps-resourcepath.patch b/app-misc/gramps/files/gramps-resourcepath.patch
38 new file mode 100644
39 index 0000000..b414e94
40 --- /dev/null
41 +++ b/app-misc/gramps/files/gramps-resourcepath.patch
42 @@ -0,0 +1,11 @@
43 +--- setup.py.old 2014-04-11 14:37:05.557343225 -0400
44 ++++ setup.py 2014-04-11 14:37:30.560989056 -0400
45 +@@ -248,7 +248,7 @@
46 + 'utils', 'resource-path')
47 + with io.open(resource_file, 'w', encoding='utf-8',
48 + errors='strict') as fp:
49 +- path = os.path.abspath(os.path.join(self.install_data, 'share'))
50 ++ path = '/usr/share'
51 + if sys.version_info[0] < 3:
52 + path = unicode(path)
53 + fp.write(path)
54
55 diff --git a/app-misc/gramps/files/gramps-use_bsddb3.patch b/app-misc/gramps/files/gramps-use_bsddb3.patch
56 new file mode 100644
57 index 0000000..930f408
58 --- /dev/null
59 +++ b/app-misc/gramps/files/gramps-use_bsddb3.patch
60 @@ -0,0 +1,11 @@
61 +--- gramps-4.1.1/gramps/gen/config.py.orig 2015-02-23 13:20:20.150291498 -0500
62 ++++ gramps-4.1.1/gramps/gen/config.py 2015-02-23 13:20:37.260291400 -0500
63 +@@ -313,7 +313,7 @@
64 + register('preferences.use-last-view', False)
65 + register('preferences.last-view', '')
66 + register('preferences.last-views', [])
67 +-register('preferences.use-bsddb3', False)
68 ++register('preferences.use-bsddb3', True)
69 + register('preferences.family-relation-type', 3) # UNKNOWN
70 + register('preferences.age-display-precision', 1)
71 + register('preferences.color-gender-male-alive', '#b8cee6')
72
73 diff --git a/app-misc/gramps/gramps-3.4.9.ebuild b/app-misc/gramps/gramps-3.4.9.ebuild
74 new file mode 100644
75 index 0000000..b5ee8a4
76 --- /dev/null
77 +++ b/app-misc/gramps/gramps-3.4.9.ebuild
78 @@ -0,0 +1,78 @@
79 +# Copyright 1999-2015 Gentoo Foundation
80 +# Distributed under the terms of the GNU General Public License v2
81 +# $Header: $
82 +
83 +EAPI=5
84 +PYTHON_COMPAT=( python2_7 )
85 +GCONF_DEBUG="no"
86 +
87 +inherit eutils gnome2 python-single-r1
88 +
89 +DESCRIPTION="Genealogical Research and Analysis Management Programming System"
90 +HOMEPAGE="http://www.gramps-project.org/"
91 +SRC_URI="mirror://sourceforge/gramps/Stable/${PV}/${P}.tar.gz"
92 +
93 +LICENSE="GPL-2"
94 +SLOT="0"
95 +KEYWORDS="~amd64 ~ppc ~x86"
96 +
97 +IUSE="gnome reports spell webkit"
98 +REQUIRED_USE="${PYTHON_REQUIRED_USE}"
99 +
100 +RDEPEND="${PYTHON_DEPS}
101 + dev-python/bsddb3[${PYTHON_USEDEP}]
102 + dev-python/pygoocanvas[${PYTHON_USEDEP}]
103 + >=dev-python/pygtk-2.16.0[${PYTHON_USEDEP}]
104 + gnome-base/librsvg:2
105 + sci-geosciences/osm-gps-map
106 + x11-misc/xdg-utils
107 + gnome? (
108 + dev-python/gconf-python[${PYTHON_USEDEP}]
109 + dev-python/libgnome-python[${PYTHON_USEDEP}]
110 + )
111 + spell? ( dev-python/gtkspell-python[${PYTHON_USEDEP}] )
112 + reports? ( media-gfx/graphviz )
113 + webkit? ( dev-python/pywebkitgtk[${PYTHON_USEDEP}] )
114 +"
115 +DEPEND="${RDEPEND}
116 + dev-util/intltool
117 + sys-devel/gettext
118 + virtual/libiconv
119 + virtual/pkgconfig
120 +"
121 +
122 +src_prepare() {
123 + epatch "${FILESDIR}/${PN}-3.4.0-use_bsddb3.patch"
124 +
125 + # Fix install path, bug 423315 for example
126 + einfo "Fix installation path"
127 + find . -iname 'Makefile.in' | xargs \
128 + sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
129 + || die
130 + find . -iname 'Makefile.in' | xargs \
131 + sed "s;\(pkgpythondir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \
132 + || die
133 +
134 + sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
135 + -i src/Makefile.in || die
136 +
137 + sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \
138 + -i src/docgen/Makefile.in || die
139 +
140 + einfo "Fix wrapper script"
141 + sed "s;@datadir@;$(python_get_sitedir);" \
142 + -i gramps.sh.in || die
143 +
144 + einfo "Fix icon location"
145 + sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die
146 +
147 + python_fix_shebang .
148 +
149 + gnome2_src_prepare
150 +}
151 +
152 +src_configure() {
153 + gnome2_src_configure \
154 + --disable-mime-install \
155 + PYTHON="${EROOT}"/usr/bin/python2
156 +}
157
158 diff --git a/app-misc/gramps/gramps-4.1.3.ebuild b/app-misc/gramps/gramps-4.1.3.ebuild
159 new file mode 100644
160 index 0000000..6e5670e
161 --- /dev/null
162 +++ b/app-misc/gramps/gramps-4.1.3.ebuild
163 @@ -0,0 +1,51 @@
164 +# Copyright 1999-2015 Gentoo Foundation
165 +# Distributed under the terms of the GNU General Public License v2
166 +# $Header: $
167 +
168 +EAPI=5
169 +PYTHON_COMPAT=( python{2_7,3_3,3_4} )
170 +
171 +#DISTUTILS_SINGLE_IMPL=1
172 +inherit distutils-r1
173 +
174 +MY_PV=${PV/_/}
175 +
176 +DESCRIPTION="Genealogical Research and Analysis Management Programming System"
177 +HOMEPAGE="http://www.gramps.org/"
178 +SRC_URI="mirror://sourceforge/gramps/Stable/${PN}-${MY_PV}.tar.gz"
179 +
180 +LICENSE="GPL-2"
181 +SLOT="0"
182 +KEYWORDS="~amd64 ~x86"
183 +IUSE="geography +gexiv2 html +reports spell"
184 +
185 +DEPEND="${PYTHON_DEPS}"
186 +RDEPEND="
187 + dev-python/bsddb3
188 + >=dev-python/pygobject-3.2.2-r1:3[${PYTHON_USEDEP}]
189 + dev-python/pyicu
190 + gnome-base/librsvg:2
191 + x11-libs/cairo
192 + x11-libs/gtk+:3
193 + x11-libs/pango[introspection]
194 + x11-misc/xdg-utils
195 + geography? ( >=sci-geosciences/osm-gps-map-1.0 )
196 + gexiv2? ( >=media-libs/gexiv2-0.5[${PYTHON_USEDEP},introspection] )
197 + html? ( net-libs/webkit-gtk:3[introspection]
198 + reports? ( media-gfx/graphviz )
199 + spell? (
200 + dev-python/gtkspell-python
201 + app-text/gtkspell[introspection]
202 + )
203 +)"
204 +
205 +S=${WORKDIR}/${PN}-${MY_PV}
206 +DOCS="RELEASE_NOTES FAQ AUTHORS TODO NEWS README ChangeLog"
207 +
208 +src_prepare() {
209 + epatch "${FILESDIR}/${PN}-resourcepath.patch"
210 +# epatch "${FILESDIR}/${P}-python-doc-init.patch"
211 +# epatch "${FILESDIR}/${P}-print-guiplug-error.patch"
212 + epatch "${FILESDIR}/${PN}-use_bsddb3.patch"
213 + distutils-r1_src_prepare
214 +}
215
216 diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
217 new file mode 100644
218 index 0000000..b278b4e
219 --- /dev/null
220 +++ b/dev-python/pyicu/Manifest
221 @@ -0,0 +1 @@
222 +DIST PyICU-1.9.2.tar.gz 175831 SHA256 9b580801eb17b09a5e0e8ef7d3b29170361ed505c5f954b723c1b48a1e502bb6 SHA512 1964464f5385dc8f65c4b88b63cd9f34ced1ae365562386708d92fc5c40090a40554578bd5e90d0a996ca6f012b3d2a8ab6e0fd07968e94a0dfe18894e8f08f4 WHIRLPOOL 53fbd86090626cf34048501f48e8b832bafbe98369e99ae6e1a2faf5b627dc744f6d9c7354060fa4e06cb0cc116f14c834bcf63aa624691d1ecb05f1d7014ef7
223
224 diff --git a/dev-python/pyicu/metadata.xml b/dev-python/pyicu/metadata.xml
225 new file mode 100644
226 index 0000000..575c9a5
227 --- /dev/null
228 +++ b/dev-python/pyicu/metadata.xml
229 @@ -0,0 +1,8 @@
230 +<?xml version="1.0" encoding="UTF-8"?>
231 +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
232 +<pkgmetadata>
233 +<maintainer>
234 + <email>jmbsvicetto@g.o</email>
235 + <name>Jorge Manuel B. S. Vicetto</name>
236 +</maintainer>
237 +</pkgmetadata>
238
239 diff --git a/dev-python/pyicu/pyicu-1.9.2.ebuild b/dev-python/pyicu/pyicu-1.9.2.ebuild
240 new file mode 100644
241 index 0000000..e742ec1
242 --- /dev/null
243 +++ b/dev-python/pyicu/pyicu-1.9.2.ebuild
244 @@ -0,0 +1,50 @@
245 +# Copyright 1999-2015 Gentoo Foundation
246 +# Distributed under the terms of the GNU General Public License v2
247 +# $Header: $
248 +
249 +EAPI=5
250 +
251 +PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
252 +DISTUTILS_IN_SOURCE_BUILD=1 # setup.py applies 2to3 to tests
253 +
254 +inherit distutils-r1
255 +
256 +MY_PN="PyICU"
257 +MY_P="${MY_PN}-${PV}"
258 +DESCRIPTION="Python bindings for dev-libs/icu"
259 +HOMEPAGE="http://pyicu.osafoundation.org/"
260 +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
261 +
262 +LICENSE="MIT"
263 +SLOT="0"
264 +KEYWORDS="~amd64 ~x86"
265 +IUSE="doc"
266 +
267 +RDEPEND="dev-libs/icu"
268 +DEPEND="${RDEPEND}
269 + doc? ( dev-python/epydoc )"
270 +
271 +S="${WORKDIR}/${MY_P}"
272 +
273 +DOCS=(CHANGES CREDITS README.md)
274 +
275 +python_compile_all() {
276 + if use doc; then
277 + einfo "Making documentation from ${EPYTHON} build"
278 + cd "${BEST_BUILD_DIR}" || die
279 + epydoc --html --verbose \
280 + --url="${HOMEPAGE}" --name="${MY_P}" \
281 + icu.py || die "Making the docs failed!"
282 + fi
283 +}
284 +
285 +python_test() {
286 + esetup.py test
287 +}
288 +
289 +python_install_all() {
290 + distutils-r1_python_install_all
291 + if use doc; then
292 + dohtml -r ../*/html/*
293 + fi
294 +}
295
296 diff --git a/sci-geosciences/osm-gps-map/Manifest b/sci-geosciences/osm-gps-map/Manifest
297 index df7a842..5c6ee1c 100644
298 --- a/sci-geosciences/osm-gps-map/Manifest
299 +++ b/sci-geosciences/osm-gps-map/Manifest
300 @@ -1 +1,3 @@
301 +DIST 1.0.1.tar.gz 75430 SHA256 3960172735c67f8e0cc7385b090eec0442966f1f819cefc59daab136c79a3b89 SHA512 c4f2b8ddc4b19c1d777ab22e60acc39eab805cf058d46b23d72b179ac55b42095f9a3f3a21f912c6f33feb1ef83d4f33aa96d987e595eca0e46f7f9a647ac169 WHIRLPOOL b97ed126710809b6a709302ed11a2d665ef7eafeef999c7dc7e80512aee51a853440109c4a7bfa02d8fd5e1a42ac25d748dffb9fc46af73d94fe8b6cde77037e
302 DIST osm-gps-map-0.7.3.tar.gz 419300 SHA256 5967db2e911fc81297c7c035ddfe1f225ee708398f1083d7f0d1f7630afcd1a8 SHA512 a6a45621bcf0e608a2be99e1b3892bdf28eca52e61fcb9f8cd0354017ba86dbdda27d5c6d5bec75cd248a0b330f0bb24ec04c65deab11454f11e840823902687 WHIRLPOOL 328ef9790972b9c23d4321e111d86d5a99a0ace1205c311bc7db03df837f5f7490ff602b7305f1aa9e3c6b6d966392b936638f615b6e4429add3673b6c2138b0
303 +DIST python-osmgpsmap-0.7.3.tar.gz 212270 SHA256 fcd0339a5922bdbbb9c934aa3c2fb9a2b8d04487d037e36cbf308dc83a02a9cf SHA512 2c46a0ad80b4ff1b9d841de49b82c0c3c7c3b51c3a9ee0c7033ae2467e36de7632f308f90720f0bb01f5c785531be6207681631b5fec9fc81f90e1e9157bffbd WHIRLPOOL 11a7f49650a387fcded20c89f7c72f06be4a7b037f85bad4bc4b69c86446ff82b4d6f7703a9405b5cfce266d9534fe16b0ae0ed5c6b6c0440cfca7194889c69f
304
305 diff --git a/sci-geosciences/osm-gps-map/files/osm-gps-map-fix-introspection.patch b/sci-geosciences/osm-gps-map/files/osm-gps-map-fix-introspection.patch
306 new file mode 100644
307 index 0000000..350876c
308 --- /dev/null
309 +++ b/sci-geosciences/osm-gps-map/files/osm-gps-map-fix-introspection.patch
310 @@ -0,0 +1,10 @@
311 +--- src/Makefile.am 2011-03-19 10:08:23.000000000 +0300
312 ++++ src/Makefile.am 2013-04-02 23:13:01.408952029 +0400
313 +@@ -86,6 +86,7 @@
314 + OsmGpsMap_1_0_gir_CFLAGS = $(OSMGPSMAP_CFLAGS)
315 + OsmGpsMap_1_0_gir_LIBS = libosmgpsmap.la
316 + OsmGpsMap_1_0_gir_FILES = $(introspection_sources)
317 ++OsmGpsMap_1_0_gir_SCANNERFLAGS = --identifier-prefix=OsmGps
318 + INTROSPECTION_GIRS += OsmGpsMap-1.0.gir
319 +
320 + girdir = $(datadir)/gir-1.0
321
322 diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
323 index 06c519b..7b986d6 100644
324 --- a/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
325 +++ b/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
326 @@ -1,43 +1,81 @@
327 -# Copyright 1999-2011 Gentoo Foundation
328 +# Copyright 1999-2015 Gentoo Foundation
329 # Distributed under the terms of the GNU General Public License v2
330 -# $Header: $
331 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild,v 1.7 2015/04/08 18:49:16 mgorny Exp $
332
333 -EAPI="4"
334 +EAPI=5
335
336 -inherit autotools gnome2
337 +PYTHON_COMPAT=( python2_7 )
338 +DISTUTILS_OPTIONAL=1
339
340 -DESCRIPTION="osm-gps-map is a gtk+ viewer for OpenStreetMap files."
341 +inherit eutils autotools gnome2 distutils-r1
342 +
343 +DESCRIPTION="A gtk+ viewer for OpenStreetMap files"
344 HOMEPAGE="http://nzjrs.github.com/osm-gps-map/"
345 -SRC_URI="http://www.johnstowers.co.nz/files/${PN}/${P}.tar.gz"
346 +SRC_URI="http://www.johnstowers.co.nz/files/${PN}/${P}.tar.gz
347 +python? ( http://www.johnstowers.co.nz/files/${PN}/python-osmgpsmap-${PV}.tar.gz )"
348
349 LICENSE="GPL-2"
350 SLOT="0"
351 -KEYWORDS="~amd64"
352 -IUSE="introspection python"
353 +KEYWORDS="~amd64 ~x86"
354 +IUSE="+introspection python"
355 +
356 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
357
358 -DEPEND="
359 - >=dev-libs/glib-2.16.0
360 - gnome-base/gnome-common
361 - >=net-libs/libsoup-2.4.0
362 +RDEPEND="
363 + >=dev-libs/glib-2.16.0:2
364 + >=net-libs/libsoup-2.4.0:2.4
365 >=x11-libs/cairo-1.6.0
366 - >=x11-libs/gtk+-2.14.0
367 + >=x11-libs/gtk+-2.14.0:2[introspection?]
368 + x11-libs/gdk-pixbuf:2[introspection?]
369 introspection? ( dev-libs/gobject-introspection )
370 + python? ( ${PYTHON_DEPS}
371 + dev-python/pygtk:2[${PYTHON_USEDEP}]
372 + dev-python/pygobject:2[${PYTHON_USEDEP}]
373 + )
374 "
375 -RDEPEND="${DEPEND}"
376 -PDEPEND="python? ( dev-python/python-osmgpsmap )"
377 -
378 -G2CONF="
379 - $(use_enable introspection)
380 - --docdir=/usr/share/doc/${PN}
381 - --disable-dependency-tracking
382 - --enable-fast-install
383 - --disable-static
384 -"
385 +DEPEND="${RDEPEND}
386 + dev-util/gtk-doc-am
387 + gnome-base/gnome-common:3
388 + virtual/pkgconfig"
389 +
390 +PYTHON_S="${WORKDIR}/python-osmgpsmap-${PV}"
391 +
392 +src_configure() {
393 + # Configure script does not accept quoted EPREFIX...
394 + gnome2_src_configure \
395 + $(use_enable introspection) \
396 + --docdir=/usr/share/doc/${PF} \
397 + --enable-fast-install \
398 + --disable-static
399 +}
400
401 src_prepare() {
402 - epatch "${FILESDIR}/${PN}-fix-docs-location.patch"
403 -# epatch "${FILESDIR}/${PN}-disable-compiler-warnings.patch"
404 + epatch "${FILESDIR}/${P}-fix-docs-location.patch" \
405 + "${FILESDIR}/${P}-fix-introspection.patch"
406 eautoreconf
407
408 gnome2_src_prepare
409 +
410 + if use python ; then
411 + cd "${PYTHON_S}" || die
412 + epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
413 + fi
414 +}
415 +
416 +src_compile() {
417 + gnome2_src_compile
418 +
419 + if use python ; then
420 + cd "${PYTHON_S}" || die
421 + CFLAGS="${CFLAGS} -I\"${S}\"/src" LDFLAGS="${LDFLAGS} -L\"${S}\"/src/.libs" distutils-r1_src_compile
422 + fi
423 +}
424 +
425 +src_install() {
426 + gnome2_src_install
427 +
428 + if use python ; then
429 + cd "${PYTHON_S}" || die
430 + distutils-r1_src_install
431 + fi
432 }
433
434 diff --git a/sci-geosciences/osm-gps-map/osm-gps-map-1.0.1.ebuild b/sci-geosciences/osm-gps-map/osm-gps-map-1.0.1.ebuild
435 new file mode 100644
436 index 0000000..d800794
437 --- /dev/null
438 +++ b/sci-geosciences/osm-gps-map/osm-gps-map-1.0.1.ebuild
439 @@ -0,0 +1,82 @@
440 +# Copyright 1999-2015 Gentoo Foundation
441 +# Distributed under the terms of the GNU General Public License v2
442 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild,v 1.7 2015/04/08 18:49:16 mgorny Exp $
443 +
444 +EAPI=5
445 +
446 +PYTHON_COMPAT=( python2_7 )
447 +DISTUTILS_OPTIONAL=1
448 +
449 +inherit eutils autotools gnome2 distutils-r1
450 +
451 +AUTHOR="nzjrs"
452 +DESCRIPTION="A gtk+ viewer for OpenStreetMap files"
453 +HOMEPAGE="http://nzjrs.github.com/osm-gps-map/"
454 +SRC_URI="http://www.github.com/${AUTHOR}/${PN}/archive/${PV}.tar.gz"
455 +#python? ( http://www.johnstowers.co.nz/files/${PN}/python-osmgpsmap-${PV}.tar.gz )"
456 +
457 +LICENSE="GPL-2"
458 +SLOT="0"
459 +KEYWORDS="~amd64 ~x86"
460 +IUSE="+introspection python"
461 +
462 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
463 +
464 +RDEPEND="
465 + >=dev-libs/glib-2.16.0:2
466 + >=net-libs/libsoup-2.4.0:2.4
467 + >=x11-libs/cairo-1.6.0
468 + >=x11-libs/gtk+-2.14.0:2[introspection?]
469 + x11-libs/gdk-pixbuf:2[introspection?]
470 + introspection? ( dev-libs/gobject-introspection )
471 + python? ( ${PYTHON_DEPS}
472 + dev-python/pygtk:2[${PYTHON_USEDEP}]
473 + dev-python/pygobject:2[${PYTHON_USEDEP}]
474 + )
475 +"
476 +DEPEND="${RDEPEND}
477 + dev-util/gtk-doc-am
478 + gnome-base/gnome-common:3
479 + virtual/pkgconfig"
480 +
481 +PYTHON_S="${WORKDIR}/python"
482 +
483 +src_configure() {
484 + # Configure script does not accept quoted EPREFIX...
485 + gnome2_src_configure \
486 + $(use_enable introspection) \
487 + --docdir=/usr/share/doc/${PF} \
488 + --enable-fast-install \
489 + --disable-static
490 +}
491 +
492 +src_prepare() {
493 + epatch "${FILESDIR}/${PN}-fix-docs-location.patch" \
494 + "${FILESDIR}/${PN}-fix-introspection.patch"
495 + eautoreconf
496 +
497 + gnome2_src_prepare
498 +
499 + if use python ; then
500 + cd "${PYTHON_S}" || die
501 + epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
502 + fi
503 +}
504 +
505 +src_compile() {
506 + gnome2_src_compile
507 +
508 + if use python ; then
509 + cd "${PYTHON_S}" || die
510 + CFLAGS="${CFLAGS} -I\"${S}\"/src" LDFLAGS="${LDFLAGS} -L\"${S}\"/src/.libs" distutils-r1_src_compile
511 + fi
512 +}
513 +
514 +src_install() {
515 + gnome2_src_install
516 +
517 + if use python ; then
518 + cd "${PYTHON_S}" || die
519 + distutils-r1_src_install
520 + fi
521 +}
522
523 diff --git a/www-apps/dokuwiki/dokuwiki-20140505e.ebuild b/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
524 index 8a950c6..a311091 100644
525 --- a/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
526 +++ b/www-apps/dokuwiki/dokuwiki-20140505e.ebuild
527 @@ -4,7 +4,7 @@
528
529 EAPI=5
530
531 -inherit webapp depend.php
532 +inherit webapp
533
534 # upstream uses dashes in the datestamp
535 MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
536 @@ -21,6 +21,7 @@ IUSE="gd"
537 DEPEND=""
538 RDEPEND="
539 >=dev-lang/php-5.3[xml]
540 + virtual/httpd-php:*
541 gd? ( ||
542 (
543 dev-lang/php[gd]
544 @@ -30,7 +31,6 @@ RDEPEND="
545 "
546
547 need_httpd_cgi
548 -need_php_httpd
549
550 S="${WORKDIR}/${PN}-${MY_PV}"
551
552
553 diff --git a/www-apps/dokuwiki/dokuwiki-20140929d.ebuild b/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
554 index 29c8522..a311091 100644
555 --- a/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
556 +++ b/www-apps/dokuwiki/dokuwiki-20140929d.ebuild
557 @@ -4,13 +4,13 @@
558
559 EAPI=5
560
561 -inherit webapp depend.php
562 +inherit webapp
563
564 # upstream uses dashes in the datestamp
565 MY_BASE_PV="${PV:0:4}-${PV:4:2}-${PV:6:2}"
566 MY_PV="${MY_BASE_PV}${PV:8:1}"
567
568 -DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs."
569 +DESCRIPTION="DokuWiki is a simple to use Wiki aimed at a small company's documentation needs"
570 HOMEPAGE="http://wiki.splitbrain.org/wiki:dokuwiki"
571 SRC_URI="http://download.dokuwiki.org/src/${PN}/${PN}-${MY_PV}.tgz"
572
573 @@ -21,6 +21,7 @@ IUSE="gd"
574 DEPEND=""
575 RDEPEND="
576 >=dev-lang/php-5.3[xml]
577 + virtual/httpd-php:*
578 gd? ( ||
579 (
580 dev-lang/php[gd]
581 @@ -30,7 +31,6 @@ RDEPEND="
582 "
583
584 need_httpd_cgi
585 -need_php_httpd
586
587 S="${WORKDIR}/${PN}-${MY_PV}"