Clean up build a bit and use Debian patches.

Package-Manager: portage-2.2.0_alpha169/cvs/Linux x86_64
Manifest-Sign-Key: 0xFB7C4156

5 files changed, 115 insertions, 16 deletions

diff --git a/app-arch/unace/ChangeLog b/app-arch/unace/ChangeLog
index 28d11269ddd6..c57653c57827 100644
--- a/app-arch/unace/ChangeLog
+++ b/app-arch/unace/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/unace
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/ChangeLog,v 1.46 2013/02/20 09:54:31 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/ChangeLog,v 1.47 2013/03/28 03:07:37 vapier Exp $
+
+*unace-1.2b-r2 (28 Mar 2013)
+
+  28 Mar 2013; Mike Frysinger <vapier@gentoo.org>
+  +files/unace-1.2b-64bit-fmt.patch, +files/unace-1.2b-aliasing.patch,
+  +unace-1.2b-r2.ebuild:
+  Clean up build a bit and use Debian patches.
 
   20 Feb 2013; Agostino Sarubbo <ago@gentoo.org> unace-2.5-r2.ebuild:
   Stable for s390, wrt bug #431696
diff --git a/app-arch/unace/Manifest b/app-arch/unace/Manifest
index b839dc857eba..44da45020531 100644
--- a/app-arch/unace/Manifest
+++ b/app-arch/unace/Manifest
@@ -1,35 +1,40 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX unace-1.2b-64bit-fmt.patch 701 SHA256 82224cfcbefce63d93f7b71a089725dbec0fa2ade4e0ef7dc6c88f29b2154481 SHA512 57261e028767740b191a0b0bfa4da17451e8b691eae7e866f19571964cff440a9d88f600eb4fc9bec19383e4445f6614b25f906e9af995a7991f9592fb5ea931 WHIRLPOOL 9d7263ce639ff3c26b3dd76f05210dedc283edd34f00dfb560176695b3e297c7a8e8e210ccef7a6cc2f3ec9f7072cc3a8e9bc45e0bc8e10f244c0d00ed20f8eb
 AUX unace-1.2b-64bit.patch 1604 SHA256 ce7233f16b6001079749cfc5bfc4d52d2f0711c3cc2943c3272d58644c59caa8 SHA512 36238e4a4eda3982755cae848cc0d3733bae14d2150698b166362b372163b932658695958b1f6036a6a70807d9231fbb1707146c67ff88a8d97a9de5ec6a55fc WHIRLPOOL 18a9e43f15f2022fac038b6e189e4462767b2755d6e2b5ef8d1e25dad059721aa804f299521c3aea35f710644192dec1492d9bb143f90272b960bb1ac052eb59
 AUX unace-1.2b-CAN-2005-0160-CAN-2005-0161.patch 4618 SHA256 c8327d6ae8bf1b905e7faaf43a54cae7e01ace9eb8aefb61b9a6fabbf4d78c74 SHA512 76c361d104561a71e403da57a8cd327aa5314d44545e8d114bebc8057146a0f9c2f1e14944dd1f2c5ba77a559ed9887624e314673f33bb7700c1e365ea6fdd30 WHIRLPOOL c5e30d1d48387bf2963b78e16379bf1b3c18149b77d1ca66c13ef2bd41d4445c2803344b65a97fb51f30212a1827386895af3c4b0daf7d3cc01d6dbe3ac89e5f
