gentoo resync : 29.06.2020

3 files changed, 2 insertions, 63 deletions

diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index ae7c9e189561..af4137fe91ab 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,8 +1,6 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
 DIST org-9.3.6.tar.gz 4669953 BLAKE2B 1d221918f8145b789d979ee7822640dd37c5722e9f65ba36e945f7d574cfb89d48e2da1812d5dc727301ef1ad8bd2ef5628f54cbbfef5bffbab48656ed4c1e65 SHA512 47b5b81f47474d399cc7aada0e32f376d4c8758f6e955b7d889035610c20a4c372ea0571a510695822d2b87bd1e8002c2d0d8c73dc730144540c59b5ef25e090
-DIST org-9.3.tar.gz 5189006 BLAKE2B 1e082988a47e2058fe248dd1f8f5f0e75291279be1a7abf75d507786f84f93e9701607d15688162ff4d3e4f590ac8391c37d1f6d047ed55d9d9bfb498b47cfa4 SHA512 e00f15750b76350765b6a01e5b0021fec4dcbd9dd5ca4de6745e0df6881b9d62ad496b7d579c0cc0f6dbb206bb27e5a219e0a668a6167ccc7f629d763eafa24c
 EBUILD org-mode-8.3.2-r1.ebuild 1746 BLAKE2B df764e008c1f4bebde801dfd922c16988d863f598e39619b953aba8013d1737f6aebca910bd395cb4ad2f8004c2d0fc326e40b6daa3f534e74e1223da752751a SHA512 f5d1edbc5eba7d392823bccc0ab9338baa2db8687ad1112be351a4fade13c94cc3727c9a91f0cef2137cc8efc727aec86e9dbf3115a16f9e4894aa19280562ca
-EBUILD org-mode-9.3.6.ebuild 1723 BLAKE2B d07d2342272f740a2837a3fcb046456a1ea59f030849f29d5346f0660d74c5bd8364328cb5ebb0b86aac5629e78d3b0ec4dafaaa963e808310b3479b139b7488 SHA512 138d6d5de547a4fa13787634f387c51ada66de1867079885d6efd7179df0c38ae224dd95d42923f859c953c64777873cfd180f7d6ff78d8146bd778a9de1f785
-EBUILD org-mode-9.3.ebuild 1720 BLAKE2B 0b0b38326d521754bc7a3b4148f21f290b39ba55c17c28423f31b6e130933f843b698472db4cff1d9a5bb738d14ee959504c9465e0712542823a71116ab5cdb5 SHA512 8827962425b24c573ae7f6b72dd96cfcc5c9c495b57c1516a6139da8ed9b8e79c96949c57db75401e70c9df7baf097a7cc6d3a5faa2f4c6aa8cddae86e9e8669
+EBUILD org-mode-9.3.6.ebuild 1720 BLAKE2B 0b0b38326d521754bc7a3b4148f21f290b39ba55c17c28423f31b6e130933f843b698472db4cff1d9a5bb738d14ee959504c9465e0712542823a71116ab5cdb5 SHA512 8827962425b24c573ae7f6b72dd96cfcc5c9c495b57c1516a6139da8ed9b8e79c96949c57db75401e70c9df7baf097a7cc6d3a5faa2f4c6aa8cddae86e9e8669
 MISC metadata.xml 1368 BLAKE2B 2680c11ca69b9acd8b96b6dc76586037bd1b7ce0e9cdc183781742f373ce8d0be5b8820b7fa4d18c4f59523e10d3b40df3edbba5178169fb993bacc8d10cdfe1 SHA512 6c557a3a3ecb9b1993bd8c976d0a81460cd1ecc6e53fbaeb0d086e8d78497485a1b34470b72a73e779878b4947a22d61ef36259037cf6ff0315a823e15e09c66
diff --git a/app-emacs/org-mode/org-mode-9.3.6.ebuild b/app-emacs/org-mode/org-mode-9.3.6.ebuild
index 60448056b54a..d8248f25435b 100644
--- a/app-emacs/org-mode/org-mode-9.3.6.ebuild
+++ b/app-emacs/org-mode/org-mode-9.3.6.ebuild
@@ -12,7 +12,7 @@ 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-macos"
+KEYWORDS="amd64 ppc x86 ~x86-macos"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emacs/org-mode/org-mode-9.3.ebuild b/app-emacs/org-mode/org-mode-9.3.ebuild
deleted file mode 100644
index d8248f25435b..000000000000
--- a/app-emacs/org-mode/org-mode-9.3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-NEED_EMACS=24
-
-inherit elisp readme.gentoo-r1
-
-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-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-BDEPEND="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
-		( docinto contrib; dodoc -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 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,
-		so you may have to install one or more additional packages.
-		A non-exhaustive list of these dependencies may be found at
-		<http://orgmode.org/worg/org-dependencies.html>."
-	readme.gentoo_create_doc
-}