mapnik-german-9999.ebuild, +files/mapnik-german-9999-drop-ruins.patch

Workaround broken SQL query by removing the feature for now.

4 files changed, 47 insertions, 4 deletions

diff --git a/sci-geosciences/mapnik-german/ChangeLog b/sci-geosciences/mapnik-german/ChangeLog
index 64a9f01..8fc31c0 100644
--- a/sci-geosciences/mapnik-german/ChangeLog
+++ b/sci-geosciences/mapnik-german/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  21 Aug 2012; Christoph Brill <egore911@egore911.de>
+  mapnik-german-9999.ebuild, +files/mapnik-german-9999-drop-ruins.patch:
+  Workaround broken SQL query by removing the feature for now.
+
 *mapnik-german-9999 (21 Aug 2012)
 
   21 Aug 2012; Christoph Brill <egore911@egore911.de>
diff --git a/sci-geosciences/mapnik-german/Manifest b/sci-geosciences/mapnik-german/Manifest
index b2ef24d..ee3b530 100644
--- a/sci-geosciences/mapnik-german/Manifest
+++ b/sci-geosciences/mapnik-german/Manifest
@@ -1,3 +1,4 @@
-EBUILD mapnik-german-9999.ebuild 1149 SHA256 454c10c1a79e1632a372bd6a220ed48a13f77d96cb4ea6cb587a053e582bdc9a SHA512 393515bf3fb58db748c4ece64d397d92b64fd9485b4bd3398cfce90d886fcb14af5fc768dd631a2fe888c14ba65779c41b3e13bdc6dc611e3a3b8e21b7888e26 WHIRLPOOL 101cb663bdd7108ce0ad259035d439aa14ebba14a63e940a2dc9011cf7af388e96221b6fe113f4191ce26ece4ca464b33e70bccb22e9615d2aecb0b675e684ca
-MISC ChangeLog 296 SHA256 1663b9c9140170d0ce2d49e6b161f8b5a7c0a5788bcf6a8e87c76778c0170818 SHA512 d4c91d5ab8c0c9cc419140331b1a387c0913656d0c2c2c50db51776cffde3a59ca03e4cf365bbf25e129bc527972b3b2746ee440059173889330b8a20c497ad1 WHIRLPOOL 9a1aeceb9567529349bc805ec012091a19159a6cdea2faf3b7cb034bddc8abcc1f7ba939fa203f875651136102b8d2bbfde746a53ee7d9752baa053ed97d92e6
+AUX mapnik-german-9999-drop-ruins.patch 1730 SHA256 48d1833abedd0833814ca01f11a1bef26cddc9b48d1c9a063ac4daa1153a881a SHA512 a9b98db3b497a5e130891f014ef1b1150782c3165c5e2218fc52a7ad71deb0e2122f0586df70521482692d0d12ee304302099e6503bb1c15a8113e359339a2ec WHIRLPOOL de70cdf0d9f8e4a59af3ce3af6baa7cfaab440783162375b2c11d4e2ab33f85a6f07c0889be208f8e6fe402bfba3317b7b0a8f859e235edeb85adb5ad7d0158f
+EBUILD mapnik-german-9999.ebuild 1363 SHA256 da81689f060dd9b7bb7a9a97ff8f39640d122fdb5d397ffc87617ec9dd6e40e9 SHA512 8c343e549d9f863171066ef3395198315546d30c573a4f69aaafde437daed5f1984c611db236a78ddc46a62d00f79eb5d8ce8267e3944dbfc2706823e83c5ac0 WHIRLPOOL 93ab4a422a50cec1c028eb1d063d77b9eaf4fd8e06454be15f5c3f81c94d55d1ee4d7c059472b8c1995b8e370fc9df8d7a0e6ecb3c61b37192180428cab5e698
+MISC ChangeLog 487 SHA256 5efaf7cf6b1f23c566c1dc1a5e81528ace092493dbe1f700fd98f991ddc05d6b SHA512 93af0a0d52f7933e0968eba9cfad03f429d0497b33853ef396e9864b9991f4ecbd1ebe9192ab5ca21bddd2f52a0874ab790496221ddb50dfb6cdd584131a9fb1 WHIRLPOOL c68f1d0d0aab9f15d75221c40cc34f6197be7ec3bb67960a183222491ad8762766b5c69eaf561811b4faf279b9cc6dd2674a883f15389f3cd6b9df0c5707bfa0
 MISC metadata.xml 204 SHA256 e808030aad62dfe3e81350c1c879870c3d406c50e908ddc3f521480aec65e8d5 SHA512 4e3e5b3211b0bd063a20b73fc3489bcb4f483990dc0eeb4c677a969f653b72b182e266bdf370669ab83713a9a2b1e26ae6eb703e219d9931c5220d51fb9f5f02 WHIRLPOOL 17bb47a871a62dbb7e5baf653d0e099928ba21409fd66c270f762e528ac1a6323e660c5e3ad8c72847a737ffd105f1d7528ad856608f9f9ac48bb5e55ab13d24
