gentoo auto-resync : 07:07:2023 - 16:17:07

3 files changed, 88 insertions, 10 deletions

diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index 3bf35c19b332..41feb6c1dff0 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -2,9 +2,10 @@ AUX giac-1.6.0-pari-2.11.patch 783 BLAKE2B f173015006fef4a9f8176965f923664f11b0b
 AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88ecbc71dc450ef714f6da323128d9c945ada9d658c73647987f84638498aa4d3bbef49062424ab63b53c76defc127902 SHA512 14bfcb04e5a23933cfa4635789bf02f6d6e6a528c167504678b3d2ecb38f135d0c05583712005fe53afd7696cc9ebee5dc3ab90cac056d75bd43be786075b011
 AUX giac-1.9.0.21-pari-2.15.patch 298 BLAKE2B 99329cfd473ec3b580caf8f9700501e8b5dca9143cd04d883729880109d4e1962d19dce19aaf51e5d26ab09dc399a45a3a052847837f53a60c1b21087ebeabb8 SHA512 f9335dd47ee43ca10b784c8302422efcd5a835b1fe13fa134f5d36e453327e96624e77e086710f9d556352b1d62e6e693b3308fe8af329492e11d68cc9451b5b
 AUX giac-1.9.0.55-pari-2.15-test.patch 356 BLAKE2B 93863190cb64dbf0073f56e9657478b5e6d166da5ae36b81e55a45bbb75359cf63b23089b8191ae1e60958bf14652d5ac935b1aaf900b2bfb7d30b7ef3dc9504 SHA512 09155a08d8078d9bff610be15a2df0329ab9db53ca3873f01e61b02095361ab201ec93600cebc2ef42ccac67be40095a71bdaecaf54561e824fa267085245c7f
+AUX giac-1.9.0.55-system-gl2ps.patch 2242 BLAKE2B 6248f5ad950f43f8c1e274b93040d3fbd2dd3d20f23580d1ea7f08f9f932376bb1cdf129da424773832349a5f7e049f9da0dee0ce707601f10055b6bed5e47e6 SHA512 ac3db9ba34a7cc57f544061337f465644feeda5aece3449066c9cfe87583ed4ca8c964cb458254a50fa29fcf40a05236d37c712820d9bd367b0f52bf8507ef09
 AUX giac-1.9.0.55-undefined-behavior.patch 2081 BLAKE2B 68a3b7f2a56b6d425442f47fe6f069c1cce1bda38d85421519c68fdc9fd256ff7228886c74697151a80ec79016b436c82bc033be098b62e848e49ec499273d2d SHA512 ae531a42c9670d1ecb2cc6546ed256532705a99e13154fef6024f0ab69d5ff07b2872746b164b1cf234dce1ffe9c448a174a60dfb34eb914535ae92816007a2a
 DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
 DIST giac_1.9.0-55.tar.gz 113729553 BLAKE2B 8e95693623cfc8558e9a3b2dcc5e11cdbc4f2e25f0c2e88322dee986c5e010a63ced682bdbcb8b6dda61c8309477e8a106360a56f3a88d76043359bdb64f5d61 SHA512 c8043893fbe8951662c6c2fdd53adf6d2602ae7d3810254cd76d8478992005d9320de5e6be9453a03d5ed976900ec7721790ee61dace58e7121e0cfc330ecad9
 EBUILD giac-1.9.0.29-r1.ebuild 4542 BLAKE2B dce03818ac9af080b4416b6546563e4be99617b220c4661a540f77e0127760582cfe0a3df8c6a2f94da676b8a0e9fa967be59748184b86eb8934481c607d7500 SHA512 6915110b6964d2e79d7da01cee85ee3b51b944f9879e5659447f0cba5d74bda8c4113ee9290203510fdb57ad1ba60eae52639b134ed74eec01b04a97d75cf066
-EBUILD giac-1.9.0.55.ebuild 4883 BLAKE2B 13cb41649246526921d4b30291373361fa715849dba380b1bb62d6c644063c79322a45993c94239d4188bec22745f01157041e52c13dc432422c112214d7a63d SHA512 eb0d59090282d292b5b74400b45ccdae25ef06b303d55e81b3ffdf75510c39d30a43ec0e7fd88d6a175a4e7d561b8e426d43841bd42fb43b7644b10988bb9931
+EBUILD giac-1.9.0.55-r1.ebuild 5007 BLAKE2B 8a4cdcb42ecae741970e262c012f2f9b7ac058508c3c824b5fe7ca745dce16bc59441262ce9f79b3e581f40989eb875bacfd268ee2e819185dfacc3e0dbcd9fc SHA512 6ff8cc8639796f8f71e80dac5a172bc8a60eceeb7c4986f787185440e8d921a9b18adbf2ece1c17b85c22c762a1b3d50bc70c9e984839e6ed34b458d895475da
 MISC metadata.xml 1315 BLAKE2B a461d359b33617422f5863466bdbec9ddf56db03467b992c887bce9967d434913489602fd684edc893303078f89cf94d01b44cfdc0ccff33db9b42c5e686cfa8 SHA512 eaeb480010c9dbdfd75516e45e97e3226d2b2812c44e217b318c5a1d86dc40820bac0de69686d7b502775b14a6f1ed3bc11d2372b891c46a37080b4e84da9a1c
