Use global USE flag "postscript" instead of local USE flag "gs" for PostScript support

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 16 insertions, 12 deletions

diff --git a/media-gfx/imagemagick/ChangeLog b/media-gfx/imagemagick/ChangeLog
index 020fd8163942..28ec4e0fdc31 100644
--- a/media-gfx/imagemagick/ChangeLog
+++ b/media-gfx/imagemagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/imagemagick
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.483 2012/06/16 16:24:14 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/ChangeLog,v 1.484 2012/06/16 16:32:04 ssuominen Exp $
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  imagemagick-6.7.6.4.ebuild, imagemagick-6.7.7.5.ebuild, metadata.xml:
+  Use global USE flag "postscript" instead of local USE flag "gs" for
+  PostScript support
 
   16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
   -imagemagick-6.7.6.9.ebuild:
diff --git a/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild b/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild
index e5ccde5fdcdb..83ce2b4e08de 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild,v 1.11 2012/05/09 17:35:19 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.6.4.ebuild,v 1.12 2012/06/16 16:32:07 ssuominen Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs versionator
@@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 LICENSE="imagemagick"
 SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RDEPEND=">=sys-devel/libtool-2.2.6b
 	autotrace? ( >=media-gfx/autotrace-0.31.1 )
@@ -25,7 +25,6 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	fontconfig? ( media-libs/fontconfig )
 	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
 	graphviz? ( >=media-gfx/graphviz-2.6 )
-	gs? ( app-text/ghostscript-gpl )
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
@@ -36,6 +35,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	pango? ( x11-libs/pango )
 	perl? ( >=dev-lang/perl-5.8.6-r6 )
 	png? ( media-libs/libpng:0 )
+	postscript? ( app-text/ghostscript-gpl )
 	raw? ( media-gfx/ufraw )
 	svg? ( >=gnome-base/librsvg-2.9.0 )
 	tiff? ( media-libs/tiff:0 )
@@ -100,14 +100,14 @@ src_configure() {
 		$(use_with X x) \
 		$(use_with zlib) \
 		$(use_with autotrace) \
-		$(use_with gs dps) \
+		$(use_with postscript dps) \
 		$(use_with djvu) \
 		--with-dejavu-font-dir="${EPREFIX}/usr/share/fonts/dejavu" \
 		$(use_with fftw) \
 		$(use_with fpx) \
 		$(use_with fontconfig) \
 		$(use_with truetype freetype) \
-		$(use_with gs gslib) \
+		$(use_with postscript gslib) \
 		$(use_with graphviz gvc) \
 		$(use_with jbig) \
 		$(use_with jpeg) \
diff --git a/media-gfx/imagemagick/imagemagick-6.7.7.5.ebuild b/media-gfx/imagemagick/imagemagick-6.7.7.5.ebuild
index 995266a61948..ffd7dbae7a8a 100644
--- a/media-gfx/imagemagick/imagemagick-6.7.7.5.ebuild
+++ b/media-gfx/imagemagick/imagemagick-6.7.7.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.7.5.ebuild,v 1.1 2012/06/01 07:43:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/imagemagick/imagemagick-6.7.7.5.ebuild,v 1.2 2012/06/16 16:32:06 ssuominen Exp $
 
 EAPI=4
 inherit multilib toolchain-funcs versionator libtool
@@ -14,7 +14,7 @@ SRC_URI="mirror://${PN}/${MY_P}.tar.xz"
 LICENSE="imagemagick"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz gs hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
+IUSE="autotrace bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q64 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib"
 
 RESTRICT="perl? ( userpriv )"
 
@@ -27,7 +27,6 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	fontconfig? ( media-libs/fontconfig )
 	fpx? ( >=media-libs/libfpx-1.3.0-r1 )
 	graphviz? ( >=media-gfx/graphviz-2.6 )
-	gs? ( app-text/ghostscript-gpl )
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg )
 	jpeg2k? ( media-libs/jasper )
@@ -38,6 +37,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	pango? ( x11-libs/pango )
 	perl? ( >=dev-lang/perl-5.8.6-r6 )
 	png? ( media-libs/libpng:0 )
+	postscript? ( app-text/ghostscript-gpl )
 	raw? ( media-gfx/ufraw )
 	svg? ( >=gnome-base/librsvg-2.9.0 )
 	tiff? ( media-libs/tiff:0 )
@@ -101,14 +101,14 @@ src_configure() {
 		$(use_with X x) \
 		$(use_with zlib) \
 		$(use_with autotrace) \
-		$(use_with gs dps) \
+		$(use_with postscript dps) \
 		$(use_with djvu) \
 		--with-dejavu-font-dir="${EPREFIX}/usr/share/fonts/dejavu" \
 		$(use_with fftw) \
 		$(use_with fpx) \
 		$(use_with fontconfig) \
 		$(use_with truetype freetype) \
-		$(use_with gs gslib) \
+		$(use_with postscript gslib) \
 		$(use_with graphviz gvc) \
 		$(use_with jbig) \
 		$(use_with jpeg) \
diff --git a/media-gfx/imagemagick/metadata.xml b/media-gfx/imagemagick/metadata.xml
index d4a1a608002f..9ea268abe98a 100644
--- a/media-gfx/imagemagick/metadata.xml
+++ b/media-gfx/imagemagick/metadata.xml
@@ -6,7 +6,6 @@
     <flag name='autotrace'>Use <pkg>media-gfx/autotrace</pkg> to convert bitmaps into vector graphics</flag>
     <flag name='corefonts'>Use <pkg>media-fonts/corefonts</pkg> which is required by some commands</flag> 
     <flag name='fpx'>Enable <pkg>media-libs/libfpx</pkg> support</flag>
-    <flag name='gs'>Enable ghostscript support</flag>
     <flag name='hdri'>enable High Dynamic Range Images formats</flag>
     <flag name='lqr'>Enable experimental liquid rescale support using <pkg>media-libs/liblqr</pkg></flag>
     <flag name='opencl'>Enable OpenCL support</flag>