Add internal LFS flag to CPPFLAGS #281473 by Rafał Mużyło.

Package-Manager: portage-2.2_rc38/cvs/Linux x86_64

3 files changed, 83 insertions, 7 deletions

diff --git a/app-arch/unzip/ChangeLog b/app-arch/unzip/ChangeLog
index 562922d469f5..80174c91cacb 100644
--- a/app-arch/unzip/ChangeLog
+++ b/app-arch/unzip/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/unzip
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.59 2009/08/14 07:20:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/ChangeLog,v 1.60 2009/08/16 18:15:45 vapier Exp $
+
+*unzip-6.0-r1 (16 Aug 2009)
+
+  16 Aug 2009; Mike Frysinger <vapier@gentoo.org> +unzip-6.0-r1.ebuild:
+  Add internal LFS flag to CPPFLAGS #281473 by Rafał Mużyło.
 
 *unzip-6.0 (14 Aug 2009)
 
diff --git a/app-arch/unzip/Manifest b/app-arch/unzip/Manifest
index 9ec7ff59d130..2d2bc7fcca9b 100644
--- a/app-arch/unzip/Manifest
+++ b/app-arch/unzip/Manifest
@@ -7,13 +7,13 @@ AUX unzip-6.0-no-exec-stack.patch 381 RMD160 c45c06fd6a4fc88ce051637b6d7f1f4b0e0
 DIST unzip552.tar.gz 1140291 RMD160 b749b0923bc4cceaa6f937aef688e9713a84328c SHA1 1831bd59b9e607a69052f83b263384895e2d4a19 SHA256 145d95e2ef1ef9add2e3c97d1340907e33ab8749eb1235372e7f0b7af600a8e9
 DIST unzip60.tar.gz 1376845 RMD160 48af66606e9472e45fbb94bc4e285da23d1b89ba SHA1 abf7de8a4018a983590ed6f5cbd990d4740f8a22 SHA256 036d96991646d0449ed0aa952e4fbe21b476ce994abc276e49d30e686708bd37
 EBUILD unzip-5.52-r2.ebuild 1741 RMD160 3c2526bb8e409cdfa732bf3ede58b634c12969cb SHA1 cbb348d770925e7737bfff4d1832ea6c374184a5 SHA256 939f3df994f9b6b34932dcba358ea9b6f5c93c2fa297e619b97742b4995db539
-EBUILD unzip-6.0.ebuild 1918 RMD160 5478a022561c774979faf3b4a4c56f03c947a163 SHA1 bff497f2969139a325149829d29495f2e78302a6 SHA256 1c16113f54cdf1d7c2dc11deda699344f9d1706fd614031f97d24bcb4f1fb5e5
-MISC ChangeLog 6893 RMD160 4584269e940786e822dc8c792581c042f6d9f515 SHA1 8a61f3892775206d12a695d0783ea32b84c47de9 SHA256 02f1a23727c48ceaf99557f05a798d2257f033126dce1f27b987215dce62b169
+EBUILD unzip-6.0-r1.ebuild 1967 RMD160 55b825452a13789f6e60d8aa507ace10bd02e7d5 SHA1 4c6c92c9efc28be7a9df8dfdab7b2abd1e7c113e SHA256 94e687cfe97b1f742a3722329b204e68673403314d0da9f237ff8508fe1889a0
+MISC ChangeLog 7059 RMD160 29cb7e257e03f9e5e21d8b5cb6fbf9688316fd00 SHA1 a6516e8501d0e05beb2345e995c1a372bf4a5c44 SHA256 3cbe7c1f4461901c39cf3aa8c0026eda61425294024826175b52cf0d8cc4b8eb
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.12 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkqFEGEACgkQlPl3HsVfCDrThwCfdQeHMDSGkklgU4lRNInuEGtR
-6mcAn3cEVTdTUzim48BB7mmbHzbCiZGB
-=NNfh
+iEYEARECAAYFAkqITNcACgkQlPl3HsVfCDqf6gCfZ4jb5Brv3ZadYGQDa8qrYjO8
+92cAnA1vTQChQKp/dvSEbA07AxBkhxh3
+=49OI
 -----END PGP SIGNATURE-----
diff --git a/app-arch/unzip/unzip-6.0-r1.ebuild b/app-arch/unzip/unzip-6.0-r1.ebuild
new file mode 100644
index 000000000000..d0b05ea8f01a
--- /dev/null
+++ b/app-arch/unzip/unzip-6.0-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/unzip/unzip-6.0-r1.ebuild,v 1.1 2009/08/16 18:15:45 vapier Exp $
+
+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="~amd64 ~x86"
+IUSE="bzip2 unicode"
+
+DEPEND="bzip2? ( app-arch/bzip2 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-no-exec-stack.patch
+	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 .)::" \
+		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-lfs-flags #104315
+	append-cppflags -DLARGE_FILE_SUPPORT #281473
+
+	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
+}