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

(Portage version: 2.2.0_alpha96-r1/cvs/Linux x86_64)

2 files changed, 80 insertions, 2 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/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
+}