Add check to make sure cairo was built with X support. See bug #94858.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 30 insertions, 6 deletions

diff --git a/dev-dotnet/libgdiplus/ChangeLog b/dev-dotnet/libgdiplus/ChangeLog
index a79f8c74f774..3cf66f57d153 100644
--- a/dev-dotnet/libgdiplus/ChangeLog
+++ b/dev-dotnet/libgdiplus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-dotnet/libgdiplus
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.40 2005/09/28 19:00:52 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/ChangeLog,v 1.41 2005/10/15 20:06:14 latexer Exp $
+
+  15 Oct 2005; Peter Johanson <latexer@gentoo.org> libgdiplus-1.1.8.ebuild,
+  libgdiplus-1.1.9.1.ebuild:
+  Add check to make sure cairo was built with X support. See bug #94858.
 
   28 Sep 2005; Peter Johanson <latexer@gentoo.org> -libgdiplus-1.1.7.ebuild,
   -libgdiplus-1.1.7-r1.ebuild, -libgdiplus-1.1.9.ebuild:
diff --git a/dev-dotnet/libgdiplus/Manifest b/dev-dotnet/libgdiplus/Manifest
index d21f7ec663f6..bcaef7b0fd0e 100644
--- a/dev-dotnet/libgdiplus/Manifest
+++ b/dev-dotnet/libgdiplus/Manifest
@@ -1,8 +1,8 @@
-MD5 2322133047da1a10e68b035cb629776f libgdiplus-1.1.8.ebuild 1574
-MD5 45ab32cf14e59b8d334ffba86ab694df ChangeLog 7167
+MD5 e327583a1a95ce4020da39befcbe0b24 libgdiplus-1.1.8.ebuild 1854
+MD5 b06065fb22aa20e4844c64687cd9af02 ChangeLog 7346
 MD5 a6614575798e40bc922ce2c1ed2a05c7 libgdiplus-1.0.5-r3.ebuild 1503
 MD5 5f5de8057dfa705eb9320fe00909f00a libgdiplus-1.0.6-r2.ebuild 1505
-MD5 633a41210b081226f540679e99efbb6f libgdiplus-1.1.9.1.ebuild 1691
+MD5 50ef2a7f1e13790c3075a17ff3cb20cb libgdiplus-1.1.9.1.ebuild 1971
 MD5 a60fdfbce7c7cfc52187ff86a7f8bbf8 metadata.xml 222
 MD5 606acb6e7c0ef822f28f9fb67b50a28f libgdiplus-1.0.6.ebuild 1356
 MD5 ddb453b524ee81a3b0788c201419c649 libgdiplus-1.0.5-r4.ebuild 1541
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.8.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.8.ebuild
index c703fe85157d..006fe6b59da6 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.1.8.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.8.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-dotnet/libgdiplus/libgdiplus-1.1.8.ebuild,v 1.2 2005/09/16 05:10:57 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.1.8.ebuild,v 1.3 2005/10/15 20:06:14 latexer Exp $
 
 inherit libtool eutils
 
@@ -25,6 +25,16 @@ DEPEND="sys-devel/libtool
 		jpeg? ( media-libs/jpeg )
 		png? ( media-libs/libpng )"
 
+pkg_setup () {
+	if ! built_with_use cairo X
+	then
+		eerror "For libgdiplus to compile, cairo must be built with 'X' in"
+		eerror "ones USE flags. Please re-emerge cairo with the 'X' USE flag"
+		eerror "set and then emerge libgdiplus."
+		die "cairo not built with USE='X'."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}
diff --git a/dev-dotnet/libgdiplus/libgdiplus-1.1.9.1.ebuild b/dev-dotnet/libgdiplus/libgdiplus-1.1.9.1.ebuild
index 8f5de45117bf..84d9fd7d34aa 100644
--- a/dev-dotnet/libgdiplus/libgdiplus-1.1.9.1.ebuild
+++ b/dev-dotnet/libgdiplus/libgdiplus-1.1.9.1.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-dotnet/libgdiplus/libgdiplus-1.1.9.1.ebuild,v 1.1 2005/09/22 22:38:16 latexer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/libgdiplus/libgdiplus-1.1.9.1.ebuild,v 1.2 2005/10/15 20:06:14 latexer Exp $
 
 inherit libtool eutils flag-o-matic toolchain-funcs
 
@@ -25,6 +25,16 @@ DEPEND="sys-devel/libtool
 		jpeg? ( media-libs/jpeg )
 		png? ( media-libs/libpng )"
 
+pkg_setup () {
+	if ! built_with_use cairo X
+	then
+		eerror "For libgdiplus to compile, cairo must be built with 'X' in"
+		eerror "ones USE flags. Please re-emerge cairo with the 'X' USE flag"
+		eerror "set and then emerge libgdiplus."
+		die "cairo not built with USE='X'."
+	fi
+}
+
 src_unpack() {
 	unpack ${A}
 	cd ${S}