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, 38 insertions, 32 deletions

diff --git a/dev-ml/camlimages/ChangeLog b/dev-ml/camlimages/ChangeLog
index c0a0e556bd15..7aabd3744626 100644
--- a/dev-ml/camlimages/ChangeLog
+++ b/dev-ml/camlimages/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ml/camlimages
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.31 2012/04/10 12:22:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/ChangeLog,v 1.32 2012/06/16 16:37:51 ssuominen Exp $
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> camlimages-3.0.2.ebuild,
+  camlimages-4.0.1.ebuild, metadata.xml:
+  Use global USE flag "postscript" instead of local USE flag "gs" for
+  PostScript support
 
 *camlimages-4.0.1 (10 Apr 2012)
 
diff --git a/dev-ml/camlimages/Manifest b/dev-ml/camlimages/Manifest
index 58ce012f9e18..d7069b3be0b0 100644
--- a/dev-ml/camlimages/Manifest
+++ b/dev-ml/camlimages/Manifest
@@ -9,14 +9,18 @@ AUX camlimages-3.0.2-tiffread-CVE-2009-3296.patch 995 RMD160 ccf0d82e20c4c11ebe3
 AUX camlimages-4.0.1-libpng15.patch 2354 RMD160 6a0deaea3b853a233fc6c3e81eb883804e6b5603 SHA1 e0daec14d11a7806665bd29975c7f61256c9a103 SHA256 2a7852d67eb31055aff8225666530d808da688f98560e3c0853fc475a27dc29f
 DIST camlimages-3.0.2.tgz 1429138 RMD160 f3b741a30afc23f5d68747830bcd192402514a50 SHA1 7e33e0de1e1afb3b370140fe9c3a610a32bfb9f5 SHA256 db5aec421c89bea7b1bf55df6a674a0a6ac245f89c220c818e2e5d83f623662c
 DIST camlimages-4.0.1.tar.bz2 2010729 RMD160 ba5ade941a0c9b20db693ddd03e5437709a4c5b6 SHA1 b3f8e4be1f7f922016ae11cf7d303b730a28c9dc SHA256 b6a5e79abcfba1316a516f2e0290e6f06c90fa1ed94d8dcd5533a2e3d51c0c89
-EBUILD camlimages-3.0.2.ebuild 1526 RMD160 e91d60f888de572024edb898a84d0de5f6a9e12a SHA1 74edd0fea9188e2609f4e0fb085b723b627df9d7 SHA256 4309e41558a30836d35c325858362c33e02bdf790b80c11daf91af7a5e360789
-EBUILD camlimages-4.0.1.ebuild 2027 RMD160 f5ec952d7111efebdcef35ebc3d35daddab308ae SHA1 814f77fe00f6486cd500193861ad3ecc15787bdc SHA256 38cb25c11827358d98894318dacb72219d837ecf69108ffd6f5932ca0b3460ef
-MISC ChangeLog 5315 RMD160 95cd3d097d9d77eb086b3f63e4e44f9468277127 SHA1 5803aa7ab9a619e3248944f32103a8b9b017d161 SHA256 9c2ffbdbc94992e8ab8a5eda06f84e7471f10624db28d6b575cb4098e99682ab
-MISC metadata.xml 250 RMD160 598e56c53e73f20d9f66aa719a344dd151d72e00 SHA1 eb18ff902a727aa9352e813aacb53831c43a36f0 SHA256 5e4fa04a77d47a0f481ef815f7a82527865397a89ffd15b3288c7d9559644b42
+EBUILD camlimages-3.0.2.ebuild 1556 RMD160 80ea2c6ebdad9cfc5258c62809f99886e05ab319 SHA1 f331fa725905092d8e29aa030862fcd9129c3fe8 SHA256 aafb631bad5235376c0133ea2acd4726f70ef0d31a4f58afb1fb8f0018ec9c1e
+EBUILD camlimages-4.0.1.ebuild 2079 RMD160 6c5adbe64eceef328818a9cb69ddd717286978e7 SHA1 4d133925167d5315fd47167a309936fe143b092a SHA256 88b123ac491c5c085afefd2e8a3e004776bb718a35b1996dbb03d27e11fcb3b5
+MISC ChangeLog 5528 RMD160 78e3691668530057a8ba25a1db6c969f4caf27d6 SHA1 d6b3ca5fc84eb2455b86b1d96889409266d2a71b SHA256 495e22f148f47c818222435209be381a007f42a85c308d9673f8442e731e9763
+MISC metadata.xml 155 RMD160 dfaa057e679b01302a807c75a32a910098b26809 SHA1 94024f83dcacbb53e92be090dd0f994ec93dc90d SHA256 118048376ebb76f57628b0819f3de4856e73959c2578c88715d37ea2d1e0af81
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEARECAAYFAk+EJfwACgkQvFcC4BYPU0pNlwCfeIEm3xcy8q4lrzEUnpA1UQjd
-w4oAoJSVvIS34Pi+n935T14mbtR6UyAt
-=p9HE
+iQEcBAEBAgAGBQJP3LVeAAoJEEdUh39IaPFNkW4H/ifx9wwLtNqnbuJIofGuZvEK
+nM01OlgsB+3qf9FUp7NOd3LI3o4UNVWlpeVbCheaRzZhMLYzKnWwOnaSSEmBMNWw
+BQ1NZWkBB54rbcCdG1tTUdNZ8SkRV4Ywk/Yr8Ub5l8c/zZ5lsvXE0pwRw/EpF3hJ
+kRbdhqSMBgkArlMdM2sw+rtssDw+Q/HwcGRNFaZF1nTW71+ajRhKUsd5JUvVGpvL
+67UBomaVOF7IXpe0EagvMiKhWVu3Xa3xjivwIYNVMUlqAnzYXp/dee47xpRSU5c6
+FGO0pIC518lhV+cx6Ca7ElZsRivGa15xOtQMcaGPaDw8UtQniPFkBT2E30y2hlk=
+=hLzk
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/camlimages/camlimages-3.0.2.ebuild b/dev-ml/camlimages/camlimages-3.0.2.ebuild
index 222cbe2ed8f1..dc9c258dbc8d 100644
--- a/dev-ml/camlimages/camlimages-3.0.2.ebuild
+++ b/dev-ml/camlimages/camlimages-3.0.2.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.9 2011/02/28 18:10:41 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-3.0.2.ebuild,v 1.10 2012/06/16 16:37:51 ssuominen Exp $
 
 EAPI=2
 
 inherit eutils autotools
 
