Handle running configure ourselves and be stricter with feature flags so they are respected #435410 by Ambroz Bizjak.

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 85 insertions, 7 deletions

diff --git a/app-arch/zip/ChangeLog b/app-arch/zip/ChangeLog
index 52297c7a3d59..0281b702e49f 100644
--- a/app-arch/zip/ChangeLog
+++ b/app-arch/zip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/zip
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.101 2013/02/18 22:42:54 zmedico Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.102 2014/01/05 18:26:15 vapier Exp $
+
+*zip-3.0-r2 (05 Jan 2014)
+
+  05 Jan 2014; Mike Frysinger <vapier@gentoo.org> +zip-3.0-r2.ebuild:
+  Handle running configure ourselves and be stricter with feature flags so they
+  are respected #435410 by Ambroz Bizjak.
 
   18 Feb 2013; Zac Medico <zmedico@gentoo.org> zip-3.0-r1.ebuild:
   Add ~arm-linux keyword.
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index c2ce044c29bf..f408bcb8e1cc 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -13,13 +13,24 @@ DIST zip232.tar.gz 807180 SHA256 d0d3743f732a9baa162f80d0c4567b9c545b41a33858250
 DIST zip30.zip 1287223 SHA256 7061ceac0407682b6dc54bb480347205f680f4e56cf34fe1423df2309f18968a SHA512 642ea6768d79adc1499251a3fb7bfc7ddc8d708699cbf9e0cfe849deda94165cb93e21dc2606bea1166ae5d8531e1e2cb056a7246bf2ab86ea7587bd4712d8d8 WHIRLPOOL 9e25cd9bcc25645667438019ab3423056a43b62d137c176e7aabad4ed8b7f7ddf6a7ccdedd9ada848c22d33b7f50f442910c39c4b2a5a188ad872109519cae7f
 EBUILD zip-2.32-r1.ebuild 1188 SHA256 c2055e9c02652dc728926d7fd5aace4673204b12abb155ccd0af1f11b1fd637d SHA512 62349d472665a40827215e5692cfee28feace2456810bce4cd262a329e925152ace6b69566a6c7e9384ef243c406173123f8164685d18445ffefcbcf78f1cb60 WHIRLPOOL 4279f0132b606ab79ce4ed793a4eb4207f4ae460acda16f28f6fa049fc8bbfa02a2da6268e5ce8791d38d821441d2cbe5bd5163b98d6e5ece9b0330490aaff72
 EBUILD zip-3.0-r1.ebuild 1479 SHA256 d890b3492b0f18c34d114f45d94a7026c93bda1d2226737716e28c550d2c290c SHA512 f778eaf711124066edee02970db3be1a4e56a601eb8611f771cc03a31ffeee34215c92a207beeea2d0f9e1f242446cd7587921e44d829e2060a26aef27c57685 WHIRLPOOL 92b949d78471f8286f629569feb26aacf14615390ab426bfef87dbb1bc306e880378f38718788f091bae80814d4cb6c6efc405eef1965ab857af9403fa3cee14
+EBUILD zip-3.0-r2.ebuild 1718 SHA256 c9fb94c57711dd2a1be5751aebd4f47770a3c96406ce1f4d087b9cc7d7085ede SHA512 63bee74fd5bcc047bb811ccb7e58c88e91b58dbb7b332ad03872050ea7307f845918b4b98c9597a11340948a834bf6af42e7c7fdd0677f8226f306379b96c2a5 WHIRLPOOL bb892d49039c999a23e015b3ef2ce155ff122982100ce6e21cc3d905503f92e45121d01257a200030a033e69ed8c25cce47937fec44e1c391bd87fa4e6d77554
 EBUILD zip-3.0.ebuild 1493 SHA256 9514836f62da469c48a8e7cf619b92aa8637140655274ce4c632064927119e43 SHA512 599bc91b3c4be69f0e71d98191c92373bdc357ab9f56491c1def80a88266b82d4022b3b47af8c67843daa46c29ddc8f3daa79816e90d7e4abd7e6dd386320a90 WHIRLPOOL 24959ae1e39ab04c727ede04a724da79077c1c0272991a3591142b435e72c19d20e6d145d151fb844152636f94292ad67905c7473b677fad281e216d12c5b26a
