From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RBV3I-0006Pj-Az for garchives@archives.gentoo.org; Wed, 05 Oct 2011 17:14:40 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 39EF321C0A0; Wed, 5 Oct 2011 17:14:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0CE4121C0A0 for ; Wed, 5 Oct 2011 17:14:32 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 892D81B4034 for ; Wed, 5 Oct 2011 17:14:32 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 938DA80042 for ; Wed, 5 Oct 2011 17:14:31 +0000 (UTC) From: "Nirbheek Chauhan" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Nirbheek Chauhan" Message-ID: <186519950f1173d2a9c397e80c52cbfb42b1deb9.nirbheek@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: x11-misc/colord/ X-VCS-Repository: proj/gnome X-VCS-Files: x11-misc/colord/colord-0.1.13.ebuild x11-misc/colord/colord-9999.ebuild X-VCS-Directories: x11-misc/colord/ X-VCS-Committer: nirbheek X-VCS-Committer-Name: Nirbheek Chauhan X-VCS-Revision: 186519950f1173d2a9c397e80c52cbfb42b1deb9 Date: Wed, 5 Oct 2011 17:14:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 9db348a0110d34303a7e4c513b1b3441 commit: 186519950f1173d2a9c397e80c52cbfb42b1deb9 Author: Nirbheek Chauhan gentoo org> AuthorDate: Wed Oct 5 15:43:26 2011 +0000 Commit: Nirbheek Chauhan gentoo org> CommitDate: Wed Oct 5 17:14:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D18651995 x11-misc/colord: fix docbook-sgml-utils dependency * Only needed when building from git * Also call gnome2_src_prepare in src_prepare --- x11-misc/colord/colord-0.1.13.ebuild | 2 +- x11-misc/colord/colord-9999.ebuild | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/x11-misc/colord/colord-0.1.13.ebuild b/x11-misc/colord/color= d-0.1.13.ebuild index 3615593..8350c8a 100644 --- a/x11-misc/colord/colord-0.1.13.ebuild +++ b/x11-misc/colord/colord-0.1.13.ebuild @@ -41,7 +41,6 @@ RDEPEND=3D"${COMMON_DEPEND} media-gfx/shared-color-profiles" # Automagic build-time vala dependency if USE=3Dintrospection DEPEND=3D"${COMMON_DEPEND} - app-text/docbook-sgml-utils dev-libs/libxslt >=3Ddev-util/intltool-0.35 dev-util/pkgconfig @@ -67,6 +66,7 @@ src_prepare() { # Ubuntu patch to allow root and at_console to access colord without po= lkit; # this behavior matches upstream default polkit settings. epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patc= h" + gnome2_src_prepare } =20 src_configure() { diff --git a/x11-misc/colord/colord-9999.ebuild b/x11-misc/colord/colord-= 9999.ebuild index 3615593..b4678b8 100644 --- a/x11-misc/colord/colord-9999.ebuild +++ b/x11-misc/colord/colord-9999.ebuild @@ -41,7 +41,6 @@ RDEPEND=3D"${COMMON_DEPEND} media-gfx/shared-color-profiles" # Automagic build-time vala dependency if USE=3Dintrospection DEPEND=3D"${COMMON_DEPEND} - app-text/docbook-sgml-utils dev-libs/libxslt >=3Ddev-util/intltool-0.35 dev-util/pkgconfig @@ -52,6 +51,11 @@ DEPEND=3D"${COMMON_DEPEND} ) introspection? ( dev-lang/vala:0.14 ) " +if [[ ${PV} =3D~ 9999 ]]; then + # Needed for generating man pages, not needed for tarballs + DEPEND=3D"${DEPEND} + app-text/docbook-sgml-utils" +fi =20 # FIXME: needs pre-installed dbus service files RESTRICT=3D"test" @@ -67,6 +71,7 @@ src_prepare() { # Ubuntu patch to allow root and at_console to access colord without po= lkit; # this behavior matches upstream default polkit settings. epatch "${FILESDIR}/${PN}-0.1.13-use-dbus-security-for-permissions.patc= h" + gnome2_src_prepare } =20 src_configure() {