gentoo auto-resync : 05:09:2023 - 16:23:54

9 files changed, 69 insertions, 76 deletions

diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 6042ef96ae24..7143b90e9a8c 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/eldev/Manifest b/app-emacs/eldev/Manifest
index 6e9a8c17772b..62002b1a1d25 100644
--- a/app-emacs/eldev/Manifest
+++ b/app-emacs/eldev/Manifest
@@ -1,10 +1,8 @@
-DIST eldev-1.4.1.tar.gz 268814 BLAKE2B d31ef7842888f523dab25d279064ceda2f427f70f3353d015485bc78346f368e2a56f1a5dfc0243efae36752576be32b869726e391b040eda9c3ea4418002d67 SHA512 485ccbdbcb40c3e2a19de5bad7b35bc439a4fe7c228c28ca0c75ca8292ff6216bbf78bb2d26678b94b9fcc5526aea12e1e9c6aa0368e343a08c9081ef1058e81
 DIST eldev-1.5.1.tar.gz 277342 BLAKE2B 9efc21e393703aa6649bf95ce0ab774f0306e04371001ab8de9202a9c0c975c9c8ba695dddecfb2be1717b49862aaea9a4ea714f38ccd05545597a93ddf2d61b SHA512 a06f8ecd9b5e1536f03fc6b23b721febb11841fe63b610ae410fe1a317f9e0c28c5cba590104d899e3987acb17bf354bdd17a0447aa83fab99871717574e7598
 DIST eldev-1.5.2.tar.gz 278912 BLAKE2B 6f4aa63817f09bd5fc744a08b7204227c607e1c1cf586d31d0f1835bdc720ab41a272c9dbcd309a8512ef5ddec31db50f6d31e4d52446b66aa3b5abd0e7f6c36 SHA512 86f91c7dde1a1f1012268f6b32d86855d6996ab70c828c70dd188d01609dacbba8aa68dfd86a4995a1ee944aca08d08f844696bd70f996346279dd808ab446b2
-DIST eldev-1.5.tar.gz 276909 BLAKE2B 963940d203c0864d091c50703d18805b48e3bcc4d4fec07262421c453ad346a3963d711b2a96f10e46c2329ba75f6a92093ec2845726e83958e6973a8d579b0a SHA512 fcb277175254de51b37caab04ba74422925b22d3bc98e9e84a2f563f3251fa2bfabb573c98800a05245713d256fbdb59d1091d94a037ddb3a7dda4879f451e88
-EBUILD eldev-1.4.1.ebuild 1150 BLAKE2B a23151af7f489ef8c7d4257858cf26ff8c3968308712535deb7d6f1d5f5b7110176c597a65df33ed438feb06790ca6c2e9a05e92689643e6f52286206df74f48 SHA512 9797018c6396dad2a4cdb604eb32ca6087df2abde4ae698d82484695517540cbc4b8429f45e77e3b2e8387b86ec0847a3660a9db28d4cf2697990bf14bf81bf0
+DIST eldev-1.6.tar.gz 283833 BLAKE2B c9111b97ef0ca8a70d60909f5ecacf6628e571e547a83a78aee478964bd8194b93a3c5c2fc83278a5e5e5c9909492699abe9edc1b8e113d2dafeb4af64b000b7 SHA512 855c63e173fa3ed8294eeabb08effb621e1b13d672ce035559f9eaa2dc5fa095302cc52b76fd3716312f0e5922b2774d3ccad741b764d67155f8d73c032acbe7
 EBUILD eldev-1.5.1.ebuild 1265 BLAKE2B 1eee453d4c432c5ed283696dd6091c8eaf4e930648d9173b82efd298c37f73ad88268aa4dddd7193417595e2cfd6352dceb90be9241683985030865392414f5b SHA512 3560a6e18c1f0afefd064163a4000f14ac41dd0dc6db3490c3add4a094b27f0cafa48d42f28da39342342bfa6fabf72648b7b4638883544ed3a27135afe43fd5
 EBUILD eldev-1.5.2.ebuild 1266 BLAKE2B da46690b2345f74c543a5cd3fd94cfd2c072cdce13da71051c2f0ecfcd3a4fd82fa3b3976a08ff34b894b32104298964122a69ae94afe8741eae9dee2acbadc1 SHA512 01c6c2232244713f9533f4ef3e7b30df221c0fa42efb9fa15adeb68664ab20b823e296fbd24b2b5b1a6973969edc3e3d932366ce68dbe66ce34a405559f3a255
