Fix include guards to prevent gnome-color-manager-3.6 build failure; thanks to Frédéric Romagné for the report.

Package-Manager: portage-2.2.0_alpha122/cvs/Linux x86_64

5 files changed, 205 insertions, 9 deletions

diff --git a/x11-libs/colord-gtk/ChangeLog b/x11-libs/colord-gtk/ChangeLog
index b3226e298e68..2538ee22f529 100644
--- a/x11-libs/colord-gtk/ChangeLog
+++ b/x11-libs/colord-gtk/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-libs/colord-gtk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/ChangeLog,v 1.2 2012/08/22 21:23:32 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/ChangeLog,v 1.3 2012/08/26 02:08:12 tetromino Exp $
+
+*colord-gtk-0.1.22-r1 (26 Aug 2012)
+
+  26 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +colord-gtk-0.1.22-r1.ebuild, +files/colord-gtk-0.1.22-includes-1.patch,
+  +files/colord-gtk-0.1.22-includes-2.patch:
+  Fix include guards to prevent gnome-color-manager-3.6 build failure; thanks
+  to Frédéric Romagné for the report.
 
   22 Aug 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   colord-gtk-0.1.22.ebuild:
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
index 44ae61deccd9..af6058d8bf46 100644
--- a/x11-libs/colord-gtk/Manifest
+++ b/x11-libs/colord-gtk/Manifest
@@ -2,18 +2,21 @@
 Hash: SHA256
 
 AUX colord-gtk-0.1.22-automagic-vala.patch 1345 SHA256 d827dea5a6c9d982fae876dd72f34983dde61f255c559fad706bff9343dbbb17 SHA512 d8c7e034680536ae9610053911eeb33e038c1e733ae9866a084a239383adb1383e02384f5d913701e09eee6e0ce0b2af18cf52ed1cf4a627aeef75d3c6ad6da7 WHIRLPOOL 8e696a0f0aa07b37066ab25aba2a5facab79478ebc0ed16c06162250bb945d752fc13745d169ba14a8df1aa4bbc826aba28cf4da7103aa49ae238a34ff45e7d7
+AUX colord-gtk-0.1.22-includes-1.patch 2555 SHA256 b7223ff4d50bb0e11cb3d2117a7a66c6ef2ccb88e48b08e0c697e07b4e8dd414 SHA512 ba862269496f2ca6636f8509ee3c47f65e3a337ef8b7315014febaee3643aba3bad3fed529fdf1b89701b5342c85d380cc3afdcb51e348b2c9205b699d76ce30 WHIRLPOOL 3a35444fdf535690a559b790644673eaec7796d7ef9aa2e1fe7fcb7d05aa8288bc1ebad1762debc658ad9d8d9ab81762ec4c8e54acef4eef29bf45b40bc8edcb
+AUX colord-gtk-0.1.22-includes-2.patch 1289 SHA256 bf9a81ed0850b65c03197c771d346b4f94f6bcbc0086f666cf34ed6caf20be70 SHA512 7ea89cc560792eb1aa3bf7ccc583162d819d6963d32726ba54e2af2cd74d0d6e1cb5c4ffac78f863b12f26ee62fdf208b976771a1988f3014d2e620bebf5e986 WHIRLPOOL d7aab055c361ba7dc8c1ad6206a67ee2bba6424f87f734660c0d6dbead8c09ef8af02fbaa138767f08782336ffd3b0982a92b55d11e5b21968bf794a0766cf38
 DIST colord-gtk-0.1.22.tar.xz 283216 SHA256 d0916d837b44bbe3175917d0e80a08dad2cf2787e09ab4a83e58a88030b66305 SHA512 a4b2b677a38d533a5639e0c747ef83c6aa3d636c7b909238010262a7ba2a5ed3e7cedd28f476ea4f9858fcffe9bb76993433360bfd14908379ca6a7deb45e312 WHIRLPOOL a219cd571859c58eceb1420c4befe2b0a51f2a469d596df9bd9dc0d044e86ab3ab66b6d185150c1a2704548dd430e2e17b66371c25a1b05a5111f387da92f56c
