Remove old. Move comments where they belong, from ebuild to the patch.

Package-Manager: portage-2.2_rc62/cvs/Linux x86_64

5 files changed, 8 insertions, 178 deletions

diff --git a/dev-libs/libofx/Manifest b/dev-libs/libofx/Manifest
index 77b955f02481..b9e7a2944da1 100644
--- a/dev-libs/libofx/Manifest
+++ b/dev-libs/libofx/Manifest
@@ -1,8 +1,5 @@
-AUX libofx-0.8.3-gcc43.patch 4215 RMD160 a7cf58fd298877a7a9b16cdbef2dc7e95a184ed6 SHA1 143779030165307645bbc1a1a658bcfa8c1c7d46 SHA256 fddd74fbbfb7d9a86b44c1b1d806a443907e55472568912f31ade0e10167fdce
-AUX libofx-0.9.0-gcc43.patch 4139 RMD160 c09bf6381077d283a371dd7a2962fb50e1f16921 SHA1 8090040f9f381b759b04f3ee8597a0f4fb121e08 SHA256 31828b44c225b30ac9c0cb316a500bf310a37b6666f77fe77be37496a853af99
-DIST libofx-0.8.3.tar.gz 971250 RMD160 a5c9acd6af4ce252d5a0941c82436af72961cd7c SHA1 0fa22f0535c1f50d4b9056f6f86d1429f1c8485f SHA256 bcba43e92468fc007b40af263ed229c4834b0b65cd556fd456530c0509e46ce4
+AUX libofx-0.9.0-gcc43.patch 4170 RMD160 dd872636403ac1e9996a25b1ea2f2c706064fa52 SHA1 69015fb866d09735aa1a079aebc9348ca7eae9f5 SHA256 d7bb1134055414ed9096ab377853f3a725da9c80800f40cad16ccbc156faf00c
 DIST libofx-0.9.1.tar.gz 1177818 RMD160 84b139cb39006f8f6433d490d72e83f103156952 SHA1 a12110ddcbff596e26496865570fb4dcb75c08d0 SHA256 321b34bf3036c5af6a2ab44607decee38b2c7e79bb64c9ec6d98ddb18fb2ca3f
-EBUILD libofx-0.8.3.ebuild 969 RMD160 069e4f15f0713f932e5fa80b586e4bd4797c2db9 SHA1 29c524ed63eab71660ff7e4c31e45b1043f1b7c2 SHA256 8c3d3b19167feca15ed8719847a569cb7a5ab3260ce19365b487d6ad4483cb18
-EBUILD libofx-0.9.1.ebuild 1511 RMD160 4beebed6df1e631894afa74be881ebb843577408 SHA1 be5fd2d4db012967672fea7bf33ac280d3914ca4 SHA256 2563b326b76549d55fd4e28a91f4f9f5cc9fea70778642b566555c2ab6160b31
+EBUILD libofx-0.9.1.ebuild 1268 RMD160 3e4a718acee9f00d78a8261df8d47aafa51cd5b1 SHA1 85de3e42c292bdd2f07cbb05c993a8c9156d1084 SHA256 5c013e68fdd34f6c6c7c1d692fc204c745a0b0c6017292e7f7121709967f1016
 MISC ChangeLog 6744 RMD160 55528a79028e2e830cf8b19f86df3ac6f402aedf SHA1 b9da6d992a4426f3891a0411db03b58b3df606d0 SHA256 dad11ff36da7c54c86119a62d4bd3b6bbd706610f5adfeb3bd48d0aff3839f97
 MISC metadata.xml 231 RMD160 c13056229989c3d4f448a7c7abcff3f4ee7ce13c SHA1 2d63dfb700b223f8f37c078692a81b2237896bce SHA256 4595c2615fd7c9095517949b1a920d4457f92801eb9d46307b18aafe58ec2a8a
