Cleanup the build system yet again #200995.

Package-Manager: portage-2.1.4_rc4

5 files changed, 161 insertions, 9 deletions

diff --git a/app-arch/zip/ChangeLog b/app-arch/zip/ChangeLog
index aaf0b770200f..34f0757b0043 100644
--- a/app-arch/zip/ChangeLog
+++ b/app-arch/zip/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-arch/zip
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.66 2007/06/13 00:31:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/ChangeLog,v 1.67 2007/12/02 19:52:06 vapier Exp $
+
+*zip-2.32-r1 (02 Dec 2007)
+
+  02 Dec 2007; Mike Frysinger <vapier@gentoo.org>
+  +files/zip-2.32-build.patch, +zip-2.32-r1.ebuild:
+  Cleanup the build system yet again #200995.
 
   13 Jun 2007; Mike Frysinger <vapier@gentoo.org> files/zip-2.31-make.patch,
   zip-2.32.ebuild:
diff --git a/app-arch/zip/Manifest b/app-arch/zip/Manifest
index b3b971584e43..5e8e5f2185d5 100644
--- a/app-arch/zip/Manifest
+++ b/app-arch/zip/Manifest
@@ -13,15 +13,23 @@ AUX zip-2.31-make.patch 383 RMD160 941c9768d22c5080cc89f1caf59be88368b726b9 SHA1
 MD5 451a1e5426d57ee2dd3b97dcdde0cbdc files/zip-2.31-make.patch 383
 RMD160 941c9768d22c5080cc89f1caf59be88368b726b9 files/zip-2.31-make.patch 383
 SHA256 878ddf24bb89065c679653fbcc28add70e24fb4c8391bb4f47a4c40643e72581 files/zip-2.31-make.patch 383
+AUX zip-2.32-build.patch 2003 RMD160 3356051c53465fa70015818b6c8c364489bb5bf0 SHA1 34492ef0e226ff7912de01c9266580b148ff54f1 SHA256 3e4b94015c1448c8769d7154b308bd986e1d0e6e514da151d658d1b8ba3a774c
+MD5 624d481b5bc89b8dc56386cd65169257 files/zip-2.32-build.patch 2003
+RMD160 3356051c53465fa70015818b6c8c364489bb5bf0 files/zip-2.32-build.patch 2003
+SHA256 3e4b94015c1448c8769d7154b308bd986e1d0e6e514da151d658d1b8ba3a774c files/zip-2.32-build.patch 2003
 DIST zip232.tar.gz 807180 RMD160 6b9326c8a60bc6bf08825e416140fd0ca8a6a7f1 SHA1 5bc562bf95d9aee0cb6625e6038898e1f191a4aa SHA256 d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f
+EBUILD zip-2.32-r1.ebuild 1203 RMD160 b72e7aec094b1b343c73e9b2bf63ab8b3a1f98c4 SHA1 58f5db3ad6745dee950145a7d41c120ac5da8302 SHA256 5aa6420fc3da71877d6ec4cd4bbe7d328896aec2a79dd0c49c811ce9a9ff2857
+MD5 2c64279eafe83e9c5ddd34ff46765916 zip-2.32-r1.ebuild 1203
+RMD160 b72e7aec094b1b343c73e9b2bf63ab8b3a1f98c4 zip-2.32-r1.ebuild 1203
+SHA256 5aa6420fc3da71877d6ec4cd4bbe7d328896aec2a79dd0c49c811ce9a9ff2857 zip-2.32-r1.ebuild 1203
 EBUILD zip-2.32.ebuild 1268 RMD160 bf011d9e7efd73dfee0d9dce5b484ce2b6e7f512 SHA1 25bfe9c517d406e5b9e3d19c6c66fe393711a91e SHA256 a665756992659c236ca084e9e591264a8a0bc92845e67785320a62e64d8efe6e
 MD5 84ca3324cc856facc7b6366250f3bc0f zip-2.32.ebuild 1268
 RMD160 bf011d9e7efd73dfee0d9dce5b484ce2b6e7f512 zip-2.32.ebuild 1268
 SHA256 a665756992659c236ca084e9e591264a8a0bc92845e67785320a62e64d8efe6e zip-2.32.ebuild 1268
