10 files changed, 260 insertions, 181 deletions
diff --git a/app-emacs/org-mode/Manifest b/app-emacs/org-mode/Manifest
index 05a023370d4b..27e6856b0fb6 100644
--- a/app-emacs/org-mode/Manifest
+++ b/app-emacs/org-mode/Manifest
@@ -1,3 +1,4 @@
-DIST org-8.3.2.tar.gz 4442361 BLAKE2B f21f07578e870cd3edaa3721a53f679627c0115c320c666c2086e201e272c0ef03540bfdd90936a624cd4c4dcbac21b91346ba975b6006ada2d46184f73574f3 SHA512 3e1ff47c875a2db3239add8b060f555da357e465161ca62860c0ac2734c2e31c5387d2df4223ab7ea8ea60050f9a845d160b0bcb3afcf36f1d3cabcaa961e6a2
-DIST org-9.3.6.tar.gz 4669953 BLAKE2B 1d221918f8145b789d979ee7822640dd37c5722e9f65ba36e945f7d574cfb89d48e2da1812d5dc727301ef1ad8bd2ef5628f54cbbfef5bffbab48656ed4c1e65 SHA512 47b5b81f47474d399cc7aada0e32f376d4c8758f6e955b7d889035610c20a4c372ea0571a510695822d2b87bd1e8002c2d0d8c73dc730144540c59b5ef25e090
-DIST org-9.4.tar.gz 4724986 BLAKE2B 8f56c2459e1718d4982ccdba3a8fb1403ff4a66a5425ec341f6d5ef01b2415c87d77c7ac8a8cd7046b4398a18688ef5fb4f92d0131f6694bc6047b32e3dd5827 SHA512 480377b13950e1f9cfa2ec553f274156ff9a25a5572d5eb6137fa08a3d6f1d5c0a6942f4d139379974861ee467c3be17105bec6b17640beaa308c8fa6825f8f5
+DIST org-mode-release_9.6.26.tar.gz 2213217 BLAKE2B a4972b4c9647fc816506cc8aebab8d21e0ef461dbf8a0dcaed789c6451ee54464eaa99f59581bc39256b68c8d66c133c60c3c523ac4a31725e7002ccdc6e51b5 SHA512 3b612b3af272c0633d8e11ed210c16218250c3f5b6be7f800659a767ebfc77ebb01bdaf649045ac9ab7edf1bb8a9c7386a8c04eaafe12d943bf48989670ca20d
+DIST org-mode-release_9.6.28.tar.gz 2213979 BLAKE2B a0dec5afe4c234d895e459abb1d30e4b7dc8b0c7ff918b8444adb7324bf77975acafe2ab1dcc7ea1ef3340471cf0508896609ca5ce4f8384777b72ce0fb0bcb8 SHA512 7e4944277ff52d3740d341e059eab00316f0baf3bf6e0f9c1b3c35577530feb0a516f1b081902e0e45b0138d1903d0bb7d96342a3fb5524bb6a066713a6c044b
+DIST org-mode-release_9.6.29.tar.gz 2213955 BLAKE2B 6941618cae31ce7ff93789d926ff340609136bbfab2f1ee96d33622e0ad8c86193948999f25cfe3ca935e6938c57f805e3423e0ac434f80f31a52639e4b65380 SHA512 3b1ab2a70b4407b84cd7103c789b12285b774f873a488c9c92cb11c1f9c08b9f85b1ee05d9f69c7e6333d9b7085ac804f50aa7a97c2123f8f72db2160aa4e7f3
+DIST org-mode-release_9.6.30.tar.gz 2213585 BLAKE2B 60fc54953fda7c3c4d8887ad0bd1acd349aa58ba4ef472d49fee32eb2b8e2830262efbaf348ff2485034a67ce404279d79e5ab555e74c79e187eba09cd372c73 SHA512 0d24b01d773b9a3039cc3174d8a3242e9fc202631b7b837c6ebd511d0da00a657e961943da9a7f21dd370ce070d0c383bd9c1a508199a7772581f6d4906fb8cb
diff --git a/app-emacs/org-mode/metadata.xml b/app-emacs/org-mode/metadata.xml
index 1947e1fe4286..ab6e8b67070e 100644
--- a/app-emacs/org-mode/metadata.xml
+++ b/app-emacs/org-mode/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <maintainer type="project">
   <email>gnu-emacs@gentoo.org</email>
@@ -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-8.3.2-r1.ebuild b/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
deleted file mode 100644
index 3c74d138b599..000000000000
--- a/app-emacs/org-mode/org-mode-8.3.2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit elisp readme.gentoo-r1
-
-DESCRIPTION="An Emacs mode for notes and project planning"
-HOMEPAGE="https://www.orgmode.org/"
-SRC_URI="http://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 ~x86-macos"
-IUSE="contrib doc odt-schema"
-RESTRICT="test"
-
-DEPEND="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 doc/library-of-babel.org doc/orgcard.txt 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.3.6.ebuild b/app-emacs/org-mode/org-mode-9.3.6.ebuild
deleted file mode 100644
index d8248f25435b..000000000000
--- a/app-emacs/org-mode/org-mode-9.3.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 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="http://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 ~x86-macos"
-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.4.ebuild b/app-emacs/org-mode/org-mode-9.4.ebuild
deleted file mode 100644
index 60448056b54a..000000000000
--- a/app-emacs/org-mode/org-mode-9.4.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 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="http://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 ~x86-macos"
-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.26.ebuild b/app-emacs/org-mode/org-mode-9.6.26.ebuild
new file mode 100644
index 000000000000..99d1b2f0ae2f
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.26.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 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/"
+MY_P="${PN}-release_${PV}"
+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
+}
diff --git a/app-emacs/org-mode/org-mode-9.6.28.ebuild b/app-emacs/org-mode/org-mode-9.6.28.ebuild
new file mode 100644
index 000000000000..6a5fae66355f
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.28.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 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/"
+MY_P="${PN}-release_${PV}"
+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
+}
diff --git a/app-emacs/org-mode/org-mode-9.6.29.ebuild b/app-emacs/org-mode/org-mode-9.6.29.ebuild
new file mode 100644
index 000000000000..6a5fae66355f
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.29.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 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/"
+MY_P="${PN}-release_${PV}"
+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
+}
diff --git a/app-emacs/org-mode/org-mode-9.6.30.ebuild b/app-emacs/org-mode/org-mode-9.6.30.ebuild
new file mode 100644
index 000000000000..6a5fae66355f
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9.6.30.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2024 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/"
+MY_P="${PN}-release_${PV}"
+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
+}
diff --git a/app-emacs/org-mode/org-mode-9999.ebuild b/app-emacs/org-mode/org-mode-9999.ebuild
new file mode 100644
index 000000000000..ac0cf59313b4
--- /dev/null
+++ b/app-emacs/org-mode/org-mode-9999.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp readme.gentoo-r1
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/emacs/${PN}.git"
+	EGIT_CHECKOUT_DIR="${WORKDIR}/org"
+	inherit git-r3
+	S="${WORKDIR}/org"
+else
+	MY_P="${PN}-release_${PV}"
+	SRC_URI="https://git.savannah.gnu.org/cgit/emacs/${PN}.git/snapshot/${MY_P}.tar.gz"
+	S="${WORKDIR}/${MY_P}"
+	KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="An Emacs mode for notes and project planning"
+HOMEPAGE="https://www.orgmode.org/"
+
+LICENSE="GPL-3+ FDL-1.3+ CC-BY-SA-3.0 odt-schema? ( OASIS-Open )"
+SLOT="0"
+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.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
+}