Spring cleaning

(Portage version: 2.1_pre4-r1)

13 files changed, 7 insertions, 247 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 17c0853a991c..9c458278c19e 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.56 2006/02/19 16:42:04 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.57 2006/02/19 17:40:02 cardoe Exp $
+
+  19 Feb 2006; Doug Goldstein <cardoe@gentoo.org>
+  -files/cairo-0.3.0-header-fix.diff, -files/cairo-0.4.0-makefile.patch,
+  -cairo-0.1.23-r1.ebuild, -cairo-0.2.0-r1.ebuild, -cairo-0.3.0.ebuild,
+  -cairo-0.3.0-r2.ebuild, -cairo-0.4.0.ebuild:
+  Spring cleaning
 
   19 Feb 2006; Stephen P. Becker <geoman@gentoo.org> cairo-1.0.2.ebuild:
   stable on mips
diff --git a/x11-libs/cairo/cairo-0.1.23-r1.ebuild b/x11-libs/cairo/cairo-0.1.23-r1.ebuild
deleted file mode 100644
index 3b99533e6e12..000000000000
--- a/x11-libs/cairo/cairo-0.1.23-r1.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.23-r1.ebuild,v 1.16 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="alpha amd64 arm hppa ia64 ~mips ppc sparc x86"
-IUSE=""
-
-DEPEND="virtual/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}" || die
-}
diff --git a/x11-libs/cairo/cairo-0.2.0-r1.ebuild b/x11-libs/cairo/cairo-0.2.0-r1.ebuild
deleted file mode 100644
index 293f9652ee48..000000000000
--- a/x11-libs/cairo/cairo-0.2.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.2.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/xft
-			virtual/x11
-		)
-		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 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.3.0-r2.ebuild b/x11-libs/cairo/cairo-0.3.0-r2.ebuild
deleted file mode 100644
index b478388ab3da..000000000000
--- a/x11-libs/cairo/cairo-0.3.0-r2.ebuild
+++ /dev/null
@@ -1,43 +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-r2.ebuild,v 1.6 2005/09/05 18:54:31 corsair 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="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_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-header-fix.diff
-}
-
-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.3.0.ebuild b/x11-libs/cairo/cairo-0.3.0.ebuild
deleted file mode 100644
index 1be692d725a8..000000000000
--- a/x11-libs/cairo/cairo-0.3.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.3.0.ebuild,v 1.9 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.3.0* )
-	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.4.0.ebuild b/x11-libs/cairo/cairo-0.4.0.ebuild
deleted file mode 100644
index 85c70c1c4a5f..000000000000
--- a/x11-libs/cairo/cairo-0.4.0.ebuild
+++ /dev/null
@@ -1,43 +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.4.0.ebuild,v 1.4 2005/07/10 03:45:04 vapier 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="glitz png X"
-
-DEPEND="X? (
-			virtual/x11
-			virtual/xft
-		)
-		media-libs/fontconfig
-		>=media-libs/freetype-2
-		>=media-libs/libpixman-0.1.4
-		glitz? ( =media-libs/glitz-0.4.0* )
-		png? ( media-libs/libpng )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile.patch
-}
-
-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/files/cairo-0.3.0-header-fix.diff b/x11-libs/cairo/files/cairo-0.3.0-header-fix.diff
deleted file mode 100644
index 0dacd9fe5052..000000000000
--- a/x11-libs/cairo/files/cairo-0.3.0-header-fix.diff
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -aur cairo-0.3.0-orig/src/cairo-xlib.h cairo-0.3.0/src/cairo-xlib.h
---- cairo-0.3.0-orig/src/cairo-xlib.h	2005-01-20 11:28:54.000000000 -0500
-+++ cairo-0.3.0/src/cairo-xlib.h	2005-04-08 20:23:30.000000000 -0400
-@@ -40,6 +40,9 @@
- #define CAIRO_XLIB_H
- #ifdef  CAIRO_HAS_XLIB_SURFACE
- 
-+#ifdef __cplusplus
-+extern "C" {
-+#endif /* __cplusplus */
- #include <X11/extensions/Xrender.h>
- 
- /* XXX: This shold be renamed to cairo_set_target_xlib to match the
-@@ -66,6 +69,10 @@
- cairo_xlib_surface_set_size (cairo_surface_t *surface, int width, int height);
- */
- 
-+#ifdef __cplusplus
-+} /* extern "C" */
-+#endif /* __cplusplus */
-+
- #endif /* CAIRO_HAS_XLIB_SURFACE */
- #endif /* CAIRO_XLIB_H */
- 
diff --git a/x11-libs/cairo/files/cairo-0.4.0-makefile.patch b/x11-libs/cairo/files/cairo-0.4.0-makefile.patch
deleted file mode 100644
index 79ab14302f03..000000000000
--- a/x11-libs/cairo/files/cairo-0.4.0-makefile.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- cairo-0.4.0/src/Makefile.in.old	2005-03-28 02:57:44.924552656 -0500
-+++ cairo-0.4.0/src/Makefile.in	2005-03-28 02:59:13.385104608 -0500
-@@ -653,7 +653,7 @@
- 
- info-am:
- 
--install-data-am: install-cairoincludeHEADERS install-data-local
-+install-data-am: install-cairoincludeHEADERS
- 
- install-exec-am: install-libLTLIBRARIES
- 
-@@ -689,7 +689,7 @@
- 	distclean-compile distclean-generic distclean-libtool \
- 	distclean-tags distdir dvi dvi-am html html-am info info-am \
- 	install install-am install-cairoincludeHEADERS install-data \
--	install-data-am install-data-local install-exec \
-+	install-data-am install-exec \
- 	install-exec-am install-info install-info-am \
- 	install-libLTLIBRARIES install-man install-strip installcheck \
- 	installcheck-am installdirs maintainer-clean \
-@@ -698,16 +698,6 @@
- 	tags uninstall uninstall-am uninstall-cairoincludeHEADERS \
- 	uninstall-info-am uninstall-libLTLIBRARIES
- 
--
--install-data-local:
--	@if test -f $(includedir)/cairo.h || test -f $(includedir)/cairo-features.h ; then \
--	  echo "****************************************************************" ;	\
--	  echo "*** Error: Old headers found. You should remove the following" ;	\
--	  echo "***        files and then type 'make install' again." ;			\
--	  ls $(includedir)/cairo*.h ;							\
--	  echo "****************************************************************" ;	\
--	  false ;									\
--        fi
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/x11-libs/cairo/files/digest-cairo-0.1.23-r1 b/x11-libs/cairo/files/digest-cairo-0.1.23-r1
deleted file mode 100644
index 26e3effccf3e..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.1.23-r1
+++ /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-r1 b/x11-libs/cairo/files/digest-cairo-0.2.0-r1
deleted file mode 100644
index 735bf2b3cb68..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.2.0-r1
+++ /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 b/x11-libs/cairo/files/digest-cairo-0.3.0
deleted file mode 100644
index 31d20e43ed9f..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.3.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78c1a536d3a45bdc06a8335d33e63d8f cairo-0.3.0.tar.gz 514446
diff --git a/x11-libs/cairo/files/digest-cairo-0.3.0-r2 b/x11-libs/cairo/files/digest-cairo-0.3.0-r2
deleted file mode 100644
index 31d20e43ed9f..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.3.0-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 78c1a536d3a45bdc06a8335d33e63d8f cairo-0.3.0.tar.gz 514446
diff --git a/x11-libs/cairo/files/digest-cairo-0.4.0 b/x11-libs/cairo/files/digest-cairo-0.4.0
deleted file mode 100644
index 7be25bf69bd4..000000000000
--- a/x11-libs/cairo/files/digest-cairo-0.4.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 2c76c6f6717cb5fc7398eb2e0f9cb025 cairo-0.4.0.tar.gz 781463