3 files changed, 5 insertions, 127 deletions
diff --git a/mail-client/geary/ChangeLog b/mail-client/geary/ChangeLog
index ffcd087116f6..d9496387431d 100644
--- a/mail-client/geary/ChangeLog
+++ b/mail-client/geary/ChangeLog
@@ -1,6 +1,10 @@
 # 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.27 2014/09/18 13:09:24 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/geary/ChangeLog,v 1.28 2014/09/19 20:26:53 hasufell Exp $
+
+  19 Sep 2014; Julian Ospald <hasufell@gentoo.org> -geary-0.6.1.ebuild,
+  -files/geary-0.5.3-cflags.patch:
+  cleanup old
 
   18 Sep 2014; Agostino Sarubbo <ago@gentoo.org> geary-0.6.3-r1.ebuild:
   Stable for x86, wrt bug #522926
diff --git a/mail-client/geary/files/geary-0.5.3-cflags.patch b/mail-client/geary/files/geary-0.5.3-cflags.patch
deleted file mode 100644
index 7a7666b2c4f8..000000000000
--- a/mail-client/geary/files/geary-0.5.3-cflags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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/geary-0.6.1.ebuild b/mail-client/geary/geary-0.6.1.ebuild
deleted file mode 100644
index b7eaea8cb20f..000000000000
--- a/mail-client/geary/geary-0.6.1.ebuild
+++ /dev/null
@@ -1,99 +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.6.1.ebuild,v 1.3 2014/09/06 16:41:05 nimiux 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}
-	app-text/gnome-doc-utils
-	dev-util/desktop-file-utils
-	nls? ( sys-devel/gettext )
-	$(vala_depend)
-	virtual/pkgconfig"
-
-DOCS=( AUTHORS MAINTAINERS README NEWS THANKS )
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.3-{unity,cflags,vapigen}.patch \
-		"${FILESDIR}"/${PN}-0.6.0-desktopfile.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 "/^${i%.po}$/d" po/LINGUAS || 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
-}