[gentoo-commits] proj/gnome:master commit in: gnome-base/gnome-desktop/

[Alexandre Restovtsev]

commit:     5f1d9cc9c9bdc2b04223d85cc5e47de3d39ad0a2
Author:     Alexandre Rostovtsev <tetromino <AT> gmail <DOT> com>
AuthorDate: Tue Jun 28 02:46:58 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Tue Jun 28 03:25:40 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=5f1d9cc9

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 => 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="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	inherit git-2 gnome2-live
 fi
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
@@ -51,11 +51,35 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
 	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-scrollkeeper
 		--disable-static
-		--with-pnp-ids-path=internal
 		--with-gnome-distributor=Gentoo
 		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 }
+
+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
+}

diff --git a/gnome-base/gnome-desktop/gnome-desktop-9999.ebuild b/gnome-base/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: $
 
-EAPI="2"
+EAPI="3"
+GCONF_DEBUG="yes"
 GNOME2_LA_PUNT="yes"
 
 inherit gnome2
 if [[ ${PV} = 9999 ]]; then
-	inherit gnome2-live
+	inherit git-2 gnome2-live
 fi
 
 DESCRIPTION="Libraries for the gnome desktop that are not part of the UI"
@@ -23,6 +24,7 @@ else
 fi
 
 # TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
+# Latest schemas needed due to commit 7f3e3d52
 RDEPEND="
 	>=dev-libs/glib-2.19.1:2
 	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
@@ -30,31 +32,54 @@ RDEPEND="
 	>=x11-libs/libXrandr-1.2
 	>=x11-libs/startup-notification-0.5
 	x11-libs/libX11
-	>=gnome-base/gsettings-desktop-schemas-0.1.4
+	>=gnome-base/gsettings-desktop-schemas-2.91.92
 	doc? ( !<gnome-base/gnome-desktop-2.32.1-r50:2[doc] )
 	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
 DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=dev-util/intltool-0.40
-	>=dev-util/pkgconfig-0.9
-	>=app-text/gnome-doc-utils-0.3.2
-	doc? ( >=dev-util/gtk-doc-1.4 )
 	~app-text/docbook-xml-dtd-4.1.2
+	>=app-text/gnome-doc-utils-0.3.2
+	>=dev-util/intltool-0.40.6
+	>=dev-util/pkgconfig-0.9
+	sys-devel/gettext
 	x11-proto/xproto
-	>=x11-proto/randrproto-1.2"
+	>=x11-proto/randrproto-1.2
+	doc? ( >=dev-util/gtk-doc-1.4 )"
 
 # 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)
 
-DOCS="AUTHORS ChangeLog HACKING NEWS README"
-
 pkg_setup() {
+	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-scrollkeeper
 		--disable-static
-		--disable-desktop-docs
-		--with-pnp-ids-path=/usr/share/libgnome-desktop/pnp.ids
 		--with-gnome-distributor=Gentoo
+		$(use_enable doc desktop-docs)
 		$(use_enable introspection)"
 }
+
+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
+}