summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Cafarelli <voyageur@gentoo.org>2008-06-10 14:31:18 +0000
committerBernard Cafarelli <voyageur@gentoo.org>2008-06-10 14:31:18 +0000
commit19016ebfe854ba0c69b8dc72376bafe6dff7bfe2 (patch)
treefab14bdb5668237fa23508c6c4adac407925392f /gnustep-base/gnustep-back-cairo
parentMarking courier-authlib-0.60.6 ppc64 for bug 225407 (diff)
downloadgentoo-2-19016ebfe854ba0c69b8dc72376bafe6dff7bfe2.tar.gz
gentoo-2-19016ebfe854ba0c69b8dc72376bafe6dff7bfe2.tar.bz2
gentoo-2-19016ebfe854ba0c69b8dc72376bafe6dff7bfe2.zip
Check that cairo was built with USE=X, bug #225225
(Portage version: 2.1.5.4)
Diffstat (limited to 'gnustep-base/gnustep-back-cairo')
-rw-r--r--gnustep-base/gnustep-back-cairo/ChangeLog6
-rw-r--r--gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.1.ebuild11
-rw-r--r--gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.13.2.ebuild11
3 files changed, 25 insertions, 3 deletions
diff --git a/gnustep-base/gnustep-back-cairo/ChangeLog b/gnustep-base/gnustep-back-cairo/ChangeLog
index 8a76e8d58379..89c496255617 100644
--- a/gnustep-base/gnustep-back-cairo/ChangeLog
+++ b/gnustep-base/gnustep-back-cairo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for gnustep-base/gnustep-back-cairo
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/ChangeLog,v 1.7 2008/06/10 14:20:04 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/ChangeLog,v 1.8 2008/06/10 14:31:18 voyageur Exp $
+
+ 10 Jun 2008; Bernard Cafarelli <voyageur@gentoo.org>
+ gnustep-back-cairo-0.12.1.ebuild, gnustep-back-cairo-0.13.2.ebuild:
+ Check that cairo was built with USE=X, bug #225225
10 Jun 2008; Bernard Cafarelli <voyageur@gentoo.org>
-gnustep-back-cairo-0.12.0.ebuild:
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.1.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.1.ebuild
index d863fc75ccc3..aae729d4fe9f 100644
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.1.ebuild
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.1.ebuild,v 1.3 2008/05/17 20:12:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.12.1.ebuild,v 1.4 2008/06/10 14:31:18 voyageur Exp $
inherit gnustep-base
@@ -36,6 +36,15 @@ RDEPEND="${GNUSTEP_CORE_DEPEND}
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+pkg_setup() {
+ gnustep-base_pkg_setup
+
+ if ! built_with_use x11-libs/cairo X; then
+ eerror "x11-libs/cairo must be compiled with the X USE flag enabled"
+ die "x11-libs/cairo rebuild needed"
+ fi
+}
+
src_compile() {
egnustep_env
diff --git a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.13.2.ebuild b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.13.2.ebuild
index 403975fc0db6..0fb958681d08 100644
--- a/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.13.2.ebuild
+++ b/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.13.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.13.2.ebuild,v 1.2 2008/05/17 20:12:35 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnustep-base/gnustep-back-cairo/gnustep-back-cairo-0.13.2.ebuild,v 1.3 2008/06/10 14:31:18 voyageur Exp $
inherit gnustep-base
@@ -36,6 +36,15 @@ RDEPEND="${GNUSTEP_CORE_DEPEND}
DEPEND="${RDEPEND}
dev-util/pkgconfig"
+pkg_setup() {
+ gnustep-base_pkg_setup
+
+ if ! built_with_use x11-libs/cairo X; then
+ eerror "x11-libs/cairo must be compiled with the X USE flag enabled"
+ die "x11-libs/cairo rebuild needed"
+ fi
+}
+
src_compile() {
egnustep_env