gentoo auto-resync : 09:06:2024 - 00:08:13

3 files changed, 92 insertions, 0 deletions

diff --git a/app-text/wv/Manifest b/app-text/wv/Manifest
index 5704d5bd5c35..1b4cce70f8b0 100644
--- a/app-text/wv/Manifest
+++ b/app-text/wv/Manifest
@@ -1,5 +1,7 @@
 AUX wv-1.2.9-C99-decls.patch 2193 BLAKE2B 9b8e0008c989c2f65d59678fa33d4c4630537376ebf4d75e7aafa9f4c48a4cbd774cd9c33800e97bdffa38fbeefbd8846778d3035c37a96d4de2c9b50ec88457 SHA512 333a4aad45d29128ffd38509a6d62ac3ab8869b5507e34d3507a62161b3cf79046e3e844b506c55e8bcba1ca35993b3303818a997b66b67c0ba162bc659ecbe0
 AUX wv-1.2.9-format-security.patch 336 BLAKE2B 18641a15c75a32250012771bd8ca8b0739f503ef8d1d2eebe23f2d378996aa3f6e2f0cfa72f8077add3db33f8ece86c57e80cc5b868719472b45ba1bed10a7d0 SHA512 99fef3bec0f129ae2d138c50d1e3e9288d5309db87a72d9b1970d1d230e20be3469b423f0b74c5083a0a5cdca8fed0b2ca32ec1fefdca22f213e4a02a6bbd405
+AUX wv-1.2.9-gcc14-build-fix.patch 691 BLAKE2B 0948319415dbc4c40dadc3a86852649c471dac6b563e66b81fe459714bd58420a7c428eb3c4177bb2dba754c4d3696b4b54ecc89fddeda77ad8ba4abc29b18c7 SHA512 cbe08a7690f4aceb67ad5abfdae699ab54cb2248374b5fd4d8fe5d67b18584e57b32f3d5abec7ec59452558a9f4f0f7ba197ec39693b567cbaf9844ca2a8c647
 DIST wv-1.2.9.tar.gz 616256 BLAKE2B 6a6aa6b5f87a934c703c8a74d85af3d7aa84dcd2bc613a3af7fb8d69a9339e71ba2618ae8f725b90c3fe0b0199f4b224bdb32a50c2b6b6614f84b6a14437633f SHA512 ae5c762012595ce8922bfda8749ad3e9cb055edab30152c3a5feaaf3ca6601f357d1e301b179e9a5860cd99452dd6e63e5f44f5bcc12f8db148bdd334e0200a5
 EBUILD wv-1.2.9-r3.ebuild 1630 BLAKE2B bc3798c92a403ae620f8a190b924893ab3bd0732bb9e8f9edbcea28d94644f72513f86ba9d9463fa66f681ebde5f52cb68bf0b1bfa32fedc8b69c71e10b4c0f2 SHA512 3f115ae93368cf57817b92e8a40c3bc89537e72b746dab3dca2993a71b598a4269fee90edabd900f8619651a605c44554cbb27183bda3baf8cf4356eb1504d34
+EBUILD wv-1.2.9-r4.ebuild 1677 BLAKE2B 3df0897aa0ebd57e01dd4ae28aebff414ac8a60f720f6c9d26f158d8634b03bac14bd3e3f122786eff5fa9564fc1c99a327dcd98d9840d2399f2b8738ffdd78c SHA512 389ee51a24b1c09afe1e2614fff004116a7e21d81d459ec54472daa54066cff38e89bbee66091c046b12575d7e10af17b7947a1cee1fe2879c47ed5f4680744e
 MISC metadata.xml 449 BLAKE2B ac74f5a8ee805072c669569b336f99840bd4a868aaedca72764c516040444b3c216bb33d9369d020d46394add0de746597c33c43c6466be4e672c2c017eec390 SHA512 bb4871f0e9a9801aeac5660b82c480d42a62d0d06641a085887d7359aace546b10071d09e92f730d1958aaee9444752723aa5d05fe9417842413b92270bdd174
diff --git a/app-text/wv/files/wv-1.2.9-gcc14-build-fix.patch b/app-text/wv/files/wv-1.2.9-gcc14-build-fix.patch
new file mode 100644
index 000000000000..ea3a0649bc38
--- /dev/null
+++ b/app-text/wv/files/wv-1.2.9-gcc14-build-fix.patch
@@ -0,0 +1,22 @@
+Bug: https://bugs.gentoo.org/921570
+Bug: https://bugs.gentoo.org/883207
+--- a/wvConfig.c
++++ b/wvConfig.c
+@@ -158,7 +158,7 @@ wvReleaseStateData (state_data * data)
+ 
+ 
+ static void
+-exstartElement (void *userData, const char *name, const char **atts)
++exstartElement (void *userData, const unsigned char *name, const unsigned char **atts)
+ {
+     unsigned int token_type;
+     expand_data *mydata = (expand_data *) userData;
+@@ -3371,7 +3371,7 @@ wvendElement (void *userData, const XML_Char *name)
+ }
+ 
+ static void
+-exendElement (void *userData, const char *name)
++exendElement (void *userData, const unsigned char *name)
+ {
+     /*
+        expand_data *mydata = (expand_data *)userData;
diff --git a/app-text/wv/wv-1.2.9-r4.ebuild b/app-text/wv/wv-1.2.9-r4.ebuild
new file mode 100644
index 000000000000..4f6cf22d4f1e
--- /dev/null
+++ b/app-text/wv/wv-1.2.9-r4.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Tool for conversion of MSWord doc and rtf files to something readable"
+HOMEPAGE="http://wvware.sourceforge.net/"
+SRC_URI="http://abiword.org/downloads/${PN}/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris"
+IUSE="tools wmf"
+
+RDEPEND="
+	>=dev-libs/glib-2:2
+	>=gnome-extra/libgsf-1.13:=
+	sys-libs/zlib
+	media-libs/libpng:0=
+	dev-libs/libxml2:2
+	tools? (
+		app-text/texlive-core
+		dev-texlive/texlive-latex
+	)
+	wmf? ( >=media-libs/libwmf-0.2.2 )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-format-security.patch
+	"${FILESDIR}"/${P}-C99-decls.patch
+	"${FILESDIR}"/${P}-gcc14-build-fix.patch
+)
+
+src_prepare() {
+	default
+
+	# remove -ansi flag, since it disables POSIX
+	# function declarations (bug #874396)
+	sed -i -e 's/-ansi//' configure || die
+
+	if ! use tools; then
+		sed -i -e '/bin_/d' GNUmakefile.am || die
+		sed -i -e '/SUBDIRS/d' GNUmakefile.am || die
+		sed -i -e '/\/GNUmakefile/d' configure.ac || die
+		sed -i -e '/wv[[:upper:]]/d' configure.ac || die
+		sed -i -e 's/-ansi//' configure.ac || die
+
+		# automake-1.13 fix, bug #467620
+		sed -i -e 's|AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' configure.ac || die
+
+		eautoreconf
+	fi
+}
+
+src_configure() {
+	econf $(use_with wmf libwmf)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+
+	rm -f "${ED}"/usr/share/man/man1/wvConvert.1 || die
+	use tools && dosym wvWare.1 /usr/share/man/man1/wvConvert.1
+}