gentoo resync : 20.11.2017

2 files changed, 7 insertions, 7 deletions

diff --git a/dev-util/geany/Manifest b/dev-util/geany/Manifest
index 8acff5006ae5..503c03780085 100644
--- a/dev-util/geany/Manifest
+++ b/dev-util/geany/Manifest
@@ -1,9 +1,9 @@
-DIST geany-1.28.tar.bz2 4315264 SHA256 f73a3708f1a26e9bf72da564d5037d6f7fedca2e0d6175db0681c2b672100a5a SHA512 b36c7effeaec88019b35ea6e6f6b5d0c691fc6790885f6ce73fd1f7e34a50e92e49fa120479c0eba17d564f985e5a560d4ea549a6e9b4e6e6f65f9a25b0c811a WHIRLPOOL 16d2e122d9a89d8f66522f499f79826b6662a26fceeca5b7be2471d13c8a5036f68c1be66a08e1af9242167176f4080bed6acef9ae6005d9d868e6a7fb723278
 DIST geany-1.30.1.tar.bz2 4352154 SHA256 0ac360f1f3d6c28790a81d570252a7d40421f6e1d8e5a8d653756bd041d88491 SHA512 55fb446b0c517ccee4d2f3023334b96a336788422a4dc41207a4f290c5d4b88df1eefa4b7f6fddf0567224f890ae7bea396306a935512f17e01682034f7200e3 WHIRLPOOL 3f0ae26facedef3df5e96020a23730d9729641882d3a59c2c22bedf14c9e1294de32521a65573a36ad49b0336ee339cc9692718d8c8e153d5988f8d4b8abdf84
 DIST geany-1.31.tar.bz2 4355879 SHA256 30fdb906bb76c4251a8bcf83ee267db28c26ef6ab867668a782cec1164a3aba5 SHA512 6b5b07928173ef2673867ce2ab9cef1d74dfa97a5ca3515bfb85c0c4d239d7964d5f8d912dce3d97cad06a92c7a967abd454a5e4dc91e481d47de7773d8f6503 WHIRLPOOL c8746974afaadeada7846ec66dec4490c76316e12fbd59670934f3ecf28ace451e673e8c5a63ff740513ee4b01b6b3d5091032af2a4125d058dda7fefe3aed5f
-EBUILD geany-1.28.ebuild 1570 SHA256 b445b0c5bfda40da7d0fe3deb239e0ca7a8bb2d56e2d87e732ea8c9cc60f5347 SHA512 f615b350f98e7ada744a9a67ad6a96b009eb1fb12216fc9e200a50a6d3da651f1c083dcda638002769ea0a0ef2de5f6601987250a243e7c34c8e2686d489ceaa WHIRLPOOL 572229fc6ef2d98b1db84eb852b3de07560a566b244091377fb14098675b9125080ebd193e39e03b60c4919bc971d81edc34dad2a59c6edb4796338e5350d3ac
+DIST geany-1.32.tar.bz2 4341296 SHA256 8b7be10b95d0614eb07f845ba2280f7c026eacd5739d8fac4d5d26606f8c3c2d SHA512 a5ec73f690368d735e20ba90db90ab9a10e504545374a0d82c82af1f2df2f1382edb966e442257a271602b9322e3229af6a07f9c883d5d2d32236dd8f7791b5d WHIRLPOOL 4baef6747d7e8581fdc61aa08321ccf078c7f74b2d754c724a333f24543bbbae07c3d51eeef18f930364e0b8d487860a7d5d47c3427132a0ceb62e0cb596d8e4
 EBUILD geany-1.30.1.ebuild 1570 SHA256 278d0c1e33c2a124821b67dfaf7ae81e725a25985afe2c964ed78f41715d1798 SHA512 c8d077fa9cfb0a7911f8ecb4fa343f359da2f48ab252928ba594e66e33ecf694e28239f5ab0185cf0d36b2e0421e053daaf9d12ef5fce48a8b458a47d319fe2e WHIRLPOOL d382bf9f590fb279f40c5f8348b0d083269f14f9c933050f2a0612c1b5666ffbbdd49caf163d975edc406b4d622eb825d11a53b8cb79d33f6b7304c6f55cca45
 EBUILD geany-1.31.ebuild 1578 SHA256 2716e5b41682fef954fcb8a3e2025bc87b04de1b9c5acc437a88affd0d9fa60c SHA512 2901aeef60de657cead6a8014f454fde320ea444ac0971e8d9575b22a26fc28c5291873cf2aa04a630159c7385c8089cc9a4fe86d4df346a828a065095df023f WHIRLPOOL d06c586b1b43779bbdbfc94222b6fe65cb93e79f42c164374b37110c8f33525f83bbaf39ebf2153aea616c114ee3167dbbaeb1bcad41c6ef80fe27cc915025ae
