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

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 28 insertions, 26 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 92cbfa840b26..d92e22cdae9d 100644
--- a/media-gfx/graphicsmagick/ChangeLog
+++ b/media-gfx/graphicsmagick/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/graphicsmagick
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.94 2012/06/14 23:35:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.95 2012/06/16 16:22:59 ssuominen Exp $
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  graphicsmagick-1.3.15.ebuild, metadata.xml:
+  Use global USE flag "postscript" instead of local USE flag "gs" for
+  PostScript support
 
   14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
   graphicsmagick-1.3.15.ebuild, metadata.xml:
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index 21823d64c2da..68a8199fcf6a 100644
--- a/media-gfx/graphicsmagick/Manifest
+++ b/media-gfx/graphicsmagick/Manifest
@@ -7,17 +7,17 @@ DIST GraphicsMagick-1.3.14.tar.xz 4879292 RMD160 b8d973d60af70e48ff02689ebb8efb1
 DIST GraphicsMagick-1.3.15.tar.xz 4921024 RMD160 38d82616acffae4749ee701377fa882438b751bb SHA1 d5df4000d5531fad3ede9e008f9c8dc2d085d546 SHA256 47fc508e596f3ff35f0e94f7844f52c19124446e5626e5081064f81cc39715e8
 EBUILD graphicsmagick-1.3.13.ebuild 3101 RMD160 4f0038e8d452f95c61a621230e8e8b05f1ee8cc0 SHA1 5b49b063518cc48117ba2e4ee2a027fbdf482cf9 SHA256 662eb525e865e3fdead9203f9017f2a48983d34509eea31e843d447084a68e80
 EBUILD graphicsmagick-1.3.14.ebuild 3131 RMD160 7a8c4b1a94ce3d5ad6bfd6049880f92c4cd0c231 SHA1 b563273253b864c961b5ca11fc6ff83a07663699 SHA256 430c039f9107e60c8a37cdf57991d7fb287ddd140955e4c84c81f9a72c8864be
-EBUILD graphicsmagick-1.3.15.ebuild 3163 RMD160 03ebb8f453efaa25127193bb87e7e82c32c84465 SHA1 dc36417512415504965e076791dce70d12413eac SHA256 9b9b3e5f55bcfb12f934299cefb01f028a82c18cc6f065a9f7cdbae207fcb6ab
-MISC ChangeLog 9641 RMD160 dfb9371c3f9739b99d9fc632bf80ab4039d282f7 SHA1 b5afbfdca095063ccc338f80426979bf924fedaa SHA256 970e1d9ae5b849f6fc298d194e5175ba661ea1ee4832170a8235c4984208e862
-MISC metadata.xml 1000 RMD160 5217b1bd18afe9761c19dd6f8eec7a17f1ced1d8 SHA1 78739ded6266b6a399badf5d0149acc3edd06104 SHA256 6a17ae298058420370ef3a1302a9a4668115b297d6aaf2edd519cbd89b2610c1
+EBUILD graphicsmagick-1.3.15.ebuild 3187 RMD160 bcdc439a30919a06467a06cd0f35a4af6b845083 SHA1 dee50c82bf108cc0c4c0b2546bc2bf76c4ba7613 SHA256 13c94718843ebf97561c009b116de8e6eab726fb81eceb63ef418f5d805a2d59
+MISC ChangeLog 9833 RMD160 300869be5ed92353978dcb13fedf103b0489a671 SHA1 34a60d5986bed791eb92258e5d0658a303bfab1b SHA256 b74b7702eb02cf83302c3c9017e775d15eb36f70a8c5efbb0891d6e568b130e2
+MISC metadata.xml 948 RMD160 777ea220f961149cf9da9f4d0150c613df0ca92b SHA1 cf14a02282804546e796d61d143b0add1c086cfd SHA256 885686871e4c7d112c5fcbbe0a9056a286c5714985643844bb3a078175085ac6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP2nRVAAoJEEdUh39IaPFN70YH/i8ggvQfyMACG68BTGyMIM6V
-YK2zDuD0SZ+RWv3B/uJlYeu3SI6oaVkgADwpiX73PPAWRsMiI1aXTD/qw1QIunyS
-/EfVhg1sxOmOhGwxU1t28Vgj8wvsxl14tEIYzTErpKBiwPEXso5smWWE7cG8ZHt5
-kqLL27pQ+4Gk7wDOuA81PeWwg5J2zBXvrCFzl/mUBbcyPRM8iXEBhbLPEAe6YXlM
-ASEfbwuqpOQ5jioZQStn07rIggaubSCP47eErg3Ix1M8XbnIGh6AsPYUiybMxoBk
-kvX5signJPWcgMNaRbkb5vDCwMRvVdBL24DwnggChRrmVX3NzjJJhvwwLgWAKGU=
-=YoAA
+iQEcBAEBAgAGBQJP3LHiAAoJEEdUh39IaPFNaV8H/A4WSoYBfBgO/24e9mCUQeH8
+Me89Hs/B0Zia/d/TM2H0QCDd9ukCwe+P2JTixt53pyeOOhsRunZN5O/bBPcyTmHI
+yH5QHSStFZ2dV2x5wz8iGrbDP9KbaGa4EOUntC+kOd01eKW4BJhMNqCTwVrC4O6Q
+gITBJhTfoZi7EPVfonJyaHJF4tf9InO8+PD61ci6JnseR4OxPcQdINUKC9D90ZNh
+CKvTw8YCjYU1HIK2W9yWdptvGzrKf/QMxBNbVlYiKCh3Pei2ZtDzJyXtDn0spJFs
+2akM0j6n0AxhDhF7keWcsJDczzSyG400ohUQ2FE30zm+VVmzhGzdH5Fnm0ogZyA=
+=+smG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.15.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.15.ebuild
index 8f829f62f046..0d3ce2ad799d 100644
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.15.ebuild
+++ b/media-gfx/graphicsmagick/graphicsmagick-1.3.15.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/graphicsmagick/graphicsmagick-1.3.15.ebuild,v 1.2 2012/06/14 23:35:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.15.ebuild,v 1.3 2012/06/16 16:22:59 ssuominen Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -14,12 +14,11 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="bzip2 cxx debug fpx gs imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png q16 q32 static-libs svg threads tiff truetype wmf X zlib"
+IUSE="bzip2 cxx debug fpx imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png postscript q16 q32 static-libs svg threads tiff truetype wmf X zlib"
 
 RDEPEND=">=sys-devel/libtool-2.2.6b
 	bzip2? ( app-arch/bzip2 )
 	fpx? ( media-libs/libfpx )
