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, 27 insertions, 25 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/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>