--- /usr/portage/sci-geosciences/mapnik-world-boundaries/mapnik-world-boundaries-20090514.ebuild	2009-06-24 01:46:51.000000000 +1000
+++ mapnik-world-boundaries/mapnik-world-boundaries-20120923.ebuild	2012-09-24 00:16:46.000000000 +1000
@@ -4,25 +4,31 @@
 EAPI=2
 
 DESCRIPTION="Mapnik World Boundaries"
-HOMEPAGE="http://www.openstreetmap.org/"
-SRC_URI="mirror://gentoo/world_boundaries-spherical-20090331.tgz
-	mirror://gentoo/processed_p-20090514.zip"
+HOMEPAGE="http://wiki.openstreetmap.org/wiki/Mapnik#World%20boundaries"
+SRC_URI="http://tile.openstreetmap.org/world_boundaries-spherical.tgz
+	http://tile.openstreetmap.org/processed_p.tar.bz2
+	http://tile.openstreetmap.org/shoreline_300.tar.bz2
+	http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/10m/cultural/10m-populated-places.zip
+	http://www.naturalearthdata.com/http//www.naturalearthdata.com/download/110m/cultural/110m-admin-0-boundary-lines.zip
+"
 
-LICENSE="CCPL-Attribution-ShareAlike-2.0"
+LICENSE="dbcl-10 public-domain"
 SLOT="0"
 
 KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE=""
 
-DEPEND="app-arch/unzip"
+DEPEND="app-arch/bzip2
+	app-arch/unzip
+"
 RDEPEND=""
 
 src_prepare() {
-	mv coastlines/* world_boundaries/
+	mv 110m_admin* ne_10m_populated* processed_p* shoreline* world_boundaries/
 }
 
 src_install() {
-	insinto /usr/share/mapnik
+	insinto /usr/lib/mapnik
 	doins -r world_boundaries
 }