bump to 1.5.12 and remove old versions. 1.5.12 includes 24.8 pixel addressing.

(Portage version: 2.1.4.4)

3 files changed, 8 insertions, 79 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index d1a571db70bf..569a69522a2e 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.163 2008/02/21 14:43:19 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.164 2008/02/29 22:10:08 cardoe Exp $
+
+*cairo-1.5.12 (29 Feb 2008)
+
+  29 Feb 2008; Doug Klima <cardoe@gentoo.org> -cairo-1.5.6.ebuild,
+  -cairo-1.5.8.ebuild, +cairo-1.5.12.ebuild:
+  bump to 1.5.12 and remove old versions. 1.5.12 includes 24.8 pixel addressing.
 
   21 Feb 2008; Doug Klima <cardoe@gentoo.org>
   -files/cairo-1.5.4-fix-private.patch:
diff --git a/x11-libs/cairo/cairo-1.5.6.ebuild b/x11-libs/cairo/cairo-1.5.12.ebuild
index 24d7cb36be5f..528a28d975b5 100644
--- a/x11-libs/cairo/cairo-1.5.6.ebuild
+++ b/x11-libs/cairo/cairo-1.5.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.6.ebuild,v 1.1 2008/01/16 19:51:48 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.12.ebuild,v 1.1 2008/02/29 22:10:08 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
diff --git a/x11-libs/cairo/cairo-1.5.8.ebuild b/x11-libs/cairo/cairo-1.5.8.ebuild
deleted file mode 100644
index 5b6a9c58e9fc..000000000000
--- a/x11-libs/cairo/cairo-1.5.8.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.5.8.ebuild,v 1.1 2008/02/21 14:34:54 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 opengl svg X xcb test"
-
-RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.4
-		sys-libs/zlib
-		media-libs/libpng
-		>=x11-libs/pixman-0.9.4
-		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
-		test? (
-				virtual/ghostscript
-				>=app-text/poppler-bindings-0.4.1
-				x11-libs/pango
-				x11-libs/gtk+
-				svg? ( >=gnome-base/librsvg-2.15.0 )
-			)
-		X? ( x11-proto/renderproto
-			xcb? ( x11-proto/xcb-proto ) )
-		doc?	(
-					>=dev-util/gtk-doc-1.6
-					 ~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
-
-	if use glitz && use opengl; then
-		export glitz_LIBS=-lglitz-glx
-	fi
-
-	econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \
-		  $(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
-		  $(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
-}