New release: 0.9.2. Cleaning old ebuilds. Adding gnome herd to metadata.xml

(Portage version: 2.0.51.22-r2)

18 files changed, 100 insertions, 225 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index b246ba983471..938e23835bd8 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.39 2005/07/31 10:56:28 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.40 2005/08/15 18:42:04 leonardop Exp $
+
+*cairo-0.9.2 (15 Aug 2005)
+
+  15 Aug 2005; Leonardo Boshell <leonardop@gentoo.org> cairo-0.9.2.ebuild,
+  files/cairo-0.9.2-vendor_string.patch, metadata.xml:
+  New version. Updated dependencies. Install a few files with 'dodoc'. Added
+  'doc' and 'static' USE flags. Added patch to properly enable a work-around
+  in cairo's code for a rendering problem (see bug #100917).
 
 *cairo-0.6.0 (31 Jul 2005)
 
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 17563f2cb7e5..0f81b816670d 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,27 +1,18 @@
+MD5 0ead505cd6768edce15e5177627bbecf ChangeLog 5333
+MD5 136fe5d737c8022f3ee0c8b17483fe35 attachment.cgi?id=65924 1033
+MD5 3a4cce771cdc4714c6931467622c9ddc cairo-0.1.23-r1.ebuild 757
+MD5 35bbc6c5841e982f3b2b010c5953d04c cairo-0.9.2.ebuild 1076
+MD5 4db2c222787dd6470523acdfe996891e cairo-0.2.0-r1.ebuild 900
 MD5 627da87d1d67830749f3dafde81804ca cairo-0.3.0.ebuild 843
-MD5 b3c7457b7cd79bcb1f482989a0f44ea5 cairo-0.1.18-r1.ebuild 700
-MD5 89b3424208cfab9960dd1cd378bc40bd cairo-0.1.23.ebuild 798
-MD5 1d2ad415e2e6db1a58640bb93b15a34f cairo-0.4.0.ebuild 994
+MD5 ea284a6e24864155e0176859cbddf1b3 metadata.xml 335
 MD5 bf58c44a3e6266ea9d01e8788eabbccc cairo-0.3.0-r2.ebuild 997
-MD5 4db2c222787dd6470523acdfe996891e cairo-0.2.0-r1.ebuild 900
-MD5 3a4cce771cdc4714c6931467622c9ddc cairo-0.1.23-r1.ebuild 757
-MD5 6530e3394d4bd4331548a567e79b060d cairo-0.1.18.ebuild 755
-MD5 5e508ee8f393ac39c114c64053ebf728 cairo-0.3.0-r1.ebuild 901
-MD5 0703b7de7585b5efb54c86b00bb27ca6 cairo-0.6.0.ebuild 1063
-MD5 84ef7dc14d4bb777858a58844eb50641 cairo-0.2.0.ebuild 846
-MD5 0ead505cd6768edce15e5177627bbecf ChangeLog 5333
-MD5 65d1d5c2aa536148fb35cee02b3a8428 metadata.xml 337
-MD5 4df3bcd9171f83ca24b03ab0f8eefb24 files/cairo-0.3.0-header-fix.diff 697
-MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151
-MD5 ee0e0ddbf61c280106ae3683503054a8 files/digest-cairo-0.2.0 63
-MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0 63
-MD5 f84da26023eb9d5a29079fbccc555523 files/digest-cairo-0.4.0 63
-MD5 a18ffc985185c344e960ea626dc50ff2 files/digest-cairo-0.6.0 64
-MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18 64
-MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23 64
-MD5 1ecec7f667ad4b91d876db0efdf4a261 files/cairo-0.4.0-makefile.patch 1553
-MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18-r1 64
+MD5 1d2ad415e2e6db1a58640bb93b15a34f cairo-0.4.0.ebuild 994
+MD5 bc9e5e0986980a06b8ce6393b5e84cab files/digest-cairo-0.9.2 64
 MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23-r1 64
 MD5 ee0e0ddbf61c280106ae3683503054a8 files/digest-cairo-0.2.0-r1 63
-MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0-r1 63
+MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0 63
+MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151
+MD5 4df3bcd9171f83ca24b03ab0f8eefb24 files/cairo-0.3.0-header-fix.diff 697
+MD5 1ecec7f667ad4b91d876db0efdf4a261 files/cairo-0.4.0-makefile.patch 1553
 MD5 2a0e4de10c4b8aacdb9b5991825b30d5 files/digest-cairo-0.3.0-r2 63
