commit:     658157dd352c9e4640abcbe2b25a89e04fb9d325
Author:     Alexander Golubev <fatzer2 <AT> gmail <DOT> com>
AuthorDate: Sun Mar  1 15:51:48 2026 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar  7 01:12:50 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=658157dd

app-text/wv2: avoid generating libtool file

Also drop 0.4.2-r3 due to it already overshadowed.

Note that technically #948605 was already resolved by 57eb11233b9f, but
the bug wasn't closed.

Closes: https://bugs.gentoo.org/948605
Closes: https://bugs.gentoo.org/970307
Signed-off-by: Alexander Golubev <fatzer2 <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/45875
Closes: https://github.com/gentoo/gentoo/pull/45875
Signed-off-by: Sam James <sam <AT> gentoo.org>

 app-text/wv2/files/wv2-0.4.2-disable-libtool.patch   | 20 ++++++++++++++++++++
 .../wv2/{wv2-0.4.2-r3.ebuild => wv2-0.4.2-r5.ebuild} |  5 +++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/app-text/wv2/files/wv2-0.4.2-disable-libtool.patch 
b/app-text/wv2/files/wv2-0.4.2-disable-libtool.patch
new file mode 100644
index 000000000000..5cd8b01cc70b
--- /dev/null
+++ b/app-text/wv2/files/wv2-0.4.2-disable-libtool.patch
@@ -0,0 +1,20 @@
+Creation of the libtool file were causing build failure with newer cmake.
+Since Gentoo has no use for the la file no reason to generate it.
+
+Bug: https://bugs.gentoo.org/948605
+Bug: https://bugs.gentoo.org/970307
+Origin: an original patch for Gentoo
+Author: Alexander Golubev (Fat-Zer) <[email protected]>
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index f001384..5d924a3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -103,5 +103,5 @@ INSTALL( FILES ${wv2_HEADERS}
+ # libtool files are useless for Visual C++ and Borland C++
+ IF( NOT MSVC AND NOT BORLAND )
+-  INCLUDE( ${wvWare_SOURCE_DIR}/cmake/MacroCreateLibtoolFile.cmake )
+-  CREATE_LIBTOOL_FILE( wv2 /lib${LIB_SUFFIX} )
++  # INCLUDE( ${wvWare_SOURCE_DIR}/cmake/MacroCreateLibtoolFile.cmake )
++  # CREATE_LIBTOOL_FILE( wv2 /lib${LIB_SUFFIX} )
+ ENDIF( NOT MSVC AND NOT BORLAND )
+

diff --git a/app-text/wv2/wv2-0.4.2-r3.ebuild b/app-text/wv2/wv2-0.4.2-r5.ebuild
similarity index 83%
rename from app-text/wv2/wv2-0.4.2-r3.ebuild
rename to app-text/wv2/wv2-0.4.2-r5.ebuild
index f81e79ac27c9..f2817b0344ac 100644
--- a/app-text/wv2/wv2-0.4.2-r3.ebuild
+++ b/app-text/wv2/wv2-0.4.2-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2025 Gentoo Authors
+# Copyright 1999-2026 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ 
SRC_URI="https://downloads.sourceforge.net/wvware/${P}.tar.bz2";
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm64 ~hppa ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="zlib"
 
 RDEPEND="dev-libs/glib
@@ -23,6 +23,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
        "${FILESDIR}"/${P}-glib.patch
        "${FILESDIR}"/${P}-libgsf.patch
+       "${FILESDIR}"/${P}-disable-libtool.patch
 )
 
 DOCS=( AUTHORS ChangeLog README RELEASE THANKS TODO )

Reply via email to