Created attachment 360196 [details] mail-client/geary-0.4.0.ebuild Hello, Upstream has released geary-0.4.0. I modified the existing ebuild for 0.4.0_pre2 and tested that it compiles and works fine. Attaching new ebuild. List of changes: - Fix sqlite,glib,libgee,libxml2,libcanberra,webkit-gtk[*],libnotify dependency versions based on versions declared in upstream Makefile - Rename clags/unity patches for this version [*] I added a blocker against >net-libs/webkit-gtk-2.0.4 since upstream CMakeLists.txt contains that check.
Created attachment 360198 [details, diff] geary-0.4.0-cflags.patch
Created attachment 360200 [details, diff] geary-0.4.0-unity.patch
Comment on attachment 360196 [details] mail-client/geary-0.4.0.ebuild --- geary-0.4.0_pre2.ebuild 2013-09-22 15:06:15.000000000 +0200 +++ - 2013-10-06 16:11:11.505061293 +0200 @@ -1,8 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.4.0_pre2.ebuild,v 1.1 2013/09/22 13:06:15 hasufell Exp $ - -# REMINDER: next release probably swaps gnome-keyring for libsecret-1 +# $Header: $ EAPI=5 @@ -22,16 +20,17 @@ DEPEND=" >=app-crypt/libsecret-0.11 - dev-db/sqlite:3 - dev-libs/glib:2 - dev-libs/libgee:0.8 + >=dev-db/sqlite-3.7.4:3 + >=dev-libs/glib-2.32.0:2 + >=dev-libs/libgee-0.8.5:0.8 dev-libs/libunique:3 - dev-libs/libxml2:2 + >=dev-libs/libxml2-2.7.8:2 dev-libs/gmime:2.6 - media-libs/libcanberra + >=media-libs/libcanberra-0.28 >=net-libs/webkit-gtk-1.10.0:3[introspection] + !>net-libs/webkit-gtk-2.0.4:3[introspection] >=x11-libs/gtk+-3.6.0:3[introspection] - x11-libs/libnotify" + >=x11-libs/libnotify-0.7.5" RDEPEND="${DEPEND} gnome-base/gsettings-desktop-schemas nls? ( virtual/libintl )"
+ 06 Oct 2013; Julian Ospald <hasufell@gentoo.org> + +files/geary-0.4.0-cflags.patch, +files/geary-0.4.0-unity.patch, + +geary-0.4.0.ebuild, -files/geary-0.4.0_pre2-cflags.patch, + -files/geary-0.4.0_pre2-unity.patch, -geary-0.4.0_pre2.ebuild: + version bump wrt #487054
Hey guys, thanks for prompt turnaround. Unfortunately I think the webkit-gtk blocker is wrong: On the ebuild committed: <net-libs/webkit-gtk-2.0.4:3[introspection] In my patch it was: !>net-libs/webkit-gtk-2.0.4:3[introspection] For achieving the same effect the ebuild's check needs to be '<=' instead of '<' only. Right now I'm getting the following: # emerge -av --backtrack=0 geary These are the packages that would be merged, in order: Calculating dependencies... done! [ebuild UD ] net-libs/webkit-gtk-1.10.2-r300:3/3 [2.0.4:3/25] USE="geoloc gstreamer introspection jit spell webgl (-aqua) -coverage -debug {-test} (-libsecret%*)" 0 kB [ebuild N ] mail-client/geary-0.4.0 USE="nls" 0 kB Total: 2 packages (1 downgrade, 1 new), Size of downloads: 0 kB !!! Multiple package instances within a single package slot have been pulled !!! into the dependency graph, resulting in a slot conflict: net-libs/webkit-gtk:3 (net-libs/webkit-gtk-2.0.4::gentoo, installed) pulled in by >=net-libs/webkit-gtk-1.11.92:3[jit?] required by (www-client/epiphany-3.8.2::gentoo, installed) (net-libs/webkit-gtk-1.10.2-r300::gentoo, ebuild scheduled for merge) pulled in by <net-libs/webkit-gtk-2.0.4:3[introspection] required by (mail-client/geary-0.4.0::gentoo, ebuild scheduled for merge)
then I misunderstood your comment does it build against 2.0.4?
+ 06 Oct 2013; Julian Ospald <hasufell@gentoo.org> geary-0.4.0.ebuild: + fix deps
Yes, it does build against 2.0.4. The reason why I added the blocker is because the upstream CMakeLists.txt contains a check for <= 2.0.4. Not sure why but I figured they know better :)
