[gentoo-commits] proj/gnome:master commit in: sys-apps/baobab/

["Gilles Dartiguelongue" <eva@gentoo.org>]

commit:     a5aa7ea8681df90131cd401b457183f47a332fae
Author:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 23 23:20:32 2012 +0000
Commit:     Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Sun Dec 23 23:20:32 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a5aa7ea8

sys-apps/baobab: moved to gx86

    * Sync live ebuild  with gx86 changes.
    * Add metadata.xml.

---
 sys-apps/baobab/baobab-3.6.3.ebuild |   62 -----------------------------------
 sys-apps/baobab/baobab-9999.ebuild  |   22 ++++++++----
 sys-apps/baobab/metadata.xml        |    5 +++
 3 files changed, 19 insertions(+), 70 deletions(-)

diff --git a/sys-apps/baobab/baobab-3.6.3.ebuild b/sys-apps/baobab/baobab-3.6.3.ebuild
deleted file mode 100644
index 8e763dd..0000000
--- a/sys-apps/baobab/baobab-3.6.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2
-if [[ ${PV} = 9999 ]]; then
-	VALA_MIN_API_VERSION="0.18"
-	VALA_USE_DEPEND="vapigen"
-	inherit gnome2-live vala
-fi
-
-DESCRIPTION="Disk usage browser for GNOME 3"
-HOMEPAGE="https://live.gnome.org/GnomeUtils"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="0"
-IUSE=""
-if [[ ${PV} = 9999 ]]; then
-	KEYWORDS=""
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-fi
-
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	gnome-base/libgtop:2=
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	>=x11-libs/gtk+-3.5.9:3
-	x11-libs/pango"
-RDEPEND="${COMMON_DEPEND}
-	gnome-base/gsettings-desktop-schemas
-	!<gnome-extra/gnome-utils-3.4"
-# ${PN} was part of gnome-utils before 3.4
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
-
-if [[ ${PV} = 9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/yelp-tools
-		$(vala_depend)"
-fi
-
-src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile"
-	if [[ ${PV} = 9999 ]]; then
-		vala_src_prepare
-	else
-		G2CONF="${G2CONF}
-			ITSTOOL=$(type -P true)
-			XMLLINT=$(type -P true)
-			VALAC=$(type -P true)
-			VAPIGEN=$(type -P true)"
-	fi
-	gnome2_src_prepare
-}

diff --git a/sys-apps/baobab/baobab-9999.ebuild b/sys-apps/baobab/baobab-9999.ebuild
index 8e763dd..9404413 100644
--- a/sys-apps/baobab/baobab-9999.ebuild
+++ b/sys-apps/baobab/baobab-9999.ebuild
@@ -25,20 +25,24 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 fi
 
-COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
+COMMON_DEPEND="
+	>=dev-libs/glib-2.30.0:2
 	gnome-base/libgtop:2=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	>=x11-libs/gtk+-3.5.9:3
-	x11-libs/pango"
+	x11-libs/pango
+"
 RDEPEND="${COMMON_DEPEND}
 	gnome-base/gsettings-desktop-schemas
-	!<gnome-extra/gnome-utils-3.4"
+	!<gnome-extra/gnome-utils-3.4
+"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
-	virtual/pkgconfig"
+	virtual/pkgconfig
+"
 
 if [[ ${PV} = 9999 ]]; then
 	DEPEND="${DEPEND}
@@ -47,16 +51,18 @@ if [[ ${PV} = 9999 ]]; then
 fi
 
 src_prepare() {
-	G2CONF="${G2CONF}
-		--disable-schemas-compile"
 	if [[ ${PV} = 9999 ]]; then
 		vala_src_prepare
-	else
+	fi
+}
+
+src_configure() {
+	if [[ ${PV} != 9999 ]]; then
 		G2CONF="${G2CONF}
 			ITSTOOL=$(type -P true)
 			XMLLINT=$(type -P true)
 			VALAC=$(type -P true)
 			VAPIGEN=$(type -P true)"
 	fi
-	gnome2_src_prepare
+	gnome2_src_configure
 }

diff --git a/sys-apps/baobab/metadata.xml b/sys-apps/baobab/metadata.xml
new file mode 100644
index 0000000..6e0e2ec
--- /dev/null
+++ b/sys-apps/baobab/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <herd>gnome</herd>
+</pkgmetadata>