9 files changed, 115 insertions, 85 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index d56ea0cc657e..dfb7f99826b2 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/bustle/Manifest b/dev-util/bustle/Manifest
deleted file mode 100644
index 036635d70ec3..000000000000
--- a/dev-util/bustle/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST bustle-0.8.0.tar.gz 101175 BLAKE2B 30359a51da16631eda8f74239de7955d5887e12e7e99853dd930b12b351a0dd56425487c339ddf297dae02b271019c11329130aa0caabc4bf0c87e21600b707b SHA512 92f4757c4ed9dd88bfa144a0626d7530b6a1f859a8069d8631a9990b6a523dbb59d573c6ba142614c371171ccf391a3e77d1e8ba0c2155ecf231f9e7aa735f72
-EBUILD bustle-0.8.0.ebuild 1503 BLAKE2B 5d8e656db77fbe5d4f480b3eb2c4d3bc250ec33f1ea88be44f9adb3bd770aeda50a81002432bc3f4a281228511739eb23801e6962334b154dd99f6d080c8c222 SHA512 294818518c6a600d12b38ac9b500ceb3db9f23bf61f1651a51a70e2a52bdc4c25364cd7e8b3fbec30c0f486f4a6da645bb3f6a05ffb8942234f83c26e3da1b1d
-MISC metadata.xml 880 BLAKE2B 51f295765e7935839a4e6c4e1b42c09e2ad0420e7251b85f13a807c90bc67fcccbf2f0eb0eaed8e25a7ced62cfdec4f48a89db54588485c705d9ff124a58f7bb SHA512 2c414f8b859a776c88a205f5446263aef7d3cbebf7c67c40daf196463f7d594547f32ea9552ed61648f618a5a1ec770cede0a831a00ee545a6377de5f627f513
diff --git a/dev-util/bustle/bustle-0.8.0.ebuild b/dev-util/bustle/bustle-0.8.0.ebuild
deleted file mode 100644
index cf60600336ea..000000000000
--- a/dev-util/bustle/bustle-0.8.0.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# ebuild generated by hackport 0.6.7.9999
-#hackport: flags: -hgettext
-
-CABAL_FEATURES="test-suite"
-inherit haskell-cabal
-
-DESCRIPTION="Draw sequence diagrams of D-Bus traffic"
-HOMEPAGE="https://gitlab.freedesktop.org/bustle/bustle#readme"
-SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1 GPL-2 GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="interactivetests +threaded"
-
-RDEPEND="dev-haskell/cairo:=
-	dev-haskell/gio:=
-	dev-haskell/glib:=
-	dev-haskell/gtk3:=
-	>=dev-haskell/mtl-2.2.1:=
-	dev-haskell/pango:=
-	dev-haskell/text:=
-	>=dev-lang/ghc-8.4.3:=
-	dev-libs/glib:2
-	net-libs/libpcap
-"
-DEPEND="${RDEPEND}
-	>=dev-haskell/cabal-2.2.0.1
-	virtual/pkgconfig
-	test? ( dev-haskell/hunit
-		dev-haskell/quickcheck
-		dev-haskell/test-framework
-		dev-haskell/test-framework-hunit )
-"
-
-src_configure() {
-	haskell-cabal_src_configure \
-		--flag=-hgettext \
-		$(cabal_flag interactivetests interactivetests) \
-		$(cabal_flag threaded threaded)
-}
-
-src_compile() {
-	# compile haskell part
-	haskell-cabal_src_compile || die "could not build haskell parts"
-
-	# compile C part
-	emake \
-		"CC=$(tc-getCC)" \
-		"CFLAGS=${CFLAGS}" \
-		"CPPFLAGS=${CPPFLAGS}" \
-		"LDFLAGS=${LDFLAGS}"
-}
-
-src_install() {
-	# install haskell part
-	haskell-cabal_src_install || die "could not install haskell parts"
-
-	dobin "${S}"/dist/build/bustle-pcap
-	doman bustle-pcap.1
-	dodoc README.md NEWS.md
-}
diff --git a/dev-util/bustle/metadata.xml b/dev-util/bustle/metadata.xml
deleted file mode 100644
index 9de7d989491b..000000000000
--- a/dev-util/bustle/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>haskell@gentoo.org</email>
-		<name>Gentoo Haskell</name>
-	</maintainer>
-	<use>
-		<flag name="interactivetests">Build interactive test programs</flag>
-		<flag name="threaded">Build with the multi-threaded runtime</flag>
-	</use>
-	<longdescription>
-		Bustle records and draws sequence diagrams of D-Bus activity, showing signal emissions, method calls and their corresponding returns, with timestamps for each individual event and the duration of each method call. This can help you check for unwanted D-Bus traffic, and pinpoint why your D-Bus-based application isn't performing as well as you like.  It also provides statistics like signal frequencies and average method call times.
-	</longdescription>
-</pkgmetadata>
diff --git a/dev-util/codespell/Manifest b/dev-util/codespell/Manifest
index 45ad8ccc4d07..00bf0b7d6d4f 100644
--- a/dev-util/codespell/Manifest
+++ b/dev-util/codespell/Manifest
@@ -1,3 +1,5 @@
 DIST codespell-2.1.0.tar.gz 187490 BLAKE2B 6114aa3a7ad8cd37ab868a3f27f641501dd0cc5bfe80bef0aa5cad0a86f8e2bba6e1f1030d5ac6fb06f78f9e01e37359d0fc17d17eb54608060300f676d3d56c SHA512 16d9a4239ae18fad6a06825a2afae6adc903d50eb90b759cdc61b1e1d145458bbfb1385837c4465b0a9858da100be074c597343c4816ca0260bbf6710d9c84e8
