Add fix for 64bit OS. Add ~amd64 wrt bug #146426.

Package-Manager: portage-2.1.2_rc1-r3

4 files changed, 51 insertions, 11 deletions

diff --git a/dev-db/odbtp/ChangeLog b/dev-db/odbtp/ChangeLog
index d873f51ff2b5..0f912371d1ec 100644
--- a/dev-db/odbtp/ChangeLog
+++ b/dev-db/odbtp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-db/odbtp
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/odbtp/ChangeLog,v 1.1 2006/07/23 19:49:53 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/odbtp/ChangeLog,v 1.2 2006/11/05 20:46:30 peper Exp $
+
+  05 Nov 2006; Piotr Jaroszyński <peper@gentoo.org>
+  +files/odbtp-1.1.4-amd64.patch, odbtp-1.1.4.ebuild:
+  Add fix for 64bit OS. Add ~amd64 wrt bug #146426.
 
 *odbtp-1.1.4 (23 Jul 2006)
 
diff --git a/dev-db/odbtp/Manifest b/dev-db/odbtp/Manifest
index 23b153992e6d..a4e51b60b4bc 100644
--- a/dev-db/odbtp/Manifest
+++ b/dev-db/odbtp/Manifest
@@ -1,12 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX odbtp-1.1.4-amd64.patch 331 RMD160 506dc1f7fde31aa839eff7840bb380f7618cc7e1 SHA1 04f7a4509977247684ff8f58026dfe28d766ee6a SHA256 edf3f9ccfef247a37e8994895bb317481aed0266c663245c26629593ae5ae8b1
+MD5 f14580f143eaf85f56c11dc20e897746 files/odbtp-1.1.4-amd64.patch 331
+RMD160 506dc1f7fde31aa839eff7840bb380f7618cc7e1 files/odbtp-1.1.4-amd64.patch 331
+SHA256 edf3f9ccfef247a37e8994895bb317481aed0266c663245c26629593ae5ae8b1 files/odbtp-1.1.4-amd64.patch 331
 DIST odbtp-1.1.4.tar.gz 1049975 RMD160 4d724bace5041daf85df6c945346238acc076d40 SHA1 366ee9bc8d018ac4ce37a24a14d4f19e4b7a30b5 SHA256 c4f4e0b01610d0e547dfe70e9e2184fc35c8944a44be6a70ec8c8fc28dffe705
-EBUILD odbtp-1.1.4.ebuild 750 RMD160 fa917f5db77d5add9e1f2832f0bea9627358fae1 SHA1 64068bdf6476cffdb5c4905122144fb1f713f001 SHA256 a4ef145e6865628ecab72ca0bef9c0054b3a9a0a15040a4f28bbc0609a893362
-MD5 fd32a455dc31dcdd26f0fd3c105837a0 odbtp-1.1.4.ebuild 750
-RMD160 fa917f5db77d5add9e1f2832f0bea9627358fae1 odbtp-1.1.4.ebuild 750
-SHA256 a4ef145e6865628ecab72ca0bef9c0054b3a9a0a15040a4f28bbc0609a893362 odbtp-1.1.4.ebuild 750
-MISC ChangeLog 384 RMD160 561d0b4f9b3243f7c660a0521bef73affb098fc2 SHA1 8439f421dc536144a88b1967b648bea195d32f6f SHA256 59fb26ae7e4c486b4faa711a0b4e06a7add782bea2d8483bedb4c011964c303f
-MD5 f5554f9471a980ae75ae843484b77aee ChangeLog 384
-RMD160 561d0b4f9b3243f7c660a0521bef73affb098fc2 ChangeLog 384
-SHA256 59fb26ae7e4c486b4faa711a0b4e06a7add782bea2d8483bedb4c011964c303f ChangeLog 384
+EBUILD odbtp-1.1.4.ebuild 909 RMD160 81aa69ff95826c7c7cb5fd8b77d6241f6106043d SHA1 ea91789f33b69569c35288f56006190abfe6fcf6 SHA256 aa191ed0ceb3b47413621a94db2712422634e3adca306a25d022877c8c9fda99
+MD5 511340abcdc6f85f6b76d2d659568d51 odbtp-1.1.4.ebuild 909
+RMD160 81aa69ff95826c7c7cb5fd8b77d6241f6106043d odbtp-1.1.4.ebuild 909
+SHA256 aa191ed0ceb3b47413621a94db2712422634e3adca306a25d022877c8c9fda99 odbtp-1.1.4.ebuild 909
+MISC ChangeLog 543 RMD160 c36dcf800d40691dcc48d887f0b88fafaf161b2d SHA1 e1e49bd355b100bc41d4ecb387b86893e651bd32 SHA256 539751feb515cf6b602aa20ba606a8cf1009c76624fcb6c6e35b6518cae548d9
+MD5 d9c952fed5e5bbec29ec8678c83b8a70 ChangeLog 543
+RMD160 c36dcf800d40691dcc48d887f0b88fafaf161b2d ChangeLog 543
+SHA256 539751feb515cf6b602aa20ba606a8cf1009c76624fcb6c6e35b6518cae548d9 ChangeLog 543
 MISC metadata.xml 157 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a SHA1 ddaa23cc35eb917bf8962b652442bebb1ce0f440 SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1
 MD5 c58d07ca1c1235bbad9bccaec96fc062 metadata.xml 157
 RMD160 a98db3a086fae3c09a903dadbc05f60443ec4b1a metadata.xml 157
