gentoo auto-resync : 11:11:2022 - 03:29:03

4 files changed, 10 insertions, 346 deletions

diff --git a/sci-mathematics/giac/Manifest b/sci-mathematics/giac/Manifest
index f3b87c6c47e3..a219144a463e 100644
--- a/sci-mathematics/giac/Manifest
+++ b/sci-mathematics/giac/Manifest
@@ -3,11 +3,7 @@ AUX giac-1.7.0.1-gsl_lapack.patch 2912 BLAKE2B b0f9f05126316b9b76d5f1a5ad737cc88
 AUX giac-1.7.0.13-xcas-desktop.patch 890 BLAKE2B 31e33a52fdcb70c610edf21f046d112df3702e1d4f635cd4956bbe17d928839c9a0a87cb5ba5d6aeff94213b482ce22bd497d1d258aaa8abd6d8fc0116031f15 SHA512 269c733edc899051fc3de23021c322a3099499dfeb559ab1cada0964258a91a9735e620b480560226e5a3b492f2f5654062ee9c2c5479ae9789b012e7a5055ca
 AUX giac-1.9.0.21-pari-2.15.patch 298 BLAKE2B 99329cfd473ec3b580caf8f9700501e8b5dca9143cd04d883729880109d4e1962d19dce19aaf51e5d26ab09dc399a45a3a052847837f53a60c1b21087ebeabb8 SHA512 f9335dd47ee43ca10b784c8302422efcd5a835b1fe13fa134f5d36e453327e96624e77e086710f9d556352b1d62e6e693b3308fe8af329492e11d68cc9451b5b
 DIST giac_1.7.0-13.tar.gz 86447065 BLAKE2B 4d91e83608f7ec376d133c2784ffce99447a9dd78b5c8582b81a0aae0b8ac59eec4db3ee4a8bcb39202c777c300178a181f2dc2ac74ab445ddba2f3efa0ecb1b SHA512 99fff7ce5117fd8c106601ead03679805d529fe12d5372cdd4ae54824aa6fdcbdaaa1a62ea1153391a1a65af8970e38fca7d95ca9983755ff06053f1d8b6d65a
-DIST giac_1.7.0-47.tar.gz 96787570 BLAKE2B b05b3f44f10695a5d085df0a0db9aba761ac011964caeb247bd6034ca2a41505e5eb30df0de494826270703d9b62fbb3b9d4869f4cdd32d1d88636f374fbae16 SHA512 60a8550f7da2a163365759266660421c936797a9d52c3ba3802b5e00610fc460b49ccef44df809331abb1cbb65432e283fb4484b1efffb577c4802ab44fecff7
-DIST giac_1.9.0-21.tar.gz 103871108 BLAKE2B 2db4a930b8acb2304456c85437b50504a25df3d0395115c8e71906b8608a38f034de0b9474115f87d4169a8eaa2039c200101696abb98f47123037aa1ef47630 SHA512 b14e41cf2f94d6e73417d5908ae77a503b3ab191bca7e7e5b07659516cbc4f6081a199175f3f5fdb12608c6100291081d234b94cecd0e30ac822c37b50e95821
-DIST giac_1.9.0-5.tar.gz 97863572 BLAKE2B 8766061ace737972b5f47cd7d9f92b0002fa6c94a754dd723fb06001560cc62c60631163bd038b2e7b50919088d8bc669e61582189084395ad2aacf39865cb52 SHA512 86a6edc31797bd3d6ec0ac9ed93c092bbe77cb056269be64c9a23304fcc8ce56c521d829d61ffeac98efd2995ef8371500360462815d61ba97d0cd7bd3b86976
+DIST giac_1.9.0-29.tar.gz 115441843 BLAKE2B 9114db489be0c51d67c87b0a0c187fecf9eca84d7cb3117e72793290c8e606e76c3d9bc8a2d573fc2de2f2d885fb34d18583302a5902d69045976114ac02b95e SHA512 57b58aa35c724eae7df36229cb3d45d1b724a8a88acb1d1dd0711be64dd7c891850e7242662e448ce955e76b856973f9065628b65ce0826c60e277cb944b21b7
 EBUILD giac-1.7.0.13-r1.ebuild 4257 BLAKE2B af1277a69e3a27cf215e870fe6dab127d4ac7edc0fd1e8905498e5b745bc92133d7f4f725fc096c4a83bd649fd5ba3731d16c86688f3bee1a9f8e4b7b1bd2aaf SHA512 351d891b219e15c24cae84e5ef1e1063a702c36d0fc6a6f9955f0eb3b1d16cb179e0fdbfd39bd6f820929fbe9d259a3ab91e71976cdb1a270cedbb66ec6fff83
