gentoo resync : 02.05.2018

9 files changed, 15 insertions, 15 deletions

diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index e7398b5e3b64..a9490d71eba0 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest
index e165be57036a..3c6925e0c47b 100644
--- a/app-editors/gedit-plugins/Manifest
+++ b/app-editors/gedit-plugins/Manifest
@@ -1,3 +1,3 @@
 DIST gedit-plugins-3.22.0.tar.xz 1314512 BLAKE2B 2910a101da94112b4190d96111013675234c109bfc37e05ff98d53e87e0a4db8e5a4a6823017153d65a9d554cfb95fed000d56d9e721faebfeeb033fc7be2901 SHA512 5560b48c0b21b535de7247c39653c111439f9cb138025d7e3a600b94babbe060777c2095160b7e5ea39b8ba8be520ea3966b0ffc2ec15d17ea0bf814bf58748d
-EBUILD gedit-plugins-3.22.0.ebuild 2420 BLAKE2B aa28d57f50d4661d8de168fd8e14584edb71681198f7d2a0c41c25d799b8622a82d826b9bd0cce75c73d51b74a2f203005b79a90e45d391c7611092a88a64289 SHA512 684b5c910000888ca4a19e18c025be7e28a59f929c3c488662f8a98d5801e8c7d8d4c1d459ba83c8fade3c91707b269081ee4667b252c8de62568bafba16b06d
-MISC metadata.xml 620 BLAKE2B fcc7cf7278df0cd01a6187d770743c3c084a0196bd643d72118ba522a11f008a3b66da8b96da5a66bd0815093a2d3aece695120f1fd5744b49c8202375a11a10 SHA512 6e5b4cc4bc422c280a3ab0122382f3de3aaaa4f248f765c5023b3970394ece595c101d2197dd57f24eee29ad3215dacc10c78fdfadbc8c0e7ab941a32af1a89f
+EBUILD gedit-plugins-3.22.0.ebuild 2297 BLAKE2B 74878dee069c2eeed548f80084f2bf1b63cedeab159ab84b54bd2bde7ae5446b5b6facb77e0cc08184a6bfd7502508bd0e5e6130c412247b822233fdae060ada SHA512 dce1562f0c1882d55feec31b82f3261d5e026f1e7fc1eb295941769c2da57d4feba03637f266f2a370fa5efb9f33b90253900eb40ad1d065b2762a6f08ea9ad2
+MISC metadata.xml 542 BLAKE2B 1336fdd161ef76bb2e1445dd074aed82e04be00c9c47885eb5005122c850193dd2bec1aed69dd1da74527c8ee82d7c75d57b73d020cc692e41f6762ba43d8f08 SHA512 1eba6ba724a313d8dd04e838c448cb8de2f3411b891daaacdea615f0d8187d3bbe1f650c9b2ab5457d519ed98dee600d8830e7eea848c872ccb9c52ba58f231a
diff --git a/app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild
index e9e6e28248fe..676c4d9aa014 100644
--- a/app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild
+++ b/app-editors/gedit-plugins/gedit-plugins-3.22.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ LICENSE="GPL-2+"
 KEYWORDS="amd64 x86"
 SLOT="0"
 
-IUSE_plugins="charmap git terminal vala zeitgeist"
+IUSE_plugins="charmap git terminal vala"
 IUSE="+python ${IUSE_plugins}"
 # python-single-r1 would request disabling PYTHON_TARGETS on libpeas
 REQUIRED_USE="
@@ -24,7 +24,6 @@ REQUIRED_USE="
 	git? ( python )
 	python? ( ${PYTHON_REQUIRED_USE} )
 	terminal? ( python )
-	zeitgeist? ( python )
 "
 
 RDEPEND="
@@ -49,7 +48,6 @@ RDEPEND="
 	git? ( >=dev-libs/libgit2-glib-0.0.6 )
 	terminal? ( x11-libs/vte:2.91[introspection] )
 	vala? ( $(vala_depend) )
-	zeitgeist? ( >=gnome-extra/zeitgeist-0.9.12[introspection] )
 "
 DEPEND="${RDEPEND}
 	app-text/yelp-tools