diff --git a/dev-libs/libofx/files/libofx-0.8.3-gcc43.patch b/dev-libs/libofx/files/libofx-0.8.3-gcc43.patch
deleted file mode 100644
index 19497ccca0db..000000000000
--- a/dev-libs/libofx/files/libofx-0.8.3-gcc43.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_container_transaction.cpp libofx-0.9.0/lib/ofx_container_transaction.cpp
---- libofx-0.9.0.orig/lib/ofx_container_transaction.cpp	2007-11-10 00:10:49.000000000 +0100
-+++ libofx-0.9.0/lib/ofx_container_transaction.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,10 +19,11 @@
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
- 
-+#include <cstdlib>
- #include <string>
- #include "messages.hh"
- #include "libofx.h"
- #include "ofx_containers.hh"
- #include "ofx_utilities.hh"
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_request_accountinfo.cpp libofx-0.9.0/lib/ofx_request_accountinfo.cpp
---- libofx-0.9.0.orig/lib/ofx_request_accountinfo.cpp	2007-10-28 03:33:43.000000000 +0100
-+++ libofx-0.9.0/lib/ofx_request_accountinfo.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,10 +19,11 @@
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
- 
-+#include <cstdlib>
- #include <string>
- #include "libofx.h"
- #include "ofx_request_accountinfo.hh"
- 
- using namespace std;
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_request.cpp libofx-0.9.0/lib/ofx_request.cpp
---- libofx-0.9.0.orig/lib/ofx_request.cpp	2007-10-28 03:37:52.000000000 +0100
-+++ libofx-0.9.0/lib/ofx_request.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,10 +19,11 @@
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
- 
-+#include <cstring>
- #include <string>
- #include "messages.hh"
- #include "libofx.h"
- #include "ofx_request.hh"
- 
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_request_statement.cpp libofx-0.9.0/lib/ofx_request_statement.cpp
---- libofx-0.9.0.orig/lib/ofx_request_statement.cpp	2007-10-28 13:57:18.000000000 +0100
-+++ libofx-0.9.0/lib/ofx_request_statement.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,10 +19,11 @@
- 
- #ifdef HAVE_CONFIG_H
- #include <config.h>
- #endif
- 
-+#include <cstdlib>
- #include <string>
- #include "libofx.h"
- #include "ofx_utilities.hh"
- #include "ofx_request_statement.hh"
- 
-diff -NrU5 libofx-0.9.0.orig/lib/ofx_utilities.cpp libofx-0.9.0/lib/ofx_utilities.cpp
---- libofx-0.9.0.orig/lib/ofx_utilities.cpp	2007-10-27 14:12:49.000000000 +0200
-+++ libofx-0.9.0/lib/ofx_utilities.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -19,11 +19,12 @@
- ***************************************************************************/
- #include <config.h>
- #include <iostream>
- #include "ParserEventGeneratorKit.h"
- #include "SGMLApplication.h"
--#include <time.h>
-+#include <ctime>
-+#include <cstdlib>
- #include <string>
- #include <locale.h>
- #include "messages.hh"
- #include "ofx_utilities.hh"
- 
-diff -NrU5 libofx-0.9.0.orig/ofxconnect/ofxconnect.cpp libofx-0.9.0/ofxconnect/ofxconnect.cpp
---- libofx-0.9.0.orig/ofxconnect/ofxconnect.cpp	2007-10-26 20:24:10.000000000 +0200
-+++ libofx-0.9.0/ofxconnect/ofxconnect.cpp	2008-04-21 22:31:18.000000000 +0200
-@@ -34,10 +34,11 @@
- #include "libofx.h"
- #include <config.h>		/* Include config constants, e.g., VERSION TF */
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <cstring>
- 
- #ifdef HAVE_LIBCURL
- #include <curl/curl.h>
- #endif
- 
-diff -NrU5 libofx-0.9.0.orig/ofxconnect/ofxpartner.cpp libofx-0.9.0/ofxconnect/ofxpartner.cpp
---- libofx-0.9.0.orig/ofxconnect/ofxpartner.cpp	2006-03-26 06:49:54.000000000 +0200
-+++ libofx-0.9.0/ofxconnect/ofxpartner.cpp	2008-04-21 22:28:26.000000000 +0200
-@@ -33,10 +33,13 @@
- #include <sys/stat.h>
- 
- #include <iostream>
- #include <string>
- #include <vector>
-+#include <algorithm>
-+#include <cstring>
-+
- 
- using std::string;
- using std::vector;
- using std::cout;
- using std::endl;
-diff -NrU5 libofx-0.9.0.orig/ofxdump/ofxdump.cpp libofx-0.9.0/ofxdump/ofxdump.cpp
---- libofx-0.9.0.orig/ofxdump/ofxdump.cpp	2006-08-02 06:19:22.000000000 +0200
-+++ libofx-0.9.0/ofxdump/ofxdump.cpp	2008-04-21 22:26:24.000000000 +0200
-@@ -27,10 +27,12 @@
-  *   (at your option) any later version.                                   *
-  *                                                                         *
-  ***************************************************************************/
- #include <iostream>
- #include <iomanip>
-+#include <cstdlib>
-+#include <cstring>
- #include <string>
- #include "libofx.h"
- #include <stdio.h>		/* for printf() */
- #include <config.h>		/* Include config constants, e.g., VERSION TF */
- #include <errno.h>
diff --git a/dev-libs/libofx/files/libofx-0.9.0-gcc43.patch b/dev-libs/libofx/files/libofx-0.9.0-gcc43.patch
index acc4a2e8ebda..720b2dc5c97a 100644
--- a/dev-libs/libofx/files/libofx-0.9.0-gcc43.patch
+++ b/dev-libs/libofx/files/libofx-0.9.0-gcc43.patch
@@ -1,3 +1,5 @@
+http://bugs.gentoo.org/218782
+
 diff -NrU5 libofx-0.9.0.orig/lib/ofx_container_transaction.cpp libofx-0.9.0/lib/ofx_container_transaction.cpp
 --- libofx-0.9.0.orig/lib/ofx_container_transaction.cpp	2007-11-10 00:10:49.000000000 +0100
 +++ libofx-0.9.0/lib/ofx_container_transaction.cpp	2008-04-21 22:26:24.000000000 +0200
