| 1 |
nerdboy 08/09/25 05:56:22 |
| 2 |
|
| 3 |
Modified: metadata.xml mapnik-0.5.1.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
removed proj and gdal use flags in favor of hard depends |
| 6 |
(Portage version: 2.2_rc8/cvs/Linux 2.6.26.5 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 sci-geosciences/mapnik/metadata.xml |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/metadata.xml?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/metadata.xml?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/metadata.xml?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: metadata.xml |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/metadata.xml,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -u -r1.1 -r1.2 |
| 21 |
--- metadata.xml 25 Sep 2008 05:42:05 -0000 1.1 |
| 22 |
+++ metadata.xml 25 Sep 2008 05:56:22 -0000 1.2 |
| 23 |
@@ -10,10 +10,4 @@ |
| 24 |
mapping applications. The core libraries are written in C++, with |
| 25 |
optional Python bindings. |
| 26 |
</longdescription> |
| 27 |
-<use> |
| 28 |
- <flag name='gdal'>Enable <pkg>sci-libs/gdal</pkg> geoformat conversion |
| 29 |
- support</flag> |
| 30 |
- <flag name='proj'> Enable <pkg>sci-libs/proj</pkg> library support for |
| 31 |
- specific map projections</flag> |
| 32 |
-</use> |
| 33 |
</pkgmetadata> |
| 34 |
|
| 35 |
|
| 36 |
|
| 37 |
1.2 sci-geosciences/mapnik/mapnik-0.5.1.ebuild |
| 38 |
|
| 39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild?rev=1.2&view=markup |
| 40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild?rev=1.2&content-type=text/plain |
| 41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild?r1=1.1&r2=1.2 |
| 42 |
|
| 43 |
Index: mapnik-0.5.1.ebuild |
| 44 |
=================================================================== |
| 45 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v |
| 46 |
retrieving revision 1.1 |
| 47 |
retrieving revision 1.2 |
| 48 |
diff -u -r1.1 -r1.2 |
| 49 |
--- mapnik-0.5.1.ebuild 25 Sep 2008 05:42:05 -0000 1.1 |
| 50 |
+++ mapnik-0.5.1.ebuild 25 Sep 2008 05:56:22 -0000 1.2 |
| 51 |
@@ -1,6 +1,6 @@ |
| 52 |
# Copyright 1999-2008 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.1 2008/09/25 05:42:05 nerdboy Exp $ |
| 55 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/mapnik-0.5.1.ebuild,v 1.2 2008/09/25 05:56:22 nerdboy Exp $ |
| 56 |
|
| 57 |
inherit eutils autotools |
| 58 |
|
| 59 |
@@ -10,7 +10,7 @@ |
| 60 |
LICENSE="LGPL-3" |
| 61 |
SLOT="0" |
| 62 |
KEYWORDS="~amd64 ~ppc ~x86" |
| 63 |
-IUSE="postgres proj debug doc gdal python bidi" |
| 64 |
+IUSE="debug doc postgres python bidi" |
| 65 |
|
| 66 |
RDEPEND=">=dev-libs/boost-1.33.0 |
| 67 |
>=media-libs/libpng-1.2.12 |
| 68 |
@@ -18,9 +18,10 @@ |
| 69 |
>=media-libs/tiff-3.8.2 |
| 70 |
>=sys-libs/zlib-1.2.3 |
| 71 |
>=media-libs/freetype-2.1.10 |
| 72 |
+ >=sci-libs/proj-4.4.9 |
| 73 |
+ dev-libs/libxml2 |
| 74 |
+ sci-libs/gdal |
| 75 |
postgres? ( >=dev-db/postgis-1.1.2 ) |
| 76 |
- proj? ( >=sci-libs/proj-4.4.9 ) |
| 77 |
- gdal? ( sci-libs/gdal ) |
| 78 |
python? ( >=dev-lang/python-2.4 ) |
| 79 |
bidi? ( dev-libs/fribidi )" |
| 80 |
|
| 81 |
@@ -37,10 +38,14 @@ |
| 82 |
} |
| 83 |
|
| 84 |
src_compile() { |
| 85 |
+ MAKEOPTS="${MAKEOPTS} INPUT_PLUGINS=shape,raster,postgis" |
| 86 |
+ MAKEOPTS="${MAKEOPTS} PROJ_INCLUDES=/usr/include" |
| 87 |
+ MAKEOPTS="${MAKEOPTS} PROJ_LIBS=/usr/$(get_libdir)" |
| 88 |
+ MAKEOPTS="${MAKEOPTS} XMLPARSER=libxml2" |
| 89 |
+ |
| 90 |
if ! use python ; then |
| 91 |
MAKEOPTS="${MAKEOPTS} BINDINGS=none" |
| 92 |
fi |
| 93 |
- MAKEOPTS="${MAKEOPTS} INPUT_PLUGINS=shape,raster,postgis" |
| 94 |
if use debug ; then |
| 95 |
MAKEOPTS="${MAKEOPTS} DEBUG=1" |
| 96 |
fi |
| 97 |
@@ -50,11 +55,7 @@ |
| 98 |
if use postgres ; then |
| 99 |
MAKEOPTS="${MAKEOPTS} PGSQL_INCLUDES=/usr/include/postgresql" |
| 100 |
fi |
| 101 |
- if use proj ; then |
| 102 |
- MAKEOPTS="${MAKEOPTS} PROJ_INCLUDES=/usr/include" |
| 103 |
- MAKEOPTS="${MAKEOPTS} PROJ_LIBS=/usr/$(get_libdir)" |
| 104 |
- fi |
| 105 |
- MAKEOPTS="${MAKEOPTS} XMLPARSER=libxml2" |
| 106 |
+ |
| 107 |
scons ${MAKEOPTS} || die |
| 108 |
} |
| 109 |
|
| 110 |
|
| 111 |
|
| 112 |
|
| 113 |
1.2 sci-geosciences/mapnik/ChangeLog |
| 114 |
|
| 115 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.2&view=markup |
| 116 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/ChangeLog?rev=1.2&content-type=text/plain |
| 117 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sci-geosciences/mapnik/ChangeLog?r1=1.1&r2=1.2 |
| 118 |
|
| 119 |
Index: ChangeLog |
| 120 |
=================================================================== |
| 121 |
RCS file: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v |
| 122 |
retrieving revision 1.1 |
| 123 |
retrieving revision 1.2 |
| 124 |
diff -u -r1.1 -r1.2 |
| 125 |
--- ChangeLog 25 Sep 2008 05:42:05 -0000 1.1 |
| 126 |
+++ ChangeLog 25 Sep 2008 05:56:22 -0000 1.2 |
| 127 |
@@ -1,6 +1,11 @@ |
| 128 |
# ChangeLog for sci-geosciences/mapnik |
| 129 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 130 |
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.1 2008/09/25 05:42:05 nerdboy Exp $ |
| 131 |
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/mapnik/ChangeLog,v 1.2 2008/09/25 05:56:22 nerdboy Exp $ |
| 132 |
+ |
| 133 |
+ 25 Sep 2008; Steve Arnold <nerdboy@g.o> metadata.xml, |
| 134 |
+ mapnik-0.5.1.ebuild: |
| 135 |
+ Removed proj and gdal use flags in favor of hard depends (mostly to |
| 136 |
+ make it cleaner for people using gpsdrive). |
| 137 |
|
| 138 |
*mapnik-0.5.1 (25 Sep 2008) |
Archives