-IUSE="doc gif gs gtk jpeg tiff truetype xpm"
+IUSE="doc gif gtk jpeg postscript tiff truetype xpm"
 
 DESCRIPTION="An image manipulation library for ocaml"
 HOMEPAGE="http://cristal.inria.fr/camlimages/"
@@ -19,10 +19,10 @@ KEYWORDS="~amd64 ppc x86"
 RDEPEND=">=dev-lang/ocaml-3.10.2[X,ocamlopt]
 	gif? ( media-libs/giflib )
 	gtk? ( dev-ml/lablgtk )
-	gs? ( app-text/ghostscript-gpl )
 	jpeg? ( virtual/jpeg )
+	postscript? ( app-text/ghostscript-gpl )
 	tiff? ( media-libs/tiff )
-	>=media-libs/libpng-1.4
+	>=media-libs/libpng-1.4:0
 	truetype? ( >=media-libs/freetype-2 )
 	xpm? ( x11-libs/libXpm )
 	"
@@ -42,7 +42,7 @@ src_prepare() {
 src_configure() {
 	econf \
 		$(use_with gif) \
-		$(use_with gs) \
+		$(use_with postscript gs) \
 		$(use_with gtk lablgtk2) \
 		--without-lablgtk \
 		$(use_with jpeg) \
diff --git a/dev-ml/camlimages/camlimages-4.0.1.ebuild b/dev-ml/camlimages/camlimages-4.0.1.ebuild
index 414aad32fe7a..f72f0dcd508c 100644
--- a/dev-ml/camlimages/camlimages-4.0.1.ebuild
+++ b/dev-ml/camlimages/camlimages-4.0.1.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/dev-ml/camlimages/camlimages-4.0.1.ebuild,v 1.1 2012/04/10 12:22:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/camlimages/camlimages-4.0.1.ebuild,v 1.2 2012/06/16 16:37:51 ssuominen Exp $
 
 EAPI=4
 
@@ -13,15 +13,15 @@ SRC_URI="http://bitbucket.org/camlspotter/camlimages/get/v4.0.1.tar.bz2 -> ${P}.
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc gif gs gtk jpeg png tiff truetype X xpm zlib"
+IUSE="doc gif gtk jpeg png postscript tiff truetype X xpm zlib"
 
 RDEPEND=">=dev-lang/ocaml-3.10.2[X?,ocamlopt]
 	gif? ( media-libs/giflib )
 	gtk? ( dev-ml/lablgtk )
-	gs? ( app-text/ghostscript-gpl )
 	jpeg? ( virtual/jpeg )
 	tiff? ( media-libs/tiff )
-	png? ( >=media-libs/libpng-1.4 )
+	png? ( >=media-libs/libpng-1.4:0 )
+	postscript? ( app-text/ghostscript-gpl )
 	truetype? ( >=media-libs/freetype-2 )
 	xpm? ( x11-libs/libXpm )
 	X? ( x11-apps/rgb )
@@ -46,17 +46,17 @@ camlimages_disable_have() {
 }
 
 src_configure() {
-	camlimages_disable_have gif      GIF
-	camlimages_disable_have zlib     Z
-	camlimages_disable_have png      PNG
-	camlimages_disable_have jpeg     JPEG
-	camlimages_disable_have tiff     TIFF
-	camlimages_disable_have xpm      XPM
-	camlimages_disable_have gs       PS
-	camlimages_disable_have gtk      LABLGTK2
-	camlimages_disable_have X        GRAPHICS
-	camlimages_disable_have X        RGB_TXT
-	camlimages_disable_have truetype FREETYPE
+	camlimages_disable_have gif         GIF
+	camlimages_disable_have zlib        Z
+	camlimages_disable_have png         PNG
+	camlimages_disable_have jpeg        JPEG
+	camlimages_disable_have tiff        TIFF
+	camlimages_disable_have xpm         XPM
+	camlimages_disable_have postscript  PS
+	camlimages_disable_have gtk         LABLGTK2
+	camlimages_disable_have X           GRAPHICS
+	camlimages_disable_have X           RGB_TXT
+	camlimages_disable_have truetype    FREETYPE
 }
 
 src_compile() {
diff --git a/dev-ml/camlimages/metadata.xml b/dev-ml/camlimages/metadata.xml
index 833e0adbfd20..2193d772e351 100644
--- a/dev-ml/camlimages/metadata.xml
+++ b/dev-ml/camlimages/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>ml</herd>
-<use>
-	<flag name="gs">Ghostscript support (<pkg>app-text/ghostscript-gpl</pkg>)</flag>
-</use>
 </pkgmetadata>