Fix endianess detection, bug #222301.

Package-Manager: portage-2.1.8.3/cvs/Linux parisc64

4 files changed, 71 insertions, 12 deletions

diff --git a/app-arch/unace/ChangeLog b/app-arch/unace/ChangeLog
index e22692c8d402..a250711e002a 100644
--- a/app-arch/unace/ChangeLog
+++ b/app-arch/unace/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/unace
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/ChangeLog,v 1.35 2010/01/01 19:40:07 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/ChangeLog,v 1.36 2010/08/23 09:55:19 gmsoft Exp $
+
+*unace-2.5-r2 (23 Aug 2010)
+
+  23 Aug 2010; Guy Martin <gmsoft@gentoo.org> +unace-2.5-r2.ebuild,
+  +files/unace-2.5-endianness-detection.patch:
+  Fix endianess detection, bug #222301.
 
   01 Jan 2010; Christian Faulhammer <fauli@gentoo.org> unace-2.5-r1.ebuild:
   Transfer Prefix keywords
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index 2a90cfed2845..47461b04f4b3 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX unace-1.2b-64bit.patch 1604 RMD160 fb7cc31a9b73f918da5907d54ba7ec54e450b4b9 SHA1 d9cece37bf6fce4c72625dfb08ad544e8eed8192 SHA256 ce7233f16b6001079749cfc5bfc4d52d2f0711c3cc2943c3272d58644c59caa8
 AUX unace-1.2b-CAN-2005-0160-CAN-2005-0161.patch 4618 RMD160 e638448a91f1017f62bd1d351ef3762370beee04 SHA1 ea7b95c24b1c4d94182bc773b167ee76f0214a37 SHA256 c8327d6ae8bf1b905e7faaf43a54cae7e01ace9eb8aefb61b9a6fabbf4d78c74
+AUX unace-2.5-endianness-detection.patch 889 RMD160 f7fa16a7b1861275a63a519d9266c5736f39e4f1 SHA1 4afff597ec9a9d5f9456a19b725b8cba674b204c SHA256 eb229f92c2012128fc0ee5fc108b1b57e06ec97781dd438fb0f5a59415be5cd4
 DIST linunace25.tgz 202606 RMD160 ac7bcc89452e6d410a0d638df5737bbecaaa9165 SHA1 64169a8f63aab9749beacc66ab0572981bd28c0f SHA256 7ef5dd1828e7ec15f4961a0396cdc2db59ba042162409ed074fda05ff9888c84
 DIST unace-1.2b.tar.gz 20784 RMD160 09c9f427db01c39851c9865766f1dea726b19df3 SHA1 f3ea47f3be70e5bd19914fbf7ea44d70bad04855 SHA256 7e7d11b05baa6ecb8b70274dc909362f8277003962c665226abb8e433460ecf5
 DIST unace-nonfree_2.5-5.diff.gz 13921 RMD160 7e618bdbd98101bc95d7f140ed8dfa6b266d2e6c SHA1 21f6133ee2d076053296f8375fc8f54122032fd5 SHA256 c9666d9739e0047483c7dfc822f606ec17465e0618a6fd1f98030f86a8469a3b
 DIST unace-nonfree_2.5.orig.tar.gz 122509 RMD160 f899e1e43d9ab039d1340347cfc1804d71b1c1b0 SHA1 f658f03aa6f663c1a90af85e3e8c6e7ef12adb42 SHA256 5a85480ed0d39672962a05dc835efc0876be4f0d47b0fa7741b955ae7b148566
 EBUILD unace-1.2b-r1.ebuild 887 RMD160 3dced1c2c3503d1849513c4b6494daa11ad36ec7 SHA1 47cc49aadebbc9c64362e5faefb0fe1db17f072f SHA256 f2f208b79c53df8bc3f72f02592094c4672b37d24d2129b1469e55566d4ff351
 EBUILD unace-2.5-r1.ebuild 966 RMD160 401293780d516c7c89e87e7abf842f65ff0e9a77 SHA1 fc5563dba7cd9bc5457a15fe8139044da216a6e4 SHA256 16cef9a15c1dabc1317ebd0af218a9464063f5ff620f33b75830b8b527f02222
+EBUILD unace-2.5-r2.ebuild 1021 RMD160 6d141ede63d074319001710b24ebb0f41a447b81 SHA1 225f90dc71535439bdf8794535894eed503b29dc SHA256 23cd8ab09e35a70eba32b05d43574a2966de7e24034e2fabc86be4c20ef7a18f
 EBUILD unace-2.5.ebuild 492 RMD160 614114166d53d3d943f29c57e4fd7b88e29dac53 SHA1 12ebeb169c7412deef10488453d3d79c961b6516 SHA256 3f5b2ca69a37696c7ec6cd9fad1876be39cd7715429a6845b9ce30a8154c92a0
