gentoo resync : 08.10.2021

3 files changed, 54 insertions, 4 deletions

diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index d6657dd8da1d..4f987f97ef20 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,6 +1,8 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
 DIST org-9.4.4.tar.gz 4725983 BLAKE2B 69fcd15e13c55b71a2c0c6185a0b82dfd8f72ef2c68a8ccc5aa9d3e9f134233d7c7c3cb38f4957cc7d5d70a082067412b61be2111b484b6a91a8a2e5f077bb39 SHA512 ec857f9765a869371bd3425aaecdbe1c8bb8f605640d81efebd7ed13afcb05439cf3a5277457ed399bc501f95a6d823bda7f46b6991cd5f21cf53cf0e666d831
-DIST org-9.4.tar.gz 4724986 BLAKE2B 8f56c2459e1718d4982ccdba3a8fb1403ff4a66a5425ec341f6d5ef01b2415c87d77c7ac8a8cd7046b4398a18688ef5fb4f92d0131f6694bc6047b32e3dd5827 SHA512 480377b13950e1f9cfa2ec553f274156ff9a25a5572d5eb6137fa08a3d6f1d5c0a6942f4d139379974861ee467c3be17105bec6b17640beaa308c8fa6825f8f5
+DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8fa94c24eb041a42a6fca1fd6da7f242be89e6b0ca5e7b80d879096f9114dca0ba86b20a5d26d2a185baa537 SHA512 7e50d7e9e2073bc0f06d2c861f59d4c9b8af4cf63c98f730c810a3a8721e65829fe9ef7ba0ac99f49bf9da427a4d5ad1d028e05c1a8ab6a3bea2ff2020c0e61d
+DIST org-mode-release_9.5.tar.gz 2043985 BLAKE2B 7f8c45be0c3c873eb9dada8d637088aa0fac4d2b2e4ddd7523c305e0c1acdc10c58ed36646285cff2ecac78d5d862f08fcd113dcb4fa853db04e59a6252a1d7a SHA512 9f05ef6d4adb89224248299ca7c8120924b6ad4c2fa5d0804ac4985b35f87382e20e0c6fecfed59bd52917cd1b6e57830505d47fc80102390cbc6336029fe132
 EBUILD org-mode-9.4.4.ebuild 1710 BLAKE2B 4f0a97a455d97ade5ed4743abef2c8027a6e20bec8f758d146cd027123f8ed9cdc6c282e93a7b6325b6bd728158350caf36cd6eadc523d91278f3169b8900436 SHA512 f60a2887ae93d3ff50cc1e2300703b2154d983923e445e63dc8736245c39d80db60ad8d9aa86c8f2780bf051930dea53f865fb611d84e472e13f178f687a693f
-EBUILD org-mode-9.4.ebuild 1710 BLAKE2B 4f0a97a455d97ade5ed4743abef2c8027a6e20bec8f758d146cd027123f8ed9cdc6c282e93a7b6325b6bd728158350caf36cd6eadc523d91278f3169b8900436 SHA512 f60a2887ae93d3ff50cc1e2300703b2154d983923e445e63dc8736245c39d80db60ad8d9aa86c8f2780bf051930dea53f865fb611d84e472e13f178f687a693f
+EBUILD org-mode-9.4.6.ebuild 1713 BLAKE2B ce3a94f20fcef4d3d9ffe14908227763159cadc44b86af63d33788452320e382728b78841582d38b329365d881a44aa909b35686235c7a3be259dbf58a34c481 SHA512 46982cd5c1880aafbf6a9ee14bcb7b5c1c5188a549fd2ac86fe9de3e8ca33e327a6f270992fc1eb5bca46962c376413bc68b04ffa48a670d036d52db34669bb6
+EBUILD org-mode-9.5.ebuild 1357 BLAKE2B bd6f1c161575a24cbde34d6a8a9242d0a846df938a79af2b00d8af2814449fe864558c45579e60b9da4b731fe5a8f03ce1e93e8f11e9cc7dce8997e159509516 SHA512 7313065c1f6245682e0dcbcb8614d5186b3eaab6f4716710ecb7087055651ed2b18122c53a4db4baea5838041bfd7b414fcd500fa056cce2b90e52b2d3d5b85f
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.4.ebuild b/app-emacs/org-mode/org-mode-9.4.6.ebuild
index bffbcb8d7146..9e5416d94789 100644
--- a/app-emacs/org-mode/org-mode-9.4.ebuild
+++ b/app-emacs/org-mode/org-mode-9.4.6.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 NEED_EMACS=24
 
 inherit elisp readme.gentoo-r1
@@ -12,7 +12,7 @@ SRC_URI="https://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"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="contrib doc odt-schema"
 RESTRICT="test"
 
diff --git a/app-emacs/org-mode/org-mode-9.5.ebuild b/app-emacs/org-mode/org-mode-9.5.ebuild
new file mode 100644
index 000000000000..d4f4644be22f
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.5.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+NEED_EMACS=24
+
+inherit elisp readme.gentoo-r1
+
+MY_P="${PN}-release_${PV}"
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc odt-schema"
+RESTRICT="test"
+
+BDEPEND="doc? ( virtual/texi2dvi )"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_compile() {
+	emake datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake pdf card
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
+		lispdir="${EPREFIX}${SITELISP}/${PN}" \
+		datadir="${EPREFIX}${SITEETC}/${PN}" \
+		infodir="${EPREFIX}/usr/share/info" \
+		install
+
+	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	dodoc README CONTRIBUTE etc/ORG-NEWS
+	use doc && dodoc doc/org.pdf doc/orgcard.pdf doc/orgguide.pdf
+
+	local 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
+}