Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: sys-apps/baobab/
Date: Sun, 01 Dec 2013 16:18:24
Message-Id: 1385913277.4dfd3aade30ed589ad8d1d416f3e718305c932b7.eva@gentoo
1 commit: 4dfd3aade30ed589ad8d1d416f3e718305c932b7
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sat Oct 12 22:58:46 2013 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 1 15:54:37 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=4dfd3aad
7
8 sys-apps/baobab: 3.8.2 → 3.10.1
9
10 ---
11 sys-apps/baobab/baobab-3.10.1.ebuild | 39 ++++++++++++++++++++++++++++++++++++
12 sys-apps/baobab/baobab-9999.ebuild | 22 +++++++++-----------
13 2 files changed, 48 insertions(+), 13 deletions(-)
14
15 diff --git a/sys-apps/baobab/baobab-3.10.1.ebuild b/sys-apps/baobab/baobab-3.10.1.ebuild
16 new file mode 100644
17 index 0000000..4d364b8
18 --- /dev/null
19 +++ b/sys-apps/baobab/baobab-3.10.1.ebuild
20 @@ -0,0 +1,39 @@
21 +# Copyright 1999-2013 Gentoo Foundation
22 +# Distributed under the terms of the GNU General Public License v2
23 +# $Header: $
24 +
25 +EAPI="5"
26 +GCONF_DEBUG="no"
27 +
28 +inherit gnome2
29 +
30 +DESCRIPTION="Disk usage browser for GNOME"
31 +HOMEPAGE="https://live.gnome.org/Baobab"
32 +
33 +LICENSE="GPL-2+ FDL-1.1+"
34 +SLOT="0"
35 +IUSE=""
36 +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
37 +
38 +COMMON_DEPEND="
39 + >=dev-libs/glib-2.37.5:2
40 + >=x11-libs/gtk+-3.9.10:3
41 +"
42 +RDEPEND="${COMMON_DEPEND}
43 + gnome-base/gsettings-desktop-schemas
44 + !<gnome-extra/gnome-utils-3.4
45 +"
46 +# ${PN} was part of gnome-utils before 3.4
47 +DEPEND="${COMMON_DEPEND}
48 + >=dev-util/intltool-0.40
49 + >=sys-devel/gettext-0.17
50 + virtual/pkgconfig
51 +"
52 +
53 +src_configure() {
54 + gnome2_src_configure \
55 + ITSTOOL=$(type -P true) \
56 + XMLLINT=$(type -P true) \
57 + VALAC=$(type -P true) \
58 + VAPIGEN=$(type -P true)
59 +}
60
61 diff --git a/sys-apps/baobab/baobab-9999.ebuild b/sys-apps/baobab/baobab-9999.ebuild
62 index 9404413..05ef7f1 100644
63 --- a/sys-apps/baobab/baobab-9999.ebuild
64 +++ b/sys-apps/baobab/baobab-9999.ebuild
65 @@ -1,20 +1,19 @@
66 -# Copyright 1999-2012 Gentoo Foundation
67 +# Copyright 1999-2013 Gentoo Foundation
68 # Distributed under the terms of the GNU General Public License v2
69 # $Header: $
70
71 EAPI="5"
72 GCONF_DEBUG="no"
73 -GNOME2_LA_PUNT="yes"
74
75 inherit gnome2
76 if [[ ${PV} = 9999 ]]; then
77 - VALA_MIN_API_VERSION="0.18"
78 + VALA_MIN_API_VERSION="0.22"
79 VALA_USE_DEPEND="vapigen"
80 inherit gnome2-live vala
81 fi
82
83 -DESCRIPTION="Disk usage browser for GNOME 3"
84 -HOMEPAGE="https://live.gnome.org/GnomeUtils"
85 +DESCRIPTION="Disk usage browser for GNOME"
86 +HOMEPAGE="https://live.gnome.org/Baobab"
87
88 LICENSE="GPL-2+ FDL-1.1+"
89 SLOT="0"
90 @@ -26,12 +25,8 @@ else
91 fi
92
93 COMMON_DEPEND="
94 - >=dev-libs/glib-2.30.0:2
95 - gnome-base/libgtop:2=
96 - x11-libs/cairo
97 - x11-libs/gdk-pixbuf
98 - >=x11-libs/gtk+-3.5.9:3
99 - x11-libs/pango
100 + >=dev-libs/glib-2.37.5:2
101 + >=x11-libs/gtk+-3.9.10:3
102 "
103 RDEPEND="${COMMON_DEPEND}
104 gnome-base/gsettings-desktop-schemas
105 @@ -57,12 +52,13 @@ src_prepare() {
106 }
107
108 src_configure() {
109 + local myconf=""
110 if [[ ${PV} != 9999 ]]; then
111 - G2CONF="${G2CONF}
112 + myconf="${myconf}
113 ITSTOOL=$(type -P true)
114 XMLLINT=$(type -P true)
115 VALAC=$(type -P true)
116 VAPIGEN=$(type -P true)"
117 fi
118 - gnome2_src_configure
119 + gnome2_src_configure ${myconf}
120 }