6 files changed, 106 insertions, 5 deletions
diff --git a/dev-util/bnfc/Manifest b/dev-util/bnfc/Manifest
index 957e61c5e4af..6a5c50e3f536 100644
--- a/dev-util/bnfc/Manifest
+++ b/dev-util/bnfc/Manifest
@@ -1 +1,2 @@
 DIST BNFC-2.8.1.tar.gz 225015 BLAKE2B 973f7a5ebc5fb995bf0014621ba7bfebe0d6adbb35bd276b3f7ec56e3fe1ab08c3811d27a2d58a73ca52ac4bf9ba35fba3d172a82684b1ef999a2fdd6dc4ece9 SHA512 d5ea9b4129a4f71c2d66cda2f859a2c39be6d4400cddbd5a5303b5b408f4cf03ce7a92825224f4674c6cc48bec07429c447b9b39fc4e6d144c922bf1b0829561
+DIST BNFC-2.8.3.tar.gz 286964 BLAKE2B 5c8a5d08b1b705e064ef0a7a685dab455e933d0fa84946b4526aebee8698e94ea2cdfa797eb63320e9632b3503da5c41ea2aa59d0bb1f0fa9bda3588a19552d9 SHA512 742937cb0674f5e890376f51aeeccaf2f4c986f6b27e77faaee1ac8baebec553e70c623844c7c63e1caf441592b53113ba4ba187d88a9e869885d40201c54bef
diff --git a/dev-util/bnfc/bnfc-2.8.3.ebuild b/dev-util/bnfc/bnfc-2.8.3.ebuild
new file mode 100644
index 000000000000..c0e31b093445
--- /dev/null
+++ b/dev-util/bnfc/bnfc-2.8.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.2
+
+CABAL_FEATURES="lib profile haddock hoogle hscolour test-suite"
+inherit haskell-cabal
+
+MY_PN="BNFC"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="A compiler front-end generator"
+HOMEPAGE="https://bnfc.digitalgrammars.com/"
+SRC_URI="https://hackage.haskell.org/package/${MY_P}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # Ambiguous module name ‘Data.Time’: it was found in multiple packages: pulseaudio-0.0.2.1 time-1.8.0.2
+
+RDEPEND="dev-haskell/mtl:=[profile?]
+	dev-haskell/semigroups:=[profile?]
+	>=dev-lang/ghc-7.6.1:=
+"
+DEPEND="${RDEPEND}
+	dev-haskell/alex
+	>=dev-haskell/cabal-1.16.0
+	dev-haskell/happy
+	test? ( >=dev-haskell/doctest-0.8
+		dev-haskell/hspec
+		dev-haskell/hunit
+		>=dev-haskell/quickcheck-2.5
+		dev-haskell/temporary )
+"
+
+S="${WORKDIR}/${MY_P}"
diff --git a/dev-util/cvise/Manifest b/dev-util/cvise/Manifest
index d2add3abf8e5..7f952238977a 100644
--- a/dev-util/cvise/Manifest
+++ b/dev-util/cvise/Manifest
@@ -1 +1,2 @@
 DIST cvise-1.1.0.tar.gz 228867 BLAKE2B 08becb5ad00ef08a1f511c0bdb0cb649af1406dd035fe61f737ec6dfb5151215ae363272fc3676ce76e17234a88866ee1dd0664d82326f3ddb2ced2f1982aacf SHA512 66c09cb7e088fc36b0c36928e2eda19e7bef4fad4573fcedc06f2070136e74d7878f8056f406c2ade22fc465a75bf13dca9f4a1a319cd183187a2d66a441e661
+DIST cvise-1.6.0.tar.gz 243050 BLAKE2B 64c305426dbeaf2e3f3a92a902209b35fcc76b5f5a6d2e48fcc8e24d1325badc0839e70afa1381c6d1412c22a7e9dd41ca03d6ca714fa5082958378cc8863000 SHA512 9d4ee043c34748b600b49ac4f00463b853faff2809f8b581e9b07433a8f3bef4436d0e5d5a9dbff1b2d7c3a8ab1d6d4823e78787eb3e911a683808703b2e24b6
diff --git a/dev-util/cvise/cvise-1.6.0.ebuild b/dev-util/cvise/cvise-1.6.0.ebuild
new file mode 100644
index 000000000000..2a977d7dab94
--- /dev/null
+++ b/dev-util/cvise/cvise-1.6.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+: ${CMAKE_MAKEFILE_GENERATOR=ninja}
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
+inherit cmake llvm python-single-r1
+
+DESCRIPTION="Super-parallel Python port of the C-Reduce"
+HOMEPAGE="https://github.com/marxin/cvise/"
+SRC_URI="
+	https://github.com/marxin/cvise/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+LLVM_MAX_SLOT=12
+DEPEND="
+	|| (
+		sys-devel/clang:12
+		sys-devel/clang:11
+		sys-devel/clang:10
+	)
+	<=sys-devel/clang-$(( LLVM_MAX_SLOT + 1 )):="
+RDEPEND="${DEPEND}
+	${PYTHON_DEPS}
+	$(python_gen_cond_dep '
+		dev-python/pebble[${PYTHON_USEDEP}]
+	')
+	dev-util/unifdef
+	sys-devel/flex"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-devel/flex
+	test? (
+		$(python_gen_cond_dep '
+			dev-python/pebble[${PYTHON_USEDEP}]
+			dev-python/pytest[${PYTHON_USEDEP}]
+		')
+	)"
+
+llvm_check_deps() {
+	has_version "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	llvm_pkg_setup
+}
+
+src_test() {
+	cd "${BUILD_DIR}" || die
+	pytest -vv || die
+}
diff --git a/dev-util/meson/meson-0.54.3.ebuild b/dev-util/meson/meson-0.54.3.ebuild
index 2018174d3fa6..9acfdfc92305 100644
--- a/dev-util/meson/meson-0.54.3.ebuild
+++ b/dev-util/meson/meson-0.54.3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit distutils-r1 toolchain-funcs
diff --git a/dev-util/xdelta/xdelta-3.1.0.ebuild b/dev-util/xdelta/xdelta-3.1.0.ebuild
index 3740cfb0b6b1..567fcf57d16f 100644
--- a/dev-util/xdelta/xdelta-3.1.0.ebuild
+++ b/dev-util/xdelta/xdelta-3.1.0.ebuild
@@ -1,10 +1,9 @@
 # Copyright 2002-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+PYTHON_COMPAT=( python3_{5,6,7,8,9} )
 
-WANT_AUTOMAKE=1.14
 inherit autotools python-any-r1
 
 MY_P=xdelta3-${PV}
@@ -33,12 +32,13 @@ src_prepare() {
 	eapply_user
 
 	# huh
+	2to3 -w -n --no-diffs testing/*.py || die
 	sed -i -e '/python/s:2.6:2:' testing/xdelta3-regtest.py || die
 	sed -i -e '/python/s:2.7:2:' testing/xdelta3-test.py || die
 
 	# only build tests when required
 	sed -i -e '/xdelta3regtest/s:noinst_P:check_P:' Makefile.am || die
-	eautomake
+	eautoreconf
 }
 
 src_test() {