Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/x11-libs
diff options
context:
space:
mode:
authorTom William Payne <twp@gentoo.org>2004-06-27 11:18:40 +0000
committerTom William Payne <twp@gentoo.org>2004-06-27 11:18:40 +0000
commit56c71be2cce3dfcedb07ced64a93ec022287a102 (patch)
treedce26673ce1bbffe64fbb709d51f656e71cf2bce /x11-libs
parentx86 stable (Manifest recommit) (diff)
downloadgentoo-2-56c71be2cce3dfcedb07ced64a93ec022287a102.tar.gz
gentoo-2-56c71be2cce3dfcedb07ced64a93ec022287a102.tar.bz2
gentoo-2-56c71be2cce3dfcedb07ced64a93ec022287a102.zip
Try to fix bug # 55099 (xrender.pc) using DEPEND magic
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cairo/ChangeLog8
-rw-r--r--x11-libs/cairo/Manifest8
-rw-r--r--x11-libs/cairo/cairo-0.1.18-r1.ebuild28
-rw-r--r--x11-libs/cairo/cairo-0.1.18.ebuild3
-rw-r--r--x11-libs/cairo/cairo-0.1.23-r1.ebuild26
-rw-r--r--x11-libs/cairo/cairo-0.1.23.ebuild5
-rw-r--r--x11-libs/cairo/files/digest-cairo-0.1.18-r11
-rw-r--r--x11-libs/cairo/files/digest-cairo-0.1.23-r11
8 files changed, 75 insertions, 5 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 287e105571b8..3c604cd42894 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
# 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.9 2004/06/24 21:58:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.10 2004/06/27 11:18:40 twp Exp $
+
+*cairo-0.1.18-r1 (27 Jun 2004)
+
+ 27 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:
+ Try to fix bug # 55099 (xrender.pc) using DEPEND magic
20 Jun 2004; <twp@gentoo.org> cairo-0.1.18.ebuild, cairo-0.1.23.ebuild:
Don't install xrender.pc. Bug # 49024.
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 894ae86b40a7..18d9cadd313c 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,7 +1,11 @@
-MD5 823fdc1cc009cd4530b8edb655ca50a2 cairo-0.1.23.ebuild 686
-MD5 b63e9620f7b51503e54496e54401627e cairo-0.1.18.ebuild 663
+MD5 5a714baa13215e12e06f6597860e3472 cairo-0.1.18-r1.ebuild 773
+MD5 44aa8542382140a6cc54c489aa502611 cairo-0.1.23.ebuild 772
+MD5 d4385ccd10e65366d92e917a49f9a28f cairo-0.1.23-r1.ebuild 738
+MD5 37e6ad4816d2fabd59921d1e3f13d53f cairo-0.1.18.ebuild 691
MD5 6cbceb5390c287e567e891b8e59e7c10 ChangeLog 995
MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151
MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18 64
MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23 64
+MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18-r1 64
+MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23-r1 64
diff --git a/x11-libs/cairo/cairo-0.1.18-r1.ebuild b/x11-libs/cairo/cairo-0.1.18-r1.ebuild
new file mode 100644
index 000000000000..cdc82c21a999
--- /dev/null
+++ b/x11-libs/cairo/cairo-0.1.18-r1.ebuild
@@ -0,0 +1,28 @@
+# 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 $
+
+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-r6 x11-base/xorg-x11 )
+ 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.18.ebuild b/x11-libs/cairo/cairo-0.1.18.ebuild
index e804c48a9fc1..6052503f48d9 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.5 2004/06/24 21:58:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.18.ebuild,v 1.6 2004/06/27 11:18:40 twp Exp $
DESCRIPTION="A vector graphics library with cross-device output support"
HOMEPAGE="http://cairographics.org/"
@@ -10,6 +10,7 @@ SLOT="0"
KEYWORDS="x86 ~ppc"
IUSE=""
DEPEND="virtual/x11
+ !<=x11-base/xfree-4.3.0-r5
virtual/xft
media-libs/fontconfig
>=media-libs/freetype-2*
diff --git a/x11-libs/cairo/cairo-0.1.23-r1.ebuild b/x11-libs/cairo/cairo-0.1.23-r1.ebuild
new file mode 100644
index 000000000000..46e19bf94526
--- /dev/null
+++ b/x11-libs/cairo/cairo-0.1.23-r1.ebuild
@@ -0,0 +1,26 @@
+# 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 $
+
+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-r6 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}
+}
diff --git a/x11-libs/cairo/cairo-0.1.23.ebuild b/x11-libs/cairo/cairo-0.1.23.ebuild
index e0467e5e0aa4..495f6e28a68a 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.5 2004/06/24 21:58:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23.ebuild,v 1.6 2004/06/27 11:18:40 twp Exp $
DESCRIPTION="A vector graphics library with cross-device output support"
HOMEPAGE="http://cairographics.org/"
@@ -10,6 +10,7 @@ SLOT="0"
KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
IUSE=""
DEPEND="virtual/x11
+ !<=x11-base/xfree-4.3.0-r5
virtual/xft
media-libs/fontconfig
>=media-libs/freetype-2*
@@ -22,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/files/digest-cairo-0.1.18-r1 b/x11-libs/cairo/files/digest-cairo-0.1.18-r1
new file mode 100644
index 000000000000..3fdc0e3f104b
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-0.1.18-r1
@@ -0,0 +1 @@
+MD5 b578f3cbfb8574bca85c86e4580bdf46 cairo-0.1.18.tar.gz 365601
diff --git a/x11-libs/cairo/files/digest-cairo-0.1.23-r1 b/x11-libs/cairo/files/digest-cairo-0.1.23-r1
new file mode 100644
index 000000000000..26e3effccf3e
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-0.1.23-r1
@@ -0,0 +1 @@
+MD5 c36bcb2c5fe2b716620e68626a0da3a1 cairo-0.1.23.tar.gz 393051