Add configure fix for userpriv; #117307.

(Portage version: 2.0.51.22-r2)

3 files changed, 20 insertions, 225 deletions

diff --git a/dev-lang/prc-tools/ChangeLog b/dev-lang/prc-tools/ChangeLog
index 14ae77954abf..9013bc1b3eb9 100644
--- a/dev-lang/prc-tools/ChangeLog
+++ b/dev-lang/prc-tools/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/prc-tools
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/ChangeLog,v 1.10 2006/01/01 22:01:59 plasmaroo Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/prc-tools/ChangeLog,v 1.11 2006/01/02 17:16:15 plasmaroo Exp $
+
+  02 Jan 2006; <plasmaroo@gentoo.org> files/prc-tools-2.3-compilefix.patch:
+  Add configure fix for userpriv; #117307.
 
   01 Jan 2006; <plasmaroo@gentoo.org> prc-tools-2.3-r1.ebuild:
   Path fix; bug #100879.
diff --git a/dev-lang/prc-tools/files/prc-tools-2.2-compilefix.patch b/dev-lang/prc-tools/files/prc-tools-2.2-compilefix.patch
deleted file mode 100644
index 10bb44ef2c46..000000000000
--- a/dev-lang/prc-tools/files/prc-tools-2.2-compilefix.patch
+++ /dev/null
@@ -1,224 +0,0 @@
---- prc-tools-2.2/binutils/configure.in	2002-05-15 00:47:22.000000000 +0100
-+++ prc-tools-2.2/binutils/configure.in	2003-07-01 22:02:49.000000000 +0100
-@@ -508,35 +508,38 @@
- fi
- 
- # Handle ${copy_dirs}
--set fnord ${copy_dirs}
--shift
--while [ $# != 0 ]; do
--  if [ -f $2/COPIED ] && [ x"`cat $2/COPIED`" = x"$1" ]; then
--    :
--  else
--    echo Copying $1 to $2
--
--    # Use the install script to create the directory and all required
--    # parent directories.
--    if [ -d $2 ]; then
--      :
--    else
--      echo >config.temp
--      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
--    fi
--
--    # Copy the directory, assuming we have tar.
--    # FIXME: Should we use B in the second tar?  Not all systems support it.
--    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
--
--    # It is the responsibility of the user to correctly adjust all
--    # symlinks.  If somebody can figure out how to handle them correctly
--    # here, feel free to add the code.
--
--    echo $1 > $2/COPIED
--  fi
--  shift; shift
--done
-+### DISABLED ---> plasmaroo@plasmaroo.squirrelserver.co.uk
-+###               prc-tools compile fix to prevent sandbox
-+###               errors
-+# set fnord ${copy_dirs}
-+# shift
-+# while [ $# != 0 ]; do
-+#  if [ -f $2/COPIED ] && [ x"`cat $2/COPIED`" = x"$1" ]; then
-+#    :
-+#  else
-+#    echo Copying $1 to $2
-+#
-+#    # Use the install script to create the directory and all required
-+#    # parent directories.
-+#    if [ -d $2 ]; then
-+#      :
-+#    else
-+#      echo >config.temp
-+#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
-+#    fi
-+#
-+#    # Copy the directory, assuming we have tar.
-+#    # FIXME: Should we use B in the second tar?  Not all systems support it.
-+#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
-+#
-+#    # It is the responsibility of the user to correctly adjust all
-+#    # symlinks.  If somebody can figure out how to handle them correctly
-+#    # here, feel free to add the code.
-+#
-+#    echo $1 > $2/COPIED
-+#  fi
-+#  shift; shift
-+#done
- 
- # Configure extra directories which are host specific
-
---- prc-tools-2.2/gcc/configure.in 2002-05-15 00:47:22.000000000 +0100
-+++ prc-tools-2.2/gcc/configure.in 2003-07-01 22:02:49.000000000 +0100
-@@ -470,36 +470,39 @@
-   esac
- fi
-
- # Handle ${copy_dirs}
--set fnord ${copy_dirs}
--shift
--while [ $# != 0 ]; do
--  if [ -f $2/COPIED ] && [ x"`cat $2/COPIED`" = x"$1" ]; then
--    :
--  else
--    echo Copying $1 to $2
--
--    # Use the install script to create the directory and all required
--    # parent directories.
--    if [ -d $2 ]; then
--      :
--    else
--      echo >config.temp
--      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
--    fi
--
--    # Copy the directory, assuming we have tar.
--    # FIXME: Should we use B in the second tar?  Not all systems support it.
--    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
--
--    # It is the responsibility of the user to correctly adjust all
--    # symlinks.  If somebody can figure out how to handle them correctly
--    # here, feel free to add the code.
--
--    echo $1 > $2/COPIED
--  fi
--  shift; shift
--done
-+### DISABLED ---> plasmaroo@plasmaroo.squirrelserver.co.uk
-+###               prc-tools compile fix to prevent sandbox
-+###               errors
-+#set fnord ${copy_dirs}
-+#shift
-+#while [ $# != 0 ]; do
-+#  if [ -f $2/COPIED ] && [ x"`cat $2/COPIED`" = x"$1" ]; then
-+#    :
-+#  else
-+#    echo Copying $1 to $2
-+#
-+#    # Use the install script to create the directory and all required
-+#    # parent directories.
-+#    if [ -d $2 ]; then
-+#      :
-+#    else
-+#      echo >config.temp
-+#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
-+#    fi
-+#
-+#   # Copy the directory, assuming we have tar.
-+#   # FIXME: Should we use B in the second tar?  Not all systems support it.
-+#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
-+#
-+#   # It is the responsibility of the user to correctly adjust all
-+#   # symlinks.  If somebody can figure out how to handle them correctly
-+#   # here, feel free to add the code.
-+#
-+#    echo $1 > $2/COPIED
-+#  fi
-+#  shift; shift
-+#done
-
- # Configure extra directories which are host specific
-
---- prc-tools-2.2/doc/Makefile.in  2002-08-03 01:02:16.000000000 +0100
-+++ prc-tools-2.2/doc/Makefile.in  2003-07-02 12:59:41.000000000 +0100
-@@ -16,7 +16,8 @@
- exec_prefix = @exec_prefix@
- palmdev_prefix = @palmdev_prefix@
- infodir = @infodir@
--htmldir = @htmldocs_prefix@
-+htmldir = ${D}/@htmldocs_prefix@
-+       # Portage fix - install to ${D} instead...
-
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-
---- prc-tools-2.2/gdb/configure.in  2002-12-10 21:34:10.000000000 +0000
-+++ prc-tools-2.2/gdb/configure.in  2003-07-03 17:49:38.000000000 +0100
-@@ -909,35 +909,38 @@
- fi
-
- # Handle ${copy_dirs}
--set fnord ${copy_dirs}
--shift
--while test $# != 0 ; do
--  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
--    :
--  else
--    echo Copying $1 to $2
--
--    # Use the install script to create the directory and all required
--    # parent directories.
--    if test -d $2 ; then
--      :
--    else
--      echo >config.temp
--      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
--    fi
--
--    # Copy the directory, assuming we have tar.
--    # FIXME: Should we use B in the second tar?  Not all systems support it.
--    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
--
--    # It is the responsibility of the user to correctly adjust all
--    # symlinks.  If somebody can figure out how to handle them correctly
--    # here, feel free to add the code.
--
--    echo $1 > $2/COPIED
--  fi
--  shift; shift
--done
-+### DISABLED ---> plasmaroo@plasmaroo.squirrelserver.co.uk
-+###               prc-tools compile fix to prevent sandbox
-+###               errors
-+# set fnord ${copy_dirs}
-+# shift
-+# while test $# != 0 ; do
-+#  if test -f $2/COPIED && test x"`cat $2/COPIED`" = x"$1" ; then
-+#    :
-+#  else
-+#    echo Copying $1 to $2
-+#
-+#    # Use the install script to create the directory and all required
-+#    # parent directories.
-+#    if test -d $2 ; then
-+#      :
-+#    else
-+#      echo >config.temp
-+#      ${srcdir}/install-sh -c -m 644 config.temp $2/COPIED
-+#   fi
-+#
-+#    # Copy the directory, assuming we have tar.
-+#    # FIXME: Should we use B in the second tar?  Not all systems support it.
-+#    (cd $1; tar -cf - .) | (cd $2; tar -xpf -)
-+#
-+#    # It is the responsibility of the user to correctly adjust all
-+#    # symlinks.  If somebody can figure out how to handle them correctly
-+#    # here, feel free to add the code.
-+#
-+#    echo $1 > $2/COPIED
-+#  fi
-+#  shift; shift
-+#done
-
- # Work in distributions that contain no compiler tools, like Autoconf.
- tentative_cc=""
diff --git a/dev-lang/prc-tools/files/prc-tools-2.3-compilefix.patch b/dev-lang/prc-tools/files/prc-tools-2.3-compilefix.patch
index dbfe81d0283b..835c85801bb3 100644
--- a/dev-lang/prc-tools/files/prc-tools-2.3-compilefix.patch
+++ b/dev-lang/prc-tools/files/prc-tools-2.3-compilefix.patch
@@ -326,3 +326,19 @@
  	done
  
  .PHONY: all info man html install install-info install-man install-html clean
+--- prc-tools-2.3/configure	2003-09-18 01:30:15.000000000 +0100
++++ prc-tools-2.3/configure	2006-01-02 17:05:59.000000000 +0000
+@@ -1764,13 +1764,6 @@
+ fi
+ 
+   if test -n "$htmldocs_enabled"; then
+-    # Check that texi2html understands its new-style (e.g. -out_file) arguments
+-    if test $TEXI2HTML != false &&
+-       $TEXI2HTML -out_file /dev/null /dev/null >/dev/null 2>/dev/null
+-    then :
+-    else
+-      { echo "configure: error: modern texi2html needed to build HTML documentation" 1>&2; exit 1; }
+-    fi
+     # In a multi-target build, hmtldocs needs to ensure that this is configured
+     # before it tries to "make info" over there.
+     if test $first_enabled_target != .; then