+DIST codespell-2.2.1.tar.gz 211593 BLAKE2B aba431119fd1f16ee51076cd4496ef3f3e80e56a124bbbd4ebbec5dcee5b7e49788db37bcdefd15946d12680596b33ab20ae845fd9a3a3a61ee8c3eed187fe2f SHA512 6c1ce9ed134ba4602cc91c1851a023911ff09ce7d4b1e8a33e655bf821a5b82ae8f0e75defef43e9a8537a6ffc7f0ad7e59af7b200a1294dfe3aff1651869e41
 EBUILD codespell-2.1.0.ebuild 905 BLAKE2B f841dc9d6189ac0325b8b4064aabaefe3fc71c936a4cd90340cd257cef494f3b3f99533b65c8bfef870a81b015f7a0b6c5e2ff8f2b77e79077dca0a4af6156ab SHA512 e031f094df22ead785a808d211b71fdf003aa0517ec885662c79070a27d5b1dacd0160333e2e260a135c49c0c176764bd8ee9cdb525242480291452a31432e1c
+EBUILD codespell-2.2.1.ebuild 945 BLAKE2B a022535462fbf62ca815c85ddd8d34d85169cde7ab682f3b30919cb38b85a5a2641323bb3609ddcddd1af4e5dd887a7fe63aa3fb4816293ff71edda286d9c46b SHA512 db4d94f424ea0ffd22b28d30782f84e2190f9a1fa27c7007d1cec4d625319e3402b02f969a12f41cb713e2f2ba08af29266196e68efce0d8cc3a9f91405871cc
 MISC metadata.xml 774 BLAKE2B fe1de89542c86da21ef70e12bee327af41f09f4af419da14074f01c3d0d995ee51deb13748330d13b61a4e3e1ac392e581656973ece8df5290b21d3c4f1fec81 SHA512 e95c51eeb9da39aa2cc7ad6e5f584050407bd232fd77a9f25b339a2c25262f51194278b47d4e05e55a0c3fcc6daaa41bc0babb242aba83e0b87912400179afa6