-EBUILD giac-1.7.0.47.ebuild 4247 BLAKE2B b28c9cfc47b8eed41a1add40aa2d66858cb1f065aa020b0c5a3d667ef57509f732dabeb27d6dea2a699c36b8cad483e4f939f8569bda37a7ca7e6f94bcf949bb SHA512 24b2907aaa1a68b5ca0afe5965d68b8004fa991abaf9dbd0cd1b01b138ce5ac810da244374edc85a0b794e4856b7959dc2bcc53e2551092f298b5d6e8bc277ac
-EBUILD giac-1.9.0.21.ebuild 4533 BLAKE2B 7db2cf6c7e495d74f3022c0d89d5ec39775e436d37f655ceb0044d95b9fea680cad8a14bc8c0b733c565f88533bf46e7044defd5634f92b812a0a900e7c8bb44 SHA512 04cdf58fc5fdb821a102b21241824d8b37de5efdd3c1552a8144bfdb8ecdea7f80526726587a80422482e7ca0d6be637905d9a2d2b6a3794c50117029469e937
-EBUILD giac-1.9.0.5.ebuild 4247 BLAKE2B b28c9cfc47b8eed41a1add40aa2d66858cb1f065aa020b0c5a3d667ef57509f732dabeb27d6dea2a699c36b8cad483e4f939f8569bda37a7ca7e6f94bcf949bb SHA512 24b2907aaa1a68b5ca0afe5965d68b8004fa991abaf9dbd0cd1b01b138ce5ac810da244374edc85a0b794e4856b7959dc2bcc53e2551092f298b5d6e8bc277ac
+EBUILD giac-1.9.0.29.ebuild 4526 BLAKE2B 238ab269404bc5e01099188e20a2ffc8a1c578fd364d8853fb293418e41fc5331ea91b1e273bdb1127656231df32bae142c36181e491ebbf869d088baba73392 SHA512 f7f5fe59c4e75eaac28a18b79adc1d44fb2e3d180f3832e2d20012ed2845d53598e10f4d1015b025758476aec855bec0dc7c29f8cb1992be3f57c18529884554
 MISC metadata.xml 1315 BLAKE2B a461d359b33617422f5863466bdbec9ddf56db03467b992c887bce9967d434913489602fd684edc893303078f89cf94d01b44cfdc0ccff33db9b42c5e686cfa8 SHA512 eaeb480010c9dbdfd75516e45e97e3226d2b2812c44e217b318c5a1d86dc40820bac0de69686d7b502775b14a6f1ed3bc11d2372b891c46a37080b4e84da9a1c
