gentoo auto-resync : 07:11:2022 - 03:21:00

5 files changed, 63 insertions, 46 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index a30f6b022676..ddc3e91f1562 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gitchangelog/Manifest b/dev-util/gitchangelog/Manifest
index d02cd886abe2..bbf5d87b48b3 100644
--- a/dev-util/gitchangelog/Manifest
+++ b/dev-util/gitchangelog/Manifest
@@ -1,3 +1,3 @@
-DIST gitchangelog-3.0.9.tar.gz 52483 BLAKE2B 8e7fc61dee6cba6e630cb2006d5bec988ea3d7a7c1e09789b430e11d4c3d8f5e7ff7ee1231dbbcb56185c84fa9c2bbf6a353980f5a70c8a0cce51b2dce83fb5d SHA512 4e290d75455ddddb7d12d831dce973771f861d23d6b6548b8a9e24e838b0931255dfc8c9ef25765fb4f269d5cdad6bd207fbaa3626a3b24681efdbb56ad9e1b1
-EBUILD gitchangelog-3.0.9.ebuild 969 BLAKE2B 1c7d4e4cb763b38496a2dfebcc35ac94027dec4d35c194e321256f860b9b95ae03b855047f28c58a83ec31cf6c2acafbf9ae3bd19d36e884f2e5cf6600f0c34b SHA512 fdb13230e8d3c4a35edc6876de02b9936bded1c20f935db08911c20ef27270e889d9d65fd241ea6f2104317bb9a605b23333bd7d7ee9d8cdb0c61c99cb7ec8fd
-MISC metadata.xml 494 BLAKE2B 824c3efe12c8bbf8cbe59105480a1b7577bacc5de585bd885ce6880be01581686430ede68caa26dc70a48c61b01b13fe237ddc883abe7003549e52e04faa81bc SHA512 1e8116ae5af5d981512ebaff010ea44694d0563f552adadd853aaae18348f498265cdae078d2ab2753986904255b127bbff2a56dfc4b1373bd1b255a18ed00db
+DIST gitchangelog-3.1.2.tar.gz 93679 BLAKE2B ffd5a9bd25c8bc647c7414e0864a008bafa09b6d5452fa0241408fa324821d4d4faa3e05ac1157521dec5508240383064fb9baca112218d5555e12cc05807400 SHA512 390d90fe62799350044b0009cc05a9889b1d4cd2a1e10dcdc42c71202afcb2c6bb1cc49125b3f69b03c0bd6a5bc8a7c29da0d9feeb54ac6ce2e396c489e69384
+EBUILD gitchangelog-3.1.2.ebuild 1204 BLAKE2B 4697956056a022ca84e7911d08bb4ddcc19f9185c6ef68a2109508fd207b665a4d3921fca5bb9d8feef6d9c6753dfeb174110331a66be434b212b08fbb0c176c SHA512 545733c59cc2d8c21dd2eb0fc5742712ea516076163f0109d393856f46a357ac47d09d15e0cbbe338db48b1a7183c2d6136c007a440b8e96547aedf0eea5423b
+MISC metadata.xml 553 BLAKE2B 6f3337cae47990ab80cf532b546f9bad3b9cc7a2d3fea5976fb56bcfd98cc1548a959552124b52f8f40d70cd24edc51d74b44c7a9cc7846657c3e4cb31fe7c8d SHA512 8bae1fb5f3466a383507634fcb741dd1687e090ef3fef70aeadf73f24d8e1ecd0138a41277959081d17532d6321d1fd3d9b2471a621a0c1c66eeea4fdc055684
diff --git a/dev-util/gitchangelog/gitchangelog-3.0.9.ebuild b/dev-util/gitchangelog/gitchangelog-3.0.9.ebuild
deleted file mode 100644
index d2e9d691c1bb..000000000000
--- a/dev-util/gitchangelog/gitchangelog-3.0.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{7..10} )
-DISTUTULS_USE_SETUPTOOLS="pyproject.toml"
-
-inherit distutils-r1
-
-DESCRIPTION="Creates a changelog from git log history"
-HOMEPAGE="https://github.com/sarnold/gitchangelog"
-
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="https://github.com/sarnold/gitchangelog.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="test"
-
-BDEPEND="${DEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/nose[${PYTHON_USEDEP}]
-		dev-python/minimock[${PYTHON_USEDEP}] )
-"
-
-DEPEND="${PYTHON_DEPS}
-	dev-python/pystache[${PYTHON_USEDEP}]
-	dev-python/mako[${PYTHON_USEDEP}]
-"
-
-RESTRICT="!test? ( test )"
-
-python_test() {
-	"${EPYTHON}" -m nose -sx . || die "Testing failed with ${EPYTHON}"
-}
diff --git a/dev-util/gitchangelog/gitchangelog-3.1.2.ebuild b/dev-util/gitchangelog/gitchangelog-3.1.2.ebuild
new file mode 100644
index 000000000000..85d99c6cb0ce
--- /dev/null
+++ b/dev-util/gitchangelog/gitchangelog-3.1.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Creates a nicely formatted changelog from git log history"
+HOMEPAGE="https://github.com/sarnold/gitchangelog"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/sarnold/gitchangelog.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sarnold/${PN}/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="doc"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	test? ( dev-python/minimock[${PYTHON_USEDEP}] )
+"
+
+RDEPEND="
+	dev-python/pystache[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+"
+
+# needs versioningit if building from git repo source
+if [[ ${PV} = 9999* ]]; then
+	BDEPEND="
+		$(python_gen_any_dep '
+			>=dev-python/versioningit-2.0.0[${PYTHON_USEDEP}]
+		')"
+fi
+
+DOCS=( README.rst )
+
+distutils_enable_sphinx \
+	docs/source \
+	dev-python/sphinx_rtd_theme \
+	dev-python/recommonmark \
+	dev-python/sphinxcontrib-apidoc
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest --doctest-modules .
+}
diff --git a/dev-util/gitchangelog/metadata.xml b/dev-util/gitchangelog/metadata.xml
index 14d417cfceb2..35fc060a9777 100644
--- a/dev-util/gitchangelog/metadata.xml
+++ b/dev-util/gitchangelog/metadata.xml
@@ -6,8 +6,9 @@
 	<name>Steve Arnold</name>
 </maintainer>
 <longdescription lang="en">
-	Create a fancy changelog from git log history (in rst or md) and
-	customize your config with Python callables and regex.
+	Create a fancy changelog from git log history (in rst or md). You can
+	customize your config with Python callables and custom regex, as well
+	as built-in or custom template files.
 </longdescription>
 <upstream>
 	<remote-id type="github">sarnold/gitchangelog</remote-id>