+EBUILD colord-gtk-0.1.22-r1.ebuild 1667 SHA256 80c5d865d9328a2b2353bc392955afe7d48f02cd4a68257cd4c365ea9cb0a1de SHA512 61bd5ce2e072c5c536580d49d707bbd1957ec5be3a61f20f1e1f0a7b4b15688497ab8fbfcbf2c737d4120a8213940e9df780aba8c73f00fbf2541a52747c8b5a WHIRLPOOL de6d01c69690c544f349204d70502f9e6ebd0b9391ff6b95a88069b23cf088f12effed94198287d741fa4bddeb614d21a2f5e58ed384c4f3959b909300f8dbf4
 EBUILD colord-gtk-0.1.22.ebuild 1577 SHA256 186f07bfb9dd5f671578ff7153ce3a37b4ff99ce0850932c7825b17bb8d9f1c7 SHA512 027a2c66d90b4b4f2b014252f6848367e5f8c9f6310a36c551a46093a5bd259ff93855ef2901719401e4191c8f1f3807ca28263b87e3276dbbd939aad07e5cf9 WHIRLPOOL ff71a181453617e5b1e1759f18491e244bcab85a8956bf4474e1d90f399ff094d87aeefdf5eca1e052e4a98819729178e9ce3b8ea1551ddde1b41b8fcbd63015
-MISC ChangeLog 773 SHA256 7cfae0361ef2686f814c26ad8ec3ceee3b82f97c7ad40befffaf082080d70479 SHA512 e79620259c43aec40ac29c7adb0eb3521f76affde49bca7af7869bd06d893efa33708e493b2fd77c63d87f1714d61713928480df436fd93d9fcb8bc5f0b1c1fb WHIRLPOOL 6f011a1aa45b66fa5ff895733eec88f24738752d114ba3715a3e042b0290c5b67dc273c4737677888e57c97fc7274a4bc32299d30f2f1e7078f8674182f7694d
+MISC ChangeLog 1109 SHA256 530b6bfda10c8f52d33e17140d39a473f8be4cecbd0a3375a2d0c7ded94cbdf3 SHA512 d64f82a2dc9691f2d8f2f06b936e40cc9962ede12b28513c28e5cfbf4a1b9be9e7701f40b14588958581e5c0f44686764de77deb9ad8e980597bf2a30243d248 WHIRLPOOL 35dfafae81822ce34024cfe11c6dad4f099cabc5b1e587ff0d847eafd7a3a649a191379550716a16cd975b8f76ca9ef7e7dfd227191ade7167798f40ceada427
 MISC metadata.xml 345 SHA256 37f4e508d835b0f0916cca691c9b6116118ba5ce0d97652097c15d010fb4b8af SHA512 af137d5585337b6d1fe28aa484f3af893cd954b07ad54fcb383e735f8f8779db59fecfd6ab2157b38ddeb589f5b264b5c047824e960b9d6ca648ec2cbaa1a2d4 WHIRLPOOL 43905cd81d45e8400af299946b1d0f22eea9b01186da108614d9fd685bea90de7d0e3f06fb01782c2d9465c75d2f596eb871ae59bfa1936f09d89f9d2aa958b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQNU3aAAoJEJ0WA1zPCt1hSv8IAIGgSuqgpfeyU5oG8mWzsKNB
