Don't require itstool at build time (thanks to Michael Sterrett for noticing). Update to EAPI5. Update license.

Package-Manager: portage-2.2.0_alpha144/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

3 files changed, 26 insertions, 21 deletions

diff --git a/sys-apps/baobab/ChangeLog b/sys-apps/baobab/ChangeLog
index 1c1c3a731b11..83be8cb15adf 100644
--- a/sys-apps/baobab/ChangeLog
+++ b/sys-apps/baobab/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/baobab
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baobab/ChangeLog,v 1.1 2012/05/05 08:22:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baobab/ChangeLog,v 1.2 2012/12/06 01:01:14 tetromino Exp $
+
+  06 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> baobab-3.4.1.ebuild:
+  Don't require itstool at build time (thanks to Michael Sterrett for
+  noticing). Update to EAPI5. Update license.
 
 *baobab-3.4.1 (05 May 2012)
 
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 365d598dc810..e14ca9dbbbef 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,18 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-DIST baobab-3.4.1.tar.xz 826356 RMD160 e59697e7ec642042045aa1f5bd73360d29405626 SHA1 f89ef33c855451818adcac962150d5587386b58e SHA256 0c9743caf8cdc6dd69d694453cd57816c1ca0514cf51111022846088021949f7
-EBUILD baobab-3.4.1.ebuild 1053 RMD160 414633f32bc8dfc66222ec2adfcbaac1f4aef656 SHA1 45dd8c3e745198d1582696d5eab9e75432fcad6b SHA256 5a5a2f5024a859757facb5306d8aea0a65b15d79d18ba43d6e04fe573a7c07e6
-MISC ChangeLog 426 RMD160 5017432cd178e178dba62faba673f1789fcd116f SHA1 9a8f24cf2e10e7fe7e85ccb688dff640f8b6c1e0 SHA256 219580bf0b723479b6eedfbf5472c106248e3538cf0957a51776a7496ad5e14a
-MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
+DIST baobab-3.4.1.tar.xz 826356 SHA256 0c9743caf8cdc6dd69d694453cd57816c1ca0514cf51111022846088021949f7 SHA512 be2015795753ece824230535d100cb55dfb9000d5b875f5f6ed054c63763ee9b5d05bcd43b487c09319135a3996729b93b91eee8ce2717b6f2fd8a6f5656a59b WHIRLPOOL b494d9d6a0a138f8e4d461bdb89a3cc7de9e85c069601179ce6cc9a92071fa6560e9f4caca51d99e2ea017e937eb823bf2e633b33fab80baa2b3509a57d2bb5a
+EBUILD baobab-3.4.1.ebuild 1069 SHA256 3fada57245771030206b0ba446d461fa04cf15fe996d31a094289d768096eceb SHA512 be24aa8c0f7190b576c75450bf6f163817e84c7f965225ba2e5a6230b5cc52dde2b5b3b5d93039adb54a0231c055fe40d7d7836cd1236c8b75a57a08b8e4145c WHIRLPOOL 71383460b90cd7d6ea6cacf39b485d5bdfdd77939d49809d2a8dad1c426440a02d4c33accbebcf2f43e022077baaf6c52b65ad67504b8dd1cc815f8403438418
+MISC ChangeLog 623 SHA256 0dee42103b6cbbd3f3c4a5b2b7895a54e6cbd470f9dd30f30b28640319ea2441 SHA512 e0045548c53241c97970c656e56a20a46e54431db44416d3cbdaf417553a68f08474ad5225ac4a47cb4c24bb5660d0baf35f0f68048720f17712097a8c86ae55 WHIRLPOOL f6b509e67038178e525ce449a95f10726bf8bbf4879631b3d5a1cd148dd248acdca59b520f8162553fcfc68a27439ad7ec6a8618b9ed75b5d644631fb39fd0df
+MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPpONGAAoJEJ0WA1zPCt1hKaEH/iZw5Gf6KtBptEkkvuuiTdq0
-UeNPcPQGZmhjZKCZiomyuosCSuAGF5xownnaObTYEDHouO3C+Jg1q8X8gq/OUvdW
-0fR5mp+6vWRWgIjdzX8A0f4WgA7cVFqJXtqANiTVQm8dybcEfNeJB8v/mjV7KitE
-VSYoam02yLCWbXUbNnl3iGYvIzyscmtIkeEVBPEgtiULw2u+Mvyrt5/VdJFZh6qX
-P4ZZQUUaV38AkJOwkqDxHoVD9JPq47Sp9K3EXeEY0lSffGjaGbvK80ZIEiuLEl0Z
-clAFql+HAoR5qoRtPBu2q5kF7UmF5EvGRAp5XLilcXF5tBGobwcvg49oJYIy1vI=
-=Qq8R
+iQEcBAEBCAAGBQJQv+5cAAoJEJ0WA1zPCt1hO1wIAIF62wL68MkteMZehiepL9Fl
+WemCU6QRKvVdvj06NDTbZvUpCAnV2okmlpmuCKRZNxbXM/DogywJaqtHguOV/Qkz
+esw8Qd5byN0WS9ujBF3jqOfygwhmpeVkxVZr95qvnytIFzGhY+BQdByeGdjV8P96
+5soDPnrvpnw12KsWzBZ0OpsZka1u+81niTW/pjb9e+n1EUxhXslQ+JqnV8k7TTkP
+JZJpyjOjwBkkA15xyY1w67nQq+HikFTnkrJ8tQRftIc/rcFIeg14OIqcGonLmdBR
++k7kOvXo1bPC8FP9GgWV6LJV1K8XsKKaSV1A0M8wiDwo5TtjwSGkP5QxgM6U+mQ=
+=6a9t
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baobab/baobab-3.4.1.ebuild b/sys-apps/baobab/baobab-3.4.1.ebuild
index 291b078f9771..6d1e19fcdf09 100644
--- a/sys-apps/baobab/baobab-3.4.1.ebuild
+++ b/sys-apps/baobab/baobab-3.4.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baobab/baobab-3.4.1.ebuild,v 1.1 2012/05/05 08:22:24 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baobab/baobab-3.4.1.ebuild,v 1.2 2012/12/06 01:01:15 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -11,13 +11,13 @@ inherit gnome2
 DESCRIPTION="Disk usage browser for GNOME 3"
 HOMEPAGE="https://live.gnome.org/GnomeUtils"
 
-LICENSE="GPL-2 FDL-1.1"
+LICENSE="GPL-2+ FDL-1.1+"
 SLOT="0"
 IUSE=""
 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 COMMON_DEPEND=">=dev-libs/glib-2.30.0:2
-	gnome-base/libgtop:2
+	gnome-base/libgtop:2=
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf
 	>=x11-libs/gtk+-3.3.18:3
@@ -27,14 +27,15 @@ RDEPEND="${COMMON_DEPEND}
 	!<gnome-extra/gnome-utils-3.4"
 # ${PN} was part of gnome-utils before 3.4
 DEPEND="${COMMON_DEPEND}
-	dev-util/itstool
 	dev-libs/libxml2:2
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
 	virtual/pkgconfig"
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README TODO"
+src_prepare() {
 	G2CONF="${G2CONF}
-		--disable-schemas-compile"
+		--disable-schemas-compile
+		ITSTOOL=$(type -P true)
+		XMLLINT=$(type -P true)"
+	gnome2_src_prepare
 }