dev-db/postgis: Depend on virtual/imagemagick-tools

Package-Manager: Portage-2.3.3, Repoman-2.3.1
Closes: https://github.com/gentoo/gentoo/pull/3907

diff --git a/dev-db/postgis/postgis-2.1.8.ebuild b/dev-db/postgis/postgis-2.1.8-r1.ebuild
similarity index 98%
rename from dev-db/postgis/postgis-2.1.8.ebuild
rename to dev-db/postgis/postgis-2.1.8-r1.ebuild
index ac370b688e8bcec00f920a6b5ebe72e7ee4e9db1..c094f484ba44db86a2521d8819a0616199f4d2dd 100644 (file)
--- a/dev-db/postgis/postgis-2.1.8.ebuild
+++ b/dev-db/postgis/postgis-2.1.8-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -39,10 +39,7 @@ DEPEND="${RDEPEND}
                                app-text/docbook-xsl-stylesheets
                                app-text/docbook-xml-dtd:4.5
                                dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
+                               virtual/imagemagick-tools[png]
                )
                virtual/pkgconfig
                test? ( dev-util/cunit )

diff --git a/dev-db/postgis/postgis-2.2.0.ebuild b/dev-db/postgis/postgis-2.2.0-r1.ebuild
similarity index 95%
rename from dev-db/postgis/postgis-2.2.0.ebuild
rename to dev-db/postgis/postgis-2.2.0-r1.ebuild
index 4e3023c749516736ebcdd3a58c2356882defcafe..ddfe871547574cbaf4a222ef202f6bd0e782b426 100644 (file)
--- a/dev-db/postgis/postgis-2.2.0.ebuild
+++ b/dev-db/postgis/postgis-2.2.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,10 +40,7 @@ DEPEND="${RDEPEND}
                                app-text/docbook-xsl-stylesheets
                                app-text/docbook-xml-dtd:4.5
                                dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
+                               virtual/imagemagick-tools[png]
                )
                virtual/pkgconfig
                test? ( dev-util/cunit )

diff --git a/dev-db/postgis/postgis-2.2.1.ebuild b/dev-db/postgis/postgis-2.2.1-r1.ebuild
similarity index 95%
rename from dev-db/postgis/postgis-2.2.1.ebuild
rename to dev-db/postgis/postgis-2.2.1-r1.ebuild
index 4e3023c749516736ebcdd3a58c2356882defcafe..ddfe871547574cbaf4a222ef202f6bd0e782b426 100644 (file)
--- a/dev-db/postgis/postgis-2.2.1.ebuild
+++ b/dev-db/postgis/postgis-2.2.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,10 +40,7 @@ DEPEND="${RDEPEND}
                                app-text/docbook-xsl-stylesheets
                                app-text/docbook-xml-dtd:4.5
                                dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
+                               virtual/imagemagick-tools[png]
                )
                virtual/pkgconfig
                test? ( dev-util/cunit )

diff --git a/dev-db/postgis/postgis-2.2.5.ebuild b/dev-db/postgis/postgis-2.2.2-r1.ebuild
similarity index 97%
rename from dev-db/postgis/postgis-2.2.5.ebuild
rename to dev-db/postgis/postgis-2.2.2-r1.ebuild
index dbd23affd4a391b7acdc7559a90bd62baaa12c79..b092e33137b59887c0e3a0fc4d03c99a1a3688fb 100644 (file)
--- a/dev-db/postgis/postgis-2.2.5.ebuild
+++ b/dev-db/postgis/postgis-2.2.2-r1.ebuild
@@ -40,10 +40,7 @@ DEPEND="${RDEPEND}
                                app-text/docbook-xsl-stylesheets
                                app-text/docbook-xml-dtd:4.5
                                dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
+                               virtual/imagemagick-tools[png]
                )
                virtual/pkgconfig
                test? ( dev-util/cunit )

diff --git a/dev-db/postgis/postgis-2.2.2.ebuild b/dev-db/postgis/postgis-2.2.5-r1.ebuild
similarity index 95%
rename from dev-db/postgis/postgis-2.2.2.ebuild
rename to dev-db/postgis/postgis-2.2.5-r1.ebuild
index 9d93dd357555d3f6bdd1102dd611c35afeeb5fe4..b092e33137b59887c0e3a0fc4d03c99a1a3688fb 100644 (file)
--- a/dev-db/postgis/postgis-2.2.2.ebuild
+++ b/dev-db/postgis/postgis-2.2.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -40,10 +40,7 @@ DEPEND="${RDEPEND}
                                app-text/docbook-xsl-stylesheets
                                app-text/docbook-xml-dtd:4.5
                                dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
+                               virtual/imagemagick-tools[png]
                )
                virtual/pkgconfig
                test? ( dev-util/cunit )

diff --git a/dev-db/postgis/postgis-2.3.2.ebuild b/dev-db/postgis/postgis-2.3.2-r1.ebuild
similarity index 97%
rename from dev-db/postgis/postgis-2.3.2.ebuild
rename to dev-db/postgis/postgis-2.3.2-r1.ebuild
index 4bf76c5505c6f5d4ebcc70c0c314b34b69d0b98b..dcf7ebcb5eca5c2fe1456e82fa357b1f5c992d24 100644 (file)
--- a/dev-db/postgis/postgis-2.3.2.ebuild
+++ b/dev-db/postgis/postgis-2.3.2-r1.ebuild
@@ -41,10 +41,7 @@ DEPEND="${RDEPEND}
                                app-text/docbook-xsl-stylesheets
                                app-text/docbook-xml-dtd:4.5
                                dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
+                               virtual/imagemagick-tools[png]
                )
                virtual/pkgconfig
                test? ( dev-util/cunit )

diff --git a/dev-db/postgis/postgis-9999.ebuild b/dev-db/postgis/postgis-9999.ebuild
index d386460e6db1de61cee3713b020d7ddfacece8e7..ddbe5d735cbb67798cfdf03cec14a4d9b3bd4ea2 100644 (file)
--- a/dev-db/postgis/postgis-9999.ebuild
+++ b/dev-db/postgis/postgis-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -41,10 +41,7 @@ DEPEND="${RDEPEND}
                                app-text/docbook-xsl-stylesheets
                                app-text/docbook-xml-dtd:4.5
                                dev-libs/libxslt
-                               || (
-                                       media-gfx/imagemagick[png]
-                                       media-gfx/graphicsmagick[imagemagick,png]
-                               )
+                               virtual/imagemagick-tools[png]
                )
                virtual/pkgconfig
                test? ( dev-util/cunit )