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

Package-Manager: portage-2.1.4.4

diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog
index d1a571db70bf43740d2a364831a25ca705875ffa..569a69522a2eb08c410b7fe197f44cf5162f5c79 100644 (file)
--- 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/Manifest b/x11-libs/cairo/Manifest
index 7460679c1ba88f95ef15ac77635ba7603676f922..fd94d8e8b466097b7652befebff4275c703a2ee5 100644 (file)
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,26 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST cairo-1.2.6.tar.gz 2973689 RMD160 4469a661b294e342ee77e726c1cefccd4837ae2e SHA1 b86b4017a9abd565ef11c72b7faee9082a04118f SHA256 7d36449c9a05c2c9b44248b10e9f82f0bca99f30e24848435e65aca77c28b3f9
 DIST cairo-1.4.10.tar.gz 3216689 RMD160 ce1cb025d47ec395577e4f4c6fe5092be85e0cbe SHA1 8371097e30650ec817b24694367110139627403e SHA256 594e78a66044898c321e378d47faf43b665b23ba638834d2787e344ba13e5132
 DIST cairo-1.4.12.tar.gz 3276610 RMD160 5ed65d5872c0561f3392e60007898d9360d83d0a SHA1 45d5257e5a0c1524bcc25660a96b2c79d012ad3f SHA256 a1a1e4ccec8da980141d903adbe83535481b4fda96a479456438d3dfbc767d5d
 DIST cairo-1.4.14.tar.gz 3283608 RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd SHA1 63310243ba8af949060b06c01fc28ee5471ed5a4 SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
 DIST cairo-1.5.10.tar.gz 4229262 RMD160 50ad403ae5a0d683793b0099d297ee8548cfe626 SHA1 8c97a24f3297bade49508d833cf9218f42e88b8c SHA256 b25fd2dad243ab11bcb233ae8bf0ba3a3c567a540349198e6d2fbb8071b60089
-DIST cairo-1.5.6.tar.gz 3433496 RMD160 319b452affacea71b15502a9d461a23bfc93553c SHA1 101382fc6ad2e702f74acf5486a1fea45affa608 SHA256 e6f900f10cec90b905588dff17b3c80b0fab928b93b4cd7520d39b5e3490d2bf
-DIST cairo-1.5.8.tar.gz 3903762 RMD160 085e2c11a2ab9ca03a094a90e9e62d4baa651b7d SHA1 8ab70db0eec1db3b730537d9076ddabf7e0ba537 SHA256 6bfd4a573355a8362cc032483168b3a92d891ae53d166ef03d03ec9fa5e82afd
+DIST cairo-1.5.12.tar.gz 4430802 RMD160 ce6979568b7fbf61549b6e0a48ad36ef3f9ff842 SHA1 f101957fd0fbd76d9f670de95fc2a726b3d93262 SHA256 165e6b605614af7ca39f8755bc9eccc80bf87a540c20505672ac70a9d4f5927d
 EBUILD cairo-1.2.6.ebuild 1647 RMD160 6a36df2bb99acf75696cae5f8b64d42bcf2cc08f SHA1 9238226c12312ac6a1d1f1dc26611514b2b62735 SHA256 5abd3942899a397e3b325c0b6dfa8131d97a790ce3d5d4f86c0c196383bff35c
 EBUILD cairo-1.4.10.ebuild 1967 RMD160 bb67712a3fc0b758d06e99711abd28fec8ba8c5e SHA1 d2d38263a7820a2e2c189ffaa23e9359935af0de SHA256 85f44cf40fa7b551cc8f7515e7c70d375723d67123fd1f859bc94c29d7c54c78
 EBUILD cairo-1.4.12.ebuild 1968 RMD160 64ecf4bd8788e715239de20ed9b8e0b25266258c SHA1 10cd93281e9af9858cd0f61a0708d53681c81afd SHA256 6f25e6e271d47c75deeee9121d25098eb0c6aa25cbdf60349e76d094a4f0d912
 EBUILD cairo-1.4.14.ebuild 1979 RMD160 e02b8f16936817056ed0b9bc3ad92f62a03441fa SHA1 78017dbb2d8e38b903ed94a47a59c6c7c2b1b474 SHA256 56197b3bf132e8f84caece71e62368c7b3481e69458b1ca9597cd7e77200ba3f
 EBUILD cairo-1.5.10.ebuild 2085 RMD160 fb91d441ceac739b65adf44b4ab2789526f2e4ea SHA1 48b91fd8ff6424d28e259f24a91ac83c5f9db8dd SHA256 c7cfa354692029ccc9afecca8f69ee55320bdca3c4ef964bdfeb947c30f6b65c
-EBUILD cairo-1.5.6.ebuild 2084 RMD160 876213a6092b0947de087fa28f4650d18d079782 SHA1 c40573a377a591d2d02707901b2b96375e3e639e SHA256 702d64857a14f26768f2e5922be9f195c93d91d22838ee2800c8c20f27eec6f3
-EBUILD cairo-1.5.8.ebuild 2084 RMD160 9a448890f63c9b82cf384c53140a7ad1df634aeb SHA1 4b5e84f20ac3d0979a1ae2ea81c8ed2a514668f0 SHA256 3832f433f95a3ca1df0588343c547258786ec4aeb789df6accdc0937d493ae1d
-MISC ChangeLog 22829 RMD160 17eb0e74398b47837afe78d96762589aa518419f SHA1 d7ab7dd630ae277cae23999f1aaa84e744f79feb SHA256 35772802a0a33fe3b6d0e7a60a6497e6ed0e88f64c248993855ee34652493cfe
+EBUILD cairo-1.5.12.ebuild 2085 RMD160 23e4b8944273665a179183e04646443cd150c376 SHA1 8f73ba32b899ecb5a5e456892d44aeee773d389e SHA256 95df0be8e1ca044914320093e9955694bd4517c5950b8e2510d5c9bd7f902c7a
+MISC ChangeLog 23052 RMD160 15a83d3544b25fe2fd331a2625f32280697b1054 SHA1 49085698fc6d62e555b8b463d41796bc0b4dac97 SHA256 c872c1cbe4e3342317c94eec117ed20b658f90031f9555ad46d7597663f79c20
 MISC metadata.xml 316 RMD160 d7b0e5cfbeb43dfd4360c0f214cf8c2ac9752639 SHA1 3605a0ef9a0874134e3dbed331719153c1dc9db6 SHA256 5d1733aeedb6ad445d6e54a1dcfcfe822ea57bd010275fc46d9c34cc0c6b9b53
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
-
-iD8DBQFHvY4OoeSe8B0zEfwRAgCnAJ9528jV0ZTxQv7C0k0ZZTabJcMdfACdFhhk
-8OAQQOg5+5zIO8AKeZSe0uA=
-=TNFD
------END PGP SIGNATURE-----

diff --git a/x11-libs/cairo/cairo-1.5.6.ebuild b/x11-libs/cairo/cairo-1.5.12.ebuild
similarity index 94%
rename from x11-libs/cairo/cairo-1.5.6.ebuild
rename to x11-libs/cairo/cairo-1.5.12.ebuild
index 24d7cb36be5f892767f544094ada00755e7e2f40..528a28d975b5f9ec3555c3231209fbf976982c74 100644 (file)
--- 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 (file)
index 5b6a9c5..0000000
--- 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
-}