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
commitad25cfb48692d446783af6513f7b1f2f9929047a (patch)
treed77ff7391f8b329dbc336ab52bc45b432b03a33e /gnustep-base/gnustep-back-cairo
parentMarking courier-authlib-0.60.6 ppc64 for bug 225407 (diff)
downloadhistorical-ad25cfb48692d446783af6513f7b1f2f9929047a.tar.gz
historical-ad25cfb48692d446783af6513f7b1f2f9929047a.tar.bz2
historical-ad25cfb48692d446783af6513f7b1f2f9929047a.zip
Check that cairo was built with USE=X, bug #225225
Package-Manager: portage-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/Manifest6
-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
4 files changed, 28 insertions, 6 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/Manifest b/gnustep-base/gnustep-back-cairo/Manifest
index 3cbc0a32f3fc..6be478383a51 100644
--- a/gnustep-base/gnustep-back-cairo/Manifest
+++ b/gnustep-base/gnustep-back-cairo/Manifest
@@ -1,6 +1,6 @@
DIST gnustep-back-0.12.1.tar.gz 861961 RMD160 7970dfeebd12facb52aa6ba4dd2f06406dbdae74 SHA1 f4505126bbb8a7ca3664a8c5fb86c505ba1eef47 SHA256 c7eb3e0ee3f6b1224aacdcd8052f99d3ec58c94c8f21c6b4b888a2bb5bc97611
DIST gnustep-back-0.13.2.tar.gz 872705 RMD160 57675d94584f63722342fe832a4e13e95f910014 SHA1 a6443a21d2d2a0981d232a4681f60d87bf707c24 SHA256 42956d85c308926ce655eb77511c3430ccbe4d18a5c0192e6aa74ea32f860da9
-EBUILD gnustep-back-cairo-0.12.1.ebuild 1286 RMD160 9706b664732cb565ff6816387cf597b92067e35f SHA1 bf8808da48433be8755ddb969f9fb0a1b455713b SHA256 8c797c45a846a1b610f033208b14d3380d9eb2570249c928f71f310dc43df6af
-EBUILD gnustep-back-cairo-0.13.2.ebuild 1286 RMD160 7d466b940668065cfe8081ddb3bb153daeef0602 SHA1 06131ccceee4fc65d12ddf46e92e02d2fd5add36 SHA256 488368ead72d2b5e42bbb0c74a4f5aff89d07d72372da4a5602c4b2765308b34
-MISC ChangeLog 1514 RMD160 5f8bf851c6e686078ded9068d640fe7d0cac601a SHA1 67771caa03630bbc3fc1b778417dcf1f4d87539c SHA256 84ca4320c15bdce8b77395edec3576ef8c153eb4d0a17a21e5a9d9e80002c3b5
+EBUILD gnustep-back-cairo-0.12.1.ebuild 1486 RMD160 b96d68f4d788d2f7f78c29f70c9f81d92d17977b SHA1 2eb6976e25b40ecc9e9ae8a5405da75e0d60d0c6 SHA256 209520535826c9ae488d919783b69b0943a809cb49c5e0d3162e55217fe36a1d
+EBUILD gnustep-back-cairo-0.13.2.ebuild 1486 RMD160 fc9326571bac02207d90695b7a1debf5b7f139c3 SHA1 21966669b8113932fb5932e0058a2111c67fdf63 SHA256 2fe862b33bf12fc9f03f8572e1558d01de0c657f1381c29a39f0884f90ec3a67
+MISC ChangeLog 1693 RMD160 700d7618587410406d5c1e6672ad8e2beceee7c3 SHA1 e9a9e593783dd6d7c9fe6783d7d17c377358893e SHA256 14ca3e1dd5f96b008ea8ff0c4a42fe327368e6fcf99ec4b963fa8e579128e509
MISC metadata.xml 252 RMD160 57fd620799809121691f296a6d0f395751c56cb2 SHA1 db908ebc6872280d7247709358439c587a881c4f SHA256 dea0d5ccb02e798556ea88d9be4c3a81c93b18f099f168a3ad880e7c5036ddb5
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