Add simple patch to compile on non-GNU systems, and readd ~x86-fbsd keyword.

Package-Manager: portage-2.1_rc1-r2

4 files changed, 37 insertions, 14 deletions

diff --git a/sys-apps/sed/ChangeLog b/sys-apps/sed/ChangeLog
index 8694ed0e746a..f77a1a9fbdda 100644
--- a/sys-apps/sed/ChangeLog
+++ b/sys-apps/sed/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/sed
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.71 2006/05/16 14:09:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/ChangeLog,v 1.72 2006/05/16 14:57:43 flameeyes Exp $
+
+  16 May 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/sed-4.1.5-alloca.patch, sed-4.1.5.ebuild:
+  Add simple patch to compile on non-GNU systems, and readd ~x86-fbsd keyword.
 
   16 May 2006; Diego Pettenò <flameeyes@gentoo.org> sed-4.1.5.ebuild:
   Drop ~x86-fbsd keyword for 4.1.5 version until it works.
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 94b82ec4a229..75ca465aae27 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -13,6 +13,10 @@ AUX sed-4.1.4-makeinfo-c-locale.patch 617 RMD160 83f62dca50d5c3e0d9cd787f317205c
 MD5 3ea67fdbcfe6288bb7e03a47b5801a04 files/sed-4.1.4-makeinfo-c-locale.patch 617
 RMD160 83f62dca50d5c3e0d9cd787f317205cd4e89431a files/sed-4.1.4-makeinfo-c-locale.patch 617
 SHA256 5fa61306d210de7ad859e705d9df0a8c397cc309888b635510bf9b23d5df90c1 files/sed-4.1.4-makeinfo-c-locale.patch 617
+AUX sed-4.1.5-alloca.patch 462 RMD160 55abb17de8058c0ef8bfb2041ebcda0f87cf0138 SHA1 2c3afab6d42424f28b64932bdd9595ff3dec2d4e SHA256 1aa91cf1a4d338514f609ab1e7254d26f7082248047459d276e3193cb73e812f size 462
+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 unix2dos 56 RMD160 b5c28ec740e353ec1dc1722eff3ca54b48d7b6bc SHA1 2284993c506a1af122205ae8c3e4d75fcdb3c265 SHA256 13513234158e35ecd98ed24e765f69e5aecce6045889775dee12545c14a4dc7b size 56
 MD5 2502535e2cc93fa49d1c2fdc31eff1b2 files/unix2dos 56
 RMD160 b5c28ec740e353ec1dc1722eff3ca54b48d7b6bc files/unix2dos 56
@@ -28,14 +32,14 @@ EBUILD sed-4.1.4-r1.ebuild 1817 RMD160 51ce8e9b3357caebc178d36003f3a7c401e586ce
 MD5 541fd293f30dc6580c8a9f2c76d8aa81 sed-4.1.4-r1.ebuild 1817
 RMD160 51ce8e9b3357caebc178d36003f3a7c401e586ce sed-4.1.4-r1.ebuild 1817
 SHA256 e4371efe96d6922b3115dcc3a27917db36336a8b687e36e6d31a58fce7db3b00 sed-4.1.4-r1.ebuild 1817
