gentoo resync : 02.02.2022

3 files changed, 13 insertions, 73 deletions

diff --git a/sci-mathematics/gfan/Manifest b/sci-mathematics/gfan/Manifest
index 8b925c06a708..a805a9a4f759 100644
--- a/sci-mathematics/gfan/Manifest
+++ b/sci-mathematics/gfan/Manifest
@@ -2,6 +2,5 @@ AUX gfan-0.6.2-Makefile.patch 6603 BLAKE2B 48f9b4280418aef41d502d770c070ec1dcef9
 AUX gfan-0.6.2-testsuite.patch 3223 BLAKE2B ddb94775a13bd503df5c9563750a6b4b68c9e72e1a19aaa0415c5484e07765dfd28ba02b3a0fab65a0b9cd5c61afafbc6a3d862a1de68ece57ef9d8bb2835c16 SHA512 d62e765a39ee1a8cb149fcae8afb538b19a91206dd0b8cf0ac2b681b28569e44f492b770b9e61d7573f2d52f265ad4cf25671197c204238a89075709753a83e6
 AUX gfan-0.6.2-xcode9.3_compat.patch 367 BLAKE2B fb7c685a4dd811fed83e2734a16507b1792e3a97c666d0e7de1d2ed53a7b9b43c5319517f9eef829f47147dc725f2c4ead38968fa3868baa1d16630a8b844636 SHA512 129d2c35777f82bf2a1581450ecb12dd6811fb72b583748b30665c0f9b20d39646233d9b40fb64a3c7790360514a51b30e49c53d83c34d259f664bf820ae1ce2
 DIST gfan0.6.2.tar.gz 1321059 BLAKE2B 1ed61e1e084a1ceb65dd21848440bc3a90486c0ce4012b3b64c8029e89636696d2b0e5446ea156d2cf050b5db179c7c2f25c97e683cecf6e9616e8553d8513bf SHA512 5961820750af2522fdc1a86c0254742c3b003607a8707df5d6cd5f0bc6461e4d3db3b1d3cb537979d57eb9dff387974a58aeb91d0b5246d7c701cadc5a2cf4cf
-EBUILD gfan-0.6.2-r2.ebuild 1631 BLAKE2B cd0084cc50cea5303a41ca4e10d8bdb0afe1c03e1c7f92a9b6bf6e42cf901d122c0769f8218ed5aa02671479750d2c853bcdb68e5ebf77775d34176b5970e894 SHA512 5ecc3f93d6fa3da09af5340091b4a93e5b4c840b6eaa7d61575931950a99b61abda51946bde1edbfe25a0a6899f9abcdfb71bd8eb493161ab804c38247e0847f
-EBUILD gfan-0.6.2-r3.ebuild 1666 BLAKE2B c8f52e3b6de28840061c6a23f846f88f166a8a33dac5adf6d6ea536d5fd6d6423d9f208b0f5cf4cc822485c85e59d1fa5dab5a35047d0a99c8a94d54fa5455f7 SHA512 68c23c9388dcecb4cb103702fe9d238d8235f7d2a26e9d435dfac63f7c9e0fa169a4e9520f4eb5db612bee0d1ce9fa4236acdf539b53b829e6e644ee4be41d70
+EBUILD gfan-0.6.2-r4.ebuild 1867 BLAKE2B 771c2d6b4e656b5461f19c56afed397995da74dc984542adc590bbfa6b79012b37d6572abeac711cc7b43defba925198ab9c98a2e3d5b7565007a1bacc631ea0 SHA512 4811847a4e24efa6f6844ac32c6c473c8076e4871880fe1c26f9112303a435cf68dee16900dc2278dde2f691404a197c59e39476a3114e043bb4f91f52103138
 MISC metadata.xml 1344 BLAKE2B 1a1d24099e2338877b068dee2b9e17feb4063de3a681a3b8d6a707c863708d6f380bb4864eb2fd5fef8ed49d6b1a770a8d1b4c12ce722b4f7fe113876de0b792 SHA512 8d5c93337a82b132c66c8d7e64c97deedcfdc724e9874bf308e6d817f71e663bc2b281ea133ae15e30096f5c801f88116b11e4d36dd8dd8eec526b5bc16d5f54
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
deleted file mode 100644
index 24132c367b9e..000000000000
--- a/sci-mathematics/gfan/gfan-0.6.2-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="Compute Groebner fans and tropical varieties"
-HOMEPAGE="https://users-math.au.dk/~jensen/software/gfan/gfan.html"
-SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-BDEPEND="doc? ( virtual/latex-base )"
-DEPEND="dev-libs/gmp:0=[cxx(+)]
-	sci-libs/cddlib:0="
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}${PV}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.6.2-xcode9.3_compat.patch"
-	"${FILESDIR}/${PN}-0.6.2-testsuite.patch"
-	"${FILESDIR}/${PN}-0.6.2-Makefile.patch"
-	)
-
-pkg_setup() {
-	tc-export CC CXX
-
-	# This should really go in cppflags, but that doesn't work with
-	# gfan's hand-written Makefile.
-	append-cxxflags -DNOCDDPREFIX
-}
-
-src_prepare() {
-	default
-
-	# This test hangs on x86, bug 717112.
-	rm -r testsuite/0602ResultantFanProjection || \
-		die "unable to disable test 0602ResultantFanProjection"
-}
-
-src_configure() {
-	# The upstream Makefile says that GCC produces bad code with -O3.
-	replace-flags "-O3" "-O2"
-	default
-}
-
-src_compile() {
-	default
-	if use doc; then
-		pushd doc > /dev/null || die
-		# The LaTeX build commands need to be repeated until the
-		# document "stops changing," which is not as easy as it
-		# sounds to detect. Running it twice seems to work here.
-		pdflatex manual.tex && bibtex manual && pdflatex manual.tex || die
-		popd > /dev/null || die
-	fi
-}
-
-src_install() {
-	emake PREFIX="${ED}/usr" install
-	use doc && dodoc doc/manual.pdf
-}
diff --git a/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
index 00132defd82f..1ec0a87690e9 100644
--- a/sci-mathematics/gfan/gfan-0.6.2-r3.ebuild
+++ b/sci-mathematics/gfan/gfan-0.6.2-r4.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit flag-o-matic toolchain-funcs
 
@@ -11,7 +11,7 @@ SRC_URI="https://users-math.au.dk/~jensen/software/${PN}/${PN}${PV}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
 IUSE="doc"
 
 BDEPEND="doc? ( virtual/latex-base )"
@@ -41,6 +41,10 @@ src_prepare() {
 	# This test hangs on x86, bug 717112.
 	rm -r testsuite/0602ResultantFanProjection || \
 		die "unable to disable test 0602ResultantFanProjection"
+
+	# And this one fails (harmlessly) on x86, bug 818397.
+	rm -r testsuite/0009RenderStairCase || \
+		die "unable to disable test 0009RenderStairCase"
 }
 
 src_configure() {
@@ -56,7 +60,11 @@ src_compile() {
 		# The LaTeX build commands need to be repeated until the
 		# document "stops changing," which is not as easy as it
 		# sounds to detect. Running it twice seems to work here.
-		pdflatex manual.tex && bibtex manual && pdflatex manual.tex || die
+		for iteration in 1 2; do
+			latex manual.tex && \
+				bibtex manual && \
+				dvipdf manual.dvi manual.pdf || die
+		done
 		popd > /dev/null || die
 	fi
 }