14 files changed, 55 insertions, 387 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 55efebcfce73..5493ae120045 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 95e4563eb133..b93449c698fc 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,3 @@
-AUX graphviz-2.34.0-Xaw-configure.patch 2445 BLAKE2B fc1b3820fd72821ac431f5d93d0b4b0c8f596ca9d2c2f516961f5baab9fd54ba870df75434d2ed59fd9034bb7e2ce38c00faef9c12a79c7ec4da2d5e416d7117 SHA512 473d2ed9070329512cbc26929267b25fb8d7726e21ed01d2921d4d8ac13b8ffaf166f07229fa7409192cfa14fabb0cf68b299bb3331b3cc953ae5363274fd15c
-AUX graphviz-2.47.1-bashisms.patch 407 BLAKE2B 957817776e4ea7a0ae84a64d65c452e1bf632a1a10e18a62a47c238fef3a63aca9fe60c5a8749d63004b5a6a442b55870de201a546dfc8b40e43dd4f47e9aeae SHA512 035312d4910bd063bcffdfa3b921c6398614625381747611603fbeed4e1332e687ba7b12b86e18ffe6ae826ebb99a9916c3ee058a86a240126a230b6cd14242e
-DIST graphviz-2.47.1.tar.xz 23226336 BLAKE2B 7e9f8683ba3694ff34c589dee7f595694e3fb44fa14b3904d648e2f6effebcd725b3cbf09bdfbc25825a92a8fdb4a6cf988f7000997d0a6be065138585fc897a SHA512 4a49a14ca738058ced6ce6352b65137c34cd130525ab2b84a436d282b8b65ecfe7330a214e472e74cfa8e432b4574a746460daff0a4d292962c851fec341aefb
 DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 74bc90e433c29662b292c0f086777648db4cded69b7640586647f46e3df46137044fa287d170a780e58f552289fec2d65e10def9ed68095bd4ec8efe9208f929 SHA512 5396b6cb4615ba509233a5a079956aef014245cac64635f01467dcb26e9d6e4b1d044110bc3a85132c747ba410597fa289bef3e503e84fa000c845e1e75c89b0
-EBUILD graphviz-2.47.1-r1.ebuild 7746 BLAKE2B b5dc9125734820998a498d3fd48a811e90b88fe4d36b9bd694ac3f2c7134a11ebaea8694a4b0d131f8f6991d009b489dd9cb1bac2f27d0d8afe728a6d1322608 SHA512 11f479ccf853fd1d2e93a8efdb9baf56b00daeb8a8964479faf5b1fc7d77e941187b40519c0b52d1470972878e5ba14954b056e998ca15a5dddb54b098d0af52
 EBUILD graphviz-2.49.0.ebuild 7681 BLAKE2B b622bfd68d9acb26102fae34d7c70ade52789bddcfc7a59b04abc7187f5686e41046d132a80f8e302914a9807ca39d2b6bdf1fb4ea73a2bec9cccd3464d2c8f9 SHA512 dc74f353b58cd95ac0802269ee7833c85f12f5732dd4436d854809991339be4934dd49fa3c6618afc71649c26ce3e1def614ce435aa5fd7fb2a842d0db520910
 MISC metadata.xml 2381 BLAKE2B 97971708021091d2d53c49f2f83751cea0aa7e2e0d4c5c9f09fc6e4c187bd23d1bf29b79b953e40601492365b2e592b2481946c53d15190c64a80aeeeffc3992 SHA512 6baa00b4838adda1093799bd773f242258bf0900c9b211336888c94a0c6d4f58d5749552cf0acea79329e0ebcf2f0cf63ae933fa13ed6497d94ea63f961b812f
