+files/88_mod_tile.conf, mod_tile-9999.ebuild

Add configuration file and rely on sci-geosciences/mapnik-stylesheets for the
osm.xml

4 files changed, 15 insertions, 9 deletions

diff --git a/sci-geosciences/mod_tile/ChangeLog b/sci-geosciences/mod_tile/ChangeLog
index 0ea0752..d9e29d9 100644
--- a/sci-geosciences/mod_tile/ChangeLog
+++ b/sci-geosciences/mod_tile/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  04 Jun 2012; Christoph Brill <cbrill@gentoo.org> +files/88_mod_tile.conf,
+  mod_tile-9999.ebuild:
+  Add configuration file and rely on sci-geosciences/mapnik-stylesheets for the
+  osm.xml
+
 *mod_tile-9999 (02 Jun 2012)
 
   02 Jun 2012; Christoph Brill <cbrill@gentoo.org> +mod_tile-9999.ebuild,
diff --git a/sci-geosciences/mod_tile/Manifest b/sci-geosciences/mod_tile/Manifest
index d752341..5602ecf 100644
--- a/sci-geosciences/mod_tile/Manifest
+++ b/sci-geosciences/mod_tile/Manifest
@@ -1,5 +1,5 @@
+AUX 88_mod_tile.conf 60 RMD160 3dd32aef01bd5e8460b61b6c828afdac27eb9e67 SHA1 b4c8b484d182a918fff16c82d7f6f29ea0e0ed8c SHA256 c2ebd537ba6e229b14ce6e12446e3c5795bcaa3601a988a5a92891a4ea4da207
 AUX mod_tile-9999-use-external-iniparser.patch 1080 RMD160 b48ef7dfc3ea94c8dc8a93ad014f87e6e4ec9b1d SHA1 126c03c699bb8d711d12773142e3a24a43587387 SHA256 5c210ef78edb588f731db7f69fd2f183d70e167bf22489a782843bda4a8f4f03
-DIST osm.xml 170859 RMD160 a9a7b373243731525a8f205b907151395c6c8114 SHA1 1baafa1bf16d8a902f3aa4e8c0b011498210b476 SHA256 ae0dc71c788e6dd4621258c97ca350a27a45abc0a8f58c137a2eef18f89b8aa4
-EBUILD mod_tile-9999.ebuild 1162 RMD160 b831d66d8732084d215277e51730975679b42312 SHA1 e37cce6662dd0d92e9053796ed13b3dc20d41b6c SHA256 ae95b28fe146f2dfbac232147e17c9d4610a2f46a334167c882e48d301ec1efa
-MISC ChangeLog 330 RMD160 a66d71fdd791c9c46d5089909fdd9da3969f9776 SHA1 0f9ff22117a550b05d96b30122354bba805ff1b6 SHA256 8fd578097717b67fbf1d418e79f989eb521c00f548e4c24aeaf67ee07115e8c2
+EBUILD mod_tile-9999.ebuild 1114 RMD160 8ce2bf7bd08eaf0a21bece7c81539686fad30f54 SHA1 887ec2ea1006fd6bfc604c736a1b062926d76320 SHA256 0b40295fdeceb438eb7b8030b0be4bee0defd87223cb7742b02862329debfeab
+MISC ChangeLog 521 RMD160 4de9b61ebfb76ddbba58f8ee66e7cb3b46b93f02 SHA1 8cbf898603e2365e49cf4d775873c3607f6c5dd8 SHA256 aaccd0caceb2e3beef54d78008bf45ffea78fd14aef589dff41cde294251109c
 MISC metadata.xml 204 RMD160 19671a561cc119505a06464a35a5096b484471c2 SHA1 b00abe788b4847cd2bfcdb6e4e207ed38949d475 SHA256 e808030aad62dfe3e81350c1c879870c3d406c50e908ddc3f521480aec65e8d5
diff --git a/sci-geosciences/mod_tile/files/88_mod_tile.conf b/sci-geosciences/mod_tile/files/88_mod_tile.conf
new file mode 100644
index 0000000..eb6b330
--- /dev/null
+++ b/sci-geosciences/mod_tile/files/88_mod_tile.conf
@@ -0,0 +1 @@
+LoadModule tile_module /usr/lib/apache2/modules/mod_tile.so
diff --git a/sci-geosciences/mod_tile/mod_tile-9999.ebuild b/sci-geosciences/mod_tile/mod_tile-9999.ebuild
index 77d8156..3fd3ef5 100644
--- a/sci-geosciences/mod_tile/mod_tile-9999.ebuild
+++ b/sci-geosciences/mod_tile/mod_tile-9999.ebuild
@@ -8,7 +8,6 @@ inherit apache-module subversion autotools
 
 DESCRIPTION="a raster tiles service for example to use within a slippy map"
 HOMEPAGE="http://wiki.openstreetmap.org/wiki/Mod_tile"
-SRC_URI="http://svn.openstreetmap.org/applications/rendering/mapnik/osm.xml"
 ESVN_REPO_URI="http://svn.openstreetmap.org/applications/utils/mod_tile/"
 #ESVN_REVISION="28425"
 
@@ -20,16 +19,19 @@ IUSE=""
 DEPEND=">=sci-geosciences/mapnik-2.0
 	media-libs/freetype:2
 	>=dev-libs/icu-4.2
-	dev-libs/iniparser"
+	dev-libs/iniparser
+	sci-geosciences/mapnik-stylesheets"
 RDEPEND="${DEPEND}"
 
+APACHE2_MOD_CONF="88_${PN}"
+
 need_apache
 
 src_prepare() {
 	epatch "${FILESDIR}"/${P}-use-external-iniparser.patch
 	sed -i \
 		-e "s:/usr/local/lib64/mapnik:/usr/lib64/mapnik:g" renderd.conf \
-		-e "s:/home/jburgess/osm/svn.openstreetmap.org/applications/rendering/mapnik/osm-local.xml:/etc/renderd.d/osm.xml:" \
+		-e "s:/home/jburgess/osm/svn.openstreetmap.org/applications/rendering/mapnik/osm-local.xml:/usr/share/mapnik-stylesheets/osm.xml:" \
 		|| die "sed failed"
 	eautoreconf || die "eautoreconf failed"
 }
@@ -42,6 +44,4 @@ src_compile() {
 src_install() {
 	default
 	apache-module_src_install
-	insinto /etc/renderd.d
-	doins "${DISTDIR}"/osm.xml
-}
\ No newline at end of file
+}