Version bump #237141 by Conrad Kostecki.

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26.2 x86_64

6 files changed, 145 insertions, 4 deletions

diff --git a/app-arch/zip/ChangeLog b/app-arch/zip/ChangeLog
index 62100807ec19..1ec46ed2e4f4 100644
--- a/app-arch/zip/ChangeLog
+++ b/app-arch/zip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-arch/zip
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.74 2008/03/17 16:06:43 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.75 2008/09/21 10:08:47 vapier Exp $
+
+*zip-3.0 (21 Sep 2008)
+
+  21 Sep 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/zip-3.0-build.patch, +files/zip-3.0-exec-stack.patch,
+  +files/zip-3.0-pic.patch, +zip-3.0.ebuild:
+  Version bump #237141 by Conrad Kostecki.
 
   17 Mar 2008; Jeroen Roovers <jer@gentoo.org> zip-2.32-r1.ebuild:
   Stable for HPPA (bug #213585).
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index 9fccfc694efd..95e0bf7260c0 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -1,9 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX zip-2.3-unix_configure-pic.patch 444 RMD160 8fd81ff732abe0e6189cd593c98e0055a11dca36 SHA1 c08486c683a9a8d02dbb0d500f421b07c0bcc704 SHA256 3e348be7890f21280fceab6cb2a87f3020b08a31608ab93d1b5a53667760e556
 AUX zip-2.31-exec-stack.patch 407 RMD160 a27f0112dbbda418feef97b66240442190e8b5d7 SHA1 3043e8150222749b6f05fc10f8ab1c15da21c8d0 SHA256 108686d8854096422bd4895690a37202aee66757d0d2b43afa16d9fb914cbb29
-AUX zip-2.31-make.patch 383 RMD160 941c9768d22c5080cc89f1caf59be88368b726b9 SHA1 b1d6523edaae339d58b3811d9423093f1e9af4ce SHA256 878ddf24bb89065c679653fbcc28add70e24fb4c8391bb4f47a4c40643e72581
 AUX zip-2.32-build.patch 2003 RMD160 3356051c53465fa70015818b6c8c364489bb5bf0 SHA1 34492ef0e226ff7912de01c9266580b148ff54f1 SHA256 3e4b94015c1448c8769d7154b308bd986e1d0e6e514da151d658d1b8ba3a774c
+AUX zip-3.0-build.patch 923 RMD160 7790c9e283cfd7b121f7bf7bcfdaed355a0c6d46 SHA1 2ac8bcaa53f1f506c3743980f5852b696233c0ac SHA256 a66386c3a48019d8063a48c3610a28862412926f04a3b8f44662c6a87bb250f5
+AUX zip-3.0-exec-stack.patch 548 RMD160 f05b881c81168f780301db44aaa51f317b460bb3 SHA1 a2b624a522a0d1fec1ab1d703dfabed5aa90850b SHA256 5e46b247107c71f34e00c93d27d9f5cf0812d1c8ffc171fc71addee715308ff5
+AUX zip-3.0-pic.patch 499 RMD160 481d78e842bc08b776c90c4b2a9e13bfce0fcadb SHA1 624b216446ff7208701409b3027e84030ec95145 SHA256 5f64ef0fc1afc0256fdb3a503dda10de6c5df576b8bfad328de720c68f8b777a
 DIST zip232.tar.gz 807180 RMD160 6b9326c8a60bc6bf08825e416140fd0ca8a6a7f1 SHA1 5bc562bf95d9aee0cb6625e6038898e1f191a4aa SHA256 d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f
+DIST zip30.zip 1287223 RMD160 88f34a3cc15ea153952289289f3d70f9a8a41f47 SHA1 4f244128ee8fa3fc07eedfee3d4ac634dcabd492 SHA256 7061ceac0407682b6dc54bb480347205f680f4e56cf34fe1423df2309f18968a
 EBUILD zip-2.32-r1.ebuild 1188 RMD160 d6900f122f833e17b91b362f528bdc47da740dc8 SHA1 77d6ce5f5b6e80a5df604a0029892eecfb7a7d03 SHA256 c2055e9c02652dc728926d7fd5aace4673204b12abb155ccd0af1f11b1fd637d
-EBUILD zip-2.32.ebuild 1268 RMD160 bf011d9e7efd73dfee0d9dce5b484ce2b6e7f512 SHA1 25bfe9c517d406e5b9e3d19c6c66fe393711a91e SHA256 a665756992659c236ca084e9e591264a8a0bc92845e67785320a62e64d8efe6e
-MISC ChangeLog 8160 RMD160 fcf809d009a1706aa449845610692b1af87dfad5 SHA1 e071ffe2c2bc19d6963e1dd4640602ac2714ceb1 SHA256 15d57eb3613514661e61656168c3fbd4cb3a394b940bafde4fd944e033e99693
+EBUILD zip-3.0.ebuild 1274 RMD160 eac369cbdfe65b4b21387f7a6fcaa92b2e645997 SHA1 c2b6d11177eeb3296e3d331c3b2b71e6f19f5422 SHA256 9afd0130a39876027da4e1dc094a6c8b6615f208543782bf336e19d35c73db04
+MISC ChangeLog 8389 RMD160 9daa30942965bf1354921bb3fd2e80f0c6dc738d SHA1 b0c42d3bf0bc02204b8f9a4fd930153cada0b77d SHA256 a61d1ecec38de51610fe16a8546e501c1c6d17001f9098d40442243718c1b5e9
 MISC metadata.xml 260 RMD160 43cb7ced9f55009bba29a4017d2ee88dab5ab83f SHA1 94674a402b77f6a586b2fc1ad889b8ac9e48b175 SHA256 b937624b5672a3a8f418d773a2dff2c4228888b64f40e2ca3350b3915b0e5319
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkjWHTUACgkQ67wieSYcaxeWIACg3Nc5sQ813AAvA3dMkL2Z6SNT
+LqcAniDFV+1GELzcxJNn6A79VajG8Cra
+=xdKq
+-----END PGP SIGNATURE-----
diff --git a/app-arch/zip/files/zip-3.0-build.patch b/app-arch/zip/files/zip-3.0-build.patch
new file mode 100644
index 000000000000..595303cc48d4
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-build.patch
@@ -0,0 +1,36 @@
+respect build environment settings
+
+--- zip/unix/configure
++++ zip/unix/configure
+@@ -18,7 +18,7 @@
+ 
+ CC=${1-cc}
+ CFLAGS=${2-"-I. -DUNIX"}
+-LFLAGS1=''
++LFLAGS1="${LDFLAGS}"
+ LFLAGS2=''
+ LN="ln -s"
+ 
+@@ -118,7 +118,7 @@ _EOF_
+ fi
+ 
+ # optimization flags
+-if test -n "${CFLAGS_OPT}"; then
++if false; then
+   CFLAGS="${CFLAGS} ${CFLAGS_OPT}"
+   CFLAGS_BZ="${CFLAGS_BZ} ${CFLAGS_OPT}"
+ fi
+@@ -220,13 +220,6 @@ fi
+ echo Check for the C preprocessor
+ # on SVR4, cc -E does not produce correct assembler files. Need /lib/cpp.
+ CPP="${CC} -E"
+-# solaris as(1) needs -P, maybe others as well ?
+-[ -f /usr/ccs/lib/cpp ] && CPP="/usr/ccs/lib/cpp -P"
+-[ -f /usr/lib/cpp ] && CPP=/usr/lib/cpp
+-[ -f /lib/cpp ] && CPP=/lib/cpp
+-[ -f /usr/bin/cpp ] && CPP=/usr/bin/cpp
+-[ -f /xenix ] && CPP="${CC} -E"
+-[ -f /lynx.os ] && CPP="${CC} -E"
+ 
+ echo "#include <stdio.h>" > conftest.c
+ $CPP conftest.c >/dev/null 2>/dev/null || CPP="${CC} -E"
diff --git a/app-arch/zip/files/zip-3.0-exec-stack.patch b/app-arch/zip/files/zip-3.0-exec-stack.patch
new file mode 100644
index 000000000000..80719c961298
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-exec-stack.patch
@@ -0,0 +1,22 @@
+add proper GNU stack markings so we dont get the default: executable
+
+--- zip-2.31/crc_i386.S
++++ zip-2.31/crc_i386.S
+@@ -238,3 +238,7 @@
+ #endif /* i386 || _i386 || _I386 || __i386 */
+ 
+ #endif /* !USE_ZLIB && !CRC_TABLE_ONLY */
++
++#if defined __ELF__ && defined __linux__
++.section .note.GNU-stack,"",@progbits
++#endif
+--- zip-2.31/match.S
++++ zip-2.31/match.S
+@@ -405,3 +405,7 @@
+ #endif /* i386 || _I386 || _i386 || __i386  */
+ 
+ #endif /* !USE_ZLIB */
++
++#if defined __ELF__ && defined __linux__
++.section .note.GNU-stack,"",@progbits
++#endif
diff --git a/app-arch/zip/files/zip-3.0-pic.patch b/app-arch/zip/files/zip-3.0-pic.patch
new file mode 100644
index 000000000000..b4c53de694f7
--- /dev/null
+++ b/app-arch/zip/files/zip-3.0-pic.patch
@@ -0,0 +1,15 @@
+if our toolchain generates PIC by default, then do not use the hand written
+assembly files as none of it is PIC friendly.
+
+--- unix/configure
++++ unix/configure
+@@ -29,6 +29,9 @@
+ echo Check if we can use asm code
+ OBJA=""
+ OCRCU8=""
++piclib="$(echo | $CPP -dM $CFLAGS - | grep -i __pic__)"
++echo "Checking if compiler wants to create pic code"
++[ "$piclib" == "" ] && \
+ if eval "$CPP match.S > _match.s 2>/dev/null"; then
+   if test ! -s _match.s || grep error < _match.s > /dev/null; then
+     :
diff --git a/app-arch/zip/zip-3.0.ebuild b/app-arch/zip/zip-3.0.ebuild
new file mode 100644
index 000000000000..2854720226c1
--- /dev/null
+++ b/app-arch/zip/zip-3.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-3.0.ebuild,v 1.1 2008/09/21 10:08:47 vapier Exp $
+
+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 ~x86-fbsd"
+IUSE="bzip2 crypt unicode"
+
+DEPEND="bzip2? ( app-arch/bzip2 )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0-pic.patch
+	epatch "${FILESDIR}"/${PN}-3.0-exec-stack.patch
+	epatch "${FILESDIR}"/${PN}-3.0-build.patch
+}
+
+src_compile() {
+	use bzip2 || append-flags -DNO_BZIP2_SUPPORT
+	use crypt || append-flags -DNO_CRYPT
+	use unicode || append-flags -DNO_UNICODE_SUPPORT
+	emake \
+		CC="$(tc-getCC)" \
+		LOCAL_ZIP="${CFLAGS} ${CPPFLAGS}" \
+		-f unix/Makefile generic \
+		|| die
+}
+
+src_install() {
+	dobin zip zipnote zipsplit || die
+	doman man/zip{,note,split}.1
+	if use crypt ; then
+		dobin zipcloak || die
+		doman man/zipcloak.1
+	fi
+	dodoc BUGS CHANGES README* TODO WHATSNEW WHERE proginfo/*.txt
+}