gentoo auto-resync : 19:09:2022 - 05:21:10

6 files changed, 225 insertions, 3 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 50988f44ce28..df0b5e5921d3 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/eog/Manifest b/media-gfx/eog/Manifest
index c2fd471bd950..f5a466bd0533 100644
--- a/media-gfx/eog/Manifest
+++ b/media-gfx/eog/Manifest
@@ -1,5 +1,5 @@
 DIST eog-42.2.tar.xz 4445892 BLAKE2B 863ecf1efcf295ae0deb6a966b6e0009cf4966543548e258d73315810bb4c1ed8434fa022b8367d779243376d2ba6cbe10d5e44135cedd0e5ec520dcee4ceaaf SHA512 f2da81fe7040f7ffc63da03df4889add33d59ad8df637797d1094d95233f4ce891838dfe6f774f58de63c28a620807bc4097b3ab1f31afb7cc7c402f8501e69d
 DIST eog-42.3.tar.xz 4460968 BLAKE2B ce589ec50210870bf11d8737c0ca18dd7da308de59654639623f15984f9d62f36cb1b87854fa4f67b7885cb5802e576281fc91c6e2c86e9d285d9a952193a8cc SHA512 bc82830897c55769cd2cb0c0d428b9456465c0f4e793c597ea74b3c84d5c052f051b772413cb32754153714239a9815a09fe93daf928f13e16f8d997b1e58b45
 EBUILD eog-42.2.ebuild 1713 BLAKE2B ab54d270a0702792c60a7e3d069a0a842b99f2615ed840c8c40c4648f20bf53b35e490e9336d8070e1d7628240505e30bb063182cf0c86f5fe0905eb82482aae SHA512 21334df0eb38c1631b98afbf52e701281345177dc38020a05f45470a15550e6702755405508128e345c494a469c8ebdf81d368ca93ff522dae0a97270626f23c
-EBUILD eog-42.3.ebuild 1714 BLAKE2B 7e5b382bb89bd1116a1a36b84b0fead4354b3f19f8d8f708ad6a5501d187b267ebcdb2385954ae1c7f55b8056522ef8f4795ef95a8bf6dc9e2ee49e46e073c84 SHA512 9c0cb62fb6733e382c4e8146471303a0d8dcc97a08a4740f3d809ed05ae03fc6bf1f2ddfe4422bab4b00980eedaed2847a901f6158613fe3383d1eefeb9ae0ab
+EBUILD eog-42.3.ebuild 1713 BLAKE2B ab54d270a0702792c60a7e3d069a0a842b99f2615ed840c8c40c4648f20bf53b35e490e9336d8070e1d7628240505e30bb063182cf0c86f5fe0905eb82482aae SHA512 21334df0eb38c1631b98afbf52e701281345177dc38020a05f45470a15550e6702755405508128e345c494a469c8ebdf81d368ca93ff522dae0a97270626f23c
 MISC metadata.xml 482 BLAKE2B 03780ad7b79dd3b35ee6a9b3ee95bceb94ebbd97de711912ba0f5e61ef4e25d9a20a474011cd3c5261c82757105bed5383f16259468dee80bfd6cdcec13b5828 SHA512 0c51ba4ac4859bc5e6361862282a76a98343ad3e46dfac04e088c79ec25683e820ea907991212979b5fffa0b757a66ea33ddfcff7a8012e42e81dba0e943ea39
