Enlarge environment limit to at least temporarilly releave the presure by ebuild.sh etc. so that openoffice can be build

5 files changed, 107 insertions, 3 deletions

diff --git a/sys-apps/findutils/ChangeLog b/sys-apps/findutils/ChangeLog
index 198eaac173bb..4a4c2e2f541a 100644
--- a/sys-apps/findutils/ChangeLog
+++ b/sys-apps/findutils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/findutils
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.20 2003/09/28 16:23:14 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/ChangeLog,v 1.21 2003/10/23 10:51:39 pauldv Exp $
+
+*findutils-4.1.20-r1 (23 Oct 2003)
+
+  23 Oct 2003; Paul de Vrieze <pauldv@gentoo.org> findutils-4.1.20-r1.ebuild,
+  files/findutils-env-size.patch:
+  Enlarge the xargs acceptable environment to 50k as 20k is reached with big
+  ebuilds as ebuild.sh is "too" large
 
 *findutils-4.1.20 (28 Sep 2003)
 
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index 51106d8dfb96..63d2fd5d1675 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,10 +1,10 @@
-MD5 14d3ef22a646aa8cea1113bb1fadf897 ChangeLog 3570
+MD5 ba7bc63f7ea44879720ae0a54b269e96 ChangeLog 3570
 MD5 b92f7c59f607a94b3422d6ec5b4f64c1 findutils-4.1.7-r1.ebuild 1392
 MD5 4d717bd3a8b1379d34f1a479fc500ca5 findutils-4.1.7-r2.ebuild 1540
 MD5 e8d15cea8b64b0944e5b0dbd814591cf findutils-4.1.7-r3.ebuild 1649
 MD5 8fc76e43de3e427dd3a438072cd3bb54 findutils-4.1.7-r4.ebuild 1882
 MD5 1881e21684c89ee5c0298fbd815287a6 findutils-4.1.20.ebuild 1931
-MD5 149c26ad2c5e88416a2ecedf3a187da5 findutils-4.1.20-r1.ebuild 2034
+MD5 2cd340ee43809b5b54676bc6f0677342 findutils-4.1.20-r1.ebuild 2037
 MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r1 67
 MD5 d6a2c5cf6a7fd16e1470d1818b08e0ca files/digest-findutils-4.1.7-r2 67
 MD5 b46d51a8d2953ef314c033171c836c3d files/digest-findutils-4.1.7-r3 161
diff --git a/sys-apps/findutils/files/digest-findutils-4.1.20-r1 b/sys-apps/findutils/files/digest-findutils-4.1.20-r1
new file mode 100644
index 000000000000..f304c6405801
--- /dev/null
+++ b/sys-apps/findutils/files/digest-findutils-4.1.20-r1
@@ -0,0 +1,2 @@
+MD5 e90ce7222daadeb8616b8db461e17cbc findutils-4.1.20.tar.gz 777980
+MD5 0fe2231e7a309c98077b7290b6269e49 findutils-4.1.20-2003011510-selinux-gentoo.patch.bz2 4407
diff --git a/sys-apps/findutils/files/findutils-env-size.patch b/sys-apps/findutils/files/findutils-env-size.patch
new file mode 100644
index 000000000000..7a1d69bc53f8
--- /dev/null
+++ b/sys-apps/findutils/files/findutils-env-size.patch
@@ -0,0 +1,15 @@
+diff -urN findutils-4.1.20.orig/xargs/xargs.c findutils-4.1.20/xargs/xargs.c
+--- findutils-4.1.20.orig/xargs/xargs.c	2003-10-23 11:36:08.000000000 +0200
++++ findutils-4.1.20/xargs/xargs.c	2003-10-23 11:38:04.000000000 +0200
+@@ -300,8 +300,9 @@
+      have it at 1 meg).  Things will work fine with a large ARG_MAX but it
+      will probably hurt the system more than it needs to; an array of this
+      size is allocated.  */
+-  if (arg_max > 20 * 1024)
+-    arg_max = 20 * 1024;
++/* Make this 50 k as ebuild.sh is too big */
++  if (arg_max > 50 * 1024)
++    arg_max = 50 * 1024;
+ 
+   /* Take the size of the environment into account.  */
+   arg_max -= env_size (environ);
diff --git a/sys-apps/findutils/findutils-4.1.20-r1.ebuild b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
new file mode 100644
index 000000000000..1fcf0e9534de
--- /dev/null
+++ b/sys-apps/findutils/findutils-4.1.20-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/findutils/findutils-4.1.20-r1.ebuild,v 1.1 2003/10/23 10:51:39 pauldv Exp $
+
+IUSE="nls build afs selinux"
+
+inherit eutils
+
+DESCRIPTION="GNU utilities to find files"
+HOMEPAGE="http://www.gnu.org/software/findutils/findutils.html"
+
+# Note this doesn't point to gnu.org because alpha.gnu.org has quit
+# supplying the development versions.  If it comes back in the future
+# then we might want to redirect the link.  See bug 18729
+SRC_URI="ftp://alpha.gnu.org/gnu/${PN}/${P}.tar.gz
+	mirror://gentoo/${P}.tar.gz
+	selinux? mirror://gentoo/${P}-2003011510-selinux-gentoo.patch.bz2"
+
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~hppa ~arm ~alpha ~ia64"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="virtual/glibc
+	>=sys-apps/sed-4
+	nls? ( sys-devel/gettext )
+	afs? ( net-fs/openafs )
+	selinux? ( sys-apps/selinux-small )"
+RDEPEND="virtual/glibc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Don't build or install locate because it conflicts with slocate,
+	# which is a secure version of locate.  See bug 18729
+	sed -i '/^SUBDIRS/s/locate//' Makefile.in
+
+	#get a bigger environment as ebuild.sh is growing large
+	epatch ${FILESDIR}/findutils-env-size.patch
+
+	use selinux && epatch ${DISTDIR}/${P}-2003011510-selinux-gentoo.patch.bz2
+}
+
+src_compile() {
+	local myconf=
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	if use afs; then
+		export CPPFLAGS=-I/usr/afsws/include
+		export LDFLAGS=-lpam
+		export LIBS=/usr/afsws/lib/pam_afs.so.1
+	fi
+
+	./configure \
+		--host=${CHOST} \
+		--prefix=/usr \
+		${myconf} || die
+
+	emake libexecdir=/usr/lib/find || die
+}
+
+src_install() {
+	einstall libexecdir=${D}/usr/lib/find || die
+
+	prepallman
+
+	rm -rf ${D}/usr/var
+	if ! use build; then
+		dodoc COPYING NEWS README TODO ChangeLog
+	else
+		rm -rf ${D}/usr/share
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Please note that the locate and updatedb binaries"
+	ewarn "are not longer provided by findutils."
+	ewarn "Please emerge slocate"
+}