gentoo resync : 06.08.2019

7 files changed, 8 insertions, 183 deletions

diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 475451fcddc3..8a98bfdfd196 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 5c1a4397edd3..362aec297d14 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -16,23 +16,23 @@ DIST git-2.19.2.tar.xz 5235608 BLAKE2B ece292b8cf41deafc63c00e6176b0de39936f7d84
 DIST git-2.21.0.tar.xz 5491296 BLAKE2B c5e66f4d4045f99bb4306e8f096ae9299908383df78bdf2a954cd415f4778eb59ea0ee7d501689313617de7dc1d2ee4ae15ab70dee564add5de877109073ddff SHA512 83f57c3950a07f6773a3aea66611d22daba0e5599e5d8f0751a16f6fdbeab0f3844d942a39a5642051212df99d1d4513253c36829b1454b4f0977cc6026fd973
 DIST git-2.22.0.tar.xz 5609772 BLAKE2B 3fd84987eba4873d7eca56cc2d28e15cc22e5c382f47e831f12c06b05c1a971d5713e7096b609ec5321e5ae4c63c78ebc7747f7e0948d12bf1ac19a911405d6d SHA512 75b3dcac36f80281effcd099944de34050a35f3599ce42f86ce60455b6c952039fb0f6438d296e0cc9c0651d4a17f467780dc475669227d3c98ddefe91723d42
 DIST git-2.22.1.tar.xz 5616124 BLAKE2B 2856bf5dc446921eab0fb92db6c6505de870d75f2baf7e95cf5796acba3198db789f26bc617da2a1f736fa3a22ee91b77524213ba880f959ea71c449b604f7c2 SHA512 8fa0900e1a583cdacbafa2e0d00a4cb50ad225c11227f6a811b721e56677b62b1354995e2b7117a66b1e89dbcb2cddc1eee7ef1e57723d9615a063a318095f14
-DIST git-2.23.0.rc2.tar.xz 5677896 BLAKE2B 72c8dabb7de4dbde7967f2865adf65e6877ab9322b6dd9c3c1d6f1a918b7e85f800223584739dc56caf4d17b9c24f831719f37f3869bd6bdc4df95cd632b7769 SHA512 5ce0581982858e80f12ce35a1e64803392b88d63cc79e45ab9c6f930324e248128d3ee9a158ded08b80e97fa01146759cec214bd6316b1cc51c19dc37d770a39
+DIST git-2.23.0.tar.xz 5707148 BLAKE2B a57642cfc297615c9510d9d746d83fc4174195bfefe22fc77098419e424d4f6e383896ad5509370c8cc35b2f4b531dcf5c5a4e9c2d2e99041ad15a40399ec4d2 SHA512 c0bb29b3689ec2e157f90df849599ca149a08fc0c69f6a68b1f3219b6335d521983e6ed58cd364b86398e4dcf9e84892fb9eded79a1c97b74150edca299cf671
 DIST git-htmldocs-2.19.2.tar.xz 1223848 BLAKE2B 6f30192cb101988fdfcce3bb79c684c6d1ac08cdc929caa049102fba10277fa8cc908904fe7472e40d60707c1b23145d95c441c1401c8697c37a81456d79aab8 SHA512 830e780beea10bde750d09a335fd9986c5ffbf47a724cbbeed5a1a2c94bc81d9c9223e415c5888faf81ab6404e460565434988f6635312039b88282a46014634
 DIST git-htmldocs-2.21.0.tar.xz 1234956 BLAKE2B d8ef32acbad7eeb8758f711e09c380dbf3ca72526067b3a86ed0865e37351c4fac1f0c7e845e7b0c27a1d955c64622f10c999389446b53191acdc05a44647847 SHA512 4537b3f67d03050e5daefaa6f274d3acdf6e116dc8c7f76566b33100e76a445c3e3894b5ff63b5ddb024e1c691a3bf08acea42dbec681da1b0f1de2e5736c9c4
 DIST git-htmldocs-2.22.0.tar.xz 1262136 BLAKE2B 0fea02449e73a9e1b125895f0e319704ccc5949cd68820cadb1a71fc06d182c3ce0629149c9d7f19bdab782fd8c0e1ac8661fc774253caf897fc8fd58e497d9e SHA512 2feab5d3bc70914d7980c8a22f950a9604cbaace2e867119776715f1ba7bdb3c742fbd9aaa827210b234e6381d98611e02dec4e50db4cae4e20bb72116afecb1
 DIST git-htmldocs-2.22.1.tar.xz 1264164 BLAKE2B 88722e4438c75bf875477caaa40060955f52ddadaa13f506fe975eaa92748fc44e2ba1ccfe15d88843013e931975176eb6b7433efe4d71bbbc3cca2ac6afd037 SHA512 b78d5a59df2ec4beff3915b15c0c6af0e54dbf457f0e29c8d92c49880259f03a91b12b40787a1d0b7c9751f42e48a9a3fd1258818121d5d0f45b1cc8d45b3715
