sci-geosciences/mapnik: Add missing subslot dependencies

Package-Manager: portage-2.2.27

diff --git a/sci-geosciences/mapnik/mapnik-2.0.1.ebuild b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
index b5e1449e7b107906cec0f9b7b15b49d48a891043..ca7a158318613ed36fe264009ad8ae0cbbda61eb 100644 (file)
--- a/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
+++ b/sci-geosciences/mapnik/mapnik-2.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ inherit eutils python scons-utils toolchain-funcs
 
 DESCRIPTION="A Free Toolkit for developing mapping applications"
 HOMEPAGE="http://www.mapnik.org/"
-SRC_URI="https://github.com/downloads/${PN}/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://github/${PN}/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"

diff --git a/sci-geosciences/mapnik/mapnik-2.0.2.ebuild b/sci-geosciences/mapnik/mapnik-2.0.2.ebuild
index 0873250ab19923e85a48f14355700465744c3021..c4d20ce700bef2ad358eb8e6435367f841d92926 100644 (file)
--- a/sci-geosciences/mapnik/mapnik-2.0.2.ebuild
+++ b/sci-geosciences/mapnik/mapnik-2.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ inherit eutils python scons-utils toolchain-funcs
 
 DESCRIPTION="A Free Toolkit for developing mapping applications"
 HOMEPAGE="http://www.mapnik.org/"
-SRC_URI="https://github.com/downloads/${PN}/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://github/${PN}/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"

diff --git a/sci-geosciences/mapnik/mapnik-2.1.0.ebuild b/sci-geosciences/mapnik/mapnik-2.1.0.ebuild
index 1c7a30db59fffeed0925c9b726250df57b006b52..f3c740f8467aee8b5ed3568aa04647f99ffbbf01 100644 (file)
--- a/sci-geosciences/mapnik/mapnik-2.1.0.ebuild
+++ b/sci-geosciences/mapnik/mapnik-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -11,7 +11,7 @@ inherit eutils python scons-utils toolchain-funcs
 
 DESCRIPTION="A Free Toolkit for developing mapping applications"
 HOMEPAGE="http://www.mapnik.org/"
-SRC_URI="https://github.com/downloads/${PN}/${PN}/${MY_P}.tar.bz2"
+SRC_URI="mirror://github/${PN}/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="LGPL-3"
 SLOT="0"

diff --git a/sci-geosciences/mapnik/mapnik-2.2.0.ebuild b/sci-geosciences/mapnik/mapnik-2.2.0.ebuild
index bfc3b65b61a3cb9e0d439e938fe35e5ff5e5d6e1..2bbbfafc2e141585d7c24b10e4b10250815c7c05 100644 (file)
--- a/sci-geosciences/mapnik/mapnik-2.2.0.ebuild
+++ b/sci-geosciences/mapnik/mapnik-2.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -24,9 +24,9 @@ RDEPEND="
        sys-libs/zlib
        media-libs/freetype
        dev-libs/libxml2
-       media-libs/libpng
-       media-libs/tiff
-       virtual/jpeg
+       media-libs/libpng:0=
+       media-libs/tiff:0=
+       virtual/jpeg:0=
        media-libs/libwebp
        sci-libs/proj
        media-fonts/dejavu
@@ -37,7 +37,7 @@ RDEPEND="
                dev-cpp/cairomm
                python? ( dev-python/pycairo[${PYTHON_USEDEP}] )
        )
-       postgres? ( >=dev-db/postgresql-8.3 )
+       postgres? ( >=dev-db/postgresql-8.3:* )
        gdal? ( sci-libs/gdal )
        sqlite? ( dev-db/sqlite:3 )
        python_single_target_python3_3? ( >=dev-libs/boost-1.53[${PYTHON_USEDEP}] )