+AUX unace-1.2b-aliasing.patch 572 SHA256 9266aaae8de7dc18c17530c9fea611caac0ad64a5d1b2ca2a03a2356ea3f5bd2 SHA512 d53f1095f567521e2662485e8b27bf9747f37c9284f4d60c1558b6aa5aececf5a3009b4a448efc23c9f546fd5c42e949a36d8dbea96aa34eb6decd66fc03e8f4 WHIRLPOOL ec66c817f20e4711c1fbb17f6039477115cb110ddc1c423669e063300b514541ce3cf5d40ae83a357b61f9c65429b63bc24c27a7523078c04ba02aa0cee8f5f3
 AUX unace-2.5-endianness-detection.patch 889 SHA256 eb229f92c2012128fc0ee5fc108b1b57e06ec97781dd438fb0f5a59415be5cd4 SHA512 36911d0f32b348fb55185a6237ba9c1bf0cf1d864ca4aa9805371dabc8717f642aa81381bc1d85426f91465a82fdc8d003a50f4087da43584ac61734369b0d8b WHIRLPOOL 5e125086b448d6750fce710bd7436539ebffc3110b9beb47f124aecf611b55b871879e9454587fbedbd60d0af69bc0e3b6265c2a56f56bcfedda9351304e29e4
 DIST linunace25.tgz 202606 SHA256 7ef5dd1828e7ec15f4961a0396cdc2db59ba042162409ed074fda05ff9888c84 SHA512 354e0f4214379938789830f788c26f49ea277675aee3e9507bd100f07fd3beda54638cb555467cc8fe4a3e811eb1a0e8b2190a106611cfa869fd32dcfd2a48ed WHIRLPOOL 141c9bedc23f96b37eff7f0a3fff170623ce5b254385f38c2efd203b8a92abfeeb9aa4dd49654652f87adbea564b8bcaf54bab4aaafd3eeac5aeea141939e746
 DIST unace-1.2b.tar.gz 20784 SHA256 7e7d11b05baa6ecb8b70274dc909362f8277003962c665226abb8e433460ecf5 SHA512 45a5f0c026eeb1f4b8a0bf91bb8b13846d01c0c89fb56be943d284fa2729b38294c88057316d985671ad002a0c9805997e60d90c07a65eefc8ac62226ec65d51 WHIRLPOOL a95b1858e4b068cc727c7828f365db3ad355d11c50dc58f93a803c13a6f5f3a1340ccfac19f391411d10f92270d5f90dc1c71646c393dc866b1ddaa63161c175
 DIST unace-nonfree_2.5-5.diff.gz 13921 SHA256 c9666d9739e0047483c7dfc822f606ec17465e0618a6fd1f98030f86a8469a3b SHA512 33bf4390b7fa35ca887493af1796bfbc9c498c7754c36c422567e9e6d704358e71b96dc515d2aea798854bc9fe0371acc68ea0b8a838829b8de5a25fd5f5f069 WHIRLPOOL 487d6d759fb73ec3ad4c142055b02bf0ec9b01f366c273a38bb95af4eac0b752c9bc6c9c8468d8b3b9f35db30cbf0e6abfac8e4912fde4f113d1834202e111c8
 DIST unace-nonfree_2.5-7.debian.tar.gz 16205 SHA256 9cc12ae2fe1af2356164800390316501a82293e1692268edc9781275058ff809 SHA512 f381e68fe27f9e892bf76b0b976e89b801829fdb7d25caf3bab758a7d4cc9cf6d5157d6cccf08df94fa895b5cf75c8c0b8f4a0f5bd87e2b71811f88ec4e94b12 WHIRLPOOL a27dfa86f5e58a970187307cfc846ed92198dbadad885df2b62b44506ddb66662a9bb2e1df6a4c58e3676db4381670cae04c4309311a28f55adfd1cf7242c152
 DIST unace-nonfree_2.5.orig.tar.gz 122509 SHA256 5a85480ed0d39672962a05dc835efc0876be4f0d47b0fa7741b955ae7b148566 SHA512 f7e9f3431f882160693cb55a90449e881aead9dc501bb4bb8303f04530bd3f6e1d84bbc2775d23e7c680e1e2d55a06872658c4b14c7bf51dd2db73fdcdea953b WHIRLPOOL 9aaa3098ef45dad66a00c42d13cd916206751e37042ad5ce9cd5704a88219b0941bca69612a4c102acc2b6877d33b8b50f4fcbdc5b1853cadc2d7e3e5a1f3361
+DIST unace_1.2b-10.debian.tar.gz 7505 SHA256 50293d279acedf9843ce3973cd6f2edfb47e1c286b226813b0c8eff23bf58f4e SHA512 3c189b5a5934268a69ed9566836a16b5b264f77d354bcb5938d3d4b728e724d41cc819a410b521335d48696b604039f73b3c9eae48256293694b7e3e1bc65b11 WHIRLPOOL d0bc9a1f53953a01ab676d68977bfd84242a0e5e3af4ba6a236b03fd6bcf910ea32e7f51c8e5c403cdb855801012fb3b3fe0fa148e94fef715ee4c15d3487eb9
+DIST unace_1.2b.orig.tar.gz 27561 SHA256 a5f3b7d0994b2c6aa3b95ac1196ee18605d8dbd0660f978f8d64b8583fb55490 SHA512 9c030a43898c111d3cdaa8ea6469e0a5665ae3310633f21f87622c0f37b21554388b0a1250c72e53ea3411550f58b1372713e6eb82bf5092f6b7e485f366b6ec WHIRLPOOL 33867fc6a9b5d1cfc41c4e17f7dfb8ad6e07d96725227f2f5962e4f089a8ee371c8cf8c3b840837770a857ac0354f3eb4f4aea624b6f2c65bdda7990f10aa6f3
 EBUILD unace-1.2b-r1.ebuild 887 SHA256 f2f208b79c53df8bc3f72f02592094c4672b37d24d2129b1469e55566d4ff351 SHA512 62c208d93e8817dc69580600ac91ddb89a1404e794c291bcc2a1c2e4cd4c3164ab0e3c0343bab02bd49491cdf12a77a6d79fcf2c96433f10aadf8cd60092308b WHIRLPOOL b861aac4c0b8706ad4c344b8d69e7b74a584ac93eb126bdb74954e3b78e82f35d241ce359c63d8056e3757ede8463b2c5674330d598595f68fc8ce81b032a609
