Default to using regex from the libc so as to get a smaller sed binary.

Package-Manager: portage-2.1.4

5 files changed, 113 insertions, 9 deletions

diff --git a/sys-apps/sed/ChangeLog b/sys-apps/sed/ChangeLog
index 44f27977b042..cc3d36d8f89a 100644
--- a/sys-apps/sed/ChangeLog
+++ b/sys-apps/sed/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/sed
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.84 2007/07/10 23:00:46 uberlord Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.85 2008/01/30 00:26:46 vapier Exp $
+
+*sed-4.1.5-r1 (30 Jan 2008)
+
+  30 Jan 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/sed-4.1.5-prototypes.patch, +sed-4.1.5-r1.ebuild:
+  Default to using regex from the libc so as to get a smaller sed binary.
 
   10 Jul 2007; Roy Marples <uberlord@gentoo.org> sed-4.1.5.ebuild:
   Only install sed to /bin for GNU userland.
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 240d134ad657..d0da84b5e30e 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -13,19 +13,27 @@ AUX sed-4.1.5-alloca.patch 462 RMD160 55abb17de8058c0ef8bfb2041ebcda0f87cf0138 S
 MD5 52fd04d5d48efc172b5601dd3221a85d files/sed-4.1.5-alloca.patch 462
 RMD160 55abb17de8058c0ef8bfb2041ebcda0f87cf0138 files/sed-4.1.5-alloca.patch 462
 SHA256 1aa91cf1a4d338514f609ab1e7254d26f7082248047459d276e3193cb73e812f files/sed-4.1.5-alloca.patch 462
+AUX sed-4.1.5-prototypes.patch 228 RMD160 ef696698ab5b8b5f4500474412b2dadde0a3e57d SHA1 756ef351a463508077936a4aea4ee95e7e7fdfbb SHA256 987c44e3a0806242a20016de5c371da4e5bc328c70858cb575149baa27aab25d
+MD5 2db365314169ca5591459ef9707a741d files/sed-4.1.5-prototypes.patch 228
+RMD160 ef696698ab5b8b5f4500474412b2dadde0a3e57d files/sed-4.1.5-prototypes.patch 228
+SHA256 987c44e3a0806242a20016de5c371da4e5bc328c70858cb575149baa27aab25d files/sed-4.1.5-prototypes.patch 228
 AUX unix2dos 56 RMD160 b5c28ec740e353ec1dc1722eff3ca54b48d7b6bc SHA1 2284993c506a1af122205ae8c3e4d75fcdb3c265 SHA256 13513234158e35ecd98ed24e765f69e5aecce6045889775dee12545c14a4dc7b
 MD5 2502535e2cc93fa49d1c2fdc31eff1b2 files/unix2dos 56
 RMD160 b5c28ec740e353ec1dc1722eff3ca54b48d7b6bc files/unix2dos 56
 SHA256 13513234158e35ecd98ed24e765f69e5aecce6045889775dee12545c14a4dc7b files/unix2dos 56
 DIST sed-4.1.5.tar.gz 799584 RMD160 49b12e99a55c6d2e78ad236f0205e63e46444173 SHA1 8e575e8a44568392d5b6e089eab5da5cdbd45885 SHA256 be955bef7a81d69222e929689e0de0ecf64c13dc5b15b2ee5696d5ef66fdeec0
+EBUILD sed-4.1.5-r1.ebuild 2004 RMD160 67c2c824002ec543147bb8b6e403faaafedb0f7a SHA1 96377b6cb9af012d3e5b5f7afb779218348f5bda SHA256 ccd1a96086c3ac8b0e67347df13b44624cb1055ef3ea64e21eac98b809bb8600
+MD5 47560b04ce0a18c9a70c794de8159306 sed-4.1.5-r1.ebuild 2004
+RMD160 67c2c824002ec543147bb8b6e403faaafedb0f7a sed-4.1.5-r1.ebuild 2004
+SHA256 ccd1a96086c3ac8b0e67347df13b44624cb1055ef3ea64e21eac98b809bb8600 sed-4.1.5-r1.ebuild 2004
 EBUILD sed-4.1.5.ebuild 1794 RMD160 7edf800fe2568f00b0a16a877a2fc54d45040527 SHA1 e634d96a9d560276de571e6d3fd8d0564b1ab468 SHA256 cca54ebc29c6b10b5083725bcc677d31691b344b7aace4f4161a0447e917e307
 MD5 6c0ebd333d9d47b0051adf68b56057d0 sed-4.1.5.ebuild 1794
 RMD160 7edf800fe2568f00b0a16a877a2fc54d45040527 sed-4.1.5.ebuild 1794
 SHA256 cca54ebc29c6b10b5083725bcc677d31691b344b7aace4f4161a0447e917e307 sed-4.1.5.ebuild 1794
-MISC ChangeLog 11116 RMD160 3b3dbbbbea224d726242c53945afb69ab6c445bc SHA1 2cbac6e74febccfbdbad2b838d56f607419fdb84 SHA256 a7f98a6401d64424035d018eea0c2a06d5467a2e02607c32d59a8b199d0a1bb4
-MD5 4a23999654e4e489065312f8cd2b70d1 ChangeLog 11116
-RMD160 3b3dbbbbea224d726242c53945afb69ab6c445bc ChangeLog 11116
-SHA256 a7f98a6401d64424035d018eea0c2a06d5467a2e02607c32d59a8b199d0a1bb4 ChangeLog 11116
+MISC ChangeLog 11327 RMD160 31c871ccb97791ac9266f2013acbc44cc10d1474 SHA1 2afafd5d5e711edb7bb9aff2b42b4bca4f681147 SHA256 45cce27b8d4dc3eaa9e53f0933d43c2ec9d438dce475106d0ad0cce5dc655772
+MD5 26d826645e22b9fc22e3976616330d60 ChangeLog 11327
+RMD160 31c871ccb97791ac9266f2013acbc44cc10d1474 ChangeLog 11327
+SHA256 45cce27b8d4dc3eaa9e53f0933d43c2ec9d438dce475106d0ad0cce5dc655772 ChangeLog 11327
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -33,10 +41,13 @@ SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata
 MD5 d830c9b91707f87d92c8c97fe4deee55 files/digest-sed-4.1.5 229
 RMD160 e62a89e0fb3237843b43bb5b265639f4d903ad02 files/digest-sed-4.1.5 229
 SHA256 fc27a6c7e4ea15ccadc1700d6e950a14125370ea6eb28e3c8d188ac9c91bf98c files/digest-sed-4.1.5 229
