Add support for ASFLAGS and add abi-specific flags argument to AS

Package-Manager: portage-2.2.0_alpha96-r1/cvs/Linux x86_64

3 files changed, 89 insertions, 18 deletions

diff --git a/app-arch/unzip/ChangeLog b/app-arch/unzip/ChangeLog
index 720f9ac6d015..09e3149b94c2 100644
--- a/app-arch/unzip/ChangeLog
+++ b/app-arch/unzip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/unzip
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.80 2011/12/18 15:24:14 naota Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.81 2012/04/01 21:45:11 tommy Exp $
+
+*unzip-6.0-r3 (01 Apr 2012)
+
+  01 Apr 2012; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  +unzip-6.0-r3.ebuild:
+  Add support for ASFLAGS and add abi-specific flags argument to AS
 
   18 Dec 2011; Naohiro Aota <naota@gentoo.org> unzip-6.0-r2.ebuild:
   Add ~x86-fbsd wrt 349393
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index dbcc7382c01e..189632dcc1ec 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX unzip-5.52-CVE-2008-0888.patch 1075 RMD160 03d5ec7845ae9347a197c7d1484bb2d9ab96cb93 SHA1 a72e703048ddd2226d430b7375b531320997b98a SHA256 a93b927000ff5923c3e84fc4108a0f19d76a3a057a33556a2f761c18b270f87c
 AUX unzip-5.52-no-exec-stack.patch 334 RMD160 81d73b5bb66fb54f8f71252c1fe6e2036d488de9 SHA1 0f318fecebd548e9feb2e93a32c56258d5c552b1 SHA256 8e165db2c138f9729020f3e60e9d8be58d504f4cf8eb7aae18b9432d2d751d4f
@@ -10,22 +10,15 @@ DIST unzip60.tar.gz 1376845 RMD160 48af66606e9472e45fbb94bc4e285da23d1b89ba SHA1
 EBUILD unzip-5.52-r2.ebuild 1741 RMD160 3c2526bb8e409cdfa732bf3ede58b634c12969cb SHA1 cbb348d770925e7737bfff4d1832ea6c374184a5 SHA256 939f3df994f9b6b34932dcba358ea9b6f5c93c2fa297e619b97742b4995db539
 EBUILD unzip-6.0-r1.ebuild 2011 RMD160 57fb12cc72fc820cf58da58b813cbb989b0b462d SHA1 75044d9949bd65b1c57e40fe110bbeaf8fe223df SHA256 84b38662de06ea85d80c0260b4174f6b5ee2814bb42c4f734ff5b068f1ab7aeb
 EBUILD unzip-6.0-r2.ebuild 2130 RMD160 938b304d3e8611dfc9951acc6d581672028ad8eb SHA1 e35fa1813cf7f5347297efc6855e21c14b5a3c91 SHA256 3279a00c93b8c1b088a49a4992ac78a4aeace2b769605500a58d6a1977f8cd49
-MISC ChangeLog 9183 RMD160 e6232d6cfb07535f56cf8273f8c1f6eb2faaae57 SHA1 694d6ec0cbb3ac92d4fa1c4ad6589e5db26ddb73 SHA256 6175466db9f9cb10b7b64dd59e39b05cbac917e30d5ef466d73352ef3de528ff
+EBUILD unzip-6.0-r3.ebuild 2211 RMD160 44daef7541226f4ff8909ba0918ae3cecebb3397 SHA1 f87fed72c3f69aa9830f2b30b10c813e3545f571 SHA256 3c2202b80cac8b856d2e9e4f093ec7e782bcdedeb1195638bb595d786c766c7a
+MISC ChangeLog 9364 RMD160 9c4dcca063217a549f65b25ddcd555e7cec2d7fd SHA1 bbdb99bc2faec9ee2d703f58e263f4ab82f71fa7 SHA256 4687f47bfe86d6d3b15cc09fc5efbe09c2f83640c47e0497a512868d92b95706
 MISC metadata.xml 416 RMD160 138d4099c623a37c5a313319950ad579b8413c54 SHA1 7365f153006d4265bb645df6753584a655d9e5e6 SHA256 373bf8580935926301acc73ff176dac263dd9925059aaae3aa060bb03948e212
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJO7gWfAAoJEDYO1FT4VRUUg7QP/2zRlK+hJ/k0dD2zanak6K8x
-0T/xsnMQKHTFNIqFUUeiQWsVtWEYlU5lfeeVGYP91Ia6f7+//U0rp1tn8cz70jRO
-C5i6+/F8Jc9OQL4NMTqD2chdW3QGRkmFNByptkKM0XeqRGQTzTWybRxqCvNuzt5d
-INho4wHhuv7hOU20G8QHXBOonHYmSLvmi+noqBKkSZbh9Pediw9j/XFCVmu5J1jW
-Vk6i82DeiqfxEnxdfQmtHbNCbKWi7acq0TFv0XuWBR1UXpM+XsxYfV9m2Evufkck
-PoYRDD/AjetO0kRuRPv3IhvFMd/hOYFrhsyFNLOYBlZWV4olph9JkuEkI1MTh5s6
-45VweVDaYcKcQpE01V7psh+QqKUlOmTFmyqThmR8IZkLO5hsGOtJHuWtqvDsj9TO
-CyeoY4838y6FGNdNQlqALGyC/Dm5U/1zdtiudsJSxzdTHhQWZTqLjcIHEnHDYyO5
-a6yOUJtnntTjrOvoQWPv/pvs4xg5wtcn/j/tNIEK6Yq1JhTgbchhfQCNAzbQnix9
-d7nra46ZeU3cNsfBDFFlCLggyZQyFBoUugE/0EKSq0myk7Uumsc8TqYu34JxWSrQ
-Wu6NsNrkwu4q4hEMcLDqLrkQjN+/QiJbzscXyn1tJiLJHUENyaq2kU6qm82stRa9
-bA4F70K0OMEeRe0O7uO+
-=6iir
+iJwEAQECAAYFAk94zHMACgkQG7kqcTWJkGfvFgP/Wst9JVGSeOfk+qzwaJgZO81Y
+SxSX8+6d8CB43eAoEgYq7npF9w5z4di+ogaFFh01hI55dH8f1p3w0fcmL/zHizMu
+8B3TB/gt8MSqYppzkTbBXzyto0TxujH8DDg5BCDaBe0l0/BUbFpWM2D2idwuVDU+
+Y7wbKJupkr4XZjbPgBc=
+=JdUa
 -----END PGP SIGNATURE-----
