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

15 files changed, 55 insertions, 46 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 5107b5da8731..f96d92fc47e5 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.372 2012/06/02 21:42:28 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.373 2012/06/16 16:28:39 ssuominen Exp $
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> gimp-2.7.5.ebuild,
+  gimp-2.8.0_rc1.ebuild, gimp-2.8.0.ebuild, gimp-2.8.0-r1.ebuild,
+  gimp-9999.ebuild, metadata.xml:
+  Use global USE flag "postscript" instead of local USE flag "gs" for
+  PostScript support
 
   02 Jun 2012; Sebastian Pipping <sping@gentoo.org> gimp-2.8.0.ebuild,
   gimp-2.8.0-r1.ebuild:
diff --git a/media-gfx/gimp/gimp-2.7.5.ebuild b/media-gfx/gimp/gimp-2.7.5.ebuild
index 31e05f76f7dc..2c4d8ae9db17 100644
--- a/media-gfx/gimp/gimp-2.7.5.ebuild
+++ b/media-gfx/gimp/gimp-2.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/gimp/gimp-2.7.5.ebuild,v 1.4 2012/05/18 22:32:00 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.7.5.ebuild,v 1.5 2012/06/16 16:28:39 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -15,7 +15,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome gs jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.0.1
@@ -52,7 +52,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	x11-libs/libXcursor
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
-	gs? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl )
 	udev? ( sys-fs/udev[gudev] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -80,7 +80,7 @@ pkg_setup() {
 		$(use_with jpeg2k libjasper) \
 		$(use_with exif libexif) \
 		$(use_with lcms) \
-		$(use_with gs) \
+		$(use_with postscript gs) \
 		$(use_enable mmx) \
 		$(use_with mng libmng) \
 		$(use_with pdf poppler) \
diff --git a/media-gfx/gimp/gimp-2.8.0-r1.ebuild b/media-gfx/gimp/gimp-2.8.0-r1.ebuild
index 5428a4394c95..dad6b85a714d 100644
--- a/media-gfx/gimp/gimp-2.8.0-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.0-r1.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/gimp/gimp-2.8.0-r1.ebuild,v 1.4 2012/06/02 21:42:28 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.0-r1.ebuild,v 1.5 2012/06/16 16:28:39 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -15,7 +15,7 @@ SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
-IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome gs jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
 
 for lang in ${LANGS}; do
 	IUSE+=" linguas_${lang}"
@@ -56,7 +56,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	x11-libs/libXcursor
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
-	gs? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl )
 	udev? ( sys-fs/udev[gudev] )"
 DEPEND="${RDEPEND}
 	sys-apps/findutils
@@ -87,7 +87,7 @@ pkg_setup() {
 		$(use_with jpeg2k libjasper) \
 		$(use_with exif libexif) \
 		$(use_with lcms) \
-		$(use_with gs) \
+		$(use_with postscript gs) \
 		$(use_enable mmx) \
 		$(use_with mng libmng) \
 		$(use_with pdf poppler) \
diff --git a/media-gfx/gimp/gimp-2.8.0.ebuild b/media-gfx/gimp/gimp-2.8.0.ebuild
index aa9d16c80d8a..42a5eff532da 100644
--- a/media-gfx/gimp/gimp-2.8.0.ebuild
+++ b/media-gfx/gimp/gimp-2.8.0.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/gimp/gimp-2.8.0.ebuild,v 1.5 2012/06/02 21:42:28 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.0.ebuild,v 1.6 2012/06/16 16:28:39 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -14,7 +14,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome gs jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
@@ -51,7 +51,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	x11-libs/libXcursor
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
-	gs? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl )
 	udev? ( sys-fs/udev[gudev] )"
 DEPEND="${RDEPEND}
 	sys-apps/findutils
@@ -82,7 +82,7 @@ pkg_setup() {
 		$(use_with jpeg2k libjasper) \
 		$(use_with exif libexif) \
 		$(use_with lcms) \
-		$(use_with gs) \
+		$(use_with postscript gs) \
 		$(use_enable mmx) \
 		$(use_with mng libmng) \
 		$(use_with pdf poppler) \
diff --git a/media-gfx/gimp/gimp-2.8.0_rc1.ebuild b/media-gfx/gimp/gimp-2.8.0_rc1.ebuild
index 5c8d08acd4b7..dfec26b46697 100644
--- a/media-gfx/gimp/gimp-2.8.0_rc1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.0_rc1.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/gimp/gimp-2.8.0_rc1.ebuild,v 1.3 2012/05/18 22:32:00 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.8.0_rc1.ebuild,v 1.4 2012/06/16 16:28:39 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -14,7 +14,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 
-IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome gs jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
@@ -51,7 +51,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	x11-libs/libXcursor
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
-	gs? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl )
 	udev? ( sys-fs/udev[gudev] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -81,7 +81,7 @@ pkg_setup() {
 		$(use_with jpeg2k libjasper) \
 		$(use_with exif libexif) \
 		$(use_with lcms) \
-		$(use_with gs) \
+		$(use_with postscript gs) \
 		$(use_enable mmx) \
 		$(use_with mng libmng) \
 		$(use_with pdf poppler) \
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 829c77721afd..33120f318c1d 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.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/gimp/gimp-9999.ebuild,v 1.45 2012/05/18 22:32:00 sping Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.46 2012/06/16 16:28:39 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -17,7 +17,7 @@ LICENSE="GPL-3 LGPL-3"
 SLOT="2"
 KEYWORDS=""
 
-IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome gs jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
+IUSE="alsa aalib altivec bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms mmx mng pdf png python smp sse svg tiff udev webkit wmf xpm"
 
 RDEPEND=">=dev-libs/glib-2.30.2:2
 	>=dev-libs/atk-2.2.0
@@ -54,7 +54,7 @@ RDEPEND=">=dev-libs/glib-2.30.2:2
 	x11-libs/libXcursor
 	sys-libs/zlib
 	bzip2? ( app-arch/bzip2 )
-	gs? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl )
 	udev? ( sys-fs/udev[gudev] )"
 DEPEND="${RDEPEND}
 	sys-apps/findutils
@@ -84,7 +84,7 @@ pkg_setup() {
 		$(use_with jpeg2k libjasper) \
 		$(use_with exif libexif) \
 		$(use_with lcms) \
-		$(use_with gs) \
+		$(use_with postscript gs) \
 		$(use_enable mmx) \
 		$(use_with mng libmng) \
 		$(use_with pdf poppler) \
diff --git a/media-gfx/gimp/metadata.xml b/media-gfx/gimp/metadata.xml
index 35cce1f4afbf..87952c0778bf 100644
--- a/media-gfx/gimp/metadata.xml
+++ b/media-gfx/gimp/metadata.xml
@@ -9,9 +9,6 @@
 		<description>backup maintainer</description>
 	</maintainer>
 	<use>
-		<flag name="gs">
-			Enable Ghostscript support (<pkg>app-text/ghostscript-gpl</pkg>)
-		</flag>
 		<flag name="smp">
 			Enable support for multiprocessors
 		</flag>
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>
diff --git a/media-gfx/inkscape/ChangeLog b/media-gfx/inkscape/ChangeLog
index 726f3a22c953..93026a0f3755 100644
--- a/media-gfx/inkscape/ChangeLog
+++ b/media-gfx/inkscape/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/inkscape
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.176 2012/05/31 17:37:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/ChangeLog,v 1.177 2012/06/16 16:30:05 ssuominen Exp $
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> inkscape-0.48.2.ebuild,
+  inkscape-0.48.3.1.ebuild, metadata.xml:
+  Use global USE flag "postscript" instead of local USE flag "gs" for
+  PostScript support
 
   31 May 2012; Tim Harder <radhermit@gentoo.org> inkscape-0.48.3.1.ebuild:
   Conditionally apply fix for >=poppler-0.20 (bug #418167 by James Cloos, patch
diff --git a/media-gfx/inkscape/inkscape-0.48.2.ebuild b/media-gfx/inkscape/inkscape-0.48.2.ebuild
index 249cb788a236..d523b1dcabab 100644
--- a/media-gfx/inkscape/inkscape-0.48.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.2.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/inkscape/inkscape-0.48.2.ebuild,v 1.12 2012/05/05 07:00:26 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.2.ebuild,v 1.13 2012/06/16 16:30:05 ssuominen Exp $
 
 EAPI=4
 inherit eutils flag-o-matic autotools gnome2
@@ -15,7 +15,7 @@ HOMEPAGE="http://www.inkscape.org/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="amd64 hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="dia gnome gs inkjar lcms nls spell wmf"
+IUSE="dia gnome postscript inkjar lcms nls spell wmf"
 
 RESTRICT="test"
 
@@ -57,7 +57,7 @@ RDEPEND="
 	dev-python/numpy
 	media-gfx/uniconvertor
 	dia? ( app-office/dia )
-	gs? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl )
 	wmf? ( media-libs/libwmf )"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/inkscape/inkscape-0.48.3.1.ebuild b/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
index ac35f7cea13d..8e2c25fca55e 100644
--- a/media-gfx/inkscape/inkscape-0.48.3.1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.48.3.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/media-gfx/inkscape/inkscape-0.48.3.1.ebuild,v 1.4 2012/05/31 17:37:59 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/inkscape/inkscape-0.48.3.1.ebuild,v 1.5 2012/06/16 16:30:05 ssuominen Exp $
 
 EAPI=4
 
@@ -20,7 +20,7 @@ HOMEPAGE="http://www.inkscape.org/"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
-IUSE="dia gnome gs inkjar lcms nls spell wmf"
+IUSE="dia gnome postscript inkjar lcms nls spell wmf"
 
 RESTRICT="test"
 
@@ -61,7 +61,7 @@ RDEPEND="
 	dev-python/numpy
 	media-gfx/uniconvertor
 	dia? ( app-office/dia )
-	gs? ( app-text/ghostscript-gpl )
+	postscript? ( app-text/ghostscript-gpl )
 	wmf? ( media-libs/libwmf )"
 
 DEPEND="${COMMON_DEPEND}
diff --git a/media-gfx/inkscape/metadata.xml b/media-gfx/inkscape/metadata.xml
index 4d0502de5eb6..5e939ec0f02e 100644
--- a/media-gfx/inkscape/metadata.xml
+++ b/media-gfx/inkscape/metadata.xml
@@ -9,8 +9,5 @@
 		<flag name='inkjar'>
 			enables support for OpenOffice.org SVG jar files
 		</flag>
-		<flag name='gs'>
-			enables support for the PostScript import extension
-		</flag>
 	</use>
 </pkgmetadata>