diff --git a/dev-libs/libofx/libofx-0.8.3.ebuild b/dev-libs/libofx/libofx-0.8.3.ebuild
deleted file mode 100644
index 86b53d32a92b..000000000000
--- a/dev-libs/libofx/libofx-0.8.3.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libofx/libofx-0.8.3.ebuild,v 1.9 2010/01/06 20:31:36 ranger Exp $
-
-inherit eutils
-
-DESCRIPTION="Library to support the Open Financial eXchange XML Format"
-HOMEPAGE="http://libofx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libofx/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc ppc64 sparc x86"
-IUSE=""
-
-DEPEND=">=app-text/opensp-1.5
-	 >=net-misc/curl-7.9.7"
-
-src_unpack() {
-	unpack ${A}
-
-	# 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"
-	sed -i -e 's/$(DESTDIR)$(docdir)/$(DESTDIR)$(LIBOFX_DTD_DIR)/g' \
-		Makefile.in
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-}
-
-src_install() {
-	dodir /usr/share/doc/${PF}
-	make install DESTDIR="${D}" docdir="/usr/share/doc/${PF}" || die 'install failed'
-}
diff --git a/dev-libs/libofx/libofx-0.9.1.ebuild b/dev-libs/libofx/libofx-0.9.1.ebuild
index 6e180850a545..7351457d1380 100644
--- a/dev-libs/libofx/libofx-0.9.1.ebuild
+++ b/dev-libs/libofx/libofx-0.9.1.ebuild
@@ -1,9 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libofx/libofx-0.9.1.ebuild,v 1.7 2010/01/19 14:35:43 ranger Exp $
-
-EAPI="1"
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libofx/libofx-0.9.1.ebuild,v 1.8 2010/02/01 09:06:47 ssuominen Exp $
 
+EAPI=1
 inherit eutils
 
 DESCRIPTION="Library to support the Open Financial eXchange XML Format"
@@ -19,7 +18,6 @@ DEPEND=">=app-text/opensp-1.5
 	 >=net-misc/curl-7.9.7
 	dev-cpp/libxmlpp:0
 	dev-libs/libxml2"
-RDEPEND="${DEPEND}"
 
 src_unpack() {
 	unpack ${A}
@@ -41,18 +39,11 @@ src_unpack() {
 			"${S}/Makefile.in" || die "sed failed"
 	fi
 
-	# Fix compilation with gcc 4.3, see bug #218782
 	cd "${S}"
-	epatch "${FILESDIR}/${PN}-0.9.0-gcc43.patch"
+	epatch "${FILESDIR}"/${PN}-0.9.0-gcc43.patch
 }
 
 src_install() {
 	dodir /usr/share/doc/${PF}
-	emake install DESTDIR="${D}" docdir="/usr/share/doc/${PF}" || die 'install failed'
-}
-
-pkg_postinst() {
-	elog "Please run"
-	elog "  revdep-rebuild --library libofx.so.3"
-	elog "to rebuild packages linked against an older version of libofx."
+	emake install DESTDIR="${D}" docdir="/usr/share/doc/${PF}" || die
 }