From 1f92ac1ff1caf5ad994525cb12f490a0666cea04 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Sat, 5 Nov 2005 02:56:58 +0000 Subject: [PATCH] make sure we break the gif/urt circular depend #111455 Package-Manager: portage-2.0.53_rc7 --- media-libs/giflib/giflib-4.1.4.ebuild | 5 +++-- media-libs/urt/urt-3.1b-r1.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/media-libs/giflib/giflib-4.1.4.ebuild b/media-libs/giflib/giflib-4.1.4.ebuild index daee1993a0ce..7efbc6692eb8 100644 --- a/media-libs/giflib/giflib-4.1.4.ebuild +++ b/media-libs/giflib/giflib-4.1.4.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/giflib/giflib-4.1.4.ebuild,v 1.9 2005/11/04 10:37:24 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.4.ebuild,v 1.10 2005/11/05 02:56:58 vapier Exp $ inherit eutils @@ -28,13 +28,14 @@ src_compile() { ac_cv_lib_gl_s_main=no \ ac_cv_lib_rle_rle_hdr_init=$(yesno rle) \ ac_cv_lib_X11_main=$(yesno X) + # prevent circular depend #111455 + has_version media-libs/urt || export ac_cv_lib_rle_rle_hdr_init=no econf || die emake || die "emake failed" } src_install() { make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS BUGS ChangeLog NEWS ONEWS README TODO doc/*.txt dohtml -r doc } diff --git a/media-libs/urt/urt-3.1b-r1.ebuild b/media-libs/urt/urt-3.1b-r1.ebuild index 414d015e3bd2..3628d8fa4a9d 100644 --- a/media-libs/urt/urt-3.1b-r1.ebuild +++ b/media-libs/urt/urt-3.1b-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/urt/urt-3.1b-r1.ebuild,v 1.20 2005/11/04 10:16:12 grobian Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/urt/urt-3.1b-r1.ebuild,v 1.21 2005/11/05 02:56:20 vapier Exp $ inherit eutils toolchain-funcs @@ -44,11 +44,12 @@ src_unpack() { cp "${FILESDIR}"/gentoo-config config/gentoo cat >> config/gentoo <<-EOF $(urt_config X X11) - $(urt_config gif GIF) $(urt_config gs POSTSCRIPT) $(urt_config tiff TIFF) ExtraCFLAGS = ${CFLAGS} MFLAGS = ${MAKEOPTS} + # prevent circular depend #111455 + $(has_version media-libs/giflib && urt_config gif GIF) EOF } -- 2.26.2