@@ -14,3 +21,10 @@ SHA256 54f8878ca0228e380abbaa4b529806b5533a6b9b51b3b16c0909e906586a91a1 metadata
 MD5 1e7d4f76ffa56bdb9cf46f65efa5b3d7 files/digest-odbtp-1.1.4 238
 RMD160 a738de718ca60a70561c4ca44bb1290f725fe2d4 files/digest-odbtp-1.1.4 238
 SHA256 e64a7efe2c5f474a1461d6d31829b9d1f0d729096513f5529fbe319ba3e3f57e files/digest-odbtp-1.1.4 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+
+iD8DBQFFTk2yppoStNGKGywRAsPRAJ9kY0+J1HcL/3uCirJanEbX36CM6wCfUuYp
+AqS/7dnD2N6N8/2c86guOyU=
+=cfdo
+-----END PGP SIGNATURE-----
diff --git a/dev-db/odbtp/files/odbtp-1.1.4-amd64.patch b/dev-db/odbtp/files/odbtp-1.1.4-amd64.patch
new file mode 100644
index 000000000000..1ba2cb3b71e5
--- /dev/null
+++ b/dev-db/odbtp/files/odbtp-1.1.4-amd64.patch
@@ -0,0 +1,11 @@
+--- odbtp-1.1.4/odbtp.h.old	2006-11-05 21:29:33.000000000 +0100
++++ odbtp-1.1.4/odbtp.h	2006-11-05 21:29:44.000000000 +0100
+@@ -22,7 +22,7 @@
+ #define _ODBTP_H_
+ 
+ /* The below line must be uncommented for 64-bit systems, such as Tru64. */
+-/* #define _C_LONG_64_ 1 */
++#define _C_LONG_64_ 1
+ 
+ #define ODBTP_LIB_VERSION "1.1.4"
+ 
diff --git a/dev-db/odbtp/odbtp-1.1.4.ebuild b/dev-db/odbtp/odbtp-1.1.4.ebuild
index 6efd3c7b78e2..4bd0b9b8b63a 100644
--- a/dev-db/odbtp/odbtp-1.1.4.ebuild
+++ b/dev-db/odbtp/odbtp-1.1.4.ebuild
@@ -1,15 +1,26 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/odbtp/odbtp-1.1.4.ebuild,v 1.1 2006/07/23 19:49:53 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/odbtp/odbtp-1.1.4.ebuild,v 1.2 2006/11/05 20:46:30 peper Exp $
+
+inherit eutils
 
-KEYWORDS="~x86"
 DESCRIPTION="ODBTP is a fast, efficient TCP/IP protocol for connecting to Win32-based databases from any platform."
 HOMEPAGE="http://odbtp.sourceforge.net/"
 SRC_URI="mirror://sourceforge/odbtp/${P}.tar.gz"
+
 LICENSE="GPL-2 LGPL-2"
 SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Patch according to the README.64bitOS
+	use amd64 && epatch "${FILESDIR}/${P}-amd64.patch"
+}
+
 src_compile() {
 	econf || die "econf failed"
 	emake -j1 || die "emake failed"