Clean up old revisions.

(Portage version: 2.2.0_alpha166/cvs/Linux x86_64, signed Manifest commit with key C6085806)

5 files changed, 7 insertions, 226 deletions

diff --git a/x11-libs/colord-gtk/ChangeLog b/x11-libs/colord-gtk/ChangeLog
index 1275e40e1644..8f59bc929f52 100644
--- a/x11-libs/colord-gtk/ChangeLog
+++ b/x11-libs/colord-gtk/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/colord-gtk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/ChangeLog,v 1.20 2013/03/28 16:02:06 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/ChangeLog,v 1.21 2013/03/30 17:16:01 eva Exp $
+
+  30 Mar 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/colord-gtk-0.1.22-automagic-vala.patch,
+  -files/colord-gtk-0.1.22-includes-1.patch,
+  -files/colord-gtk-0.1.22-includes-2.patch, -colord-gtk-0.1.23.ebuild:
+  Clean up old revisions.
 
   28 Mar 2013; Agostino Sarubbo <ago@gentoo.org> colord-gtk-0.1.23.ebuild:
   Stable for arm, wrt bug #458984
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild
deleted file mode 100644
index 79dccba67074..000000000000
--- a/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2013 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.23.ebuild,v 1.8 2013/03/28 16:02:06 ago Exp $
-
-EAPI="4"
-VALA_MIN_API_VERSION="0.14"
-VALA_USE_DEPEND="vapigen"
-
-inherit autotools eutils vala
-
-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 ~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? ( $(vala_depend) )"
-
-RESTRICT="test" # Tests need a display device with a default color profile set
-
-src_prepare() {
-	use vala && vala_src_prepare
-
-	# https://bugs.freedesktop.org/show_bug.cgi?id=55464
-	epatch "${FILESDIR}/${PN}-0.1.22-automagic-vala.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable doc gtk-doc) \
-		$(use_enable introspection) \
-		$(use_enable vala)
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-automagic-vala.patch b/x11-libs/colord-gtk/files/colord-gtk-0.1.22-automagic-vala.patch
deleted file mode 100644
index 5e7519fc7bba..000000000000
--- a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-automagic-vala.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 09cfb7f14f3766c80137a00586579dd2280ffe65 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Fri, 10 Aug 2012 14:34:03 -0400
-Subject: [PATCH] Make vala bindings non-automagic
-
----
- configure.ac |    8 ++++++--
- 1 files changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index b51b7d2..e174c4b 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -134,7 +134,9 @@ PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2)
- dnl ---------------------------------------------------------------------------
- dnl - Build VALA support
- dnl ---------------------------------------------------------------------------
--if test x$found_introspection != xno; then
-+AC_ARG_ENABLE(vala, AS_HELP_STRING([--enable-vala],[build vala bindings]),
-+	      enable_vala=$enableval,enable_vala=no)
-+if test x$found_introspection != xno -a x$enable_vala != xno; then
- 	AC_PATH_PROG([VAPIGEN], [vapigen], [])
- 	if test "x$VAPIGEN" = "x"; then
- 		has_vapigen="no"
-@@ -144,7 +146,9 @@ if test x$found_introspection != xno; then
- 	fi
- else
- 	has_vapigen="no"
--	AC_MSG_WARN([Not introspection found, will not build Vala binding])
-+	if test x$found_introspection = xno; then
-+		AC_MSG_WARN([introspection not found, will not build Vala binding])
-+	fi
- fi
- AM_CONDITIONAL(HAVE_VAPIGEN, [test "x$has_vapigen" = "xyes"])
- 
--- 
-1.7.8.6
-
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
deleted file mode 100644
index abf9ba1f2a37..000000000000
--- a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-1.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-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
deleted file mode 100644
index e27a650a7718..000000000000
--- a/x11-libs/colord-gtk/files/colord-gtk-0.1.22-includes-2.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
-