[gentoo-commits] proj/gnome:master commit in: gnome-extra/evolution-data-server/files/, gnome-extra/evolution-data-server/

[Priit Laes]

commit:     3350a654e03b3b9d343bf6b86e42832d3ad1dab0
Author:     Priit Laes <plaes <AT> plaes <DOT> org>
AuthorDate: Sun Mar  3 15:04:40 2013 +0000
Commit:     Priit Laes <plaes <AT> plaes <DOT> org>
CommitDate: Sun Mar  3 15:04:40 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=3350a654

gnome-extra/evolution-data-server: 3.7.90 → 3.7.91

---
 ....ebuild => evolution-data-server-3.7.91.ebuild} |    4 +--
 .../evolution-data-server-9999.ebuild              |    2 +-
 ...n-data-server-3.7.90-libebook-splitup-fix.patch |   25 --------------------
 3 files changed, 2 insertions(+), 29 deletions(-)

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
similarity index 97%
rename from gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild
rename to gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
index 12eb80e..bc3ebf4 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.7.90.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.7.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
@@ -103,8 +103,6 @@ src_prepare() {
 	gnome2_src_prepare
 	use vala && vala_src_prepare
 
-	epatch "${FILESDIR}/${P}-libebook-splitup-fix.patch"
-
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
 	append-cppflags "-I$(db_includedir)"

diff --git a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
index bcbfb50..bc3ebf4 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 

diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch
deleted file mode 100644
index 3241de2..0000000
--- a/gnome-extra/evolution-data-server/files/evolution-data-server-3.7.90-libebook-splitup-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 794f538befedadaded6f19004738cf3babd5e9c5 Mon Sep 17 00:00:00 2001
-From: Tristan Van Berkom <tristanvb@×××××××××.com>
-Date: Mon, 18 Feb 2013 12:05:22 +0000
-Subject: Fixing pkg-config files for libebook & libedata-book
-
-This part was missed while the libebook / libebook-contacts library
-splitup was done manually.
----
-(limited to 'addressbook/libebook')
-
-diff --git a/addressbook/libebook/libebook.pc.in b/addressbook/libebook/libebook.pc.in
-index 993870b..293cdc0 100644
---- a/addressbook/libebook/libebook.pc.in
-+++ b/addressbook/libebook/libebook.pc.in
-@@ -10,7 +10,7 @@ privincludedir=@privincludedir@
- Name: libebook
- Description: Client library for evolution address books
- Version: @VERSION@
--Requires: libedataserver-1.2
-+Requires: libedataserver-1.2 libebook-contacts-1.2 libedata-book-1.2
- Requires.private: camel-1.2
- Libs: -L${libdir} -lebook-1.2
- Cflags: -I${privincludedir}
---
-cgit v0.9.1