diff --git a/sci-geosciences/mapnik-german/files/mapnik-german-9999-drop-ruins.patch b/sci-geosciences/mapnik-german/files/mapnik-german-9999-drop-ruins.patch
new file mode 100644
index 0000000..005ab76
--- /dev/null
+++ b/sci-geosciences/mapnik-german/files/mapnik-german-9999-drop-ruins.patch
@@ -0,0 +1,34 @@
+--- /usr/portage/distfiles/svn-src/mapnik-german/mapnik-german/inc-de/layer-amenity-points.xml.inc	2012-08-15 13:35:52.866443533 +0200
++++ /usr/share/mapnik-german/inc-de/layer-amenity-points.xml.inc	2012-08-22 00:22:33.055513156 +0200
+@@ -297,12 +297,7 @@
+     </Rule>

+     <Rule>

+       &maxscale_zoom14;

+-      <Filter>[historic]='castle' and [ruins]='yes'</Filter>

+-      <PointSymbolizer file="&ATKISsymbols;/burgruine.png" placement="interior"/>

+-    </Rule>

+-    <Rule>

+-      &maxscale_zoom14;

+-      <Filter>[historic]='castle' and not [ruins]='yes'</Filter>

++      <Filter>[historic]='castle'</Filter>

+       <PointSymbolizer file="&ATKISsymbols;/burg.png" placement="interior"/>

+     </Rule>

+     <Rule>

+@@ -390,7 +385,7 @@
+     <StyleName>points</StyleName>

+     <Datasource>

+       <Parameter name="table">

+-      (select way,coalesce("name:de",name) as name,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure,tags->'ruins' as ruins

++      (select way,coalesce("name:de",name) as name,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure

+       from &prefix;_point

+       where amenity is not null

+          or shop is not null

+@@ -409,7 +404,7 @@
+     <StyleName>points</StyleName>

+     <Datasource>

+       <Parameter name="table">

+-      (select way,coalesce("name:de",name) as name,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure,tags->'ruins' as ruins

++      (select way,coalesce("name:de",name) as name,amenity,shop,tourism,highway,man_made,access,religion,waterway,lock,historic,leisure

+       from &prefix;_polygon

+       where amenity is not null

+          or shop is not null

diff --git a/sci-geosciences/mapnik-german/mapnik-german-9999.ebuild b/sci-geosciences/mapnik-german/mapnik-german-9999.ebuild
index 6bcf32c..016411b 100644
--- a/sci-geosciences/mapnik-german/mapnik-german-9999.ebuild
+++ b/sci-geosciences/mapnik-german/mapnik-german-9999.ebuild
@@ -6,7 +6,7 @@ EAPI=4
 
 ESVN_REPO_URI="http://svn.openstreetmap.org/applications/rendering/mapnik-german/"
 
-inherit subversion
+inherit subversion eutils
 
 DESCRIPTION="German Map Style for mapnik"
 HOMEPAGE="http://www.openstreetmap.de/germanstyle.html"
@@ -27,6 +27,8 @@ src_prepare() {
 		-e "s:/land_polygons<:/processed_p<:g" \
 		inc-de/layer-shapefiles.xml.inc \
 		|| die "sed failed"
+	# The columns are not create by osm2pgsql
+	epatch "${FILESDIR}"/${P}-drop-ruins.patch
 }
 
 src_compile() {
@@ -39,5 +41,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo "Be sure to run osm2pgsql with '-S /usr/share/${PN}/default.style'"
+	einfo "Be sure to run osm2pgsql with '-S /usr/share/${PN}/default.style', for example:"
+	echo
+	einfo "sudo -u postgres osm2pgsql --slim -C 1500 -S /usr/share/${PN}/default.style hessen.osm.pbf"
 }