diff --git a/app-arch/unzip/unzip-6.0-r3.ebuild b/app-arch/unzip/unzip-6.0-r3.ebuild
new file mode 100644
index 000000000000..f29fe6de3ce7
--- /dev/null
+++ b/app-arch/unzip/unzip-6.0-r3.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0-r3.ebuild,v 1.1 2012/04/01 21:45:11 tommy Exp $
+
+EAPI="2"
+inherit eutils toolchain-funcs flag-o-matic
+
+MY_P="${PN}${PV/.}"
+
+DESCRIPTION="unzipper for pkzip-compressed files"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.tar.gz"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="bzip2 natspec unicode"
+
+DEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-no-exec-stack.patch
+	use natspec && epatch "${FILESDIR}/${PN}-6.0-natspec.patch" #275244
+	sed -i \
+		-e '/^CFLAGS/d' \
+		-e '/CFLAGS/s:-O[0-9]\?:$(CFLAGS) $(CPPFLAGS):' \
+		-e '/^STRIP/s:=.*:=true:' \
+		-e "s:\<CC=gcc\>:CC=\"$(tc-getCC)\":" \
+		-e "s:\<LD=gcc\>:LD=\"$(tc-getCC)\":" \
+		-e "s:\<AS=gcc\>:AS=\"$(tc-getCC)\":" \
+		-e 's:LF2 = -s:LF2 = :' \
+		-e 's:LF = :LF = $(LDFLAGS) :' \
+		-e 's:SL = :SL = $(LDFLAGS) :' \
+		-e 's:FL = :FL = $(LDFLAGS) :' \
+		-e "/^#L_BZ2/s:^$(use bzip2 && echo .)::" \
+		-e 's:$(AS) :$(AS) $(ASFLAGS) :g' \
+		unix/Makefile \
+		|| die "sed unix/Makefile failed"
+}
+
+src_compile() {
+	local TARGET
+	case ${CHOST} in
+		i?86*-*linux*)       TARGET=linux_asm ;;
+		*linux*)             TARGET=linux_noasm ;;
+		i?86*-*bsd* | \
+		i?86*-dragonfly*)    TARGET=freebsd ;; # mislabelled bsd with x86 asm
+		*bsd* | *dragonfly*) TARGET=bsd ;;
+		*-darwin*)           TARGET=macosx ;;
+		*) die "Unknown target, you suck" ;;
+	esac
+
+	[[ ${CHOST} == *linux* ]] && append-cppflags -DNO_LCHMOD
+	use bzip2 && append-cppflags -DUSE_BZIP2
+	use unicode && append-cppflags -DUNICODE_SUPPORT -DUNICODE_WCHAR -DUTF8_MAYBE_NATIVE
+	append-cppflags -DLARGE_FILE_SUPPORT #281473
+
+	ASFLAGS="${ASFLAGS} $(get_abi_var CFLAGS)" emake \
+		-f unix/Makefile \
+		${TARGET} || die "emake failed"
+}
+
+src_install() {
+	dobin unzip funzip unzipsfx unix/zipgrep || die "dobin failed"
+	dosym unzip /usr/bin/zipinfo || die
+	doman man/*.1
+	dodoc BUGS History* README ToDo WHERE
+}