Gentoo Archives: gentoo-commits

From: Gilles Dartiguelongue <eva@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/eva:master commit in: app-office/dates/
Date: Thu, 22 Nov 2012 21:41:43
Message-Id: 1353620261.2c61cdf607d02e5f0e44662536e62902f107e959.eva@gentoo
1 commit: 2c61cdf607d02e5f0e44662536e62902f107e959
2 Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
3 AuthorDate: Thu Nov 22 21:37:41 2012 +0000
4 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 22 21:37:41 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/eva.git;a=commit;h=2c61cdf6
7
8 app-office/dates: fix repoman warnings and update ebuild style
9
10 ---
11 app-office/dates/Manifest | 12 +++++++++++-
12 app-office/dates/dates-0.4.11-r1.ebuild | 20 +++++++++++---------
13 2 files changed, 22 insertions(+), 10 deletions(-)
14
15 diff --git a/app-office/dates/Manifest b/app-office/dates/Manifest
16 index 5ecd7be..13ad213 100644
17 --- a/app-office/dates/Manifest
18 +++ b/app-office/dates/Manifest
19 @@ -1 +1,11 @@
20 -DIST dates-0.4.11.tar.bz2 425726 RMD160 22c2a3d8f51d7addeca8a705537943f3645c1ed4 SHA1 5e5304b29cc89655bd212210c5408cf75c36d491 SHA256 60b0cfe1fa6dee684e255c2a0cd02febafb9d16607ba4b05196e983cd8012c03
21 +-----BEGIN PGP SIGNED MESSAGE-----
22 +Hash: SHA512
23 +
24 +DIST dates-0.4.11.tar.bz2 425726 SHA256 60b0cfe1fa6dee684e255c2a0cd02febafb9d16607ba4b05196e983cd8012c03
25 +-----BEGIN PGP SIGNATURE-----
26 +Version: GnuPG v2.0.19 (GNU/Linux)
27 +
28 +iEYEAREKAAYFAlCumyUACgkQ1fmVwcYIWAaMBwCdFwDr9huFld3df5D0SZhYFNEC
29 +kLEAn10q7hViJWxNbA+EMbcGtZdZJ6wC
30 +=xIMV
31 +-----END PGP SIGNATURE-----
32
33 diff --git a/app-office/dates/dates-0.4.11-r1.ebuild b/app-office/dates/dates-0.4.11-r1.ebuild
34 index 1c54f67..e9c388e 100644
35 --- a/app-office/dates/dates-0.4.11-r1.ebuild
36 +++ b/app-office/dates/dates-0.4.11-r1.ebuild
37 @@ -2,37 +2,39 @@
38 # Distributed under the terms of the GNU General Public License v2
39 # $Header: $
40
41 -EAPI="3"
42 +EAPI="4"
43 GCONF_DEBUG="yes"
44 +GNOME_TARBALL_SUFFIX="bz2"
45
46 inherit eutils gnome2
47
48 DESCRIPTION="A small, lightweight calendar for Gnome"
49 HOMEPAGE="http://pimlico-project.org/dates.html"
50 -#SRC_URI="http://pimlico-project.org/sources/dates/${P}.tar.gz"
51
52 LICENSE="GPL-2"
53 SLOT="0"
54 KEYWORDS="~amd64 ~ppc ~x86"
55 IUSE=""
56
57 -RDEPEND=">=dev-libs/glib-2:2
58 +RDEPEND="
59 + >=dev-libs/glib-2:2
60 >=x11-libs/gtk+-2.6:2
61 >=gnome-extra/evolution-data-server-2.32
62 - >=gnome-base/gconf-2"
63 -
64 + gnome-base/gconf:2
65 +"
66 DEPEND="${RDEPEND}
67 - >=dev-util/pkgconfig-0.9.0
68 - >=dev-util/intltool-0.35.0"
69 + >=dev-util/intltool-0.35.0
70 + virtual/pkgconfig
71 +"
72
73 DOCS="AUTHORS ChangeLog INSTALL NEWS README"
74
75 src_prepare() {
76 - gnome2_src_prepare
77 -
78 # Fix build with gmake-3.82
79 sed 's/^ /\t/g' -i Makefile.am Makefile.in || die "sed failed"
80
81 # Fix build against >=evolution-data-server-2.32, upstream #631081
82 epatch "${FILESDIR}/${PN}-0.4.11-eds-api-usage-fix.patch"
83 +
84 + gnome2_src_prepare
85 }