-jKIiEKlhvOfIpDWncXrM3GulSDW2KRyRREiD+Miq/K1JBEu3fY5mv4HvX1DfCFpr
-vjPrcIwSAko94fQrz5VJYPouH4UNtCJN1gFh8G+BIIU5gHaOmcXs0ih+3POPXHB3
-BIDg1FaRh0kzOkrIFhcb4hXscx4bsyVFcy6GSVcDRsGugCLrxBGPWOcPIFXjiKaM
-WPndoLVOZZlDqE0VcGKxE1QMeOPr++v3RCt1juYWiGDvhKMerbIDAVt2/fGp44pc
-hMBwpOshviCXCaa10SrTxPw54ZmqA1Zl/t7xRLKcBS3V/imB+SjLnnkcV+srbms=
-=fwN/
+iQEcBAEBCAAGBQJQOYUYAAoJEJ0WA1zPCt1hJGYIAIi8YhAGwWbvNRO6kLyBUbZZ
+TZMy0tFF+7UYQhM+h6Wyj7l8dLt6XwBBCCaJ+ZcurGBqPWJOd2BdfjgrWahJ6bDO
+Y8cjtvV8Byk6iK6QJsLNg0o1EWPwj7XKL1xz3YD+Cvor5/xhJLzTobqBtwdapANg
+7FASt08Nl0CUPK86y5AJNyEdz9mMYKvDu7YrH8G9tRwc1qVXIQW3d30idbFLupjG
+JZNAy+/z4aIAgzSsm1KwiSUvHHpm6jl0Pyj4YhSquWJ+YA4O9vSPvPeN6dOAxZrP
+j1llTcoUb3QWp8nZlNb3aDzEWY9i43cuCKlrwbF5TdACYRtpcU3XiTjkCbAwMN8=
+=3u0S
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.22-r1.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.22-r1.ebuild
new file mode 100644
index 000000000000..beeeafdf8c53
--- /dev/null
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.22-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/colord-gtk-0.1.22-r1.ebuild,v 1.1 2012/08/26 02:08:12 tetromino Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="GTK support library for colord"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
+SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND=">=dev-libs/glib-2.28:2
+	>=media-libs/lcms-2.2:2
+	x11-libs/gdk-pixbuf:2[introspection?]
+	x11-libs/gtk+:3[X(+),introspection?]
+	x11-misc/colord[introspection?,vala?]
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )"
+# ${PN} was part of x11-misc/colord until 0.1.22
+RDEPEND="${COMMON_DEPEND}
+	!<x11-misc/colord-0.1.22"
+DEPEND="${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-libs/libxslt
+	>=dev-util/intltool-0.35
+	>=sys-devel/gettext-0.17
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.1.2
+		>=dev-util/gtk-doc-1.9
+	)
+	vala? ( dev-lang/vala:0.14[vapigen] )"
+
+RESTRICT="test" # Tests need a display device with a default color profile set
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-0.1.22-automagic-vala.patch"
+	# Fix include guards, in next release
+	epatch "${FILESDIR}/${P}-includes-"{1,2}.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
+		$(use_enable vala) \
+		VAPIGEN=$(type -P vapigen-0.14)
+}
+
+src_install() {
+	default
+	prune_libtool_files
+}
diff --git a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch b/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch
new file mode 100644
index 000000000000..abf9ba1f2a37
--- /dev/null
+++ b/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch
@@ -0,0 +1,83 @@
+From 71510fc785e440c068cc42dbd294dba5d74eeaff Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Wed, 27 Jun 2012 09:00:15 +0100
+Subject: [PATCH 1/2] Do not reuse __COLORD_H_INSIDE__ as this causes #include
+ insanity
+
+---
+ libcolord-gtk/cd-version.h.in  | 2 +-
+ libcolord-gtk/cd-window-sync.h | 2 +-
+ libcolord-gtk/cd-window.h      | 2 +-
+ libcolord-gtk/colord-gtk.h     | 9 +++------
+ 4 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/libcolord-gtk/cd-version.h.in b/libcolord-gtk/cd-version.h.in
+index 5ad7569..555556a 100644
+--- a/libcolord-gtk/cd-version.h.in
++++ b/libcolord-gtk/cd-version.h.in
+@@ -29,7 +29,7 @@
+  * See also: #CdClient, #CdDevice
+  */
+ 
+-#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION)
++#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
+ #error "Only <colord.h> can be included directly."
+ #endif
+ 
+diff --git a/libcolord-gtk/cd-window-sync.h b/libcolord-gtk/cd-window-sync.h
+index 6afe83b..47b8254 100644
+--- a/libcolord-gtk/cd-window-sync.h
++++ b/libcolord-gtk/cd-window-sync.h
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+  */
+ 
+-#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION)
++#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
+ #error "Only <colord.h> can be included directly."
+ #endif
+ 
+diff --git a/libcolord-gtk/cd-window.h b/libcolord-gtk/cd-window.h
+index 3b993a8..dbdab3e 100644
+--- a/libcolord-gtk/cd-window.h
++++ b/libcolord-gtk/cd-window.h
+@@ -19,7 +19,7 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+  */
+ 
+-#if !defined (__COLORD_H_INSIDE__) && !defined (CD_COMPILATION)
++#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
+ #error "Only <colord-gtk.h> can be included directly."
+ #endif
+ 
+diff --git a/libcolord-gtk/colord-gtk.h b/libcolord-gtk/colord-gtk.h
+index 658ec60..4080667 100644
+--- a/libcolord-gtk/colord-gtk.h
++++ b/libcolord-gtk/colord-gtk.h
+@@ -31,20 +31,17 @@
+ #ifndef __COLORD_GTK_H__
+ #define __COLORD_GTK_H__
+ 
+-#define __COLORD_H_INSIDE__
++#define __COLORD_GTK_H_INSIDE__
+ 
+ #include <gtk/gtk.h>
+-
+ #include <colord.h>
+-//#include <colord/cd-device.h>
+-//#include <colord/cd-profile.h>
+-//#include <colord/cd-color.h>
++
+ #include <colord-gtk/cd-sample-window.h>
+ #include <colord-gtk/cd-version.h>
+ #include <colord-gtk/cd-window.h>
+ #include <colord-gtk/cd-window-sync.h>
+ 
+-#undef __COLORD_H_INSIDE__
++#undef __COLORD_GTK_H_INSIDE__
+ 
+ #endif /* __COLORD_GTK_H__ */
+ 
+-- 
+1.7.12
+
diff --git a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch b/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch
new file mode 100644
index 000000000000..e27a650a7718
--- /dev/null
+++ b/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch
@@ -0,0 +1,41 @@
+From 6c18326f3dc3aeb2b80db167fab5a1001f6bbe4c Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Wed, 27 Jun 2012 09:02:17 +0100
+Subject: [PATCH 2/2] trivial: add include guards to cd-sample-window.h
+
+---
+ libcolord-gtk/cd-sample-window.h | 4 ++++
+ libcolord-gtk/cd-window-sync.h   | 2 +-
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/libcolord-gtk/cd-sample-window.h b/libcolord-gtk/cd-sample-window.h
+index c994409..d95dfbf 100644
+--- a/libcolord-gtk/cd-sample-window.h
++++ b/libcolord-gtk/cd-sample-window.h
+@@ -19,6 +19,10 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
+  */
+ 
++#if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
++#error "Only <colord-gtk.h> can be included directly."
++#endif
++
+ #ifndef __CD_SAMPLE_WINDOW_H
+ #define __CD_SAMPLE_WINDOW_H
+ 
+diff --git a/libcolord-gtk/cd-window-sync.h b/libcolord-gtk/cd-window-sync.h
+index 47b8254..632ab55 100644
+--- a/libcolord-gtk/cd-window-sync.h
++++ b/libcolord-gtk/cd-window-sync.h
+@@ -20,7 +20,7 @@
+  */
+ 
+ #if !defined (__COLORD_GTK_H_INSIDE__) && !defined (CD_COMPILATION)
+-#error "Only <colord.h> can be included directly."
++#error "Only <colord-gtk.h> can be included directly."
+ #endif
+ 
+ #ifndef __CD_WINDOW_SYNC_H
+-- 
+1.7.12
+