Optionalize app-text/ghostscript-gpl with USE="gs" wrt #409467 by Johan Bergström

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

4 files changed, 29 insertions, 20 deletions

diff --git a/media-gfx/graphicsmagick/ChangeLog b/media-gfx/graphicsmagick/ChangeLog
index 32fdf66a9691..92cbfa840b26 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.93 2012/06/14 22:39:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/ChangeLog,v 1.94 2012/06/14 23:35:41 ssuominen Exp $
+
+  14 Jun 2012; Samuli Suominen <ssuominen@gentoo.org>
+  graphicsmagick-1.3.15.ebuild, metadata.xml:
+  Optionalize app-text/ghostscript-gpl with USE="gs" wrt #409467 by Johan
+  Bergström
 
 *graphicsmagick-1.3.15 (14 Jun 2012)
 
diff --git a/media-gfx/graphicsmagick/Manifest b/media-gfx/graphicsmagick/Manifest
index a0e38f402fe1..21823d64c2da 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 3150 RMD160 ab9b84664d714f5d1d49a0c4b51058750757b14c SHA1 5efdfc7429f04392f6a76cbb31319b8314990872 SHA256 e3c36638d9c6552d1fa4696732bebad1993eccae41eac69564e6f54582e782ef
-MISC ChangeLog 9453 RMD160 4220c278c3aeb35cc4f8f622d21e8382117a9277 SHA1 c20afcf3e22c5f05491ebee6e908e20f202efd7e SHA256 6a0f7577c3db0138e462288e0e08b42a681bd3e3abf0c405fc7f0a31d69937ed
-MISC metadata.xml 948 RMD160 777ea220f961149cf9da9f4d0150c613df0ca92b SHA1 cf14a02282804546e796d61d143b0add1c086cfd SHA256 885686871e4c7d112c5fcbbe0a9056a286c5714985643844bb3a078175085ac6
+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
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJP2miEAAoJEEdUh39IaPFNuzoH/A5V2cmlNN1nT7So7oZrqlEg
-qkXAUmowVHMJ4zfFDjskcEQ5baEAsPEQx1UFqYRi+S0I8frbpB56ZJqxTRD77ZGL
-HO1210o/OyN4r9ehFWI8zNUTOdFMgfWGYF2QKr1/ntZcayEjC9XrTtvhOT+x/FGm
-n7peIn9i+WyveHOyyXru8zy5/7hv4XyWpJGwjW+Xp5eX/fML+z0mxKWwI1dLmzto
-oa49sBB17iWfooOOP4VkwAorIqnLn1sEC/npBnKYomK2kfli/GQXtm8fOYElHz4p
-aSG+AWANF4YncRDv4QfT/nkcJVxWXuxoN76a1ZNzFMXNn6N6P37/qkODO4yxFmM=
-=kf2h
+iQEcBAEBAgAGBQJP2nRVAAoJEEdUh39IaPFN70YH/i8ggvQfyMACG68BTGyMIM6V
+YK2zDuD0SZ+RWv3B/uJlYeu3SI6oaVkgADwpiX73PPAWRsMiI1aXTD/qw1QIunyS
+/EfVhg1sxOmOhGwxU1t28Vgj8wvsxl14tEIYzTErpKBiwPEXso5smWWE7cG8ZHt5
+kqLL27pQ+4Gk7wDOuA81PeWwg5J2zBXvrCFzl/mUBbcyPRM8iXEBhbLPEAe6YXlM
+ASEfbwuqpOQ5jioZQStn07rIggaubSCP47eErg3Ix1M8XbnIGh6AsPYUiybMxoBk
+kvX5signJPWcgMNaRbkb5vDCwMRvVdBL24DwnggChRrmVX3NzjJJhvwwLgWAKGU=
+=YoAA
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.15.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.15.ebuild
index 6f2855b83961..8f829f62f046 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.1 2012/06/14 22:39:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/graphicsmagick/graphicsmagick-1.3.15.ebuild,v 1.2 2012/06/14 23:35:41 ssuominen Exp $
 
 EAPI=4
 inherit eutils toolchain-funcs
@@ -14,24 +14,26 @@ 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 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 gs imagemagick jbig jpeg jpeg2k lcms lzma modules openmp perl png q16 q32 static-libs svg threads tiff truetype wmf X zlib"
 
-RDEPEND="app-text/ghostscript-gpl
-	media-fonts/urw-fonts
-	>=sys-devel/libtool-2.2.6b
+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 )
-	jpeg2k? ( >=media-libs/jasper-1.701.0 )
+	jpeg2k? ( media-libs/jasper )
 	lcms? ( media-libs/lcms:2 )
 	lzma? ( app-arch/xz-utils )
 	perl? ( dev-lang/perl )
-	png? ( >=media-libs/libpng-1.2:0 )
+	png? ( media-libs/libpng:0 )
 	svg? ( dev-libs/libxml2 )
-	tiff? ( >=media-libs/tiff-3.8.2:0 )
-	truetype? ( >=media-libs/freetype-2.0 )
+	tiff? ( media-libs/tiff:0 )
+	truetype? (
+		media-fonts/urw-fonts
+		>=media-libs/freetype-2
+		)
 	wmf? ( media-libs/libwmf )
 	X? (
 		x11-libs/libSM
@@ -76,6 +78,7 @@ src_configure() {
 		$(use_with perl) \
 		--with-perl-options=INSTALLDIRS=vendor \
 		$(use_with bzip2 bzlib) \
+		$(use_with gs dps) \
 		$(use_with fpx) \
 		--without-gslib \
 		$(use_with jbig) \
diff --git a/media-gfx/graphicsmagick/metadata.xml b/media-gfx/graphicsmagick/metadata.xml
index 7828bbc85335..d2f3cce77cb7 100644
--- a/media-gfx/graphicsmagick/metadata.xml
+++ b/media-gfx/graphicsmagick/metadata.xml
@@ -13,6 +13,7 @@
 </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>