gentoo auto-resync : 29:09:2024 - 01:25:46

2 files changed, 21 insertions, 9 deletions

diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 0c51e8250341..09b337ba8bad 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -1,8 +1,8 @@
 DIST graphviz-11.0.0.tar.xz 21306368 BLAKE2B c424b2d81180513f2a03210b5a5febfbf80e5c9912ad020d7015be69fdae6579d44108d22f99450ae3384560b610dbaac49a50fe8cac9dbd4e80b8761a8b65a8 SHA512 e95c9ed491c5f09190ca0f085aba2b9a3f6703371d62f6a275f41ddfceef7d79956e1fb0ccfda6c21f2e57afc3a88e37d7091af724911fe3e900ee90a7a811cf
 DIST graphviz-12.0.0.tar.xz 21279920 BLAKE2B 67d4444dcc31417fd01268b0fdc81538d86e26f961227d106ae57eb3d6d0e4a2e0ba684413a2d1b66f17340e0ad3a244ce5554c180873683e3ad4775f661739d SHA512 b5d4c8e9b565d4268fff28f169e3bfdb9ebf8b809996f7e35887430e5745aeac92c092fe2a9e15b23c9ba3364aa89fe2eeed85ab3fba61acce21634bc9632813
-DIST graphviz-9.0.0.tar.xz 21412796 BLAKE2B a1fd4e0d8d25ade263fdc0d357078cd8bb7847e88746561a0cfe07d129d193c309c7f4cb25f41cebca9549c8486aae2b1e3ebca0eaca57a41cbe2304a418dbd3 SHA512 912f31a4a90e21de9601ffcf8a85d2650d46f07e61aeb0e5124e5a91c67f444d08d40d49f15f2e4078d53d01fb9ca6f54dc9d18c1c08406da91b8ba9ad61416c
+DIST graphviz-12.1.2.tar.xz 20939968 BLAKE2B 4c9ad31f9ce6c68e67a48330b6693c9d6dc9ecebd4ef74e0aa250fd6cb86f02a585c8b6fe16b1322aedfa844004327f72ac4cbcca782848d55202b8e4695371d SHA512 2c31c33bcc0a912b08bf837df318152f910452e3efa5e6c19cf76c49017c64d6dad4cde719d4713bb41343c4484381d94706c2e993233aaa45a334390338cde9
 EBUILD graphviz-11.0.0.ebuild 6292 BLAKE2B cd5314ceddbf687cd310eb2e01a1db77e7c970cf27654f768e8c80079c7584ce728a3766e4ccef75eb7ca3e7d2ace353e8991751027a8aeb3c933c79032805e4 SHA512 1602d4934fd21228b046dbe6c14c5b2097d096f17409bf20e0af198e93f5d0c5a84c209af60f8cc8e89d7adde209922bfc58b243aeba7968963cce2d2be806a1
 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
+EBUILD graphviz-12.1.2.ebuild 6497 BLAKE2B 73aac1004d0acebea0a1555260980a227d810bd8f194f2c271dc09f79884c364324e1d79129ecee5ad3a90156f9a41ea32dd3002a429d60e717ca8b52baff898 SHA512 889fc6a842a87092678a8b3c16428754e2bc03a1c8ae995be1e70654295dadb00d2b71d23252146405e44d965c9f4941d294895fc350fdfd2e4857be4b4f0063
 MISC metadata.xml 2309 BLAKE2B 261f100c9c78cf3bb50ffd84260594d34fa5af75f0b3789ce5640e0d633494405e64b3e9f7524e35ef87d11164c501e21fcef2cc483f60ad6ad2e350f500e3b2 SHA512 1a29d11154b72af3deeb0202136926f0871797086ce1a5a4d1fc71822e86d0e76ff789c684fabad85fac1abd5f29913a555be0916f42b90f5ce62fa395e1cbba
diff --git a/media-gfx/graphviz/graphviz-9.0.0.ebuild b/media-gfx/graphviz/graphviz-12.1.2.ebuild
index 0046302362c8..d66128a9fbcf 100644
--- a/media-gfx/graphviz/graphviz-9.0.0.ebuild
+++ b/media-gfx/graphviz/graphviz-12.1.2.ebuild
@@ -3,8 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{10..12} )
-inherit libtool python-single-r1
+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/"
@@ -14,11 +15,12 @@ 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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+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} )"
 
@@ -45,7 +47,7 @@ RDEPEND="
 		x11-libs/gtk+:2
 	)
 	gts? ( sci-libs/gts )
-	guile? ( dev-scheme/guile )
+	guile? ( ${GUILE_DEPS} )
 	lasi? ( media-libs/lasi )
 	pdf? ( app-text/poppler )
 	perl? ( dev-lang/perl:= )
@@ -74,7 +76,7 @@ BDEPEND="
 	)
 	guile? (
 		dev-lang/swig
-		dev-scheme/guile
+		${GUILE_DEPS}
 	)
 	nls? ( >=sys-devel/gettext-0.14.5 )
 	perl? ( dev-lang/swig )
@@ -138,11 +140,16 @@ BDEPEND="
 #   with flags enabled at configure time
 
 pkg_setup() {
+	use guile && guile-single_pkg_setup
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	default
+	if use guile; then
+		guile-single_src_prepare
+	else
+		default
+	fi
 	elibtoolize
 }
 
@@ -194,7 +201,10 @@ src_configure() {
 		--disable-ltdl-install
 		QMAKE=$(usev qt5 qmake5)
 	)
-	econf "${myconf[@]}"
+	# 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() {
@@ -202,6 +212,8 @@ src_install() {
 
 	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