From cbeddccfaa9415fb407a0b64374d241a30eab179 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <drac@gentoo.org>
Date: Fri, 18 Apr 2008 18:48:12 +0000
Subject: Fix building with GCC 4.3 wrt #214264. Use DESTDIR for installing.
 Fix LICENSE from GPL-2 to LGPL-2. (Portage version: 2.1.5_rc4)

---
 app-text/wv2/ChangeLog                   |  9 +++++++--
 app-text/wv2/files/wv2-0.2.3-gcc43.patch | 10 ++++++++++
 app-text/wv2/wv2-0.2.3.ebuild            | 30 ++++++++++++++----------------
 3 files changed, 31 insertions(+), 18 deletions(-)
 create mode 100644 app-text/wv2/files/wv2-0.2.3-gcc43.patch

(limited to 'app-text/wv2')

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/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
 }
-- 
cgit v1.2.3-65-gdbad