summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Harder <radhermit@gentoo.org>2011-02-09 07:53:31 +0000
committerTim Harder <radhermit@gentoo.org>2011-02-09 07:53:31 +0000
commit8af059c9d2ad59f62fbcbbaca2ac506b62eaa79b (patch)
tree920a0d5a5493e5be45efd9167c8e4ff30f19cc36 /media-libs/libcaca
parentAdd less to RDEPEND and include a post-install message about optional depende... (diff)
downloadhistorical-8af059c9d2ad59f62fbcbbaca2ac506b62eaa79b.tar.gz
historical-8af059c9d2ad59f62fbcbbaca2ac506b62eaa79b.tar.bz2
historical-8af059c9d2ad59f62fbcbbaca2ac506b62eaa79b.zip
Fix compile error when the imlib USE flag is selected and the X USE flag isn't.
Package-Manager: portage-2.2.0_alpha22/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libcaca')
-rw-r--r--media-libs/libcaca/ChangeLog6
-rw-r--r--media-libs/libcaca/Manifest14
-rw-r--r--media-libs/libcaca/libcaca-0.99_beta17.ebuild6
3 files changed, 19 insertions, 7 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index 48e21d25de84..e864781ab732 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/libcaca
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.95 2011/01/29 19:59:14 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.96 2011/02/09 07:53:31 radhermit Exp $
+
+ 09 Feb 2011; Tim Harder <radhermit@gentoo.org> libcaca-0.99_beta17.ebuild:
+ Fix compile error when the imlib USE flag is selected and the X USE flag
+ isn't.
29 Jan 2011; Alexis Ballier <aballier@gentoo.org>
-libcaca-0.99_beta16.ebuild, -libcaca-0.99_beta16-r1.ebuild,
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 34ebd53f530f..4af7f954a7cc 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -2,13 +2,17 @@
Hash: SHA1
DIST libcaca-0.99.beta17.tar.gz 1110516 RMD160 86a4d86ced5a9fcf0eddfbd4f86268a68d49bca9 SHA1 24cdb9fb7dc4a01be2787a9009304fad419f79db SHA256 6355ae9e3961e983ef66057a232d25f1fba2e7fa615d7591aba011d78764f1d6
-EBUILD libcaca-0.99_beta17.ebuild 2556 RMD160 6e481a86abe1dfc908aa03efe0c35b7ade8b061e SHA1 72cb3b36d4fcb411cd79f18f9a177bb5b947466e SHA256 e18e627cbf374ab03cbf9b42cf3ff606bafa26dccf6335f3da2ed06ae9bfe526
-MISC ChangeLog 13904 RMD160 a4346fc58cae85c095a5c8e4ae2fbba90d41cd9b SHA1 8182fc4393cb5d47dd9ab693eed79de723f54469 SHA256 a4a4e7718053c1aa2c75871cbd752d42abc7d7d80513bcaadd8304fd2464b219
+EBUILD libcaca-0.99_beta17.ebuild 2627 RMD160 836ec5fced4e80e1ed940ba80ff23ca1307e3d45 SHA1 52e0ab150a6ce9becfc3fcee1966c420707b7ff6 SHA256 89d0b14d94830ed785db4c6ae4f7f6e80ebdf51acd207261abca47ea76a5b57a
+MISC ChangeLog 14067 RMD160 523484f0925f4b654c17a59d250c1c8cb21426dc SHA1 50e1553497fa913dfc4b1e21e42f70945f877d8b SHA256 3f60076cbd274c2a15de4a684c09ac55034dd22730c35ff3b7185fdec6843d55
MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk1EcZgACgkQvFcC4BYPU0qRPgCfUhLSSVHgAoKmynzgpuCCzE2o
-8poAoKaVfk3HQzdpIoqlvCEZrbIAMcX7
-=c3XY
+iQEcBAEBAgAGBQJNUkgIAAoJEEqz6FtPBkyjZTEH/2Mt7ouyRgYm5Klok+D5C5Fn
+s+dEVtfpLIm6iGWTZhqKOPcq9ywMt9rDBBLqqCu9Ml0Meox0ltVHN84tN6EDw5Nx
+qHCjk7TYXKEnV+rnW3Ij0xGEt0VoNs11hbek1PiFD6VVojskEaYYKD5hbr082ig+
+1E64L6DsGTPx+sAja7PcCsEtvvOQYOEtBgRgvZ3ZpzBcrdP58kIHmFR/ACELElMg
+z7kVNKhsWuwJ14d3qXhjV7wntKpf12XXo28PoPriAH06V9mQ9wco7KSnp2MEpP9e
+Gqir5Y8zCevila/2488DFGs/fSDfk4OHDejrKIocWqiR7KzZHxnFX2e23EaF7Yg=
+=ltF6
-----END PGP SIGNATURE-----
diff --git a/media-libs/libcaca/libcaca-0.99_beta17.ebuild b/media-libs/libcaca/libcaca-0.99_beta17.ebuild
index 2399cf6aef86..ca26b4398487 100644
--- a/media-libs/libcaca/libcaca-0.99_beta17.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta17.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.19 2011/01/20 18:23:14 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.20 2011/02/09 07:53:31 radhermit Exp $
EAPI=2
inherit autotools flag-o-matic mono multilib java-pkg-opt-2
@@ -52,6 +52,10 @@ src_prepare() {
sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
fi
+ if use imlib && ! use X; then
+ append-cflags -DX_DISPLAY_MISSING
+ fi
+
eautoreconf
java-pkg-opt-2_src_prepare