9 files changed, 0 insertions, 454 deletions
diff --git a/mail-client/Manifest.gz b/mail-client/Manifest.gz
index 05f678347d22..1c126f6314b5 100644
--- a/mail-client/Manifest.gz
+++ b/mail-client/Manifest.gz
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index d2d8d8062c9d..dbafcf81d9bd 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,11 +1,7 @@
 AUX 3.24.6-DESTDIR-honoring.patch 1948 BLAKE2B a8f90d369e3428c29ce9eaaf7e4043cfdba8bc5bc4160a83a2d53a1a46ced571dd809f59f176927b75dc21728c8bd37e9d9751ecb3b9cae66bebaae37a2efc0d SHA512 251cfc15c6dfc54235560cdf206c93038023f12dd505d94432b2a2a71fc0a119dab4485a05a15b51867028369386d79e08926563adba567ada1e2a0f4ead119d
 AUX 3.24.6-libical3-compat.patch 10788 BLAKE2B 414a007abf354309bf3c29b7df4dcc7c93ca47c4ffa41dc4d311390a64688b86f8f228502efb3b6999e3df0885af30be4b141ed12efb250364cc9c442f711e6e SHA512 02145b859ab4e559728c5437e0d584fb57273264fb812ce4cfe65eb16b4c7c444b1db96c7ad0c9dcb817a7e71928a3dec3583d08cf3d59df2d3d12f310867231
 DIST evolution-3.22.4.tar.xz 12272488 BLAKE2B 7740d1d6e734fb7212d2b36f0a64dca03360ab059f0ca716522312c490f2b071a8fc6b383c98b429a6cb22ea5afec0e7e6c05dcb63b3908053ee891aa4129cdb SHA512 dd73a11d4d7903be6a99bf0d937f5a217a26f0dffb9dc0cea2ca81142d5783c42f889a8b913d565678e9f55b7f2f2a1d42f06c30e3cb004926c19f44dae3b70f
-DIST evolution-3.22.6.tar.xz 12288232 BLAKE2B d9412ee86621fd87bbfdb5799de64a148c766642e62b6781a7a9111819ea9b3cd1aa94d95f71df2e46fdb347aedc8b28488a7ca6f7940f08644b00cdfc9f190d SHA512 c699adae640d05558b583b05eda5c5ad3de99aa1d1bbfa24af6110be41251f715ff4b16ff0efb96c8de7faa8c895d82460b504c2704974d4c9731f1bc3e7739f
-DIST evolution-3.24.5.tar.xz 12140736 BLAKE2B e144307693f6ae1824aafd3444b38e435414aa1e7900b3622b5f36098d1c8d073ff565896bea07ad9eca076482d98c3bcea70e7d08d37c5fdcd68226d8bc4588 SHA512 daba1ebd9407219b3abe959b27adb32eb0038a9c1653c360a19cf28f8849004a8cd4a652562d696045311c13d19030f93d3578e09d06fff01534ada28f883f2c
 DIST evolution-3.24.6.tar.xz 12153692 BLAKE2B ced20d9e08f6b9aac65be6f5ecd5beb861feec40dddc4411b1bdc6519e249de8db8b3319450808d7a31b80386f9830f351b7edacb3c6fcd28fe5fdfe343329f7 SHA512 da5c9062791996735e52575894763597cc957cb17bc0abe46a966f0e3e6706550ce534ae03b2c444d142547119f3a59aec6ee17e0302a002d8437da166ef7178
 EBUILD evolution-3.22.4.ebuild 4086 BLAKE2B 43e3c62a5c89f72a4539e92f4695db1fa8e890d4638c81045bf359f53d64d969fc958e20c1bb47885f4ea77895f651e2d023b613ca8ba2f45914947094531303 SHA512 6b419b6eba9a57551b889ca94fc18770789a24a7e8aeba1aa6c49186aa656b27d3045f571f05781aada1bcb18dfecaeff557fa28404a0e5380cbf1eb7b03e744
