gentoo resync : 25.08.2020

3 files changed, 16 insertions, 81 deletions

diff --git a/sci-mathematics/ginac/Manifest b/sci-mathematics/ginac/Manifest
index 7c56d50d32c0..9859e6665865 100644
--- a/sci-mathematics/ginac/Manifest
+++ b/sci-mathematics/ginac/Manifest
@@ -1,10 +1,8 @@
 AUX ginac-1.5.1-pkgconfig.patch 340 BLAKE2B 4e45d5af711f0a6bb833bd805340527be8972b8587f47ffe34b9e473b2783f6cb98af2b2397b199bfca1c7522250c68249112ac67a750ec59f31e26628978bd0 SHA512 b88c7ef69686733a3e817d9d4961246eb64aebf753b51bf8f6ea5c6fdfef41e52b6a20656e074f0bcc42dfe7965a440642d9036628a139f2c87bbde5f59d76d1
 DIST ginac-1.6.6.tar.bz2 1028211 BLAKE2B 3f939e82cfa833ee5ba6714d4db38edf80de4e380b0bcacfe23992ca3c5eefbd719506cf77f57aebc1517968eff7d26c8d24d14167c596e5e7145458367074e8 SHA512 495ef255dd32e71ee91257a515c0566e56525e0c54c8955c19beaf9e2e55457f7d8171c7e5f6e4f29f555f5d262bbaf4edf4f033166c4904c016987a5029e958
-DIST ginac-1.7.2.tar.bz2 1056339 BLAKE2B 116be56df781d6e9675f914b9f75af86736183dbd26a1ff5e7f6f3cc79e4efc31449bc4fd5454b0f73cf189749a00f071d2b7cc519005e1f3b772b6b1521d508 SHA512 5c356beb8e0830b9f5805870f67298d4c19e512db8b8f46a37b490c19179a5c99e4497439e5adb575dd97e7deb5fe0b931a4b6db80e98a8e1e6f46977e33d8cf
-DIST ginac-1.7.4.tar.bz2 1062724 BLAKE2B 742ec49629fecb14a2294ca9e8dc1df52cdad2d2e11cebbffa3c23a64592c597f872dd8294bc9324ea1f88e540f75015d09ea526ef9d67689943bb6c94325911 SHA512 740c221a0115bd233723f3032a77b1389122694b2893c52d4c7ed778c7332981c152f6ea81b35352882c14b42542f64963d5199af3f492af97f79a6e6c52156c
+DIST ginac-1.7.11.tar.bz2 1077491 BLAKE2B 741e9c8adfec15c225c3656b935707f86292b98310b50533269b238d1a9746bf54d186074c879fdbdd23f915dde225d9ee34fdbd87977835e8f9e78af364d77d SHA512 35a029915c946fcc10ba7b78df6fe1ece9a9f2f6bc172816a923c35f5b495154ab356526b904ac2a16a1bd6b0a81c480c5abb39ef40238ca7b32d1acbf97276c
 DIST ginac-1.7.8.tar.bz2 1075317 BLAKE2B 6ae917b442c090fa6c6b28f543eecfc2a8119a63d15494933f0cb1c979f018d6439551e52e92b6d50c8cf83ce2df66aca4bb6be947e5b18cbfab2539c42e0ad2 SHA512 4d5a0e52108aee2438362d66d6b5f3e3a108855fc2c0ab2bc521ddc9a2a87c9b1404ae5304ba7d1dbcf6e985bfe26c730e14f3f46d63d0bdffe242f4a948c6a0
 EBUILD ginac-1.6.6.ebuild 1400 BLAKE2B 7813592727485b9e4ffe56a4f5cbde1250823b239e621fdbbcd9485b25ab0062efc4cd09cdf2556c19fbaee1b34c8ab2b27d001f3b16c19fce5f748ad093b9ec SHA512 363562d721e28744c64b535404e8bab606c040df3d36af53b5e04156401db9c88210ed623317cd52a482b276585dc3741b3233cc0cf942abd2f1d55a790db8a3
