Change USE pango to cairo reflecting desktop/make.defaults logic.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

7 files changed, 30 insertions, 27 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index 6f5c3bedb424..bdb7b11f113e 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.107 2010/03/09 22:28:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.108 2010/03/30 11:50:46 ssuominen Exp $
+
+  30 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  libgdiplus-2.0.9999.ebuild, libgdiplus-2.4.2.ebuild,
+  libgdiplus-2.4.9999.ebuild, libgdiplus-2.6.ebuild, libgdiplus-9999.ebuild,
+  metadata.xml:
+  Change USE pango to cairo reflecting desktop/make.defaults logic.
 
   09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> libgdiplus-2.6.ebuild,
   +files/libgdiplus-2.6-libpng14.patch:
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.0.9999.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.0.9999.ebuild
index dacdaf154edd..e8848f1cea71 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.0.9999.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.0.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.0.9999.ebuild,v 1.3 2009/06/09 21:17:39 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.0.9999.ebuild,v 1.4 2010/03/30 11:50:46 ssuominen Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ SRC_URI=""
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="pango"
+IUSE="cairo"
 
 RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/freetype-2.3.7
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/giflib-4.1.3
 		media-libs/jpeg
 		media-libs/tiff
-		pango? ( >=x11-libs/pango-1.20 )"
+		!cairo? ( >=x11-libs/pango-1.20 )"
 DEPEND="${RDEPEND}"
 
 RESTRICT="test"
@@ -49,6 +49,6 @@ src_prepare() {
 src_configure() {
 	append-flags -fno-strict-aliasing
 	go-mono_src_configure	--with-cairo=system			\
-				$(use pango && printf %s --with-pango)	\
+				$(use !cairo && printf %s --with-pango)	\
 				|| die "configure failed"
 }
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild
index 252cfcf61bfd..c88fa367a1a9 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild,v 1.4 2010/01/02 12:24:47 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.4.2.ebuild,v 1.5 2010/03/30 11:50:46 ssuominen Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.go-mono.com/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="pango"
+IUSE="cairo"
 
 RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/freetype-2.3.7
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/giflib-4.1.3
 		media-libs/jpeg
 		media-libs/tiff
-		pango? ( >=x11-libs/pango-1.20 )"
+		!cairo? ( >=x11-libs/pango-1.20 )"
 DEPEND="${RDEPEND}"
 
 RESTRICT="test"
@@ -39,6 +39,6 @@ src_prepare() {
 src_configure() {
 	append-flags -fno-strict-aliasing
 	go-mono_src_configure	--with-cairo=system			\
-				$(use pango && printf %s --with-pango)	\
+				$(use !cairo && printf %s --with-pango)	\
 				|| die "configure failed"
 }
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.4.9999.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.4.9999.ebuild
index 9d0383e990d4..11b4eea9b134 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.4.9999.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.4.9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.4.9999.ebuild,v 1.3 2009/06/09 21:17:39 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.4.9999.ebuild,v 1.4 2010/03/30 11:50:46 ssuominen Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ SRC_URI=""
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="pango"
+IUSE="cairo"
 
 RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/freetype-2.3.7
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/giflib-4.1.3
 		media-libs/jpeg
 		media-libs/tiff
-		pango? ( >=x11-libs/pango-1.20 )"
+		!cairo? ( >=x11-libs/pango-1.20 )"
 DEPEND="${RDEPEND}"
 
 RESTRICT="test"
@@ -46,6 +46,6 @@ src_prepare() {
 src_configure() {
 	append-flags -fno-strict-aliasing
 	go-mono_src_configure	--with-cairo=system			\
-				$(use pango && printf %s --with-pango)	\
+				$(use !cairo && printf %s --with-pango)	\
 				|| die "configure failed"
 }
diff --git a/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild b/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild
index 447cdca0ce44..1e8318d79129 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild,v 1.2 2010/03/09 22:28:34 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-2.6.ebuild,v 1.3 2010/03/30 11:50:46 ssuominen Exp $
 
 EAPI=2
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://www.go-mono.com/"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86 ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="pango"
+IUSE="cairo"
 
 RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/freetype-2.3.7
@@ -26,7 +26,7 @@ RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/giflib-4.1.3
 		media-libs/jpeg
 		media-libs/tiff
-		pango? ( >=x11-libs/pango-1.20 )"
+		!cairo? ( >=x11-libs/pango-1.20 )"
 DEPEND="${RDEPEND}"
 
 RESTRICT="test"
@@ -43,6 +43,6 @@ src_prepare() {
 src_configure() {
 	append-flags -fno-strict-aliasing
 	go-mono_src_configure	--with-cairo=system			\
-				$(use pango && printf %s --with-pango)	\
+				$(use !cairo && printf %s --with-pango)	\
 				|| die "configure failed"
 }
diff --git a/dev-dotnet/libgdiplus/libgdiplus-9999.ebuild b/dev-dotnet/libgdiplus/libgdiplus-9999.ebuild
index f32a3c249d01..5c8f7cf63afd 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-9999.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-9999.ebuild,v 1.3 2009/06/09 21:17:39 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-9999.ebuild,v 1.4 2010/03/30 11:50:46 ssuominen Exp $
 
 EAPI=2
 
@@ -17,7 +17,7 @@ SRC_URI=""
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="pango"
+IUSE="cairo"
 
 RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/freetype-2.3.7
@@ -31,7 +31,7 @@ RDEPEND=">=dev-libs/glib-2.16
 		>=media-libs/giflib-4.1.3
 		media-libs/jpeg
 		media-libs/tiff
-		pango? ( >=x11-libs/pango-1.20 )"
+		!cairo? ( >=x11-libs/pango-1.20 )"
 DEPEND="${RDEPEND}"
 
 RESTRICT="test"
@@ -45,6 +45,6 @@ src_prepare() {
 src_configure() {
 	append-flags -fno-strict-aliasing
 	go-mono_src_configure	--with-cairo=system			\
-				$(use pango && printf %s --with-pango)	\
+				$(use !cairo && printf %s --with-pango)	\
 				|| die "configure failed"
 }
diff --git a/dev-dotnet/libgdiplus/metadata.xml b/dev-dotnet/libgdiplus/metadata.xml
index 8d51049a4d8f..e01adbb307db 100644
--- a/dev-dotnet/libgdiplus/metadata.xml
+++ b/dev-dotnet/libgdiplus/metadata.xml
@@ -2,7 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>dotnet</herd>
-	<use>
-		<flag name='pango'>Use pango instead of cairo to render text.</flag>
-	</use>
 </pkgmetadata>