diff --git a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch b/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
deleted file mode 100644
index 2283cc5dab40..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.34.0-Xaw-configure.patch
+++ /dev/null
@@ -1,81 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -560,8 +560,8 @@
-   use_xlib="Yes"
- #no x11.pc on centos4
- #  PKG_CHECK_MODULES(X11, [x11])
--  PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
- fi
-+PKG_CHECK_MODULES(XRENDER, [xrender],HAVE_XRENDER="yes" ,HAVE_XRENDER="no")
- AM_CONDITIONAL(WITH_X, [test "x$use_xlib" = "xYes"])
- AM_CONDITIONAL(WITH_XRENDER, [test "x$,HAVE_XRENDER" = "xyes"])
- 
-@@ -1924,6 +1924,10 @@
- # so we set HAVE_LIBXPMFORLEFTY instead of the usual HAVE_LIBXPM
- #
- 
-+AC_ARG_WITH(lefty,
-+  [AS_HELP_STRING([--with-lefty=yes],[build lefty])],
-+  [],[with_xaw=yes])
-+
- AC_ARG_WITH(Xpmincludedir,
-   [AS_HELP_STRING([--with-Xpmincludedir=DIR],[use Xpm includes from DIR])],
-   [XPM_INCLUDES="-I$withval"])
-@@ -1931,6 +1935,17 @@
-   [AS_HELP_STRING([--with-Xpmlibdir=DIR],[use Xpm libraries from DIR])],
-   [XPM_LIBS="-L$withval"])
- 
-+AC_ARG_WITH(Xawincludedir,
-+  [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
-+  [XAW_INCLUDES="-I$withval"])
-+AC_ARG_WITH(Xawlibdir,
-+  [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
-+  [XAW_LIBS="-L$withval"])
-+
-+if test "x$with_xaw" != "xyes"; then
-+  use_lefty="No (disabled)"
-+else
-+
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS="$CPPFLAGS $XPM_INCLUDES $X_CFLAGS"
-@@ -1941,18 +1956,10 @@
-    AC_MSG_WARN(Optional Xpm library not available), [-lXmu -lXt -lX11 -lXext $SOCKET_LIBS])
- LDFLAGS=$save_LDFLAGS
- CPPFLAGS=$save_CPPFLAGS
--AC_SUBST([XPM_INCLUDES])
--AC_SUBST([XPM_LIBS])
- 
- dnl -----------------------------------
- dnl INCLUDES and LIBS for XAW
- 
--AC_ARG_WITH(Xawincludedir,
--  [AS_HELP_STRING([--with-Xawincludedir=DIR],[use Xaw includes from DIR])],
--  [XAW_INCLUDES="-I$withval"])
--AC_ARG_WITH(Xawlibdir,
--  [AS_HELP_STRING([--with-Xawlibdir=DIR],[use Xaw libraries from DIR])],
--  [XAW_LIBS="-L$withval"])
- save_CPPFLAGS=$CPPFLAGS
- save_LDFLAGS=$LDFLAGS
- CPPFLAGS="$CPPFLAGS $XAW_INCLUDES $X_CFLAGS"
-@@ -1978,12 +1985,17 @@
- fi
- LDFLAGS=$save_LDFLAGS
- CPPFLAGS=$save_CPPFLAGS
-+
-+fi
-+
-+AC_SUBST([XPM_INCLUDES])
-+AC_SUBST([XPM_LIBS])
- AC_SUBST([XAW_INCLUDES])
- AC_SUBST([XAW_LIBS])
--AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" != "xno"])
--if test "x$with_xaw" = "xno"; then
-+AM_CONDITIONAL(WITH_XAW, [test "x$with_xaw" = "xyes"])
-+if test "x$with_xaw" != "xyes"; then
-     if test "x$no_x" != "xyes"; then
--	AC_MSG_WARN(Lefty cannot be built)
-+	AC_MSG_WARN(Lefty will not be built)
-     fi
- fi
- 
diff --git a/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch b/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch
deleted file mode 100644
index 4e9aab6ae341..000000000000
--- a/media-gfx/graphviz/files/graphviz-2.47.1-bashisms.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur a/configure.ac b/configure.ac
---- a/configure.ac	2019-07-13 03:14:04.000000000 +0000
-+++ b/configure.ac	2020-05-15 19:44:57.715169627 +0000
-@@ -315,7 +315,7 @@
- dnl ===========================================================================
- dnl Set GCC compiler flags
- 
--if [test "${GCC}" == "yes"]
-+if [test "${GCC}" = "yes"]
- then
-   # Enable common warnings flags
-   CFLAGS="${CFLAGS} -Wall"
diff --git a/media-gfx/graphviz/graphviz-2.47.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.47.1-r1.ebuild
deleted file mode 100644
index 130d70d2a5f1..000000000000
--- a/media-gfx/graphviz/graphviz-2.47.1-r1.ebuild
+++ /dev/null
@@ -1,279 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
-
-DESCRIPTION="Open Source Graph Visualization Software"
-HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
-# unfortunately upstream uses an "artifact" store for the pre-generated
-# tarball now, which makes predictable URLs impossible.
-SRC_URI="https://gitlab.com/graphviz/graphviz/-/package_files/9573974/download -> ${P}.tar.xz"
-
-LICENSE="CPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk gts guile java lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
-
-REQUIRED_USE="
-	!cairo? ( !X !gtk !postscript !lasi )
-	pdf? ( cairo )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Requires ksh, tests against installed package, missing files and directory
-RESTRICT="test"
-
-BDEPEND="
-	sys-devel/flex
-	sys-devel/libtool
-	x11-libs/gdk-pixbuf:2
-	virtual/pkgconfig
-	doc? (
-		app-text/ghostscript-gpl
-		sys-apps/groff
-	)
-	guile? (
-		dev-lang/swig
-		dev-scheme/guile
-	)
-	java? (
-		dev-lang/swig
-		>=virtual/jdk-1.8:*
-	)
-	nls? ( >=sys-devel/gettext-0.14.5 )
-	perl? ( dev-lang/swig )
-	python? ( dev-lang/swig )
-	ruby? ( dev-lang/swig )
-	tcl? ( dev-lang/swig )"
-RDEPEND="
-	>=dev-libs/expat-2
-	>=dev-libs/glib-2.11.1:2
-	dev-libs/libltdl:0
-	>=media-libs/fontconfig-2.3.95
-	>=media-libs/freetype-2.1.10
-	>=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib]
-	>=media-libs/libpng-1.2:0=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/libiconv
-	cairo? (
-		>=x11-libs/cairo-1.1.10[svg]
-		>=x11-libs/pango-1.12
-	)
-	devil? ( media-libs/devil[png,jpeg] )
-	gtk? ( x11-libs/gtk+:2 )
-	gts? ( sci-libs/gts )
-	guile? ( dev-scheme/guile )
-	java? ( >=virtual/jre-1.8:* )
-	lasi? ( media-libs/lasi )
-	pdf? ( app-text/poppler )
-	perl? ( dev-lang/perl:= )
-	postscript? ( app-text/ghostscript-gpl )
-	python? ( ${PYTHON_DEPS} )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-	)
-	ruby? ( dev-lang/ruby:* )
-	svg? ( gnome-base/librsvg )
-	tcl? ( >=dev-lang/tcl-8.3:0= )
-	webp? ( media-libs/libwebp:= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXaw
-		x11-libs/libXmu
-		x11-libs/libXpm
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}"
-
-# Dependency description / Maintainer-Info:
-
-# Rendering is done via the following plugins (/plugins):
-# - core, dot_layout, neato_layout, gd , dot
-#   the ones which are always compiled in, depend on zlib, gd
-# - gtk
-#   Directly depends on gtk-2.
-#   needs 'pangocairo' enabled in graphviz configuration
-#   gtk-2 depends on pango, cairo and libX11 directly.
-# - gdk-pixbuf
-#   Disabled, GTK-1 junk.
-# - glitz
-#   Disabled, no particular reason
-#   needs 'pangocairo' enabled in graphviz configuration
-# - ming
-#   flash plugin via -Tswf requires media-libs/ming-0.4. Disabled as it's
-#   incomplete.
-# - cairo/pango:
-#   Needs pango for text layout, uses cairo methods to draw stuff
-# - xlib:
-#   needs cairo+pango,
-#   can make use of gnomeui and inotify support (??? unsure),
-#   needs libXaw for UI
-#   UI also links directly against libX11, libXmu, and libXt
-#   and uses libXpm if available so we make sure it always is
-
-# There can be swig-generated bindings for the following languages (/tclpkg/gv):
-# - c-sharp (disabled)
-# - scheme (enabled via guile) ... no longer broken on ~x86
-# - go (disabled)
-# - io (disabled)
-# - java (enabled via java) *2
-# - lua (enabled via lua)
-# - ocaml (enabled via ocaml)
-# - perl (enabled via perl) *1
-# - php (enabled via php) *2
-# - python (enabled via python) *1
-# - ruby (enabled via ruby) *1
-# - tcl (enabled via tcl)
-# *1 = The ${P}-bindings.patch takes care that those bindings are installed to the right location
-# *2 = Those bindings don't build because the paths for the headers/libs aren't
-#      detected correctly and/or the options passed to swig are wrong (-php instead of -php4/5)
-
-# There are several other tools in /tclpkg:
-# gdtclft, tcldot, tclhandle, tclpathplan, tclstubs ; enabled with: --with-tcl
-# tkspline, tkstubs ; enabled with: --with-tk
-
-# And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
-#   sci-libs/gts can be used for some of these
-# - lefty:
-#   needs Xaw and X to build
-# - gvedit (via 'qt5'):
-#   based on ./configure it needs qt-core and qt-gui only
-# - smyrna : experimental opengl front-end (via 'smyrna')
-#   currently disabled -- it segfaults a lot
-#   needs x11-libs/gtkglext, gnome-base/libglade, media-libs/freeglut
-#   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
-#   with flags enabled at configure time
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.34.0-Xaw-configure.patch
-	"${FILESDIR}"/${PN}-2.47.1-bashisms.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# ToDo: Do the same thing for examples and/or
-	#       write a patch for a configuration-option
-	#       and send it to upstream
-	# note - the longer sed expression removes multi-line assignments that are extended via '\'
-	if ! use doc ; then
-		find . -iname Makefile.am \
-			| xargs sed -i -e '/^\(html\|pdf\)_DATA.*\\[[:space:]]*$/{:m;N;s/\\\n//;tm;d}' \
-				-e '/^\(html\|pdf\)_DATA/d' || die
-	fi
-
-	# Nuke the dead symlinks for the bindings
-	sed -i -e '/$(pkgluadir)/d' tclpkg/gv/Makefile.am || die
-
-	# replace the whitespace with tabs
-	sed -i -e 's:  :\t:g' doc/info/Makefile.am || die
-
-	# use correct version of qmake. bug #567236
-	sed -i -e "/AC_CHECK_PROGS(QMAKE/a AC_SUBST(QMAKE,$(qt5_get_bindir)/qmake)" configure.ac || die
-
-	use java && append-cppflags $(java-pkg_get-jni-cflags)
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-static
-		--enable-ltdl
-		--enable-gdk-pixbuf
-		$(use_with cairo pangocairo)
-		$(use_with devil)
-		$(use_with gtk)
-		$(use_with gts)
-		$(use_with qt5 qt)
-		$(use_with lasi)
-		$(use_with pdf poppler)
-		$(use_with postscript ghostscript)
-		$(use_with svg rsvg)
-		$(use_with webp)
-		$(use_with X x)
-		$(use_with X xaw)
-		$(use_with X lefty)
-		--with-digcola
-		--with-fontconfig
-		--with-freetype2
-		--with-ipsepcola
-		--with-libgd
-		--with-sfdp
-		--without-ming
-		# new/experimental features, to be tested, disable for now
-		--with-cgraph
-		--without-glitz
-		--without-ipsepcola
-		--without-smyrna
-		--without-visio
-		# Bindings:
-		$(use_enable guile)
-		$(use_enable java)
-		$(use_enable perl)
-		$(use_enable python python2)
-		$(use_enable python python3)
-		$(use_enable ruby)
-		$(use_enable tcl)
-		--disable-go
-		--disable-io
-		--disable-lua
-		--disable-ocaml
-		--disable-php
-		--disable-python
-		--disable-r
-		--disable-sharp
-		# libtool file collision, bug #276609
-		--without-included-ltdl
-		--disable-ltdl-install
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	sed -i -e "s:htmldir:htmlinfodir:g" doc/info/Makefile || die
-
-	emake DESTDIR="${D}" \
-		txtdir="${EPREFIX}"/usr/share/doc/${PF} \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		htmlinfodir="${EPREFIX}"/usr/share/doc/${PF}/html/info \
-		pdfdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
-		pkgconfigdir="${EPREFIX}"/usr/$(get_libdir)/pkgconfig \
-		install
-
-	if ! use examples; then
-		rm -rf "${ED}"/usr/share/graphviz/demo || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	einstalldocs
-
-	use python && python_optimize \
-		"${D}"$(python_get_sitedir) \
-		"${ED}"/usr/$(get_libdir)/graphviz/python3
-}
-
-pkg_postinst() {
-	# This actually works if --enable-ltdl is passed
-	# to configure
-	dot -c || die
-}
-
-pkg_postrm() {
-	# Remove cruft, bug #547344
-	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
-}
diff --git a/media-gfx/mkbold-mkitalic/Manifest b/media-gfx/mkbold-mkitalic/Manifest
new file mode 100644
index 000000000000..e5536488a8ef
--- /dev/null
+++ b/media-gfx/mkbold-mkitalic/Manifest
@@ -0,0 +1,3 @@
+DIST mkbold-mkitalic-0.11.tar.bz2 21922 BLAKE2B 90473ee9ce751f491a36b18b4adcfc15a64535ca11b7394a2d46b48a144394ae549133635f898b8b16d87eb3271439fc425cee3cb05e4559818ab00a7d054e3d SHA512 fe40693bc5d73aaf45daf1bbd22f8107fb61604cd4ff0ec09e8bd63029be811a2b1bb46a3ce214954841c5d074e9ec23c150006d9a2c8ffe633e93801c2d7345
+EBUILD mkbold-mkitalic-0.11.ebuild 716 BLAKE2B ce14e7b422a21facf653d7dbcb85b779af1696037f0fc3911c14b848f2b8865d4a60077480e7c9b9bbc6b39330ea7ec0f59e4178f995f81ba450b48fdf4c6b0e SHA512 eaa04d5daeb01f9c7288407df82ab7b92fb458075337a5f8c1ae79388fcd2d458338f0fc48f852587dee56ec93ce8f1250d782862a2ab2c70349b073222df369
+MISC metadata.xml 249 BLAKE2B a37da98d387308dab889eab2665b67e4176707f3c115a7a69cb7f4b19f9864b96bc2fe70efa105e627c4b57a7d626f6b23dc2709a225a9debada3356f3cf32a0 SHA512 a5095fb01e05f24583a962e36131b2f02cf2d1dd7a97051200e465ad97db014721de7c1857f5eb736cb0290682e8de833cb4c735f7de8d98cdfae1aed6d3d549
diff --git a/media-gfx/mkbold-mkitalic/metadata.xml b/media-gfx/mkbold-mkitalic/metadata.xml
new file mode 100644
index 000000000000..987ce1bc2ed6
--- /dev/null
+++ b/media-gfx/mkbold-mkitalic/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>hattya@gentoo.org</email>
+		<name>Akinori Hattori</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
new file mode 100644
index 000000000000..6ecea3ce61ab
--- /dev/null
+++ b/media-gfx/mkbold-mkitalic/mkbold-mkitalic-0.11.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+inherit toolchain-funcs
+
+DESCRIPTION="Make BDF fonts bold and/or italic"
+HOMEPAGE="https://hp.vector.co.jp/authors/VA013651/freeSoftware/mkbold-mkitalic.html"
+SRC_URI="https://hp.vector.co.jp/authors/VA013651/lib/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND=""
+RDEPEND=""
+
+DOCS="ALGORITHM* README*"
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "/^MAKE/,/^CC/d" \
+		-e "/^CFLAGS/s|= .* \\$|= ${CFLAGS} $|" \
+		-e "/^LDFLAGS/s|= .*|= ${LDFLAGS}|" \
+		-e "/^prefix/s|= .*|= ${EPREFIX}|" \
+		Makefile
+	tc-export CC
+}
+
+src_install() {
+	dobin mk{bold,italic,bolditalic}
+	einstalldocs
+}
diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest
index 5020554b659d..f3a81eecdb57 100644
--- a/media-gfx/openvdb/Manifest
+++ b/media-gfx/openvdb/Manifest
@@ -4,7 +4,7 @@ AUX openvdb-8.0.1-glfw-libdir.patch 495 BLAKE2B 6a47bd300b3cd2186be8b749abd1e1fc
 DIST openvdb-7.0.0.tar.gz 1872744 BLAKE2B e3a8c8d51f77e115d3d397abde0860a6322d56eb6c4795c1ba39539a23aab6cf37602ce7122965fbc3098b15b118b25010263f567e8003363b78c9b7d9d5dfd8 SHA512 f5321b22b10e192012d544cc02921d3d52f621778ec5aa21ba6d450f3e29f2fdbd76486ad390a0c008394dbc6ee4aeecc04527ef30e73adf71c1a08a021746b7
 DIST openvdb-7.1.0.tar.gz 1956052 BLAKE2B 7778d67bcc65ecb17b86f6e67a9e5f2d6574de5869a0a9c675ad7bc8540154c0f249a91c68a9da9068a3951b3e919e5676450fcaf13921c6263e7c87012a2f29 SHA512 49806375f7e6d7b12eaba24e672a068531d2f8a05f12eba29069710d2682f9983f9e6ad26047eed4b28e337f8d0e738b90130582863c710e8dd1e720bf0addad
 DIST openvdb-8.0.1.tar.gz 2299276 BLAKE2B e65bd4710ff65e20570013399d1e71a32e8f80c5e3b5527fc17d23c7f86ead7e04483cf7ba5266f26343604677d3a0dcafc01474baf7ef09b98f1f41a66119a2 SHA512 6a5a8b637429295efa72494aef82ff92dd83092591b713f56930ccf4aab3a33806d1263bfd090c27239eab97b4fdc053288dc545e631f8a7d4ca180a32331be2