+EBUILD geany-1.32.ebuild 1569 SHA256 a390399f28d4d04c9d333be75ded7c8cf55b47116c5189ae4700b78d3987d89e SHA512 092512d94cd461d2ba5822a1a7c6fb8151170bbadbebf037f2da41351e7be56780344c29734bc48d88f369fb20f2d9a617d1a9600f35909fd0b449d764373182 WHIRLPOOL 23c8b9b7319f2ba9145463d59f4fed36d8d425b8b1c8d3feed3e67245fc4758420307e53d5b81b08be48f7d5889c31145c01cd244c97ffde6a48cbc7ceab0abf
 MISC ChangeLog 5960 SHA256 c01915e517d45a51839e0203819d35b73afeb72321d703391a9b304225f50a08 SHA512 55e315eb96bac6d50040d9f998bab1a5bf6679a65b5abdd6288c884d5aa8d6c4894b3cbfe20b0675a60117734b1017f8a856971a6385be90d8496c20dcac4a8a WHIRLPOOL e971ce6279ae8638bc2b8433c94a21348b71ae2fc626cab99396e63934c9b82e33a3c589202f5ae7021ff94f6e2304cb3ef132b2f87d01e578f40c923d610e9a
 MISC ChangeLog-2015 11051 SHA256 85a686b3bcb423d83d485f73edc33415b0e8a98b2a36d6a346b70d1c6a854183 SHA512 e8b9c51fb2e134a6380a10a757db4e2276e55c15397ae1d033069b98c7990ffc5b4761b6b2557dc95abd257ad7041473d60f6edb796a1b75907d053778d7d6df WHIRLPOOL c9b5084b7b5b55a3529e84b40037753df609dfa2cb808077cedf8380baf48de9441695bd3996d1dcefb2859f1ccf660cf84ee4a6c8961cb47607374e038074d1
 MISC metadata.xml 1992 SHA256 6397cfb3a83658527550c9b6a53154d5172f0e04120095a99b16da48bcb7bf9c SHA512 74ebf425ba5707bd535cdd3a70af5372eaeebebd6a49a4829b4d2aae7e9dd5b0f9955b7928d869fd24a3ee310e216d52ffff2d20703611bfeb20619e52fa9f29 WHIRLPOOL c979c76e4c1563d9d121d162513fc7374ac79ec2d5ab78afbcb610caf6ad94537a7a10b188bb808f84d3f45cdd212f46ab02e007a3dacf41063f29124b48113f
diff --git a/dev-util/geany/geany-1.28.ebuild b/dev-util/geany/geany-1.32.ebuild
index 7facaa6aa9ba..9dc2d38f3f60 100644
--- a/dev-util/geany/geany-1.28.ebuild
+++ b/dev-util/geany/geany-1.32.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-inherit eutils fdo-mime gnome2-utils
+inherit eutils gnome2-utils xdg-utils
 
 LANGS="ar ast be bg ca cs de el en_GB es et eu fa fi fr gl he hi hu id it ja kk ko lb lt mn nl nn pl pt pt_BR ro ru sk sl sr sv tr uk vi zh_CN ZH_TW"
 NOSHORTLANGS="en_GB zh_CN zh_TW"
@@ -13,7 +13,7 @@ SRC_URI="http://download.geany.org/${P}.tar.bz2"
 
 LICENSE="GPL-2+ HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="gtk3 +vte"
 
 RDEPEND=">=dev-libs/glib-2.32:2
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.32:2
 	)
 	gtk3? (
 		>=x11-libs/gtk+-3.0:3
-		vte? ( x11-libs/vte:2.90 )
+		vte? ( x11-libs/vte:2.91 )
 	)"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -59,11 +59,11 @@ src_install() {
 pkg_preinst() { gnome2_icon_savelist; }
 
 pkg_postinst() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }
 
 pkg_postrm() {
-	fdo-mime_desktop_database_update
+	xdg_desktop_database_update
 	gnome2_icon_cache_update
 }