5 files changed, 53 insertions, 62 deletions
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index d2f84bde18ab..ad3de5c4da21 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index d9e046c8227b..0b2237bee698 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,13 +1,13 @@
 AUX 50org-mode-gentoo.el 95 BLAKE2B 9c74869edce0915d9793a3b10f61e8002dec553a93fe9856c526d77e5e988a35203c35322a1ea7ce9e19b02ff9a5ce1b2b4d73b8ba19bada30b7fbf453e43b01 SHA512 aa2e47c060d441ef1f631f2a44f3b7adc7cf5306155b9cc3f3f808aa053b411980671a89933c77fe02aac79bb6f25f2fe98c676e13e097dd885f23bc9d8cb000
-DIST org-9.4.6.tar.gz 4729335 BLAKE2B b88edaf8098124b2048ce57d6005d2af0de34e9b8fa94c24eb041a42a6fca1fd6da7f242be89e6b0ca5e7b80d879096f9114dca0ba86b20a5d26d2a185baa537 SHA512 7e50d7e9e2073bc0f06d2c861f59d4c9b8af4cf63c98f730c810a3a8721e65829fe9ef7ba0ac99f49bf9da427a4d5ad1d028e05c1a8ab6a3bea2ff2020c0e61d
 DIST org-mode-release_9.5.5.tar.gz 2049730 BLAKE2B 382e6585f693fd30def29da740d1329a52b4565382df90a37e3646324ee44106f1a99c2ea0c0862d77721cc9bfbec0736cb03065b59b2fdea0a68d8f8ea37c9a SHA512 ce06bab17ae7944c1623f935bbad0379d06390c72c43633ba0de2bc04ad362e18d9aaae96103eeaa23f7ea9e4e00976a97a914da87fb7941a13746b1fa77f591
 DIST org-mode-release_9.6.10.tar.gz 2211113 BLAKE2B 6cbbcb13842fa25e47fe2fdb2ab3c486ce3fd75d138dfe88a788e9fe3d0779bce8b5ee0339adb55f348e0bef84490004cd20d51235001d0f59ce3829cee06079 SHA512 4ca1585e85474c8ab05c2c5a5caaefffe3c947e71abe7e28b226b0d7f0eb1a84fe8e68bf787c955223e8c0bc79dccd9687d4b8a3c0d7e60bebb4654014bce7d2
 DIST org-mode-release_9.6.11.tar.gz 2211391 BLAKE2B e9b7dae75f512f95c3dca5b03d0c830dbbd12d21ff5db4a255a422e30e477b68ce73b26274e6a7d78394249aea662debcdcbc76a52de404243a7322ba00f6046 SHA512 4a08e4631ddfda4a74db29d000664742cbeac90115d85cb1d575fca7099c32919f69b37ac96de776bc03db8746b03872b6339c8b943c0b1c2e503262d877f79a
+DIST org-mode-release_9.6.12.tar.gz 2211710 BLAKE2B 3d6d94966493b3c76899b1e2c781cd12b35c902d31d75a64024e674b496507ca5487a36bf89af860aa4adc96c95d3e8644a923a4812722b44521cdedafd5d719 SHA512 b23a78075ed44c45ac6d52e86f3128e51c8bd9c0587fc38eb0c39fd1d1967e8125f719ed499589821f5ffc50390dc3b1db1c9901309dffb1140ce836da239153
 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.10.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
 EBUILD org-mode-9.6.11.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
+EBUILD org-mode-9.6.12.ebuild 1405 BLAKE2B c72dfd77145677c969a4cedf57a53ddfbf09621b5830ffc96171661d6df7974114d169c5111d8ff346c232201f67d8d79999d7f3589566a132fb0b2de19303c2 SHA512 7ac81d9b86c6317c50c4cdd5d7b8786e1c0fd2a930b0adba139451d32e7d6801f8c38f9eb11723ab50af8da10dde5f4a7d2b5b25e469959b7bf0ac8b2701886f
 EBUILD org-mode-9.6.9.ebuild 1402 BLAKE2B 6d24234cff61823b747d2bf5acd2c5ea42e44230fff15e7414ce501ac80efbe6aa3a278544f8875af5ca6cda3f34e8ebc52ce58a02805b92cd9ac2173d050748 SHA512 31946a3e38c438325919b05e2d084e8533248e15f68bf74bbebfec4c00fe9f39e66d622e49c3fca9714b22ef35e8eb0583bafe66cc40f85838df327cdd0f064e
 EBUILD org-mode-9999.ebuild 1531 BLAKE2B 6c06454ac286f2d681af7e55c151a9855dac8aa3028c41c43753ee907fe4d63ec26e5e8e4a0a4f97b80172b0f8fabc92ba591298bef9b5301a176460a1ce9358 SHA512 5526252d6a1190a8bee375b96e9b85c33e593f6bc77f118a33cd566c8fc5634e9e839dbe931c9ad96252e81d669fdc84f9999ea6b834cf2273d31d1e8cb86d90
-MISC metadata.xml 1369 BLAKE2B 4da436ff9e2de1e6f01a37be7cd8a893d49896d00c83a16a47838c3908e04b46f7f07499ce3bdf41a25033ec1313e16b30d6498622e476fdede774ce711d77ff SHA512 d0817690d4662401fcdd28de85b3e7e5f0c69cb37de4ba7ada8499d7ef964217cda8cabed4849c9b48ebecc393d65b2de5067c36db1e98834ac8a86024b901d1
+MISC metadata.xml 1308 BLAKE2B 5aecc9209e6435d3112633a3dbb154494d20f6e428985f942ea9102d83d03ad08049fc58abe16d189f6744278fb84886990c0dfa94972b7e5669edf05de17223 SHA512 331969bde4138037bb516456a25de2b89a913f06c411375a3303eb95799e5cd214934aad98166f407acb47963ea9ab6ceae6d35fe607c963e62f0279d28a1cf1
diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
index 19cec1152498..ab6e8b67070e 100644
--- a/app-emacs/org-mode/metadata.xml
+++ b/app-emacs/org-mode/metadata.xml
@@ -22,7 +22,6 @@
 </longdescription>
 <stabilize-allarches/>
 <use>
-  <flag name="contrib">Install user-contributed files</flag>
   <flag name="odt-schema">Install non-free schema files
     for OpenDocument Text exporter</flag>
 </use>
diff --git a/app-emacs/org-mode/org-mode-9.4.6.ebuild b/app-emacs/org-mode/org-mode-9.4.6.ebuild
deleted file mode 100644
index 25cfba5ab285..000000000000
--- a/app-emacs/org-mode/org-mode-9.4.6.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-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.6.12.ebuild b/app-emacs/org-mode/org-mode-9.6.12.ebuild
new file mode 100644
index 000000000000..77e4614e18c6
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.12.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
+}