gentoo resync : 20.03.2022

5 files changed, 3 insertions, 190 deletions

diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index b03cc6bbb044..74a789d75b1b 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,12 +1,7 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
-AUX org-mode-9.5-parallel-make.patch 2234 BLAKE2B 9bd3c123ffd619c0478a17a7ec52293e2f01bd89129f15c38dc9769e7c71e4b4a2e11967f7f5cfbd90c822b89c3cfa4ec9efcf66ea3cd9264cc2268a61ee6659 SHA512 e768a99cb5e849f89fb3eb8d893f0d3aff3ecf9aaa450abe63cea98b543a423d22b415dfb1504978984ab029ac49caeb3d06c3c62662286ddd87e87741426814
-DIST org-9.4.4.tar.gz 4725983 BLAKE2B 69fcd15e13c55b71a2c0c6185a0b82dfd8f72ef2c68a8ccc5aa9d3e9f134233d7c7c3cb38f4957cc7d5d70a082067412b61be2111b484b6a91a8a2e5f077bb39 SHA512 ec857f9765a869371bd3425aaecdbe1c8bb8f605640d81efebd7ed13afcb05439cf3a5277457ed399bc501f95a6d823bda7f46b6991cd5f21cf53cf0e666d831
 DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8fa94c24eb041a42a6fca1fd6da7f242be89e6b0ca5e7b80d879096f9114dca0ba86b20a5d26d2a185baa537 SHA512 7e50d7e9e2073bc0f06d2c861f59d4c9b8af4cf63c98f730c810a3a8721e65829fe9ef7ba0ac99f49bf9da427a4d5ad1d028e05c1a8ab6a3bea2ff2020c0e61d
 DIST org-mode-release_9.5.2.tar.gz 2047430 BLAKE2B 3df1ea84d3513ff4ceeea69d6afcdbd68ac1dd0112831a4d202d4d8ab730067d9b9d72bc86e40157282d487c0020e4c2161d611f71da40951f3e322923efce9b SHA512 6d61e2db7f3bc736e299f47e85b3fd7c31324d0f60bf4b84f5540b717e7d394957bd5f9196aa8d3840e8798eb2b597818b03fa239fc1427ffb54c8ed74b5c9ae
