gentoo resync : 24.12.2018

3 files changed, 3 insertions, 82 deletions

diff --git a/mail-client/geary/Manifest b/mail-client/geary/Manifest
index 786a1297fb01..85ff8322112b 100644
--- a/mail-client/geary/Manifest
+++ b/mail-client/geary/Manifest
@@ -1,5 +1,3 @@
-DIST geary-0.12.0.tar.xz 1064064 BLAKE2B c4021a784f7704494dfcf9013e4b108d9f921d553e47f55878de30c9878852ac2c023e679c33660cfe2fb190fac56dea4976eccb15bc1a512914442564a24e48 SHA512 caaf49065181f84234bbdb3dc20808f68cb7339e7ef3e992bd83789d3a474b5f59a210d54db2b4fe5f44539a2d52ad7f328087580748c74a513cca7be31c2e52
 DIST geary-0.12.3.tar.xz 1069444 BLAKE2B 73f4382cd97813fcb3921daeab4338f4797bef2b5dcb1f7df1afeb75be48877109dcb15317f9bbe595326ee38f9ea3359a7d062c39ea3d83e1d36c34b680e707 SHA512 0e22b7ad8b79d17e55f6ab75a13883db04b21b1be9c2b06b08009e48fe433de323e23414ae8e47543bcb7785d6aa90bea582a2e20eaed1ce7bcb02687a69b9b6
-EBUILD geary-0.12.0.ebuild 1696 BLAKE2B e09db7ec9f677f5cd287be3a5a14852e443db1679c29e32c88cd72efefa911978e22fd4fd23c2c09dad6947746b4e2799eb2ec0d1b41094ec3cd091dd9c775cd SHA512 c70ced94dd34b205bf1ecd86b642856582cb4c44a14bfb83d316e1c816f520e5fdd4929afc14a23a1e08d982b2e6f52286f8be1c1da8b53a78372377adb17011
-EBUILD geary-0.12.3.ebuild 1971 BLAKE2B 70f8d301bc48a2a448cd32a1e0cfd8b7f260f22d0f559ce9d8dd9f76fe6799aed1b78a87d25dce3f47d68b5ecf0f2e6cd88e0ba121181d9789d38791ffcc275e SHA512 d67227a25b5b9c67bb2ca2f3508efc0a2f1cb1e74c7919fde37702b60898a4b895438c68d6d1e17d43adf4ef4244864c3c319448cff314b2f017fce1020ddf1a
+EBUILD geary-0.12.3.ebuild 1966 BLAKE2B 71ef0ad6f68c44fe8df194c8fb5caf39ace3fb9353e7e916ba8008ef6204c4d497eea8f122a2eed2667fd7562e4e558a8a3caa46ada46a880dc31d702b12294a SHA512 e362fbb121707a35e6d64c767cd11998becb7764cffb0e9a040a1402f9a5c5cef5f8e5fb8a955347dff0dd89aa1e188dc43f205d59928a52858d10ae61d1ab4a
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/mail-client/geary/geary-0.12.0.ebuild b/mail-client/geary/geary-0.12.0.ebuild
deleted file mode 100644
index e50c3dfda668..000000000000
--- a/mail-client/geary/geary-0.12.0.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2018 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
-	app-text/iso-codes
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.42: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-2.10.0:4=[introspection]
-	>=x11-libs/gtk+-3.14.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=751557
-	sed -i -e 's/vapigen --library/${VAPIGEN} --library/' src/CMakeLists.txt || die
-
-	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}"
-		-DVAPIGEN="${VAPIGEN}"
-		-DWITH_UNITY=OFF
-		-DDESKTOP_VALIDATE=OFF
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/mail-client/geary/geary-0.12.3.ebuild b/mail-client/geary/geary-0.12.3.ebuild
index 6ed3152f6cc8..832bb862d28f 100644
--- a/mail-client/geary/geary-0.12.3.ebuild
+++ b/mail-client/geary/geary-0.12.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Geary"
 
 LICENSE="LGPL-2.1+ BSD-2 CC-BY-3.0 CC-BY-SA-3.0" # code is LGPL-2.1+, BSD-2 for bundled snowball-stemmer, CC licenses for some icons
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=dev-libs/glib-2.42:2