-MISC ChangeLog 4069 RMD160 079fcb92556e01d718dedcb3ec21d12a1b32130c SHA1 8e1963f9abd7bcb49b91af7f072d6ec6942b5f72 SHA256 3ebd0ded28e881be3c8add5bd8426876d61c9398de46273bba78c5708c92c16b
+MISC ChangeLog 4255 RMD160 b67e067aa9c82ec57a5e458ce8bd0197b24555c5 SHA1 90946f1ef9187562b7d3cdbf0d66753e879cb492 SHA256 2fbbc2ed3be1915ee3f10883ad0f9ce782b5b535be3d284e978dc96cabdb70da
 MISC metadata.xml 245 RMD160 f8c757bd69d5368e042052a3d4f19e201ce29aaf SHA1 0d5026e2b0148acc1b1367391c974c9f3aa8963e SHA256 97f8c99117c7fc7523ab85ec3df150c74135486a6cc40d11d2a40fdd72a0e789
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAks+T50ACgkQNQqtfCuFneMw3wCgjXcCARM+amiHuTboiKdlwXhn
-U0MAniwxwP2IuUTEKL7gLBEwmK0TxEzU
-=joID
------END PGP SIGNATURE-----
diff --git a/app-arch/unace/files/unace-2.5-endianness-detection.patch b/app-arch/unace/files/unace-2.5-endianness-detection.patch
new file mode 100644
index 000000000000..3a574a6b90ba
--- /dev/null
+++ b/app-arch/unace/files/unace-2.5-endianness-detection.patch
@@ -0,0 +1,26 @@
+diff -uNr unace-2.5.orig/source/base/all/all.h unace-2.5/source/base/all/all.h
+--- unace-2.5.orig/source/base/all/all.h	2010-08-03 14:22:49.809269706 +0000
++++ unace-2.5/source/base/all/all.h	2010-08-03 14:29:10.189469638 +0000
+@@ -61,7 +61,7 @@
+ #define put_unaligned(ptr, val) ((void)( *(ptr) = (val) ))
+ #endif /* __EMULATE_UNALIGNED__ */
+ 
+-#ifdef __BIG_ENDIAN__
++#if __BYTE_ORDER == __BIG_ENDIAN
+ #define ADJUST_ENDIANNESS16(Ptr) {\
+   USHORT x = get_unaligned((USHORT*) (Ptr));\
+   put_unaligned((USHORT*) (Ptr), x >> 8 | x << 8);\
+@@ -78,10 +78,12 @@
+   x2 = x2 >> 16 | x2 << 16;\
+   put_unaligned(((ULONG*) (Ptr)), (x2&0xff00ff00) >> 8 | (x2&0x00ff00ff) << 8);\
+ }
+-#else
++#elif __BYTE_ORDER == __LITTLE_ENDIAN
+ #define ADJUST_ENDIANNESS16(Ptr) 
+ #define ADJUST_ENDIANNESS32(Ptr) 
+ #define ADJUST_ENDIANNESS64(Ptr) 
++#else
++#error Please define system endianness
+ #endif
+ 
+ #endif
diff --git a/app-arch/unace/unace-2.5-r2.ebuild b/app-arch/unace/unace-2.5-r2.ebuild
new file mode 100644
index 000000000000..9644aafe25e3
--- /dev/null
+++ b/app-arch/unace/unace-2.5-r2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/unace-2.5-r2.ebuild,v 1.1 2010/08/23 09:55:19 gmsoft Exp $
+
+inherit eutils toolchain-funcs
+
+DEB_VER="5"
+DESCRIPTION="ACE unarchiver"
+HOMEPAGE="http://www.winace.com/"
+SRC_URI="mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}.orig.tar.gz
+	mirror://debian/pool/non-free/u/unace-nonfree/unace-nonfree_${PV}-${DEB_VER}.diff.gz"
+
+LICENSE="freedist"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~sparc-solaris"
+IUSE=""
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${WORKDIR}"/unace-nonfree_${PV}-${DEB_VER}.diff
+	local p
+	for p in $(<unace-nonfree-${PV}/debian/patches/00list) ; do
+		epatch unace-nonfree-${PV}/debian/patches/${p}.dpatch
+	done
+	epatch "${FILESDIR}"/${P}-endianness-detection.patch
+	tc-export CC
+}
+
+src_install() {
+	dobin unace || die
+	doman unace-nonfree-${PV}/debian/manpage/unace.1
+}