Gentoo Archives: gentoo-commits

From: "Steve Arnold (nerdboy)" <nerdboy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sci-geosciences/mapnik: ChangeLog mapnik-0.6.0.ebuild mapnik-0.5.1.ebuild
Date: Sat, 22 Aug 2009 23:18:11
Message-Id: E1Mezqb-0002b8-8T@stork.gentoo.org
1 nerdboy 09/08/22 23:18:09
2
3 Modified: ChangeLog mapnik-0.6.0.ebuild mapnik-0.5.1.ebuild
4 Log:
5 Reverting back to the virtual for postgresql.
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.11 sci-geosciences/mapnik/ChangeLog
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.11&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.11&content-type=text/plain
13 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/ChangeLog?r1=1.10&r2=1.11
14
15 Index: ChangeLog
16 ===================================================================
17 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v
18 retrieving revision 1.10
19 retrieving revision 1.11
20 diff -u -r1.10 -r1.11
21 --- ChangeLog 19 Aug 2009 02:59:58 -0000 1.10
22 +++ ChangeLog 22 Aug 2009 23:18:09 -0000 1.11
23 @@ -1,6 +1,11 @@
24 # ChangeLog for sci-geosciences/mapnik
25 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
26 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.10 2009/08/19 02:59:58 nerdboy Exp $
27 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.11 2009/08/22 23:18:09 nerdboy Exp $
28 +
29 + 22 Aug 2009; Steve Arnold <nerdboy@g.o> mapnik-0.5.1.ebuild,
30 + mapnik-0.6.0.ebuild:
31 + Reverting back to the virtual, in the hopes that postgresql will get
32 + something >=8.0 stable soon. Newer libpq works now...
33
34 19 Aug 2009; Steve Arnold <nerdboy@g.o> mapnik-0.5.1.ebuild,
35 mapnik-0.6.0.ebuild:
36
37
38
39 1.5 sci-geosciences/mapnik/mapnik-0.6.0.ebuild
40
41 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild?rev=1.5&view=markup
42 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild?rev=1.5&content-type=text/plain
43 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild?r1=1.4&r2=1.5
44
45 Index: mapnik-0.6.0.ebuild
46 ===================================================================
47 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild,v
48 retrieving revision 1.4
49 retrieving revision 1.5
50 diff -u -r1.4 -r1.5
51 --- mapnik-0.6.0.ebuild 19 Aug 2009 02:59:58 -0000 1.4
52 +++ mapnik-0.6.0.ebuild 22 Aug 2009 23:18:09 -0000 1.5
53 @@ -1,6 +1,6 @@
54 # Copyright 1999-2009 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild,v 1.4 2009/08/19 02:59:58 nerdboy Exp $
57 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.6.0.ebuild,v 1.5 2009/08/22 23:18:09 nerdboy Exp $
58 EAPI=2
59
60 inherit eutils toolchain-funcs
61 @@ -26,12 +26,8 @@
62 python? ( >=dev-libs/boost-1.35.0-r5[python] )
63 cairo? ( x11-libs/cairo
64 dev-cpp/cairomm )
65 - postgres? ( || (
66 - >=dev-db/postgresql-base-8.0
67 - >=dev-db/postgresql-server-8.0
68 - >=dev-db/postgresql-8.0
69 - )
70 - !dev-db/libpq
71 + postgres? (
72 + >=virtual/postgresql-base-8.0
73 >=dev-db/postgis-1.1.2
74 )
75 gdal? ( sci-libs/gdal )
76 @@ -49,7 +45,7 @@
77
78 sed -i -e "s:libraries \= \[:libraries \= \[\'mapnik\',:g" \
79 plugins/input/{gdal,postgis,shape,raster}/SConscript \
80 - || die "sed 4 failed"
81 + || die "sed 2 failed"
82 }
83
84 src_configure() {
85
86
87
88 1.9 sci-geosciences/mapnik/mapnik-0.5.1.ebuild
89
90 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild?rev=1.9&view=markup
91 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild?rev=1.9&content-type=text/plain
92 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild?r1=1.8&r2=1.9
93
94 Index: mapnik-0.5.1.ebuild
95 ===================================================================
96 RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v
97 retrieving revision 1.8
98 retrieving revision 1.9
99 diff -u -r1.8 -r1.9
100 --- mapnik-0.5.1.ebuild 19 Aug 2009 02:59:58 -0000 1.8
101 +++ mapnik-0.5.1.ebuild 22 Aug 2009 23:18:09 -0000 1.9
102 @@ -1,6 +1,6 @@
103 # Copyright 1999-2009 Gentoo Foundation
104 # Distributed under the terms of the GNU General Public License v2
105 -# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.8 2009/08/19 02:59:58 nerdboy Exp $
106 +# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.9 2009/08/22 23:18:09 nerdboy Exp $
107
108 inherit eutils toolchain-funcs
109
110 @@ -22,12 +22,8 @@
111 >=sci-libs/proj-4.4.9
112 sci-libs/gdal
113 xml? ( dev-libs/libxml2 )
114 - postgres? ( || (
115 - >=dev-db/postgresql-8.0
116 - >=dev-db/postgresql-base-8.0
117 - >=dev-db/postgresql-server-8.0
118 - )
119 - !dev-db/libpq
120 + postgres? (
121 + >=virtual/postgresql-base-8.0
122 >=dev-db/postgis-1.1.2
123 )
124 python? ( >=dev-lang/python-2.4 )