7 files changed, 68 insertions, 31 deletions
diff --git a/app-emacs/org-contrib/Manifest b/app-emacs/org-contrib/Manifest
index 301731376e02..45dcd5d53b8f 100644
--- a/app-emacs/org-contrib/Manifest
+++ b/app-emacs/org-contrib/Manifest
@@ -1,2 +1,3 @@
-DIST org-contrib-0.2.tar.gz 231795 BLAKE2B e8ec122bc87a50ae9b718ab984418a73c6e6734920a208815cac11ecbc2a3897409f3f4d3c0bbbc04f2f4a1a5e657ef35b71e0342156e1b82e2057a6deffdcb8 SHA512 26ce845a9f845ceee2326bd006ff18ef35ba5b1af438d9d02e7f249bf45df293128b24f9f9ff15d7c87271618d1e4ee95d689a96e2104b6dee09ef7b78a6d581
-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.2.tar.gz 175913 BLAKE2B 42e4bc473ec63775e77e402614309f85c9228094bf4a8c604df1c11988ea116327fb97f8d914509075d2e988521c525ba1ac7a5da30623a9a0e2591695c39e1c SHA512 dfa2982a279384d5f0b3fcbfb3b107116c78f364d76c86952a29db6e41a7229295b700b6451f7085eb75307d7f83d1a8dbcf7c268127d989270344328a574167
+DIST org-contrib-0.5.tar.gz 168071 BLAKE2B 8abc53edfa5ca5aa1c5568deabf6e9d167eae1745f7531b5a308c7b3f25c282a06003f37ef6ab45156abd067b332f1d718268c6854122fbd3c5755da43782455 SHA512 ef7b26a7626768cb0f3b95330c12eef8f8005a5e44a41f3b0426bc98b6d43b91655ec78685d6af71fe9baea305216cb991251b1141928af4dfdcc6e3321ba8f1
diff --git a/app-emacs/org-contrib/files/50org-contrib-gentoo.el b/app-emacs/org-contrib/files/50org-contrib-gentoo.el
deleted file mode 100644
index 431f7e90ae73..000000000000
--- a/app-emacs/org-contrib/files/50org-contrib-gentoo.el
+++ /dev/null
@@ -1 +0,0 @@
-(add-to-list 'load-path "@SITELISP@")
diff --git a/app-emacs/org-contrib/metadata.xml b/app-emacs/org-contrib/metadata.xml
index 986088003fe1..daade8e3e6cb 100644
--- a/app-emacs/org-contrib/metadata.xml
+++ b/app-emacs/org-contrib/metadata.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="project">
-  <email>gnu-emacs@gentoo.org</email>
-  <name>Gentoo GNU Emacs project</name>
-</maintainer>
-<stabilize-allarches/>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <stabilize-allarches/>
+  <upstream>
+    <remote-id type="sourcehut">~bzg/org-contrib</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/app-emacs/org-contrib/org-contrib-0.3.ebuild b/app-emacs/org-contrib/org-contrib-0.3.ebuild
deleted file mode 100644
index e0570dbb3965..000000000000
--- a/app-emacs/org-contrib/org-contrib-0.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-NEED_EMACS=24
-
-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-contrib/org-contrib-0.2.ebuild b/app-emacs/org-contrib/org-contrib-0.4.1.ebuild
index b3eb691a59b1..85893537b110 100644
--- a/app-emacs/org-contrib/org-contrib-0.2.ebuild
+++ b/app-emacs/org-contrib/org-contrib-0.4.1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-NEED_EMACS=24
 
 inherit elisp
 
diff --git a/app-emacs/org-contrib/org-contrib-0.4.2.ebuild b/app-emacs/org-contrib/org-contrib-0.4.2.ebuild
new file mode 100644
index 000000000000..5c5af7aa3af6
--- /dev/null
+++ b/app-emacs/org-contrib/org-contrib-0.4.2.ebuild
@@ -0,0 +1,28 @@
+# 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/"
+
+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"
+
+RDEPEND=">=app-emacs/org-mode-9.5"
+
+DOCS=( ../README.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-emacs/org-contrib/org-contrib-0.5.ebuild b/app-emacs/org-contrib/org-contrib-0.5.ebuild
new file mode 100644
index 000000000000..5c5af7aa3af6
--- /dev/null
+++ b/app-emacs/org-contrib/org-contrib-0.5.ebuild
@@ -0,0 +1,28 @@
+# 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/"
+
+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"
+
+RDEPEND=">=app-emacs/org-mode-9.5"
+
+DOCS=( ../README.org )
+SITEFILE="50${PN}-gentoo.el"