-EBUILD openvdb-7.0.0-r1.ebuild 2850 BLAKE2B 042072b65ba212949817da393ca0816be24f6ed00e5dc8f685241e0edbc3ca4d7225ff551624d9340ebce2c8a0c51edcb58c9043542458ac40f9cba4320828ca SHA512 e2ca1e6f279b45a63643e098c7bd3d92117ee1373ce02ae25ca090abcc1577005dc4303a7ea94b5ab7cba1fe72c4aeb4f9f63b8f8c4b3396cf5eda1be585dc92
-EBUILD openvdb-7.1.0-r1.ebuild 2780 BLAKE2B 4183344ab52862ba20546b358e267c1525b01b3ab77a3043cd102d33252760cf61e3a66d913ffc6857dc86b1445b1deb2bd1dc9226545a969689906cd687305a SHA512 7ace5d72a976f3925e7c62a90c51af81c746f7280ffaa424abcf4a1b6e4f5dda0a88ae9f06a60a331f1528780074db1a0ba94dc53b71498c827e4819d43a460d
-EBUILD openvdb-8.0.1.ebuild 2807 BLAKE2B 50388b1d5c3d401cf4a3849431240478c531cd0f5120a45140fb79edcfe454ed9dce276b41d6c7a5ff8814a18d0bb573b7a1079e1587b23dbbd5a5201e9f0c14 SHA512 fa2079ed52041b9591e719563f1c3477b7bf3afe64de00d70c756f30580871086c5da7e692e54dc4e1eea2ea72cdd4eb8d743a49e9760cf8699920294e12a891
+EBUILD openvdb-7.0.0-r2.ebuild 2851 BLAKE2B 3821ba9650485ada8f4e9069d52e254ed982799477ccbb5305711e0864df12aac4ed548933eb8c8c9fa98f6618eec7dddf734e13f51dd85a8a5a3e7f4666c440 SHA512 232aa8f18ce8ce2628bcb97d7e14c02519ab589a4b2c77a8d34a616effc4b744a19d5d8354b95eb315daffa9907aa345776c859a573221e0939a9c8ecc9d8c40
+EBUILD openvdb-7.1.0-r2.ebuild 2781 BLAKE2B 3d90096c2920b597d36b9ef727b31b9ad4bd6d43433d8efe933d9f3bfca73c575f5c00681205c4309ca88779cefbf1a557b4d684b98ba2bfff74881539dbde87 SHA512 4068cbc8980912106783e79f02e9afcd485aeff8158cc2cd7249f5ccc31585bc55d1568afcd6387dd9b16137143264cde06281de43492a700dcf110790acb78f
+EBUILD openvdb-8.0.1-r1.ebuild 2808 BLAKE2B c1aa4506207f5f6cdc5841a31d70a32fce16658a93107f1655c3c36f9c5838922399b584ce42ed652a8581fee5d094e5a0cc7eb461bebf8f6e399a13ce0c3eaf SHA512 9ced1195ee85546684e4c350c872689e038739f59f7dbdd10056f2c59789c0fc960a80283c5a0b6baaa18b233c82552d65115cda95f15e7ccd55067f27511bcb
 MISC metadata.xml 1549 BLAKE2B e8d5f0ca6156371ff45898efcb217d008db1cb9dd041d818da55f2668af2cd53560d9b5c2ccaf1aed4da88f567294fe52940999d658db67a7372161cadb781a6 SHA512 2ba75c98a8cbf0212d4d24f85f8c3c5f8ee3a98be7dc2749acba4c37de14b489d88276608424290406f3a0bf31fc1298b7844320f6ac607b9f033e0f6ad14d46