-DIST git-htmldocs-2.23.0.rc2.tar.xz 1294236 BLAKE2B 1370b0c97af1fb0d24d0c8081e158e8c5a629e4ab6a6ef8d95e8c38f17945fea15a16940ef1251f45706dfc96e25107e04d7576d6059248d98bcbab4585015a5 SHA512 fd4f88a8172ea917375760dbd66fb14d863903aea4a39dad5d0b7f482d864a068925c70a3f3a3e315fda4f6f885e8174c63786f5a50ea1fb7c0f6edd52aae6b2
+DIST git-htmldocs-2.23.0.tar.xz 1294240 BLAKE2B 7420eb836d582448a996d8302d1e4873316baadd3a1baae555935443028af6a9c9e1fa629d5e0667901b8c63cce19bbf5e46c5fcb09b50382751e6b2cbc3d514 SHA512 165c8989ed9c0c09125e2e99beeddd1f2bb4d00ecae4aa58bcbfb1f1a8cd5a6ad646035e984471484fd1e943437d5d42d917e8c32b1207c590a1fc7c9bebc2dc
 DIST git-manpages-2.19.2.tar.xz 432200 BLAKE2B 92b4c87c40e20133c4b6d9b7f3d56952556470855543a329ea0fb7a91382396376755656ded029d68df8291b0ffecc3e6b2b4c6f71cb8694d44c5f02da7357f8 SHA512 329ea9a6de4a5352c57d2ea3df0cf6caf9dcf03728416a3bca5a5ebc5dc133abe1faffd5e5b5ae11cc91412baff93df83ff684f3626bbac0770ca94bc79d2cb1
 DIST git-manpages-2.21.0.tar.xz 440096 BLAKE2B 6cbedf6e497b0d13c62003b166293a0d438d163255bce845eaf75e08a3eec49060c314e73d24c1c015101868d9149e9b0cd1c2e8cb3ce2245b8acae5701fe8ba SHA512 61e01cd312dbade8aac0144e32edc5eea2708b274273c207889a291cea18d131c9c2d83cc405ba8a955d387fd1e6dd74b7bdae4003f2062501073a0844122d30
 DIST git-manpages-2.22.0.tar.xz 443320 BLAKE2B 900efc3c90ab949bea4655a82febd01a8ec9dfdd39cff3d9cffb5912925bdc60567c3f8cc3fe63a42eb4c390d795b02f30608f672481e41a2aaae8ce9edc109a SHA512 ed9d2ba78fe5081c80a1ffb911ce0e0d883a76b3b4b3d1469c46932e710d1565cf223f74f1402fe94430e3eda514406829b2c422f31ced63ff5126004fdb36d9
 DIST git-manpages-2.22.1.tar.xz 443912 BLAKE2B 794f2edaf2cd4436b9dd19005dfe6e8b92d994fee49ac0b38ccc12cbc9fc0a7bc95c1d6fe6882a91f72ceb3cb1729c0a6d7abcd1f5d00f2e7ab36af6c604718e SHA512 e7d2c9c868fc57271e9c70771a0da527597428a55647d0779fce818988c8f74fc61dba0804cb789e1200c9147c7853bd7f89c241e5c477fd30a119d0104905d6
