summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaúl Porcel <armin76@gentoo.org>2008-06-20 15:03:42 +0000
committerRaúl Porcel <armin76@gentoo.org>2008-06-20 15:03:42 +0000
commit4b093a2e87319ab0df7fc71f86c6e001e0365127 (patch)
treea4ccaf4e445a3f509f8b33650df77769fe055119 /net-libs/xulrunner
parentStable on amd64; bug 228249 (diff)
downloadhistorical-4b093a2e87319ab0df7fc71f86c6e001e0365127.tar.gz
historical-4b093a2e87319ab0df7fc71f86c6e001e0365127.tar.bz2
historical-4b093a2e87319ab0df7fc71f86c6e001e0365127.zip
Add check for pango and cairo to be built with X, bug #228451
Package-Manager: portage-2.1.4.4
Diffstat (limited to 'net-libs/xulrunner')
-rw-r--r--net-libs/xulrunner/ChangeLog5
-rw-r--r--net-libs/xulrunner/Manifest4
-rw-r--r--net-libs/xulrunner/xulrunner-1.9-r2.ebuild16
3 files changed, 21 insertions, 4 deletions
diff --git a/net-libs/xulrunner/ChangeLog b/net-libs/xulrunner/ChangeLog
index aa2bad48a87d..94791ec9af31 100644
--- a/net-libs/xulrunner/ChangeLog
+++ b/net-libs/xulrunner/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-libs/xulrunner
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.119 2008/06/20 14:37:21 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/ChangeLog,v 1.120 2008/06/20 15:03:42 armin76 Exp $
+
+ 20 Jun 2008; Raúl Porcel <armin76@gentoo.org> xulrunner-1.9-r2.ebuild:
+ Add check for pango and cairo to be built with X, bug #228451
20 Jun 2008; Raúl Porcel <armin76@gentoo.org> xulrunner-1.9-r2.ebuild:
Re-fix bug #228005
diff --git a/net-libs/xulrunner/Manifest b/net-libs/xulrunner/Manifest
index f2d0e5e509fb..1a9dde278b82 100644
--- a/net-libs/xulrunner/Manifest
+++ b/net-libs/xulrunner/Manifest
@@ -7,6 +7,6 @@ DIST xulrunner-1.9-patches-0.1.tar.bz2 5880 RMD160 bd5475536e06b81f08aaa9d43e8ff
DIST xulrunner-1.9.tar.bz2 34035285 RMD160 0cbc3e76c1ac43858375ab88610e5b68b2620d62 SHA1 091a1bf39c8b57b579fadb01c6377f357427cd90 SHA256 5a17a5e138fe5f3a39d6ad44eb9cba076360b7e1809e4b647c4ae4f316d8a2ee
EBUILD xulrunner-1.8.1.11.ebuild 4858 RMD160 17de41e45e8b18be49bcbdc12d70ff06ced7ce60 SHA1 0e12768437e8dca58af17cc0330e003bca575e76 SHA256 d8fc4b0b29beecbd73135ed4d51bed81476dde139eb604e1a20fe3725dc453ab
EBUILD xulrunner-1.8.1.14.ebuild 4839 RMD160 9d67ad5284e8c79fa5a1a6caf410da914daf9eba SHA1 8e16b5cbd7f9958968a5961ff188753ddf0f4f68 SHA256 0ac4923db88b52fccabb7684f98bca6c63f6364215eed867a1659b2c010e6ee8
-EBUILD xulrunner-1.9-r2.ebuild 5020 RMD160 7ff254caf2d4e42bae026e265ab7e323e86b6d5d SHA1 55328ff1a483e87b7bf9ae5b3f95cfdcf48fa577 SHA256 077f2ae5f82fd7dbc7b25dacd366ab0fe519ab644484d89dcc2f13cc8fef7021
-MISC ChangeLog 14915 RMD160 6feb37542a0a906c1154a55f08178514f3a686f8 SHA1 bcda2cdd563e0f93810347f5364d22fb71cc459d SHA256 e660ec289efd44d60e57cc8b249d1197d8ee8a3fc7dca49b8909dc3613c1b434
+EBUILD xulrunner-1.9-r2.ebuild 5416 RMD160 023eaf46507125e49f32f2220f3e2ab3ae280a7e SHA1 faf5a1e9e66455895c30f3c2a26cc9f1367d4526 SHA256 7952e6172f685362e696720569a66fafd994c8eafa214a09cce47e270d85efa4
+MISC ChangeLog 15054 RMD160 8c1b39ad5e145153858a2e57e960f5ce213f860e SHA1 8635a285a61bbb3556fe0d3690c492bf8dd0b935 SHA256 15262f8c9323eac487c8897a8d4477f3cc38fef508e3849302c560c2da6d84c2
MISC metadata.xml 160 RMD160 d5a9f0bf8989621c2bde30facb53bcae00aba709 SHA1 5015c07af2083f20f9552d7fb11afb5ea69af345 SHA256 0cc5126362a12cee42ec1197c528a804cf36859329dd2c6d9225726831d14b8b
diff --git a/net-libs/xulrunner/xulrunner-1.9-r2.ebuild b/net-libs/xulrunner/xulrunner-1.9-r2.ebuild
index 236e6dc6fb0d..ff39013c3fe4 100644
--- a/net-libs/xulrunner/xulrunner-1.9-r2.ebuild
+++ b/net-libs/xulrunner/xulrunner-1.9-r2.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/net-libs/xulrunner/xulrunner-1.9-r2.ebuild,v 1.3 2008/06/20 14:38:32 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/xulrunner/xulrunner-1.9-r2.ebuild,v 1.4 2008/06/20 15:03:42 armin76 Exp $
WANT_AUTOCONF="2.1"
@@ -38,6 +38,20 @@ export MOZ_CO_PROJECT=xulrunner
export BUILD_OFFICIAL=1
export MOZILLA_OFFICIAL=1
+pkg_setup(){
+ if ! built_with_use x11-libs/cairo X; then
+ eerror "Cairo is not built with X useflag."
+ eerror "Please add 'X' to your USE flags, and re-emerge cairo."
+ die "Cairo needs X"
+ fi
+
+ if ! built_with_use --missing true x11-libs/pango X; then
+ eerror "Pango is not built with X useflag."
+ eerror "Please add 'X' to your USE flags, and re-emerge pango."
+ die "Pango needs X"
+ fi
+}
+
src_unpack() {
unpack ${A}