From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id E9FB31385EC for ; Tue, 22 Jan 2013 08:12:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A06C821C036; Tue, 22 Jan 2013 08:12:39 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E7AFA21C036 for ; Tue, 22 Jan 2013 08:12:38 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A1C2733DAC6 for ; Tue, 22 Jan 2013 08:12:37 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 01066E4073 for ; Tue, 22 Jan 2013 08:12:35 +0000 (UTC) From: "Alexandre Rostovtsev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Rostovtsev" Message-ID: <1358841351.1c85dc6579f92783c1f30e5c560b1be1144a5db1.tetromino@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/files/, x11-misc/colord/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-misc/colord/colord-9999.ebuild x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch x11-misc/colord/files/colord-0.1.26-fix-automagic-systemd.patch x11-misc/colord/metadata.xml X-VCS-Directories: x11-misc/colord/files/ x11-misc/colord/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 1c85dc6579f92783c1f30e5c560b1be1144a5db1 X-VCS-Branch: master Date: Tue, 22 Jan 2013 08:12:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7060a8e1-b242-44c9-a3cb-6208094e8f18 X-Archives-Hash: 3bf5523f83a152015d42646d2e77e513 commit: 1c85dc6579f92783c1f30e5c560b1be1144a5db1 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Tue Jan 22 07:55:51 2013 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Tue Jan 22 07:55:51 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=1c85dc65 x11-misc/colord: sync with gx86 --- x11-misc/colord/colord-9999.ebuild | 65 +++++++++++--------- .../files/colord-0.1.11-fix-automagic-vala.patch | 26 -------- .../colord-0.1.15-fix-automagic-libgusb.patch | 33 ---------- .../colord-0.1.26-fix-automagic-systemd.patch | 40 ++++++++++++ x11-misc/colord/metadata.xml | 14 ++-- 5 files changed, 82 insertions(+), 96 deletions(-) diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-9999.ebuild index 9b30db3..eac06ce 100644 --- a/x11-misc/colord/colord-9999.ebuild +++ b/x11-misc/colord/colord-9999.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" VALA_MIN_API_VERSION="0.18" VALA_USE_DEPEND="vapigen" -inherit autotools bash-completion-r1 eutils user systemd base toolchain-funcs vala +inherit autotools bash-completion-r1 check-reqs eutils user systemd base udev vala if [[ ${PV} = 9999 ]]; then GCONF_DEBUG="no" inherit gnome2-live # need all the hacks from gnome2-live_src_prepare @@ -20,63 +20,67 @@ else SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz" fi -LICENSE="GPL-2" -SLOT="0" +LICENSE="GPL-2+" +SLOT="0/1" # subslot = libcolord soname version if [[ ${PV} = 9999 ]]; then KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" fi -IUSE="doc examples +gusb +introspection scanner +udev vala" +IUSE="doc examples extra-print-profiles +gusb +introspection systemd +udev vala" REQUIRED_USE="vala? ( introspection )" COMMON_DEPEND=" - dev-db/sqlite:3 + dev-db/sqlite:3= >=dev-libs/glib-2.28.0:2 - >=media-libs/lcms-2.2:2 + >=media-libs/lcms-2.2:2= >=sys-auth/polkit-0.103 gusb? ( >=dev-libs/libgusb-0.1.1 ) introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) - scanner? ( media-gfx/sane-backends ) - udev? ( virtual/udev[gudev] ) -" + systemd? ( >=sys-apps/systemd-44 ) + udev? ( virtual/udev:=[gudev] )" RDEPEND="${COMMON_DEPEND} - media-gfx/shared-color-profiles" + !media-gfx/shared-color-profiles" DEPEND="${COMMON_DEPEND} dev-libs/libxslt - >=dev-util/gtk-doc-am-1.9 >=dev-util/intltool-0.35 >=sys-devel/gettext-0.17 virtual/pkgconfig - doc? ( app-text/docbook-xml-dtd:4.1.2 ) + doc? ( + app-text/docbook-xml-dtd:4.1.2 + >=dev-util/gtk-doc-1.9 ) + extra-print-profiles? ( media-gfx/argyllcms ) vala? ( $(vala_depend) ) " if [[ ${PV} =~ 9999 ]]; then # Needed for generating man pages, not needed for tarballs DEPEND="${DEPEND} - app-text/docbook-sgml-utils - doc? ( >=dev-util/gtk-doc-1.9 )" + >=dev-util/gtk-doc-am-1.9 + app-text/docbook-sgml-utils" fi # FIXME: needs pre-installed dbus service files RESTRICT="test" -DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO) +# According to upstream comment in colord.spec.in, building the extra print +# profiles requires >=4G of memory +CHECKREQS_MEMORY="4G" + +pkg_pretend() { + use extra-print-profiles && check-reqs_pkg_pretend +} pkg_setup() { + use extra-print-profiles && check-reqs_pkg_setup enewgroup colord enewuser colord -1 -1 /var/lib/colord colord } src_prepare() { - # https://bugs.freedesktop.org/show_bug.cgi?id=55464 - epatch "${FILESDIR}/${PN}-0.1.11-fix-automagic-vala.patch" - - # https://bugs.freedesktop.org/show_bug.cgi?id=55465 - epatch "${FILESDIR}/${PN}-0.1.15-fix-automagic-libgusb.patch" + use vala && vala_src_prepare + epatch "${FILESDIR}/${PN}-0.1.26-fix-automagic-systemd.patch" eautoreconf - use vala && vala_src_prepare } src_configure() { @@ -89,11 +93,14 @@ src_configure() { --with-daemon-user=colord \ --localstatedir="${EPREFIX}"/var \ $(use_enable doc gtk-doc) \ + $(use_enable extra-print-profiles print-profiles) \ + $(usex extra-print-profiles COLPROF="$(type -P argyll-colprof)" "") \ $(use_enable gusb) \ $(use_enable gusb reverse) \ $(use_enable introspection) \ - $(use_enable scanner sane) \ + $(use_enable systemd libsystemd-login) \ $(use_enable udev gudev) \ + --with-udevrulesdir="$(udev_get_udevdir)"/rules.d \ $(use_enable vala) \ "$(systemd_with_unitdir)" @@ -102,10 +109,8 @@ src_configure() { } src_install() { - local udevdir=/lib/udev - use udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)" - - base_src_install udevrulesdir="${udevdir}"/rules.d + DOCS=(AUTHORS ChangeLog MAINTAINERS NEWS README TODO) + default newbashcomp client/colormgr-completion.bash colormgr rm -vr "${ED}etc/bash_completion.d" @@ -120,5 +125,5 @@ src_install() { doins examples/*.c fi - prune_libtool_files --all + prune_libtool_files --modules } diff --git a/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch b/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch deleted file mode 100644 index 6f33190..0000000 --- a/x11-misc/colord/files/colord-0.1.11-fix-automagic-vala.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -ur colord-0.1.11//configure.ac colord-0.1.11.new//configure.ac ---- colord-0.1.11//configure.ac 2011-08-01 14:25:25.000000000 +0530 -+++ colord-0.1.11.new//configure.ac 2011-08-14 18:55:45.560334275 +0530 -@@ -218,8 +218,10 @@ - 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" - AC_MSG_WARN([vapigen not found, will not build Vala binding]) -@@ -228,7 +230,9 @@ - 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"]) - diff --git a/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch b/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch deleted file mode 100644 index 8c7e933..0000000 --- a/x11-misc/colord/files/colord-0.1.15-fix-automagic-libgusb.patch +++ /dev/null @@ -1,33 +0,0 @@ -From db63bbbe6a3d925644401ba001b8e84a84d19369 Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev -Date: Sun, 27 Nov 2011 01:33:55 -0500 -Subject: [PATCH] Make libgusb dependency non-automagic - ---- - configure.ac | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4732921..65abf67 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -126,11 +126,13 @@ dnl --------------------------------------------------------------------------- - dnl - Check library dependencies - dnl --------------------------------------------------------------------------- - PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.28.0 gobject-2.0 gthread-2.0 gio-2.0 >= 2.25.9 gio-unix-2.0 gmodule-2.0) --PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1, have_gusb=yes, have_gusb=no) --if test x$have_gusb = xyes; then -+AC_ARG_ENABLE(gusb, AS_HELP_STRING([--enable-gusb],[Enable GUSB support]), -+ enable_gusb=$enableval, enable_gusb=yes) -+if test x$enable_gusb != xno; then -+ PKG_CHECK_MODULES(GUSB, gusb >= 0.1.1) - AC_DEFINE(HAVE_GUSB,1,[whether gusb is available]) - fi --AM_CONDITIONAL(HAVE_GUSB, test x$have_gusb = xyes) -+AM_CONDITIONAL(HAVE_GUSB, test x$enable_gusb = xyes) - - PKG_CHECK_MODULES(LCMS, lcms2 >= 2.2, has_new_lcms=yes, has_new_lcms=no) - if test x$has_new_lcms = xyes; then --- -1.7.8.rc3 - diff --git a/x11-misc/colord/files/colord-0.1.26-fix-automagic-systemd.patch b/x11-misc/colord/files/colord-0.1.26-fix-automagic-systemd.patch new file mode 100644 index 0000000..50d3027 --- /dev/null +++ b/x11-misc/colord/files/colord-0.1.26-fix-automagic-systemd.patch @@ -0,0 +1,40 @@ +From 2847b6fa7c88e34916da19fbd46604f90b51023a Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Wed, 19 Dec 2012 23:50:23 -0500 +Subject: [PATCH] Fix automagic dep on libsystemd-login + +Just because it's installed doesn't mean we want to use it. +--- + configure.ac | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ef0df5b..4da2055 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -177,17 +177,14 @@ if test "x$with_systemdsystemunitdir" != "xno"; then + fi + AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"]) + +-PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, +- [libsystemd-login >= 44], +- have_libsystemd_login=yes, +- have_libsystemd_login=no) +-AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$have_libsystemd_login = xyes) +-if test "x$have_libsystemd_login" = "xyes"; then ++AC_ARG_ENABLE(libsystemd-login, AS_HELP_STRING([--enable-libsystemd-login],[Enable libsystemd-login support]), ++ enable_libsystemd_login=$enableval, enable_libsystemd_login=yes) ++if test x$enable_libsystemd_login != xno; then ++ PKG_CHECK_MODULES(LIBSYSTEMD_LOGIN, [libsystemd-login >= 44]) + AC_DEFINE([HAVE_LIBSYSTEMD_LOGIN], 1, [Define to 1 if libsystemd-login is available]) + fi ++AM_CONDITIONAL(HAVE_LIBSYSTEMD_LOGIN, test x$enable_libsystemd_login = xyes) + AC_SUBST(HAVE_LIBSYSTEMD_LOGIN) +-AC_SUBST(LIBSYSTEMD_LOGIN_CFLAGS) +-AC_SUBST(LIBSYSTEMD_LOGIN_LIBS) + + dnl --------------------------------------------------------------------------- + dnl - Where to install udev rules +-- +1.8.0.2 + diff --git a/x11-misc/colord/metadata.xml b/x11-misc/colord/metadata.xml index 9840b90..5954305 100644 --- a/x11-misc/colord/metadata.xml +++ b/x11-misc/colord/metadata.xml @@ -1,12 +1,12 @@ - gnome - - Enable dev-libs/libgusb support, needed for + gnome + + Generate extra print profiles. + Warning: significant build time and memory requirements. + Enable dev-libs/libgusb support, needed for colorimeter drivers - Use dev-libs/gobject-introspection - for introspection - Generate bindings for dev-lang/vala - + Generate bindings for dev-lang/vala +