bump the bugger

(Portage version: 2.1_pre4-r1)

5 files changed, 67 insertions, 19 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 9c458278c19e..62f346cb1357 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,13 @@
 # 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.57 2006/02/19 17:40:02 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.58 2006/03/27 16:27:50 foser Exp $
+
+*cairo-1.0.4 (27 Mar 2006)
+
+  27 Mar 2006; Marinus Schraal <foser@gentoo.org> cairo-1.0.4.ebuild :
+  New release, fix modular X deps.
+  Remove zlib dep, it's ps backend only
+  Remove twp & latexer as maintainers
 
   19 Feb 2006; Doug Goldstein <cardoe@gentoo.org>
   -files/cairo-0.3.0-header-fix.diff, -files/cairo-0.4.0-makefile.patch,
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index 65a39333e3bc..4d58dca78a36 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,25 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 773816a1e31e45a0d65f337e7d90ef58 ChangeLog 8576
 RMD160 e0227efab219fbe2c9a340518b625c453bc89d60 ChangeLog 8576
 SHA256 b51d8da3506db4417006de72b6c087ba69823d19266b5dc5b086ee891baf388b ChangeLog 8576
 MD5 e8e5d3bbc39d2d39c75c139e14d10d1a cairo-1.0.2.ebuild 1530
 RMD160 12790aa490cd8d5441abec121899226c8657757a cairo-1.0.2.ebuild 1530
 SHA256 41cc3865da19f668e4083345aae63845ff1a35111edee302ce2a8779af99dff4 cairo-1.0.2.ebuild 1530
+MD5 e8e5d3bbc39d2d39c75c139e14d10d1a cairo-1.0.4.ebuild 1530
+RMD160 12790aa490cd8d5441abec121899226c8657757a cairo-1.0.4.ebuild 1530
+SHA256 41cc3865da19f668e4083345aae63845ff1a35111edee302ce2a8779af99dff4 cairo-1.0.4.ebuild 1530
 MD5 6600a332745a27c0333f2c8193a805fa files/cairo-1.0.2-pkg_macro.patch 542
 RMD160 2e5e8c260f59f6bb63d7e5e46d38b0ee25f025ad files/cairo-1.0.2-pkg_macro.patch 542
 SHA256 4ab7469075776de4fadcc733c9ceb9754b075e5a99b05fcdc247fc597b971149 files/cairo-1.0.2-pkg_macro.patch 542
 MD5 ce0ff23d9d7dc27eafe29f87bd52524e files/digest-cairo-1.0.2 64
 RMD160 c29ad1bd1888889892321cbb769f784aaa79d0f6 files/digest-cairo-1.0.2 64
 SHA256 d887ebd4ef17cdd9031cd30af0a39491c017f5a6c6d8b9687e6201d03c1d2961 files/digest-cairo-1.0.2 64
+MD5 dd098b533608d6250bc6d4fbe016256d files/digest-cairo-1.0.4 238
+RMD160 014452a883fabada98aae5064c27a524ff0594ff files/digest-cairo-1.0.4 238
+SHA256 bf411c74051b9d9a6d3e5d6975117b31a7d4cd3adc0952877b0bc9056ad82746 files/digest-cairo-1.0.4 238
 MD5 d7538d01f3572ea308f9ca04df380e1b metadata.xml 427
 RMD160 a4cdf1c4381648447949759388047e3d85da304c metadata.xml 427
 SHA256 4e43d81dcbffb186ceb9e85d2d461d48bbf6977ff50bd4af73b6a6e7d612efcc metadata.xml 427
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1 (GNU/Linux)
-
-iD8DBQFD+K3SBtvusYtCZMsRAptZAJ9Wfp4ZfRO6UBfnXAOLUKfftKUWEQCeKOCd
-sFGQ5mu0lYiFrGNxNU/NbZw=
-=YCPf
------END PGP SIGNATURE-----
diff --git a/x11-libs/cairo/cairo-1.0.4.ebuild b/x11-libs/cairo/cairo-1.0.4.ebuild
new file mode 100644
index 000000000000..4851a3c09c56
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.0.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.0.4.ebuild,v 1.1 2006/03/27 16:27:50 foser 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 ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="doc glitz png X"
+
+RDEPEND="media-libs/fontconfig
+	>=media-libs/freetype-2.1
+	X? ( || ( (	x11-libs/libXrender
+			x11-libs/libX11 )
+			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
+	X? ( || ( x11-proto/renderproto virtual/x11 ) )
+	doc? (	>=dev-util/gtk-doc-1.3
+		~app-text/docbook-xml-dtd-4.2 )"
+
+src_compile() {
+
+	econf $(use_enable X xlib) \
+		$(use_enable png) \
+		$(use_enable doc gtk-doc) \
+		$(use_enable glitz) \
+		--enable-freetype || 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/digest-cairo-1.0.4 b/x11-libs/cairo/files/digest-cairo-1.0.4
new file mode 100644
index 000000000000..cb0dba37b278
--- /dev/null
+++ b/x11-libs/cairo/files/digest-cairo-1.0.4
@@ -0,0 +1,3 @@
+MD5 9002b0e69b3f94831a22d3f2a7735ce2 cairo-1.0.4.tar.gz 1475777
+RMD160 40403971bcb6ed9cd4379e8e13a52f515db886cb cairo-1.0.4.tar.gz 1475777
+SHA256 2c54f7a452bd21ae99789e36d38135b0ea43e7238648aabd13476d1868dcd2f5 cairo-1.0.4.tar.gz 1475777
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
index 4280484f39cc..c42eb384d799 100644
--- a/x11-libs/cairo/metadata.xml
+++ b/x11-libs/cairo/metadata.xml
@@ -3,14 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <maintainer>
-  <email>latexer@gentoo.org</email>
-  <name>Peter Johanson</name>
-</maintainer>
-<maintainer>
-  <email>twp@gentoo.org</email>
-  <name>Tom Payne</name>
-</maintainer>
-<maintainer>
   <email>cardoe@gentoo.org</email>
   <name>Doug Goldstein</name>
 </maintainer>