-MISC ChangeLog 11239 SHA256 74408ca98993ec02ce2833e39e16aec3ec707c03c0eb4403f03bca95bb983af0 SHA512 e77b7e444eabc8a33f2ee45432778c8d6f661add54aa1eb75542f1c2cd7762cd707faf1bcccc6386d8033c6108864ae6fa507b3423e212315e2e9de097a3047b WHIRLPOOL 76bf068bf42a5c2149dde1d990e92b75a8217508472c4080a6946a34df1ca85239af9e3c4b52c9569204d4693c75e9f6d8b2034ca5af870fccb6a779bdeccf7e
+MISC ChangeLog 11458 SHA256 4be110ea7cd57f8b791ec265cd9c32727e7e66083b03b980140ecff901cc901b SHA512 e896f3c80347b08f1baa7763fc2d5e063006c26fc7d444ffe51ddb1c5e97696e0a222b586bcf046806542abf0c7f9cbc61a10e2e09c7718a4ea6719ff7b6c274 WHIRLPOOL 106d1e08ccbfcb8c30e1932b3c0a40e2fb26e4ce58e927fc00e956d9f99678b83861449af7c35886751877ee00a4cb0f2f7c08c15b5d0c133d79fdd0a62ed84d
 MISC metadata.xml 398 SHA256 891de1d65a105972c5476663b951438a4506f15271009898514b0d37c14ede51 SHA512 18f64d7473c52c97195f0357ad3a2f353bab115cbf2cabf413c020e5d4f3b71d5a5cd589b79ab4e2be92858ab87eb71443f9a5d61799d98dc762a9adeee10850 WHIRLPOOL 4bd7748303c2ad8725da919e713a10b034334cae183d02a1227ae195198669520057b5f763cfe9e83c2edb4369c59bfbfc8b1eec04bb7569e69dcb38fbbf02bf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlEirm8ACgkQ/ejvha5XGaNkZgCeMShW8PLr2+pcYobHMqg9VOOv
-YBEAoPKF3TjPWg2YzBdGI9aM9jL+P8VC
-=bQ8c
+iQIcBAEBCAAGBQJSyaPLAAoJEPGu1DbS6WIARNcQAIlgDepuSI4GL9e0WIoDWzgM
+mrBTxXA/IcRXiY9fIs46OvDbl3DX2xF9dHN4kA+tZV+9el7YjNeHP8Q+e2o/r+IA
+aswPeNa16odCzQHW3c2SQuWvgWe2utfDQbsxOsmKvmRc7e9k/vggpUAG0LXwaoSa
++MtjfPRD5NU76wfzfuW3fW5kx702x7y05gHZzIErMBdFM3uLZfoo7VXXgfHYL2DK
+BWcPprRd1x8K+Iqk9YPdZc7XfoSDXrv41iU6BHsbI7uVJ43v5SfUdau1FTB+i+Fz
+hlv8z4K0hYOE5sR6LG2cSlYrdRybpz1M99iTuu9A+ysjBthutjBsDdT/uCb97iIq
+913AP1f8X672LWcYDUKRjwTbP8w3iEqGtH0PzT6PBX0mEnYyMNu+uNp6KHhxsPnf
+v9ytxiYRKzzvkXty/4t5H+u/BcMtgTCEoVTk1jorXuF5sC2tSa8nHBndWfxb+HIe
+CsDarcdltn8HaGnci18nz3gn0J20EU0hrL0fkp6/He4sH7BXuoEkMZd3wQJn69SZ
+okCliGlW6MN2XrC+QB6YDZdZQmqFroScu0mpqsfrwdWQG8vINZ6U/j3SYAomo67L
+bS+h6+PHarRA3UWIrC3amfz1Usby5Va1lfjSh397QlsUus/CHp2xgTGWllIh6bqx
+gzapTMNK+DvPAJMEm2ms
+=ar6g
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zip/zip-3.0-r2.ebuild b/app-arch/zip/zip-3.0-r2.ebuild
new file mode 100644
index 000000000000..04ee003e8521
--- /dev/null
+++ b/app-arch/zip/zip-3.0-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-3.0-r2.ebuild,v 1.1 2014/01/05 18:26:15 vapier Exp $
+
+EAPI="4"
+inherit toolchain-funcs eutils flag-o-matic
+
+MY_P="${PN}${PV//.}"
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="mirror://sourceforge/infozip/${MY_P}.zip"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux"
+IUSE="bzip2 crypt natspec unicode"
+
+RDEPEND="bzip2? ( app-arch/bzip2 )
+	natspec? ( dev-libs/libnatspec )"
+DEPEND="${RDEPEND}
+	app-arch/unzip"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.0-no-crypt.patch #238398
+	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
+	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
+	epatch "${FILESDIR}"/${PN}-3.0-build.patch
+	use natspec && epatch "${FILESDIR}"/${PN}-3.0-natspec.patch #275244
+}
+
+src_configure() {
+	append-cppflags \
+		-DLARGE_FILE_SUPPORT \
+		-DUIDGID_NOT_16BIT \
+		-D$(usex bzip2 '' NO)BZIP2_SUPPORT \
+		-D$(usex crypt '' NO)CRYPT \
+		-D$(usex unicode '' NO)UNICODE_SUPPORT
+	# Third arg disables bzip2 logic as we handle it ourselves above.
+	sh ./unix/configure "$(tc-getCC)" "-I. -DUNIX ${CFLAGS} ${CPPFLAGS}" "${T}" || die
+	if use bzip2 ; then
+		sed -i -e "s:LFLAGS2=:&'-lbz2 ':" flags || die
+	fi
+}
+
+src_compile() {
+	emake \
+		CPP="$(tc-getCPP)" \
+		-f unix/Makefile generic
+}
+
+src_install() {
+	dobin zip zipnote zipsplit
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}