+MD5 d830c9b91707f87d92c8c97fe4deee55 files/digest-sed-4.1.5-r1 229
+RMD160 e62a89e0fb3237843b43bb5b265639f4d903ad02 files/digest-sed-4.1.5-r1 229
+SHA256 fc27a6c7e4ea15ccadc1700d6e950a14125370ea6eb28e3c8d188ac9c91bf98c files/digest-sed-4.1.5-r1 229
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHLT3ap/wUKkr7RBoRAsnMAJ9SfD3/1zVmqFn2DYHIiMKihlCUgQCeJpE6
-T8Z7qak08nF7MtlSSAaGlmM=
-=P6qK
+iD8DBQFHn8RMj9hvisErhMIRAnfUAKCIbjKcVeNg6/6SWYFjCW+YteIN3gCfVbKS
+Ig2WB2sT2MbhIOO1LlrLGXo=
+=IYDJ
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sed/files/digest-sed-4.1.5-r1 b/sys-apps/sed/files/digest-sed-4.1.5-r1
new file mode 100644
index 000000000000..4774a32a7cd8
--- /dev/null
+++ b/sys-apps/sed/files/digest-sed-4.1.5-r1
@@ -0,0 +1,3 @@
+MD5 7a1cbbbb3341287308e140bd4834c3ba sed-4.1.5.tar.gz 799584
+RMD160 49b12e99a55c6d2e78ad236f0205e63e46444173 sed-4.1.5.tar.gz 799584
+SHA256 be955bef7a81d69222e929689e0de0ecf64c13dc5b15b2ee5696d5ef66fdeec0 sed-4.1.5.tar.gz 799584
diff --git a/sys-apps/sed/files/sed-4.1.5-prototypes.patch b/sys-apps/sed/files/sed-4.1.5-prototypes.patch
new file mode 100644
index 000000000000..d82ee5f6c98b
--- /dev/null
+++ b/sys-apps/sed/files/sed-4.1.5-prototypes.patch
@@ -0,0 +1,10 @@
+--- lib/utils.c.orig	2008-01-29 19:23:27.000000000 -0500
++++ lib/utils.c	2008-01-29 19:23:37.000000000 -0500
+@@ -19,6 +19,7 @@
+ #include "config.h"
+ 
+ #include <stdio.h>
++#include <unistd.h>
+ 
+ #include <errno.h>
+ #ifndef errno
diff --git a/sys-apps/sed/sed-4.1.5-r1.ebuild b/sys-apps/sed/sed-4.1.5-r1.ebuild
new file mode 100644
index 000000000000..8918f7c82564
--- /dev/null
+++ b/sys-apps/sed/sed-4.1.5-r1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.5-r1.ebuild,v 1.1 2008/01/30 00:26:46 vapier Exp $
+
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Super-useful stream editor"
+HOMEPAGE="http://sed.sourceforge.net/"
+SRC_URI="mirror://gnu/sed/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="nls static"
+
+RDEPEND="nls? ( virtual/libintl )"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )"
+
+src_bootstrap_sed() {
+	# make sure system-sed works #40786
+	export NO_SYS_SED=""
+	if ! type -p sed > /dev/null ; then
+		NO_SYS_SED="!!!"
+		./bootstrap.sh || die "couldnt bootstrap"
+		cp sed/sed "${T}"/ || die "couldnt copy"
+		export PATH="${PATH}:${T}"
+		make clean || die "couldnt clean"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-4.1.4-makeinfo-c-locale.patch
+	epatch "${FILESDIR}"/${P}-alloca.patch
+	epatch "${FILESDIR}"/${P}-prototypes.patch
+	# don't use sed here if we have to recover a broken host sed
+}
+
+src_compile() {
+	src_bootstrap_sed
+	# make sure all sed operations here are repeatable
+	sed -i \
+		-e '/docdir =/s:=.*/doc:= $(datadir)/doc/'${PF}'/html:' \
+		doc/Makefile.in || die "sed html doc"
+
+	local myconf= bindir=/bin
+	if ! use userland_GNU ; then
+		myconf="--program-prefix=g"
+		bindir=/usr/bin
+	fi
+
+	if echo "#include <regex.h>" | $(tc-getCPP) > /dev/null ; then
+		myconf="${myconf} --without-included-regex"
+	fi
+
+	use static && append-ldflags -static
+	econf \
+		--bindir=${bindir} \
+		$(use_enable nls) \
+		${myconf} \
+		|| die "Configure failed"
+	emake || die "build failed"
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die "Install failed"
+	dodoc NEWS README* THANKS AUTHORS BUGS ChangeLog
+	docinto examples
+	dodoc "${FILESDIR}"/{dos2unix,unix2dos}
+
+	rm -f "${D}"/usr/lib/charset.alias "${D}"/usr/share/locale/locale.alias
+}