-DIST git-manpages-2.23.0.rc2.tar.xz 448328 BLAKE2B da7222e5578d86627a037f4385b8b4b49a58e85af1f3c1a974d202b37bce0da1b69b89323b3a66b486e57686568cb6e74b488a3425a21d5706d9b5edf3547ac1 SHA512 fbc770b33a33e00faa974b972f04b7c3124a359585dceae4ab187281d38c26ae1a021ede70499b5c36d3a5369ccf10862fd048121f8a77df4ff0dbc306f8df6c
+DIST git-manpages-2.23.0.tar.xz 448272 BLAKE2B 34dcb535caf54bfa9ea8e9f2d8104fe74e4c38398d685a712735c0199dab59cfeac16f863c6285a1122139cb2be99cfad4ba7c3f71e88603284815536172ccbc SHA512 f4316f28d8f462804cee3e6f5d19a1426087dbeb0e6141148d9b021562c86723cbd4f96d30cc650b2b41230e097c3a1f574055b8b7e5025cbb90089484bf9e96
 EBUILD git-2.19.2.ebuild 19013 BLAKE2B 5ac67e85648aeaca6ccf506c0348b7d21509c7f9a463309a5657f2f4dcdf1136c65559c6b8aa3159fb2b91c39d5dc4af35755bb32498645ec554e769bedf72cf SHA512 99bfefa79aa4b00a0dbcfcb944efb6dcc5fdbfa5927c6b6d84ce03a1410f206e753f1a62c4ca960b3b016081b37c30280436cbf4028caf18ea27c454bb9b0dac
 EBUILD git-2.21.0-r2.ebuild 19251 BLAKE2B 536737c9f0380b649019ee5fcfb1e4294cef7231c876ec05d095699fbe3538c75178f6861d7e37ec8b9a13a1d4f7cf588410044cfe6c8f1b71cb5a50f7d1aa25 SHA512 24ef89e02273ce490068da570eb6c9808a9672d38db68140e6e3c2e5c83974f7d1f55d33caf060514bccd801d488752fd9fc0670de6df6c18821d8fc2206cd01
 EBUILD git-2.21.0.ebuild 19070 BLAKE2B fb5bca963913d9994c90e553cb27ae70596e180ed97d029adf38ae01ed27f48b19b52607df31b93b0485bcdbcac433d5b935e580230b2986a1ecf4af30c3d92e SHA512 f071bca6a089fb96ea19615d4919c5e52538bcdb92251b85741fe6d61d4fce3ea5892f040058c90d3ea89805630f1725f5d0795086a713ffa323a1212ac3406a
 EBUILD git-2.22.0.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
 EBUILD git-2.22.1.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
-EBUILD git-2.23.0_rc2.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
+EBUILD git-2.23.0.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
 EBUILD git-9999-r1.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
 EBUILD git-9999-r2.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
 EBUILD git-9999-r3.ebuild 19499 BLAKE2B 1a8e4642b8c8ea44640e46d8302a7c13367ad9a7ea2ff9bf9152c015308f92e9c7743d78bf00dc89e91ad037072512f416b95c2e8f05eab982c2403122fe30be SHA512 7bb5c95a0775648ddf88389e5ec51dc95a77815b53f9c57731ad7b13787672a19ee47470c271c128f67b49b2a5fb89780d956eb1e1f3d45f650273982cad7c44
