64bit lovin !

6 files changed, 47 insertions, 12 deletions

diff --git a/dev-libs/opensc/ChangeLog b/dev-libs/opensc/ChangeLog
index 98327ee27186..193ce64c9dc3 100644
--- a/dev-libs/opensc/ChangeLog
+++ b/dev-libs/opensc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/opensc
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.8 2004/08/31 22:10:52 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/ChangeLog,v 1.9 2004/10/13 12:56:24 vapier Exp $
+
+*opensc-0.8.1-r1 (13 Oct 2004)
+
+  13 Oct 2004; Mike Frysinger <vapier@gentoo.org> +files/0.8.1-64bit.patch,
+  +opensc-0.8.1-r1.ebuild, -opensc-0.8.1.ebuild, opensc-0.9.2.ebuild:
+  Version bump to fix 64bit problems.  Patch by Andreas Steffen.
 
 *opensc-0.9.2 (31 Aug 2004)
 
diff --git a/dev-libs/opensc/Manifest b/dev-libs/opensc/Manifest
index 6cf1483e4e7e..773c784945d8 100644
--- a/dev-libs/opensc/Manifest
+++ b/dev-libs/opensc/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 09173a2e68f31f5546c5c1ac0a4ebf7e opensc-0.8.1.ebuild 1224
-MD5 0caf09595cc6fefd6259d7addbda8c60 ChangeLog 1258
-MD5 0ae67158bcd1828ac8ce0c76ae0c22e9 opensc-0.9.2.ebuild 1242
-MD5 f86c0f261be1b0dfc62c930134c05a42 files/digest-opensc-0.8.1 64
+MD5 247fb27e04ff89fd468bf19742185281 ChangeLog 1502
+MD5 d0461d63751f8b5943108238b55d73fa opensc-0.8.1-r1.ebuild 1285
+MD5 4a6b44e8c4b8196caa054da208fab945 opensc-0.9.2.ebuild 1300
+MD5 074aae91efbecf981a1e8ed73d5d1681 files/0.8.1-64bit.patch 577
 MD5 7e385f133c96ce2511b8dbed242c2959 files/digest-opensc-0.9.2 64
+MD5 f86c0f261be1b0dfc62c930134c05a42 files/digest-opensc-0.8.1-r1 64
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBa0ntHTu7gpaalycRAlSOAKCMiSy8lqikjEuSHRRG+hD4KvMgygCeP0nf
-uksVE+qkbOwIDVLyQzO7pRs=
-=XD0E
+iD8DBQFBbSYJHTu7gpaalycRAp9AAJ99r3i9maUfL+v1DAZ0sVZOMxHlUwCfQ6VK
+TyrlEyORAFr5idMU52sg9E0=
+=g/wG
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/opensc/files/0.8.1-64bit.patch b/dev-libs/opensc/files/0.8.1-64bit.patch
new file mode 100644
index 000000000000..91b18496443e
--- /dev/null
+++ b/dev-libs/opensc/files/0.8.1-64bit.patch
@@ -0,0 +1,20 @@
+--- opensc-0.8.1/src/libopensc/asn1.c.ori	Wed Oct 13 12:38:24 2004
++++ opensc-0.8.1/src/libopensc/asn1.c	Wed Oct 13 12:39:15 2004
+@@ -474,7 +474,7 @@
+  */
+ static int decode_bit_field(const u8 * inbuf, size_t inlen, void *outbuf, size_t outlen)
+ {
+-	u8		data[sizeof(unsigned int)];
++	u8		data[sizeof(size_t)];
+ 	unsigned int	field = 0;
+ 	int		i, n;
+ 
+@@ -495,7 +495,7 @@
+ static int encode_bit_field(const u8 *inbuf, size_t inlen,
+ 			    u8 **outbuf, size_t *outlen)
+ {
+-	u8		data[sizeof(unsigned int)];
++	u8		data[sizeof(size_t)];
+ 	unsigned int	field = 0;
+ 	int		i, bits;
+ 
diff --git a/dev-libs/opensc/files/digest-opensc-0.8.1 b/dev-libs/opensc/files/digest-opensc-0.8.1-r1
index 4a8463064b25..4a8463064b25 100644
--- a/dev-libs/opensc/files/digest-opensc-0.8.1
+++ b/dev-libs/opensc/files/digest-opensc-0.8.1-r1
diff --git a/dev-libs/opensc/opensc-0.8.1.ebuild b/dev-libs/opensc/opensc-0.8.1-r1.ebuild
index e917edcdc865..2e66b2005d9e 100644
--- a/dev-libs/opensc/opensc-0.8.1.ebuild
+++ b/dev-libs/opensc/opensc-0.8.1-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.8.1.ebuild,v 1.8 2004/10/12 03:05:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.8.1-r1.ebuild,v 1.1 2004/10/13 12:56:24 vapier Exp $
+
+inherit eutils
 
 DESCRIPTION="SmartCard library and applications"
 HOMEPAGE="http://www.opensc.org/"
@@ -20,7 +22,9 @@ RDEPEND="ldap? ( net-nds/openldap )
 
 src_unpack() {
 	unpack ${A}
-	use X || echo 'all:'$'\n''install:' > ${S}/src/signer/Makefile.in
+	cd ${S}
+	use X || echo 'all:'$'\n''install:' > src/signer/Makefile.in
+	epatch ${FILESDIR}/${PV}-64bit.patch
 }
 
 src_compile() {
diff --git a/dev-libs/opensc/opensc-0.9.2.ebuild b/dev-libs/opensc/opensc-0.9.2.ebuild
index 3b9f9f9d00e9..2c6ee331b013 100644
--- a/dev-libs/opensc/opensc-0.9.2.ebuild
+++ b/dev-libs/opensc/opensc-0.9.2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.9.2.ebuild,v 1.2 2004/10/12 03:05:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/opensc/opensc-0.9.2.ebuild,v 1.3 2004/10/13 12:56:24 vapier Exp $
+
+inherit eutils
 
 MY_P=${P/_/-}
 DESCRIPTION="SmartCard library and applications"
@@ -23,7 +25,9 @@ S=${WORKDIR}/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	use X || echo 'all:'$'\n''install:' > ${S}/src/signer/Makefile.in
+	cd ${S}
+	use X || echo 'all:'$'\n''install:' > src/signer/Makefile.in
+	epatch ${FILESDIR}/0.8.1-64bit.patch
 }
 
 src_compile() {