7 files changed, 9 insertions, 64 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index ab51cb2dd050..adc252cb0dbd 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.13 2004/09/03 15:35:19 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.14 2004/09/10 19:29:08 twp Exp $
+
+  10 Sep 2004; Tom Payne <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:
+  Respect user's PKG_CONFIG_PATH. Bug # 62814. Stable on x86.
 
   03 Sep 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
   cairo-0.1.18-r1.ebuild, cairo-0.1.18.ebuild:
diff --git a/x11-libs/cairo/cairo-0.1.18-r1.ebuild b/x11-libs/cairo/cairo-0.1.18-r1.ebuild
index 069ca920e745..489d4f04cb71 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.3 2004/09/03 15:35:19 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.18-r1.ebuild,v 1.4 2004/09/10 19:29:08 twp Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -17,7 +17,7 @@ DEPEND="virtual/x11
 	media-libs/libpixman"
 
 src_compile() {
-	PKG_CONFIG_PATH=${FILESDIR} econf || die
+	PKG_CONFIG_PATH=${PKG_CONFIG_PATH+$PKG_CONFIG_PATH:}${FILESDIR} econf || die
 	emake || die
 }
 
diff --git a/x11-libs/cairo/cairo-0.1.18.ebuild b/x11-libs/cairo/cairo-0.1.18.ebuild
deleted file mode 100644
index 9d00bee8225a..000000000000
--- a/x11-libs/cairo/cairo-0.1.18.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# 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.8 2004/09/03 15:35:19 pvdabeel Exp $
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE=""
-DEPEND="virtual/x11
-	!>=x11-base/xfree-4.3.0-r7
-	virtual/xft
-	media-libs/fontconfig
-	>=media-libs/freetype-2*
-	media-libs/libpixman"
-
-src_compile() {
-	PKG_CONFIG_PATH=${FILESDIR} econf || die
-	emake || die
-}
-
-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 52ae9fb6c488..dbfb443c803f 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.3 2004/09/01 00:12:58 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23-r1.ebuild,v 1.4 2004/09/10 19:29:08 twp Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -19,7 +19,7 @@ DEPEND="virtual/x11
 	>=media-libs/libpixman-0.1.1"
 
 src_compile() {
-	PKG_CONFIG_PATH=${FILESDIR} econf || die
+	PKG_CONFIG_PATH=${PKG_CONFIG_PATH+$PKG_CONFIG_PATH:}${FILESDIR} econf || die
 	emake || die
 }
 
diff --git a/x11-libs/cairo/cairo-0.1.23.ebuild b/x11-libs/cairo/cairo-0.1.23.ebuild
deleted file mode 100644
index 170e3f292062..000000000000
--- a/x11-libs/cairo/cairo-0.1.23.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# 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.7 2004/06/30 18:39:09 twp Exp $
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE=""
-DEPEND="virtual/x11
-	!>=x11-base/xfree-4.3.0-r7
-	!x11-base/xorg-x11
-	virtual/xft
-	media-libs/fontconfig
-	>=media-libs/freetype-2*
-	>=media-libs/libpixman-0.1.1"
-
-src_compile() {
-	PKG_CONFIG_PATH=${FILESDIR} econf || die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR=${D}
-	insinto /usr/lib/pkgconfig
-	doins ${FILESDIR}/xrender.pc
-}
diff --git a/x11-libs/cairo/files/digest-cairo-0.1.18 b/x11-libs/cairo/files/digest-cairo-0.1.18
deleted file mode 100644
index 3fdc0e3f104b..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.1.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b578f3cbfb8574bca85c86e4580bdf46 cairo-0.1.18.tar.gz 365601
diff --git a/x11-libs/cairo/files/digest-cairo-0.1.23 b/x11-libs/cairo/files/digest-cairo-0.1.23
deleted file mode 100644
index 26e3effccf3e..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.1.23
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c36bcb2c5fe2b716620e68626a0da3a1 cairo-0.1.23.tar.gz 393051