+MD5 f84da26023eb9d5a29079fbccc555523 files/digest-cairo-0.4.0 63
diff --git a/x11-libs/cairo/cairo-0.1.18-r1.ebuild b/x11-libs/cairo/cairo-0.1.18-r1.ebuild
deleted file mode 100644
index cc361fe13dff..000000000000
--- a/x11-libs/cairo/cairo-0.1.18-r1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2005 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.7 2005/05/05 23:19:47 latexer 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
-	virtual/xft
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/libpixman"
-
-src_compile() {
-	PKG_CONFIG_PATH=${PKG_CONFIG_PATH+$PKG_CONFIG_PATH:}${FILESDIR} econf || die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR=${D}
-}
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 bf3f8a7ee0bd..000000000000
--- a/x11-libs/cairo/cairo-0.1.18.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2005 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.13 2005/05/05 23:19:47 latexer 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
-	virtual/xft
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	media-libs/libpixman"
-
-src_compile() {
-	PKG_CONFIG_PATH=${PKG_CONFIG_PATH+$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.ebuild b/x11-libs/cairo/cairo-0.1.23.ebuild
deleted file mode 100644
index 9b8ca47f98a7..000000000000
--- a/x11-libs/cairo/cairo-0.1.23.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2005 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.13 2005/05/05 23:19:47 latexer 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/xorg-x11
-	virtual/xft
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=media-libs/libpixman-0.1.1"
-
-src_compile() {
-	PKG_CONFIG_PATH=${PKG_CONFIG_PATH+$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.2.0.ebuild b/x11-libs/cairo/cairo-0.2.0.ebuild
deleted file mode 100644
index df6a402a32db..000000000000
--- a/x11-libs/cairo/cairo-0.2.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.2.0.ebuild,v 1.11 2005/07/10 03:45:04 vapier 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="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="glitz png"
-
-DEPEND="virtual/x11
-	virtual/xft
-	media-libs/fontconfig
-	>=media-libs/freetype-2
-	>=media-libs/libpixman-0.1.2
-	glitz? ( =media-libs/glitz-0.2.3 )
-	png? ( media-libs/libpng )"
-
-src_compile() {
-	econf \
-		$(use_enable glitz) \
-		$(use_enable png) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-}
diff --git a/x11-libs/cairo/cairo-0.3.0-r1.ebuild b/x11-libs/cairo/cairo-0.3.0-r1.ebuild
deleted file mode 100644
index 1ebbcc69678e..000000000000
--- a/x11-libs/cairo/cairo-0.3.0-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.3.0-r1.ebuild,v 1.4 2005/07/10 03:45:04 vapier 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="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="glitz png X"
-
-DEPEND="X? (
-			virtual/x11
-			virtual/xft
-		)
-		media-libs/fontconfig
-		>=media-libs/freetype-2
-		>=media-libs/libpixman-0.1.2
-		glitz? ( =media-libs/glitz-0.3.0* )
-		png? ( media-libs/libpng )"
-
-src_compile() {
-	econf \
-		$(use_enable X xlib) \
-		$(use_enable glitz) \
-		$(use_enable png) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	make install DESTDIR="${D}" || die
-}
diff --git a/x11-libs/cairo/cairo-0.6.0.ebuild b/x11-libs/cairo/cairo-0.6.0.ebuild
deleted file mode 100644
index 2c1b59376945..000000000000
--- a/x11-libs/cairo/cairo-0.6.0.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.6.0.ebuild,v 1.4 2005/07/31 13:55:21 foser 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="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="glitz png X"
-
-RDEPEND="X? (
-			virtual/x11
-			virtual/xft
-		)
-		media-libs/fontconfig
-		>=media-libs/freetype-2
-		>=media-libs/libpixman-0.1.5
-		png? ( media-libs/libpng )
-	!<x11-libs/cairo-0.2"
-# the block fixes the issue described in #85285 without patching
-
-# no snapshot available yet
-#		glitz? ( >=media-libs/glitz-0.4.4 )
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
-
-src_compile() {
-
-	econf \
-		$(use_enable X xlib) \
-		$(use_enable png) \
-		|| die
-#		$(use_enable glitz) \
-
-	emake || die
-
-}
-
-
-src_install() {
-
-	make install DESTDIR="${D}" || die
-
-}
diff --git a/x11-libs/cairo/cairo-0.9.2.ebuild b/x11-libs/cairo/cairo-0.9.2.ebuild
new file mode 100644
index 000000000000..5717654b1226
--- /dev/null
+++ b/x11-libs/cairo/cairo-0.9.2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.9.2.ebuild,v 1.1 2005/08/15 18:42:04 leonardop Exp $
+
+inherit eutils
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
+
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="doc png static X"
+# glitz
+
+RDEPEND="X? (
+		virtual/x11
+		virtual/xft )
+	media-libs/fontconfig
+	>=media-libs/freetype-2.1
+	sys-libs/zlib
+	png? ( media-libs/libpng )
+	!<x11-libs/cairo-0.2"
+# the block fixes the issue described in #85285 without patching
+
+# no snapshot available yet
+#		glitz? ( >=media-libs/glitz-0.4.4 )
+
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.9
+	doc? (
+		>=dev-util/gtk-doc-1.3
+		~app-text/docbook-xml-dtd-4.2 )"
+
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Recognize gentoo's X server. See
+	# <https://bugs.freedesktop.org/show_bug.cgi?id=4068>. For more details
+	# about the problem it fixes, see --GNOME bug-- #306216.
+	epatch ${FILESDIR}/${P}-vendor_string.patch
+}
+
+src_compile() {
+	local myconf="$(use_enable X xlib) $(use_enable png) \
+		$(use_enable static) $(use_enable doc gtk-doc)"
+		# $(use_enable glitz)
+
+	econf $myconf || die "./configure failed"
+	emake || die "Compilation failed"
+}
+
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+
+	dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/x11-libs/cairo/files/cairo-0.9.2-vendor_string.patch b/x11-libs/cairo/files/cairo-0.9.2-vendor_string.patch
new file mode 100644
index 000000000000..a90bba38ad68
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-0.9.2-vendor_string.patch
@@ -0,0 +1,15 @@
+--- src/cairo-xlib-surface.c.orig	2005-08-10 16:52:14.000000000 +0300
++++ src/cairo-xlib-surface.c	2005-08-15 18:09:31.000000000 +0300
+@@ -1633,10 +1633,10 @@
+     }
+ 
+     surface->buggy_repeat = FALSE;
+-    if (strcmp (ServerVendor (dpy), "The X.Org Foundation") == 0) {
++    if (strstr (ServerVendor (dpy), "The X.Org Foundation") != NULL) {
+ 	if (VendorRelease (dpy) <= 60802000)
+ 	    surface->buggy_repeat = TRUE;
+-    } else if (strcmp (ServerVendor (dpy), "The XFree86 Project, Inc") == 0) {
++    } else if (strstr (ServerVendor (dpy), "The XFree86 Project, Inc") != NULL) {
+ 	if (VendorRelease (dpy) <= 40400000)
+ 	    surface->buggy_repeat = TRUE;
+     }
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.18-r1 b/x11-libs/cairo/files/digest-cairo-0.1.18-r1
deleted file mode 100644
index 3fdc0e3f104b..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.1.18-r1
+++ /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
diff --git a/x11-libs/cairo/files/digest-cairo-0.2.0 b/x11-libs/cairo/files/digest-cairo-0.2.0
deleted file mode 100644
index 735bf2b3cb68..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2ff2b3b52b862971d2baa3fede3a3d6e cairo-0.2.0.tar.gz 462216
diff --git a/x11-libs/cairo/files/digest-cairo-0.3.0-r1 b/x11-libs/cairo/files/digest-cairo-0.3.0-r1
deleted file mode 100644
index 31d20e43ed9f..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.3.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78c1a536d3a45bdc06a8335d33e63d8f cairo-0.3.0.tar.gz 514446
diff --git a/x11-libs/cairo/files/digest-cairo-0.6.0 b/x11-libs/cairo/files/digest-cairo-0.6.0
deleted file mode 100644
index 1a3276e9b3e7..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.6.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0a0c8bd3bfddf2b6b9ffa670ee706723 cairo-0.6.0.tar.gz 1138003
diff --git a/x11-libs/cairo/files/digest-cairo-0.9.2 b/x11-libs/cairo/files/digest-cairo-0.9.2
new file mode 100644
index 000000000000..0463cdceb65c
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-0.9.2
@@ -0,0 +1 @@
+MD5 992095a5db597384a89b41e93737105d cairo-0.9.2.tar.gz 1346039
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 0277d97e7d3f..80255e22f706 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>no-herd</herd>
+<herd>gnome</herd>
 <maintainer>
   <email>latexer@gentoo.org</email>
   <name>Peter Johanson</name>