Adding metadata

5 files changed, 47 insertions, 79 deletions

diff --git a/dev-util/reuse/Manifest b/dev-util/reuse/Manifest
index b3a8bb0106c6..9a61e30a670b 100644
--- a/dev-util/reuse/Manifest
+++ b/dev-util/reuse/Manifest
@@ -1,2 +1 @@
-DIST reuse-2.0.0.tar.gz 222637 BLAKE2B abcf7adbf110e7c3721eef26a56741dae3d69f9ccf31025807e158317b9dd0bcee2b38731ca7897a7671afa602040119d275488b2c198b1a74e32b99b8477cdb SHA512 0716fc48c5cf6a8dda3c8c962c518554fdd2d0f71502eaa636dd4effa86a135c5819e6d7e62a1420174fce5c80ad6d7c3174389170b7680006fcc137c35cdb4c
-DIST reuse-2.1.0.tar.gz 224518 BLAKE2B 328bafdeea1740afa1346d134be38fddd6cb7cedebea25eff4fb46f9935bef6ea0a605092798e4b5e256f43068459c2e4162f13540b6d62d3a3fd2596f5e6ba1 SHA512 8353ee53dd503d8dc3e956f0f13a7f0d4d80218e8b59a0bb972ecd4a80ec3b737548ad2c46177a5ba27a1c288af2c0b993befc1e0e88533af663094c3d1bcf38
+DIST reuse-2.1.0.gh.tar.gz 260786 BLAKE2B 371c1167e10449ecdbaf0a93dbfa7d50c700daaf71394379a48d1baaae0b1be03728e79fd551da75a3743e06cae1a77e7445482222845d1356a6af3eb39bef46 SHA512 912d713b2c68029cc67a5fbebfca61d96165ae8ae9d927bbdd651cf2130104b297d5c0133f1a46442cba3ec84d00ba92c27414bff770d2250f5a2131c7ad4aef
diff --git a/dev-util/reuse/files/reuse-2.1.0_docs.patch b/dev-util/reuse/files/reuse-2.1.0_docs.patch
new file mode 100644
index 000000000000..a9f19a8ea0a4
--- /dev/null
+++ b/dev-util/reuse/files/reuse-2.1.0_docs.patch
@@ -0,0 +1,15 @@
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -189,9 +189,9 @@
+     """Copy the markdown files from the root of the project into the docs/
+     directory.
+     """
+-    copyfile("../README.md", "readme.md")
+-    copyfile("../CHANGELOG.md", "history.md")
+-    copyfile("../CONTRIBUTING.md", "contributing.md")
++    copyfile("README.md", "docs/readme.md")
++    copyfile("CHANGELOG.md", "docs/history.md")
++    copyfile("CONTRIBUTING.md", "docs/contributing.md")
+ 
+ 
+ def setup(app):
diff --git a/dev-util/reuse/metadata.xml b/dev-util/reuse/metadata.xml
index cbd7df91918a..e0b89e6ccb49 100644
--- a/dev-util/reuse/metadata.xml
+++ b/dev-util/reuse/metadata.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
+ <maintainer type="person">
+  <email>jstein@gentoo.org</email>
+  <name>Jonas Stein</name>
+ </maintainer>
  <upstream>
   <doc>https://reuse.readthedocs.io/</doc>
  </upstream>
