evolution-mapi: Fix compatibility with libical-3

[gentoo-draconx.git] / gnome-extra / evolution-mapi / evolution-mapi-3.24.5-r1.ebuild

diff --git a/gnome-extra/evolution-mapi/evolution-mapi-3.24.5.ebuild b/gnome-extra/evolution-mapi/evolution-mapi-3.24.5-r1.ebuild
similarity index 71%
rename from gnome-extra/evolution-mapi/evolution-mapi-3.24.5.ebuild
rename to gnome-extra/evolution-mapi/evolution-mapi-3.24.5-r1.ebuild
index 9ba94163a3d2d5e601dfe8679723742456f60ddb..676c7da5f188e8d901d10b9a40fee3eab242156f 100644 (file)
--- a/gnome-extra/evolution-mapi/evolution-mapi-3.24.5.ebuild
+++ b/gnome-extra/evolution-mapi/evolution-mapi-3.24.5-r1.ebuild
@@ -16,13 +16,22 @@ SLOT="0"
 RDEPEND=">=gnome-extra/evolution-data-server-$PV:0=
        >=mail-client/evolution-$PV:2.0
        >=net-libs/libmapi-2
-       <dev-libs/libical-3:="
+       dev-libs/libical:="
 
 DEPEND="$RDEPEND
        virtual/pkgconfig"
 
+PATCHES=(
+       "$FILESDIR/$PN-3.24-libical-3.patch"
+)
+
 src_prepare () {
        cmake-utils_src_prepare
+
+       # Both cmake-utils_src_prepare and gnome2_src_prepare call default, which
+       # means patches get applied twice and that doesn't end well.  So redefine
+       # default to do nothing here, since it's already been run...
+       default () { :; }
        gnome2_src_prepare
 }