diff --git a/dev-util/codespell/codespell-2.2.1.ebuild b/dev-util/codespell/codespell-2.2.1.ebuild
new file mode 100644
index 000000000000..b323c3f6c7cb
--- /dev/null
+++ b/dev-util/codespell/codespell-2.2.1.ebuild
@@ -0,0 +1,44 @@
+# 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} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Check text files for common misspellings"
+HOMEPAGE="https://github.com/codespell-project/codespell"
+SRC_URI="https://github.com/codespell-project/codespell/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+# Code licensed under GPL-2
+# Dictionary licensed under CC-BY-SA-3.0
+LICENSE="GPL-2 CC-BY-SA-3.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	sys-apps/help2man
+	test? ( dev-python/chardet[${PYTHON_USEDEP}] )
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	# do not depend on pytest-cov
+	sed -e '/addopts/d' -i setup.cfg || die
+}
+
+python_compile_all() {
+	# generate included man page
+	emake ${PN}.1
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	doman ${PN}.1
+}
diff --git a/dev-util/repolite/Manifest b/dev-util/repolite/Manifest
new file mode 100644
index 000000000000..451c7ef470a8
--- /dev/null
+++ b/dev-util/repolite/Manifest
@@ -0,0 +1,3 @@
+DIST repolite-0.2.0.tar.gz 27531 BLAKE2B 6505a2b61d03e63a23c6e3ccaf8b3a596b8c9a9c67eeb4633e25715ce04cf238fea3fd6fbad2bd648598038f1d983504e2f6fa2476ea6642ace9ae31b9fa6f2d SHA512 f076d55eae2fc52e219ed39ab746f5e0e941ea83e1612321b6b6950a9253640338cb1131b679428c7e4f35627bc657246c55f31b8754e22094e391d736b67267
+EBUILD repolite-0.2.0-r1.ebuild 1113 BLAKE2B b70e38bd22b91e103f846a0cb6f4d3cba2355e088a2fdab3fc6c2ac81579c7c750b81dc5db111bed6aa416087cf95add7730dd6b5978cba26614eb6662edd556 SHA512 5e06d56e518a020e2962bfb650c71fb307258cead9ff87e2f79e2ea927502ce62e0304c763e540015037b5ac10318e96034047c521d677abe4af19e3aa0a5d1a
+MISC metadata.xml 467 BLAKE2B a6fbc3238aa19bc3ae3fcfc48df5c93675fa4a2f30fade8b5e212277a71c0cc9e78a91f893ad9afe2d73a3b7173b045216c459d0c30e037c21bd758afd2890e4 SHA512 4438ba9c9a1a76b0632971aeef760619205de565d7e80cd95d8124ebf06281e20c2618d0c407fd724cc14e595329a8b880c7fd70e958518cddbf2bbc95c99d8a
diff --git a/dev-util/repolite/metadata.xml b/dev-util/repolite/metadata.xml
new file mode 100644
index 000000000000..c30b51566eec
--- /dev/null
+++ b/dev-util/repolite/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="person">
+	<email>nerdboy@gentoo.org</email>
+	<name>Steve Arnold</name>
+</maintainer>
+<longdescription lang="en">
+	Lightweight repository manager using yaml config files instead of xml
+	manifest or git submodules.
+</longdescription>
+<upstream>
+	<remote-id type="github">sarnold/repolite</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/dev-util/repolite/repolite-0.2.0-r1.ebuild b/dev-util/repolite/repolite-0.2.0-r1.ebuild
new file mode 100644
index 000000000000..7786cd608778
--- /dev/null
+++ b/dev-util/repolite/repolite-0.2.0-r1.ebuild
@@ -0,0 +1,51 @@
+# 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 optfeature
+
+DESCRIPTION="Manage a small set of git repository dependencies with YAML."
+HOMEPAGE="https://github.com/sarnold/repolite"
+
+if [[ ${PV} = 9999* ]]; then
+	EGIT_REPO_URI="https://github.com/sarnold/repolite.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/sarnold/repolite/releases/download/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+IUSE="doc"
+RESTRICT="test"  # no tests :(
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/munch[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	dev-vcs/git
+"
+BDEPEND="
+	$(python_gen_any_dep '
+		>=dev-python/versioningit-2.0.1[${PYTHON_USEDEP}]
+	')
+"
+
+DOCS=( README.rst )
+
+distutils_enable_sphinx \
+	docs/source \
+	dev-python/sphinx_rtd_theme \
+	dev-python/recommonmark \
+	dev-python/sphinxcontrib-apidoc
+
+pkg_postinst() {
+	optfeature "initialize repos with lfs files" dev-vcs/git-lfs
+}