diff --git a/dev-vcs/git/git-2.23.0_rc2.ebuild b/dev-vcs/git/git-2.23.0.ebuild
index f3b738828c17..f3b738828c17 100644
--- a/dev-vcs/git/git-2.23.0_rc2.ebuild
+++ b/dev-vcs/git/git-2.23.0.ebuild
diff --git a/dev-vcs/gitg/Manifest b/dev-vcs/gitg/Manifest
index 79e5cff7da04..e79f68f49b7e 100644
--- a/dev-vcs/gitg/Manifest
+++ b/dev-vcs/gitg/Manifest
@@ -1,7 +1,3 @@
-DIST gitg-3.26.0.tar.xz 1551308 BLAKE2B 45a9fd3df8eb891c4e07eefb6cf8f9b517c78dccc63dd08498b4c847614e164472e0605a01c81515ea349366e56c21c99a4558e73b6548b18bb94f578c0fc9bd SHA512 782aa02e2f0f4d8c86ad726045502d545877d835f0449d2ec646d93a78bbfa50f84662d3a437c922eb168b2737c00ec088dc2c73487742f332e3910f041b519d
-DIST gitg-3.30.1.tar.xz 10555888 BLAKE2B 02e8f957eee82bbf0702ca39b5b336929c131a93a94f5e28a2e4aa7c2c473c5d8bda072eba184cef37d6ad2fa7bfa21c007c86204a0a81b6d401487d752952fd SHA512 0d9241422dda6bf1840632fbcabf6b640554081ba995eba59ce90f893654e42c0ca8953e814533b90f362abb13b002e7a74b5f6841aee1f33c2834d2acab869f
 DIST gitg-3.32.1.tar.xz 10613836 BLAKE2B 43c2c37f5c06cb6155906d5988f0787334af7a9091e537fa7b0fc1a9de3138f261a3e3c578afc663c7b57a33f39c19318a53daf7896c465922138197c3bbb778 SHA512 243e630b3e5bb1919dc307e6b3fed1b1b0e3884d2a2507e4526b4af61e86f1cd7004a3dbb96001ffb0280cefe7cdb9b109c39996718913c7410224830c0145a4
-EBUILD gitg-3.26.0.ebuild 1922 BLAKE2B 7b86abf6af11e82908ddabe99737ee663a63b407b80562545b34b6b9252937185e85c9cc2fa7007f33bcbdcfc2865daf30361b77b849c298624cc5ff1e02cf1b SHA512 b99a42a88bc033d5425d7dfb21054f594f1a1255ca77befc387320d33d4df92c54c41d7bf322363fe5b93bb669ba4729e68f9992d382c7e644065dddf1fdc5c4
-EBUILD gitg-3.30.1.ebuild 1942 BLAKE2B 12feca54eaaf676b14aac41a4f4c805a2a2f5df5acab6e4be8e7dc3fe54a8aaea067d8e74e8cba9d3da760edbfbce0e103553380ea5b504ed80c376cd95f4988 SHA512 090749745016a612ad59308ffe1d80507f81e4cc4170fd1bfacbcb061a5572215592d2378734bf00426c9cb0171396a62517c93f0671fa2be3346cb170081540
-EBUILD gitg-3.32.1.ebuild 1931 BLAKE2B 83b768bd55b676e5b9783663ab30afadea233cb4d738592920ddca57f6b10c37015df233b4347b2510502103305f73431bc52a98c24f950fc8ec008e54ffb847 SHA512 6b1aa1008563a6a31a3be45ad63eeb11200ddc6706c8cdc69f99ac94f169b6181842a35f8e17139e8f9474cfb9a0d110fa5c876b17982fd80a940bdacc9d26ca
+EBUILD gitg-3.32.1.ebuild 1956 BLAKE2B 5b2e6dbe5794956e98b08a3e44717b79c2713dbb598978fec46f29eb234107699525d904da0e45d6d08d6eee7bab99fd85be7fc5667025bc114211b89e6e64cd SHA512 f0fcda0136c7c940edc9ae5e787aa3c56243217cfb4b57ac94441cf1d929a217317fbe215d136b586bf0a22693eadf947b28a1e62971193f8513e5dae66fdcb1
 MISC metadata.xml 927 BLAKE2B f967c30f2442bbbef782e69c044900db8bd733c5463b2aeff35496225be549827e8e8f9b7d072ae9396500cdcaecc9f7b4902524b5a3768848736d0bab8adc35 SHA512 889733c311b2ab0e35aadc3fff1bcb50c3dad59186293e2f46e81ba4a0041137938e38f12bcfa40d793a04462bbce25aa476bc9241fb5c7a5c4a25611e371d30