+EBUILD unace-1.2b-r2.ebuild 1128 SHA256 32c4888fbbe5985ec08fa66f1e12178a7cb2f50cb6999d2aa4653b3c68728929 SHA512 b09489b87a645e279437c42320721dadcd5c3bd64af8b2fd4d39b1eec14825f2e2bbf5392d7ccf1880a3788bbd6926dfbf07893b0efe085c79e1459615cc6303 WHIRLPOOL fd7ac9f11d6f89f6cfa3d2e8b2d19d16d65224d3b0dfbe946d5fd1d934f750d5b8931a2879d597d2ce70356dc3f740cc3b6aeb8dc71e5c3d18c42ac1c8289283
 EBUILD unace-2.5-r1.ebuild 966 SHA256 16cef9a15c1dabc1317ebd0af218a9464063f5ff620f33b75830b8b527f02222 SHA512 49085b593c3ea4dda956257fdae2216db3c414b1bb3be9dace05e5a759847b53c6ab403b146d02b931cf48d9fadfed478d9a3196a50b79d7594d70420d0ecc61 WHIRLPOOL d518078b1195155e9beb05995a2e3d06a083a3fb4953616ffc2723892336960d64922bb58d79bcc3ba56e6e434c8bcfe211e6b620c866f194aaaeebd53410533
 EBUILD unace-2.5-r2.ebuild 1023 SHA256 043a2d24ed59018ab7315bf3f59739baa36b20f3174392bacd5c3ef38f6fe892 SHA512 804d10043baec9088dd0a8597dfed9eaf6967a26853f5d83f110f76af6fad576a4352b516529e89b131d72e4c44a12a21a8f3657658df68cdf6a869b3cc30578 WHIRLPOOL 032220b62fd29a0b45113091a57afc95b129e581398197a8baa0620cc3ea1a781b678f79e73f363f885f4f73ff733ec5e229b6803ccb7284cff8a25476813425
 EBUILD unace-2.5-r3.ebuild 854 SHA256 fa6c8873255619a01785b6aa16573fe911a72f3ddc73cd15ce0c36a8d7ffae4e SHA512 f8dfcc618fd540f274abd0ca4f798da36a897cabfc420efac00a0bee3c9510673fe739ca5198e72f586f934d6eda4bbe36017125b257009f03eaaf4ad9a8cda9 WHIRLPOOL 20139d4024dd9cf24099f820aeb54fa00f728680507d82dd30f98a5269e622587e915f2cda33e3ecb6e9aba0bd01dddbe0be6cfcd7a0d53ec6322de4dec0d5c6
 EBUILD unace-2.5.ebuild 492 SHA256 3f5b2ca69a37696c7ec6cd9fad1876be39cd7715429a6845b9ce30a8154c92a0 SHA512 cf8066f17844f3ca14b8961e7d92ef0610a0552c53cc0579bae4fe03b103865ef5b6e40fef992ddf8f629d2dde93cd5bf5ceb83536b681bbc7255473e7e5330e WHIRLPOOL c098aa783e2b8fbac7b1b09b97edda642343b6a990fcd6837606bf9ebea5a09ac22422b1d712c6127148c6179f910b606f82fa53e0a510b056988482948fbdb3
