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 1Q77b2-00057b-Tx for garchives@archives.gentoo.org; Tue, 05 Apr 2011 14:51:09 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 820711C060; Tue, 5 Apr 2011 14:50:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 3B4FC1C060 for ; Tue, 5 Apr 2011 14:50:50 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D8BB51B40C8 for ; Tue, 5 Apr 2011 14:50:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 009C080065 for ; Tue, 5 Apr 2011 14:50:49 +0000 (UTC) From: "Gilles Dartiguelongue" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Gilles Dartiguelongue" Message-ID: <68fa669ae6a34f72c0e004fb345722ae33ddcd5d.eva@gentoo> Subject: [gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/ X-VCS-Repository: proj/gnome X-VCS-Files: gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild gnome-base/gnome-desktop/gnome-desktop-9999.ebuild X-VCS-Directories: gnome-base/gnome-desktop/ X-VCS-Committer: eva X-VCS-Committer-Name: Gilles Dartiguelongue X-VCS-Revision: 68fa669ae6a34f72c0e004fb345722ae33ddcd5d Date: Tue, 5 Apr 2011 14:50:49 +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: dd5a33bf55f0a41e5ad4a4e00b22850d commit: 68fa669ae6a34f72c0e004fb345722ae33ddcd5d Author: Gilles Dartiguelongue gentoo org> AuthorDate: Tue Apr 5 14:50:42 2011 +0000 Commit: Gilles Dartiguelongue gentoo org> CommitDate: Tue Apr 5 14:50:42 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D68fa669a gnome-base/gnome-desktop: QAed * Sort DEPEND * Re-enable desktop-docs * Explicitely set internal for pnp.ids (Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --forc= e, signed Manifest commit with key C6085806) --- .../gnome-desktop/gnome-desktop-3.0.0.ebuild | 21 +++++++++-----= ----- gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 1 - 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild b/gnome-= base/gnome-desktop/gnome-desktop-3.0.0.ebuild index 641d07c..077b595 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.0.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"2" +EAPI=3D"3" +GCONF_DEBUG=3D"yes" GNOME2_LA_PUNT=3D"yes" =20 inherit gnome2 @@ -32,28 +33,26 @@ RDEPEND=3D" >=3Dgnome-base/gsettings-desktop-schemas-2.91.92 introspection? ( >=3Ddev-libs/gobject-introspection-0.9.7 )" DEPEND=3D"${RDEPEND} - sys-devel/gettext + ~app-text/docbook-xml-dtd-4.1.2 + >=3Dapp-text/gnome-doc-utils-0.3.2 >=3Ddev-util/intltool-0.40 >=3Ddev-util/pkgconfig-0.9 - >=3Dapp-text/gnome-doc-utils-0.3.2 - doc? ( >=3Ddev-util/gtk-doc-1.4 ) - ~app-text/docbook-xml-dtd-4.1.2 + sys-devel/gettext x11-proto/xproto - >=3Dx11-proto/randrproto-1.2" + >=3Dx11-proto/randrproto-1.2 + doc? ( >=3Ddev-util/gtk-doc-1.4 )" =20 # Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from x= proto # Includes X11/extensions/Xrandr.h that includes randr.h from randrproto= (and # eventually libXrandr shouldn't RDEPEND on randrproto) =20 -DOCS=3D"AUTHORS ChangeLog HACKING NEWS README" - pkg_setup() { + DOCS=3D"AUTHORS ChangeLog HACKING NEWS README" G2CONF=3D"${G2CONF} --disable-scrollkeeper --disable-static - --disable-desktop-docs - --with-pnp-ids-path=3D/usr/share/libgnome-desktop/pnp.ids + --with-pnp-ids-path=3Dinternal --with-gnome-distributor=3DGentoo + $(use_enable doc desktop-docs) $(use_enable introspection)" } - diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-b= ase/gnome-desktop/gnome-desktop-9999.ebuild index c8bf51b..5b7781b 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild @@ -55,4 +55,3 @@ pkg_setup() { --with-gnome-distributor=3DGentoo $(use_enable introspection)" } -