-EBUILD evolution-3.22.6.ebuild 4069 BLAKE2B 3b8cbaf03bfbe4883d67ff982481d6abb85f3edab97e9ec3ffee30ea4fe822e5803ac37e28310cb6da6b0a170f6de378a8b44044de254daa1958600c5420e074 SHA512 bf276e7f5c0d6936b5166e739ac7d5b1f3349684cbd940a629baf37b505a78ebbcaa1f79a5eb634db8d903db8e881dcf9f4bd14f94402e3904d3c9f074a6230d
-EBUILD evolution-3.24.5.ebuild 4374 BLAKE2B 9793bdc3cf4eb793a88b42bb3935fc0674182f88d8535c0f631654fb35301a3804654db620cb322cbb1c3d198a31a2d9b227f0626b6827511a37f01e0102d85c SHA512 18020872e0c355671307098d4dc36b2c800a253cbc51392494f9190fe45c4c5d17e4fdb7ccec4a70d1c04e76b1822d9d4897a02fbc7b33d4784540460012160b
 EBUILD evolution-3.24.6.ebuild 4536 BLAKE2B 6a533b93d2a912fb5b78a5e52f25b76625fd4ba78eacf6d73db7ba9a20ef98961714ea344a5d6dd38ae06ad69697ec388dce3b8fb92dd8c8e3aff04b586982fe SHA512 5bf391f8ddbc6dc82585224f9b5ff2c7f61a7892f2f42ac7f40124f61a64c01b5952a3441ce0d8b7462b14bb984fc4b72e461aeb4ad1b3fb3b7f13fc026dd3a3
 MISC metadata.xml 1205 BLAKE2B 66e8fe4cec38cecf66a4a781c5d3498d8f11d72f1298a1df615a1b178b53cfd435bbbbcfbb6805662027be17be00082f429cc1e3c93fd5ce54cd2b88c873df8c SHA512 8713d5f9cbc7efdc7245cb7b18d30132c96095e396a1c8559e8f942c87157b6b5f3de03daade3b6d2ad9fc53067bc938b7af4369beeec70ca01291c198e438bd
