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 7C6941381F3 for ; Wed, 19 Dec 2012 08:39:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 587ADE06B5; Wed, 19 Dec 2012 08:38:28 +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 8D3A1E06B5 for ; Wed, 19 Dec 2012 08:38:27 +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 7015233DBBE for ; Wed, 19 Dec 2012 08:38:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 6F302E5451 for ; Wed, 19 Dec 2012 08:38:23 +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: <1355906269.6facd47f06d46fac923112cd5dab0b8f8f8f86f4.tetromino@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.6.2.ebuild gnome-base/gnome-desktop/gnome-desktop-9999.ebuild gnome-base/gnome-desktop/metadata.xml X-VCS-Directories: gnome-base/gnome-desktop/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Rostovtsev X-VCS-Revision: 6facd47f06d46fac923112cd5dab0b8f8f8f86f4 X-VCS-Branch: master Date: Wed, 19 Dec 2012 08:38:23 +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: addabf70-b3c1-428a-ad0d-560972916132 X-Archives-Hash: 62fdc92bcade7961364d7f93a739b447 commit: 6facd47f06d46fac923112cd5dab0b8f8f8f86f4 Author: Alexandre Rostovtsev gentoo org> AuthorDate: Wed Dec 19 08:37:40 2012 +0000 Commit: Alexandre Rostovtsev gentoo org> CommitDate: Wed Dec 19 08:37:49 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=6facd47f gnome-base/gnome-desktop: moved to gx86 Sync live ebuild with gx86. Always install license help files. --- .../gnome-desktop/gnome-desktop-3.6.2.ebuild | 106 -------------------- gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 25 +++-- gnome-base/gnome-desktop/metadata.xml | 4 - 3 files changed, 16 insertions(+), 119 deletions(-) diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild deleted file mode 100644 index 338bee2..0000000 --- a/gnome-base/gnome-desktop/gnome-desktop-3.6.2.ebuild +++ /dev/null @@ -1,106 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit eutils gnome2 multilib -if [[ ${PV} = 9999 ]]; then - inherit git-2 gnome2-live -fi - -DESCRIPTION="Libraries for the gnome desktop that are not part of the UI" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" -SLOT="3/4" # subslot = libgnome-desktop-3 soname version -IUSE="doc +introspection" -if [[ ${PV} = 9999 ]]; then - KEYWORDS="" -else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" -fi - -# cairo[X] needed for gnome-bg -RDEPEND=" - >=dev-libs/glib-2.33.3:2 - >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] - >=x11-libs/gtk+-3.3.6:3[introspection?] - >=x11-libs/libXext-1.1 - >=x11-libs/libXrandr-1.3 - x11-libs/cairo[X] - x11-libs/libxkbfile - x11-libs/libX11 - x11-misc/xkeyboard-config - >=gnome-base/gsettings-desktop-schemas-2.91.92 - doc? ( !=dev-libs/gobject-introspection-0.9.7 ) -" -DEPEND="${RDEPEND} - app-text/docbook-xml-dtd:4.1.2 - >=dev-util/gtk-doc-am-1.4 - >=dev-util/intltool-0.40.6 - sys-devel/gettext - x11-proto/xproto - >=x11-proto/randrproto-1.2 - virtual/pkgconfig -" - -if [[ ${PV} = 9999 ]]; then - DEPEND="${DEPEND} - doc? ( >=dev-util/gtk-doc-1.4 ) - app-text/yelp-tools" -fi - -# Includes X11/Xatom.h in libgnome-desktop/gnome-bg.c which comes from xproto -# Includes X11/extensions/Xrandr.h that includes randr.h from randrproto (and -# eventually libXrandr shouldn't RDEPEND on randrproto) - -src_unpack() { - gnome2_src_unpack - - if [[ ${PV} = 9999 ]]; then - # pnp.ids are only provided with the gnome-desktop tarball; - # for the live version, we have to get them from hwdata git - unset gnome_desktop_LIVE_BRANCH - unset gnome_destkop_LIVE_COMMIT - unset gnome_desktop_LIVE_REPO - unset EGIT_BRANCH - unset EGIT_COMMIT - unset EGIT_DIR - unset EGIT_MASTER - EGIT_PROJECT="gnome-desktop_hwdata" - EGIT_REPO_URI="git://git.fedorahosted.org/hwdata.git" - EGIT_SOURCEDIR="${WORKDIR}/hwdata" - git-2_src_unpack - ln -sf "${WORKDIR}/hwdata/pnp.ids" "${S}/libgnome-desktop/" || - die "ln -sf failed" - fi -} - -src_prepare() { - DOCS="AUTHORS ChangeLog HACKING NEWS README" - # Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp.ids - # file (needed by other packages such as >=gnome-settings-daemon-3.1.2) - # will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-3.0). - G2CONF="${G2CONF} - --disable-static - --with-gnome-distributor=Gentoo - $(use_enable doc desktop-docs) - $(use_enable introspection)" - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" - - gnome2_src_prepare -} - -pkg_preinst() { - gnome2_pkg_preinst - preserve_old_lib /usr/$(get_libdir)/libgnome-desktop-3.so.2 -} - -pkg_postinst() { - gnome2_pkg_preinst - preserve_old_lib_notify /usr/$(get_libdir)/libgnome-desktop-3.so.2 -} diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild index 338bee2..f628d98 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild @@ -16,29 +16,32 @@ HOMEPAGE="http://www.gnome.org/" LICENSE="GPL-2+ FDL-1.1+ LGPL-2+" SLOT="3/4" # subslot = libgnome-desktop-3 soname version -IUSE="doc +introspection" +IUSE="+introspection" if [[ ${PV} = 9999 ]]; then + IUSE="${IUSE} doc" KEYWORDS="" else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" fi # cairo[X] needed for gnome-bg -RDEPEND=" +COMMON_DEPEND=" >=dev-libs/glib-2.33.3:2 >=x11-libs/gdk-pixbuf-2.21.3:2[introspection?] >=x11-libs/gtk+-3.3.6:3[introspection?] >=x11-libs/libXext-1.1 >=x11-libs/libXrandr-1.3 - x11-libs/cairo[X] + x11-libs/cairo:=[X] x11-libs/libxkbfile x11-libs/libX11 x11-misc/xkeyboard-config - >=gnome-base/gsettings-desktop-schemas-2.91.92 - doc? ( !=gnome-base/gsettings-desktop-schemas-3.5.91 introspection? ( >=dev-libs/gobject-introspection-0.9.7 ) " -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + !=gnome-settings-daemon-3.1.2) @@ -88,9 +91,13 @@ src_prepare() { G2CONF="${G2CONF} --disable-static --with-gnome-distributor=Gentoo - $(use_enable doc desktop-docs) + --enable-desktop-docs $(use_enable introspection)" - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)" + if [[ ${PV} = 9999 ]]; then + G2CONF="${G2CONF} $(use_enable doc gtk-doc)" + else + G2CONF="${G2CONF} ITSTOOL=$(type -P true)" + fi gnome2_src_prepare } diff --git a/gnome-base/gnome-desktop/metadata.xml b/gnome-base/gnome-desktop/metadata.xml index 99b3795..6e0e2ec 100644 --- a/gnome-base/gnome-desktop/metadata.xml +++ b/gnome-base/gnome-desktop/metadata.xml @@ -2,8 +2,4 @@ gnome - - Use dev-libs/gobject-introspection - for introspection -