- <origin>gentoo-guru-overlay</origin>
+ <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-util/reuse/reuse-2.0.0.ebuild b/dev-util/reuse/reuse-2.0.0.ebuild
deleted file mode 100644
index 546f8a87cacf..000000000000
--- a/dev-util/reuse/reuse-2.0.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10,11,12} )
-DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 pypi
-
-DESCRIPTION="A tool for compliance with the REUSE recommendations"
-HOMEPAGE="
-	https://reuse.software/
-	https://pypi.org/project/reuse/
-	https://github.com/fsfe/reuse-tool
-"
-
-LICENSE="Apache-2.0 CC0-1.0 CC-BY-SA-4.0 GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/boolean-py[${PYTHON_USEDEP}]
-	dev-python/binaryornot[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	dev-python/python-debian[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	sys-devel/gettext
-	test? (
-		dev-vcs/git
-		dev-vcs/mercurial
-	)
-"
-
-DOCS=( AUTHORS.rst CHANGELOG.md README.md )
-
-distutils_enable_tests pytest
-
-# [Errno 2] No such file or directory: '../README.md'
-#distutils_enable_sphinx docs \
-	#dev-python/furo \
-	#dev-python/recommonmark \
-	#dev-python/sphinx-autodoc-typehints \
-	#dev-python/sphinxcontrib-apidoc
-
-python_test() {
-	cd "${T}" || die
-	epytest "${S}"/tests
-}
diff --git a/dev-util/reuse/reuse-2.1.0.ebuild b/dev-util/reuse/reuse-2.1.0.ebuild
index 546f8a87cacf..d6ff9d29ed56 100644
--- a/dev-util/reuse/reuse-2.1.0.ebuild
+++ b/dev-util/reuse/reuse-2.1.0.ebuild
@@ -5,44 +5,44 @@ EAPI=8
 
 PYTHON_COMPAT=( python3_{8,9,10,11,12} )
 DISTUTILS_USE_PEP517=poetry
-inherit distutils-r1 pypi
 
-DESCRIPTION="A tool for compliance with the REUSE recommendations"
-HOMEPAGE="
-	https://reuse.software/
-	https://pypi.org/project/reuse/
-	https://github.com/fsfe/reuse-tool
-"
+inherit distutils-r1
 
-LICENSE="Apache-2.0 CC0-1.0 CC-BY-SA-4.0 GPL-3+"
+DESCRIPTION="Manage license information according to the SPDX standard"
+HOMEPAGE="https://reuse.software/
+	https://github.com/fsfe/reuse-tool"
+MY_PN="${PN}-tool"
+SRC_URI="https://github.com/fsfe/${MY_PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3+ CC-BY-SA-4.0 CC0-1.0 Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64"
 
-RDEPEND="
-	dev-python/boolean-py[${PYTHON_USEDEP}]
-	dev-python/binaryornot[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	dev-python/python-debian[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	sys-devel/gettext
+RDEPEND=">=dev-python/binaryornot-0.4.4[${PYTHON_USEDEP}]
+	>=dev-python/boolean-py-3.8[${PYTHON_USEDEP}]
+	>=dev-python/jinja-3.0.0[${PYTHON_USEDEP}]
+	>=dev-python/license-expression-1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-debian-0.1.48[${PYTHON_USEDEP}]"
+
+BDEPEND="sys-devel/gettext
 	test? (
 		dev-vcs/git
 		dev-vcs/mercurial
-	)
-"
+	)"
+
+PATCHES=( "${FILESDIR}/reuse-2.1.0_docs.patch" )
 
-DOCS=( AUTHORS.rst CHANGELOG.md README.md )
+DOCS=( AUTHORS.rst CHANGELOG.md CODE_OF_CONDUCT.md CONTRIBUTING.md README.md )
 
 distutils_enable_tests pytest
 
-# [Errno 2] No such file or directory: '../README.md'
-#distutils_enable_sphinx docs \
-	#dev-python/furo \
-	#dev-python/recommonmark \
-	#dev-python/sphinx-autodoc-typehints \
-	#dev-python/sphinxcontrib-apidoc
+# dev-python/sphinx-autodoc-typehints will be dropped after 2.1.0
+distutils_enable_sphinx docs \
+	">=dev-python/furo-2023.3.27" \
+	">=dev-python/recommonmark-0.7.1" \
+	">=dev-python/sphinxcontrib-apidoc-0.3.0" \
+	">=dev-python/sphinx-autodoc-typehints-1.12.0"
 
 python_test() {
 	cd "${T}" || die