dev-cpp/cairomm: Bump to 1.5.0 with build fix for cairo 1.5.14

Package-Manager: portage-2.1.4.4

4 files changed, 96 insertions, 3 deletions

diff --git a/dev-cpp/cairomm/ChangeLog b/dev-cpp/cairomm/ChangeLog
index 0abfa1bb1f04..194d43abc491 100644
--- a/dev-cpp/cairomm/ChangeLog
+++ b/dev-cpp/cairomm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-cpp/cairomm
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/ChangeLog,v 1.23 2007/11/24 15:03:15 jer Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/ChangeLog,v 1.24 2008/03/24 22:08:02 remi Exp $
+
+*cairomm-1.5.0 (24 Mar 2008)
+
+  24 Mar 2008; Rémi Cardona <remi@gentoo.org>
+  +files/cairomm-1.5.0-fix-new-cairo-API.patch, +cairomm-1.5.0.ebuild:
+  Bump to 1.5.0 with build fix for cairo 1.5.14
 
   24 Nov 2007; Jeroen Roovers <jer@gentoo.org> cairomm-1.4.4.ebuild:
   Stable for HPPA (bug #198845).
diff --git a/dev-cpp/cairomm/Manifest b/dev-cpp/cairomm/Manifest
index 42d824f1cb25..f11c57e1cc14 100644
--- a/dev-cpp/cairomm/Manifest
+++ b/dev-cpp/cairomm/Manifest
@@ -1,6 +1,9 @@
+AUX cairomm-1.5.0-fix-new-cairo-API.patch 1509 RMD160 2ba961b7a08893884bcffca3262080f8ae6548d8 SHA1 e7d41d97b14a11a905746c9c0e9c32bcac490fa6 SHA256 5d34202fcb73282614325f8b8730ed9a6c3df13180f867cdad195432a1553975
 DIST cairomm-1.2.4.tar.gz 580871 RMD160 1e7b84c77a2144f8665195e07f6bd52337794233 SHA1 dca12f7d4f90812a9cc1c85dcc5652ec24c5eeef SHA256 a137ccd4a6cde6c9e9553966534702d2e7f6f44c755dfe128d9fb26ed2697fe7
 DIST cairomm-1.4.4.tar.gz 677392 RMD160 42f9320a102a4a61029d6099aade6550befefca9 SHA1 5e0411a67d8f427a7fb514f27b8d15298f6dffe6 SHA256 ec9a3d12ead9320f2caacf97bf7fb25b7386ed08de9f197b44cab16454b95aae
+DIST cairomm-1.5.0.tar.gz 795563 RMD160 4ff18c2a682c7699c9e85442fef3b7eb2ee7122a SHA1 0f64532c11f1999cb4c22edd1ecb96242051f167 SHA256 32d787171e91459de86dbdeff47f8d18505135f571a0b8aa88b65a2b8a63d7d5
 EBUILD cairomm-1.2.4.ebuild 1057 RMD160 4266a0d18eb0b046df707ffd0494c31e63b127f7 SHA1 1af5cf440e824d76c199e4e1cf2c6368c0e08d73 SHA256 9d74b7f3762f3da43db384ed16c02b5ea2a5cf46803c2d28005550ce09d83c2d
 EBUILD cairomm-1.4.4.ebuild 1057 RMD160 ab00ab652728bc0f85fd39fee01aacf7a9ff38c8 SHA1 6cb3385f1c659211ba46a6ca2b8349a0fe87a6be SHA256 08488a2622be84fea80baa69caa480bf9b12fa4c5e6b50828f54876c51450b61
-MISC ChangeLog 2682 RMD160 34afad2c50324666462cb1b980474d5f576ca8a7 SHA1 53f97dfc14f555572fb57d2301fc3e9f2107c66d SHA256 0fc908b7cb841bed8702473bffe83d286c24b382c1801231bb6cf788bb4c7fcf
+EBUILD cairomm-1.5.0.ebuild 1165 RMD160 692f93e21beff822d41ef20c24d4445db554b13c SHA1 44640180ee1b9cdb510cc19b6c90285c5d66f49e SHA256 ed11a36a933d7c66bcbd0234c25ec36e855f65147cfb09bf927673d87eb7a0ec
+MISC ChangeLog 2880 RMD160 9d0c89c28984241d7c141540d832163a7ef5d639 SHA1 44c3fd45e0d108b7e3338f9c2078545b65fb1441 SHA256 889ec8a06da656982018f8805d70226d1e8be3fff05023e0d7cb7d918601c50a
 MISC metadata.xml 208 RMD160 b54aac1a2550226c8ff1ee6aa33f42311586e77f SHA1 a818eb4c8668033af53b806b9fa9b31fe7c8ae6b SHA256 69ef7f5652bec39fc0f3997de5517448b92d43ba6236e14492c70abcd67b5d9b
diff --git a/dev-cpp/cairomm/cairomm-1.5.0.ebuild b/dev-cpp/cairomm/cairomm-1.5.0.ebuild
new file mode 100644
index 000000000000..d88bed669987
--- /dev/null
+++ b/dev-cpp/cairomm/cairomm-1.5.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-cpp/cairomm/cairomm-1.5.0.ebuild,v 1.1 2008/03/24 22:08:02 remi Exp $
+
+inherit eutils
+
+DESCRIPTION="C++ bindings for the Cairo vector graphics library"
+HOMEPAGE="http://cairographics.org/"
+SRC_URI="http://cairographics.org/releases/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc examples"
+
+RDEPEND=">=x11-libs/cairo-1.5.14"
+DEPEND="${RDEPEND}
+		doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# backport from git HEAD to fix build issue with cairo 1.5.14
+	epatch "${FILESDIR}/${PN}-1.5.0-fix-new-cairo-API.patch" || die "patch failed"
+
+	if ! use examples; then
+		# don't waste time building the examples
+		sed -i 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' Makefile.in || die "sed failed"
+	fi
+}
+
+src_compile() {
+	econf $(use_enable doc docs) || die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+
+	if use examples; then
+		dodoc examples
+	fi
+}
diff --git a/dev-cpp/cairomm/files/cairomm-1.5.0-fix-new-cairo-API.patch b/dev-cpp/cairomm/files/cairomm-1.5.0-fix-new-cairo-API.patch
new file mode 100644
index 000000000000..45467cd233c9
--- /dev/null
+++ b/dev-cpp/cairomm/files/cairomm-1.5.0-fix-new-cairo-API.patch
@@ -0,0 +1,40 @@
+From: Murray Cumming <murrayc@murrayc.com>
+Date: Sun, 23 Mar 2008 10:19:54 +0000 (+0100)
+Subject: 2008-03-23  Murray Cumming  <murrayc@murrayc.com>
+X-Git-Url: http://gitweb.cairographics.org/?p=cairomm.git;a=commitdiff;h=56d68c7dda87aaf7da08a64e8640222654b6ab22
+
+2008-03-23  Murray Cumming  <murrayc@murrayc.com>
+
+        * cairomm/enums.h (FONT_TYPE_ATSUI, FONT_TYPE_QUARTZ):
+        Change the definition of FONT_TYPE_ATSUI from CAIRO_FONT_TYPE_ATSUI to
+        CAIRO_FONT_TYPE_QUARTZ (the same numerical value) and document it as
+        deprecated. The others should be documented too.
+        Added FONT_TYPE_QUARTZ.
+---
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,11 @@
++2008-03-23  Murray Cumming  <murrayc@murrayc.com>
++
++	* cairomm/enums.h (FONT_TYPE_ATSUI, FONT_TYPE_QUARTZ):
++	Change the definition of FONT_TYPE_ATSUI from CAIRO_FONT_TYPE_ATSUI to 
++	CAIRO_FONT_TYPE_QUARTZ (the same numerical value) and document it as 
++	deprecated. The others should be documented too.
++	Added FONT_TYPE_QUARTZ.
++
+ == 1.5.0 ==
+ 
+ 2008-03-10  Jonathon Jongsma  <jjongsma@gnome.org>
+--- a/cairomm/enums.h
++++ b/cairomm/enums.h
+@@ -192,7 +192,8 @@ typedef enum
+     FONT_TYPE_TOY = CAIRO_FONT_TYPE_TOY,
+     FONT_TYPE_FT = CAIRO_FONT_TYPE_FT,
+     FONT_TYPE_WIN32 = CAIRO_FONT_TYPE_WIN32,
+-    FONT_TYPE_ATSUI = CAIRO_FONT_TYPE_ATSUI
++    FONT_TYPE_ATSUI = CAIRO_FONT_TYPE_QUARTZ, /**< @deprecated Use FONT_TYPE_QUARTZ instead. */
++    FONT_TYPE_QUARTZ = CAIRO_FONT_TYPE_QUARTZ
+ } FontType;
+ 
+ } // namespace Cairo