@@ -70,8 +68,7 @@ src_prepare() {
 src_configure() {
 	gnome2_src_configure \
 		$(use_enable python) \
-		$(use_enable vala) \
-		$(use_enable zeitgeist)
+		$(use_enable vala)
 }
 
 src_install() {
diff --git a/app-editors/gedit-plugins/metadata.xml b/app-editors/gedit-plugins/metadata.xml
index ba0535e10d0d..0b4585984564 100644
--- a/app-editors/gedit-plugins/metadata.xml
+++ b/app-editors/gedit-plugins/metadata.xml
@@ -11,6 +11,5 @@
 		them</flag>
 	<flag name="git">Shows document changes related to git's HEAD</flag>
 	<flag name="terminal">Embed a terminal in the bottom pane</flag>
-	<flag name="zeitgeist">Build the plugin to inject events to zeitgeist</flag>
 </use>
 </pkgmetadata>
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index 96e2eef61152..0b8e7c875679 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -4,6 +4,6 @@ DIST nano-2.9.5.tar.gz 2889382 BLAKE2B fa9a020b133f0b1c669689e0831d2700d7509a01e
 DIST nano-2.9.6.tar.gz 2892819 BLAKE2B 572fcd30b3640e1819d2d573c6aa755141b3990ab05fdf4928a8ade4dedd77ee4d8b81644a75d2c698fbc5512b1bffb7e7d449beac57700a77a1f7687ece4d58 SHA512 360802c3d772e8159e729803d5307575b348f779623e49401752984201b6b874df1582fe79ed6552a524db64ae6d8a1bfb449b525f7354cbd5cd9941432a2dff
 EBUILD nano-2.8.7.ebuild 2307 BLAKE2B b7ab4e20fcb2dcec5b6f2a198fbcb2a2619f9f29081521d1ce7a555be8bf44ef060ad9b8f3f229bf272bd5cf6c5f066e10d08f2596b5d3954279be71a4d09ad6 SHA512 693683af78bc48911cb50813cd8e02ded2546ce8efc79c5897c804c64479d889518d88f1cbcfa79e11409fd0f26543be270f2da451618d4b3756dd7d2bc7b4bc
 EBUILD nano-2.9.5.ebuild 2253 BLAKE2B c3b7d53fa6dafea37b151e5ee6296836d824a3f875da8250add163b862b12c8f037c383e2a258d0cba7e7667d53c001ed97c521d0b2920e9d6f968d9f8be9066 SHA512 52383eef617aa519b6084c88230d8cda018e447d3fcd032bc04aca1dad41c09f4a86203ce385accded5ea0c1d1cbb59f15f1736b9496c26d8e5b02a10e580ea8
-EBUILD nano-2.9.6.ebuild 2242 BLAKE2B 958b7c5c9ff1509b981d3fa8ba495dbc8e4ae4dfa41866c9a0a79f89e1523220e8f702d41577deea3e75f027b48fa39605b3d450a217d4f68d2961758bc4f55d SHA512 c8bf04fa19e66e78db0fc3a467b5f075794af9b023b067265dd6852e3ef7034b3a6f62032af68d19befe998722a739c7fbe2c878d573b00d54be221418f57c52
-EBUILD nano-9999.ebuild 2242 BLAKE2B 958b7c5c9ff1509b981d3fa8ba495dbc8e4ae4dfa41866c9a0a79f89e1523220e8f702d41577deea3e75f027b48fa39605b3d450a217d4f68d2961758bc4f55d SHA512 c8bf04fa19e66e78db0fc3a467b5f075794af9b023b067265dd6852e3ef7034b3a6f62032af68d19befe998722a739c7fbe2c878d573b00d54be221418f57c52
+EBUILD nano-2.9.6.ebuild 2299 BLAKE2B aaa725911e05f7f73464981129764695c996b3961ce8641623b4805fac1eeba5bef6c2e627217494fe10ae13503eaeae33d9c6e9056a0c973726b3f0a3e8fc8c SHA512 89dc29c91548b5961e68d19faf79ede5981a6c71875949258c8f61cee43d9eb533915786d2853ba7518ccb5d4fc6a4bb847fe00191513c53bb74c5069a9ddc5f
+EBUILD nano-9999.ebuild 2299 BLAKE2B aaa725911e05f7f73464981129764695c996b3961ce8641623b4805fac1eeba5bef6c2e627217494fe10ae13503eaeae33d9c6e9056a0c973726b3f0a3e8fc8c SHA512 89dc29c91548b5961e68d19faf79ede5981a6c71875949258c8f61cee43d9eb533915786d2853ba7518ccb5d4fc6a4bb847fe00191513c53bb74c5069a9ddc5f
 MISC metadata.xml 1548 BLAKE2B 36d9d02603b824fd0af0f1a487fcdcd7ffe2266acc1459b137612efb7ff6af7b8dfd19d6deb0177dc5120eadb27e277e25ef01288c930c97bdab34cdc15b581b SHA512 97bce71ba1b5b906c48be48c5f0af78092acbef27c62bce92b515b773242e81a6e9b978970eda192df66e244e58832783147f0d35f0fab5350f1f9f0a0d83c82
diff --git a/app-editors/nano/nano-2.9.6.ebuild b/app-editors/nano/nano-2.9.6.ebuild
index 2b29359919a7..a0bec925c03d 100644
--- a/app-editors/nano/nano-2.9.6.ebuild
+++ b/app-editors/nano/nano-2.9.6.ebuild
@@ -64,7 +64,8 @@ src_configure() {
 
 src_install() {
 	default
-	rm -rf "${ED%/}"/trash
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D%/}"/trash || die
 
 	dodoc doc/sample.nanorc
 	docinto html
diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
index 2b29359919a7..a0bec925c03d 100644
--- a/app-editors/nano/nano-9999.ebuild
+++ b/app-editors/nano/nano-9999.ebuild
@@ -64,7 +64,8 @@ src_configure() {
 
 src_install() {
 	default
-	rm -rf "${ED%/}"/trash
+	# don't use "${ED}" here or things break (#654534)
+	rm -r "${D%/}"/trash || die
 
 	dodoc doc/sample.nanorc
 	docinto html
diff --git a/app-editors/wily/Manifest b/app-editors/wily/Manifest
index fb17b11d8883..7787ee90c940 100644
--- a/app-editors/wily/Manifest
+++ b/app-editors/wily/Manifest
@@ -1,3 +1,3 @@
 DIST wily-9libs.tar.gz 125247 BLAKE2B 94f93d081c90f6543bb26d17f8fe053135be2df983a2280fdd15243c5e448f5f3265666692e0635156217b0e759e0d6f3bbc123cb857f1d7880ee3ee4f913a37 SHA512 3c06ef1d9c6e77a00037570f8b8bdbcdfc7648f691675db679ba83ac0ce092762a4020b0483acd325aa57810e9a386800a94c5e6e2b5002a963b4751a4d30a5b
-EBUILD wily-1.0-r1.ebuild 828 BLAKE2B 5f6219fc34ecaf1e52441ca6c2cd0f602cef5d2b5b1b7516ad363aad4c08f3867101810d388b0a2aaa32c1e950427c1475e85765373cd18278459d6e11310426 SHA512 3a234be733ff9c8f632b6481ceee425e9b673e4a430c4aba3c8a732f740dde39c2e49c6cfc87fe323d134ba1739d900ea34160b2e34725db953d22af25718ead
+EBUILD wily-1.0-r1.ebuild 836 BLAKE2B 6717232ddcf0cd6bc64d92e6818fe357bf314070be79ac475961e8020c8177b21b758497fe2e22de1ce3fb5402e5948e4198f260f23677c5b59a2b0f5ac5d260 SHA512 b3d14f3578e8916f0a8fc5e89cbaf9c9ba9187fb73395de796bfd7f52ea524b3d63f6a4e721dd988f928488981c3b8dde7a5f1759257ea984fa71d18367edf67
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-editors/wily/wily-1.0-r1.ebuild b/app-editors/wily/wily-1.0-r1.ebuild
index 1067a1ca4a99..f9093824c539 100644
--- a/app-editors/wily/wily-1.0-r1.ebuild
+++ b/app-editors/wily/wily-1.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+EAPI=0
+
 inherit toolchain-funcs
 
 MY_P="${P/1.0/9libs}"