-MISC ChangeLog 5340 SHA256 f0244d7366983d7f4851f96f62296286663f5ed2db7605608bc9b493c2cc0cc6 SHA512 cd12bb759968b3273928ced5fe200f722b07d9253a510cab5da5e872aa714b2fa88e3be6187eb383602a60a872ecac8e0cb3f78c4cd4354a46903566b59321eb WHIRLPOOL 0e67a5d48de6adbeb8d6cb426d1ac4012431c02af490632a903dcf2a0ca2b1e8558e5d9a9d8854a4308e527be15c13388825909b14b5e431953babf4c114bae9
+MISC ChangeLog 5567 SHA256 9723137b5e2acd16bccc4dbc8c7857c43152d01cb9a0dd96b9bdcd0cff7273b0 SHA512 7ead7d08b04906f0375e852dd0aac92fd40591e2d8d96c190135805f9b9c16f3270306bcfa8b6d9fa431d6b142e0031d79120628f3bd08e32b1c4703c26e3796 WHIRLPOOL ec923b6fa73caff62b9d043b98ba6234a0ef53a776298c27590754718148925589f850e84d2c3a11b681ddf747e48ca91d04f2ac34eb59a4106e3314fadffdcb
 MISC metadata.xml 245 SHA256 97f8c99117c7fc7523ab85ec3df150c74135486a6cc40d11d2a40fdd72a0e789 SHA512 ca454c82bc01e258d9f01fd07455acf1c24c02536c814eaacf007acbfbd9f8e1144e6d01ba93b771cd9e98a923d2e6b8fb1637835fb5eaf7be291afe6d24b588 WHIRLPOOL d3819852f72c4d79b84dc785147c557e239d2452b9d63339dd0ad1668486b9605e4b76a39f43d0ec339772e0e726f2d327aab6126b355b120d5f6d04a905b863
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRJJzTAAoJELp701BxlEWf2esQAMS4ibM7+uVMq04OuA0BnzSf
-EnYZU2esz8iQTOYgFQjLEamv9NmOB0+fzn4oOlvecAVAvoJsDARQwq2c9yE57eu6
-+mYz9MQDdAkltxEIRGOdn+xkU6RIVtp5sYAKrmeoliLkzOtsT9TYRAwVwhZBqqqu
-nFgxbAVA27W9VU1s9vQR7SRk5xBa2jH65MNXJBned6T37psvxC9G5b1pB5U9h05p
-AipzfiGJwr/h3fRC5UPGOIovUvh8pcnK7mTi2kTmmbRJKbmsHCpTkKE1UFQTgMHM
-dh8BYwHHykVkl94D1gQei3S70R6AkKAJVd0G94bXCVzaf/IcEQQ5S7/ZGGZvLua1
-K8xmHd/4d9hIzPQAW0m3JoM0KGtDQ7ymaEUGrFxGXPLAAcRcqB6FAyY1FylKZarf
-r6Lryd1Czmf79c4IV86XWDdgI6UfjYqeyfWcznsP4Xgwe8Hhe5UEJYhEGGiVluIg
-gO/VgaUmeWPaG3i1ARDARYLyzuEVIm/5fnirNQx0eJ6OT9KPtOeE2pdg0yadg36a
-V1zs9FgeQTw4qphsiIeDyN6j7jvy20YHNv+Fmnlzp3qVE4iv0PQonHdJ7h1/MqsR
-ojUcAjZsf+QwJ+Nn2ESIN8wtJX+dAjITQJoil52CTcqRvUbV1kLWebOg4vLSXR/K
-1RL7S/7FdAmR9R86R+u/
-=TfXw
+iQIcBAEBCAAGBQJRU7UTAAoJELEHsLL7fEFWFRwP/jv3OCF51O/75kQXWt4MAKzH
+MHAg0zTjOSktLcc0xeYnyVWwm/Q1gJtB6ZoqsNfT9UynQiQOyrpUxjLKJQD+c4dj
+QgTyWMpPIGqPrLOCJC7Itc5siQQYaiBkxSMavTXpb+a/tUtoZPCGCZvcNXaPB1xo
+azETbTONZYYucY0ZrPrwWEKz2Bg+Obrx/bCrK0W9HD1Cm579lVwQ3MvoJ1WAgYtw
+KHAJtehm9lsNqjIbIQ5FqPJZ20i2FPEG49b/i1Yk/N01wTglotS0rLCedJpjnxAW
+nKuy7BN+WDxw/VRCS0ZsSrtVypu3FoMNH/9nCCmA70LlcfFNkqvHEHmKe9lJHCAt
+4Mlm5moBuRj8fxMP+ehqz/V0c+5qgthrVW+qddT7WqdKjqUa0/YV1QsSrkCOX/lb
+8NJ7Yii1xZI8RfdQpVVsAeeW9gz4OplTdcKks2YscdNY9nq2CHMhz1L+dK/o7Fge
+f1TDDBwxoWMm75+9WEvXoK7ZJx5pgNk5CaN9OFaXuoxyWxCxEvrs243YKeyQvpd7
+hFH5LBjyHTHJNgmT6Zwbab1a8f0xPeOoV4BLuyLLPxU68heT/Sxcv67c+avzhna3
+wKMJ1Z0B4wXKHUh4UO+vBV0rkKoyy9cWXIJvDOG8uiRvqICRyWQNtf85DLrCITE0
+kUSeW3LFGq93zd5E3qI4
+=U5sN
 -----END PGP SIGNATURE-----