-EBUILD sed-4.1.5.ebuild 1770 RMD160 4180ad876b211dcf75c1bda20fcb266c0649b282 SHA1 f5d5cb304225572801c02428b413dea1ee9ab490 SHA256 f098f5c4dce8a3ca7532bff41894416139216342b16a58e414f571f8ce03844d size 1770
-MD5 e615f83b1334c77b60f2b6b36c956b56 sed-4.1.5.ebuild 1770
-RMD160 4180ad876b211dcf75c1bda20fcb266c0649b282 sed-4.1.5.ebuild 1770
-SHA256 f098f5c4dce8a3ca7532bff41894416139216342b16a58e414f571f8ce03844d sed-4.1.5.ebuild 1770
-MISC ChangeLog 9684 RMD160 8bf86d7b563246738afe3961f2f87e4eaa0f7aae SHA1 75e23fd99f7a5afc0ea969d073b4139de9c61692 SHA256 48194f8eecde890dfe44db4a5497d35042b4bd6a5514302cd64e3e50bdf83102 size 9684
-MD5 170fbc4fe5b266eda2130941e428c0fc ChangeLog 9684
-RMD160 8bf86d7b563246738afe3961f2f87e4eaa0f7aae ChangeLog 9684
-SHA256 48194f8eecde890dfe44db4a5497d35042b4bd6a5514302cd64e3e50bdf83102 ChangeLog 9684
+EBUILD sed-4.1.5.ebuild 1820 RMD160 3ab10bd3226854867eba2d65ed5cc038979c9021 SHA1 ea748e5a9181dbf3eac6e5f0942cca74f2092858 SHA256 07bdb533717c2649a5954bd4c883d650cbe65ec9619ba6a9f23e9bbba2f40139 size 1820
+MD5 200670ea6f94929655df5ab6c05d3170 sed-4.1.5.ebuild 1820
+RMD160 3ab10bd3226854867eba2d65ed5cc038979c9021 sed-4.1.5.ebuild 1820
+SHA256 07bdb533717c2649a5954bd4c883d650cbe65ec9619ba6a9f23e9bbba2f40139 sed-4.1.5.ebuild 1820
+MISC ChangeLog 9868 RMD160 8e0db37f7c8eb8282ae07a0f7bb88536f0c67dcc SHA1 6f5558f48b6a1cde36c36c20309d73447719af66 SHA256 601842af523416abb6bd39b373f42496add8fb84ca1fe0cace355410ad89ebf9 size 9868
+MD5 b985c09ab97717ff441f5c2e83d02905 ChangeLog 9868
+RMD160 8e0db37f7c8eb8282ae07a0f7bb88536f0c67dcc ChangeLog 9868
+SHA256 601842af523416abb6bd39b373f42496add8fb84ca1fe0cace355410ad89ebf9 ChangeLog 9868
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 size 164
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164
@@ -52,7 +56,7 @@ SHA256 fc27a6c7e4ea15ccadc1700d6e950a14125370ea6eb28e3c8d188ac9c91bf98c files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.3 (GNU/Linux)
 
-iD8DBQFEad1OAiZjviIA2XgRAgonAJ4hnNkcRu34EO4G5zLU4RbQ0Cb83ACeMWx3
-pF7GH5ddoISXvYnb//rB+t8=
-=VWtn
+iD8DBQFEaehuAiZjviIA2XgRAsCqAJ97EIJssdFXQLjIGdzD0wSiWE99JQCfTNUE
+MJxEXVTE/4BjB6YcsiwYuOM=
+=Yh95
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/sed/files/sed-4.1.5-alloca.patch b/sys-apps/sed/files/sed-4.1.5-alloca.patch
new file mode 100644
index 000000000000..9c92ba6ce357
--- /dev/null
+++ b/sys-apps/sed/files/sed-4.1.5-alloca.patch
@@ -0,0 +1,14 @@
+Index: sed-4.1.5/lib/regex_internal.h
+===================================================================
+--- sed-4.1.5.orig/lib/regex_internal.h
++++ sed-4.1.5/lib/regex_internal.h
+@@ -410,7 +410,9 @@ static unsigned int re_string_context_at
+ #define re_string_skip_bytes(pstr,idx) ((pstr)->cur_idx += (idx))
+ #define re_string_set_index(pstr,idx) ((pstr)->cur_idx = (idx))
+ 
++#ifdef HAVE_ALLOCA_H
+ #include <alloca.h>
++#endif
+ 
+ #ifndef _LIBC
+ # if HAVE_ALLOCA
diff --git a/sys-apps/sed/sed-4.1.5.ebuild b/sys-apps/sed/sed-4.1.5.ebuild
index 177513ea4268..693a532e5bf3 100644
--- a/sys-apps/sed/sed-4.1.5.ebuild
+++ b/sys-apps/sed/sed-4.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.ebuild,v 1.2 2006/05/16 14:09:56 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/sed/sed-4.1.5.ebuild,v 1.3 2006/05/16 14:57:43 flameeyes Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://gnu/sed/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc-macos ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
 IUSE="nls static build bootstrap"
 
 RDEPEND="nls? ( virtual/libintl )"
@@ -39,6 +39,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-4.1.4-makeinfo-c-locale.patch
+	epatch "${FILESDIR}"/${P}-alloca.patch
 	sed -i \
 		-e "/docdir =/s:/doc:/doc/${PF}/html:" \
 		doc/Makefile.in || die "sed html doc"