diff --git a/media-gfx/eog/eog-42.3.ebuild b/media-gfx/eog/eog-42.3.ebuild
index 190ea0887d7f..bb56eb7315ce 100644
--- a/media-gfx/eog/eog-42.3.ebuild
+++ b/media-gfx/eog/eog-42.3.ebuild
@@ -14,7 +14,7 @@ SLOT="1"
 IUSE="+exif gtk-doc +introspection +jpeg lcms +svg xmp tiff"
 REQUIRED_USE="exif? ( jpeg )"
 
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	>=dev-libs/glib-2.53.4:2
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 6401a5566c0b..b436e549fb66 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,7 +1,9 @@
 DIST graphviz-2.50.0.tar.xz 23031008 BLAKE2B a1789368a77384366bf813466d4a733765ffc0a04660cfcc002c643264780425b449087306b143cfddd70d2feabb67e82b6c04217684aba175824c3e83062085 SHA512 2b035559da20bad35e046bfa1b2c8ce1b395ff9b812f33bcf612d7f7c65ff9a226c9b209553b4283825330683fb925516563943de7922c2f6434baaf3c3b5ee2
 DIST graphviz-5.0.0.tar.xz 21495572 BLAKE2B b28cbc5a20b202441ed7e98ebbb85b878f9362d1f95816ca89f7aedd62302c77974efc3b63e2ab8b577da59946ca63c7607706da2e79afcae9089f8c2743cd4a SHA512 51576c0d0405aa2005e908b57c3bac5e30069e6efb355b467a35a46559b002b34eaec77c35b6d41c635d6d874351da7261a11cf0f857cea72ff7259d5f6c860d
 DIST graphviz-5.0.1.tar.xz 21493276 BLAKE2B 1eabf7dc175cde4827db682ae7c0cb00f5bec4bee8aa9801bc6ac86b06011588260ce261e25613d6d4a1e708ccb4fd65aba73210df8cf0af84f2e20b7c914167 SHA512 c1c5784558fd6f32cd8ce9b63c2bc5232f47ea1c4abf8fbfc1b8b0175aa30845af452dbc6651642f07f2c5b7a73f5c792934ca99561608a104ae99898eca3bc7
+DIST graphviz-6.0.1.tar.xz 21492876 BLAKE2B 36b8c2e922a73e35cddb2a252138193c9a413df823953faf387c964a31cf41e93b9c502ddc58831542aeea7e06cfd9ec377c390b45b859bdab1e0602c9b9683c SHA512 78f58734c47a6e1531a00b9de881481108500bf0a38b0ee734ecd024b629d838d98dbb32d81d2c2fe3b5ac28cbad140452b4bb5fa808ec667cc6cbe7638156ee
 EBUILD graphviz-2.50.0.ebuild 7752 BLAKE2B 8969610d147f4f40e65202bb8409ea6925e457fbf5456e5b37b96ec73826314ced8ed9a17ba6440c8c5806b69b0efc0914425272febfa11be6041354e30bb1fe SHA512 0a634668da138100dd1c76ea0f1b3865c8c8e43fa1249eeaa8de88a1b5acc80d69ffcffbb31f5652126dee957f40169ac585a1899d0bad96a6004b173dc89161
 EBUILD graphviz-5.0.0.ebuild 6140 BLAKE2B eda5a266f41226dcd0d596898e4c8a011786ee14dabb9dd9a48d7e7493e944b0a3c11719774ff4b4e830f4e5f31efe7dad9955a8fa9c8abe181a434ed436bcce SHA512 32e15bddd89f087faf5d1cce5db901d313759564f99a414e2f8b1c4b4922b8a199dae20e85454e0bda4e267522962aaf59b8e22d94503248af2244273b0712cc
 EBUILD graphviz-5.0.1.ebuild 6139 BLAKE2B bae5b0f1667e0beeedcbd80cde04629269046353b0bc870ba060f35ab1a3c461c75397afd6bb5ff1ce72e17442e1d4d0a4236035dfda1f1c4280a5245494d0e7 SHA512 0ca679447a0a27ca52bb67d9ff20e85d72f9bcb12465e5bd0d5c84d4588790d8cdfc76b7eded1be3b79f3cb75e56b576b56ebaeebab68be86bffa57c15636890