-MISC ChangeLog 7373 RMD160 3ce8b3f24c121e3ce251acad1748113a1add8e7d SHA1 316f42e6aed90e2f602e131da56fb87a0345f183 SHA256 6948207191b1a0860933325c8f7b7ef3a3ce0bf678354d3015fb21024b0181ed
-MD5 cc72e8f6e197c0cb822f3098c3edf060 ChangeLog 7373
-RMD160 3ce8b3f24c121e3ce251acad1748113a1add8e7d ChangeLog 7373
-SHA256 6948207191b1a0860933325c8f7b7ef3a3ce0bf678354d3015fb21024b0181ed ChangeLog 7373
+MISC ChangeLog 7550 RMD160 1d78b0b37eadc70570337a73b8fe9aa1800a9195 SHA1 104b28d4d731ce9e55863cb31de4ec092a0bd254 SHA256 e3f91b008044683221f996d0bf92d28edccb9155538bf7487059aab3abd05886
+MD5 718f5236e387099d715549ddb7593618 ChangeLog 7550
+RMD160 1d78b0b37eadc70570337a73b8fe9aa1800a9195 ChangeLog 7550
+SHA256 e3f91b008044683221f996d0bf92d28edccb9155538bf7487059aab3abd05886 ChangeLog 7550
 MISC metadata.xml 260 RMD160 43cb7ced9f55009bba29a4017d2ee88dab5ab83f SHA1 94674a402b77f6a586b2fc1ad889b8ac9e48b175 SHA256 b937624b5672a3a8f418d773a2dff2c4228888b64f40e2ca3350b3915b0e5319
 MD5 a68f2de135f18e206da75ebdf70cf045 metadata.xml 260
 RMD160 43cb7ced9f55009bba29a4017d2ee88dab5ab83f metadata.xml 260
@@ -29,10 +37,13 @@ SHA256 b937624b5672a3a8f418d773a2dff2c4228888b64f40e2ca3350b3915b0e5319 metadata
 MD5 345d860e42e96f074b9d42586b9ecb4c files/digest-zip-2.32 220
 RMD160 722b3f11ee7de1a65b28bd982b573b437145c0f5 files/digest-zip-2.32 220
 SHA256 610d0957381d482e463b305d935d376fe4dfe9c6f6ef87b98d3ae84bcd7d7993 files/digest-zip-2.32 220
+MD5 345d860e42e96f074b9d42586b9ecb4c files/digest-zip-2.32-r1 220
+RMD160 722b3f11ee7de1a65b28bd982b573b437145c0f5 files/digest-zip-2.32-r1 220
+SHA256 610d0957381d482e463b305d935d376fe4dfe9c6f6ef87b98d3ae84bcd7d7993 files/digest-zip-2.32-r1 220
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGbzrg8bi6rjpTunYRAr7SAJ0QqXz8w1y6n25KVWLnBYfejVptgACgkqSi
-UXNi4tq90pwkJlzSSacb2j0=
-=hK0N
+iD8DBQFHUwzrp/wUKkr7RBoRAmBIAKCHRIvdy1urPrLNAXzFX0Lc76mlVQCeMonj
+s5/yGwIkAql1Bf2Tlw0uU1A=
+=H0fg
 -----END PGP SIGNATURE-----
