Fix dependencies. Bug # 55689.

5 files changed, 16 insertions, 11 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 3c604cd42894..b234b1562035 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.10 2004/06/27 11:18:40 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.11 2004/06/30 18:39:09 twp Exp $
+
+  30 Jun 2004; <twp@gentoo.org> cairo-0.1.18-r1.ebuild, cairo-0.1.18.ebuild,
+  cairo-0.1.23-r1.ebuild, cairo-0.1.23.ebuild:
+  Fix dependencies. Bug # 55689.
 
 *cairo-0.1.18-r1 (27 Jun 2004)
 
diff --git a/x11-libs/cairo/cairo-0.1.18-r1.ebuild b/x11-libs/cairo/cairo-0.1.18-r1.ebuild
index cdc82c21a999..08a65eb65421 100644
--- a/x11-libs/cairo/cairo-0.1.18-r1.ebuild
+++ b/x11-libs/cairo/cairo-0.1.18-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.18-r1.ebuild,v 1.1 2004/06/27 11:18:40 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.18-r1.ebuild,v 1.2 2004/06/30 18:39:09 twp Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
 DEPEND="virtual/x11
-	|| ( >=x11-base/xfree-4.3.0-r6 x11-base/xorg-x11 )
+	|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 	virtual/xft
 	media-libs/fontconfig
 	>=media-libs/freetype-2*
@@ -23,6 +23,4 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR=${D}
-	insinto /usr/lib/pkgconfig
-	doins ${FILESDIR}/xrender.pc
 }
diff --git a/x11-libs/cairo/cairo-0.1.18.ebuild b/x11-libs/cairo/cairo-0.1.18.ebuild
index 6052503f48d9..0f8bf2f889f5 100644
--- a/x11-libs/cairo/cairo-0.1.18.ebuild
+++ b/x11-libs/cairo/cairo-0.1.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.18.ebuild,v 1.6 2004/06/27 11:18:40 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.18.ebuild,v 1.7 2004/06/30 18:39:09 twp Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="x86 ~ppc"
 IUSE=""
 DEPEND="virtual/x11
-	!<=x11-base/xfree-4.3.0-r5
+	!>=x11-base/xfree-4.3.0-r7
 	virtual/xft
 	media-libs/fontconfig
 	>=media-libs/freetype-2*
@@ -23,4 +23,6 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR=${D}
+	insinto /usr/lib/pkgconfig
+	doins ${FILESDIR}/xrender.pc
 }
diff --git a/x11-libs/cairo/cairo-0.1.23-r1.ebuild b/x11-libs/cairo/cairo-0.1.23-r1.ebuild
index 46e19bf94526..a0ea8af9d0a6 100644
--- a/x11-libs/cairo/cairo-0.1.23-r1.ebuild
+++ b/x11-libs/cairo/cairo-0.1.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23-r1.ebuild,v 1.1 2004/06/27 11:18:40 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23-r1.ebuild,v 1.2 2004/06/30 18:39:09 twp Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -10,7 +10,7 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 IUSE=""
 DEPEND="virtual/x11
-	|| ( >=x11-base/xfree-4.3.0-r6 x11-base/xorg-x11 )
+	|| ( >=x11-base/xfree-4.3.0-r7 x11-base/xorg-x11 )
 	virtual/xft
 	media-libs/fontconfig
 	>=media-libs/freetype-2*
diff --git a/x11-libs/cairo/cairo-0.1.23.ebuild b/x11-libs/cairo/cairo-0.1.23.ebuild
index 495f6e28a68a..170e3f292062 100644
--- a/x11-libs/cairo/cairo-0.1.23.ebuild
+++ b/x11-libs/cairo/cairo-0.1.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23.ebuild,v 1.6 2004/06/27 11:18:40 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23.ebuild,v 1.7 2004/06/30 18:39:09 twp Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -10,7 +10,8 @@ SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 IUSE=""
 DEPEND="virtual/x11
-	!<=x11-base/xfree-4.3.0-r5
+	!>=x11-base/xfree-4.3.0-r7
+	!x11-base/xorg-x11
 	virtual/xft
 	media-libs/fontconfig
 	>=media-libs/freetype-2*