Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gnome:master commit in: app-admin/gnome-system-log/
Date: Sun, 01 Dec 2013 17:20:03
Message-Id: 1385918368.30969c6a382871797867289da0151251f59f3b43.eva@gentoo
1 commit: 30969c6a382871797867289da0151251f59f3b43
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Sun Dec 1 17:19:00 2013 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Sun Dec 1 17:19:28 2013 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=30969c6a
7
8 app-admin/gnome-system-log: 3.8.1 → 3.9.90
9
10 ---
11 .../gnome-system-log-3.9.90.ebuild | 39 ++++++++++++++++++++++
12 .../gnome-system-log/gnome-system-log-9999.ebuild | 32 +++++++++---------
13 2 files changed, 55 insertions(+), 16 deletions(-)
14
15 diff --git a/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild b/app-admin/gnome-system-log/gnome-system-log-3.9.90.ebuild
16 new file mode 100644
17 index 0000000..4f764b4
18 --- /dev/null
19 +++ b/app-admin/gnome-system-log/gnome-system-log-3.9.90.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="System log viewer for GNOME"
31 +HOMEPAGE="https://live.gnome.org/GnomeUtils"
32 +
33 +LICENSE="GPL-2+ CC-BY-SA-3.0"
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.31:2
40 + sys-libs/zlib:=
41 + >=x11-libs/gtk+-3.9.11:3
42 + x11-libs/pango
43 +"
44 +RDEPEND="${COMMON_DEPEND}
45 + gnome-base/gsettings-desktop-schemas
46 + !<gnome-extra/gnome-utils-3.4"
47 +# ${PN} was part of gnome-utils before 3.4
48 +
49 +DEPEND="${COMMON_DEPEND}
50 + >=dev-util/intltool-0.40
51 + >=sys-devel/gettext-0.17
52 + virtual/pkgconfig
53 +"
54 +
55 +src_configure() {
56 + gnome2_src_configure \
57 + --enable-zlib \
58 + ITSTOOL=$(type -P true)
59 +}
60
61 diff --git a/app-admin/gnome-system-log/gnome-system-log-9999.ebuild b/app-admin/gnome-system-log/gnome-system-log-9999.ebuild
62 index 19ad7a7..b5e2ef2 100644
63 --- a/app-admin/gnome-system-log/gnome-system-log-9999.ebuild
64 +++ b/app-admin/gnome-system-log/gnome-system-log-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="4"
72 +EAPI="5"
73 GCONF_DEBUG="no"
74 -GNOME2_LA_PUNT="yes"
75
76 inherit gnome2
77 if [[ ${PV} = 9999 ]]; then
78 inherit gnome2-live
79 fi
80
81 -DESCRIPTION="System log viewer for GNOME 3"
82 +DESCRIPTION="System log viewer for GNOME"
83 HOMEPAGE="https://live.gnome.org/GnomeUtils"
84
85 -LICENSE="GPL-2 FDL-1.1"
86 +LICENSE="GPL-2+ CC-BY-SA-3.0"
87 SLOT="0"
88 IUSE=""
89 if [[ ${PV} = 9999 ]]; then
90 @@ -23,18 +22,22 @@ else
91 KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
92 fi
93
94 -COMMON_DEPEND=">=dev-libs/glib-2.31.0:2
95 - sys-libs/zlib
96 - >=x11-libs/gtk+-3.4.0:3
97 - x11-libs/pango"
98 +COMMON_DEPEND="
99 + >=dev-libs/glib-2.31:2
100 + sys-libs/zlib:=
101 + >=x11-libs/gtk+-3.9.11:3
102 + x11-libs/pango
103 +"
104 RDEPEND="${COMMON_DEPEND}
105 gnome-base/gsettings-desktop-schemas
106 !<gnome-extra/gnome-utils-3.4"
107 # ${PN} was part of gnome-utils before 3.4
108 +
109 DEPEND="${COMMON_DEPEND}
110 >=dev-util/intltool-0.40
111 >=sys-devel/gettext-0.17
112 - virtual/pkgconfig"
113 + virtual/pkgconfig
114 +"
115
116 if [[ ${PV} = 9999 ]]; then
117 DEPEND="${DEPEND}
118 @@ -42,10 +45,7 @@ if [[ ${PV} = 9999 ]]; then
119 fi
120
121 src_configure() {
122 - DOCS="NEWS TODO"
123 - G2CONF="${G2CONF}
124 - --disable-schemas-compile
125 - --enable-zlib"
126 - [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
127 - gnome2_src_configure
128 + gnome2_src_configure \
129 + --enable-zlib \
130 + ITSTOOL=$(type -P true)
131 }