diff --git a/app-arch/zip/files/digest-zip-2.32-r1 b/app-arch/zip/files/digest-zip-2.32-r1
new file mode 100644
index 000000000000..8b69fc356e59
--- /dev/null
+++ b/app-arch/zip/files/digest-zip-2.32-r1
@@ -0,0 +1,3 @@
+MD5 8a4da4460386e324debe97f3b7fe4d96 zip232.tar.gz 807180
+RMD160 6b9326c8a60bc6bf08825e416140fd0ca8a6a7f1 zip232.tar.gz 807180
+SHA256 d0d3743f732a9baa162f80d0c4567b9c545b41a3385825042113810f2a56eb2f zip232.tar.gz 807180
diff --git a/app-arch/zip/files/zip-2.32-build.patch b/app-arch/zip/files/zip-2.32-build.patch
new file mode 100644
index 000000000000..61a2bae34b3f
--- /dev/null
+++ b/app-arch/zip/files/zip-2.32-build.patch
@@ -0,0 +1,89 @@
+respect build environment settings
+
+--- zip/unix/Makefile
++++ zip/unix/Makefile
+@@ -12,15 +12,15 @@
+ 
+ list:   all
+ 
+-MAKE = make -f unix/Makefile
++MAKE := $(MAKE) -f unix/Makefile
+ SHELL = /bin/sh
+ LN = ln -s
+ 
+ # (to use the Gnu compiler, change cc to gcc in CC)
+-CC = cc
++CC ?= gcc
+ BIND = $(CC)
+ AS = $(CC) -c
+-CPP = /lib/cpp
++CPP ?= $(CC)
+ EXE =
+ 
+ # probably can change this to 'install' if you have it
+@@ -47,7 +47,7 @@
+ #   LFLAGS1   flags after output file spec, before obj file list
+ #   LFLAGS2   flags after obj file list (libraries, etc)
+ CFLAGS_NOOPT = -I. -DUNIX $(LOCAL_ZIP)
+-CFLAGS = -O2 $(CFLAGS_NOOPT)
++CFLAGS ?= -O2 $(CFLAGS_NOOPT)
+ LFLAGS1 =
+ LFLAGS2 = -s
+ 
+--- zip/unix/configure
++++ zip/unix/configure
+@@ -13,52 +13,13 @@
+ 
+ CC=${1-cc}
+-CFLAGS=${2-"-I. -DUNIX"}
+-LFLAGS1=""
++CFLAGS="${2--I. -DUNIX} ${CFLAGS} ${CPPFLAGS}"
++LFLAGS1="${LDFLAGS}"
+ LN="ln -s"
+-echo "Check C compiler type (optimization option)"
+-cat > conftest.c << _EOF_
+-int main()
+-{
+-#ifndef __SUNPRO_C
+-   bad code
+-#endif
+-   return 0;
+-}
+-_EOF_
+-$CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
+-if test $? -eq 0; then
+-  echo '  Sun C (-xO3)'
+-  CFLAGS="${CFLAGS} -xO3"
+-else
+-  cat > conftest.c << _EOF_
+-int main()
+-{
+-#ifndef __DECC
+-   bad code
+-#endif
+-   return 0;
+-}
+-_EOF_
+-  $CC $CFLAGS -c conftest.c > /dev/null 2>/dev/null
+-  if test $? -eq 0; then
+-    echo '  DEC C (-O3)'
+-    CFLAGS="${CFLAGS} -O3"
+-  else
+-    echo '  Other (gcc?) (-O2)'
+-    CFLAGS="${CFLAGS} -O2"
+-  fi
+-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/zip-2.32-r1.ebuild b/app-arch/zip/zip-2.32-r1.ebuild
new file mode 100644
index 000000000000..3ed7e02eacdd
--- /dev/null
+++ b/app-arch/zip/zip-2.32-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-arch/zip/zip-2.32-r1.ebuild,v 1.1 2007/12/02 19:52:06 vapier Exp $
+
+inherit toolchain-funcs eutils flag-o-matic
+
+DESCRIPTION="Info ZIP (encryption support)"
+HOMEPAGE="http://www.info-zip.org/"
+SRC_URI="ftp://ftp.info-zip.org/pub/infozip/src/zip${PV//.}.tar.gz"
+
+LICENSE="Info-ZIP"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="crypt"
+
+DEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/zip-2.3-unix_configure-pic.patch
+	epatch "${FILESDIR}"/${PN}-2.31-exec-stack.patch
+	epatch "${FILESDIR}"/${PN}-2.32-build.patch
+}
+
+src_compile() {
+	tc-export CC CPP
+	use crypt || append-flags -DNO_CRYPT
+	append-lfs-flags
+	emake -f unix/Makefile generic || die
+}
+
+src_install() {
+	dobin zip zipnote zipsplit || die
+	doman man/zip.1
+	dosym zip.1 /usr/share/man/man1/zipnote.1
+	dosym zip.1 /usr/share/man/man1/zipzplit.1
+	if use crypt ; then
+		dobin zipcloak || die
+		dosym zip.1 /usr/share/man/man1/zipcloak.1
+	fi
+	dodoc BUGS CHANGES MANUAL README TODO WHATSNEW WHERE proginfo/*.txt
+}