remove 1.6.x pre-releases

(Portage version: 2.1.5.3)

6 files changed, 19 insertions, 190 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 8f13c5d33a68..55e75c549245 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.180 2008/04/11 23:50:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.181 2008/06/04 19:07:15 cardoe Exp $
+
+  04 Jun 2008; Doug Goldstein <cardoe@gentoo.org>
+  -files/cairo-1.6.2-fix-g++-linking.patch,
+  -files/cairo-1.6.2-mutex-crash-fix.patch, -cairo-1.5.18.ebuild,
+  -cairo-1.5.20.ebuild, cairo-1.6.4.ebuild:
+  remove 1.6.x pre-releases
 
   11 Apr 2008; Doug Goldstein <cardoe@gentoo.org> cairo-1.6.4.ebuild:
   I fail. Forgot to remove epatch calls
diff --git a/x11-libs/cairo/cairo-1.5.18.ebuild b/x11-libs/cairo/cairo-1.5.18.ebuild
deleted file mode 100644
index 7fd08c850a60..000000000000
--- a/x11-libs/cairo/cairo-1.5.18.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.18.ebuild,v 1.1 2008/04/06 17:31:14 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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz opengl svg test X xcb"
-
-RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.9
-		sys-libs/zlib
-		media-libs/libpng
-		>=x11-libs/pixman-0.10.0
-		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
-}
diff --git a/x11-libs/cairo/cairo-1.5.20.ebuild b/x11-libs/cairo/cairo-1.5.20.ebuild
deleted file mode 100644
index 184d3217bba8..000000000000
--- a/x11-libs/cairo/cairo-1.5.20.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.20.ebuild,v 1.1 2008/04/08 12:13:17 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 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug directfb doc glitz opengl svg test X xcb"
-
-RDEPEND="media-libs/fontconfig
-		>=media-libs/freetype-2.1.9
-		sys-libs/zlib
-		media-libs/libpng
-		>=x11-libs/pixman-0.10.0
-		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
-}
diff --git a/x11-libs/cairo/cairo-1.6.4.ebuild b/x11-libs/cairo/cairo-1.6.4.ebuild
index 897cf1e832eb..d2399ea4e809 100644
--- a/x11-libs/cairo/cairo-1.6.4.ebuild
+++ b/x11-libs/cairo/cairo-1.6.4.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.6.4.ebuild,v 1.2 2008/04/11 23:50:59 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4.ebuild,v 1.3 2008/06/04 19:07:15 cardoe Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -57,6 +57,8 @@ src_unpack() {
 }
 
 src_compile() {
+	local use_xcb
+
 	#gets rid of fbmmx.c inlining warnings
 	append-flags -finline-limit=1200
 
@@ -64,11 +66,15 @@ src_compile() {
 		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"
+	use_xcb="--disable_xcb"
+	use X && use xcb && use_xcb="--enable-xcb"
+
+	econf $(use_enable X xlib) $(use_enable doc gtk-doc) \
+		$(use_enable directfb) ${use_xcb} \
+		$(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \
+		$(use_enable debug test-surfaces) --enable-pdf  --enable-png \
+		--enable-freetype --enable-ps \
+		|| die "configure failed"
 
 	emake || die "compile failed"
 }
diff --git a/x11-libs/cairo/files/cairo-1.6.2-fix-g++-linking.patch b/x11-libs/cairo/files/cairo-1.6.2-fix-g++-linking.patch
deleted file mode 100644
index f96e115bfb59..000000000000
--- a/x11-libs/cairo/files/cairo-1.6.2-fix-g++-linking.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/Makefile.am b/src/Makefile.am
-index dfdcf1e..16c8301 100644
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -235,11 +235,10 @@ beos_sources = cairo-beos-surface.cpp
- cairo_all_sources += $(beos_headers) $(beos_sources)
- if CAIRO_HAS_BEOS_SURFACE
- cairo_headers += $(beos_headers)
--cairo_sources += $(beos_sources)
- backend_pkgconfigs += cairo-beos.pc
- 
- noinst_LTLIBRARIES = libcairo_beos.la
--libcairo_beos_la_SOURCES = $(libcairo_beos_sources)
-+libcairo_beos_la_SOURCES = $(beos_sources)
- # BeOS system headers trigger this warning
- libcairo_beos_la_CXXFLAGS = -Wno-multichar
- endif
diff --git a/x11-libs/cairo/files/cairo-1.6.2-mutex-crash-fix.patch b/x11-libs/cairo/files/cairo-1.6.2-mutex-crash-fix.patch
deleted file mode 100644
index 4632ea1ff5ac..000000000000
--- a/x11-libs/cairo/files/cairo-1.6.2-mutex-crash-fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/cairo-xlib-screen.c b/src/cairo-xlib-screen.c

-index c456b16..60421cd 100644

---- a/src/cairo-xlib-screen.c

-+++ b/src/cairo-xlib-screen.c

-@@ -400,6 +400,7 @@ _cairo_xlib_screen_get_gc (cairo_xlib_screen_info_t *info, int depth)

-     gc = info->gc[depth];

-     info->gc[depth] = NULL;

-     needs_reset = info->gc_needs_clip_reset & (1 << depth);

-+    info->gc_needs_clip_reset &= ~(1 << depth);

-     CAIRO_MUTEX_UNLOCK (info->mutex);

- 

-     if (needs_reset)