Gentoo Archives: gentoo-commits

From: "Tom Wijsman (tomwij)" <tomwij@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-geosciences/osm-gps-map: osm-gps-map-0.7.3.ebuild ChangeLog
Date: Mon, 20 May 2013 13:59:06
Message-Id: 20130520135901.D474E2171D@flycatcher.gentoo.org
1 tomwij 13/05/20 13:59:01
2
3 Modified: osm-gps-map-0.7.3.ebuild ChangeLog
4 Log:
5 Added missing python USE flag conditional in prepare phase, fixes compilation with USE=-python.
6
7 (Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
8
9 Revision Changes Path
10 1.5 sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild?rev=1.5&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild?rev=1.5&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild?r1=1.4&r2=1.5
15
16 Index: osm-gps-map-0.7.3.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild,v
19 retrieving revision 1.4
20 retrieving revision 1.5
21 diff -u -r1.4 -r1.5
22 --- osm-gps-map-0.7.3.ebuild 21 Apr 2013 14:14:32 -0000 1.4
23 +++ osm-gps-map-0.7.3.ebuild 20 May 2013 13:59:01 -0000 1.5
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2013 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild,v 1.4 2013/04/21 14:14:32 tomwij Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/osm-gps-map-0.7.3.ebuild,v 1.5 2013/05/20 13:59:01 tomwij Exp $
29
30 EAPI=5
31
32 @@ -39,7 +39,7 @@
33 PYTHON_S="${WORKDIR}/python-osmgpsmap-${PV}"
34
35 src_configure() {
36 - #configure script does not accept quoted EPREFIX...
37 + # Configure script does not accept quoted EPREFIX...
38 gnome2_src_configure \
39 $(use_enable introspection) \
40 --docdir=/usr/share/doc/${PF} \
41 @@ -54,14 +54,16 @@
42
43 gnome2_src_prepare
44
45 - cd "${PYTHON_S}" || die
46 - epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
47 + if use python ; then
48 + cd "${PYTHON_S}" || die
49 + epatch "${FILESDIR}/${P}-fix-python-setup.py.patch"
50 + fi
51 }
52
53 src_compile() {
54 gnome2_src_compile
55
56 - if use python; then
57 + if use python ; then
58 cd "${PYTHON_S}" || die
59 CFLAGS="${CFLAGS} -I\"${S}\"/src" LDFLAGS="${LDFLAGS} -L\"${S}\"/src/.libs" distutils-r1_src_compile
60 fi
61 @@ -70,7 +72,7 @@
62 src_install() {
63 gnome2_src_install
64
65 - if use python; then
66 + if use python ; then
67 cd "${PYTHON_S}" || die
68 distutils-r1_src_install
69 fi
70
71
72
73 1.5 sci-geosciences/osm-gps-map/ChangeLog
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osm-gps-map/ChangeLog?rev=1.5&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osm-gps-map/ChangeLog?rev=1.5&content-type=text/plain
77 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-geosciences/osm-gps-map/ChangeLog?r1=1.4&r2=1.5
78
79 Index: ChangeLog
80 ===================================================================
81 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/ChangeLog,v
82 retrieving revision 1.4
83 retrieving revision 1.5
84 diff -u -r1.4 -r1.5
85 --- ChangeLog 21 Apr 2013 14:14:32 -0000 1.4
86 +++ ChangeLog 20 May 2013 13:59:01 -0000 1.5
87 @@ -1,6 +1,10 @@
88 # ChangeLog for sci-geosciences/osm-gps-map
89 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
90 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/ChangeLog,v 1.4 2013/04/21 14:14:32 tomwij Exp $
91 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/osm-gps-map/ChangeLog,v 1.5 2013/05/20 13:59:01 tomwij Exp $
92 +
93 + 20 May 2013; Tom Wijsman <TomWij@g.o> osm-gps-map-0.7.3.ebuild:
94 + Added missing python USE flag conditional in prepare phase, fixes compilation
95 + with USE=-python.
96
97 21 Apr 2013; Tom Wijsman <TomWij@g.o> osm-gps-map-0.7.3.ebuild:
98 Slotted dependencies to avoid breakage, fixes bug #464240.