x11-misc/colord: 0.1.10 → 0.1.11

Version bump with introspection support (bringing an automagic vala
build-time dep, unfortunately). Update the homepage.

3 files changed, 20 insertions, 19 deletions

diff --git a/x11-misc/colord/Manifest b/x11-misc/colord/Manifest
index 90251a9c..767a6cb3 100644
--- a/x11-misc/colord/Manifest
+++ b/x11-misc/colord/Manifest
@@ -1,3 +1,3 @@
-DIST colord-0.1.10.tar.xz 417348 RMD160 f5ee480a70938ce8d769875e5fd797fb18eb019c SHA1 4ceb743fd30458a3589f1001aed7fc0c083db30a SHA256 8469cabb77e6ce99eef9fa9292eeab9c11c7232593af12bf1560303e4f5198df
-EBUILD colord-0.1.10.ebuild 1908 RMD160 59bea1ce580290d66692af4c33f4722c52b365c3 SHA1 7def27605b07dc1a068f1f93ddc16316718706e3 SHA256 1bfd67e199f08b811b5cfcef521b45a2471e727db2b98fe90cd224d159ba6baf
-EBUILD colord-9999.ebuild 2211 RMD160 f7ce68f2cdff257dce3fd140b1c256236693d7c1 SHA1 d445a44751c002643cc32ec000d583074deae9f6 SHA256 0e69c14b17768eed7a41511c200482ee12f7dae182cda697fa40f9be206c9acc
+DIST colord-0.1.11.tar.xz 470308 RMD160 58fa3d774197d62812eb4f55002b6e3c414a334b SHA1 b0d686b0adf8dcd737e03b3c8f28582532eee208 SHA256 f30e5a8838b5c15eab7cdde2670e238afe28fc673e4ade7ed6954175f8509799
+EBUILD colord-0.1.11.ebuild 2178 RMD160 5d00651c9820f8afc823109808b886949aab0ded SHA1 02bb8690bdcc86fff87c6e9683a596d34e98219a SHA256 d11313fe19b0f5eeed8e2fff96ebecb1440e7cd3536b21b99fdf8e6fe4406adb
+EBUILD colord-9999.ebuild 2178 RMD160 5d00651c9820f8afc823109808b886949aab0ded SHA1 02bb8690bdcc86fff87c6e9683a596d34e98219a SHA256 d11313fe19b0f5eeed8e2fff96ebecb1440e7cd3536b21b99fdf8e6fe4406adb
diff --git a/x11-misc/colord/colord-0.1.10.ebuild b/x11-misc/colord/colord-0.1.11.ebuild
index 8f6a1682..e966c19d 100644
--- a/x11-misc/colord/colord-0.1.10.ebuild
+++ b/x11-misc/colord/colord-0.1.11.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://colord.hughsie.com/"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://gitorious.org/colord/master.git"
 else
@@ -25,7 +25,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="doc examples scanner +udev"
+IUSE="doc examples +introspection scanner +udev"
 
 # XXX: raise to libusb-1.0.9:1 when available
 COMMON_DEPEND="
@@ -34,11 +34,13 @@ COMMON_DEPEND="
 	>=dev-libs/libusb-1.0.8:1
 	>=media-libs/lcms-2.2:2
 	>=sys-auth/polkit-0.97
+	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
 	scanner? ( media-gfx/sane-backends )
 	udev? ( || ( sys-fs/udev[gudev] sys-fs/udev[extras] ) )
 "
 RDEPEND="${COMMON_DEPEND}
 	media-gfx/shared-color-profiles"
+# XXX: automagic build-time vala dependency if USE=introspection
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-sgml-utils
 	dev-libs/libxslt
@@ -49,6 +51,7 @@ DEPEND="${COMMON_DEPEND}
 		app-text/docbook-xml-dtd:4.1.2
 		>=dev-util/gtk-doc-1.9
 	)
+	introspection? ( dev-lang/vala:0.12 )
 "
 
 # FIXME: needs pre-installed dbus service files
@@ -63,8 +66,10 @@ src_configure() {
 		--enable-polkit \
 		--enable-reverse \
 		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
 		$(use_enable scanner sane) \
-		$(use_enable udev gudev)
+		$(use_enable udev gudev) \
+		VAPIGEN=$(type -p vapigen-0.12)
 	# parallel make fails in doc/api
 	use doc && MAKEOPTS=-j1
 }
@@ -80,5 +85,5 @@ src_install() {
 		doins examples/*.c
 	fi
 
-	find "${D}" -name "*.la" -delete
+	find "${D}" -name "*.la" -delete || die
 }
diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild
index 5acd5341..e966c19d 100644
--- a/x11-misc/colord/colord-9999.ebuild
+++ b/x11-misc/colord/colord-9999.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 DESCRIPTION="System service to accurately color manage input and output devices"
-HOMEPAGE="http://colord.hughsie.com/"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
 if [[ ${PV} = 9999 ]]; then
 	EGIT_REPO_URI="git://gitorious.org/colord/master.git"
 else
@@ -25,7 +25,7 @@ if [[ ${PV} = 9999 ]]; then
 else
 	KEYWORDS="~amd64 ~x86"
 fi
-IUSE="doc examples +introspection scanner +udev vala"
+IUSE="doc examples +introspection scanner +udev"
 
 # XXX: raise to libusb-1.0.9:1 when available
 COMMON_DEPEND="
@@ -40,6 +40,7 @@ COMMON_DEPEND="
 "
 RDEPEND="${COMMON_DEPEND}
 	media-gfx/shared-color-profiles"
+# XXX: automagic build-time vala dependency if USE=introspection
 DEPEND="${COMMON_DEPEND}
 	app-text/docbook-sgml-utils
 	dev-libs/libxslt
@@ -50,7 +51,7 @@ DEPEND="${COMMON_DEPEND}
 		app-text/docbook-xml-dtd:4.1.2
 		>=dev-util/gtk-doc-1.9
 	)
-	vala? ( dev-lang/vala:0.12 )
+	introspection? ( dev-lang/vala:0.12 )
 "
 
 # FIXME: needs pre-installed dbus service files
@@ -59,21 +60,16 @@ RESTRICT="test"
 DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO)
 
 src_configure() {
-	if use vala; then
-		if use introspection; then
-			export VAPIGEN=$(type -p vapigen-0.12)
-		else
-			ewarn "Vala bindings cannot be built because the introspection USE flag is disabled"
-		fi
-	fi
 	econf \
 		--disable-examples \
 		--disable-static \
 		--enable-polkit \
 		--enable-reverse \
 		$(use_enable doc gtk-doc) \
+		$(use_enable introspection) \
 		$(use_enable scanner sane) \
-		$(use_enable udev gudev)
+		$(use_enable udev gudev) \
+		VAPIGEN=$(type -p vapigen-0.12)
 	# parallel make fails in doc/api
 	use doc && MAKEOPTS=-j1
 }
@@ -89,5 +85,5 @@ src_install() {
 		doins examples/*.c
 	fi
 
-	find "${D}" -name "*.la" -delete
+	find "${D}" -name "*.la" -delete || die
 }