Version bump. Update license, switch to global introspection flag. Drop old.

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

4 files changed, 23 insertions, 20 deletions

diff --git a/x11-libs/colord-gtk/ChangeLog b/x11-libs/colord-gtk/ChangeLog
index 53d0b99d66b8..d36b64023140 100644
--- a/x11-libs/colord-gtk/ChangeLog
+++ b/x11-libs/colord-gtk/ChangeLog
@@ -1,6 +1,13 @@
 # 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.5 2012/10/17 23:37:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/ChangeLog,v 1.6 2012/12/20 05:29:57 tetromino Exp $
+
+*colord-gtk-0.1.24 (20 Dec 2012)
+
+  20 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  -colord-gtk-0.1.22-r1.ebuild, colord-gtk-0.1.23.ebuild,
+  +colord-gtk-0.1.24.ebuild, metadata.xml:
+  Version bump. Update license, switch to global introspection flag. Drop old.
 
   17 Oct 2012; Jeroen Roovers <jer@gentoo.org> colord-gtk-0.1.22-r1.ebuild,
   colord-gtk-0.1.23.ebuild:
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild
index beb0657525ed..adc1d102d199 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild
@@ -1,6 +1,6 @@
 # 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.23.ebuild,v 1.2 2012/10/17 23:37:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/colord-gtk-0.1.23.ebuild,v 1.3 2012/12/20 05:29:57 tetromino Exp $
 
 EAPI="4"
 VALA_MIN_API_VERSION="0.14"
@@ -12,7 +12,7 @@ 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"
+LICENSE="LGPL-3+"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE="doc +introspection vala"
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.22-r1.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.24.ebuild
index 5fe001c3b5fa..60634f0f2613 100644
--- a/x11-libs/colord-gtk/colord-gtk-0.1.22-r1.ebuild
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.24.ebuild
@@ -1,26 +1,28 @@
 # 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.2 2012/10/17 23:37:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/colord-gtk/colord-gtk-0.1.24.ebuild,v 1.1 2012/12/20 05:29:57 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
 
-inherit autotools eutils
+inherit 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"
+LICENSE="LGPL-3+"
+SLOT="0/1" # subslot = libcolord-gtk soname version
 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
+	>=media-libs/lcms-2.2:2=
 	x11-libs/gdk-pixbuf:2[introspection?]
 	x11-libs/gtk+:3[X(+),introspection?]
-	x11-misc/colord[introspection?,vala?]
+	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}
@@ -35,15 +37,12 @@ DEPEND="${COMMON_DEPEND}
 		app-text/docbook-xml-dtd:4.1.2
 		>=dev-util/gtk-doc-1.9
 	)
-	vala? ( dev-lang/vala:0.14[vapigen] )"
+	vala? ( $(vala_depend) )"
 
 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
+	use vala && vala_src_prepare
 }
 
 src_configure() {
@@ -51,11 +50,10 @@ src_configure() {
 		--disable-static \
 		$(use_enable doc gtk-doc) \
 		$(use_enable introspection) \
-		$(use_enable vala) \
-		VAPIGEN=$(type -P vapigen-0.14)
+		$(use_enable vala)
 }
 
 src_install() {
 	default
-	prune_libtool_files
+	prune_libtool_files --modules
 }
diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml
index 04ca9f3b1043..b4dbbb90f9f4 100644
--- a/x11-libs/colord-gtk/metadata.xml
+++ b/x11-libs/colord-gtk/metadata.xml
@@ -3,8 +3,6 @@
 <pkgmetadata>
 <herd>gnome</herd>
 <use>
-	<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
-		for introspection</flag>
 	<flag name="vala">Generate bindings for <pkg>dev-lang/vala</pkg></flag>
 </use>
 </pkgmetadata>