Sed replaces all 'share' in patch with 'lib', which causes sandbox errors with

a PORTAGE_TMPDIR with 'share' in it, bug #42336.
Patch by gna <gnagent2@yahoo.com.au>.

4 files changed, 32 insertions, 10 deletions

diff --git a/sys-libs/ncurses/ChangeLog b/sys-libs/ncurses/ChangeLog
index c9ad9b9f3c79..e7fae7fda50b 100644
--- a/sys-libs/ncurses/ChangeLog
+++ b/sys-libs/ncurses/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-libs/ncurses
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.49 2004/02/21 21:42:42 brad_mssw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ChangeLog,v 1.50 2004/02/29 19:12:41 azarah Exp $
+
+  29 Feb 2004; Martin Schlemmer <azarah@gentoo.org> ncurses-5.3-r5.ebuild,
+  files/ncurses-5.3-share-sed.patch:
+  Sed replaces all 'share' in patch with 'lib', which causes sandbox errors with
+  a PORTAGE_TMPDIR with 'share' in it, bug #42336.
+  Patch by gna <gnagent2@yahoo.com.au>.
 
   21 Feb 2004; Brad House <brad_mssw@gentoo.org> ncurses-5.3-r5.ebuild:
   mark stable on amd64 and ppc64
diff --git a/sys-libs/ncurses/Manifest b/sys-libs/ncurses/Manifest
index 857696f5a37f..a69f52011f15 100644
--- a/sys-libs/ncurses/Manifest
+++ b/sys-libs/ncurses/Manifest
@@ -1,16 +1,17 @@
-MD5 5003c42e358268d56bcba796e4ddfa4b ChangeLog 8015
-MD5 6eadb93d736e38cee7262e64629d0003 ncurses-5.3-r1.ebuild 2311
 MD5 6c106fbeea1c453e10d37667cefd35ae ncurses-5.3-r2.ebuild 2459
+MD5 b2e4231f6fb5cdb29e0f6d12f36ff6c4 ChangeLog 8297
+MD5 6eadb93d736e38cee7262e64629d0003 ncurses-5.3-r1.ebuild 2311
 MD5 af7a0de2f75ba90257759319bfdda6fc ncurses-5.3-r3.ebuild 2675
 MD5 ac5ab557d506a10a6781d80a16a91408 ncurses-5.3-r4.ebuild 2847
+MD5 dfd7e9bf2ec22e70cc7b4dfad51516ea ncurses-5.3-r5.ebuild 3826
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 3524c9858286705edda79a8ee49be90b ncurses-5.3-r5.ebuild 3772
+MD5 fdef42c6fdd01e99c3e36b443e8a25c2 files/ncurses-5.2.20020511-gcc31.patch 703
+MD5 c5b265c81eb2dea26b66cd656c61e99c files/ncurses-5.3-share-sed.patch 686
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r1 64
-MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r2 64
-MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r3 64
 MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r4 64
-MD5 fdef42c6fdd01e99c3e36b443e8a25c2 files/ncurses-5.2.20020511-gcc31.patch 703
-MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002
 MD5 2167b54d7c96964183554e767e5f5376 files/xterm-debian.ti 342
-MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64
 MD5 143b9126206485a5faeb817fd94b1054 files/ncurses-5.3-coreutils.patch 1581
+MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r2 64
+MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r5 64
+MD5 cd8a694247cfd64ce864e99246a8d87f files/digest-ncurses-5.3-r3 64
+MD5 f96d1b4b0bf94f1d38ce950df0efb37e files/ncurses-5.3-xterm.patch 1002
diff --git a/sys-libs/ncurses/files/ncurses-5.3-share-sed.patch b/sys-libs/ncurses/files/ncurses-5.3-share-sed.patch
new file mode 100644
index 000000000000..f069ac6c895e
--- /dev/null
+++ b/sys-libs/ncurses/files/ncurses-5.3-share-sed.patch
@@ -0,0 +1,13 @@
+diff -urN ncurses-5.3/misc/run_tic.in ncurses-5.3.share/misc/run_tic.in
+--- ncurses-5.3/misc/run_tic.in	2001-10-14 08:44:33.000000000 +0800
++++ ncurses-5.3.share/misc/run_tic.in	2004-02-21 15:46:09.000000000 +0800
+@@ -81,7 +81,8 @@
+ umask 022
+ 
+ # Construct the name of the old (obsolete) pathname, e.g., /usr/lib/terminfo.
+-TICDIR=`echo $TERMINFO | sed -e 's@/share/@/lib/@'`
++# make sure only last share directory in the $TERMINFO path is changed to lib
++TICDIR=`echo $TERMINFO | sed -e 's@/share/terminfo$@/lib/terminfo@'`
+ 
+ # Remove the old terminfo stuff; we don't care if it existed before, and it
+ # would generate a lot of confusing error messages if we tried to overwrite it.
diff --git a/sys-libs/ncurses/ncurses-5.3-r5.ebuild b/sys-libs/ncurses/ncurses-5.3-r5.ebuild
index 83d0052822c4..9ce3f25110d9 100644
--- a/sys-libs/ncurses/ncurses-5.3-r5.ebuild
+++ b/sys-libs/ncurses/ncurses-5.3-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.3-r5.ebuild,v 1.9 2004/02/22 12:34:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/ncurses/ncurses-5.3-r5.ebuild,v 1.10 2004/02/29 19:12:41 azarah Exp $
 
 inherit eutils flag-o-matic 64-bit gnuconfig
 filter-flags -fno-exceptions
@@ -22,6 +22,8 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${P}-xterm.patch
 	epatch ${FILESDIR}/${P}-coreutils.patch
+	# Bug #42336.
+	epatch ${FILESDIR}/${P}-share-sed.patch
 }
 
 src_compile() {