diff --git a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.0.0-r2.ebuild
index 10868f647c6b..60ba6a7e3eb9 100644
--- a/media-gfx/openvdb/openvdb-7.0.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.0.0-r2.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	media-libs/glfw
 	media-libs/glu
 	media-libs/ilmbase:=
-	media-libs/openexr:=
+	media-libs/openexr:0=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
 	x11-libs/libXi
diff --git a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild b/media-gfx/openvdb/openvdb-7.1.0-r2.ebuild
index ed2847345e4e..c682f71bb733 100644
--- a/media-gfx/openvdb/openvdb-7.1.0-r1.ebuild
+++ b/media-gfx/openvdb/openvdb-7.1.0-r2.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	media-libs/glfw
 	media-libs/glu
 	media-libs/ilmbase:=
-	media-libs/openexr:=
+	media-libs/openexr:0=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
 	x11-libs/libXi
diff --git a/media-gfx/openvdb/openvdb-8.0.1.ebuild b/media-gfx/openvdb/openvdb-8.0.1-r1.ebuild
index f6827c2006ec..e72b7d16bb89 100644
--- a/media-gfx/openvdb/openvdb-8.0.1.ebuild
+++ b/media-gfx/openvdb/openvdb-8.0.1-r1.ebuild
@@ -32,7 +32,7 @@ RDEPEND="
 	media-libs/glfw
 	media-libs/glu
 	media-libs/ilmbase:=