-	gs? ( app-text/ghostscript-gpl )
 	imagemagick? ( !media-gfx/imagemagick )
 	jbig? ( media-libs/jbigkit )
 	jpeg? ( virtual/jpeg )
@@ -28,6 +27,7 @@ RDEPEND=">=sys-devel/libtool-2.2.6b
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng:0 )
+	postscript? ( app-text/ghostscript-gpl )
 	svg? ( dev-libs/libxml2 )
 	tiff? ( media-libs/tiff:0 )
 	truetype? (
@@ -78,7 +78,7 @@ src_configure() {
 		$(use_with perl) \
 		--with-perl-options=INSTALLDIRS=vendor \
 		$(use_with bzip2 bzlib) \
-		$(use_with gs dps) \
+		$(use_with postscript dps) \
 		$(use_with fpx) \
 		--without-gslib \
 		$(use_with jbig) \
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index d2f3cce77cb7..7828bbc85335 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -13,7 +13,6 @@
 </longdescription>
 <use>
   <flag name='fpx'>Enable FlashPix support with <pkg>media-libs/libfpx</pkg></flag>
-  <flag name='gs'>Enable ghostscript support</flag>
   <flag name='modules'>Compile graphicsmagick with dynamically loadable modules</flag>
   <flag name='q16'>Set storage quantum size to 16 (~2*memory)</flag>
   <flag name='q32'>Set storage quantum size to 32 (~5*memory)</flag>
diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest
index b6be36d9c6ff..ecf9480fce81 100644
--- a/media-gfx/imagemagick/Manifest
+++ b/media-gfx/imagemagick/Manifest
@@ -2,21 +2,19 @@
 Hash: SHA1
 
 DIST ImageMagick-6.7.6-4.tar.xz 7576636 RMD160 f8f75421e62ae9808bf8b1b549b1ec4ee92f40a7 SHA1 e349c0976d87d8897f9d6fc3d9efee6062ec0f4d SHA256 612910aca97c345e21901cb3b2b45b485029f196d02c3c42fc3354fc824b811e
-DIST ImageMagick-6.7.6-9.tar.xz 7653436 RMD160 0762ef3b40a7fda5c42ff2a2727ff74104cceae6 SHA1 4577fcabab5e754a777db874692587e26e6a2696 SHA256 4ce906ce36622a864746cf808fd14f9deba0eb6b6890c00e5832323e8c868e5c
 DIST ImageMagick-6.7.7-5.tar.xz 7602596 RMD160 0617338c6234f08793d2f053c5dcac542731ffca SHA1 44b307c97c9bc27f60963306c82e2de5e37dcfb5 SHA256 5a978f28e4e4e8f5a5d553fa0a673beccc440ce9bd5119a26464f63168cba714
 EBUILD imagemagick-6.7.6.4.ebuild 4188 RMD160 c8a14f4d5c6b091b9c320e48e0d51b5033f27bc4 SHA1 5120e6e90a54fea0c69d97f9288d1903f0f7cc78 SHA256 e11eb8cda888c670a42396b993c2df7b1a0208c51c6f0d72b6126fb17cc5e148
-EBUILD imagemagick-6.7.6.9.ebuild 4303 RMD160 be4c4cc9eddc2d2278dd01442c7f7a704f25767e SHA1 6d1789777871bfd1a740cde86c347dcb67c14ff1 SHA256 594c27cdd3de052cf2df79b0620ed644e4133f7348d6183aecdf81eff309f59a
 EBUILD imagemagick-6.7.7.5.ebuild 4305 RMD160 d57b45e0e63f41471499b74abc443589c9a57435 SHA1 edd5219f4f20f03f5d45525a66e9f9291037d026 SHA256 a6bf110597f3475af9b286d40998002755c06ff38767d634cd4c29c7b025b805
-MISC ChangeLog 71388 RMD160 708e4ad3ab6b1a0b5cc3b5c744908475b78eef64 SHA1 9966446973c9fdab8a4341484137099a847449d6 SHA256 c3f459e787565ea12dfda81065a76ca3b41eba701a39a31eb8f9581beada6bcf
+MISC ChangeLog 71480 RMD160 4c0fce0d8581fc67433628bd555815790c492a24 SHA1 50e1bdca20c4b4753353187ce9d8e8d060be7469 SHA256 21e3794b575d14112e8b0d66816ea411160402b3cad11571769d6abb6b5e8ed9
 MISC metadata.xml 1104 RMD160 a1e2500c6057d9aaac9424ec72dc099da042e1ee SHA1 4ad8f34e03f649808dfa3999d60497c56722cee8 SHA256 d6840b362278ffdced22382075ebd20652f1b82470b6b9cbd035c4fc9ece60d3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPyHGqAAoJEEdUh39IaPFNnycH/iKhncgemGP/dFxkJELxevFl
-cW+BUxDGhdk/I71ZHc5EsqRf584f0b1BvQdJ0yYVmq0R5RHore30/CadVVIEL6tK
-0BWtmS2KHQQE7LsL5MIpCGQOZ4EWbnzpF9IFBiV8xlp40r6VxB8nfZBuuoXju7eC
-pA89hvuuO+SkuC1clPrG0BTVTwSHzz8gCgYtVQJ9f9U2BMy+UFxJ4H9pIyKNYDmJ
-3YX9nsGVm0SfB8wnN33UbvzmXL96Xof7d8mOYr6hakkso72fbuasYTQ5Z/ByMBIk
-LIWNrViHFlqSF8Zdf7o7qOFd+ScSApNXJMQgP1rmcEBdMvrGAqXsAjIuvPdbQEI=
-=zP2P
+iQEcBAEBAgAGBQJP3LIsAAoJEEdUh39IaPFNL9MH/j9mTWdKptPMc2Bm1qdYe7N5
+nd7xhBKdE0hNy9t1WZz13OsoUfv0Wm7k7vVvysK07ft79y6TvyLmd8r6eVfnB8Md
+JgMcLhWHU+RWQAZGKbGCvbGaNgRRHxRmFkJljzhol76y8IEUh8iwRTeFIfILID+J
+q9rOKK0eRiDJ8hDg3FcgbS0zDq8TfEp0hXC/ZoQbqw+aeSQvBwISLsWQ03oGu+Nq
+kBKzR2xSUvCxmROhBaRyp1fgowICjXFo4VSSRCw/tAkKCkihpeZMne9f5QG7dp/5
+V713H3RHmO4tRFsx8XUO7/Igu/Ddmpl6nPo9dhDHaq2Yxv008+3thO60wcSbPkI=
+=+wmK
 -----END PGP SIGNATURE-----