diff --git a/app-arch/unace/files/unace-1.2b-64bit-fmt.patch b/app-arch/unace/files/unace-1.2b-64bit-fmt.patch
new file mode 100644
index 000000000000..a7cdff7aca30
--- /dev/null
+++ b/app-arch/unace/files/unace-1.2b-64bit-fmt.patch
@@ -0,0 +1,20 @@
+--- unace/unace.c
++++ unace/unace.c
+@@ -516,7 +516,7 @@
+             tpsize+= fhead.PSIZE;
+          }
+          if (!f_err)
+-            printf("%02u.%02u.%02u|%02u:%02u|%c%c%9lu|%9lu|%4u%%|%c%s\n",
++            printf("%02u.%02u.%02u|%02u:%02u|%c%c%9u|%9u|%4u%%|%c%s\n",
+                    ts_day (ti), ts_month(ti), ts_year(ti)%100,
+                    ts_hour(ti), ts_min  (ti),
+                    fhead.HEAD_FLAGS & ACE_SP_BEF   ? '<' : ' ',
+@@ -529,7 +529,7 @@
+    }
+    if (!f_err)
+    {
+-      printf("\n                 %9lu|%9lu|%4u%%| %u file%s",
++      printf("\n                 %9u|%9u|%4u%%| %u file%s",
+              psize,
+              size,
+              percentage(psize, size),
diff --git a/app-arch/unace/files/unace-1.2b-aliasing.patch b/app-arch/unace/files/unace-1.2b-aliasing.patch
new file mode 100644
index 000000000000..ccd7f57c4f98
--- /dev/null
+++ b/app-arch/unace/files/unace-1.2b-aliasing.patch
@@ -0,0 +1,20 @@
+--- a/portable.h
++++ b/portable.h
+@@ -79,11 +79,13 @@
+ 
+ #else /* HI_LO_BYTE_ORDER */
+ 
+-#define BUFP2WORD(p) *(UWORD*)((p+=2)-2)
+-#define BUFP2LONG(p) *(ULONG*)((p+=4)-4)
++#define _MAGIC_UNION(type, p) ({ union { UCHAR *_c; type *_u; } _x = { ._c = (p) }; *_x._u; })
+ 
+-#define BUF2WORD(p) (*(UWORD*)p)
+-#define BUF2LONG(p) (*(ULONG*)p)
++#define BUFP2WORD(p) _MAGIC_UNION(UWORD, ((p+=2)-2))
++#define BUFP2LONG(p) _MAGIC_UNION(ULONG, ((p+=4)-4))
++
++#define BUF2WORD(p) _MAGIC_UNION(UWORD, p)
++#define BUF2LONG(p) _MAGIC_UNION(ULONG, p)
+ 
+ #endif /* !HI_LO_BYTE_ORDER */
+ 
diff --git a/app-arch/unace/unace-1.2b-r2.ebuild b/app-arch/unace/unace-1.2b-r2.ebuild
new file mode 100644
index 000000000000..dd1c5451e2c2
--- /dev/null
+++ b/app-arch/unace/unace-1.2b-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unace/unace-1.2b-r2.ebuild,v 1.1 2013/03/28 03:07:37 vapier Exp $
+
+EAPI="4"
+
+inherit eutils toolchain-funcs
+
+DEB_VER="10"
+DESCRIPTION="ACE unarchiver"
+HOMEPAGE="http://www.winace.com/"
+SRC_URI="mirror://debian/pool/main/u/${PN}/${PN}_${PV}.orig.tar.gz
+	mirror://debian/pool/main/u/${PN}/${PN}_${PV}-${DEB_VER}.debian.tar.gz"
+
+LICENSE="GPL-2" #92846
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${PN}${PV}
+
+src_prepare() {
+	epatch $(sed 's:^:../debian/patches/:' "${WORKDIR}"/debian/patches/series)
+	epatch "${FILESDIR}"/${P}-64bit-fmt.patch
+	epatch "${FILESDIR}"/${P}-aliasing.patch
+	cp unix/{makefile,gccmaked} . || die
+}
+
+src_configure() {
+	sed -i \
+		-e '/^OSTYPE =/s:=.*:= Linux:' \
+		-e "/^CFLAGS =/s:=.*:+= -Wall:" \
+		-e "/^CC =/s:=.*:= $(tc-getCC):" \
+		-e 's/-DCASEINSENSE//g' \
+		makefile || die
+}
+
+src_compile() {
+	emake dep
+	emake
+}
+
+src_install() {
+	dobin unace
+	dodoc unix/readme.txt changes.log
+	doman ../debian/unace.1
+}