Fix building with GCC 4.3 wrt #214264. Use DESTDIR for installing. Fix LICENSE from GPL-2 to LGPL-2.

Package-Manager: portage-2.1.5_rc4

4 files changed, 34 insertions, 20 deletions

diff --git a/app-text/wv2/ChangeLog b/app-text/wv2/ChangeLog
index 3df73a646d6f..0802d17b387d 100644
--- a/app-text/wv2/ChangeLog
+++ b/app-text/wv2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/wv2
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.44 2007/03/13 00:03:43 nattfodd Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/ChangeLog,v 1.45 2008/04/18 18:48:12 drac Exp $
+
+  18 Apr 2008; Samuli Suominen <drac@gentoo.org>
+  +files/wv2-0.2.3-gcc43.patch, wv2-0.2.3.ebuild:
+  Fix building with GCC 4.3 wrt #214264. Use DESTDIR for installing. Fix
+  LICENSE from GPL-2 to LGPL-2.
 
   12 Mar 2007; Alexandre Buisse <nattfodd@gentoo.org> metadata.xml:
   Replaced text-markup by tex as maintaining herd (text-markup split).
diff --git a/app-text/wv2/Manifest b/app-text/wv2/Manifest
index c4ea925e20ec..a4182d3ba00e 100644
--- a/app-text/wv2/Manifest
+++ b/app-text/wv2/Manifest
@@ -1,5 +1,6 @@
+AUX wv2-0.2.3-gcc43.patch 221 RMD160 18c61351906dadb178331ab5569e1b1af5111bef SHA1 c89733a119581259461a9e2f838af97ccca4f491 SHA256 e340e4db8687b79edabc0f10e209e7a15c177ea0445e09c2410ce1038a2000b2
 AUX wv2-0.2.3-respectflags.patch 353 RMD160 cc706bf3cb533d9a11f647cb4d282d3bc6ef3727 SHA1 557aab31e363f8b6f11bd42567b94671f5624fc4 SHA256 342498eceb4f653a943d8fd44fa6553fb83c3105850fbcf2f698efdb1b0946dc
 DIST wv2-0.2.3.tar.bz2 908983 RMD160 0534ddb23ec5a6e222cbbc76e695f8ea5cf532c7 SHA1 8378f43806bc2614ccea2b265159ce0548192601 SHA256 8f2cf24a5eddb6711d7ba49c05c7b5dddc08ce0af564aba098f516c7cbb8b560
-EBUILD wv2-0.2.3.ebuild 783 RMD160 c08d8ae467d36b022f94768433b863173253959e SHA1 5bcf44c823abe9e4eb5dbb1c006e7708f94f8f4f SHA256 7aa8f3710738c8a774555b168ecf695b8613cad3cfe18a51b2f66e0b4e18c242
-MISC ChangeLog 5145 RMD160 26a6163b132fa2c00a70197261fccbbde72ecaeb SHA1 87d3f6d4254b39e3290045cf63eb5deb359079bf SHA256 f67590d0e40f9ab3331020a6a1326685fab82c84f3f4ea3e95550cd98771084f
+EBUILD wv2-0.2.3.ebuild 891 RMD160 1c77a4e224ef2ed535a16bfe321d71b17a1d8efd SHA1 4a87f166dfee0d419a018457cbdcb2f4b4afe017 SHA256 9c76873dc07e5087a6f56cecac50c58684b8abd9a01a6aee9fd005a174b99954
+MISC ChangeLog 5346 RMD160 d2f600ecc6ee687ba3d1739b8aca5623caffa25a SHA1 5409cc572fdde7e380bc2674044cc0ff7de5e2c6 SHA256 13546bdb04f7d586b593a068e8951967eb8ec842ec3119f0c33404071e80168a
 MISC metadata.xml 157 RMD160 e666a9e73ee48e70d6fc6ea78049d38b1fcde7c2 SHA1 43a0c32101f0c6ffd8fa1aa620c8032d194a9e3a SHA256 18238fb417d8677a0495cdaba9b043526174ba63b51494b88b10aa7dd903124c
diff --git a/app-text/wv2/files/wv2-0.2.3-gcc43.patch b/app-text/wv2/files/wv2-0.2.3-gcc43.patch
new file mode 100644
index 000000000000..81578f5fb4ea
--- /dev/null
+++ b/app-text/wv2/files/wv2-0.2.3-gcc43.patch
@@ -0,0 +1,10 @@
+--- src/styles.cpp.orig	2008-02-22 15:40:41.000000000 +0100
++++ src/styles.cpp	2008-02-22 15:41:05.000000000 +0100
+@@ -24,6 +24,7 @@
+ 
+ #include "wvlog.h"
+ #include <algorithm>
++#include <string.h>
+ 
+ namespace wvWare
+ {
diff --git a/app-text/wv2/wv2-0.2.3.ebuild b/app-text/wv2/wv2-0.2.3.ebuild
index f0d7c87a2f50..44d3e28899b3 100644
--- a/app-text/wv2/wv2-0.2.3.ebuild
+++ b/app-text/wv2/wv2-0.2.3.ebuild
@@ -1,35 +1,33 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/wv2-0.2.3.ebuild,v 1.11 2007/02/12 03:52:59 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/wv2/wv2-0.2.3.ebuild,v 1.12 2008/04/18 18:48:12 drac Exp $
 
-inherit eutils autotools
+inherit autotools eutils
 
 DESCRIPTION="Excellent MS Word filter lib, used in most Office suites"
+HOMEPAGE="http://wvware.sourceforge.net"
 SRC_URI="mirror://sourceforge/wvware/${P}.tar.bz2"
-HOMEPAGE="http://wvware.sourceforge.net/"
 
+LICENSE="LGPL-2"
+SLOT="0"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE=""
-SLOT="0"
-LICENSE="GPL-2"
 
-DEPEND=">=gnome-extra/libgsf-1.8.0
+RDEPEND=">=gnome-extra/libgsf-1.8
 	>=media-libs/freetype-2.1
-	sys-libs/zlib
-	media-libs/libpng"
-
-RDEPEND="${DEPEND}
+	media-libs/libpng
 	media-gfx/imagemagick"
+DEPEND="${RDEPEND}"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
-
-	epatch "${FILESDIR}/${P}-respectflags.patch" || die
-
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-respectflags.patch \
+		"${FILESDIR}"/${P}-gcc43.patch
 	eautoreconf
 }
 
 src_install() {
-	einstall || die
+	emake DESTDIR="${D}" install || die "emake install failed."
+	dodoc AUTHORS ChangeLog README RELEASE THANKS TODO
 }