Fix bug 297662 thanks to oc666. Convert to EAPI=2. Remove unsupported configure option.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 106 insertions, 3 deletions

diff --git a/app-office/mdbtools/ChangeLog b/app-office/mdbtools/ChangeLog
index ac797c617c58..0a2f26a56bdf 100644
--- a/app-office/mdbtools/ChangeLog
+++ b/app-office/mdbtools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-office/mdbtools
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.42 2009/01/01 10:22:07 graaff Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/ChangeLog,v 1.43 2010/01/03 14:50:37 graaff Exp $
+
+*mdbtools-0.6_pre2-r1 (03 Jan 2010)
+
+  03 Jan 2010; Hans de Graaff <graaff@gentoo.org>
+  +mdbtools-0.6_pre2-r1.ebuild,
+  +files/mdbtools-0.6_pre2-haveiconv-fix.patch:
+  Fix bug 297662 thanks to oc666. Convert to EAPI=2. Remove unsupported
+  configure option.
 
 *mdbtools-0.6_pre2 (30 Dec 2008)
 
diff --git a/app-office/mdbtools/Manifest b/app-office/mdbtools/Manifest
index 9cfca3c58896..46efac264786 100644
--- a/app-office/mdbtools/Manifest
+++ b/app-office/mdbtools/Manifest
@@ -1,12 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX mdbtools-0.6_pre1-as-needed.patch 482 RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a SHA1 59c1e6a246c1dc1245386cfb6f49ec6c88eea0a0 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416
 AUX mdbtools-0.6_pre1-gcc34.patch 1571 RMD160 b21fa43cc3b3f9e336c741862caf73a6fe66f99e SHA1 04e16d502c28cb065d04fc4afe68761380cd8521 SHA256 63a2f8d06d905274c3dfb60373b7a4c967534a06b864dc3e73e2a92ed8b0f633
 AUX mdbtools-0.6_pre1-gcc41.patch 498 RMD160 3c4c39b3c17066c09e7e3a5fa052d195eb3f6740 SHA1 b137104183f56f2a155a83036613c25b3deef15e SHA256 58ab3afcf6e3a97570db7980cf81792b21c84e9074afdc7826c2789306122a63
 AUX mdbtools-0.6_pre1-strlen.patch 284 RMD160 cfa88cda151cfb7f63cc7fbd3cb366d00f40ac35 SHA1 98ec5927166a47bda8a3223998282ff9b7fa3359 SHA256 a1ba4bde512318dc6db254f5ab04df94644970106fc950e316877734502f40b5
 AUX mdbtools-0.6_pre2-as-needed.patch 482 RMD160 96eb67726fcccd745dc5494fefbcb3e6db936d9a SHA1 59c1e6a246c1dc1245386cfb6f49ec6c88eea0a0 SHA256 38d06663bc41ced3e094d4a78d6a0b81909b08720bec2696ef7431fb90519416
 AUX mdbtools-0.6_pre2-gcc34.patch 1468 RMD160 fc1ba2a523bf9dd4c0dd0601d70db4e5374ec1b2 SHA1 ae4dc5100d6fc097cddb93164cad360640da6405 SHA256 ae0f0ea67b9bcc8851073acba54297268f00a31a0d286b59680f7a28f15ba108
+AUX mdbtools-0.6_pre2-haveiconv-fix.patch 660 RMD160 6fc78057697eda733e6526573c47cfe2be950012 SHA1 cc5add40346b1aeb61985d0de6a65f3a3a39af63 SHA256 e7fc8f4809968f0cfc8e890d8dc6ca98abd51f1c243d25276e566f88f9461887
 DIST mdbtools-0.6pre1.tar.gz 611756 RMD160 e6a89d6984ba84aa9895ab0b6e6b68ac86881be3 SHA1 37a50d623a444ec690d2677b12b59c2f11e497c0 SHA256 7169dc50da857aae2b3f62cd5c6ace37fed56f3e39d07c9afa5aba882b1de3d3
 DIST mdbtools-cvs-20050624.tar.gz 306961 RMD160 800328d9acc763ce58211b5a37ad20b8ce34cc21 SHA1 15c97da82826935032aa2089d3e9ed7e2931ce43 SHA256 471034a00f9441e34b3a236ce07bdb766fea0bd140fc69a3d8a9c7225bf573b3
 EBUILD mdbtools-0.6_pre1-r1.ebuild 1881 RMD160 1dab3e8bb357913103e6493535368dce195e2fa3 SHA1 5e83ffc7162230642668472ef93404a8a4f4ee89 SHA256 9b4246179a80d36e3e3db927500d4cf9c06df423a9c1bc9b95450049d741fcd5
