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

(Portage version: 2.2_rc62/cvs/Linux x86_64)

4 files changed, 6 insertions, 173 deletions

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
 }