-	media-libs/openexr:=
+	media-libs/openexr:0=
 	sys-libs/zlib:=
 	x11-libs/libXcursor
 	x11-libs/libXi
diff --git a/media-gfx/svg2rlg/Manifest b/media-gfx/svg2rlg/Manifest
index 1b3fc4bac253..0fb205eb4882 100644
--- a/media-gfx/svg2rlg/Manifest
+++ b/media-gfx/svg2rlg/Manifest
@@ -1,3 +1,3 @@
 DIST svg2rlg-0.4.0.tar.gz 504861 BLAKE2B bfd147d824d5a49f8621e705f6bdeefdaa571918db94afea8e839d048d2089a8c8ebf8e2763caa9866f55a7142e1bb3522b01f53eaf5b8343164a08ee0983ef3 SHA512 e3813a22784c2199a1df69574c64093347a153fa2b7a40e2f38f52e5d46d7ca8d6e8e3bbe54ab59381f6c7246352c016ff3e19b1278c6f2c8dcfbe8bd7017b12
 EBUILD svg2rlg-0.4.0.ebuild 754 BLAKE2B 6c9fba4ab5dafbe4b21eab2003234771bab7422de6e95d72f8d20b0dd51d35cfda041140b51719b46b839c9227a8c1c7e08bffa7f6e8eecce958d236919f6319 SHA512 b92746089cac33f6c40924767b450ff87f4041c91b65b6a21bd4058ca5aa1f9d95dde12468f624bcafa2f9e064a11e56e94d238bff30abd86243c6b1d4ef2634
