Rev bump to 1.4.2. Remove old experimental versions.

(Portage version: 2.1.2.2)

13 files changed, 13 insertions, 295 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index a0227a7a59b7..c5229055a728 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.109 2007/03/06 14:05:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.110 2007/03/20 13:58:44 cardoe Exp $
+
+*cairo-1.4.2 (20 Mar 2007)
+
+  20 Mar 2007; Doug Goldstein <cardoe@gentoo.org> -cairo-1.0.2.ebuild,
+  -cairo-1.3.10.ebuild, -cairo-1.3.12.ebuild, -cairo-1.3.14.ebuild,
+  -cairo-1.3.16.ebuild, +cairo-1.4.2.ebuild:
+  Rev bump to 1.4.2. Remove old experimental versions.
 
 *cairo-1.4.0 (06 Mar 2007)
 
diff --git a/x11-libs/cairo/cairo-1.0.2.ebuild b/x11-libs/cairo/cairo-1.0.2.ebuild
deleted file mode 100644
index 930e64225ad9..000000000000
--- a/x11-libs/cairo/cairo-1.0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.0.2.ebuild,v 1.15 2007/02/18 10:32:33 grobian Exp $
-
-inherit eutils
-
-DESCRIPTION="A vector graphics library with cross-device output support"
-HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
-
-LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc x86"
-IUSE="doc glitz png X"
-
-RDEPEND="media-libs/fontconfig
-	>=media-libs/freetype-2.1
-	sys-libs/zlib
-	X? ( || ( (	x11-libs/libXrender
-			x11-libs/libXt )
-			virtual/x11 )
-		virtual/xft )
-	glitz? ( >=media-libs/glitz-0.4.4 )
-	png? ( media-libs/libpng )
-	!<x11-libs/cairo-0.2"
-
-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}"
-
-	# Call PKG_PROG_PKG_CONFIG to fix other standard pkg-config calls
-	epatch ${FILESDIR}/${P}-pkg_macro.patch
-
-	cp aclocal.m4 old_macros.m4
-	aclocal -I . || die "aclocal failed"
-	autoconf || die "autoconf failed"
-}
-
-
-src_compile() {
-	local myconf="$(use_with X x) \
-		$(use_enable X xlib)      \
-		$(use_enable png)         \
-		$(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/cairo-1.3.10.ebuild b/x11-libs/cairo/cairo-1.3.10.ebuild
deleted file mode 100644
index 2c1f84606365..000000000000
--- a/x11-libs/cairo/cairo-1.3.10.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.3.10.ebuild,v 1.7 2007/02/18 10:32:33 grobian Exp $
-
-inherit eutils flag-o-matic libtool
-
-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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz svg X xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.4
-		media-libs/libpng
-		X?	(
-				x11-libs/libXrender
-				x11-libs/libXext
-				x11-libs/libX11
-				virtual/xft
-				xcb? ( x11-libs/libxcb
-						x11-libs/xcb-util )
-			)
-		directfb? ( >=dev-libs/DirectFB-0.9.24 )
-		glitz? ( >=media-libs/glitz-0.5.1 )
-		svg? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19
-		X? ( x11-proto/renderproto
-			xcb? ( x11-proto/xcb-proto ) )
-		doc?	(
-					>=dev-util/gtk-doc-1.3
-					 ~app-text/docbook-xml-dtd-4.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	elibtoolize
-}
-
-src_compile() {
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
-		  $(use_enable svg) $(use_enable glitz) \
-		  $(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		  --enable-freetype --enable-ps $(use_enable xcb) \
-		  || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/cairo-1.3.12.ebuild b/x11-libs/cairo/cairo-1.3.12.ebuild
deleted file mode 100644
index 3ef3809696ef..000000000000
--- a/x11-libs/cairo/cairo-1.3.12.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.3.12.ebuild,v 1.2 2007/02/18 10:32:33 grobian Exp $
-
-inherit eutils flag-o-matic libtool
-
-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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz svg X xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.4
-		media-libs/libpng
-		X?	(
-				x11-libs/libXrender
-				x11-libs/libXext
-				x11-libs/libX11
-				virtual/xft
-				xcb? ( x11-libs/libxcb
-						x11-libs/xcb-util )
-			)
-		directfb? ( >=dev-libs/DirectFB-0.9.24 )
-		glitz? ( >=media-libs/glitz-0.5.1 )
-		svg? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19
-		X? ( x11-proto/renderproto
-			xcb? ( x11-proto/xcb-proto ) )
-		doc?	(
-					>=dev-util/gtk-doc-1.3
-					 ~app-text/docbook-xml-dtd-4.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	elibtoolize
-}
-
-src_compile() {
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
-		  $(use_enable svg) $(use_enable glitz) \
-		  $(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		  --enable-freetype --enable-ps $(use_enable xcb) \
-		  || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/cairo-1.3.14.ebuild b/x11-libs/cairo/cairo-1.3.14.ebuild
deleted file mode 100644
index 2a6a4e06349a..000000000000
--- a/x11-libs/cairo/cairo-1.3.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.3.14.ebuild,v 1.1 2007/02/19 05:54:06 cardoe Exp $
-
-inherit eutils flag-o-matic libtool
-
-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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz svg X xcb"
-
-# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
-RESTRICT="test"
-
-RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.4
-		media-libs/libpng
-		X?	(
-				x11-libs/libXrender
-				x11-libs/libXext
-				x11-libs/libX11
-				virtual/xft
-				xcb? ( x11-libs/libxcb
-						x11-libs/xcb-util )
-			)
-		directfb? ( >=dev-libs/DirectFB-0.9.24 )
-		glitz? ( >=media-libs/glitz-0.5.1 )
-		svg? ( dev-libs/libxml2 )"
-
-DEPEND="${RDEPEND}
-		>=dev-util/pkgconfig-0.19
-		X? ( x11-proto/renderproto
-			xcb? ( x11-proto/xcb-proto ) )
-		doc?	(
-					>=dev-util/gtk-doc-1.3
-					 ~app-text/docbook-xml-dtd-4.2
-				)"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# We need to run elibtoolize to ensure correct so versioning on FreeBSD
-	elibtoolize
-}
-
-src_compile() {
-	#gets rid of fbmmx.c inlining warnings
-	append-flags -finline-limit=1200
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
-		  $(use_enable svg) $(use_enable glitz) \
-		  $(use_enable debug test-surfaces) --enable-pdf  --enable-png \
-		  --enable-freetype --enable-ps $(use_enable xcb) \
-		  || die "configure failed"
-
-	emake || die "compile failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "Installation failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/x11-libs/cairo/cairo-1.3.16.ebuild b/x11-libs/cairo/cairo-1.4.2.ebuild
index 7bd239599fec..58125ab2a6ef 100644
--- a/x11-libs/cairo/cairo-1.3.16.ebuild
+++ b/x11-libs/cairo/cairo-1.4.2.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.3.16.ebuild,v 1.1 2007/03/03 15:54:12 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.2.ebuild,v 1.1 2007/03/20 13:58:44 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
-SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
 
 LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
diff --git a/x11-libs/cairo/files/cairo-1.0.2-pkg_macro.patch b/x11-libs/cairo/files/cairo-1.0.2-pkg_macro.patch
deleted file mode 100644
index e983054d1112..000000000000
--- a/x11-libs/cairo/files/cairo-1.0.2-pkg_macro.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -NurdB cairo-1.0.2/configure.in cairo-1.0.2-patched/configure.in
---- cairo-1.0.2/configure.in	2005-10-04 18:56:21.000000000 -0500
-+++ cairo-1.0.2-patched/configure.in	2005-10-04 19:28:12.000000000 -0500
-@@ -83,6 +83,10 @@
- 
- dnl ===========================================================================
- 
-+PKG_PROG_PKG_CONFIG
-+
-+dnl ===========================================================================
-+
- AC_ARG_ENABLE(xlib,
-   [  --disable-xlib          Disable cairo's Xlib backend],
-   [use_xlib=$enableval], [use_xlib=yes])
diff --git a/x11-libs/cairo/files/digest-cairo-1.0.2 b/x11-libs/cairo/files/digest-cairo-1.0.2
deleted file mode 100644
index 8b125ac6546e..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.0.2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d0b7111a14f90ec3afa777ec40c44984 cairo-1.0.2.tar.gz 1458903
-RMD160 59f309974fdac86253ed9a4d00e564a2fac310eb cairo-1.0.2.tar.gz 1458903
-SHA256 d6fba4b522decbda4aed8c9ad7243f6e923740761d677567758aebb01cdd1f5e cairo-1.0.2.tar.gz 1458903
diff --git a/x11-libs/cairo/files/digest-cairo-1.3.10 b/x11-libs/cairo/files/digest-cairo-1.3.10
deleted file mode 100644
index 61b82abd538e..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.3.10
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 78e1c1c57568f51e4da73f52cf57eadb cairo-1.3.10.tar.gz 2787973
-RMD160 eb40963c760be2e2c8f9dc743cf205c69136b399 cairo-1.3.10.tar.gz 2787973
-SHA256 2ed48e592c36bf3a2581cd9935bbe2d9cb6c4d6dbb91b794fb76c632ea1f3b98 cairo-1.3.10.tar.gz 2787973
diff --git a/x11-libs/cairo/files/digest-cairo-1.3.12 b/x11-libs/cairo/files/digest-cairo-1.3.12
deleted file mode 100644
index cda44ca8d913..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.3.12
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 b6ac81de3c47529d1f39390943728c3d cairo-1.3.12.tar.gz 2812615
-RMD160 2604af4bf3f98abdd586391dc5e43a3cb845ad16 cairo-1.3.12.tar.gz 2812615
-SHA256 7337cec2f20e4a350d39f87a86c7fe04ae62bae412a8f3e77d1d749389ae9127 cairo-1.3.12.tar.gz 2812615
diff --git a/x11-libs/cairo/files/digest-cairo-1.3.14 b/x11-libs/cairo/files/digest-cairo-1.3.14
deleted file mode 100644
index 0dd9e35026bb..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.3.14
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 08eef0800258bff5b3f13d787dd68402 cairo-1.3.14.tar.gz 2831683
-RMD160 f1d859b851077fcbe0d735fba4770f84cd84a464 cairo-1.3.14.tar.gz 2831683
-SHA256 752918a5519a67a8ce05a740574116a26d98a44a37beba075f03b547903d3ff0 cairo-1.3.14.tar.gz 2831683
diff --git a/x11-libs/cairo/files/digest-cairo-1.3.16 b/x11-libs/cairo/files/digest-cairo-1.3.16
deleted file mode 100644
index 8aeb731171b3..000000000000
--- a/x11-libs/cairo/files/digest-cairo-1.3.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 149a8006181a07c1447559058a3750df cairo-1.3.16.tar.gz 4156967
-RMD160 23ae73ad7f7e9548cacb9ec7d0f735cb4d081d67 cairo-1.3.16.tar.gz 4156967
-SHA256 8120b653e6f298ca2508ba8a82448e9b8a0b2a598a50d9db4184548e36781d1b cairo-1.3.16.tar.gz 4156967
diff --git a/x11-libs/cairo/files/digest-cairo-1.4.2 b/x11-libs/cairo/files/digest-cairo-1.4.2
new file mode 100644
index 000000000000..093048125879
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.4.2
@@ -0,0 +1,3 @@
+MD5 b254633046eafe603776d0bee791b751 cairo-1.4.2.tar.gz 3081092
+RMD160 53ad2e60507e181cb754991c1fe8f8de47f366a3 cairo-1.4.2.tar.gz 3081092
+SHA256 7cf292ae376e7120ec548ad6a807a2f0f4f0539a304229a3bd98921453becd47 cairo-1.4.2.tar.gz 3081092