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

(Portage version: 2.2.0_alpha110/cvs/Linux x86_64)

4 files changed, 14 insertions, 10 deletions

diff --git a/kde-base/okular/ChangeLog b/kde-base/okular/ChangeLog
index 824fd2299b8a..38d14b15226e 100644
--- a/kde-base/okular/ChangeLog
+++ b/kde-base/okular/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for kde-base/okular
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.140 2012/05/24 11:38:09 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/ChangeLog,v 1.141 2012/06/16 16:44:50 ssuominen Exp $
+
+  16 Jun 2012; Samuli Suominen <ssuominen@gentoo.org> okular-4.7.4.ebuild,
+  okular-4.8.3.ebuild, metadata.xml:
+  Use global USE flag "postscript" instead of local USE flag "ps" for
+  PostScript support
 
   24 May 2012; Johannes Huber <johu@gentoo.org> -okular-4.8.1.ebuild:
   Remove KDE SC 4.8.1
diff --git a/kde-base/okular/metadata.xml b/kde-base/okular/metadata.xml
index f639223a0bcf..a23f58cf78b7 100644
--- a/kde-base/okular/metadata.xml
+++ b/kde-base/okular/metadata.xml
@@ -4,7 +4,6 @@
 <use>
 	<flag name="chm">Enable support for Microsoft Compiled HTML Help files</flag>
 	<flag name="ebook">Add E-Book support</flag>
-	<flag name="ps">Add PostScript support</flag>
 </use>
 <herd>kde</herd>
 </pkgmetadata>
diff --git a/kde-base/okular/okular-4.7.4.ebuild b/kde-base/okular/okular-4.7.4.ebuild
index c5e2f134b7d1..122fa9a1a8ed 100644
--- a/kde-base/okular/okular-4.7.4.ebuild
+++ b/kde-base/okular/okular-4.7.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/kde-base/okular/okular-4.7.4.ebuild,v 1.5 2012/05/21 21:52:57 reavertm Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.7.4.ebuild,v 1.6 2012/06/16 16:44:50 ssuominen Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit kde4-base
 
 DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
 KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="chm crypt debug djvu ebook +jpeg +ps +pdf +tiff"
+IUSE="chm crypt debug djvu ebook +jpeg +postscript +pdf +tiff"
 
 DEPEND="
 	media-libs/freetype
@@ -22,7 +22,7 @@ DEPEND="
 	ebook? ( app-text/ebook-tools )
 	jpeg? ( virtual/jpeg:0 )
 	pdf? ( >=app-text/poppler-0.12.3-r3[qt4,-exceptions(-)] )
-	ps? ( app-text/libspectre )
+	postscript? ( app-text/libspectre )
 	tiff? ( media-libs/tiff )
 "
 RDEPEND="${DEPEND}"
@@ -34,7 +34,7 @@ src_configure() {
 		$(cmake-utils_use_with djvu DjVuLibre)
 		$(cmake-utils_use_with ebook EPub)
 		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with ps LibSpectre)
+		$(cmake-utils_use_with postscript LibSpectre)
 		$(cmake-utils_use_with pdf PopplerQt4)
 		$(cmake-utils_use_with pdf Poppler)
 		$(cmake-utils_use_with tiff)
diff --git a/kde-base/okular/okular-4.8.3.ebuild b/kde-base/okular/okular-4.8.3.ebuild
index 22aa7d96341d..aa0e9aabaa6a 100644
--- a/kde-base/okular/okular-4.8.3.ebuild
+++ b/kde-base/okular/okular-4.8.3.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/kde-base/okular/okular-4.8.3.ebuild,v 1.5 2012/05/24 10:07:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/okular/okular-4.8.3.ebuild,v 1.6 2012/06/16 16:44:50 ssuominen Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit kde4-base
 
 DESCRIPTION="Okular is an universal document viewer based on KPDF for KDE 4."
 KEYWORDS="amd64 ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="chm crypt debug djvu ebook +jpeg +ps +pdf +tiff"
+IUSE="chm crypt debug djvu ebook +jpeg +postscript +pdf +tiff"
 
 DEPEND="
 	media-libs/freetype
@@ -22,7 +22,7 @@ DEPEND="
 	ebook? ( app-text/ebook-tools )
 	jpeg? ( virtual/jpeg:0 )
 	pdf? ( >=app-text/poppler-0.12.3-r3[qt4,-exceptions(-)] )
-	ps? ( app-text/libspectre )
+	postscript? ( app-text/libspectre )
 	tiff? ( media-libs/tiff )
 "
 RDEPEND="${DEPEND}"
@@ -34,7 +34,7 @@ src_configure() {
 		$(cmake-utils_use_with djvu DjVuLibre)
 		$(cmake-utils_use_with ebook EPub)
 		$(cmake-utils_use_with jpeg)
-		$(cmake-utils_use_with ps LibSpectre)
+		$(cmake-utils_use_with postscript LibSpectre)
 		$(cmake-utils_use_with pdf PopplerQt4)
 		$(cmake-utils_use_with pdf Poppler)
 		$(cmake-utils_use_with tiff)