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

[Alexandre Restovtsev]

commit:     049b9e0d1b483c4f9aedcc6318c8347342cba168
Author:     Alexandre Rostovtsev <tetromino <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 29 19:42:39 2011 +0000
Commit:     Alexandre Restovtsev <tetromino <AT> gmail <DOT> com>
CommitDate: Sat Oct 29 19:42:39 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=049b9e0d

gnome-desktop, libgnomekbd: moved to gx86

---
 .../gnome-desktop/gnome-desktop-3.2.1.ebuild       |   87 --------------------
 gnome-base/libgnomekbd/libgnomekbd-3.2.0.ebuild    |   35 --------
 2 files changed, 0 insertions(+), 122 deletions(-)

diff --git a/gnome-base/gnome-desktop/gnome-desktop-3.2.1.ebuild b/gnome-base/gnome-desktop/gnome-desktop-3.2.1.ebuild
deleted file mode 100644
index 300f0d8..0000000
--- a/gnome-base/gnome-desktop/gnome-desktop-3.2.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-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"
-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
-
-# TODO: Add RDEPEND on pciutils (requires support for reading gzipped pnp.ids)
-# Latest schemas needed due to commit 7f3e3d52
-# cairo[X] needed for gnome-bg
-RDEPEND="
-	>=dev-libs/glib-2.19.1:2
-	x11-libs/cairo[X]
-	>=x11-libs/gdk-pixbuf-2.21.3:2[introspection?]
-	>=x11-libs/gtk+-3.0.0:3[introspection?]
-	>=x11-libs/libXext-1.1
-	>=x11-libs/libXrandr-1.2
-	x11-libs/libX11
-	>=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}
-	~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
-	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)
-
-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-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/libgnomekbd/libgnomekbd-3.2.0.ebuild b/gnome-base/libgnomekbd/libgnomekbd-3.2.0.ebuild
deleted file mode 100644
index b3abc62..0000000
--- a/gnome-base/libgnomekbd/libgnomekbd-3.2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnomekbd/libgnomekbd-3.0.0.1.ebuild,v 1.1 2011/08/14 14:58:21 nirbheek Exp $
-
-EAPI="4"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-
-DESCRIPTION="Gnome keyboard configuration library"
-HOMEPAGE="http://www.gnome.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+introspection test"
-
-RDEPEND=">=dev-libs/glib-2.18:2
-	>=x11-libs/gtk+-2.91.7:3[introspection?]
-	>=x11-libs/libxklavier-5.1
-
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7 )"
-DEPEND="${RDEPEND}
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-static
-		--disable-schemas-compile
-		$(use_enable introspection)
-		$(use_enable test tests)"
-	DOCS="AUTHORS ChangeLog NEWS README"
-}