summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuri Vasilevski <yvasilev@gentoo.org>2008-08-21 22:38:37 +0000
committerYuri Vasilevski <yvasilev@gentoo.org>2008-08-21 22:38:37 +0000
commitfac577c33df094c5a78b18f804b3ea8ec33fdee3 (patch)
treed59d74d1d60f87c97c03166dfe7f023a88c0eb14 /x11-misc
parentadd x11-terms to completed list (diff)
downloadhistorical-fac577c33df094c5a78b18f804b3ea8ec33fdee3.tar.gz
historical-fac577c33df094c5a78b18f804b3ea8ec33fdee3.tar.bz2
historical-fac577c33df094c5a78b18f804b3ea8ec33fdee3.zip
If build with USE=cairo, check that x11-libs/cairo is built with USE=X. Bug #225149
Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.25-gentoo-r4 x86_64
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/matchbox-keyboard/ChangeLog7
-rw-r--r--x11-misc/matchbox-keyboard/Manifest4
-rw-r--r--x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild12
3 files changed, 18 insertions, 5 deletions
diff --git a/x11-misc/matchbox-keyboard/ChangeLog b/x11-misc/matchbox-keyboard/ChangeLog
index 2808ea8cfc8b..6c0c42e82792 100644
--- a/x11-misc/matchbox-keyboard/ChangeLog
+++ b/x11-misc/matchbox-keyboard/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for x11-misc/matchbox-keyboard
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/ChangeLog,v 1.6 2008/07/17 17:15:11 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/ChangeLog,v 1.7 2008/08/21 22:38:37 yvasilev Exp $
+
+ 21 Aug 2008; Yuri Vasilevski <yvasilev@gentoo.org>
+ matchbox-keyboard-0.1.ebuild:
+ If build with USE=cairo, check that x11-libs/cairo is built with USE=X.
+ Bug #225149
17 Jul 2008; Yuri Vasilevski <yvasilev@gentoo.org>
matchbox-keyboard-0.1.ebuild:
diff --git a/x11-misc/matchbox-keyboard/Manifest b/x11-misc/matchbox-keyboard/Manifest
index dca4492b72d4..df609508e65d 100644
--- a/x11-misc/matchbox-keyboard/Manifest
+++ b/x11-misc/matchbox-keyboard/Manifest
@@ -1,4 +1,4 @@
DIST matchbox-keyboard-0.1.tar.bz2 103222 RMD160 88ed115ef7f0b62fe7cacda822ff7b5236014d85 SHA1 ebf5308f8ca93e193c3e79d0fb8304396f478baf SHA256 682614fa3682c4bd31e26b6f76e04bb579c2e70dbf060083e20077f4e93fb4b3
-EBUILD matchbox-keyboard-0.1.ebuild 916 RMD160 7033d9a40e08541fee2c86062116875b12704843 SHA1 db37cd3c18b8ff49d9251db6ca700cebcf6e22bd SHA256 8740a111679bc591e1fdf4a282f385326087abf3d550e15a8640b2a43defcd4c
-MISC ChangeLog 977 RMD160 313dce3ad6224274476ff99f5e9054b72620a842 SHA1 c2b5b4590271dedf0f682125538922e1489e1b2e SHA256 ee2b15f142916c3bc7b28e3eb537904d0c56759ee290afa2c302423c970f67f1
+EBUILD matchbox-keyboard-0.1.ebuild 1165 RMD160 f73ffeef9e86e8d8dfbf805b44e78f9756410e45 SHA1 6f0ba931d8eea03dab4da97b1d1b0e2d1cc91e7a SHA256 b3f0e9822f319b260c8b9e455d8744946f067a856364d76bc4056625bdd217e7
+MISC ChangeLog 1151 RMD160 43debd42d6275e4debc19f13dda677a7123fbb65 SHA1 a42772743b83e37ae4f12f298000f43a31471e86 SHA256 371bb5c1d1be6bf1f12a7504a6b6721a8c8947c7d0ce24fd5adcd92b4ed78a87
MISC metadata.xml 247 RMD160 49e7f36b66be574d7f3341589ebff702e1c8c8a9 SHA1 af1f5473be400926e7bf9a98a354866150c8b7a7 SHA256 09c798d19a28d8e2ee2b8494e011929f5fc1617190315d82bd03c32e911def55
diff --git a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
index 7a46e9100571..bc9f6d953351 100644
--- a/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
+++ b/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild
@@ -1,8 +1,8 @@
# Copyright 2006-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild,v 1.6 2008/07/17 17:15:11 yvasilev Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/matchbox-keyboard/matchbox-keyboard-0.1.ebuild,v 1.7 2008/08/21 22:38:37 yvasilev Exp $
-inherit versionator
+inherit versionator eutils
DESCRIPTION="Matchbox-keyboard is an on screen 'virtual' or 'software' keyboard."
HOMEPAGE="http://matchbox-project.org/"
@@ -17,6 +17,14 @@ DEPEND="x11-libs/libfakekey
cairo? ( x11-libs/cairo )
!cairo? ( x11-libs/libXft )"
+pkg_setup() {
+ if use cairo && ! built_with_use x11-libs/cairo X ; then
+ eerror "In order to install ${PN} with cairo support you"
+ eerror "need to reinstall x11-libs/cairo with USE='X'."
+ die "x11-libs/cairo built without USE='X'"
+ fi
+}
+
src_compile() {
econf $(use_enable debug) \
$(use_enable cairo) \