0.1.23 stable on x86. 0.2.0 fix LICENSE. Bug # 73489.

5 files changed, 19 insertions, 15 deletions

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index 4a677b9d30e5..c5cf61a03bb7 100644
--- a/x11-libs/cairo/ChangeLog
+++ b/x11-libs/cairo/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-libs/cairo
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.17 2004/12/05 21:06:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.18 2004/12/06 09:14:38 twp Exp $
+
+  06 Dec 2004; Tom Payne <twp@gentoo.org> cairo-0.1.23-r1.ebuild,
+  cairo-0.1.23.ebuild, cairo-0.2.0.ebuild:
+  0.1.23 stable on x86. 0.2.0 fix LICENSE. Bug # 73489.
 
   06 Dec 2004; Joseph Jezak <josejx@gentoo.org> cairo-0.1.23-r1.ebuild:
   Marked ppc stable for bug #71653.
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
index a6dac040d0d0..845c27aa1acd 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,13 +1,13 @@
-MD5 77814ee69a64959fa6dcea469ab538ea ChangeLog 2284
-MD5 8b240094a8ab1b6810c7923d76852e4c cairo-0.2.0.ebuild 882
 MD5 d4e211954babfeb40462b9c949020e9b cairo-0.1.18-r1.ebuild 749
-MD5 95fa541ab44b2909c0c919ed9d389971 cairo-0.1.23.ebuild 823
-MD5 b424f928af676cf2eace4d4ec8402e4c cairo-0.1.23-r1.ebuild 806
-MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 689228be985cf5f9f1dc7143fefcea0b cairo-0.1.23.ebuild 823
+MD5 bf5ccca0b4268b6a83936b2cb47e26bd cairo-0.1.23-r1.ebuild 802
 MD5 91b41b996daa4abb26ae5f8a6727d0e3 cairo-0.1.18.ebuild 780
-MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18-r1 64
+MD5 2d3e5d34f8ba0a00572d24bec6b72c6c cairo-0.2.0.ebuild 902
+MD5 b1fb8c2f36ddd39a87546a2bcb28ae3d ChangeLog 2447
+MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151
 MD5 ee0e0ddbf61c280106ae3683503054a8 files/digest-cairo-0.2.0 63
-MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23-r1 64
 MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18 64
-MD5 cd449933066600e3ac62fa22651a8120 files/xrender.pc 151
 MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23 64
+MD5 ce64bb341c4f80c6670a57f62c3fd7af files/digest-cairo-0.1.18-r1 64
+MD5 8045b9ac7481eb952f3c2fdfda944c65 files/digest-cairo-0.1.23-r1 64
diff --git a/x11-libs/cairo/cairo-0.1.23-r1.ebuild b/x11-libs/cairo/cairo-0.1.23-r1.ebuild
index cfa377accbe3..b2d100946e9f 100644
--- a/x11-libs/cairo/cairo-0.1.23-r1.ebuild
+++ b/x11-libs/cairo/cairo-0.1.23-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.7 2004/12/05 21:06:55 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23-r1.ebuild,v 1.8 2004/12/06 09:14:38 twp Exp $
 
 DESCRIPTION="A vector graphics library with cross-device output support"
 HOMEPAGE="http://cairographics.org/"
@@ -8,7 +8,7 @@ SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ppc ~sparc x86"
 IUSE=""
 
 DEPEND="virtual/x11
diff --git a/x11-libs/cairo/cairo-0.1.23.ebuild b/x11-libs/cairo/cairo-0.1.23.ebuild
index 6fcf5692c389..d87421fa6794 100644
--- a/x11-libs/cairo/cairo-0.1.23.ebuild
+++ b/x11-libs/cairo/cairo-0.1.23.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 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.ebuild,v 1.9 2004/09/10 19:35:21 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.1.23.ebuild,v 1.10 2004/12/06 09:14:38 twp 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="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ~ppc ~amd64 ~sparc"
 IUSE=""
 DEPEND="virtual/x11
 	!>=x11-base/xfree-4.3.0-r7
diff --git a/x11-libs/cairo/cairo-0.2.0.ebuild b/x11-libs/cairo/cairo-0.2.0.ebuild
index deec2ed0583e..b66f4be6cba5 100644
--- a/x11-libs/cairo/cairo-0.2.0.ebuild
+++ b/x11-libs/cairo/cairo-0.2.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2004 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.ebuild,v 1.1 2004/12/05 16:57:17 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-0.2.0.ebuild,v 1.2 2004/12/06 09:14:38 twp 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"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE="glitz png"