Make the libgdiplus dep optional, using the X use flag, as libgdiplus pulls that in.

Package-Manager: portage-2.0.51.20-r5

6 files changed, 24 insertions, 19 deletions

diff --git a/dev-lang/mono/ChangeLog b/dev-lang/mono/ChangeLog
index 14d4981c7515..ec18a0c336c8 100644
--- a/dev-lang/mono/ChangeLog
+++ b/dev-lang/mono/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/mono
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.41 2005/04/14 23:34:13 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/ChangeLog,v 1.42 2005/04/29 01:59:05 latexer Exp $
+
+  29 Apr 2005; Peter Johanson <latexer@gentoo.org> mono-1.1.4.ebuild,
+  mono-1.1.5-r1.ebuild, mono-1.1.6.ebuild, mono-1.1.6-r1.ebuild:
+  Make the libgdiplus dep optional, using the X use flag, as libgdiplus pulls
+  that in.
 
 *mono-1.1.6-r1 (14 Apr 2005)
 
diff --git a/dev-lang/mono/Manifest b/dev-lang/mono/Manifest
index c5b99a36fe22..e4c12e31740b 100644
--- a/dev-lang/mono/Manifest
+++ b/dev-lang/mono/Manifest
@@ -1,10 +1,10 @@
-MD5 7ce41a6146980945da8c42149cd8f409 mono-1.1.6-r1.ebuild 2384
-MD5 51e2165635b98c419673d07414036bf9 mono-1.1.5-r1.ebuild 2341
+MD5 921a54bac5f3a9e89db2fa1360630a7c mono-1.1.6-r1.ebuild 2393
+MD5 e7ea4829bcf8c5553c4a56e8d31fa896 mono-1.1.5-r1.ebuild 2350
 MD5 c69ad4a401355c5a7f29cb0f2de55ae2 mono-1.0.5-r5.ebuild 3931
 MD5 e4d80474cce3145601e84a16325b3aaa mono-1.0.6.ebuild 3908
-MD5 7f40d51e10b7316f8d22087abc4fed05 mono-1.1.4.ebuild 1811
-MD5 7f74b1ec15a42ceb305f35a99568d52d mono-1.1.6.ebuild 2305
-MD5 f2001dc12b7e90cd2bf0094f46d781cf ChangeLog 15791
+MD5 7df1ece1ffd1bacb0be1d2a46737f42f mono-1.1.4.ebuild 1827
+MD5 fe6279ea5449f9f4067f543dce346af8 mono-1.1.6.ebuild 2314
+MD5 6d525f6ef276a3e9fde77b0383f07910 ChangeLog 16016
 MD5 76b314cc7b7b79b298dd4889dff8c9cd metadata.xml 159
 MD5 e8acd8bc997d82f676be5cf2057d3d25 files/dotnet.conf 570
 MD5 6e11372f48bd32e76012be8aae54e594 files/dotnet.init 1031
diff --git a/dev-lang/mono/mono-1.1.4.ebuild b/dev-lang/mono/mono-1.1.4.ebuild
index 73f2656d599a..3a9c6ff68c0a 100644
--- a/dev-lang/mono/mono-1.1.4.ebuild
+++ b/dev-lang/mono/mono-1.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.4.ebuild,v 1.3 2005/04/08 00:08:09 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.4.ebuild,v 1.4 2005/04/29 01:59:05 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.go-mono.com/archive/${PV}/${P}.tar.gz"
 LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="nptl icu"
+IUSE="nptl icu X"
 
 DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
@@ -23,11 +23,11 @@ DEPEND="virtual/libc
 		>=sys-libs/glibc-2.3.3_pre20040420
 	)"
 RDEPEND="${DEPEND}
-	>=dev-dotnet/libgdiplus-${PV}
+	X? ( >=dev-dotnet/libgdiplus-${PV} )
 	dev-util/pkgconfig
 	dev-libs/libxml2"
 
-PDEPEND=">=dev-dotnet/libgdiplus-${PV}"
+PDEPEND="X? ( >=dev-dotnet/libgdiplus-${PV} )"
 
 src_unpack() {
 	unpack ${A}
diff --git a/dev-lang/mono/mono-1.1.5-r1.ebuild b/dev-lang/mono/mono-1.1.5-r1.ebuild
index 27909de02a2c..9f3cb7755666 100644
--- a/dev-lang/mono/mono-1.1.5-r1.ebuild
+++ b/dev-lang/mono/mono-1.1.5-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.5-r1.ebuild,v 1.3 2005/04/08 00:08:09 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.5-r1.ebuild,v 1.4 2005/04/29 01:59:05 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.go-mono.com/archive/${PV}/${P}.tar.gz"
 LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="nptl icu"
+IUSE="nptl icu X"
 
 DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 		>=sys-libs/glibc-2.3.3_pre20040420
 	)"
 RDEPEND="${DEPEND}
-	>=dev-dotnet/libgdiplus-1.1.4
+	X? ( >=dev-dotnet/libgdiplus-1.1.4 )
 	dev-util/pkgconfig
 	dev-libs/libxml2"
 
diff --git a/dev-lang/mono/mono-1.1.6-r1.ebuild b/dev-lang/mono/mono-1.1.6-r1.ebuild
index 6cd80b8d966c..6f3a024e0069 100644
--- a/dev-lang/mono/mono-1.1.6-r1.ebuild
+++ b/dev-lang/mono/mono-1.1.6-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.6-r1.ebuild,v 1.1 2005/04/14 23:34:13 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.6-r1.ebuild,v 1.2 2005/04/29 01:59:05 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.go-mono.com/archive/${PV}/${P}.tar.gz"
 LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="nptl icu"
+IUSE="nptl icu X"
 
 DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 		>=sys-libs/glibc-2.3.3_pre20040420
 	)"
 RDEPEND="${DEPEND}
-	>=dev-dotnet/libgdiplus-1.1.4
+	X? ( >=dev-dotnet/libgdiplus-1.1.4 )
 	dev-util/pkgconfig
 	dev-libs/libxml2"
 
diff --git a/dev-lang/mono/mono-1.1.6.ebuild b/dev-lang/mono/mono-1.1.6.ebuild
index 7a657e845d2e..7604a88b02e1 100644
--- a/dev-lang/mono/mono-1.1.6.ebuild
+++ b/dev-lang/mono/mono-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.6.ebuild,v 1.2 2005/04/08 00:08:09 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/mono/mono-1.1.6.ebuild,v 1.3 2005/04/29 01:59:05 latexer Exp $
 
 inherit eutils mono flag-o-matic
 
@@ -11,7 +11,7 @@ SRC_URI="http://www.go-mono.com/archive/${PV}/${P}.tar.gz"
 LICENSE="|| ( GPL-2 LGPL-2 X11)"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="nptl icu"
+IUSE="nptl icu X"
 
 DEPEND="virtual/libc
 	>=dev-libs/glib-2.0
@@ -23,7 +23,7 @@ DEPEND="virtual/libc
 		>=sys-libs/glibc-2.3.3_pre20040420
 	)"
 RDEPEND="${DEPEND}
-	>=dev-dotnet/libgdiplus-1.1.4
+	X? ( >=dev-dotnet/libgdiplus-1.1.4 )
 	dev-util/pkgconfig
 	dev-libs/libxml2"