-EBUILD eldev-1.5.ebuild 1265 BLAKE2B 1eee453d4c432c5ed283696dd6091c8eaf4e930648d9173b82efd298c37f73ad88268aa4dddd7193417595e2cfd6352dceb90be9241683985030865392414f5b SHA512 3560a6e18c1f0afefd064163a4000f14ac41dd0dc6db3490c3add4a094b27f0cafa48d42f28da39342342bfa6fabf72648b7b4638883544ed3a27135afe43fd5
+EBUILD eldev-1.6.ebuild 1266 BLAKE2B da46690b2345f74c543a5cd3fd94cfd2c072cdce13da71051c2f0ecfcd3a4fd82fa3b3976a08ff34b894b32104298964122a69ae94afe8741eae9dee2acbadc1 SHA512 01c6c2232244713f9533f4ef3e7b30df221c0fa42efb9fa15adeb68664ab20b823e296fbd24b2b5b1a6973969edc3e3d932366ce68dbe66ce34a405559f3a255
 EBUILD eldev-9999.ebuild 1266 BLAKE2B da46690b2345f74c543a5cd3fd94cfd2c072cdce13da71051c2f0ecfcd3a4fd82fa3b3976a08ff34b894b32104298964122a69ae94afe8741eae9dee2acbadc1 SHA512 01c6c2232244713f9533f4ef3e7b30df221c0fa42efb9fa15adeb68664ab20b823e296fbd24b2b5b1a6973969edc3e3d932366ce68dbe66ce34a405559f3a255
 MISC metadata.xml 982 BLAKE2B db2324ced8f4bc4ba579130677175a9de7a8dc7b8d937cd902edd69a20bc897bf4ee034acb6a9400b88de82c58c2b144e62ec4ac7b75d8dc63cdf56670cacc9e SHA512 3e4d2d7ea4fbada45b4d933d7711266bcd9ffd217ee3c3e3351e9f66145785dc11449b4f09f5ffa4853d2b475db45e501848d259f80fb5aa26429acadcb6da7d
