gentoo resync : 29.05.2018

6 files changed, 6 insertions, 61 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 1ed2f64be9f5..04b9de92e421 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/eselect-mode/Manifest b/app-emacs/eselect-mode/Manifest
index 9613194bb19c..fa18414c2875 100644
--- a/app-emacs/eselect-mode/Manifest
+++ b/app-emacs/eselect-mode/Manifest
@@ -1,7 +1,7 @@
 AUX 50eselect-mode-gentoo.el 178 BLAKE2B 50fea27e7add6d31f37801593430154636bb58ac6e3f7cc44c68a16d49c9156cf37285778a38bf97a1f4805a22d6d5cf9d597acdcdedfd77c62a5825a0d1d88f SHA512 200da398adf72241112bcda74b432a8a313cf29018c9f6fbdf6021674b23a201ada6ba884d4c9c3a4ee4c042d6c8fc7c3ba59702c8ddb6ea20b652f9ded9d32f
 DIST eselect-1.4.12.tar.xz 177520 BLAKE2B 0938fe9bd8785fe711edc1af63a9c318a4a5fe9141c61d7f1c4da0352242322f1e18e4f68f7e219a1aa2beae5b25ddac58d7c47d4272408fd8fe5207324ef7c7 SHA512 2ea182364dfb2333112e9eebe691e1963e95a4c9ab40945eb2e5bc8c81da76105c1ae6aa3d153b78dea6c1e0cadb9b0237f7556b8ceb9d48e0fba67a642d6081
 DIST eselect-1.4.4.tar.xz 177536 BLAKE2B 9991d69a0589be0a7df881fe5d6c0021c99fd7fd5b561ad7a9423edc46b25528b499a3e839dfe974d5d53e8e8a5b3a798cd7f5f1eeb78e531fff16680babce96 SHA512 1ed01cf00e3f13aad3e5f844c7086c3dd48398efd76e68cd91cf13b9939f4b48eef8915c5f3926954d158023115ad66ee67c0bc8fc4c9570900a37207674fc8f
-EBUILD eselect-mode-1.4.12.ebuild 570 BLAKE2B f1e83d11e340e13c38d0bce95a7f1d93c830241089dabbba3bd7eaf89470326c36919a784be49fd0b80ecf481959476c20e4c49af641bb815b46e33277a9ce4e SHA512 e0fa273a64b2ac40b48bfab5d7165209fa1aae21ae89db6c988691431359674c398f44f0937c5a20c8777948d6cd941e24f07e895ce9849c4dbb6d421928de51
+EBUILD eselect-mode-1.4.12.ebuild 573 BLAKE2B 49644f3440da18f4cbf22d6681edca141578776cb899cf25b888200eb99ff0b9068919e24d6c86c46ca41005763a94f951d598a5916f78949fbb99bbf830f622 SHA512 f4a8c484fb16d0408abeb8e269a034b71046cfdb2686462c5c7e64cce27f03ad71f6172cbf4fb0fbb9e91eb7ebed73f196d68de04bb26d7a4aed3644777a850c
 EBUILD eselect-mode-1.4.4.ebuild 570 BLAKE2B fb18e59ec9ba157d1a8f6b55e9e416b4332c9cc7cf561b782361ff4c840881696cf0e91b2f63f9da223fb2a3d06dae3fe3f6d46678b7139ddca745d676e718f0 SHA512 14ab8292c91ab1da794cfd4b33b09dec3f382c1e7fbf3ed3f9fc0f26438ae255b314f993963cc867e37f6cfcba37d8da0f64e6094cb42fb13ca8f11b9ed1675e
 EBUILD eselect-mode-9999.ebuild 458 BLAKE2B 0a5b748fc09dbfe532ec9b40adbbb939bd5150ecac9ee610ad0dc5b37e7b6ccdcb8c183337d6f0ce04ee5bfad4f1ede0c13cc4dc55c828474b07265fd91ffba3 SHA512 5d11532145273d6956274ce05d732352593a20daa1d86f900b1fa9927aa536131e5ec922996f4e3939803253e5649f6c2a3ec9a81dabd6dac0475422cf0a4ceb
 MISC metadata.xml 426 BLAKE2B 85331f7b7beb7a72e8151728884637e255f783856cabaf1a6bf58938b4a3f565eaa047dad4032089c416381c52d66f4341805cb43f152f99c83d0c27900f8963 SHA512 18468ec99892972ddfd973e3efc4869abc9848906773556b6ae5bf9bc48780c790beb77da548c98f9fc07771068dc219d1af2f3dc29f1bb36f12dddd2432a675
