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 5442C138247 for ; Fri, 15 Nov 2013 23:38:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 51EF5E0AC0; Fri, 15 Nov 2013 23:38:25 +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 958F9E0AC0 for ; Fri, 15 Nov 2013 23:38:24 +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 7C45F33F200 for ; Fri, 15 Nov 2013 23:38:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id CBE9DE530A for ; Fri, 15 Nov 2013 23:38:21 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <1384564971.bb3d122c3f1a4298d9b82a26f9d9d1b53806e551.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-extra/gnome-color-manager/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild X-VCS-Directories: gnome-extra/gnome-color-manager/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: bb3d122c3f1a4298d9b82a26f9d9d1b53806e551 X-VCS-Branch: master Date: Fri, 15 Nov 2013 23:38:21 +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: a7aa5fcf-e39b-4490-ab06-8657ca4221d0 X-Archives-Hash: 4d911658575f2de9cb1dc987b292d14e commit: bb3d122c3f1a4298d9b82a26f9d9d1b53806e551 Author: Gilles Dartiguelongue gentoo org> AuthorDate: Sat Nov 16 01:22:51 2013 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Sat Nov 16 01:22:51 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=bb3d122c gnome-extra/gnome-color-manager: 3.8.3 → 3.10.1 --- ...99.ebuild => gnome-color-manager-3.10.1.ebuild} | 26 ++++++---------------- .../gnome-color-manager-9999.ebuild | 10 ++++----- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild similarity index 76% copy from gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild copy to gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild index 8c46988..1941b6b 100644 --- a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild +++ b/gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild @@ -4,23 +4,15 @@ EAPI="5" GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" inherit gnome2 -if [[ ${PV} = 9999 ]]; then - inherit gnome2-live -fi DESCRIPTION="Color profile manager for the GNOME desktop" HOMEPAGE="http://projects.gnome.org/gnome-color-manager/" LICENSE="GPL-2+" SLOT="0" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" -fi +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="clutter packagekit raw" # Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331 @@ -36,17 +28,18 @@ COMMON_DEPEND=" x11-libs/libXrandr >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.90 + >=x11-misc/colord-0.1.34 >=x11-libs/colord-gtk-0.1.20 clutter? ( - >=media-libs/clutter-1.9.11:1.0 + >=media-libs/clutter-1.12:1.0 media-libs/clutter-gtk:1.0 media-libs/mash:0.2 ) packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2 ) " -RDEPEND="${COMMON_DEPEND} - || ( >=x11-misc/colord-0.1.27 media-gfx/shared-color-profiles )" +RDEPEND="${COMMON_DEPEND}" + # docbook-sgml-{utils,dtd:4.1} needed to generate man pages DEPEND="${COMMON_DEPEND} app-text/docbook-sgml-dtd:4.1 @@ -56,23 +49,18 @@ DEPEND="${COMMON_DEPEND} virtual/pkgconfig " -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - app-text/yelp-tools" -fi - # FIXME: run test-suite with files on live file-system RESTRICT="test" src_configure() { # Always enable tests since they are check_PROGRAMS anyway - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" gnome2_src_configure \ --disable-static \ --enable-tests \ $(use_enable clutter) \ $(use_enable packagekit) \ - $(use_enable raw exiv) + $(use_enable raw exiv) \ + ITSTOOL=$(type -P true) } pkg_postinst() { diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild index 8c46988..5dcb208 100644 --- a/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild +++ b/gnome-extra/gnome-color-manager/gnome-color-manager-9999.ebuild @@ -4,7 +4,6 @@ EAPI="5" GCONF_DEBUG="no" -GNOME2_LA_PUNT="yes" inherit gnome2 if [[ ${PV} = 9999 ]]; then @@ -19,7 +18,7 @@ SLOT="0" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" fi IUSE="clutter packagekit raw" @@ -36,17 +35,18 @@ COMMON_DEPEND=" x11-libs/libXrandr >=x11-libs/gtk+-3.3.8:3 >=x11-libs/vte-0.25.1:2.90 + >=x11-misc/colord-0.1.34 >=x11-libs/colord-gtk-0.1.20 clutter? ( - >=media-libs/clutter-1.9.11:1.0 + >=media-libs/clutter-1.12:1.0 media-libs/clutter-gtk:1.0 media-libs/mash:0.2 ) packagekit? ( app-admin/packagekit-base ) raw? ( media-gfx/exiv2 ) " -RDEPEND="${COMMON_DEPEND} - || ( >=x11-misc/colord-0.1.27 media-gfx/shared-color-profiles )" +RDEPEND="${COMMON_DEPEND}" + # docbook-sgml-{utils,dtd:4.1} needed to generate man pages DEPEND="${COMMON_DEPEND} app-text/docbook-sgml-dtd:4.1