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 1QbPEa-0002BI-6Z for garchives@archives.gentoo.org; Tue, 28 Jun 2011 03:45:08 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5C6B81C0DC; Tue, 28 Jun 2011 03:44:55 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 170831C0DC for ; Tue, 28 Jun 2011 03:44:54 +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 479BB1B401E for ; Tue, 28 Jun 2011 03:44:54 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 8BF1D8003C for ; Tue, 28 Jun 2011 03:44:53 +0000 (UTC) From: "Alexandre Restovtsev" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alexandre Restovtsev" Message-ID: <5f1d9cc9c9bdc2b04223d85cc5e47de3d39ad0a2.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.0.2-r1.ebuild gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild gnome-base/gnome-desktop/gnome-desktop-9999.ebuild X-VCS-Directories: gnome-base/gnome-desktop/ X-VCS-Committer: tetromino X-VCS-Committer-Name: Alexandre Restovtsev X-VCS-Revision: 5f1d9cc9c9bdc2b04223d85cc5e47de3d39ad0a2 Date: Tue, 28 Jun 2011 03:44:53 +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: d98c68d00af674685d44a8f877d20fa7 commit: 5f1d9cc9c9bdc2b04223d85cc5e47de3d39ad0a2 Author: Alexandre Rostovtsev gmail com> AuthorDate: Tue Jun 28 02:46:58 2011 +0000 Commit: Alexandre Restovtsev gmail com> CommitDate: Tue Jun 28 03:25:40 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/gnome.git;a=3D= commit;h=3D5f1d9cc9 gnome-base/gnome-desktop: install pnp.ids file A number of Gnome 3.1 packages require the pnp.ids file that on Gentoo is provided by gnome-desktop; ensure that it is installed correctly by *not* using --with-pnp-ids-path configure argument (if it's set to anything, pnp.ids will not be installed). Since the set of installed files changed, bump the revision. Also, update the live ebuild with changes from 3.0.x, update the intltool dependency, and get the pnp.ids file from Fedora's hwdata git (requiring an additional call to git-2_src_unpack), because the file is only included in the gnome-desktop tarballs, not in gnome-desktop git. --- ...-3.0.2.ebuild =3D> gnome-desktop-3.0.2-r1.ebuild} | 28 ++++++++++- gnome-base/gnome-desktop/gnome-desktop-9999.ebuild | 51 ++++++++++++++= +----- 2 files changed, 64 insertions(+), 15 deletions(-) diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild b/gnome-= base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild similarity index 66% rename from gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild rename to gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild index 3e0de57..22cf74e 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-3.0.2.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-3.0.2-r1.ebuild @@ -8,7 +8,7 @@ GNOME2_LA_PUNT=3D"yes" =20 inherit gnome2 if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live + inherit git-2 gnome2-live fi =20 DESCRIPTION=3D"Libraries for the gnome desktop that are not part of the = UI" @@ -51,11 +51,35 @@ DEPEND=3D"${RDEPEND} =20 pkg_setup() { DOCS=3D"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 >=3Dgnome-settings-daemon-3.1.= 2) + # will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-= 3.0). G2CONF=3D"${G2CONF} --disable-scrollkeeper --disable-static - --with-pnp-ids-path=3Dinternal --with-gnome-distributor=3DGentoo $(use_enable doc desktop-docs) $(use_enable introspection)" } + +src_unpack() { + gnome2_src_unpack + + if [[ ${PV} =3D 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=3D"gnome-desktop_hwdata" + EGIT_REPO_URI=3D"git://git.fedorahosted.org/hwdata.git" + EGIT_SOURCEDIR=3D"${WORKDIR}/hwdata" + git-2_src_unpack + ln -sf "${WORKDIR}/hwdata/pnp.ids" "${S}/libgnome-desktop/" || + die "ln -sf failed" + fi +} diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-b= ase/gnome-desktop/gnome-desktop-9999.ebuild index 89c74f4..07e3051 100644 --- a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild +++ b/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild @@ -2,12 +2,13 @@ # 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 if [[ ${PV} =3D 9999 ]]; then - inherit gnome2-live + inherit git-2 gnome2-live fi =20 DESCRIPTION=3D"Libraries for the gnome desktop that are not part of the = UI" @@ -23,6 +24,7 @@ else fi =20 # TODO: Add RDEPEND on pciutils (requires support for reading gzipped pn= p.ids) +# Latest schemas needed due to commit 7f3e3d52 RDEPEND=3D" >=3Ddev-libs/glib-2.19.1:2 >=3Dx11-libs/gdk-pixbuf-2.21.3:2[introspection?] @@ -30,31 +32,54 @@ RDEPEND=3D" >=3Dx11-libs/libXrandr-1.2 >=3Dx11-libs/startup-notification-0.5 x11-libs/libX11 - >=3Dgnome-base/gsettings-desktop-schemas-0.1.4 + >=3Dgnome-base/gsettings-desktop-schemas-2.91.92 doc? ( !=3Ddev-libs/gobject-introspection-0.9.7 )" DEPEND=3D"${RDEPEND} - sys-devel/gettext - >=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 + >=3Dapp-text/gnome-doc-utils-0.3.2 + >=3Ddev-util/intltool-0.40.6 + >=3Ddev-util/pkgconfig-0.9 + 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" + # Note: do *not* use "--with-pnp-ids-path" argument. Otherwise, the pnp= .ids + # file (needed by other packages such as >=3Dgnome-settings-daemon-3.1.= 2) + # will not get installed in ${pnpdatadir} (/usr/share/libgnome-desktop-= 3.0). G2CONF=3D"${G2CONF} --disable-scrollkeeper --disable-static - --disable-desktop-docs - --with-pnp-ids-path=3D/usr/share/libgnome-desktop/pnp.ids --with-gnome-distributor=3DGentoo + $(use_enable doc desktop-docs) $(use_enable introspection)" } + +src_unpack() { + gnome2_src_unpack + + if [[ ${PV} =3D 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=3D"gnome-desktop_hwdata" + EGIT_REPO_URI=3D"git://git.fedorahosted.org/hwdata.git" + EGIT_SOURCEDIR=3D"${WORKDIR}/hwdata" + git-2_src_unpack + ln -sf "${WORKDIR}/hwdata/pnp.ids" "${S}/libgnome-desktop/" || + die "ln -sf failed" + fi +}