gentoo auto-resync : 19:09:2024 - 12:11:50

5 files changed, 236 insertions, 9 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index d6f4437d3d0d..4440faacb0ab 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index bdf523930477..481a65d0ca04 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -2,6 +2,7 @@ DIST graphviz-11.0.0.tar.xz 21306368 BLAKE2B c424b2d81180513f2a03210b5a5febfbf80
 DIST graphviz-12.0.0.tar.xz 21279920 BLAKE2B 67d4444dcc31417fd01268b0fdc81538d86e26f961227d106ae57eb3d6d0e4a2e0ba684413a2d1b66f17340e0ad3a244ce5554c180873683e3ad4775f661739d SHA512 b5d4c8e9b565d4268fff28f169e3bfdb9ebf8b809996f7e35887430e5745aeac92c092fe2a9e15b23c9ba3364aa89fe2eeed85ab3fba61acce21634bc9632813
 DIST graphviz-9.0.0.tar.xz 21412796 BLAKE2B a1fd4e0d8d25ade263fdc0d357078cd8bb7847e88746561a0cfe07d129d193c309c7f4cb25f41cebca9549c8486aae2b1e3ebca0eaca57a41cbe2304a418dbd3 SHA512 912f31a4a90e21de9601ffcf8a85d2650d46f07e61aeb0e5124e5a91c67f444d08d40d49f15f2e4078d53d01fb9ca6f54dc9d18c1c08406da91b8ba9ad61416c
 EBUILD graphviz-11.0.0.ebuild 6293 BLAKE2B e2f1ba3c77af6b88256cf4afb06db00324689ccf215126fdafa71905f5b1321c258a76fe36ac48027f7253003ac82c52fb9a2408d60675e9266f07c63c5c0b0d SHA512 8062e2c7cead8b404194d4ed7d639e9a9a6aa0fc414e30d8f5767d992aec56a9cab17bd048b527e27b3d802c3977c25317860bf4b4f68f37e2a6f24b89854cff
+EBUILD graphviz-12.0.0-r100.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063
 EBUILD graphviz-12.0.0.ebuild 6300 BLAKE2B bb5554a12d879fee666b89c9e353e5925b567d79261811dbb095d5b51a1cb2698d4ced31ced861be5d5ebe459ebc5a5f0ddf6bd7ed73ae4c6207dc6d6fd83cf6 SHA512 7a278007441a88eed176f583eed7ce6fced63f09addb913eefdd069aa3e089f5cfee88c20a1750abbd1029d0756346c17506baf776690d1ab127195b853a91f4
 EBUILD graphviz-9.0.0.ebuild 6107 BLAKE2B 96a273d73b2e5799256ebae4874953d00f163366c153c405390f1c0593911f108cd8bea2ec05149f3a7904190929bf2139c75366df41bce1baa94161bd83ec69 SHA512 c2ccdb3a47bfecdb87a5e683335a7ba931a7db37902ac31ddb74050925b23814f851ac693f5d8552cbf3942f82b40a672ec0600d4efce50ea8a5d30980d634a3
 MISC metadata.xml 2309 BLAKE2B 261f100c9c78cf3bb50ffd84260594d34fa5af75f0b3789ce5640e0d633494405e64b3e9f7524e35ef87d11164c501e21fcef2cc483f60ad6ad2e350f500e3b2 SHA512 1a29d11154b72af3deeb0202136926f0871797086ce1a5a4d1fc71822e86d0e76ff789c684fabad85fac1abd5f29913a555be0916f42b90f5ce62fa395e1cbba
