Add fix from Debian to allow this to compile. Should fix bug 116208.

Package-Manager: portage-2.1_pre1

4 files changed, 27 insertions, 16 deletions

diff --git a/dev-libs/libofx/ChangeLog b/dev-libs/libofx/ChangeLog
index d88259532d45..131a9648d01a 100644
--- a/dev-libs/libofx/ChangeLog
+++ b/dev-libs/libofx/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libofx
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libofx/ChangeLog,v 1.24 2005/11/26 11:42:23 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libofx/ChangeLog,v 1.25 2005/12/22 23:21:18 vanquirius Exp $
+
+  22 Dec 2005; Marcelo Goes <vanquirius@gentoo.org>
+  +files/libofx-0.8.0-tree.diff, libofx-0.8.0-r1.ebuild:
+  Add fix from Debian to allow this to compile. Should fix bug 116208. Thanks
+  to Daniel Gerstner <d dot gerstner at gmx dot de>.
 
   26 Nov 2005; Simon Stelling <blubb@gentoo.org> libofx-0.8.0-r1.ebuild:
   mark stable on amd64
diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index c83fdb749981..de8c9ea8e304 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e18d892a18a9cda7f5867d1dd4fbd986 ChangeLog 2903
+MD5 1b865f5487607659f894be375c74c125 ChangeLog 3149
 MD5 01e95323fd235e3559b8831adc8d1d34 files/digest-libofx-0.6.4 64
 MD5 01e95323fd235e3559b8831adc8d1d34 files/digest-libofx-0.6.4-r1 64
 MD5 aed194d8bebea157fe05b7ed84e57ba5 files/digest-libofx-0.6.5 64
@@ -9,16 +6,10 @@ MD5 d7fd5ed3804d5fa2f2c14c1d212e5990 files/digest-libofx-0.6.6 64
 MD5 432886ccebfb84d58c2e7d58346a37e2 files/digest-libofx-0.7.0-r1 64
 MD5 6a9c66586595ea030c4715de6132cc41 files/digest-libofx-0.8.0-r1 64
 MD5 49ea3e257d9cc461e444c07e59396177 files/libofx-0.6.4-gcc2.patch 595
+MD5 24c3231460295a09b4a2e6687478c55b files/libofx-0.8.0-tree.diff 202
 MD5 91795bc54a13a171931b3b8f662e4fc4 libofx-0.6.4-r1.ebuild 1047
 MD5 372d7464ac85978c0cfcaef6b06063b8 libofx-0.6.4.ebuild 903
 MD5 af75375852568e3ac91c86d24915861a libofx-0.6.5.ebuild 915
 MD5 fe8734c169bd574aa9e1bb60d0322364 libofx-0.6.6.ebuild 869
 MD5 a0c394296e3eac0091475b51e8ef6df7 libofx-0.7.0-r1.ebuild 895
-MD5 dbc3e602d5125c308bd582d93d11d500 libofx-0.8.0-r1.ebuild 922
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDiJnsCRZPokWLroQRApBxAJwPgI64jTp2p1moLg302vf0I2AIfACgqkpa
-G6f0cK5AVUwYskaFT5sZi4g=
-=jFPh
------END PGP SIGNATURE-----
+MD5 8b066c0032e83bcf4ce62148fbdbf1dd libofx-0.8.0-r1.ebuild 992
diff --git a/dev-libs/libofx/files/libofx-0.8.0-tree.diff b/dev-libs/libofx/files/libofx-0.8.0-tree.diff
new file mode 100644
index 000000000000..138823ecde76
--- /dev/null
+++ b/dev-libs/libofx/files/libofx-0.8.0-tree.diff
@@ -0,0 +1,11 @@
+--- libofx-0.8.0.orig/lib/tree.hh
++++ libofx-0.8.0/lib/tree.hh
+@@ -69,7 +69,7 @@
+    }
+ 
+ template <class T1>
+-inline void kp::destructor(T1* p)
++inline void destructor(T1* p)
+    {
+    p->~T1();
+    }
diff --git a/dev-libs/libofx/libofx-0.8.0-r1.ebuild b/dev-libs/libofx/libofx-0.8.0-r1.ebuild
index 6e4fac23ff3b..fb442192af1f 100644
--- a/dev-libs/libofx/libofx-0.8.0-r1.ebuild
+++ b/dev-libs/libofx/libofx-0.8.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libofx/libofx-0.8.0-r1.ebuild,v 1.5 2005/11/26 17:22:19 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libofx/libofx-0.8.0-r1.ebuild,v 1.6 2005/12/22 23:21:18 vanquirius Exp $
 
 inherit eutils
 
@@ -23,12 +23,16 @@ src_unpack() {
 
 	# because we redefine docdir in src_install, we need to make sure the
 	# dtd's go to the right place, LIBOFX_DTD_DIR
-	cd ${S}/dtd
+	cd "${S}"/dtd
 	sed -i -e 's/$(DESTDIR)$(docdir)/$(DESTDIR)$(LIBOFX_DTD_DIR)/g' \
 		Makefile.in
+
+	cd "${S}"
+	# bug 116208
+	epatch "${FILESDIR}"/${P}-tree.diff
 }
 
 src_install() {
 	dodir /usr/share/doc/${PF}
-	einstall docdir=${D}/usr/share/doc/${PF} || die
+	einstall docdir="${D}"/usr/share/doc/${PF} || die
 }