diff --git a/app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild b/app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild
index 9c8084784a25..29d3cebf28eb 100644
--- a/app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild
+++ b/app-emacs/eselect-mode/eselect-mode-1.4.12.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${MY_P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${MY_P}/misc"
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 55d0541c4ad2..8784f27d3a21 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,10 +1,8 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
-DIST org-8.2.6.tar.gz 4221803 BLAKE2B 78adcafdc2a9020a71ef9efe4699f6c2ae20b774861cd9dae04360114a942fd32d91d66dba2508a2529f3d678ccff60cd9d328425d4d43d5d391af36f0958bbd SHA512 a64e975738f26b5315584b51332dbcd29eb6e5b03cb505d638d611455beb921c5e0b728b23fb63f380d46d2e33092865b02de01259cff8985693febebcc1a8a3
 DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
-DIST org-9.0.1.tar.gz 4439964 BLAKE2B 20f921fbcc3a45180395ec5158a6ab055e1ae7a318a5c2dcbbd8de9460a2639da222f89169f4289a2e9b4a5cd4c7928a5d4edb8997ef24fc8f41abbc919b1e52 SHA512 c0a88372787c5b71ec1523fcf58b3cbf80678835c7b0bfe3b2406290da6fc88b977121ca3b35b47abf2c32ef40c0bfb6733170f225ea35ba24f2e801bb634afe
 DIST org-9.0.4.tar.gz 4431853 BLAKE2B 1ecb8fa08597e08a6143cdf5d262274472eb5b245fa1103fe6b5509a5bb0d0aa471e9414b8f6293c3d5720c7b307a77e0f03ad6a9b590bf2469da5d54ddedfaf SHA512 fc3ab3e7c2b5f3243937497ea9515ea81434f2274ac158da7d0418e8ddc33debae2f1887ffbe37e3768d32a028834cc0ef35f3c3cc3938d7b24e0c5bfcf65ae0
-EBUILD org-mode-8.2.6.ebuild 1487 BLAKE2B 1a2b5947d23943f9556dfd3eb1312b77e92787885b53f8cafa2c7651df084bd8d8dffd56215d9e5542ff1f3e4a3b8a7881fc9ddba6207a3e9bd080019fc91b7f SHA512 8a848d4793163f0823c3bb3c0ace062172d57f91027bf717f1f560fdeff2c0a0aab77cebe0fc083214547bd0556f0bab501e8253ba69ad4626d04c4b71334a93
+DIST org-9.1.13.tar.gz 4625532 BLAKE2B c7044913b8fd0bde43fa1ff0f4bc9963ebce1cda17753fe7642aff914603a4278e7396acf2236c27334f2b9a009bd9e3310ec6144d851e121c3f6ec6516ad6c7 SHA512 a1cb1b2a8db082b7f7a03e90109352bad219808cb506af30082b87fc2c6d66733ce304df4379542e7a85e20c213e1cbc8bf4c9d6c9777fea393a88755129c4bf
 EBUILD org-mode-8.3.2-r1.ebuild 1777 BLAKE2B f05cf006f13a39b5cdc62da3e5ba742c88b2cbdc64787218e0f2862095637714e2319c406327ce69649ac163e2e9f8cf06031d8e9464337b051ebb71da56f67f SHA512 2e5c6790fc10a7df5859ff7893ad6b37417099152e8021b306f536fcd92f7c4b2b3ca2477f268ff166b7eea92cd0c1b76ff0c3db3da4003c6181e6480959e126
-EBUILD org-mode-9.0.1.ebuild 1778 BLAKE2B b5a6c58c509c1531f9327bf7551c76eb49612061635eddb7d71a50371edb2f7e09e637d76ef30c5c7f4f63e1a24c9b9d45ad0421f43b5bf4513e8eff71c75c1a SHA512 6ebb922aec745216d6b10b4e025ffc30ecd6cb8c937396ddce75a0589b1b2ab0a953c1e10fb623a3b078822d3b2db6a10283078d8db48a83a2dfffc288b64065
 EBUILD org-mode-9.0.4.ebuild 1778 BLAKE2B b5a6c58c509c1531f9327bf7551c76eb49612061635eddb7d71a50371edb2f7e09e637d76ef30c5c7f4f63e1a24c9b9d45ad0421f43b5bf4513e8eff71c75c1a SHA512 6ebb922aec745216d6b10b4e025ffc30ecd6cb8c937396ddce75a0589b1b2ab0a953c1e10fb623a3b078822d3b2db6a10283078d8db48a83a2dfffc288b64065
+EBUILD org-mode-9.1.13.ebuild 1753 BLAKE2B ddfee890b7f91ac5205f4e261113666361c7acf1cb0502b26f53809da80ee7f33ec8af768aa035d3da201806f9d233fc7b888914f0accbf13861067bcad1a40c SHA512 4bf7740fb9f8ecc7493fda8b9bc7a5a63cc8e112e456f7a2af00ca4d9a911470e6840ac5747233f417f7c58b51f40b2d7ff9efbedaf4e7dd7588d6afdb633c15
 MISC metadata.xml 1345 BLAKE2B c8db96b28bc6bdf137fe1a5084319f2b24d1cd26ccb7f8071aa3fbaab940d929889d68f41fa0a0c5e3e38686241ec869000ed54f7f95813be4547f7d523e096f SHA512 97bc0caf88697766a311ea2e92d689a17f8668164f6d4309f4f6ac850a910efc7d39bd135a48c6b636d1b5af968de8f440cfcbfd5dcc266b7bb4ce195d67786a
diff --git a/app-emacs/org-mode/org-mode-8.2.6.ebuild b/app-emacs/org-mode/org-mode-8.2.6.ebuild
deleted file mode 100644
index 407e6a953ed4..000000000000
--- a/app-emacs/org-mode/org-mode-8.2.6.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="http://orgmode.org/org-${PV}.tar.gz"
-
-LICENSE="GPL-3+ FDL-1.3+ contrib? ( GPL-2+ MIT ) odt-schema? ( OASIS-Open )"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="doc? ( virtual/texi2dvi )"
-
-S="${WORKDIR}/org-${PV}"
-SITEFILE="50${PN}-gentoo.el"
-
-src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
-	use doc && emake pdf card
-}
-
-src_install() {
-	emake \
-		DESTDIR="${D}" \
-		ETCDIRS="styles $(use odt-schema && echo schema)" \
-		lispdir="${EPREFIX}${SITELISP}/${PN}" \
-		datadir="${EPREFIX}${SITEETC}/${PN}" \
-		infodir="${EPREFIX}/usr/share/info" \
-		install
-
-	cp "${FILESDIR}/${SITEFILE}" "${T}/${SITEFILE}" || die
-
-	if use contrib; then
-		elisp-install ${PN}/contrib contrib/lisp/{org,ob,ox}*.el
-		insinto /usr/share/doc/${PF}/contrib
-		doins -r contrib/README contrib/scripts
-		find "${ED}/usr/share/doc/${PF}/contrib" -type f -name '.*' \
-			-exec rm -f '{}' '+'
-		# add the contrib subdirectory to load-path
-		sed -i -e 's:\(.*@SITELISP@\)\(.*\):&\n\1/contrib\2:' \
-			"${T}/${SITEFILE}" || die
-	fi
-
-	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org doc/orgcard.txt etc/ORG-NEWS
-	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
-}
diff --git a/app-emacs/org-mode/org-mode-9.0.1.ebuild b/app-emacs/org-mode/org-mode-9.1.13.ebuild
index 4ff2e904df26..13bf39369720 100644
--- a/app-emacs/org-mode/org-mode-9.0.1.ebuild
+++ b/app-emacs/org-mode/org-mode-9.1.13.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
@@ -49,7 +49,7 @@ src_install() {
 	fi
 
 	elisp-site-file-install "${T}/${SITEFILE}"
-	dodoc README doc/library-of-babel.org etc/ORG-NEWS
+	dodoc README etc/ORG-NEWS
 	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
 
 	DOC_CONTENTS="Org mode has a large variety of run-time dependencies,