version bump wrt #496958

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 165 insertions, 2 deletions

diff --git a/mail-client/geary/ChangeLog b/mail-client/geary/ChangeLog
index d63ed27ab71a..13968ff11589 100644
--- a/mail-client/geary/ChangeLog
+++ b/mail-client/geary/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for mail-client/geary
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.8 2013/12/25 00:55:42 hasufell Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.9 2014/01/08 16:13:27 hasufell Exp $
+
+*geary-0.4.3 (08 Jan 2014)
+
+  08 Jan 2014; Julian Ospald <hasufell@gentoo.org>
+  +files/geary-0.4.3-cflags.patch, +files/geary-0.4.3-unity.patch,
+  +geary-0.4.3.ebuild:
+  version bump wrt #496958
 
 *geary-0.4.2 (25 Dec 2013)
 
diff --git a/mail-client/geary/files/geary-0.4.3-cflags.patch b/mail-client/geary/files/geary-0.4.3-cflags.patch
new file mode 100644
index 000000000000..7a7666b2c4f8
--- /dev/null
+++ b/mail-client/geary/files/geary-0.4.3-cflags.patch
@@ -0,0 +1,27 @@
+commit e41cf68206eb16be678eeaa1dc998d94d2f93d57
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Aug 27 01:40:58 2013 +0200
+
+    respect system CFLAGS
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5202b99..949d494 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -471,16 +471,8 @@ set(CFLAGS
+     -D_GSETTINGS_DIR=\"${CMAKE_BINARY_DIR}/gsettings\"
+     -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
+     -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\"
+-    -g
+ )
+ 
+-if (NOT DEBUG)
+-    set(CFLAGS
+-        ${CFLAGS}
+-        -O2
+-    )    
+-endif ()
+-
+ if (REF_TRACKING)
+     message(STATUS "Reference tracking: ON")
+     set(EXTRA_VALA_OPTIONS
diff --git a/mail-client/geary/files/geary-0.4.3-unity.patch b/mail-client/geary/files/geary-0.4.3-unity.patch
new file mode 100644
index 000000000000..837b37f372ad
--- /dev/null
+++ b/mail-client/geary/files/geary-0.4.3-unity.patch
@@ -0,0 +1,31 @@
+commit 1f875e8a629a54748eb46237fd854359aa5edbc8
+Author: hasufell <hasufell@gentoo.org>
+Date:   Tue Aug 27 01:40:45 2013 +0200
+
+    provide option for unity
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 66145c9..5d4464c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -32,6 +32,7 @@
+ option(ICON_UPDATE "Run gtk-update-icon-cache after the install." ON)
+ option(DESKTOP_UPDATE "Run update-desktop-database after the install." ON)
+ option(DESKTOP_VALIDATE "Check generated desktop file for errors during build." ON)
++option(WITH_UNITY "Add unity support." OFF)
+ 
+ if (DEBUG)
+     message(STATUS "Debug build")
+@@ -50,8 +51,10 @@
+ endif ()
+ 
+ find_package(PkgConfig)
+-pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
+-pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
++if (WITH_UNITY)
++	pkg_check_modules(LIBUNITY QUIET unity>=5.12.0)
++	pkg_check_modules(LIBMESSAGINGMENU QUIET messaging-menu>=12.10.2)
++endif ()
+ pkg_check_modules(WEBKITGTK110X QUIET webkitgtk-3.0<=1.10.2)
+ pkg_check_modules(WEBKITGTK22X QUIET webkitgtk-3.0>=2.2.0)
+ 
diff --git a/mail-client/geary/geary-0.4.3.ebuild b/mail-client/geary/geary-0.4.3.ebuild
new file mode 100644
index 000000000000..f17838f5a917
--- /dev/null
+++ b/mail-client/geary/geary-0.4.3.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.4.3.ebuild,v 1.1 2014/01/08 16:13:27 hasufell Exp $
+
+EAPI=5
+
+VALA_MIN_API_VERSION=0.20
+
+inherit eutils fdo-mime gnome2-utils vala cmake-utils
+
+MY_P=${P/_pre/pr}
+DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
+HOMEPAGE="http://www.yorba.org/projects/geary/"
+SRC_URI="ftp://ftp.gnome.org/pub/GNOME/sources/geary/${PV:0:3}/${MY_P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+DEPEND="
+	app-crypt/libsecret
+	dev-db/sqlite:3
+	dev-libs/glib:2
+	>=dev-libs/libgee-0.8.5:0.8
+	dev-libs/libunique:3
+	dev-libs/libxml2:2
+	dev-libs/gmime:2.6
+	media-libs/libcanberra
+	>=net-libs/webkit-gtk-1.10.0:3[introspection]
+	>=x11-libs/gtk+-3.6.0:3[introspection]
+	x11-libs/libnotify"
+RDEPEND="${DEPEND}
+	gnome-base/gsettings-desktop-schemas
+	nls? ( virtual/libintl )"
+DEPEND="${DEPEND}
+	nls? ( sys-devel/gettext )
+	$(vala_depend)
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-{unity,cflags}.patch
+
+	local i
+	if use nls ; then
+		if [[ -n "${LINGUAS+x}" ]] ; then
+			for i in $(cd po ; echo *.po) ; do
+				if ! has ${i%.po} ${LINGUAS} ; then
+					sed -i -e "s/\s${i%.po}$//" po/CMakeLists.txt || die
+					rm po/${i} || die
+				fi
+			done
+		fi
+	else
+		sed -i -e 's#add_subdirectory(po)##' CMakeLists.txt || die
+	fi
+
+	cmake-utils_src_prepare
+	vala_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DDESKTOP_UPDATE=OFF
+		-DGSETTINGS_COMPILE=OFF
+		-DICON_UPDATE=OFF
+		-DVALA_EXECUTABLE="${VALAC}"
+		-DWITH_UNITY=OFF
+		-DDESKTOP_VALIDATE=OFF
+	)
+
+	cmake-utils_src_configure
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+	gnome2_schemas_savelist
+}
+
+pkg_postinst() {
+	elog "For libnotify sounds you will need"
+	elog "\"alsa\" or \"pulseaudio\" useflag of media-libs/libcanberra"
+	elog "enabled."
+
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+	gnome2_schemas_update
+}