gentoo (valentine's day) resync : 14.02.2021

2 files changed, 38 insertions, 32 deletions

diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 146379e26933..28420b80883e 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -2,5 +2,5 @@ AUX ginac-1.5.1-pkgconfig.patch 340 BLAKE2B 4e45d5af711f0a6bb833bd805340527be897
 DIST ginac-1.6.6.tar.bz2 1028211 BLAKE2B 3f939e82cfa833ee5ba6714d4db38edf80de4e380b0bcacfe23992ca3c5eefbd719506cf77f57aebc1517968eff7d26c8d24d14167c596e5e7145458367074e8 SHA512 495ef255dd32e71ee91257a515c0566e56525e0c54c8955c19beaf9e2e55457f7d8171c7e5f6e4f29f555f5d262bbaf4edf4f033166c4904c016987a5029e958
 DIST ginac-1.7.11.tar.bz2 1077491 BLAKE2B 741e9c8adfec15c225c3656b935707f86292b98310b50533269b238d1a9746bf54d186074c879fdbdd23f915dde225d9ee34fdbd87977835e8f9e78af364d77d SHA512 35a029915c946fcc10ba7b78df6fe1ece9a9f2f6bc172816a923c35f5b495154ab356526b904ac2a16a1bd6b0a81c480c5abb39ef40238ca7b32d1acbf97276c
 EBUILD ginac-1.6.6.ebuild 1400 BLAKE2B 7813592727485b9e4ffe56a4f5cbde1250823b239e621fdbbcd9485b25ab0062efc4cd09cdf2556c19fbaee1b34c8ab2b27d001f3b16c19fce5f748ad093b9ec SHA512 363562d721e28744c64b535404e8bab606c040df3d36af53b5e04156401db9c88210ed623317cd52a482b276585dc3741b3233cc0cf942abd2f1d55a790db8a3
-EBUILD ginac-1.7.11.ebuild 1628 BLAKE2B 3810a7bdde0344d086b8c00155a790e4e078aa163d4fb6645705102b97f0359d9ea39255094efec33dcaebf14e78d86c04057e73ed2272879a16773a0b41c41f SHA512 3f8db3ec36c581e6ec15f628fecc19c08816c6a90d0f0d7a279220aa1aa303115f40b5729f4febcf7a8409b42e591b6b82ee254c997c2da8df79268e1b1d139c
+EBUILD ginac-1.7.11.ebuild 1474 BLAKE2B 80960c7c7d3b8aa3196c3bb606abca7d174e02ab3e7048ce267ac74b37ad4dde177581274c081e81237f9fc366eb3c64a29239a3f13ca352dad5db1e87ade20a SHA512 2ace30976f57eb93dca8b6a4dbf851b9ac5bcdfdc09ad6dc0838358a55784e04168266e5281eab8d4096c699bc8c02b44f600a1c80d7d11be3d590c8b7d19f0c
 MISC metadata.xml 685 BLAKE2B 78804186606452771e8b37a00dd41458fd7ffabd1813303528cda8596cebdd54c5daea16f324b7d23dfcf679255e73f1cff84116b0bf8a81cd79bb559dcd77ae SHA512 d0075823063455623b875bf678448b146243347879eb9ca5a4fb9324183d8dcda9c060145d5b874fead55491625ef08289b349b8abf1bf105e09ac9ebc647c37
diff --git a/sci-mathematics/ginac/ginac-1.7.11.ebuild b/sci-mathematics/ginac/ginac-1.7.11.ebuild
index bd90fbd5c1b4..6bd2388f1c08 100644
--- a/sci-mathematics/ginac/ginac-1.7.11.ebuild
+++ b/sci-mathematics/ginac/ginac-1.7.11.ebuild
@@ -1,9 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit multilib flag-o-matic
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit python-any-r1
 
 DESCRIPTION="C++ library and tools for symbolic calculations"
 SRC_URI="http://www.ginac.de/${P}.tar.bz2"
@@ -11,59 +13,63 @@ HOMEPAGE="https://www.ginac.de/"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
+KEYWORDS="amd64 ~ppc x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples"
 
 RDEPEND=">=sci-libs/cln-1.2.2"
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
 	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		   media-gfx/transfig
-		   virtual/texi2dvi
-		   dev-texlive/texlive-fontsrecommended
-		 )"
+	doc? (
+		app-doc/doxygen
+		dev-texlive/texlive-fontsrecommended
+		media-gfx/transfig
+		virtual/texi2dvi
+	)"
 
 PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch )
 
 src_configure() {
-	append-cxxflags -std=c++14
-	econf --disable-rpath $(use_enable static-libs static)
+	econf \
+		--disable-rpath \
+		--disable-static
 }
 
 src_compile() {
 	emake
+
 	if use doc; then
-		export VARTEXFONTS="${T}"/fonts
-		pushd doc/reference >> /dev/null || die "pushd doc/reference failed"
-		emake html pdf
-		popd >> /dev/null
-		pushd doc/tutorial >> /dev/null || die "pushd doc/tutorial failed"
-		emake ginac.pdf ginac.html
-		popd >> /dev/null
+		local -x VARTEXFONTS="${T}"/fonts
+		emake -C doc/reference html pdf
+		emake -C doc/tutorial ginac.pdf ginac.html
 	fi
 }
 
-src_test() {
-	pushd ../${P}_build > /dev/null
-	emake check
-	popd > /dev/null
-}
-
 src_install() {
 	default
-	if ! use static-libs; then
-		rm "${D}"/usr/$(get_libdir)/lib${PN}.la || die "cannot rm lib${PN}.la"
-	fi
+
 	if use doc; then
-		pushd doc > /dev/null || die "pushd doc failed"
+		pushd doc >/dev/null || die
 		newdoc tutorial/ginac.pdf tutorial.pdf
 		newdoc reference/reference.pdf reference.pdf
+
 		docinto html/reference
 		dodoc -r reference/html_files/.
+
 		docinto html
 		newdoc tutorial/ginac.html tutorial.html
+		popd >/dev/null || die
+	fi
+
+	if use examples; then
+		pushd doc >/dev/null || die
 		docinto examples
-		dodoc "${S}"/doc/examples/*.cpp examples/ginac-examples.*
-		popd > /dev/null
+		dodoc examples/*.cpp examples/ginac-examples.*
+		docompress -x /usr/share/doc/${PF}/examples
+		popd >/dev/null || die
 	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
 }