version bump wrt #503486, remove old

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key BDEED020)

9 files changed, 97 insertions, 393 deletions

diff --git a/mail-client/geary/ChangeLog b/mail-client/geary/ChangeLog
index c13303a7807c..d86f2a019717 100644
--- a/mail-client/geary/ChangeLog
+++ b/mail-client/geary/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for mail-client/geary
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.12 2014/02/15 20:42:57 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.13 2014/03/05 23:48:05 hasufell Exp $
+
+*geary-0.5.3 (05 Mar 2014)
+
+  05 Mar 2014; Julian Ospald <hasufell@gentoo.org> -geary-0.3.1.ebuild,
+  -geary-0.4.0.ebuild, -geary-0.4.2.ebuild, -geary-0.5.0.ebuild,
+  -geary-0.5.1.ebuild, +geary-0.5.3.ebuild, +files/geary-0.5.3-cflags.patch,
+  +files/geary-0.5.3-unity.patch, +files/geary-0.5.3-vapigen.patch:
+  version bump wrt #503486, remove old
 
 *geary-0.5.2 (15 Feb 2014)
 
diff --git a/mail-client/geary/files/geary-0.5.3-cflags.patch b/mail-client/geary/files/geary-0.5.3-cflags.patch
new file mode 100644
index 000000000000..7a7666b2c4f8
--- /dev/null
+++ b/mail-client/geary/files/geary-0.5.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.5.3-unity.patch b/mail-client/geary/files/geary-0.5.3-unity.patch
new file mode 100644
index 000000000000..7bf282963564
--- /dev/null
+++ b/mail-client/geary/files/geary-0.5.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
+@@ -28,6 +28,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")
+@@ -46,8 +47,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 ()
+ 
+ # CMake's range-checking syntax doesn't allow for a bare less-than, so using
+ # improbably high version numbers to indicate maximum
diff --git a/mail-client/geary/files/geary-0.5.3-vapigen.patch b/mail-client/geary/files/geary-0.5.3-vapigen.patch
new file mode 100644
index 000000000000..18b3c8049b4b
--- /dev/null
+++ b/mail-client/geary/files/geary-0.5.3-vapigen.patch
@@ -0,0 +1,29 @@
+From: Julian Ospald <hasufell@gentoo.org>
+Date: Sun Feb  2 00:17:18 UTC 2014
+Subject: gentoo specific
+
+--- geary-0.5.1.tar.xz/src/CMakeLists.txt
++++ geary-0.5.1.tar.xz/src/CMakeLists.txt
+@@ -399,12 +399,7 @@
+ include(ValaPrecompile)
+ 
+ # Vapigen
+-find_program(VAPIGEN vapigen)
+-if (VAPIGEN STREQUAL "VAPIGEN-NOTFOUND")
+-    message(FATAL_ERROR "vapigen must be installed to build Geary.")
+-else ()
+-    message(STATUS "Found vapigen: " ${VAPIGEN})
+-endif ()
++set(VAPIGEN $ENV{VAPIGEN})
+ 
+ # Packages
+ if (LIBMESSAGINGMENU_FOUND)
+@@ -615,7 +610,7 @@
+     WORKING_DIRECTORY
+         ${CMAKE_SOURCE_DIR}/bindings/metadata
+     COMMAND
+-        vapigen --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
++	$ENV{VAPIGEN} --pkg=gio-2.0 --pkg=gtk+-3.0 --pkg=libsoup-2.4 --metadatadir=. --metadatadir=${WEBKITGTK_METADATA_DIR} --library=webkitgtk-3.0 --directory=${CMAKE_BINARY_DIR}/src ${WEBKITGTK_CUSTOM_VALA} `pkg-config --variable=girdir gobject-introspection-1.0`/WebKit-3.0.gir
+ )
+ 
+ # Geary client app
diff --git a/mail-client/geary/geary-0.3.1.ebuild b/mail-client/geary/geary-0.3.1.ebuild
deleted file mode 100644
index 4857e389f6ea..000000000000
--- a/mail-client/geary/geary-0.3.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.3.1.ebuild,v 1.2 2013/05/30 13:45:08 hasufell Exp $
-
-# REMINDER: next release probably swaps gnome-keyring for libsecret-1
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.17
-
-inherit eutils fdo-mime gnome2-utils vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="http://www.yorba.org/projects/geary/"
-SRC_URI="http://yorba.org/download/geary/${PV:0:3}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="ayatana nls"
-
-DEPEND="
-	dev-db/sqlite:3
-	dev-libs/glib:2
-	dev-libs/libgee:0
-	dev-libs/libunique:3
-	dev-libs/gmime:2.6
-	>=gnome-base/libgnome-keyring-3.2.2
-	media-libs/libcanberra
-	net-libs/webkit-gtk:3[introspection]
-	>=x11-libs/gtk+-3.4.0:3[introspection]
-	x11-libs/libnotify
-	ayatana? ( dev-libs/libindicate:3 )"
-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 )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-{ayatana,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
-		$(cmake-utils_use_with ayatana LIBINDICATE)
-	)
-
-	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
-}
diff --git a/mail-client/geary/geary-0.4.0.ebuild b/mail-client/geary/geary-0.4.0.ebuild
deleted file mode 100644
index 211bdaa65777..000000000000
--- a/mail-client/geary/geary-0.4.0.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# 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.ebuild,v 1.2 2013/10/06 21:53:34 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="http://yorba.org/download/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]
-	<=net-libs/webkit-gtk-2.0.4: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
-}
diff --git a/mail-client/geary/geary-0.4.2.ebuild b/mail-client/geary/geary-0.4.2.ebuild
deleted file mode 100644
index 09ddfb3afaca..000000000000
--- a/mail-client/geary/geary-0.4.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# 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.2.ebuild,v 1.1 2013/12/25 00:55:42 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="http://yorba.org/download/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
-}
diff --git a/mail-client/geary/geary-0.5.0.ebuild b/mail-client/geary/geary-0.5.0.ebuild
deleted file mode 100644
index 997909859956..000000000000
--- a/mail-client/geary/geary-0.5.0.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# 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.5.0.ebuild,v 1.1 2014/01/08 21:05:24 hasufell Exp $
-
-EAPI=5
-
-VALA_MIN_API_VERSION=0.22
-
-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/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
-}
diff --git a/mail-client/geary/geary-0.5.1.ebuild b/mail-client/geary/geary-0.5.3.ebuild
index 55bd7a41b1df..fda0d25d7a63 100644
--- a/mail-client/geary/geary-0.5.1.ebuild
+++ b/mail-client/geary/geary-0.5.3.ebuild
@@ -1,6 +1,6 @@
 # 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.5.1.ebuild,v 1.1 2014/02/02 00:36:51 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/geary-0.5.3.ebuild,v 1.1 2014/03/05 23:48:05 hasufell Exp $
 
 EAPI=5