-MISC metadata.xml 2274 BLAKE2B c0a78179ac104e2dbe542716a7bf3afa690d02d859ddd0c1103f8b9adda558d80fffa03038c3f8f2b6075dfa32454cbd0799610c084520808ae9253f237e3142 SHA512 0e9f3bd47884fe33dcbfd0f79021fe04d1d7cf3ac455aa54655c1ee4de0e63178b657bc8c3a665a47e33889f6b1a0de35918d8e0c2ce3479aa6f94b477efa158
+EBUILD graphviz-6.0.1.ebuild 6135 BLAKE2B 173aeb004d05175deca81920f084a5b3c4fcc5eea04a5d042567bb0a8b23e778031583332a62178b887495c1fafd5ca5dd825a6ff14a30a479ffd38238112568 SHA512 4d9d34eb27670c59ef9efe47cf5ee410b965819744865d5cd9cbb228d5e877482811a2e3b9366bc3ac117246fdf2f9b2ab7cdb3107769d8b283e0ebc640af426
+MISC metadata.xml 2443 BLAKE2B 6e4e513482d6c8db4f3261a1552b4d625ac05dcf528aba81c0b2c1bace0523b145cfb348ce6982a5d4f9bcb8c2f9dd38628641942fbf2f65629d04b948b608e9 SHA512 93c08b7afe4cf256bc22cd5c41db920700110668e03f7f6f55e8fb63c8d22dae467508cf3c514d092cfc4428db7984133ea843e397d0b526407f62cdbddb66d8
diff --git a/media-gfx/graphviz/graphviz-6.0.1.ebuild b/media-gfx/graphviz/graphviz-6.0.1.ebuild
new file mode 100644
index 000000000000..e88942bff58b
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-6.0.1.ebuild
@@ -0,0 +1,216 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/"
+# Unfortunately upstream uses an "artifact" store for the pre-generated
+# tarball now, which makes predictable URLs impossible.
+SRC_URI="https://gitlab.com/api/v4/projects/4207231/packages/generic/graphviz-releases/${PV}/${P}.tar.xz"
+
+LICENSE="CPL-1.0"
+SLOT="0"
+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 )
+	pdf? ( cairo )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Requires ksh, tests against installed package, missing files and directory
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/expat-2
+	>=dev-libs/glib-2.11.1:2
+	dev-libs/libltdl
+	>=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:=
+	sys-libs/zlib
+	virtual/libiconv
+	cairo? (
+		>=x11-libs/cairo-1.1.10[svg]
+		>=x11-libs/pango-1.12
+	)
+	devil? ( media-libs/devil[png,jpeg] )
+	gtk2? (
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:2
+	)
+	gts? ( sci-libs/gts )
+	guile? ( dev-scheme/guile )
+	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:= )
+	webp? ( media-libs/libwebp:= )
+	X? ( x11-libs/libX11 )"
+DEPEND="${RDEPEND}
+	X? ( x11-base/xorg-proto )"
+BDEPEND="
+	sys-devel/flex
+	sys-devel/libtool
+	virtual/pkgconfig
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	guile? (
+		dev-lang/swig
+		dev-scheme/guile
+	)
+	nls? ( >=sys-devel/gettext-0.14.5 )
+	perl? ( dev-lang/swig )
+	python? ( dev-lang/swig )
+	ruby? ( dev-lang/swig )
+	tcl? ( dev-lang/swig )"
+
+# 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
+#   Directly depends on gtk-2 and gdk-pixbuf.
+#   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)
+# - 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, gvedit, gvpr, smyrna, tools/* :)
+#   sci-libs/gts can be used for some of these
+# - 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
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf=(
+		# 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)
+		$(use_with gtk2)
+		$(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)
+		--with-digcola
+		--with-fontconfig
+		--with-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		--without-ming
+		# New/experimental features, to be tested, disable for now
+		--without-ipsepcola
+		--without-smyrna
+		--without-visio
+		# Bindings
+		$(use_enable guile)
+		$(use_enable perl)
+		$(use_enable python python3)
+		$(use_enable ruby)
+		$(use_enable tcl)
+		--disable-go
+		--disable-io
+		--disable-lua
+		--disable-java
+		--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() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use python && python_optimize \
+		"${D}"$(python_get_sitedir) \
+		"${ED}"/usr/$(get_libdir)/graphviz/python3
+}
+
+pkg_postinst() {
+	# We need to register all plugins before they become usable
+	dot -c || die
+}
+
+pkg_postrm() {
+	# Remove cruft, bug #547344
+	rm -rf "${EROOT}"/usr/$(get_libdir)/graphviz/config{,6} || die
+}
diff --git a/media-gfx/graphviz/metadata.xml b/media-gfx/graphviz/metadata.xml
index 72c95420dfc8..df2acbb2e711 100644
--- a/media-gfx/graphviz/metadata.xml
+++ b/media-gfx/graphviz/metadata.xml
@@ -38,4 +38,8 @@
 		<flag name="lefty">Builds lefty front-end, requires <pkg>x11-libs/libXmu</pkg> and <pkg>x11-libs/libXaw</pkg></flag>
 		<flag name="X">Builds dotty, lneato, unflatten, vimdot, builds plugin -Txlib, and enables support for x11 in various other modules (needs cairo)</flag>
 	</use>
+	<upstream>
+		<changelog>https://gitlab.com/graphviz/graphviz/-/blob/main/CHANGELOG.md</changelog>
+		<remote-id type="gitlab">graphviz/graphviz</remote-id>
+	</upstream>
 </pkgmetadata>