gentoo resync : 29.12.2022

5 files changed, 248 insertions, 82 deletions

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 01d0363c44c6..7fbfdf090215 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,5 +1,6 @@
-DIST graphviz-2.49.0.tar.xz 23040392 BLAKE2B 74bc90e433c29662b292c0f086777648db4cded69b7640586647f46e3df46137044fa287d170a780e58f552289fec2d65e10def9ed68095bd4ec8efe9208f929 SHA512 5396b6cb4615ba509233a5a079956aef014245cac64635f01467dcb26e9d6e4b1d044110bc3a85132c747ba410597fa289bef3e503e84fa000c845e1e75c89b0
+AUX graphviz-4.0.0-clang-printf-alike.patch 7199 BLAKE2B cb1e67561d1955ae466da8226835716421d55e61200747cbef592cb8ae02ad7b88f7721492f9ea9491519c9ce694cf0e8daef63b8f7e4eb0ae7dffd3a106df7a SHA512 c044e302402848716da87ace0542daf5e9a9d1245f24ca145c041157825fcbd6e046bf521f563f7d25b16068cb2a76b08f1234a76679983f3685d65656e82733
 DIST graphviz-2.50.0.tar.xz 23031008 BLAKE2B a1789368a77384366bf813466d4a733765ffc0a04660cfcc002c643264780425b449087306b143cfddd70d2feabb67e82b6c04217684aba175824c3e83062085 SHA512 2b035559da20bad35e046bfa1b2c8ce1b395ff9b812f33bcf612d7f7c65ff9a226c9b209553b4283825330683fb925516563943de7922c2f6434baaf3c3b5ee2