+EBUILD mdbtools-0.6_pre2-r1.ebuild 1801 RMD160 d008e8b4a471dbc76ac4326f614da62feffec667 SHA1 82149ceb1889ece10d2f75af3faaffdbd05cdf63 SHA256 9a1853163b2c957f3f07049577397cc7c7d2b2e70a2097bb55136ad26116caa0
 EBUILD mdbtools-0.6_pre2.ebuild 1820 RMD160 d58c0b05c54b1e6a90d3ddec8bacfbe2fbf8d35a SHA1 958758cb6299594c6e02cf3a2c9897bba4d8da5c SHA256 df89b4bf0777b683a48422566f6360437a4e48a473c756c148d59dd366ec3e76
-MISC ChangeLog 5627 RMD160 022ef599c2d0062017fc97ca2ec1735999a23609 SHA1 fde7191fb651442dae66aa6a854d731885b532d2 SHA256 63ed2af0b0d1cc2cd6ca016684a5bdfb5b33f60b7c25e24bc65a0395652f7492
+MISC ChangeLog 5887 RMD160 dfefe33f6e9f42bc7d390cbf8f08ad361b87ae36 SHA1 1d46ec4c3b77e495991cdcb7e23731d9fb0cac99 SHA256 73b60eff457cb2f251c95df2c87b476c5c225af4bd5189b4c56a4f0a3743c2f6
 MISC metadata.xml 220 RMD160 65cff73eb25c0cc60095d42dd59adbefcb127b77 SHA1 059c076f5c2d3a1eb0b022ef90920bcabaf841b3 SHA256 0f420960bb0e6e212e563ce0883b0e412304dfd506a39e434d2c7a40a603ba86
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAktArsgACgkQeM7EJeUH71PpQACfRNafg40wh8sD/CvrzQmODbyp
+rksAnRgVQK4q+7S6AKrY3SRC0wwpbojU
+=Dow8
+-----END PGP SIGNATURE-----
diff --git a/app-office/mdbtools/files/mdbtools-0.6_pre2-haveiconv-fix.patch b/app-office/mdbtools/files/mdbtools-0.6_pre2-haveiconv-fix.patch
new file mode 100644
index 000000000000..dc0c259f9db7
--- /dev/null
+++ b/app-office/mdbtools/files/mdbtools-0.6_pre2-haveiconv-fix.patch
@@ -0,0 +1,22 @@
+diff -u -r mdbtools/src/libmdb/file.c mdbtools.fix/src/libmdb/file.c
+--- mdbtools/src/libmdb/file.c	2005-06-28 13:53:40.000000000 +0900
++++ mdbtools.fix/src/libmdb/file.c	2009-09-09 04:02:47.000000000 +0900
+@@ -17,6 +17,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
+ #include "mdbtools.h"
+ 
+ #ifdef DMALLOC
+diff -u -r mdbtools/src/libmdb/iconv.c mdbtools.fix/src/libmdb/iconv.c
+--- mdbtools/src/libmdb/iconv.c	2005-09-08 08:27:43.000000000 +0900
++++ mdbtools.fix/src/libmdb/iconv.c	2009-09-09 04:00:36.000000000 +0900
+@@ -17,6 +17,7 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
+ #include "mdbtools.h"
+ #include "errno.h"
+ 
diff --git a/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild b/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild
new file mode 100644
index 000000000000..a84309308d36
--- /dev/null
+++ b/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre2-r1.ebuild,v 1.1 2010/01/03 14:50:37 graaff Exp $
+
+EAPI="2"
+WANT_AUTOMAKE="1.7"
+
+inherit eutils autotools
+
+MY_P=${P/_/}
+S="${WORKDIR}/${PN}-cvs-20050624"
+
+DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
+HOMEPAGE="http://sourceforge.net/projects/mdbtools"
+SRC_URI="mirror://gentoo/${PN}-cvs-20050624.tar.gz"
+
+IUSE="gnome odbc"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND=">=dev-libs/glib-2
+	sys-libs/ncurses
+	sys-libs/readline
+	gnome? (
+		>=gnome-base/libglade-2
+		>=gnome-base/libgnomeui-2 )
+	odbc? ( >=dev-db/unixODBC-2.0 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	>=sys-devel/flex-2.5.0
+	>=sys-devel/bison-1.35"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc34.patch
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	epatch "${FILESDIR}"/${P}-haveiconv-fix.patch
+
+	# This is necessary since the upstream tarball was created with a
+	# buggy libtool, and the .so suffix in library names is lost in
+	# some platforms (e.g. amd64).  Starting with libtool 2.2.4 it is
+	# also necessary to remove the acinclude.m4 file since it contains
+	# an old libtool.m4 that is obsolete, #227257.
+	rm "${S}"/acinclude.m4
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	use odbc && myconf="${myconf} --with-unixodbc=/usr"
+
+	econf ${myconf} || die "configure failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Installation failed"
+	dodoc COPYING* NEWS README* TODO AUTHORS HACKING ChangeLog
+
+	# add a compat symlink (gmdb2 is not compiled if gnome USE flag is disabled)
+	use gnome && dosym gmdb2 /usr/bin/gmdb
+}