diff --git a/dev-vcs/gitg/gitg-3.26.0.ebuild b/dev-vcs/gitg/gitg-3.26.0.ebuild
deleted file mode 100644
index 46818ef6d31e..000000000000
--- a/dev-vcs/gitg/gitg-3.26.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python3_{5,6} )
-VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
-
-inherit gnome2 pax-utils python-r1 vala
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="glade +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	app-crypt/libsecret
-	dev-libs/libgee:0.8[introspection]
-	>=app-text/gtkspell-3.0.3:3
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	dev-libs/libgit2:=[threads]
-
-	>=dev-libs/libgit2-glib-0.25.0[ssh]
-	<dev-libs/libgit2-glib-0.27.0
-
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=dev-libs/libxml2-2.9.0:2
-	net-libs/libsoup:2.4
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	>=x11-libs/gtk+-3.20.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	x11-themes/adwaita-icon-theme
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-libs/libgit2-glib-0.24.4[vala]
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-"
-
-pkg_setup() {
-	use python && [[ ${MERGE_TYPE} != binary ]] && python_setup
-}
-
-src_prepare() {
-	gnome2_src_prepare
-	vala_src_prepare
-}
-
-src_configure() {
-	gnome2_src_configure \
-		--disable-static \
-		--disable-deprecations \
-		$(use_enable glade glade-catalog) \
-		$(use_enable python)
-}
-
-src_install() {
-	# -j1: bug #???
-	gnome2_src_install -j1
-
-	if use python ; then
-		install_gi_override() {
-			python_moduleinto "$(python_get_sitedir)/gi/overrides"
-			python_domodule "${S}"/libgitg-ext/GitgExt.py
-		}
-		python_foreach_impl install_gi_override
-	fi
-}
diff --git a/dev-vcs/gitg/gitg-3.30.1.ebuild b/dev-vcs/gitg/gitg-3.30.1.ebuild
deleted file mode 100644
index 82d402136f84..000000000000
--- a/dev-vcs/gitg/gitg-3.30.1.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
-
-inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils
-
-DESCRIPTION="git repository viewer for GNOME"
-HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="glade +python"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test if unbundling of libgd is possible
-# Currently it seems not to be (unstable API/ABI)
-RDEPEND="
-	app-crypt/libsecret[vala]
-	>=app-text/gtkspell-3.0.3:3[vala]
-	>=dev-libs/glib-2.38:2[dbus]
-	>=dev-libs/gobject-introspection-0.10.1:=
-	dev-libs/libgee:0.8[introspection]
-	dev-libs/libgit2:=[threads]
-
-	>=dev-libs/libgit2-glib-0.26.4[ssh]
-	<dev-libs/libgit2-glib-0.27.0
-
-	>=dev-libs/libpeas-1.5.0[gtk]
-	>=dev-libs/libxml2-2.9.0:2
-	>=gnome-base/gsettings-desktop-schemas-0.1.1
-	net-libs/libsoup:2.4
-	>=x11-libs/gtk+-3.20.0:3
-	>=x11-libs/gtksourceview-3.10:3.0
-	x11-themes/adwaita-icon-theme
-	glade? ( >=dev-util/glade-3.2:3.10 )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	)
-"
-DEPEND="${RDEPEND}
-	$(vala_depend)
-	>=dev-libs/libgit2-glib-0.24.4[vala]
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.19.7
-	virtual/pkgconfig
-"
-
-src_prepare() {
-	default
-	vala_src_prepare
-	xdg_environment_reset
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_use glade glade_catalog)
-		# we install the module manually anyway
-		-Dpython=false
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	if use python ; then
-		python_moduleinto gi.overrides
-		python_foreach_impl python_domodule libgitg-ext/GitgExt.py
-	fi
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	gnome2_schemas_update
-	xdg_desktop_database_update
-}
diff --git a/dev-vcs/gitg/gitg-3.32.1.ebuild b/dev-vcs/gitg/gitg-3.32.1.ebuild
index 71a425bcce9b..5fee531ed8b8 100644
--- a/dev-vcs/gitg/gitg-3.32.1.ebuild
+++ b/dev-vcs/gitg/gitg-3.32.1.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 PYTHON_COMPAT=( python3_{5,6,7} )
-VALA_MIN_API_VERSION="0.32" # Needed when gtk+-3.20 is found
+# vala-0.36 fails to build, https://bugs.gentoo.org/692538
+VALA_MIN_API_VERSION="0.40"
 
 inherit gnome.org gnome2-utils meson python-r1 vala xdg-utils
 
@@ -12,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Gitg"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="glade +python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"