-EBUILD graphviz-2.49.0-r1.ebuild 7693 BLAKE2B 9546f55b0386d441def488ec76f917e40a7763f081ed86a53a3266c9e007a647b56f2cb50b4541c5022a3a0e56f24bb68a018108d800c16f63f81bebb3771a75 SHA512 560d01fef054fbc674ff4211a8f79af17afee7fa317f2a83996ab479f7299b328710110d3a19de60e85a0d22466d2746f0eaf1d2f98502113cd1b03c6a729981
-EBUILD graphviz-2.50.0.ebuild 7701 BLAKE2B dbf8c08697f62e0dad53ab137de5fd90314f6ece5bdfe1b4f88defbefcad6b771120b46b02fe2c17158532a28f165071fd0216d265f54b4bfb936d3c97c31ab2 SHA512 ff1bc159d397c86622a45278ed04e1228be8879206530874d12f9a7b5cb79ba23863d1cd205d2cf5cb7543bfc2184a75b6a27f081d1cf31fa48657e52a875a36
-MISC metadata.xml 2382 BLAKE2B 13310cf58d645ff3cff906d226e2da1bce6cb747b8629b1972cf7904126f3fa36a0904b5dea2507b94a3662b7ec2d9cc245c873c57dcb2ecc7411cac1f87e84f SHA512 3b1d625519a62f2679da1c36487782272238aaa6ecd87fbc39ebfb3b5c41b074fe5c27455f5a75d7d9a16c55e072156bdba81d458342fae116e5f7673ff66215
+DIST graphviz-4.0.0.tar.xz 21494432 BLAKE2B b188feb5c6bad2537f7d404c330c314de38f6f274d72ce84040524d6be209642686161939a210f41e446dc37619266864353f7e1829d172c97e559632ba17971 SHA512 34e3e720152cb6a8f0d266f37ae1f66d432b89f44309f172d7abfcf8eba611a16e41250faa3eac64bf94e5e721a242ad5093ef8905238b61d6ad869b7853b9d2
+EBUILD graphviz-2.50.0.ebuild 7752 BLAKE2B 8969610d147f4f40e65202bb8409ea6925e457fbf5456e5b37b96ec73826314ced8ed9a17ba6440c8c5806b69b0efc0914425272febfa11be6041354e30bb1fe SHA512 0a634668da138100dd1c76ea0f1b3865c8c8e43fa1249eeaa8de88a1b5acc80d69ffcffbb31f5652126dee957f40169ac585a1899d0bad96a6004b173dc89161
+EBUILD graphviz-4.0.0-r1.ebuild 6240 BLAKE2B 9fd392799e39ed0d329e548b27e0c78fc143efb40349d4481db67ff5a4be58bbb210281ecce17e8728a935b5c8e6514d773da253878815a3fe4900d37167f856 SHA512 4fac5de3a5baebc3046c75e7318fceb0077d2bf252adf578c61f93ae32fab2a9dc891c2652bfb9d80312011cc72afab4c6d05a016f2ea1e88cc545a5210a30d6
+MISC metadata.xml 2274 BLAKE2B c0a78179ac104e2dbe542716a7bf3afa690d02d859ddd0c1103f8b9adda558d80fffa03038c3f8f2b6075dfa32454cbd0799610c084520808ae9253f237e3142 SHA512 0e9f3bd47884fe33dcbfd0f79021fe04d1d7cf3ac455aa54655c1ee4de0e63178b657bc8c3a665a47e33889f6b1a0de35918d8e0c2ce3479aa6f94b477efa158
diff --git a/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch b/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch
new file mode 100644
index 000000000000..ef213bccd8ab
--- /dev/null
+++ b/media-gfx/graphviz/files/graphviz-4.0.0-clang-printf-alike.patch
@@ -0,0 +1,221 @@
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+index f38cc8ff5..4f1a127a2 100644
+--- a/CHANGELOG.md
++++ b/CHANGELOG.md
+@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
+ 
+ ## [Unreleased (4.0.1)]
+ 
++### Fixed
++
++- **Breaking**: The 4.0.0 change replacing the `Agiodisc_t` struct member
++  `putstr` by `printf` has been reverted
++
+ ## [4.0.0] – 2022-05-29
+ 
+ ### Changed
+diff --git a/cmd/gvpr/gvprmain.c b/cmd/gvpr/gvprmain.c
+index 188cfdf94..92872f8cd 100644
+--- a/cmd/gvpr/gvprmain.c
++++ b/cmd/gvpr/gvprmain.c
+@@ -47,14 +47,17 @@ static int iofread(void *chan, char *buf, int bufsize)
+   return (int)fread(buf, 1, (size_t)bufsize, chan);
+ }
+ 
++static int ioputstr(void *chan, const char *str)
++{
++  return fputs(str, chan);
++}
++
+ static int ioflush(void *chan)
+ {
+   return fflush(chan);
+ }
+ 
+-typedef int (*printfn)(void *chan, const char *format, ...);
+-
+-static Agiodisc_t gprIoDisc = { iofread, (printfn)fprintf, ioflush };
++static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush };
+ 
+ static Agdisc_t gprDisc = { &AgMemDisc, &AgIdDisc, &gprIoDisc };
+ 
+diff --git a/lib/cgraph/cgraph.3 b/lib/cgraph/cgraph.3
+index ed7392c06..67e35c2e9 100644
+--- a/lib/cgraph/cgraph.3
++++ b/lib/cgraph/cgraph.3
+@@ -487,14 +487,14 @@ The I/O discipline provides an abstraction for the reading and writing of graphs
+ .P0
+ struct Agiodisc_s {
+     int        (*fread)(void *chan, char *buf, int bufsize);
+-    int        (*printf)(void *chan, const char *format, ...);
++    int        (*putstr)(void *chan, char *str);
+     int        (*flush)(void *chan);    /* sync */
+ } ;
+ .P1
+ Normally, the \fBFILE\fP structure and its related functions are used for I/O. At times, though,
+ an application may need to use a totally different type of character source. The associated
+ state or stream information is provided by the \fIchan\fP argument to \fBagread\fP or \fBagwrite\fP.
+-The discipline function \fIfread\fP and \fIprintf\fP provide the corresponding functions for
++The discipline function \fIfread\fP and \fIputstr\fP provide the corresponding functions for
+ read and writing.
+ 
+ .SH "MEMORY DISCIPLINE"
+diff --git a/lib/cgraph/cgraph.h b/lib/cgraph/cgraph.h
+index 7b005c442..cbec3bbe6 100644
+--- a/lib/cgraph/cgraph.h
++++ b/lib/cgraph/cgraph.h
+@@ -169,7 +169,7 @@ struct Agiddisc_s {		/* object ID allocator */
+ 
+ struct Agiodisc_s {
+     int (*afread) (void *chan, char *buf, int bufsize);
+-    int (*printf)(void *chan, const char *format, ...);
++    int (*putstr) (void *chan, const char *str);
+     int (*flush) (void *chan);	/* sync */
+     /* error messages? */
+ };
+diff --git a/lib/cgraph/io.c b/lib/cgraph/io.c
+index d8b136804..66c605ae6 100644
+--- a/lib/cgraph/io.c
++++ b/lib/cgraph/io.c
+@@ -24,15 +24,17 @@ static int iofread(void *chan, char *buf, int bufsize)
+ }
+ 
+ /* default IO methods */
++static int ioputstr(void *chan, const char *str)
++{
++    return fputs(str, chan);
++}
+ 
+ static int ioflush(void *chan)
+ {
+     return fflush(chan);
+ }
+ 
+-typedef int (*printfn)(void *chan, const char *format, ...);
+-
+-Agiodisc_t AgIoDisc = { iofread, (printfn)fprintf, ioflush };
++Agiodisc_t AgIoDisc = { iofread, ioputstr, ioflush };
+ 
+ typedef struct {
+     const char *data;
+@@ -78,7 +80,7 @@ static Agraph_t *agmemread0(Agraph_t *arg_g, const char *cp)
+     rdr_t rdr;
+     Agdisc_t disc;
+ 
+-    memIoDisc.printf = AgIoDisc.printf;
++    memIoDisc.putstr = AgIoDisc.putstr;
+     memIoDisc.flush = AgIoDisc.flush;
+     rdr.data = cp;
+     rdr.len = strlen(cp);
+diff --git a/lib/cgraph/write.c b/lib/cgraph/write.c
+index e14f7d835..9e72d2c5c 100644
+--- a/lib/cgraph/write.c
++++ b/lib/cgraph/write.c
+@@ -26,7 +26,7 @@ typedef void iochan_t;
+ 
+ static int ioput(Agraph_t * g, iochan_t * ofile, char *str)
+ {
+-    return AGDISC(g, io)->printf(ofile, "%s", str);
++    return AGDISC(g, io)->putstr(ofile, str);
+ 
+ }
+ 
+diff --git a/lib/gvpr/compile.c b/lib/gvpr/compile.c
+index a7fe27bf5..3704f51d9 100644
+--- a/lib/gvpr/compile.c
++++ b/lib/gvpr/compile.c
+@@ -66,14 +66,17 @@ static int iofread(void *chan, char *buf, int bufsize)
+     return (int)read(sffileno(chan), buf, bufsize);
+ }
+ 
++static int ioputstr(void *chan, const char *str)
++{
++    return sfputr(chan, str, -1);
++}
++
+ static int ioflush(void *chan)
+ {
+     return sfsync(chan);
+ }
+ 
+-typedef int (*printfn)(void *chan, const char *format, ...);
+-
+-static Agiodisc_t gprIoDisc = { iofread, (printfn)sfprintf, ioflush };
++static Agiodisc_t gprIoDisc = { iofread, ioputstr, ioflush };
+ 
+ #ifdef GVDLL
+ static Agdisc_t gprDisc = { 0, 0, &gprIoDisc };
+diff --git a/plugin/core/gvrender_core_dot.c b/plugin/core/gvrender_core_dot.c
+index c45563460..63eb5e535 100644
+--- a/plugin/core/gvrender_core_dot.c
++++ b/plugin/core/gvrender_core_dot.c
+@@ -511,7 +511,7 @@ static void xdot_end_graph(graph_t* g)
+     textflags[EMIT_GLABEL] = 0;
+ }
+ 
+-typedef int (*printfn)(void *chan, const char *format, ...);
++typedef int (*putstrfn) (void *chan, const char *str);
+ typedef int (*flushfn) (void *chan);
+ static void dot_end_graph(GVJ_t *job)
+ {
+@@ -521,7 +521,7 @@ static void dot_end_graph(GVJ_t *job)
+ 
+     if (io.afread == NULL) {
+ 	io.afread = AgIoDisc.afread;
+-	io.printf = (printfn)gvprintf;
++	io.putstr = (putstrfn)gvputs;
+ 	io.flush = (flushfn)gvflush;
+     }
+ 
+diff --git a/plugin/core/gvrender_core_json.c b/plugin/core/gvrender_core_json.c
+index bab5d64af..88715a93a 100644
+--- a/plugin/core/gvrender_core_json.c
++++ b/plugin/core/gvrender_core_json.c
+@@ -693,7 +693,7 @@ static void write_graph(Agraph_t * g, GVJ_t * job, int top, state_t* sp)
+ 	gvputs(job, "}");
+ }
+ 
+-typedef int (*printfn)(void *chan, const char *format, ...);
++typedef int (*putstrfn) (void *chan, const char *str);
+ typedef int (*flushfn) (void *chan);
+ 
+ static void json_end_graph(GVJ_t *job)
+@@ -704,7 +704,7 @@ static void json_end_graph(GVJ_t *job)
+ 
+     if (io.afread == NULL) {
+ 	io.afread = AgIoDisc.afread;
+-	io.printf = (printfn)gvprintf;
++	io.putstr = (putstrfn)gvputs;
+ 	io.flush = (flushfn)gvflush;
+     }
+ 
+diff --git a/tclpkg/tcldot/tcldot.c b/tclpkg/tcldot/tcldot.c
+index 335d8e469..b747124cf 100644
+--- a/tclpkg/tcldot/tcldot.c
++++ b/tclpkg/tcldot/tcldot.c
+@@ -163,7 +163,7 @@ int Tcldot_Init(Tcl_Interp * interp)
+     /* build disciplines dynamically so we can selectively replace functions */
+ 
+     ictx->myioDisc.afread = NULL;            /* set in dotread() or dotstring() according to need */
+-    ictx->myioDisc.printf = AgIoDisc.printf; /* no change */
++    ictx->myioDisc.putstr = AgIoDisc.putstr; /* no change */
+     ictx->myioDisc.flush = AgIoDisc.flush;   /* no change */
+ 
+     ictx->mydisc.mem = &AgMemDisc;           /* no change */
+diff --git a/lib/common/output.c b/lib/common/output.c
+index c91dfe41e..648409c5a 100644
+--- a/lib/common/output.c
++++ b/lib/common/output.c
+@@ -80,11 +80,11 @@ void write_plain(GVJ_t *job, graph_t *g,
+     bezier bz;
+     pointf pt;
+     char *lbl;
+     char* fillcolor;
+ 
+-    print = g->clos->disc.io->printf;
++    print = g->clos->disc.io->putstr;
+ //    setup_graph(job, g);
+     setYInvert(g);
+     pt = GD_bb(g).UR;
+     print(f, "graph %.5g %.5g %.5g\n", job->zoom, PS2INCH(pt.x), PS2INCH(pt.y));
+     for (n = agfstnode(g); n; n = agnxtnode(g, n)) {
diff --git a/media-gfx/graphviz/graphviz-2.50.0.ebuild b/media-gfx/graphviz/graphviz-2.50.0.ebuild
index 88c2794ba6ff..656507126e5d 100644
--- a/media-gfx/graphviz/graphviz-2.50.0.ebuild
+++ b/media-gfx/graphviz/graphviz-2.50.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gtk2 gts guile java lasi lefty nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
@@ -188,7 +188,8 @@ src_prepare() {
 
 src_configure() {
 	local myconf=(
-		--disable-static
+		# Speeds up the libltdl configure
+		--cache-file="${S}"/config.cache
 		--enable-ltdl
 		$(use_with cairo pangocairo)
 		$(use_with devil)
diff --git a/media-gfx/graphviz/graphviz-2.49.0-r1.ebuild b/media-gfx/graphviz/graphviz-4.0.0-r1.ebuild
index a909b34a3d40..53c156b50c4b 100644
--- a/media-gfx/graphviz/graphviz-2.49.0-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-4.0.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
-inherit autotools flag-o-matic java-pkg-opt-2 python-single-r1 qmake-utils
+PYTHON_COMPAT=( python3_{8..11} )
+inherit python-single-r1
 
 DESCRIPTION="Open Source Graph Visualization Software"
 HOMEPAGE="https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/"
@@ -14,8 +14,8 @@ SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-re
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
-IUSE="+cairo devil doc examples gtk2 gts guile java lasi lefty nls pdf perl postscript python qt5 ruby svg tcl webp X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="+cairo devil doc examples gtk2 gts guile lasi nls pdf perl postscript python qt5 ruby svg tcl webp X"
 
 REQUIRED_USE="
 	!cairo? ( !X !gtk2 !postscript !lasi )
@@ -32,9 +32,9 @@ RDEPEND="
 	>=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/libjpeg-turbo:=
 	>=media-libs/libpng-1.2:0=
 	sys-libs/zlib
-	virtual/jpeg:0
 	virtual/libiconv
 	cairo? (
 		>=x11-libs/cairo-1.1.10[svg]
@@ -47,12 +47,7 @@ RDEPEND="
 	)
 	gts? ( sci-libs/gts )
 	guile? ( dev-scheme/guile )
-	java? ( >=virtual/jre-1.8:* )
 	lasi? ( media-libs/lasi )
-	lefty? (
-		x11-libs/libXaw
-		x11-libs/libXmu
-	)
 	pdf? ( app-text/poppler )
 	perl? ( dev-lang/perl:= )
 	postscript? ( app-text/ghostscript-gpl )
@@ -69,7 +64,6 @@ RDEPEND="
 	webp? ( media-libs/libwebp:= )
 	X? ( x11-libs/libX11 )"
 DEPEND="${RDEPEND}
-	lefty? ( x11-base/xorg-proto )
 	X? ( x11-base/xorg-proto )"
 BDEPEND="
 	sys-devel/flex
@@ -83,10 +77,6 @@ BDEPEND="
 		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 )
@@ -104,8 +94,6 @@ BDEPEND="
 #   gtk-2 depends on pango, cairo and libX11 directly.
 # - gdk-pixbuf
 #   Directly depends on gtk-2 and gdk-pixbuf.
-# - 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
@@ -124,7 +112,6 @@ BDEPEND="
 # - 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
@@ -141,10 +128,8 @@ BDEPEND="
 # tkspline, tkstubs ; enabled with: --with-tk
 
 # And the commands (/cmd):
-# - dot, dotty, gvedit, gvpr, lefty, lneato, smyrna, tools/* :)
+# - dot, gvedit, gvpr, 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')
@@ -153,44 +138,23 @@ BDEPEND="
 #   sci-libs/gts, x11-libs/gtk.  Also needs 'gtk','glade','glut','gts' and 'png'
 #   with flags enabled at configure time
 
+PATCHES=(
+	# backport, remove on bump (bug #853175)
+	"${FILESDIR}"/${P}-clang-printf-alike.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
+		# Speeds up the libltdl configure
+		--cache-file="${S}"/config.cache
 		--enable-ltdl
+		$(use_enable doc man-pdfs)
 		$(use_with cairo pangocairo)
+		$(use_with examples demos '$(docdir)/examples')
 		$(use_with devil)
 		$(use_with gtk2 gdk)
 		$(use_with gtk2 gdk-pixbuf)
@@ -203,7 +167,6 @@ src_configure() {
 		$(use_with svg rsvg)
 		$(use_with webp)
 		$(use_with X x)
-		$(use_enable lefty)
 		--with-digcola
 		--with-fontconfig
 		--with-freetype2
@@ -212,13 +175,11 @@ src_configure() {
 		--with-sfdp
 		--without-ming
 		# new/experimental features, to be tested, disable for now
-		--without-glitz
 		--without-ipsepcola
 		--without-smyrna
 		--without-visio
 		# Bindings:
 		$(use_enable guile)
-		$(use_enable java)
 		$(use_enable perl)
 		$(use_enable python python3)
 		$(use_enable ruby)
@@ -226,6 +187,7 @@ src_configure() {
 		--disable-go
 		--disable-io
 		--disable-lua
+		--disable-java
 		--disable-ocaml
 		--disable-php
 		--disable-python
@@ -239,32 +201,17 @@ src_configure() {
 }
 
 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
+	default
 
 	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
+	# We need to register all plugins before they become usable
 	dot -c || die
 }
 
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index fafa9aa44163..72c95420dfc8 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -2,10 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<maintainer type="person">
-		<email>zlogene@gentoo.org</email>
-		<name>Mikle Kolyada</name>
-	</maintainer>
-	<maintainer type="person">
 		<email>soap@gentoo.org</email>
 		<name>David Seifert</name>
 	</maintainer>