-MISC metadata.xml 327 BLAKE2B 0f822676af3dc06b16eb4df24e5d17c70c685b7c1074f303e9daf296a9e0a702c7b39c6c6039fb6a91309ca4674ba55ffad2e5038b38ffeb77655bb4bbfb318e SHA512 2866ae732a5a468a98f97c20cc3b6272e39882f533408a59489a068c914253db6976a630c4c51ef30e45cf9c3c2ccea0b4b196d2e1230ecb4880af72fd7dcf31
+MISC metadata.xml 248 BLAKE2B b8c3f3218b1a5b5a815a2a09751730237a898cdfe3b4efddbbe6cf0289c4784c1317447a7d511af25cd83e9b24cf0a1d2ead158ffd3917f2e83d83ff9868743b SHA512 403566e808f63d98634f04fa0953a6e1ec6d679a2d68cc88d38c8b150388bc93960ce9ef3134d16d72602a531ffa4dde18c8bb09c1f1d82658e381e514c859af
diff --git a/media-gfx/svg2rlg/metadata.xml b/media-gfx/svg2rlg/metadata.xml
index fbf20ae5c3cf..e7c9ced3cbbf 100644
--- a/media-gfx/svg2rlg/metadata.xml
+++ b/media-gfx/svg2rlg/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>nerdboy@gentoo.org</email>
-		<name>Steve Arnold</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">sarnold/svg2rlg</remote-id>
 	</upstream>