gentoo resync : 29.12.2022

3 files changed, 59 insertions, 3 deletions

diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 662dbde5d6c3..d73edcd03e2e 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -2,8 +2,10 @@ AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe
 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.3.tar.gz 2049323 BLAKE2B e6a93a74d5084ca168fb85d2651c23a0afb75ac649cf6821cf825bb54d69d61ea4694584872b49a23bac1374f0b22d2d7015a346b0dd46fb0795b75c8753c655 SHA512 7062e1075567b7af9b1c39f38930fc1fbc72e53be3c063dbd25cc4e8295932ba501586fcb1e2879da1db4200e63c79a454f4225b5d53dafb1773ebb2e0340ec5
+DIST org-mode-release_9.5.4.tar.gz 2049298 BLAKE2B 7abd01bd78357b09cdc10661ad9b285c2e717c5848be2ff61df023d752659b6636881dfe17fe13486db8c9c37f576edfb02303f552c85e72594af99de7618a24 SHA512 06feb279c8e669fed263f9a3dbd8e0fa25450b1310a968d22b4f4d94b6a0515a1242758ed2c91a4d7c4c6b8315e756fe26951e9f9731ed3e7cfb7a0a8ef6999e
 EBUILD org-mode-9.4.6.ebuild 1710 BLAKE2B 7e412f50607d334b4052596fee8520b7d47c982b43f23245d64c56004a2d8910ca9fc12bf8a4ee269d6556a7406e1a297131ed7d0ff9e5ad17d04bf698575d80 SHA512 5d2004cb82270a425edd181881b0c64866a04c89203695b0d56cedd7b4f4032ec63f36e564ade12e67ed75c322f4bbfeb293ccf20b0b47749cddce277f2849fb
 EBUILD org-mode-9.5.2.ebuild 1354 BLAKE2B 91230d55d675bb6fa2cc1b4b77bd15c1489972aad0ccce952effb43913f2d5efbca723d382253ab8281155ede9d268db87a513fa2616949905c108b3fbfa56f9 SHA512 9b3a68bedb079c7ddaa07edece32241172e5d7939ac979a6ddcd7812c5ea654bb7fd3994d6be767960b11d0ac33ec2c56b7d8ff717d649ef627fc029f54230ea
-EBUILD org-mode-9.5.3.ebuild 1357 BLAKE2B 2a168c412e1f23b11a3d7b14a8befce8ec7f55248507e31258dbf7e2fe900c234a395b066e22ccd30c752f7bb5951475b98ac86236585993840b21f0b4d49917 SHA512 588041db796a8d0a7062eca487071be2f9bbe5da9e44747a3545679efea0ef5a5b70bd96cd43b55c2a8623e178b429d3480999b18434cf6a4572e1a67c1fbdf3
+EBUILD org-mode-9.5.3-r1.ebuild 1400 BLAKE2B 93d99c3e959140b0064b37d275b4b1163624748c5c8cc90caa345bb283a775feb5803cac35b7d51d5b8890da94e6a052bcdda2f8a98b285e7771dc6c6779be45 SHA512 2a97b5b025ea6edbbb3a5168609e3780b944497bed223d5de47e1d6bf5c3229edfe42476bf7264c618c00346f8c3a27021146a80d9a24d1ac172004b455c080a
+EBUILD org-mode-9.5.4.ebuild 1403 BLAKE2B 0a7b076c63baad861be41882805746d054f8d85e88afd9d73a310efeba7a0bf36610f0255093a0b0f5ab43a18f0a417103b436c5a32042af1155dbd6bc3b1be2 SHA512 28293db641d62fc0d6c2ac855c579d0d4e03d1f4f3963914c74f4d78f64ee1a5f0bea3fbc6d80950c87655121f74649a3669e542d8d17f95100c3a726bac84f7
 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/org-mode-9.5.3-r1.ebuild b/app-emacs/org-mode/org-mode-9.5.3-r1.ebuild
new file mode 100644
index 000000000000..c67b95868b07
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.5.3-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 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 \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
+	use doc && emake 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 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
+}
diff --git a/app-emacs/org-mode/org-mode-9.5.3.ebuild b/app-emacs/org-mode/org-mode-9.5.4.ebuild
index dafc16ab39bc..3e9e8d36363d 100644
--- a/app-emacs/org-mode/org-mode-9.5.3.ebuild
+++ b/app-emacs/org-mode/org-mode-9.5.4.ebuild
@@ -10,7 +10,7 @@ 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}"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
 SLOT="0"
@@ -23,12 +23,15 @@ BDEPEND="doc? ( virtual/texi2dvi )"
 SITEFILE="50${PN}-gentoo.el"
 
 src_compile() {
-	emake datadir="${EPREFIX}${SITEETC}/${PN}"
+	emake \
+		ORGVERSION=${PV} \
+		datadir="${EPREFIX}${SITEETC}/${PN}"
 	use doc && emake pdf card
 }
 
 src_install() {
 	emake \
+		ORGVERSION=${PV} \
 		DESTDIR="${D}" \
 		ETCDIRS="styles csl $(use odt-schema && echo schema)" \
 		lispdir="${EPREFIX}${SITELISP}/${PN}" \