diff --git a/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild
new file mode 100644
index 000000000000..d66128a9fbcf
--- /dev/null
+++ b/media-gfx/graphviz/graphviz-12.0.0-r100.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+GUILE_COMPAT=( 2-2 3-0 )
+PYTHON_COMPAT=( python3_{10..13} )
+inherit guile-single libtool 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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~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 )
+	guile? ( ${GUILE_REQUIRED_USE} )
+	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/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? ( ${GUILE_DEPS} )
+	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="
+	app-alternatives/lex
+	dev-build/libtool
+	virtual/pkgconfig
+	doc? (
+		app-text/ghostscript-gpl
+		sys-apps/groff
+	)
+	guile? (
+		dev-lang/swig
+		${GUILE_DEPS}
+	)
+	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 guile && guile-single_pkg_setup
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	if use guile; then
+		guile-single_src_prepare
+	else
+		default
+	fi
+	elibtoolize
+}
+
+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-freetype2
+		--with-ipsepcola
+		--with-libgd
+		--with-sfdp
+		--without-ming
+		# New/experimental features, to be tested, disable for now
+		--without-ipsepcola
+		--without-smyrna
+		# Bindings
+		$(use_enable guile)
+		$(use_enable perl)
+		$(use_enable python python3)
+		$(use_enable ruby)
+		$(use_enable tcl)
+		--disable-go
+		--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
+		QMAKE=$(usev qt5 qmake5)
+	)
+	# XXX: Temporary bash for bug #926600. It's been reverted upstream
+	# on master already:
+	# https://gitlab.com/graphviz/graphviz/-/merge_requests/3636
+	CONFIG_SHELL="${BROOT}"/bin/bash econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+
+	use guile && guile_unstrip_ccache
+
+	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/hugin/Manifest b/media-gfx/hugin/Manifest
index 3e71df89c4ef..5d2d0ade2c2e 100644
--- a/media-gfx/hugin/Manifest
+++ b/media-gfx/hugin/Manifest
@@ -3,5 +3,5 @@ DIST hugin-2023.0.0.tar.bz2 10336322 BLAKE2B 5c35f67160d76f961e812a309a0c50bb012
 DIST hugin-2024.0beta1.tar.bz2 10351004 BLAKE2B 53bd8d1622ee9cc407d25cc3edcb16063689d6f949f38d4e4bf0c9afd6fa7f065bdab030dd6a2f2a2c82bb6953e8f16655d5a1f305d0b494a4a4ab8ce6dddecd SHA512 3395e00d1e895db4ce063b6e2e936f2af8aed0740d10ea15763c94549e64953da4e9c214bd6058d879435527e945c4ddfaa75d7d8efb98e7220102872c4f8305
 EBUILD hugin-2023.0.0-r1.ebuild 2193 BLAKE2B acc220e65485eba96191ed6459acda962b66eadb8010d543664fb151a0f56ada5fb8aab96584ab517405f8105b307813c60e0d82f7344a5b3d43b5de7acae201 SHA512 fd18cbc43f50dca29b9574ffa7d4d8dd5c513327269602810acafac34c4b1c48630d308c28538e6cfe73bbaff019c056cd2fc7ece1030e51a8f70ad1b46d9eaf
 EBUILD hugin-2024.0_beta1.ebuild 2117 BLAKE2B 1bf1c8e04ad68397e95d87e5a8ae9d7a5432af2ec8139dba6fd198a29edfbcd97b4052ac5f38f45e22a0be1c2664dbb0ee640bfa2ab089e17986b2760cd9c811 SHA512 6f2da09f4f2700f9becd4c1e9da9f957ba197a5b7636faf1e1f7324d1e3a95fe75b02cf9b474dbe26fa69b586af65c9c28e90c2559b11295ac4711f0758f47d7
-EBUILD hugin-9999.ebuild 2210 BLAKE2B 9961fb69cdbb3e4fd63e567ad6cc96dc8a81e608b3742733ad3cc0c19be059e591ae41f2f64751dfbb4482863b97546696ac7088f5b3d74c88ec434ee50bdc7e SHA512 900b2d13e4e756b57830af1c0c6f39b7cf9dd26afeaf5d8f3ceb06be567843f8ba30ae15af032a3a7486eb6be03b6838d96d2a90f0c70e2dfe4e52044dbfbb4f
+EBUILD hugin-9999.ebuild 2041 BLAKE2B 68e51179017623a59c1c6dbbace836c6558c8f33fce09488b999965b2d02df3703767089a5c2fd2e7979135173982fb7af30e8570f8814219832a5e848d177c4 SHA512 40e3c43bafb40fcee31092197569a51ce5fa87b48e40a2ab676acc347ffdfec9bd818d3743fc7ee1c9bf2ee481018753f56659dce7c84527b9c71d86831b9a9d
 MISC metadata.xml 547 BLAKE2B ea55ca44dac1ccf74d4af96d42af1d4efac2f9823304b529b96aea364ec4a6f8430fd130f54c064766f0c34f9060ca076aa43de664e37177b41cc2deed0207bc SHA512 5012cb4a58bdc374f89d1a2e81e8321ff25f2de2f5682a2f8859137aa3339ce059e7823e26642f58b939e6c1d7f428356a4df5311fca1105320ebcb417129cba
diff --git a/media-gfx/hugin/hugin-9999.ebuild b/media-gfx/hugin/hugin-9999.ebuild
index aec868af9672..db8dffa1c308 100644
--- a/media-gfx/hugin/hugin-9999.ebuild
+++ b/media-gfx/hugin/hugin-9999.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.2-gtk3"
-PYTHON_COMPAT=( python3_{9..12} )
+PYTHON_COMPAT=( python3_{10..13} )
 
 inherit mercurial python-single-r1 wxwidgets cmake xdg
 
@@ -14,6 +14,8 @@ SRC_URI=""
 EHG_REPO_URI="http://hg.code.sf.net/p/hugin/hugin"
 EHG_PROJECT="${PN}-${PN}"
 
+S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
+
 LICENSE="GPL-2+ BSD BSD-2 MIT wxWinLL-3 ZLIB FDL-1.2"
 SLOT="0"
 KEYWORDS=""
@@ -56,8 +58,6 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 DOCS=( authors.txt README TODO )
 
-S=${WORKDIR}/${PN}-$(ver_cut 1-2).0
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 	setup-wxwidgets
@@ -71,10 +71,6 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_HSI=$(usex python)
 		-DENABLE_LAPACK=$(usex lapack)
-		# Temporary workaround for bug #833443. Can be dropped when
-		# we switch to wxgtk-3.2, but complications for that remain
-		# w/ egl+wayland.
-		-DUSE_GDKBACKEND_X11=on
 	)
 	cmake_src_configure
 }