gentoo resync : 28.04.2021

3 files changed, 46 insertions, 11 deletions

diff --git a/dev-games/wfmath/Manifest b/dev-games/wfmath/Manifest
index 21f897a4b769..361770a754c5 100644
--- a/dev-games/wfmath/Manifest
+++ b/dev-games/wfmath/Manifest
@@ -1,3 +1,4 @@
+AUX wfmath-1.0.2-fix-bashisms.patch 592 BLAKE2B b1bb41c95967fcfa1beb76669c85a97851fa9443cdf9660dee100f263e4514649c9a49668b4351c49c41f17a40ccaf6b80b457f9958829a7576631d5d2f3751c SHA512 0c60728d86ecd4445b02e3713ab49947aadfb2e5e69ed41d2d437cc454ffe1c80d36efb1e6cbf648c4f9ba1e8bd81fdc9d34cd1d32b2cfa533013d2c4d188340
 DIST wfmath-1.0.2.tar.bz2 399987 BLAKE2B d299a6d90a37a90daa6a86e0ddad15201c1a5ee247159633ba68fcb6d0df1205bd60869e73d4849b923f3dd8142a167348bdac6764dda7a3b9857d9b9eae5701 SHA512 3506dbaed5db914b0be5483d5b589d95ed495b6375384e4b045844f8d76240f97b5c322ac432faf177f16da0fedd0b0e6006877a9b40e7f5d31d3324efa6de57
-EBUILD wfmath-1.0.2.ebuild 624 BLAKE2B 73cc798a6d978d5cac00c2e10c79d6c93ad33291d383441f94c126840cfa034d7404e55bce1adf498288ac1d35575eb5e8b6fdab6407993f5165b8b0bd5a7ce9 SHA512 bb2a0971719c58c792a64b85aa754c935367f8cded5e3ec61da32f5c64ff7f1b2d6ad16c2e6ea2f82415a15180e2ec6870931a2e8d816add14ca1da418b38e3d
+EBUILD wfmath-1.0.2.ebuild 766 BLAKE2B 9da263e4b7ede53eaa3b35d4cf5ea28c367ed1aa57ca215be40e351a7a1afa16c5be0f2e4b8d1106afc3024129f5b401122d09ea986dd38800baddad880fadaf SHA512 063004c2860d062f1d7c5494d0f9af2d56c7aca45ccaec75a275e6723e30bf818801bd6f5366ac05ce93a4dc76638815c950b698a9614b90c7e4d8ef20b44cc4
 MISC metadata.xml 834 BLAKE2B b2d412774009fe2c79f1491f1a32b58d8666e7a1bfcfb75f3a9322618094a05d86104976693d386389718d8a07be41125e867ea9915714bfc182dc507f03179b SHA512 c99727d8b00129b35865cf778eb9d6c438e53189982b54a87a2463e3664d98572f24d4fe3b7d814c2d19bfe52bafc4df4be155d68f2cc177523ede9ac104deac
diff --git a/dev-games/wfmath/files/wfmath-1.0.2-fix-bashisms.patch b/dev-games/wfmath/files/wfmath-1.0.2-fix-bashisms.patch
new file mode 100644
index 000000000000..d9a6edcfbd95
--- /dev/null
+++ b/dev-games/wfmath/files/wfmath-1.0.2-fix-bashisms.patch
@@ -0,0 +1,16 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -81,11 +81,11 @@ PKG_CHECK_MODULES(ATLAS_0_6, atlascpp-0.6 >= 0.6.0,
+ 	dnl those should already be using Atlas explicitly.
+ 	], found_atlas_0_6=no)
+ 
+-AM_CONDITIONAL(HAVE_ATLAS_0_6, test $found_atlas_0_6 == yes)
++AM_CONDITIONAL(HAVE_ATLAS_0_6, test $found_atlas_0_6 = xyes)
+ 
+ AC_CHECK_HEADERS(sstream strstream, [ found_string_stream=yes break ],
+ 				    [ found_string_stream=no ])
+-if test $found_string_stream == no ; then
++if test $found_string_stream = xno ; then
+     AC_MSG_ERROR(Couldn't find C++ string <-> stream conversion method.)
+ fi
+ 
diff --git a/dev-games/wfmath/wfmath-1.0.2.ebuild b/dev-games/wfmath/wfmath-1.0.2.ebuild
index 59d89b7ef79e..a784467255d9 100644
--- a/dev-games/wfmath/wfmath-1.0.2.ebuild
+++ b/dev-games/wfmath/wfmath-1.0.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
-inherit eutils ltprune
+EAPI=7
+
+inherit autotools
 
 DESCRIPTION="Worldforge math library"
 HOMEPAGE="http://www.worldforge.org/dev/eng/libraries/wfmath"
@@ -11,14 +12,26 @@ SRC_URI="mirror://sourceforge/worldforge/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="doc static-libs"
+IUSE="doc"
+
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-fix-bashisms.patch
+)
+
+src_prepare() {
+	default
 
-RDEPEND=""
-DEPEND="doc? ( app-doc/doxygen )
-	virtual/pkgconfig"
+	# For bashisms patch
+	eautoreconf
+}
 
 src_configure() {
-	econf $(use_enable static-libs static)
+	econf --disable-static
 }
 
 src_compile() {
@@ -28,6 +41,11 @@ src_compile() {
 
 src_install() {
 	default
-	use doc && dohtml doc/html/*
-	prune_libtool_files
+
+	if use doc ; then
+		docinto html
+		dodoc doc/html/*
+	fi
+
+	find "${ED}" -type f -name '*.la' -delete || die
 }