-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.6.ebuild 1710 BLAKE2B 7e412f50607d334b4052596fee8520b7d47c982b43f23245d64c56004a2d8910ca9fc12bf8a4ee269d6556a7406e1a297131ed7d0ff9e5ad17d04bf698575d80 SHA512 5d2004cb82270a425edd181881b0c64866a04c89203695b0d56cedd7b4f4032ec63f36e564ade12e67ed75c322f4bbfeb293ccf20b0b47749cddce277f2849fb
-EBUILD org-mode-9.5.2.ebuild 1357 BLAKE2B bd6f1c161575a24cbde34d6a8a9242d0a846df938a79af2b00d8af2814449fe864558c45579e60b9da4b731fe5a8f03ce1e93e8f11e9cc7dce8997e159509516 SHA512 7313065c1f6245682e0dcbcb8614d5186b3eaab6f4716710ecb7087055651ed2b18122c53a4db4baea5838041bfd7b414fcd500fa056cce2b90e52b2d3d5b85f
-EBUILD org-mode-9.5.ebuild 1407 BLAKE2B 4b65efd70242ed5f4aff1f1efbd8a3fde3193a99e848d8c64f17cc76d75aa2f99daffcc68859eb0f8f38a34ace57454ec7a5231030cc4c1169d476e7352f9b3e SHA512 75260ad66c878bdb5cfef389739c72cc5ce25abd64ab61dc81dd647152c83cffd1c531745a0eb832311ef2d1e07ebd7facfe5a6ccd304aa9f39ced439d86628f
+EBUILD org-mode-9.5.2.ebuild 1354 BLAKE2B 91230d55d675bb6fa2cc1b4b77bd15c1489972aad0ccce952effb43913f2d5efbca723d382253ab8281155ede9d268db87a513fa2616949905c108b3fbfa56f9 SHA512 9b3a68bedb079c7ddaa07edece32241172e5d7939ac979a6ddcd7812c5ea654bb7fd3994d6be767960b11d0ac33ec2c56b7d8ff717d649ef627fc029f54230ea
 EBUILD org-mode-9999.ebuild 1537 BLAKE2B a8bd3199be2117253f7e1d4009c98384cac23c3b9d3094e3285a0418e5b3ae4c910251bc278a00cc92225dd8106ba8f472ca32ead00f7fb1a6ff967f57a96400 SHA512 640f00ee00d72c2be2fa373b50b138400c5b2cc9f113eebf385d853cf477aa93d93f70ff8ebfbff5948aa4b57993425c53ab89d2cb5abb544d5a8715c40d7fb3
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch b/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch
deleted file mode 100644
index 92ff5d3182f8..000000000000
--- a/app-emacs/org-mode/files/org-mode-9.5-parallel-make.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://bugs.gentoo.org/829055
-
-From b6c5f028a061557e2edb64eef897cd4a28b2afeb Mon Sep 17 00:00:00 2001
-From: Marco Wahl <marcowahlsoft@gmail.com>
-Date: Mon, 20 Dec 2021 22:27:50 +0100
-Subject: [PATCH] Fix parallel make of docs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-* doc/Makefile: Split multiple target "org.texi orgguide.texi".
-* mk/org-fixup.el (org-make-manual, org-make-guide):  New functions.
-  (org-make-manuals): Make obsolete.
-
-Reported by Ulrich Müller.  https://list.orgmode.org/uee67gr96@gentoo.org/
----
- doc/Makefile    | 10 ++++++++--
- mk/org-fixup.el | 15 +++++++++++++++
- 2 files changed, 23 insertions(+), 2 deletions(-)
-
-diff --git a/doc/Makefile b/doc/Makefile
-index 7fb96e65d..cb6d72bdc 100644
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -27,11 +27,17 @@ guide::		orgguide.texi org-version.inc
- 	../mk/guidesplit.pl $@/*
- endif
- 
--org.texi orgguide.texi:	org-manual.org org-guide.org
-+org.texi:	org-manual.org
- 	$(BATCH) 				      \
- 	  --eval '(add-to-list `load-path "../lisp")' \
- 	  --eval '(load "../mk/org-fixup.el")' 	      \
--	  --eval '(org-make-manuals)'
-+	  --eval '(org-make-manual)'
-+
-+orgguide.texi:	org-guide.org
-+	$(BATCH) 				      \
-+	  --eval '(add-to-list `load-path "../lisp")' \
-+	  --eval '(load "../mk/org-fixup.el")' 	      \
-+	  --eval '(org-make-guide)'
- 
- org-version.inc:	org.texi
- 	@echo "org-version: $(ORGVERSION) ($(GITVERSION))"
-diff --git a/mk/org-fixup.el b/mk/org-fixup.el
-index c0eef23cb..0e26cc7e7 100644
---- a/mk/org-fixup.el
-+++ b/mk/org-fixup.el
-@@ -27,6 +27,21 @@
- (require 'autoload)
- (require 'org-compat "org-compat.el")
- 
-+(defun org-make-manual ()
-+  "Generate the Texinfo file out of the Org manual."
-+  (require 'ox-texinfo)
-+  (find-file "../doc/org-manual.org")
-+  (org-texinfo-export-to-texinfo))
-+
-+(defun org-make-guide ()
-+  "Generate the Texinfo file out of the Org guide."
-+  (require 'ox-texinfo)
-+  (find-file "../doc/org-guide.org")
-+  (org-texinfo-export-to-texinfo))
-+
-+(make-obsolete 'org-make-manuals
-+               "use org-make-manual and org-make-guide."
-+               "9.6")
- (defun org-make-manuals ()
-   "Generate the Texinfo files out of Org manuals."
-   (require 'ox-texinfo)
--- 
-2.34.1
-
diff --git a/app-emacs/org-mode/org-mode-9.4.4.ebuild b/app-emacs/org-mode/org-mode-9.4.4.ebuild
deleted file mode 100644
index bffbcb8d7146..000000000000
--- a/app-emacs/org-mode/org-mode-9.4.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 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="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"
-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
-}
diff --git a/app-emacs/org-mode/org-mode-9.5.2.ebuild b/app-emacs/org-mode/org-mode-9.5.2.ebuild
index d4f4644be22f..b6eef4f3f30e 100644
--- a/app-emacs/org-mode/org-mode-9.5.2.ebuild
+++ b/app-emacs/org-mode/org-mode-9.5.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="amd64 ppc x86"
 IUSE="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
deleted file mode 100644
index 064ab2444a98..000000000000
--- a/app-emacs/org-mode/org-mode-9.5.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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"
-
-PATCHES=("${FILESDIR}/${P}-parallel-make.patch")
-
-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
-}