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

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

8 files changed, 37 insertions, 34 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/Manifest b/dev-dotnet/libgdiplus/Manifest
index 0aec5efe1dd4..c45b6c110327 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -10,11 +10,11 @@ DIST libgdiplus-2.4.2.tar.bz2 1975307 RMD160 114ff6263a82d79c72b332defdac3b6ec6c
 DIST libgdiplus-2.6.tar.bz2 1992743 RMD160 25f5680dae2f5515c6e69229541ede4bdcb381ef SHA1 170836d0cb99812b1838e0207a844ac7f9e4232b SHA256 fe2007dc0f360d193b550a1687fb53a7751c3e9377daebb54031793c4a2c7435
 EBUILD libgdiplus-1.2.4.ebuild 1912 RMD160 826851bd30bef44d5de4553c1375c08392055982 SHA1 4f2c6cd620b37cba07f29244ec4d45455f64689e SHA256 515b3802230299399af0cd2d95005156ed585a15267d167c0612b07f8011b42a
 EBUILD libgdiplus-1.2.6.ebuild 1835 RMD160 f84235aa5e641a9d8b7514eff56f8f642497da05 SHA1 0c2829a78689c62977d7bbf6c4fc20e6d666367d SHA256 ffb2dd40062608f1ebc3012a6f1ca359017a09cba0e537b90e93edb750385398
-EBUILD libgdiplus-2.0.9999.ebuild 1377 RMD160 efc285430c720f83ee3145e2f1b73def2df3ce1e SHA1 e2328c8f1258c61b8096b47ab6c123c03188a5b8 SHA256 4a8a6a2fc6f1ca153ab25244493dccacb479095b55f819860b3c7552ab61e4ee
+EBUILD libgdiplus-2.0.9999.ebuild 1380 RMD160 c62e05ac856e55767f0ff175ac267d8c131977c5 SHA1 f781d3aa4d01df0c6bf1f0feb2f41fd48ad62040 SHA256 e2105b2bb5637d10387b30e138611d6723e65e937e0c0559299043eb1acefa72
 EBUILD libgdiplus-2.0.ebuild 1359 RMD160 1f71da0b2ca02c2e63a2627e5e9936b48b272fb0 SHA1 61a02d73f0d6798291517a08ab83485718095818 SHA256 39afcec679b68757a4a727a5ddc3afc4dc8a5e0600009d23df32d6878b51a63a
-EBUILD libgdiplus-2.4.2.ebuild 1090 RMD160 1a905455e2869721bdab75a660c71f4d908f3c4c SHA1 ab9dcbd812f2d56f8c2ece6378e76d04c426b777 SHA256 1ab48fae45b85766387b30455b1cdbd7072689691da21e0e69cef49a3b4155a6
-EBUILD libgdiplus-2.4.9999.ebuild 1276 RMD160 c00cfb9eb338ff100342c38152a212b07645b4b8 SHA1 f1209d0f257d3c67e0fa9550c2d52df0a973651b SHA256 450ecc43bd403f5562e8354a70da6db96fb289ad8f1a412792982bdf6d600c44
-EBUILD libgdiplus-2.6.ebuild 1244 RMD160 3dbd1e6e677153a43910aed32032d9f4dabdaece SHA1 528870ec2d9f67cc530f4ad9a5add2bb199363e1 SHA256 3261e2a6b82b421b5be845c154789263a9bffc3fe06004f702db75c0c257bc9a
-EBUILD libgdiplus-9999.ebuild 1224 RMD160 32a355c9bc1aeae1156a2fd111b3ee29c0c18ce2 SHA1 f91714e0e9846ff2fa240ac11aa7ca8772595d0d SHA256 055540bc629ad0e990c66ca44371ca69256b605d4827f782be6a89a1c0edf1b1
-MISC ChangeLog 17469 RMD160 e89b6e23d336aeeb9520112c32856b66c64279d9 SHA1 113fcedba406e5723e526d55f04a617d150a82a9 SHA256 48a9bbd6637a38d8c419a578874100f0af93cef04630d5c586392b444803459c
-MISC metadata.xml 246 RMD160 c049a364d331203a1fbf6d9796e74abe79307a26 SHA1 4d2431d4bf0e6eb30006d5033ab6ab75aa0d55bd SHA256 8dcd2a872f353f47b9647d9dbff0ea4ead52425af362279057e94b89e0b7fc81
+EBUILD libgdiplus-2.4.2.ebuild 1096 RMD160 ec1c831c8af7869e964ad4dcd2b6c616ca82d435 SHA1 fe9275f242c878de9fd0957a86153d23af8135b5 SHA256 786e67e565e8dc98cefea68477d865e1eec806a718d1b161fe64ead054de7b23
+EBUILD libgdiplus-2.4.9999.ebuild 1279 RMD160 9595f4dc9a4369f24fe367949e5666cb58bbbda4 SHA1 457c0a9cf38941ef665a2dc4a34e35345a7c18dd SHA256 f548adfcc2ca0774819adc1eb561bfbdb9f5d7c473eb2d5efc49245215f349b8
+EBUILD libgdiplus-2.6.ebuild 1246 RMD160 6444d6b34c2dcb634ce20be04e4b43a8dfe65c0f SHA1 87801d4d59dc34893e16a09a4cdb346371dff382 SHA256 017df7d015be36c30fbef2e9582fdf1e47a1c8561fa028e3497f6cc709467fc3
+EBUILD libgdiplus-9999.ebuild 1227 RMD160 9aeb03dbc80c28d9ba6c1b588eaa450623fabed2 SHA1 f611cbc4b0d7287fea5f4022ee07c9d336231a2f SHA256 e76a2e500117cdda76c37908179a8df80dc320d9e225704a2f4b2c91c6be6077
+MISC ChangeLog 17740 RMD160 bb5f947db560695908247abe0b54e31697c7107a SHA1 6a5477ebc7463379df4f21aa01a001232c104277 SHA256 95a0731510906b3039e8d0249caff188b0cbb858da2afaec94f2467a53ad7015
+MISC metadata.xml 160 RMD160 cc10b170ad63a746d8bdfbe5bf1bd9f7065922b8 SHA1 49eaf4246f7502850064d3806cce65d3a404ce1b SHA256 1bc3e313a948415fff0dfa63a5610943327146bfe16bfeca603379bf9706a687
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>