From d30069f48c7ec183ebc60077bdf4fcf887dab0ac Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alexander@sulfrian.net>
Date: Tue, 6 Mar 2012 22:49:55 +0100
Subject: games-util/wbfs_file: added fix for 64bit

---
 games-util/wbfs_file/Manifest                |  3 ++-
 games-util/wbfs_file/files/64bit_fix.patch   | 38 ++++++++++++++++++++++++++++
 games-util/wbfs_file/wbfs_file-2.9-r1.ebuild | 37 +++++++++++++++++++++++++++
 games-util/wbfs_file/wbfs_file-2.9.ebuild    | 36 --------------------------
 4 files changed, 77 insertions(+), 37 deletions(-)
 create mode 100644 games-util/wbfs_file/files/64bit_fix.patch
 create mode 100644 games-util/wbfs_file/wbfs_file-2.9-r1.ebuild
 delete mode 100644 games-util/wbfs_file/wbfs_file-2.9.ebuild

diff --git a/games-util/wbfs_file/Manifest b/games-util/wbfs_file/Manifest
index 48a83e4..99feb55 100644
--- a/games-util/wbfs_file/Manifest
+++ b/games-util/wbfs_file/Manifest
@@ -1,2 +1,3 @@
+AUX 64bit_fix.patch 1079 RMD160 90b6221cd765bb229e7b85dd4fab019872111d73 SHA1 5afb50176e10b2704afa4094b321bf6a90a7385c SHA256 e1eeaa04229447eefe44c71decf75a4d88c7423adee4248f06442cb9a9137d1c
 DIST wbfs_file_2.9.zip 687419 RMD160 50aac97941e27917ac3ada763eb3b30b5924118e SHA1 e7b0c9ffe577cb920d3b43f2e7f0134d5e5556d9 SHA256 2a3973c907dc35398047dbf748863191514f4d2c64423449729c7d36f1b8b838
-EBUILD wbfs_file-2.9.ebuild 686 RMD160 02aba682be46cfd520eeecfd754fe8d44c7d885a SHA1 f3d54319bcab5d6d1d7f08c701efcc412d64dd86 SHA256 08421c0292d356c8428db4a9d2d5b64e16ba9c57b2ffccbd5b2b0d700df6ed58
+EBUILD wbfs_file-2.9-r1.ebuild 723 RMD160 00af920a2e6c377ae3e5d10f0366b1fca56c00fc SHA1 edc4bbfe900104684ca78d4ac45ca723b80a5486 SHA256 718b621be1c7c6f9d7e2eae6f1aa90568b50c75046d30fdddd89a0d3eb6b199d
diff --git a/games-util/wbfs_file/files/64bit_fix.patch b/games-util/wbfs_file/files/64bit_fix.patch
new file mode 100644
index 0000000..97d6db2
--- /dev/null
+++ b/games-util/wbfs_file/files/64bit_fix.patch
@@ -0,0 +1,38 @@
+diff -r -u source/libwbfs/rijndael.c wbfs_file_2.9/source/libwbfs/rijndael.c
+--- source/libwbfs/rijndael.c	2009-03-26 18:37:14.000000000 +0100
++++ source/libwbfs/rijndael.c	2012-03-06 22:44:07.000000000 +0100
+@@ -11,10 +11,11 @@
+ 
+ #include <stdio.h>
+ #include <string.h>
++#include <stdint.h>
+ 
+ #define u8 unsigned char       /* 8 bits  */
+-#define u32 unsigned long       /* 32 bits */
+-#define u64 unsigned long long
++#define u32 uint32_t       /* 32 bits */
++#define u64 uint64_t
+ 
+ /* rotates x one bit to the left */
+ 
+diff -r -u source/tools.h wbfs_file_2.9_64bit//source/tools.h
+--- source/tools.h	2009-03-18 17:17:38.000000000 +0100
++++ source/tools.h	2012-03-06 22:43:26.000000000 +0100
+@@ -5,11 +5,13 @@
+ #ifndef _TOOLS_H
+ #define _TOOLS_H
+ 
++#include <stdint.h>
++
+ // basic data types
+ typedef unsigned char u8;
+-typedef unsigned short u16;
+-typedef unsigned int u32;
+-typedef unsigned long long u64;
++typedef uint16_t u16;
++typedef uint32_t u32;
++typedef uint64_t u64;
+ 
+ u16 be16(const u8 *p);
+ u32 be32(const u8 *p);
+Only in wbfs_file_2.9_64bit//source: wbfs_file
diff --git a/games-util/wbfs_file/wbfs_file-2.9-r1.ebuild b/games-util/wbfs_file/wbfs_file-2.9-r1.ebuild
new file mode 100644
index 0000000..158cd24
--- /dev/null
+++ b/games-util/wbfs_file/wbfs_file-2.9-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="wbfs_file binary for working with wbfs files or partitions"
+HOMEPAGE="http://cfg-loader.googlecode.com"
+LICENSE="GPL-2"
+SLOT="0"
+
+MY_P="${PN}_${PV}"
+SRC_URI="http://cfg-loader.googlecode.com/files/${MY_P}.zip"
+
+KEYWORDS="~amd64"
+
+IUSE="-static"
+
+DEPEND="dev-libs/openssl
+	static? ( dev-libs/openssl[static-libs] )"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}/source"
+
+src_prepare() {
+	use static || sed -i '/ADD_LF = -static/d' ${S}/Makefile
+	epatch "${FILESDIR}/64bit_fix.patch"
+}
+
+src_install() {
+	dobin wbfs_file
+	dodoc ../readme.txt
+	dodoc ../readme_orig.txt
+}
diff --git a/games-util/wbfs_file/wbfs_file-2.9.ebuild b/games-util/wbfs_file/wbfs_file-2.9.ebuild
deleted file mode 100644
index f79d7e3..0000000
--- a/games-util/wbfs_file/wbfs_file-2.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="wbfs_file binary for working with wbfs files or partitions"
-HOMEPAGE="http://cfg-loader.googlecode.com"
-LICENSE="GPL-2"
-SLOT="0"
-
-MY_P="${PN}_${PV}"
-SRC_URI="http://cfg-loader.googlecode.com/files/${MY_P}.zip"
-
-KEYWORDS="~amd64"
-
-IUSE="-static"
-
-DEPEND="dev-libs/openssl
-	static? ( dev-libs/openssl[static-libs] )"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}/source"
-
-src_prepare() {
-	use static || sed -i '/ADD_LF = -static/d' ${S}/Makefile	
-}
-
-src_install() {
-	dobin wbfs_file
-	dodoc ../readme.txt
-	dodoc ../readme_orig.txt
-}
-- 
cgit v1.2.3