diff --git a/app-emacs/eldev/eldev-1.4.1.ebuild b/app-emacs/eldev/eldev-1.4.1.ebuild
deleted file mode 100644
index cd320492dced..000000000000
--- a/app-emacs/eldev/eldev-1.4.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Emacs Lisp Development Tool"
-HOMEPAGE="https://github.com/doublep/eldev/"
-SRC_URI="https://github.com/doublep/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-KEYWORDS="amd64 ~arm ~ppc64 ~riscv ~x86"
-SLOT="0"
-
-DOCS=( README.adoc )
-SITEFILE="50${PN}-gentoo.el"
-
-src_test() {
-	ELDEV_LOCAL="${S}" ./bin/${PN} test
-}
-
-src_install() {
-	elisp_src_install
-	dobin bin/${PN}
-
-	# NOTICE: If ELDEV_LOCAL is defined Eldev will use it
-	# to load up it's components,
-	# if it is not it will bootstrap itself from network
-	# always check if it uses installed Emacs Lisp files.
-	# Also, do not forget to run `env-update` & reopen your shell.
-	# https://github.com/doublep/eldev#influential-environment-variables
-	echo "ELDEV_LOCAL=${SITELISP}/${PN}" >> "${T}"/99${PN} || die
-	doenvd "${T}"/99${PN}
-}
-
-pkg_postinst() {
-	elisp_pkg_postinst
-
-	ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
-	ewarn "to use Eldev in a shell before logging out (or restarting"
-	ewarn "your login manager)."
-}
diff --git a/app-emacs/eldev/eldev-1.5.ebuild b/app-emacs/eldev/eldev-1.6.ebuild
index 60daff744a6e..413e8c727a11 100644
--- a/app-emacs/eldev/eldev-1.5.ebuild
+++ b/app-emacs/eldev/eldev-1.6.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]] ; then
 else
 	SRC_URI="https://github.com/doublep/${PN}/archive/${PV}.tar.gz
 		-> ${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-3+"
diff --git a/app-emacs/org-contrib/Manifest b/app-emacs/org-contrib/Manifest
index 6786e0766b8d..2e1e2bd7e855 100644
--- a/app-emacs/org-contrib/Manifest
+++ b/app-emacs/org-contrib/Manifest
@@ -1,7 +1,5 @@
-DIST org-contrib-0.3.tar.gz 231094 BLAKE2B e27a6fecdafea3fbe1f50bf525845c48ce88b2bd6cac100c56a2a3113dab1063417c8a507e228a7eb11c7c0a083db0198fff7c713c0ddb6eac74ef9ab9fa485d SHA512 bdab6eea64157480914acb53904b0089c31b354adbc2c5f051deb5bbab9a28fe39026be0b51bb5233da066bf155b98966944b1209d05976729301e96a8e91fa4
 DIST org-contrib-0.4.1.tar.gz 177509 BLAKE2B 4aea73aa21f36d8e655feb78e34545ba962fe82e9516010c2f55c91009fc67ca9ce12c0309174704a2ace7f98401921571b927549bf8c134cdb020e1079898c7 SHA512 e582963ab65fd88cd01013733f497c19a724b9584ae7dec178604377f347f3f8d3aa1e7871ee1ab3903a0fc94baa4ff3ce0c0591c0d5c918aeda1a9a747f9d6b
-DIST org-contrib-0.4.tar.gz 177349 BLAKE2B e26e0ae1d82d3ffffc2746d83fa359e7036eb208084f6e7b9deb1a851de347441bedf7cd47e1eaf3b0ec07acf17016b7ec656ea61ac4a2e88ba7dc221cfb1146 SHA512 cc89a53ba342addb3d508a290cf7c734a6efef2f119c05c85db14177c0b5976ccfe263aac23003328992f71f9223851a5ab186a5c40d677bf9a9a798997f4abb
-EBUILD org-contrib-0.3.ebuild 471 BLAKE2B 3ff08adad6ac8ab031130b89907e9dd420a9fd38d3f8eddef16390443dbf9382cba5330a5ad14c0e258b270478f7a731dfb041a3da6f5229e6d73c11408f4066 SHA512 8c023232dd87499faec5fae25d4c1569af1412160d009562210bfd0977525ac08782919f244d4c0c9d42196f64b6fef36c9300f0fb562fd5c918a1ad65cf19a6
+DIST org-contrib-0.4.2.tar.gz 175913 BLAKE2B 42e4bc473ec63775e77e402614309f85c9228094bf4a8c604df1c11988ea116327fb97f8d914509075d2e988521c525ba1ac7a5da30623a9a0e2591695c39e1c SHA512 dfa2982a279384d5f0b3fcbfb3b107116c78f364d76c86952a29db6e41a7229295b700b6451f7085eb75307d7f83d1a8dbcf7c268127d989270344328a574167
 EBUILD org-contrib-0.4.1.ebuild 471 BLAKE2B 3ff08adad6ac8ab031130b89907e9dd420a9fd38d3f8eddef16390443dbf9382cba5330a5ad14c0e258b270478f7a731dfb041a3da6f5229e6d73c11408f4066 SHA512 8c023232dd87499faec5fae25d4c1569af1412160d009562210bfd0977525ac08782919f244d4c0c9d42196f64b6fef36c9300f0fb562fd5c918a1ad65cf19a6
-EBUILD org-contrib-0.4.ebuild 471 BLAKE2B 3ff08adad6ac8ab031130b89907e9dd420a9fd38d3f8eddef16390443dbf9382cba5330a5ad14c0e258b270478f7a731dfb041a3da6f5229e6d73c11408f4066 SHA512 8c023232dd87499faec5fae25d4c1569af1412160d009562210bfd0977525ac08782919f244d4c0c9d42196f64b6fef36c9300f0fb562fd5c918a1ad65cf19a6
+EBUILD org-contrib-0.4.2.ebuild 582 BLAKE2B e404ede44b38f0b18b539e0e9a68d46126be24b6c1e749c6fa9c6aa6cc42d02c0cc4bda61ced68bfc220947dde33eed02c60ee11a253a3687cf9aecc11da2356 SHA512 7d7b45bbe15ac55d8413297f76f3779dc2b02490b55a1fdf8c250063a44f5fa6d54208fb41c06602d7a46cd9807f286708a762cfbdcc4568550e4524edd1dd23
 MISC metadata.xml 381 BLAKE2B f958458786725460e86ec35f720594577f77e71725c8d40e2bc7045ae62b374c3ad6965a551df925114cb639bb09794ff30fd472698c53af5d3e2739227761dd SHA512 8923999ffb3f796bab1284bc58b87b627167531f1f6bcf057a01f5abf51e2de1ff02371104b4729aa4e94fcee14fe4c17f1587071adbdba476f9578a40f0c557
diff --git a/app-emacs/org-contrib/org-contrib-0.3.ebuild b/app-emacs/org-contrib/org-contrib-0.4.2.ebuild
index 85893537b110..5c5af7aa3af6 100644
--- a/app-emacs/org-contrib/org-contrib-0.3.ebuild
+++ b/app-emacs/org-contrib/org-contrib-0.4.2.ebuild
@@ -7,14 +7,22 @@ inherit elisp
 
 DESCRIPTION="Contributed packages to Org"
 HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="https://git.sr.ht/~bzg/${PN}/archive/release_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-release_${PV}/lisp"
+
+if [[ ${PV} == *9999* ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://git.sr.ht/~bzg/${PN}"
+else
+	SRC_URI="https://git.sr.ht/~bzg/${PN}/archive/release_${PV}.tar.gz
+		-> ${P}.tar.gz"
+	S="${WORKDIR}/${PN}-release_${PV}/lisp"
+
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND=">=app-emacs/org-mode-9.5"
 
-DOCS="../README.org"
+DOCS=( ../README.org )
 SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-contrib/org-contrib-0.4.ebuild b/app-emacs/org-contrib/org-contrib-0.4.ebuild
deleted file mode 100644
index 85893537b110..000000000000
--- a/app-emacs/org-contrib/org-contrib-0.4.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="Contributed packages to Org"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="https://git.sr.ht/~bzg/${PN}/archive/release_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-release_${PV}/lisp"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-
-RDEPEND=">=app-emacs/org-mode-9.5"
-
-DOCS="../README.org"
-SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 2ac3ca1ac66c..fd4665cde188 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -3,9 +3,11 @@ DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8f
 DIST org-mode-release_9.5.5.tar.gz 2049730 BLAKE2B 382e6585f693fd30def29da740d1329a52b4565382df90a37e3646324ee44106f1a99c2ea0c0862d77721cc9bfbec0736cb03065b59b2fdea0a68d8f8ea37c9a SHA512 ce06bab17ae7944c1623f935bbad0379d06390c72c43633ba0de2bc04ad362e18d9aaae96103eeaa23f7ea9e4e00976a97a914da87fb7941a13746b1fa77f591
 DIST org-mode-release_9.6.7.tar.gz 2209900 BLAKE2B 5e0c63722cba9708018da8e79bfd63a3d632cd7ac27144833e2f816b26cd558dc249c0c8a6b9f78f5c68af1d9218d43fa2f4fab7ab86645215d0ba40cb3d3f12 SHA512 f8225eb3d488faef54d97c812964010fefc19003950fd5b49fc1618b8ff0deb9d001c631820d99439f7527aa72f9c071578484b3b7b8d3c46baa53a7066de2fc
 DIST org-mode-release_9.6.8.tar.gz 2211121 BLAKE2B 1291be7924ba741ae09f4058549215426c73304ea9c90d9d0631889b1dcf55af75b6959aaaefebfc088f22fa126d25d7729ecd2e3b433ee07b0dc37da1ec1867 SHA512 e76834ce2baa34fe979fd9333294481c9b1cbb81d506c7830b5bd6bf556aa9f4979faa3dfcd6414a04fe7915fc089a8eea38912e0e21527aa84451903572ace7
+DIST org-mode-release_9.6.9.tar.gz 2211112 BLAKE2B 33a22d8017a86d027e12413d8ff17c6fb972c2c20921e8061690e85d3d6829a3b45512998c0b50429566fdace05184963eff97cc219cf7850f29b19e38ec1a05 SHA512 458060c220fc934ac14355bd72a1b95498c416e7b56054f4b179fde7cee128848a1f466d0f69cbc5b51f30955eeaaf86408f928358fc206ad8e8d9966d6f69d8
 EBUILD org-mode-9.4.6.ebuild 1696 BLAKE2B 1e2b698f0ba118149cd4e960e5a34b6370c878a917746ecafa9758b5f3ce24d55ea0a7ff3a99b370c972cb0c97c0321bdfe5735d5782d98adcf1ab4c65e4b84e SHA512 76bbc761a82b08a26bb73c0d655b52308487586a8a108a6bc2a29ec66816fdf1f173c626f8594198c00c6a45000686e0876b98dbeb3e566ae212b03005c90ba4
 EBUILD org-mode-9.5.5.ebuild 1386 BLAKE2B 2686e19cbcc0e8298702d9be753b8023e8736feac0d07793c581dfa51a9167d65b072a1d8a268b319b4dd87e04a6e920d400ddb13c50f3da5837bc08cc58f8a7 SHA512 b3417352a09da826becf217c2789d90b25971c4d97ff92225459b50617c04f85bb1cdf53b933ba1c5927a202a4852acf6bb1b6bee3e2c2c40a3fb772669017fb
 EBUILD org-mode-9.6.7.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
 EBUILD org-mode-9.6.8.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
+EBUILD org-mode-9.6.9.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
 EBUILD org-mode-9999.ebuild 1531 BLAKE2B 6c06454ac286f2d681af7e55c151a9855dac8aa3028c41c43753ee907fe4d63ec26e5e8e4a0a4f97b80172b0f8fabc92ba591298bef9b5301a176460a1ce9358 SHA512 5526252d6a1190a8bee375b96e9b85c33e593f6bc77f118a33cd566c8fc5634e9e839dbe931c9ad96252e81d669fdc84f9999ea6b834cf2273d31d1e8cb86d90
 MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
diff --git a/app-emacs/org-mode/org-mode-9.6.9.ebuild b/app-emacs/org-mode/org-mode-9.6.9.ebuild
new file mode 100644
index 000000000000..77e4614e18c6
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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 -j1 \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake -j1 pdf card
+}
+
+src_install() {
+	emake \
+		ORGVERSION=${PV} \
+		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.org CONTRIBUTE.org 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
+}