-EBUILD ginac-1.7.2.ebuild 1525 BLAKE2B e3e152b6b92d353f6f9c596414affd9cd4ab89a30f5f9c858618b81389704ac9ed4820fe6ea523c8fa8b6cddd52fc1737b374964c3141afaba6e36ec06660c38 SHA512 4c3397f8d96b8cff7ec46318c5fbb7a60bffbecec09db1f678d6eb43efde931e2fb41e40c293e2e9a19326a482d50f8291938cdf059a2f6fc4c6c3fe8090e37a
-EBUILD ginac-1.7.4.ebuild 1578 BLAKE2B 3f44a3342aa5c36d6d6c3e00d27790a5b436b727c25baa75a9ec90544cafa077c95f86d456b4173dcbce75e6a1694398ff8a24c1f6065be16b98de3104c40d48 SHA512 34b4167b823e40bcd128bbfd97cdf6fe3bf18633fd63dea014ad807063498e7d4e5666d31c247fa4b7fe63217fa95fcbfa73186a163bcf2e19551e029413cfc4
+EBUILD ginac-1.7.11.ebuild 1628 BLAKE2B 3810a7bdde0344d086b8c00155a790e4e078aa163d4fb6645705102b97f0359d9ea39255094efec33dcaebf14e78d86c04057e73ed2272879a16773a0b41c41f SHA512 3f8db3ec36c581e6ec15f628fecc19c08816c6a90d0f0d7a279220aa1aa303115f40b5729f4febcf7a8409b42e591b6b82ee254c997c2da8df79268e1b1d139c
 EBUILD ginac-1.7.8.ebuild 1481 BLAKE2B b11bfa56f9fbff4187f0ff576ea5e82b1159ebfc0bef8c5b97f4ef5d7d370bf4fb2db87c6ddbb98c34fe238d063ea164c1bc15048a140d9abb44a0e85b18e5ec SHA512 81a14a67cbc97a05a93493f8502b56f528556b429f89f3f162dcfd73e7ee2ad84b88f88ed8b6124115dd3827c5e865317f2f6ec63dd9d95cf27bd1ba9045d20f
 MISC metadata.xml 685 BLAKE2B 78804186606452771e8b37a00dd41458fd7ffabd1813303528cda8596cebdd54c5daea16f324b7d23dfcf679255e73f1cff84116b0bf8a81cd79bb559dcd77ae SHA512 d0075823063455623b875bf678448b146243347879eb9ca5a4fb9324183d8dcda9c060145d5b874fead55491625ef08289b349b8abf1bf105e09ac9ebc647c37
diff --git a/sci-mathematics/ginac/ginac-1.7.4.ebuild b/sci-mathematics/ginac/ginac-1.7.11.ebuild
index d1ccecc918ff..bd90fbd5c1b4 100644
--- a/sci-mathematics/ginac/ginac-1.7.4.ebuild
+++ b/sci-mathematics/ginac/ginac-1.7.11.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic
+inherit multilib flag-o-matic
 
 DESCRIPTION="C++ library and tools for symbolic calculations"
 SRC_URI="http://www.ginac.de/${P}.tar.bz2"
@@ -27,7 +27,7 @@ PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch )
 
 src_configure() {
 	append-cxxflags -std=c++14
-	econf --disable-rpath
+	econf --disable-rpath $(use_enable static-libs static)
 }
 
 src_compile() {
@@ -51,17 +51,19 @@ src_test() {
 
 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"
-		insinto /usr/share/doc/${PF}
-		newins tutorial/ginac.pdf tutorial.pdf
-		newins reference/reference.pdf reference.pdf
-		insinto /usr/share/doc/${PF}/html/reference
-		doins -r reference/html_files/*
-		insinto /usr/share/doc/${PF}/html
-		newins tutorial/ginac.html tutorial.html
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/doc/examples/*.cpp examples/ginac-examples.*
+		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
+		docinto examples
+		dodoc "${S}"/doc/examples/*.cpp examples/ginac-examples.*
 		popd > /dev/null
 	fi
 }
diff --git a/sci-mathematics/ginac/ginac-1.7.2.ebuild b/sci-mathematics/ginac/ginac-1.7.2.ebuild
deleted file mode 100644
index 8caa65f652bf..000000000000
--- a/sci-mathematics/ginac/ginac-1.7.2.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils flag-o-matic
-
-DESCRIPTION="C++ library and tools for symbolic calculations"
-SRC_URI="http://www.ginac.de/${P}.tar.bz2"
-HOMEPAGE="https://www.ginac.de/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc static-libs"
-
-RDEPEND=">=sci-libs/cln-1.2.2"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen
-		   media-gfx/transfig
-		   virtual/texi2dvi
-		   dev-texlive/texlive-fontsrecommended
-		 )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.5.1-pkgconfig.patch )
-
-src_configure() {
-	local myeconfargs=( --disable-rpath )
-	append-cxxflags -std=c++11
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile
-	if use doc; then
-		export VARTEXFONTS="${T}"/fonts
-		cd "${BUILD_DIR}/doc/reference"
-		emake html pdf
-		cd "${BUILD_DIR}/doc/tutorial"
-		emake ginac.pdf ginac.html
-	fi
-}
-
-src_test() {
-	pushd ../${P}_build > /dev/null
-	emake check
-	popd > /dev/null
-}
-
-src_install() {
-	autotools-utils_src_install
-	if use doc; then
-		cd "${BUILD_DIR}"/doc
-		insinto /usr/share/doc/${PF}
-		newins tutorial/ginac.pdf tutorial.pdf
-		newins reference/reference.pdf reference.pdf
-		insinto /usr/share/doc/${PF}/html/reference
-		doins -r reference/html_files/*
-		insinto /usr/share/doc/${PF}/html
-		newins tutorial/ginac.html tutorial.html
-		insinto /usr/share/doc/${PF}/examples
-		doins "${S}"/doc/examples/*.cpp examples/ginac-examples.*
-	fi
-}