diff --git a/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch b/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch
new file mode 100644
index 000000000000..e82d892560da
--- /dev/null
+++ b/sci-mathematics/giac/files/giac-1.9.0.55-system-gl2ps.patch
@@ -0,0 +1,69 @@
+From ca8eda770e36d2649bfc808464415308a5e9fc47 Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky <michael@orlitzky.com>
+Date: Thu, 6 Jul 2023 21:27:09 -0400
+Subject: [PATCH 1/1] src: unbundle gl2ps.
+
+Updated patch based on the one by infinity0@debian.org. Ours links
+only libxcas (and not libgiac) to gl2ps.
+---
+ configure.ac    | 4 ++++
+ src/Graph3d.cc  | 2 +-
+ src/Makefile.am | 6 +++---
+ 3 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 8e1813e..2f7f644 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -465,6 +465,10 @@ dnl		AC_CHECK_LIB(GLU, main)
+ 	      AC_CHECK_LIB(fltk_images, main)
+ 	      FLTK_LIBS="$LIBS $X_LIBS"
+ 	      AC_SUBST(FLTK_LIBS)
++
++	      # GL2PS is only used by xcas (the GUI)
++	      GL2PS_LIBS="-lgl2ps"
++	      AC_SUBST(GL2PS_LIBS)
+               cd src && ln -sf ../fltk-1.3.8 && cd ..
+            fi
+         fi
+diff --git a/src/Graph3d.cc b/src/Graph3d.cc
+index 7f54327..12d4723 100644
+--- a/src/Graph3d.cc
++++ b/src/Graph3d.cc
+@@ -45,7 +45,7 @@
+ #include "Xcas1.h"
+ #include "Cfg.h"
+ #include "Print.h"
+-#include "gl2ps.h"
++#include <gl2ps.h>
+ 
+ #ifdef __APPLE__
+ //#include <OpenGL/gl.h>
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 3fdd209..120ccb6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -35,17 +35,17 @@ libbf.h list.h cutils.h qjsgiac.h \
+ quickjs.h js.h quickjs-atom.h quickjs-libc.h quickjs-opcode.h bf2gmp.h
+ 
+ noinst_LTLIBRARIES = libxcas.la
+-libxcas_la_LIBADD = libgiac.la $(FLTK_LIBS)
++libxcas_la_LIBADD = libgiac.la $(FLTK_LIBS) $(GL2PS_LIBS)
+ 
+ libxcas_la_SOURCES = History.cc Input.cc Xcas1.cc Equation.cc Print.cc \
+ 	Tableur.cc Editeur.cc Graph.cc Graph3d.cc Help1.cc Cfg.cc \
+ 	Flv_CStyle.cc \
+ 	Flve_Check_Button.cc Flve_Input.cc Flv_Style.cc Flv_Data_Source.cc \
+-	Flve_Combo.cc Flv_List.cc Flv_Table.cc gl2ps.c \
++	Flve_Combo.cc Flv_List.cc Flv_Table.cc \
+ 	History.h Input.h Xcas1.h Equation.h Print.h Tableur.h \
+ 	Editeur.h Graph.h Graph3d.h Help1.h Cfg.h Python.cc Python.h \
+ 	Flv_CStyle.H  Flve_Check_Button.H  Flve_Input.H  Flv_Style.H \
+-	Flv_Data_Source.H  Flve_Combo.H Flv_List.H Flv_Table.H gl2ps.h
++	Flv_Data_Source.H  Flve_Combo.H Flv_List.H Flv_Table.H
+ 
+ ##libjavagiac_la_LIBADD = libgiac.la 
+ 
+-- 
+2.39.3
+
diff --git a/sci-mathematics/giac/giac-1.9.0.55.ebuild b/sci-mathematics/giac/giac-1.9.0.55-r1.ebuild
index 287394488a2d..ecc901270b63 100644
--- a/sci-mathematics/giac/giac-1.9.0.55.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.55-r1.ebuild
@@ -22,23 +22,26 @@ done
 
 # nauty and cliquer are automagical dependencies
 RDEPEND="dev-libs/gmp:=[cxx(+)]
-	sys-libs/readline:=
-	gui? ( x11-libs/fltk[opengl]
-		media-libs/libpng:= )
-	ao? ( media-libs/libao )
 	dev-libs/mpfr:=
+	dev-libs/ntl:=
+	net-misc/curl
 	sci-libs/mpfi
 	sci-libs/gsl:=
+	sci-mathematics/cliquer
+	sci-mathematics/nauty
 	sci-mathematics/pari:=[threads]
-	dev-libs/ntl:=
+	sys-libs/readline:=
 	virtual/lapack
 	virtual/blas
-	net-misc/curl
-	sci-mathematics/cliquer
-	sci-mathematics/nauty
+	ao? ( media-libs/libao )
 	ecm? ( sci-mathematics/gmp-ecm )
+	gc? ( dev-libs/boehm-gc )
 	glpk? ( sci-mathematics/glpk )
-	gc? ( dev-libs/boehm-gc )"
+	gui? (
+		media-libs/libpng:=
+		x11-libs/fltk[opengl]
+		x11-libs/gl2ps
+	)"
 
 DEPEND="${RDEPEND}"
 
@@ -52,6 +55,7 @@ PATCHES=(
 	"${FILESDIR}/${PN}-1.9.0.21-pari-2.15.patch"
 	"${FILESDIR}/${PN}-1.9.0.55-pari-2.15-test.patch"
 	"${FILESDIR}/${PN}-1.9.0.55-undefined-behavior.patch"
+	"${FILESDIR}/${PN}-1.9.0.55-system-gl2ps.patch"
 )
 
 REQUIRED_USE="test? ( gui )"
@@ -68,6 +72,10 @@ src_prepare() {
 	# if you pass --enable-fltk but the system version isn't detected.
 	# We make sure that cannot happen under any circumstances.
 	rm fltk-1.3.8-source.tar.bz2 || die
+
+	# similar deal with gl2ps
+	rm src/gl2ps.[ch] || die
+
 	default
 	eautoreconf
 }