diff --git a/sci-mathematics/giac/giac-1.7.0.47.ebuild b/sci-mathematics/giac/giac-1.7.0.47.ebuild
deleted file mode 100644
index bf7ed2bdb24c..000000000000
--- a/sci-mathematics/giac/giac-1.7.0.47.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic xdg-utils
-
-FETCH_P="${PN}_"$(ver_rs  3 '-')
-MY_PV=$(ver_cut 1-3)
-DESCRIPTION="A free C++ Computer Algebra System library and its interfaces"
-HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
-SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS="el en es pt"
-IUSE="ao doc +ecm examples gc +glpk gui static-libs test"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-# nauty and cliquer are automagical dependencies
-RDEPEND="dev-libs/gmp:=[cxx(+)]
-	sys-libs/readline:=
-	gui? ( x11-libs/fltk
-		media-libs/libpng:= )
-	ao? ( media-libs/libao )
-	dev-libs/mpfr:=
-	sci-libs/mpfi
-	sci-libs/gsl:=
-	sci-mathematics/pari:=[threads]
-	dev-libs/ntl:=
-	virtual/lapack
-	virtual/blas
-	net-misc/curl
-	sci-mathematics/cliquer
-	sci-mathematics/nauty
-	ecm? ( sci-mathematics/gmp-ecm )
-	glpk? ( sci-mathematics/glpk )
-	gc? ( dev-libs/boehm-gc )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-tex/hevea
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
-	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
-)
-
-REQUIRED_USE="test? ( gui )"
-
-# The mirror restriction is due to the French documentation for which
-# "Other kind of redistributions require the consent of the copyright
-# holder."
-RESTRICT="!test? ( test ) mirror"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14 # bug 788283
-
-	if use gui; then
-		append-cppflags -I$(fltk-config --includedir)
-		append-lfs-flags
-
-		# Get the big-L flags from fltk's LDFLAGS.
-		append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
-	fi
-
-	# Using libsamplerate is currently broken
-	#
-	# The giac build system supports --docdir, but the path /usr/share/giac/doc
-	# is hard-coded throughout the source code, so passing anything else to
-	# ./configure --docdir just causes problems. Later, we'll put things right.
-	#
-	# micropython is for specific use in an upstream project, so is quickjs.
-	econf \
-		--enable-gmpxx \
-		--disable-samplerate \
-		--disable-micropy \
-		--disable-quickjs \
-		--docdir="${EPREFIX}"/usr/share/giac/doc \
-		$(use_enable static-libs static) \
-		$(use_enable gui)  \
-		$(use_enable gui png)  \
-		$(use_enable ao) \
-		$(use_enable ecm) \
-		$(use_enable glpk) \
-		$(use_enable gc)
-
-}
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples}
-	emake install DESTDIR="${D}"
-
-	# Move all of /usr/share/giac (which contains only documentation) to
-	# its /usr/share/doc/${PF} counterpart.
-	dodir /usr/share/doc
-	mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die
-
-	# and create a symlink from the original location to the new one
-	dosym "./doc/${PF}" /usr/share/giac
-
-	# This is duplicated in ${ED}/usr/share/doc/${PF}/examples
-	rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die
-
-	# These aren't supposed to be installed at all.
-	find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die
-
-	# The French docs are not freely licensed according to the README.
-	rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES
-	if ! use gui; then
-		rm -rf \
-			"${ED}"/usr/bin/x* \
-			"${ED}"/usr/share/application-registry \
-			"${ED}"/usr/share/applications \
-			"${ED}"/usr/share/icons \
-			|| die "failed to clean up fltk files"
-	fi
-
-	if ! use doc; then
-		rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory"
-	else
-		for lang in ${LANGS}; do
-			if use l10n_$lang; then
-				dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas"
-			else
-				rm -r "${ED}/usr/share/giac/doc/${lang}" \
-					|| die "failed to remove ${lang} documentation"
-			fi
-		done
-	fi
-
-	if ! use examples; then
-		rm -r "${ED}/usr/share/doc/${PF}/examples" \
-		   || die "failed to remove examples"
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
diff --git a/sci-mathematics/giac/giac-1.9.0.21.ebuild b/sci-mathematics/giac/giac-1.9.0.29.ebuild
index a079e6b8a510..2efba95ba2ec 100644
--- a/sci-mathematics/giac/giac-1.9.0.21.ebuild
+++ b/sci-mathematics/giac/giac-1.9.0.29.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 LANGS="el en es pt"
-IUSE="ao doc +ecm examples gc +glpk gui static-libs test"
+IUSE="ao doc +ecm examples gc +glpk gui test"
 for X in ${LANGS} ; do
 	IUSE="${IUSE} l10n_${X}"
 done