diff --git a/mail-client/evolution/evolution-3.22.6.ebuild b/mail-client/evolution/evolution-3.22.6.ebuild
deleted file mode 100644
index a4d426c68304..000000000000
--- a/mail-client/evolution/evolution-3.22.6.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather"
-
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 x86"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4:=[gtk]
-	>=app-text/enchant-1.1.7
-	>=dev-libs/glib-2.46:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/webkit-gtk-2.13.90:4
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.10:3
-	>=x11-libs/libnotify-0.7:=
-	>=x11-misc/shared-mime-info-0.22
-
-	>=app-text/iso-codes-0.49
-	dev-libs/atk
-	gnome-base/dconf
-	dev-libs/libical:=
-	x11-libs/libSM
-	x11-libs/libICE
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	crypt? (
-		>=app-crypt/gnupg-1.4
-		${PINENTRY_DEPEND}
-		x11-libs/libcryptui )
-	geolocation? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0
-		x11-libs/mx:1.0 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spell? ( app-text/gtkspell:3 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	>=gnome-base/gnome-common-2.12
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	gnome2_src_configure \
-		--without-glade-catalog \
-		--disable-code-coverage \
-		--disable-installed-tests \
-		--disable-pst-import \
-		--enable-canberra \
-		$(use_enable archive autoar) \
-		$(use_enable crypt libcryptui) \
-		$(use_enable highlight text-highlight) \
-		$(use_enable geolocation contact-maps) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl nss) \
-		$(use_enable ssl smime) \
-		$(use_with bogofilter) \
-		$(use_with ldap openldap) \
-		$(use_with spamassassin) \
-		$(usex ssl --enable-nss=yes "--without-nspr-libs
-			--without-nspr-includes
-			--without-nss-libs
-			--without-nss-includes") \
-		$(use_enable weather)
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Problems with prelink:
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
-	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
-	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.24.5.ebuild b/mail-client/evolution/evolution-3.24.5.ebuild
deleted file mode 100644
index bc07cd120c04..000000000000
--- a/mail-client/evolution/evolution-3.24.5.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit cmake-utils gnome2 flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="archive +bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather"
-
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~x86"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-COMMON_DEPEND="
-	>=app-crypt/gcr-3.4:=[gtk]
-	>=app-text/enchant-1.1.7
-	>=dev-libs/glib-2.46:2[dbus]
-	>=dev-libs/libxml2-2.7.3:2
-	>=gnome-base/gnome-desktop-2.91.3:3=
-	>=gnome-base/gsettings-desktop-schemas-2.91.92
-	>=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
-	>=media-libs/libcanberra-0.25[gtk3]
-	>=net-libs/libsoup-2.42:2.4
-	>=net-libs/webkit-gtk-2.13.90:4
-	>=x11-libs/cairo-1.9.15:=[glib]
-	>=x11-libs/gdk-pixbuf-2.24:2
-	>=x11-libs/gtk+-3.10:3
-	>=x11-libs/libnotify-0.7:=
-	>=x11-misc/shared-mime-info-0.22
-
-	>=app-text/iso-codes-0.49
-	dev-libs/atk
-	gnome-base/dconf
-	dev-libs/libical:=
-	x11-libs/libSM
-	x11-libs/libICE
-
-	archive? ( >=app-arch/gnome-autoar-0.1.1[gtk] )
-	crypt? (
-		>=app-crypt/gnupg-1.4
-		${PINENTRY_DEPEND}
-		x11-libs/libcryptui )
-	geolocation? (
-		>=media-libs/libchamplain-0.12:0.12[gtk]
-		>=media-libs/clutter-1.0.0:1.0
-		>=media-libs/clutter-gtk-0.90:1.0
-		>=sci-geosciences/geocode-glib-3.10.0
-		x11-libs/mx:1.0 )
-	ldap? ( >=net-nds/openldap-2:= )
-	spell? ( app-text/gtkspell:3 )
-	ssl? (
-		>=dev-libs/nspr-4.6.1:=
-		>=dev-libs/nss-3.11:= )
-	weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools
-	dev-util/gdbus-codegen
-	>=dev-util/gtk-doc-am-1.14
-	>=dev-util/intltool-0.40.0
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	bogofilter? ( mail-filter/bogofilter )
-	highlight? ( app-text/highlight )
-	spamassassin? ( mail-filter/spamassassin )
-	!gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_prepare() {
-	# Leave post-install actions to eclass
-	sed -e "s;\(find_program(GTK_UPDATE_ICON_CACHE\).*;\1 $(type -P true));" \
-		-i "${S}"/cmake/modules/IconCache.cmake || die
-
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Use NSS/NSPR only if 'ssl' is enabled.
-	local mycmakeargs=(
-		-DENABLE_SCHEMAS_COMPILE=OFF
-		-DENABLE_GTK_DOC=OFF
-		-DWITH_OPENLDAP=$(usex ldap)
-		-DENABLE_SMIME=$(usex ssl)
-		-DENABLE_GNOME_DESKTOP=ON
-		-DENABLE_CANBERRA=ON
-		-DENABLE_AUTOAR=$(usex archive)
-		-DWITH_HELP=ON
-		-DENABLE_LIBCRYPTUI=$(usex crypt)
-		-DENABLE_YTNEF=OFF
-		-DWITH_BOGOFILTER=$(usex bogofilter)
-		-DWITH_SPAMASSASSIN=$(usex spamassassin)
-		-DENABLE_GTKSPELL=$(usex spell)
-		-DENABLE_TEXT_HIGHLIGHT=$(usex highlight)
-		-DENABLE_WEATHER=$(usex weather)
-		-DENABLE_CONTACT_MAPS=$(usex geolocation)
-		-DENABLE_PST_IMPORT=OFF
-		-DWITH_GLADE_CATALOG=OFF
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile
-}
-
-src_test() {
-	cmake-utils_src_test
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	# Problems with prelink:
-	# https://bugzilla.gnome.org/show_bug.cgi?id=731680
-	# https://bugzilla.gnome.org/show_bug.cgi?id=732148
-	# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
-	echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
-	doenvd "${T}"/99${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-	readme.gentoo_print_elog
-}
diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index f1aa16d6a3f2..903490ee20b0 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,8 +1,3 @@
-AUX geary-0.5.3-vapigen.patch 1210 BLAKE2B 7bc7d864a78af7605495c489735b7b23282dc46cd7d6c561481007adb1470f08b590ec5fe249bac33012d470dfd50d6ba5523ee023903d874215f94e35812d6d SHA512 16cb96080230390aa645faeae015cb996c6f48822c817b5540e65eea83a40738f18e5690b54140646800e494f1dd58b862708efe9566ef076ae51fb5dba5ac3f
-AUX geary-0.6.0-desktopfile.patch 291 BLAKE2B c6d62351f4e93dd3be061c53d28a70cdc865c7b4d64ca07757914be081f6f887d43ab7abb9452c56b440c3379bc0df2149fe0e6f40d9ffda7ddf88a87b65b54c SHA512 d7454a32822e2b19878bede717e707373646dc87ba5ed2fb0c972607f907b1ae57fecc7803e4eefeed1921fae3733fe73f593b6c0afec46e7da7efe561878b7c
-AUX geary-0.7.2-cflags.patch 659 BLAKE2B 09f34b7e3afc9edb9d11bb0d83671cf635a19976cf8315ee508743e72e836feb90d912803527e05b5b4c933fe4039bc1a055e6620c4465615e8404171eccf2e4 SHA512 b227930bc9977f126d15f78fcc1ce77bec4b7155e5b6af87af14bf3fb09f7f00c01ad9d860475ac56b1227b554deac0e8da41f3911ff06f1e54c46ae2d740ff7
-DIST geary-0.11.3.tar.xz 964024 BLAKE2B daf30b11f045741b4f5ec00d245afdcc04763f25526f3c5d12b0408fec9b0ce96a5ef53f01b622b4aed4bb43e879903385a545430d1e0e1bca14a80bce159f8b SHA512 dee389384b6bab25f939f0f40525670c27e3687cdfdfbc0c5632ccb2e9e189be3902aedb4fb37affb67c8b149e40ff78e41efbf8a754d76dcd405c8295be0d4b
 DIST geary-0.12.0.tar.xz 1064064 BLAKE2B c4021a784f7704494dfcf9013e4b108d9f921d553e47f55878de30c9878852ac2c023e679c33660cfe2fb190fac56dea4976eccb15bc1a512914442564a24e48 SHA512 caaf49065181f84234bbdb3dc20808f68cb7339e7ef3e992bd83789d3a474b5f59a210d54db2b4fe5f44539a2d52ad7f328087580748c74a513cca7be31c2e52
-EBUILD geary-0.11.3.ebuild 1892 BLAKE2B 6705d7e5003647847799bf56a73cca2de0ec3be6de6789cbbaae9e8cf20fe54d8d1be85aba2a6ff43bf990fadd0fa8cc0b10ef8d2d33ba94f7c50a7f9c013de3 SHA512 3693ccd3b21d527f76f440dc546fab9e04b0e3b444816fa39ff73ae170b6dc6ba127894d4c07998f140cad442a3a54390eaec1220fc3d2aeb356d36d7c768c05
 EBUILD geary-0.12.0.ebuild 1696 BLAKE2B e09db7ec9f677f5cd287be3a5a14852e443db1679c29e32c88cd72efefa911978e22fd4fd23c2c09dad6947746b4e2799eb2ec0d1b41094ec3cd091dd9c775cd SHA512 c70ced94dd34b205bf1ecd86b642856582cb4c44a14bfb83d316e1c816f520e5fdd4929afc14a23a1e08d982b2e6f52286f8be1c1da8b53a78372377adb17011
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/mail-client/geary/files/geary-0.5.3-vapigen.patch b/mail-client/geary/files/geary-0.5.3-vapigen.patch
deleted file mode 100644
index 18b3c8049b4b..000000000000
--- a/mail-client/geary/files/geary-0.5.3-vapigen.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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/files/geary-0.6.0-desktopfile.patch b/mail-client/geary/files/geary-0.6.0-desktopfile.patch
deleted file mode 100644
index 3ba892f0bb3d..000000000000
--- a/mail-client/geary/files/geary-0.6.0-desktopfile.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sun Mar 23 22:56:46 UTC 2014
-Subject: fix desktop file
-
---- a/desktop/geary.desktop.in
-+++ b/desktop/geary.desktop.in
-@@ -17,5 +17,3 @@
- [Desktop Action Compose]
- _Name=Compose Message
- Exec=geary mailto:
--OnlyShowIn=X-Messaging Menu;Unity;
--
diff --git a/mail-client/geary/files/geary-0.7.2-cflags.patch b/mail-client/geary/files/geary-0.7.2-cflags.patch
deleted file mode 100644
index 959ae4b1f34d..000000000000
--- a/mail-client/geary/files/geary-0.7.2-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
-     -DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\"
-     -DLANGUAGE_SUPPORT_DIRECTORY=\"${LANGUAGE_SUPPORT_DIRECTORY}\"
-     -DGCR_API_SUBJECT_TO_CHANGE
--    -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.11.3.ebuild b/mail-client/geary/geary-0.11.3.ebuild
deleted file mode 100644
index 3a15736c9595..000000000000
--- a/mail-client/geary/geary-0.11.3.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-# Keep cmake-utils at the end
-inherit gnome2 vala cmake-utils
-
-DESCRIPTION="A lightweight, easy-to-use, feature-rich email client"
-HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="nls"
-
-DEPEND="
-	>=app-crypt/gcr-3.10.1:0=[gtk,introspection,vala]
-	app-crypt/libsecret
-	dev-db/sqlite:3
-	dev-libs/glib:2[dbus]
-	>=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.10.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
-"
-
-src_prepare() {
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751556
-	# https://bugzilla.gnome.org/show_bug.cgi?id=772879 (recheck in
-	# 0.12)
-	eapply "${FILESDIR}"/${PN}-0.7.2-cflags.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751557
-	eapply "${FILESDIR}"/${PN}-0.5.3-vapigen.patch
-
-	# https://bugzilla.gnome.org/show_bug.cgi?id=751558
-	eapply "${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
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDESKTOP_UPDATE=OFF
-		-DNO_FATAL_WARNINGS=ON
-		-DGSETTINGS_COMPILE=OFF
-		-DICON_UPDATE=OFF
-		-DVALA_EXECUTABLE="${VALAC}"
-		-DWITH_UNITY=OFF
-		-DDESKTOP_VALIDATE=OFF
-	)
-
-	cmake-utils_src_configure
-}