From 4a3382fe34fc23022d01bb6797c34e67a57c6e9b Mon Sep 17 00:00:00 2001 From: David Seifert Date: Sat, 11 Feb 2017 20:21:51 +0100 Subject: [PATCH] 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 --- .../{postgis-2.1.8.ebuild => postgis-2.1.8-r1.ebuild} | 7 ++----- .../{postgis-2.2.0.ebuild => postgis-2.2.0-r1.ebuild} | 7 ++----- .../{postgis-2.2.1.ebuild => postgis-2.2.1-r1.ebuild} | 7 ++----- .../{postgis-2.2.5.ebuild => postgis-2.2.2-r1.ebuild} | 5 +---- .../{postgis-2.2.2.ebuild => postgis-2.2.5-r1.ebuild} | 7 ++----- .../{postgis-2.3.2.ebuild => postgis-2.3.2-r1.ebuild} | 5 +---- dev-db/postgis/postgis-9999.ebuild | 7 ++----- 7 files changed, 12 insertions(+), 33 deletions(-) rename dev-db/postgis/{postgis-2.1.8.ebuild => postgis-2.1.8-r1.ebuild} (98%) rename dev-db/postgis/{postgis-2.2.0.ebuild => postgis-2.2.0-r1.ebuild} (95%) rename dev-db/postgis/{postgis-2.2.1.ebuild => postgis-2.2.1-r1.ebuild} (95%) rename dev-db/postgis/{postgis-2.2.5.ebuild => postgis-2.2.2-r1.ebuild} (97%) rename dev-db/postgis/{postgis-2.2.2.ebuild => postgis-2.2.5-r1.ebuild} (95%) rename dev-db/postgis/{postgis-2.3.2.ebuild => postgis-2.3.2-r1.ebuild} (97%) 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 ac370b688e8b..c094f484ba44 100644 --- 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 4e3023c74951..ddfe87154757 100644 --- 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 4e3023c74951..ddfe87154757 100644 --- 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 dbd23affd4a3..b092e33137b5 100644 --- 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 9d93dd357555..b092e33137b5 100644 --- 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 4bf76c5505c6..dcf7ebcb5eca 100644 --- 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 d386460e6db1..ddbe5d735cbb 100644 --- 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 ) -- 2.26.2