@@ -75,11 +75,6 @@ src_configure() {
 
 		# Get the big-L flags from fltk's LDFLAGS.
 		append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
-	else
-		# see https://trac.sagemath.org/ticket/31563#comment:91 onwards.
-		# Unless this variable is defined a non existent function will be requested.
-		# The spelling is correct - upstream is French.
-		append-cppflags -DUSE_OBJET_BIDON=1
 	fi
 
 	# Using libsamplerate is currently broken
@@ -89,14 +84,19 @@ src_configure() {
 	# ./configure --docdir just causes problems. Later, we'll put things right.
 	#
 	# micropython is for specific use in an upstream project, so is quickjs.
+	# Note that disabling fltk is not a real option. It just skip autodetection
+	# but doesn't disable compiling against fltk. png is needed as part of fltk
+	# support.
+	#
+	# As of 1.9.0.25, --{en,dis}able-gui is no op. The only way to disable gui is
+	# use the fltk enable flag.
 	econf \
 		--enable-gmpxx \
 		--disable-samplerate \
 		--disable-micropy \
 		--disable-quickjs \
 		--docdir="${EPREFIX}"/usr/share/giac/doc \
-		$(use_enable static-libs static) \
-		$(use_enable gui)  \
+		$(use_enable gui fltk)  \
 		$(use_enable gui png)  \
 		$(use_enable ao) \
 		$(use_enable ecm) \
diff --git a/sci-mathematics/giac/giac-1.9.0.5.ebuild b/sci-mathematics/giac/giac-1.9.0.5.ebuild
deleted file mode 100644
index bf7ed2bdb24c..000000000000
--- a/sci-mathematics/giac/giac-1.9.0.5.ebuild
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools flag-o-matic xdg-utils
-
-FETCH_P="${PN}_"$(ver_rs  3 '-')
-MY_PV=$(ver_cut 1-3)
-DESCRIPTION="A free C++ Computer Algebra System library and its interfaces"
-HOMEPAGE="https://www-fourier.ujf-grenoble.fr/~parisse/giac.html"
-SRC_URI="https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/${FETCH_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-LANGS="el en es pt"
-IUSE="ao doc +ecm examples gc +glpk gui static-libs test"
-for X in ${LANGS} ; do
-	IUSE="${IUSE} l10n_${X}"
-done
-
-# nauty and cliquer are automagical dependencies
-RDEPEND="dev-libs/gmp:=[cxx(+)]
-	sys-libs/readline:=
-	gui? ( x11-libs/fltk
-		media-libs/libpng:= )
-	ao? ( media-libs/libao )
-	dev-libs/mpfr:=
-	sci-libs/mpfi
-	sci-libs/gsl:=
-	sci-mathematics/pari:=[threads]
-	dev-libs/ntl:=
-	virtual/lapack
-	virtual/blas
-	net-misc/curl
-	sci-mathematics/cliquer
-	sci-mathematics/nauty
-	ecm? ( sci-mathematics/gmp-ecm )
-	glpk? ( sci-mathematics/glpk )
-	gc? ( dev-libs/boehm-gc )"
-
-DEPEND="${RDEPEND}"
-
-BDEPEND="dev-tex/hevea
-	virtual/pkgconfig
-	virtual/yacc"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.7.0.1-gsl_lapack.patch"
-	"${FILESDIR}/${PN}-1.6.0-pari-2.11.patch"
-)
-
-REQUIRED_USE="test? ( gui )"
-
-# The mirror restriction is due to the French documentation for which
-# "Other kind of redistributions require the consent of the copyright
-# holder."
-RESTRICT="!test? ( test ) mirror"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	append-cxxflags -std=c++14 # bug 788283
-
-	if use gui; then
-		append-cppflags -I$(fltk-config --includedir)
-		append-lfs-flags
-
-		# Get the big-L flags from fltk's LDFLAGS.
-		append-ldflags $(fltk-config --ldflags | sed -e 's/\(-L\S*\)\s.*/\1/')
-	fi
-
-	# Using libsamplerate is currently broken
-	#
-	# The giac build system supports --docdir, but the path /usr/share/giac/doc
-	# is hard-coded throughout the source code, so passing anything else to
-	# ./configure --docdir just causes problems. Later, we'll put things right.
-	#
-	# micropython is for specific use in an upstream project, so is quickjs.
-	econf \
-		--enable-gmpxx \
-		--disable-samplerate \
-		--disable-micropy \
-		--disable-quickjs \
-		--docdir="${EPREFIX}"/usr/share/giac/doc \
-		$(use_enable static-libs static) \
-		$(use_enable gui)  \
-		$(use_enable gui png)  \
-		$(use_enable ao) \
-		$(use_enable ecm) \
-		$(use_enable glpk) \
-		$(use_enable gc)
-
-}
-
-src_install() {
-	docompress -x "/usr/share/doc/${PF}/"{aide_cas,doc,examples}
-	emake install DESTDIR="${D}"
-
-	# Move all of /usr/share/giac (which contains only documentation) to
-	# its /usr/share/doc/${PF} counterpart.
-	dodir /usr/share/doc
-	mv "${ED}"/usr/share/giac "${ED}/usr/share/doc/${PF}" || die
-
-	# and create a symlink from the original location to the new one
-	dosym "./doc/${PF}" /usr/share/giac
-
-	# This is duplicated in ${ED}/usr/share/doc/${PF}/examples
-	rm -r "${ED}/usr/share/doc/${PF}/doc/Exemples" || die
-
-	# These aren't supposed to be installed at all.
-	find "${ED}/usr/share/doc/${PF}" -type f -name 'Makefile*' -delete || die
-
-	# The French docs are not freely licensed according to the README.
-	rm -r "${ED}/usr/share/doc/${PF}/doc/fr" || die
-
-	dodoc AUTHORS ChangeLog INSTALL NEWS README TROUBLES
-	if ! use gui; then
-		rm -rf \
-			"${ED}"/usr/bin/x* \
-			"${ED}"/usr/share/application-registry \
-			"${ED}"/usr/share/applications \
-			"${ED}"/usr/share/icons \
-			|| die "failed to clean up fltk files"
-	fi
-
-	if ! use doc; then
-		rm -r "${ED}/usr/share/doc/${PF}/doc" || die "failed to remove doc directory"
-	else
-		for lang in ${LANGS}; do
-			if use l10n_$lang; then
-				dosym ../aide_cas "/usr/share/doc/${PF}/doc/${lang}/aide_cas"
-			else
-				rm -r "${ED}/usr/share/giac/doc/${lang}" \
-					|| die "failed to remove ${lang} documentation"
-			fi
-		done
-	fi
-
-	if ! use examples; then
-		rm -r "${ED}/usr/share/doc/${PF}/examples" \
-		   || die "failed to remove examples"
-	fi
-
-	find "${ED}" -type f -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}
-
-pkg_postrm() {
-	if use gui; then
-		xdg_desktop_database_update
-		xdg_icon_cache_update
-	fi
-}