diff options
| author |   Chris White <chriswhite@gentoo.org> | 2005-01-07 02:38:01 +0000 |
|---|---|---|
| committer | Chris White <chriswhite@gentoo.org> | 2005-01-07 02:38:01 +0000 |
| commit | 5a87a09a10a93dd49bd75654576c903b36fcaaee (patch) | |
| tree | 7a718532c0225db98aff6c74efbb69e16574b544 | |
| parent | doenvd, not doconfd (diff) | |
| download | historical-5a87a09a10a93dd49bd75654576c903b36fcaaee.tar.gz historical-5a87a09a10a93dd49bd75654576c903b36fcaaee.tar.bz2 historical-5a87a09a10a93dd49bd75654576c903b36fcaaee.zip | |
Trying to refix #76517 by adding in better X11 lib logic. Hopefully this works.
| -rw-r--r-- | media-libs/libcaca/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/libcaca/Manifest | 10 | ||||
| -rw-r--r-- | media-libs/libcaca/libcaca-0.9-r1.ebuild | 9 |
3 files changed, 17 insertions, 8 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog index a9db0263b22b..64f6b119005e 100644 --- a/media-libs/libcaca/ChangeLog +++ b/media-libs/libcaca/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/libcaca # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.15 2005/01/03 21:43:22 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.16 2005/01/07 02:38:01 chriswhite Exp $ + + 07 Jan 2005; Chris White <chriswhite@gentoo.org> libcaca-0.9-r1.ebuild: + Trying to refix #76517 by adding in better X11 lib logic. Hopefully this + works. 04 Jan 2005; Chris White <chriswhite@gentoo.org> libcaca-0.9-r1.ebuild: Fixed Bug #72426 by adding --with logic to configure. diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest index e6dd8a1f1b1b..f49f43779150 100644 --- a/media-libs/libcaca/Manifest +++ b/media-libs/libcaca/Manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -MD5 f6fe37c8d047c77108ace47196beb482 ChangeLog 2108 -MD5 7bf30d436e30fddf12ea27b6691c8c97 libcaca-0.9-r1.ebuild 1535 +MD5 34ffd544af2bbf4b703d828acd8e3cb2 ChangeLog 2267 +MD5 64e120b8eb2f0226bd94de8c1638d347 libcaca-0.9-r1.ebuild 1697 MD5 dfda78d89e36e814653e4b5e001f75e4 libcaca-0.9.ebuild 1074 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225 MD5 b74aa05e5d6b2a7d9b7108a84d6b82d7 files/digest-libcaca-0.9 63 @@ -11,7 +11,7 @@ MD5 8f10a784d1326f49c14a32fb0bcdc430 files/libcaca-0.9-libtool.patch 4596 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.6 (GNU/Linux) -iD8DBQFB2buQFdQwWVoAgN4RAoWBAKCvE7CiSTOmRYilD1dzxRIG1CGzhwCeOeR8 -kAYd509/Zq692Qcx58ny8IM= -=Kqbv +iD8DBQFB3fYjFdQwWVoAgN4RAuUPAJ4m0dVAxtGwbKXwvyCBigXZJoWiBgCggydD +RqYsgV7HLjRLT9T2WbcqzrM= +=4Kg0 -----END PGP SIGNATURE----- diff --git a/media-libs/libcaca/libcaca-0.9-r1.ebuild b/media-libs/libcaca/libcaca-0.9-r1.ebuild index d4a2e9a1c93c..c0c442015133 100644 --- a/media-libs/libcaca/libcaca-0.9-r1.ebuild +++ b/media-libs/libcaca/libcaca-0.9-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r1.ebuild,v 1.6 2005/01/03 21:43:22 chriswhite Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.9-r1.ebuild,v 1.7 2005/01/07 02:38:01 chriswhite Exp $ inherit eutils @@ -38,7 +38,12 @@ src_compile() { local myconf="" if use X ; then - myconf="${myconf} --enable-x11 --with-x --x-libraries=/usr/$(get_libdir)" + if [ -e /usr/lib/libX11.so ] || [ -e /usr/lib/libX11.a ] + then + myconf="${myconf} --enable-x11 --with-x --x-libraries=/usr/$(get_libdir)" + else + myconf="${myconf} --enable-x11 --with-x --x-libraries=/usr/X11R6/$(get_libdir)" + fi else myconf="${myconf} --disable-x11" fi |