diff --git a/app-vim/vim-nix/metadata.xml b/app-vim/vim-nix/metadata.xml
new file mode 100644
index 0000000000..a9f7351928
--- /dev/null
+++ b/app-vim/vim-nix/metadata.xml
@@ -0,0 +1,12 @@
+
+
+
+
+ marco@sirabella.org
+ Marco Sirabella
+
+
+ LnL7/vim-nix
+ https://github.com/LnL7/vim-nix/issues
+
+
diff --git a/app-vim/vim-nix/vim-nix-9999.ebuild b/app-vim/vim-nix/vim-nix-9999.ebuild
new file mode 100644
index 0000000000..c8ffe5e8c2
--- /dev/null
+++ b/app-vim/vim-nix/vim-nix-9999.ebuild
@@ -0,0 +1,14 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit git-r3 vim-plugin
+
+DESCRIPTION="vim plugin: Vim configuration files for Nix"
+HOMEPAGE="https://github.com/LnL7/vim-nix"
+EGIT_REPO_URI="https://github.com/LnL7/vim-nix.git"
+LICENSE="MIT"
+KEYWORDS=""
+
+VIM_PLUGIN_MESSAGES="filetype"
diff --git a/dev-python/raven/Manifest b/dev-python/raven/Manifest
new file mode 100644
index 0000000000..ffc242aa49
--- /dev/null
+++ b/dev-python/raven/Manifest
@@ -0,0 +1 @@
+DIST raven-6.10.0.tar.gz 288902 BLAKE2B e72f48511347910d65cae9ba342a0a592bead9e848ec932b5efc361e7993ce77ce7213fce63c7cfb40534ace536c9ed55751928c991272ed123e12222047b096 SHA512 37ca6d5953dc92b57b3bf4e2edb3947d41f33711d9babfc9eafb8712dc5923829f8810e5123e63749710aeecceb66e56bf8b5b60868f61d750704e20add3c747
diff --git a/dev-python/raven/files/no-coverage.patch b/dev-python/raven/files/no-coverage.patch
new file mode 100644
index 0000000000..70a48d1426
--- /dev/null
+++ b/dev-python/raven/files/no-coverage.patch
@@ -0,0 +1,10 @@
+--- a/setup.cfg 2018-12-19 11:00:58.000000000 -0000
++++ b/setup.cfg 2021-05-08 01:39:02.631499047 -0000
+@@ -1,6 +1,6 @@
+ [tool:pytest]
+ python_files = test*.py
+-addopts = --tb=native -p no:doctest -p no:logging --cov=raven
++addopts = --tb=native -p no:doctest -p no:logging
+ norecursedirs = raven build bin dist htmlcov hooks node_modules .* {args}
+ django_settings_module = tests.contrib.django.settings
+ python_paths = tests
diff --git a/dev-python/raven/metadata.xml b/dev-python/raven/metadata.xml
new file mode 100644
index 0000000000..3abb195a1d
--- /dev/null
+++ b/dev-python/raven/metadata.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ comaintainers welcome
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+ raven
+ getsentry/raven-python
+
+
diff --git a/dev-python/raven/raven-6.10.0.ebuild b/dev-python/raven/raven-6.10.0.ebuild
new file mode 100644
index 0000000000..71cf5f3c2d
--- /dev/null
+++ b/dev-python/raven/raven-6.10.0.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="Raven is a client for Sentry"
+HOMEPAGE="https://github.com/getsentry/raven-python"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" #tests broken with pytest >=4
+
+RDEPEND="
+ dev-python/contextlib2[${PYTHON_USEDEP}]
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/aiohttp[${PYTHON_USEDEP}]
+ >=dev-python/blinker-1.1[${PYTHON_USEDEP}]
+ dev-python/bottle[${PYTHON_USEDEP}]
+ >=dev-python/celery-2.5[${PYTHON_USEDEP}]
+ >=dev-python/exam-0.5.2[${PYTHON_USEDEP}]
+ >=dev-python/flask-0.8[${PYTHON_USEDEP}]
+ >=dev-python/flask-login-0.2.0[${PYTHON_USEDEP}]
+ dev-python/logbook[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ dev-python/paste[${PYTHON_USEDEP}]
+ dev-python/pytz[${PYTHON_USEDEP}]
+ dev-python/pytest-pythonpath[${PYTHON_USEDEP}]
+ dev-python/pytest-timeout[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
+ >=dev-python/sanic-0.7.0[${PYTHON_USEDEP}]
+ dev-python/unittest2[${PYTHON_USEDEP}]
+ dev-python/webob[${PYTHON_USEDEP}]
+ dev-python/webpy[${PYTHON_USEDEP}]
+ dev-python/webtest[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ dev-python/zconfig[${PYTHON_USEDEP}]
+ >=www-servers/tornado-4.1[${PYTHON_USEDEP}]
+ )
+"
+
+PATCHES="${FILESDIR}/no-coverage.patch"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+ export DJANGO_SETTINGS_MODULE=tests.contrib.django.settings
+
+ #test not working with >=www-servers/tornado-6
+ rm tests/contrib/tornado/tests.py || die
+ #test not working with >=dev-python/django-3
+ rm tests/contrib/django/tests.py || die
+ default
+}
diff --git a/dev-python/skia-pathops/Manifest b/dev-python/skia-pathops/Manifest
index 4304fac3f0..d26dbc8f30 100644
--- a/dev-python/skia-pathops/Manifest
+++ b/dev-python/skia-pathops/Manifest
@@ -1 +1,2 @@
DIST skia-pathops-0.4.1.zip 41254623 BLAKE2B 8d47da77c6389419cdf229085c58e692a218f400458b3bd6633307316c0d127c05990438a739633ae1622aa394da95414f86eb23338c1ef28f69283608c4ee7a SHA512 62cef669a8518643c4aefe2860f4c2207d602a531fe3f2ff1ae700b092d6f60cd2c47190926c0d00c709995e519f5538722ed1c0f4b6881c5af5aeb2a5b43e3b
+DIST skia-pathops-0.6.0.post2.zip 41471167 BLAKE2B b9da1ff7deade28e0b5ce4fa6590eb92b50976027fc9da805b50c9d1526a60c28661d5378ecdc4dc2de42f7d3d904dd2f768b49df716b345253ffe2475f1afe7 SHA512 3ebcf044d045a57531229841630dea6e656df434a4a9b994a9a1162c93f0c894ffb20cfb493159cefd1afbe40366e2f9742a4aeea1a693d917fa55841c887e86
diff --git a/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild b/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild
new file mode 100644
index 0000000000..1ef3ac4ba6
--- /dev/null
+++ b/dev-python/skia-pathops/skia-pathops-0.6.0_p2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+MYP="${P/_p/.post}"
+DESCRIPTION="Python bindings for the Skia Path Ops"
+HOMEPAGE="
+ https://github.com/fonttools/skia-pathops
+ https://skia.org/dev/present/pathops
+"
+SRC_URI="mirror://pypi/${MYP:0:1}/${PN}/${MYP}.zip"
+S="${WORKDIR}/${MYP}"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+ media-libs/skia
+"
+DEPEND="
+ ${RDEPEND}
+ test? (
+ dev-python/pytest-cython[${PYTHON_USEDEP}]
+ dev-python/pytest-randomly[${PYTHON_USEDEP}]
+ dev-python/pytest-xdist[${PYTHON_USEDEP}]
+ )
+"
+BDEPEND="
+ app-arch/unzip
+ dev-python/cython[${PYTHON_USEDEP}]
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+pkg_setup() {
+ export BUILD_SKIA_FROM_SOURCE=0
+}
+
+python_test() {
+ # assert ==
+ epytest --deselect tests/pathops_test.py::PathTest::test_transform
+}
diff --git a/dev-python/vttlib/Manifest b/dev-python/vttlib/Manifest
new file mode 100644
index 0000000000..9d405ee9e5
--- /dev/null
+++ b/dev-python/vttlib/Manifest
@@ -0,0 +1 @@
+DIST vttLib-0.11.0.zip 148335 BLAKE2B 550fb5855972ac626ad9ad98088f1b4f20794a11cb2b29f112ce669d9768c2ca910edb939392a35e3e5163eb1e236bf6a76565377828727bc6017f008ad8309a SHA512 b26f6ad967e1e16d55644e984a5f02b65ed1fd0797dc4c46fac9df786720e9b3b51eb7ab59c97a6a449b3915acecfb5f17a7a3deeb615eee21f1164c37297019
diff --git a/dev-python/vttlib/metadata.xml b/dev-python/vttlib/metadata.xml
new file mode 100644
index 0000000000..d0d033d54a
--- /dev/null
+++ b/dev-python/vttlib/metadata.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+ comaintainers welcome
+ lssndrbarbieri@gmail.com
+ Alessandro Barbieri
+
+
+vttLib
+
+A library to
+
+ Extract VTT hinting data from a OpenType font prepared with Microsoft Visual TrueType (VTT) and store it in a FontTools TTX dump
+ Merge it back from a TTX dump into an OpenType font and
+ Compile the data inside to font to ship it (turn TSI* tables into fpgm, etc.).
+
+The primary use case is version control of hinting data of fonts.
+
+
+ daltonmaag/vttLib
+ vttlib
+
+
diff --git a/dev-python/vttlib/vttlib-0.11.0.ebuild b/dev-python/vttlib/vttlib-0.11.0.ebuild
new file mode 100644
index 0000000000..194ee3efb6
--- /dev/null
+++ b/dev-python/vttlib/vttlib-0.11.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+MYPN="vttLib"
+MYPV="${PV/_p/.post}"
+MYP="${MYPN}-${MYPV}"
+PYTHON_COMPAT=( python3_{7,8} )
+
+inherit distutils-r1
+
+DESCRIPTION="Dump, merge and compile Visual TrueType data in UFO3 with FontTools"
+HOMEPAGE="
+ https://github.com/daltonmaag/vttLib
+ https://pypi.org/project/vttlib
+"
+SRC_URI="mirror://pypi/${MYP:0:1}/${MYPN}/${MYP}.zip"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+#install_requires
+RDEPEND="
+ >=dev-python/fonttools-4.10.2[${PYTHON_USEDEP}]
+ >=dev-python/pyparsing-2.4.7[${PYTHON_USEDEP}]
+ >=dev-python/ufoLib2-0.7.1[${PYTHON_USEDEP}]
+"
+#setup_requires
+DEPEND="
+ ${RDEPEND}
+ dev-python/setuptools_scm[${PYTHON_USEDEP}]
+ dev-python/wheel[${PYTHON_USEDEP}]
+ test? (
+ >=dev-python/ufo2ft-2.14.0[${PYTHON_USEDEP}]
+ )
+"
+BDEPEND="app-arch/unzip"
+S="${WORKDIR}/${MYP}"
+
+distutils_enable_tests pytest
diff --git a/games-util/dwarf-therapist/Manifest b/games-util/dwarf-therapist/Manifest
new file mode 100644
index 0000000000..4e6c63d3d4
--- /dev/null
+++ b/games-util/dwarf-therapist/Manifest
@@ -0,0 +1 @@
+DIST Dwarf-Therapist-41.2.2.tar.gz 1126446 BLAKE2B 44b84661892a50b225c5b69b6196e8397359d073bc9c268713fe93a35852370cfcfcc76df1c52aad814ceb46a74b6a9a7b3bd37bfc5cfec1eb2273b148b3cdb1 SHA512 0235c809be389743fb8205bf43770215efe72c4a178c854b14d1d9ea3a12213abaf58e2832d4c2bcf071d68216a4beff513c7e22712de996c0b6e9024c3010c2
diff --git a/games-util/dwarf-therapist/dwarf-therapist-41.2.2.ebuild b/games-util/dwarf-therapist/dwarf-therapist-41.2.2.ebuild
new file mode 100644
index 0000000000..9c7aef32e1
--- /dev/null
+++ b/games-util/dwarf-therapist/dwarf-therapist-41.2.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake desktop xdg-utils
+
+MY_PN="Dwarf-Therapist"
+MY_PV="v${PV}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="For managing dwarves in Dwarf Fortress"
+HOMEPAGE="https://github.com/Dwarf-Therapist/Dwarf-Therapist"
+SRC_URI="https://github.com/Dwarf-Therapist/${MY_PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}/${MY_P}"
+
+# DEPEND=""
+RDEPEND="
+ dev-qt/qtconcurrent:5
+ dev-qt/qtdeclarative:5
+ dev-qt/qtwidgets:5
+"
+# BDEPEND=""
+
+src_install() {
+ # Install some sort of documentation
+ dodoc README.rst
+
+ # Add the desktop file
+ domenu dist/xdg/applications/dwarftherapist.desktop
+
+ # install icons
+ insinto /usr/share/
+ doins -r dist/xdg/icons
+
+ # install memory layout files for dwarf-fortress versions
+ insinto /usr/share/dwarftherapist/memory_layouts
+ doins -r share/memory_layouts/linux
+
+ # and of course, the binary
+ newbin "${BUILD_DIR}/dwarftherapist" dwarf-therapist
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+ xdg_desktop_database_update
+}
diff --git a/games-util/dwarf-therapist/metadata.xml b/games-util/dwarf-therapist/metadata.xml
new file mode 100644
index 0000000000..1326327161
--- /dev/null
+++ b/games-util/dwarf-therapist/metadata.xml
@@ -0,0 +1,8 @@
+
+
+
+
+ ezzieyguywuf@gmail.com
+ Wolfgang E. Sanyer
+
+
diff --git a/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild b/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild
index 441dd73403..ee701bf376 100644
--- a/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild
+++ b/media-gfx/bonzomatic/bonzomatic-2021.03.07.ebuild
@@ -20,27 +20,49 @@ fi
LICENSE="Unlicense"
SLOT="0"
-IUSE="system-glfw system-glew system-stb system-kissfft"
+IUSE="system-glfw system-glew system-stb system-kissfft wayland"
# TODO: system-miniaudio, system-jsonxx/json++, system-scintilla
+# !system-glfw copied from media-libs/glfw-3.3.3::gentoo
+# !system-glew copied from media-libs/glew-2.2.0::gentoo
DEPEND="
system-glfw? ( media-libs/glfw )
+ !system-glfw? (
+ wayland? (
+ dev-libs/wayland
+ media-libs/mesa[egl,wayland]
+ dev-libs/wayland-protocols
+ )
+ !wayland? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXxf86vm
+ x11-libs/libXi
+ )
+ )
system-glew? ( media-libs/glew:= )
+ !system-glew? (
+ >=x11-libs/libX11-1.6.2
+ >=x11-libs/libXext-1.3.2
+ >=x11-libs/libXi-1.7.2
+ >=x11-libs/libXmu-1.1.1-r1
+ )
system-stb? ( dev-libs/stb )
system-kissfft? ( sci-libs/kissfft )
virtual/opengl
virtual/glu
media-libs/alsa-lib
media-libs/fontconfig
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXcursor
"
RDEPEND="${DEPEND}"
+BDEPEND="!system-glfw? ( wayland? ( dev-libs/wayland-protocols ) )"
src_configure() {
local mycmakeargs=(
-DBONZOMATIC_USE_SYSTEM_GLFW=$(usex system-glfw)
+ -DGLFW_USE_WAYLAND="$(usex wayland)"
-DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew)
-DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb)
-DBONZOMATIC_USE_SYSTEM_KISSFFT=$(usex system-kissfft)
diff --git a/media-gfx/bonzomatic/bonzomatic-9999.ebuild b/media-gfx/bonzomatic/bonzomatic-9999.ebuild
index 441dd73403..ee701bf376 100644
--- a/media-gfx/bonzomatic/bonzomatic-9999.ebuild
+++ b/media-gfx/bonzomatic/bonzomatic-9999.ebuild
@@ -20,27 +20,49 @@ fi
LICENSE="Unlicense"
SLOT="0"
-IUSE="system-glfw system-glew system-stb system-kissfft"
+IUSE="system-glfw system-glew system-stb system-kissfft wayland"
# TODO: system-miniaudio, system-jsonxx/json++, system-scintilla
+# !system-glfw copied from media-libs/glfw-3.3.3::gentoo
+# !system-glew copied from media-libs/glew-2.2.0::gentoo
DEPEND="
system-glfw? ( media-libs/glfw )
+ !system-glfw? (
+ wayland? (
+ dev-libs/wayland
+ media-libs/mesa[egl,wayland]
+ dev-libs/wayland-protocols
+ )
+ !wayland? (
+ x11-libs/libX11
+ x11-libs/libXcursor
+ x11-libs/libXinerama
+ x11-libs/libXrandr
+ x11-libs/libXxf86vm
+ x11-libs/libXi
+ )
+ )
system-glew? ( media-libs/glew:= )
+ !system-glew? (
+ >=x11-libs/libX11-1.6.2
+ >=x11-libs/libXext-1.3.2
+ >=x11-libs/libXi-1.7.2
+ >=x11-libs/libXmu-1.1.1-r1
+ )
system-stb? ( dev-libs/stb )
system-kissfft? ( sci-libs/kissfft )
virtual/opengl
virtual/glu
media-libs/alsa-lib
media-libs/fontconfig
- x11-libs/libXi
- x11-libs/libXinerama
- x11-libs/libXcursor
"
RDEPEND="${DEPEND}"
+BDEPEND="!system-glfw? ( wayland? ( dev-libs/wayland-protocols ) )"
src_configure() {
local mycmakeargs=(
-DBONZOMATIC_USE_SYSTEM_GLFW=$(usex system-glfw)
+ -DGLFW_USE_WAYLAND="$(usex wayland)"
-DBONZOMATIC_USE_SYSTEM_GLEW=$(usex system-glew)
-DBONZOMATIC_USE_SYSTEM_STB=$(usex system-stb)
-DBONZOMATIC_USE_SYSTEM_KISSFFT=$(usex system-kissfft)
diff --git a/media-gfx/bonzomatic/metadata.xml b/media-gfx/bonzomatic/metadata.xml
index 555bdeb3fb..812aa7482e 100644
--- a/media-gfx/bonzomatic/metadata.xml
+++ b/media-gfx/bonzomatic/metadata.xml
@@ -3,6 +3,7 @@