multi versions

4 files changed, 494 insertions, 1 deletions

diff --git a/sys-devel/gcc/ChangeLog b/sys-devel/gcc/ChangeLog
index 1dcc6329bfec..d6a7ba988a36 100644
--- a/sys-devel/gcc/ChangeLog
+++ b/sys-devel/gcc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/gcc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.2 2002/03/01 16:15:04 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/ChangeLog,v 1.3 2002/04/15 03:15:43 azarah Exp $
+
+*gcc-3.0.4-r2 (15 Apr 2002)
+
+  15 Apr 2002; Martin Schlemmer <azarah@gentoo.org> :
+
+  This build enables us to have multiple versions of gcc
+  installed.
 
 *gcc-3.0.4 (1 Mar 2002)
 
diff --git a/sys-devel/gcc/files/digest-gcc-3.0.4-r2 b/sys-devel/gcc/files/digest-gcc-3.0.4-r2
new file mode 100644
index 000000000000..8ffcce370b4b
--- /dev/null
+++ b/sys-devel/gcc/files/digest-gcc-3.0.4-r2
@@ -0,0 +1,2 @@
+MD5 1e7ecec7e616d85cdec2d627bac3bf9b gcc-3.0.4.tar.bz2 14154365
+MD5 070493baeb2c277c34575b0df4e2baf1 texinfo-4.0.tar.gz 1133487
diff --git a/sys-devel/gcc/files/gcc3-program-transform.patch b/sys-devel/gcc/files/gcc3-program-transform.patch
new file mode 100644
index 000000000000..acaec1857929
--- /dev/null
+++ b/sys-devel/gcc/files/gcc3-program-transform.patch
@@ -0,0 +1,192 @@
+--- gcc-3.0.3/gcc/cp/Make-lang.in.transform	Tue Nov 20 10:24:02 2001
++++ gcc-3.0.3/gcc/cp/Make-lang.in	Sat Dec  1 17:49:20 2001
+@@ -38,14 +38,16 @@
+ # - define the names for selecting the language in LANGUAGES.
+ 
+ # Actual names to use when installing a native compiler.
+-CXX_INSTALL_NAME = `t='$(program_transform_name)'; echo c++ | sed $$t`
+-GXX_INSTALL_NAME = `t='$(program_transform_name)'; echo g++ | sed $$t`
+-DEMANGLER_INSTALL_NAME = `t='$(program_transform_name)'; echo c++filt | sed $$t`
++CXX_INSTALL_NAME = `echo c++|sed '$(program_transform_name)'`
++GXX_INSTALL_NAME = `echo g++|sed '$(program_transform_name)'`
++DEMANGLER_INSTALL_NAME = `echo c++filt|sed '$(program_transform_name)'`
++CXX_TARGET_INSTALL_NAME = $(target_alias)-`echo c++|sed '$(program_transform_name)'`
++GXX_TARGET_INSTALL_NAME = $(target_alias)-`echo g++|sed '$(program_transform_name)'`
+ 
+ # Actual names to use when installing a cross-compiler.
+-CXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo c++ | sed $$t`
+-GXX_CROSS_NAME = `t='$(program_transform_cross_name)'; echo g++ | sed $$t`
+-DEMANGLER_CROSS_NAME = `t='$(program_transform_cross_name)'; echo c++filt | sed $$t`
++CXX_CROSS_NAME = `echo c++|sed '$(program_transform_cross_name)'`
++GXX_CROSS_NAME = `echo g++|sed '$(program_transform_cross_name)'`
++DEMANGLER_CROSS_NAME = `echo c++filt|sed '$(program_transform_cross_name)'`
+ 
+ # The name to use for the demangler program.
+ DEMANGLER_PROG = c++filt$(exeext)
+@@ -161,10 +163,10 @@
+ 	    chmod a+x $(bindir)/$(GXX_INSTALL_NAME)$(exeext); \
+ 	    rm -f $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
+ 	    $(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_INSTALL_NAME)$(exeext); \
+-	    rm -f $(bindir)/$(target_alias)-g++$(exeext); \
+-	    $(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-g++$(exeext); \
+-	    rm -f $(bindir)/$(target_alias)-c++$(exeext); \
+-	    $(LN) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-c++$(exeext); \
++	    rm -f $(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \
++	    $(LN) $(bindir)/$(GXX_INSTALL_NAME)$(exeext) $(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \
++	    rm -f $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \
++	    $(LN) $(bindir)/$(CXX_INSTALL_NAME)$(exeext) $(bindir)/$(CXX_TARGET_INSTALL_NAME)$(exeext); \
+ 	  fi ; \
+ 	  if [ x$(DEMANGLER_PROG) != x ] && [ -x "$(DEMANGLER_PROG)" ]; then \
+ 	    if [ -f g++-cross$(exeext) ] ; then \
+--- gcc-3.0.3/gcc/doc/install.texi.transform	Tue Nov 20 10:24:10 2001
++++ gcc-3.0.3/gcc/doc/install.texi	Sat Dec  1 17:49:50 2001
+@@ -361,6 +361,51 @@
+ 
+ @end table
+ 
++@item --program-prefix=@var{prefix}
++GCC supports some transformations of the names of its programs when
++installing them. This option prepends @var{prefix} to the names of
++programs to install in @var{bindir} (see above). For example, specifying
++@option{--program-prefix=foo-} would result in @samp{gcc}
++being installed as @file{/usr/local/bin/foo-gcc}.
++
++@item --program-suffix=@var{suffix}
++Appends @var{suffix} to the names of programs to install in @var{bindir}
++(see above). For example, specifying @option{--program-suffix=-3.1}
++would result in @samp{gcc} being installed as
++@file{/usr/local/bin/gcc-3.1}.
++
++@item --program-transform-name=@var{pattern}
++Applies the @samp{sed} script @var{pattern} to be applied to the names
++of programs to install in @var{bindir} (see above). @var{pattern} has to
++consist of one or more basic @samp{sed} editing commands, separated by
++semicolons. For example, if you want the @samp{gcc} program name to be
++transformed to the installed program @file{/usr/local/bin/myowngcc} and
++the @samp{g++} program name to be transformed to
++@file{/usr/local/bin/gspecial++} without changing other program names,
++you could use the pattern
++@option{--program-transform-name='s/^gcc$/myowngcc/; s/^g++$/gspecial++/'}
++to achieve this effect.
++
++All three options can be combined and used together, resulting in more
++complex conversion patterns. As a basic rule, @var{prefix} (and
++@var{suffix}) are prepended (appended) before further transformations
++can happen with a special transformation script @var{pattern}.
++
++As currently implemented, this options only take effect for native
++builds; cross compiler binaries' names are not transformed even when a
++transformation is explicitly asked for by one of this options.
++
++For native builds, some of the installed programs are also installed
++with the target alias in front of their name, as in
++@samp{i686-pc-linux-gnu-gcc}. All of the above transformations happen
++before the target alias is prepended to the name - so, specifying
++@option{--program-prefix=foo-} and @option{program-suffix=-3.1}, the
++resulting binary would be installed as
++@file{/usr/local/bin/i686-pc-linux-gnu-foo-gcc-3.1}.
++
++As a last shortcoming, none of the installed CHILL and Ada programs are
++transformed yet, which will be fixed in some time.
++
+ @item --with-local-prefix=@var{dirname}
+ Specify the
+ installation directory for local include files.  The default is
+--- gcc-3.0.3/gcc/f/Make-lang.in.transform	Tue Nov 20 10:24:10 2001
++++ gcc-3.0.3/gcc/f/Make-lang.in	Sat Dec  1 17:49:25 2001
+@@ -39,10 +39,10 @@
+ # $(srcdir) must be set to the gcc/ source directory (not gcc/f/).
+ #
+ # Actual name to use when installing a native compiler.
+-G77_INSTALL_NAME = `t='$(program_transform_name)'; echo g77 | sed $$t`
++G77_INSTALL_NAME = `echo g77|sed '$(program_transform_name)'`
+ 
+ # Actual name to use when installing a cross-compiler.
+-G77_CROSS_NAME = `t='$(program_transform_cross_name)'; echo g77 | sed $$t`
++G77_CROSS_NAME = `echo g77|sed '$(program_transform_cross_name)'`
+ 
+ # Some versions of `touch' (such as the version on Solaris 2.8) 
+ # do not correctly set the timestamp due to buggy versions of `utime'
+--- gcc-3.0.3/gcc/java/Make-lang.in.transform	Wed Jul 18 19:02:18 2001
++++ gcc-3.0.3/gcc/java/Make-lang.in	Sat Dec  1 17:49:44 2001
+@@ -42,10 +42,10 @@
+ # - define the names for selecting the language in LANGUAGES.
+ 
+ # Actual names to use when installing a native compiler.
+-JAVA_INSTALL_NAME = `t='$(program_transform_name)'; echo gcj | sed $$t`
++JAVA_INSTALL_NAME = `echo gcj|sed '$(program_transform_name)'` 
+ 
+ # Actual names to use when installing a cross-compiler.
+-JAVA_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcj | sed $$t`
++JAVA_CROSS_NAME = `echo gcj|sed '$(program_transform_cross_name)'` 
+ 
+ GCJ = gcj
+ 
+@@ -170,10 +170,11 @@
+ 	  fi ; \
+ 	fi ; \
+         for tool in $(JAVA_TARGET_INDEPENDENT_BIN_TOOLS); do \
++	  tool_transformed_name=`echo $$tool|sed '$(program_transform_name)'`; \
+           if [ -f $$tool$(exeext) ]; then \
+-	    rm -f $(bindir)/$$tool$(exeext); \
+-	    $(INSTALL_PROGRAM) $$tool$(exeext) $(bindir)/$$tool$(exeext); \
+-	    chmod a+x $(bindir)/$$tool$(exeext); \
++	    rm -f $(bindir)/$$tool_transformed_name$(exeext); \
++	    $(INSTALL_PROGRAM) $$tool$(exeext) $(bindir)/$$tool_transformed_name$(exeext); \
++	    chmod a+x $(bindir)/$$tool_transformed_name$(exeext); \
+           fi ; \
+        done
+ 
+--- gcc-3.0.3/gcc/Makefile.in.transform	Tue Nov 20 10:23:44 2001
++++ gcc-3.0.3/gcc/Makefile.in	Sat Dec  1 17:48:59 2001
+@@ -540,18 +540,19 @@
+ HOST_STRSTR=$(STRSTR)
+ 
+ # Actual name to use when installing a native compiler.
+-GCC_INSTALL_NAME = `t='$(program_transform_name)'; echo gcc | sed -e $$t`
+-CPP_INSTALL_NAME = `t='$(program_transform_name)'; echo cpp | sed -e $$t`
+-PROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo protoize | sed -e $$t`
+-UNPROTOIZE_INSTALL_NAME = `t='$(program_transform_name)'; echo unprotoize | sed -e $$t`
+-GCOV_INSTALL_NAME = `t='$(program_transform_name)'; echo gcov | sed -e $$t`
+-GCCBUG_INSTALL_NAME = `t='$(program_transform_name)'; echo gccbug | sed -e $$t`
++GCC_INSTALL_NAME = `echo gcc|sed '$(program_transform_name)'`
++GCC_TARGET_INSTALL_NAME = $(target_alias)-`echo gcc|sed '$(program_transform_name)'`
++CPP_INSTALL_NAME = `echo cpp|sed '$(program_transform_name)'`
++PROTOIZE_INSTALL_NAME = `echo protoize|sed '$(program_transform_name)'`
++UNPROTOIZE_INSTALL_NAME = `echo unprotoize|sed '$(program_transform_name)'`
++GCOV_INSTALL_NAME = `echo gcov|sed '$(program_transform_name)'`
++GCCBUG_INSTALL_NAME = `echo gccbug|sed '$(program_transform_name)'`
+ 
+ # Actual name to use when installing a cross-compiler.
+-GCC_CROSS_NAME = `t='$(program_transform_cross_name)'; echo gcc | sed -e $$t`
+-CPP_CROSS_NAME = `t='$(program_transform_cross_name)'; echo cpp | sed -e $$t`
+-PROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo protoize | sed -e $$t`
+-UNPROTOIZE_CROSS_NAME = `t='$(program_transform_cross_name)'; echo unprotoize | sed -e $$t`
++GCC_CROSS_NAME = `echo gcc|sed '$(program_transform_cross_name)'`
++CPP_CROSS_NAME = `echo cpp|sed '$(program_transform_cross_name)'`
++PROTOIZE_CROSS_NAME = `echo protoize|sed '$(program_transform_cross_name)'`
++UNPROTOIZE_CROSS_NAME = `echo unprotoize|sed '$(program_transform_cross_name)'`
+ 
+ # Choose the real default target.
+ ALL=all.internal
+@@ -2669,7 +2670,7 @@
+ 	  $(INSTALL_PROGRAM) xgcc$(exeext) $(bindir)/$(GCC_INSTALL_NAME)$(exeext); \
+ 	  rm -f $(bindir)/$(target_alias)-gcc-1$(exeext); \
+ 	  $(LN) $(bindir)/$(GCC_INSTALL_NAME)$(exeext) $(bindir)/$(target_alias)-gcc-1$(exeext); \
+-	  mv $(bindir)/$(target_alias)-gcc-1$(exeext) $(bindir)/$(target_alias)-gcc$(exeext); \
++	  mv $(bindir)/$(target_alias)-gcc-1$(exeext) $(bindir)/$(GCC_TARGET_INSTALL_NAME)$(exeext); \
+ 	fi
+ 
+ # Install the info files.
+--- gcc-3.0.3/gcc/configure.in.transform	Sat Dec  1 17:47:38 2001
++++ gcc-3.0.3/gcc/configure.in	Sat Dec  1 17:48:59 2001
+@@ -334,6 +334,9 @@
+ # Determine the host, build, and target systems
+ AC_CANONICAL_SYSTEM
+ 
++# Set program_transform_name
++AC_ARG_PROGRAM
++
+ # Find the native compiler
+ AC_PROG_CC
+ AC_PROG_CC_C_O
diff --git a/sys-devel/gcc/gcc-3.0.4-r2.ebuild b/sys-devel/gcc/gcc-3.0.4-r2.ebuild
new file mode 100644
index 000000000000..e376d9a2e460
--- /dev/null
+++ b/sys-devel/gcc/gcc-3.0.4-r2.ebuild
@@ -0,0 +1,292 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Grant Goodyear <g2boojum@gentoo.org>, Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/gcc/gcc-3.0.4-r2.ebuild,v 1.1 2002/04/15 03:15:43 azarah Exp $
+
+# NOTE TO MAINTAINER:  man pages and info pages gets nuked for multiple
+#                      version installs.  Ill fix later if i get a chance.
+
+TV=4.0
+GCC_SUFFIX=3
+LOC=/usr
+S=${WORKDIR}/${P}
+SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/${P}/${P}.tar.bz2
+	ftp://ftp.funet.fi/pub/mirrors/sourceware.cygnus.com/pub/gcc/releases/${P}/${P}.tar.bz2
+	ftp://ftp.gnu.org/pub/gnu/texinfo/texinfo-${TV}.tar.gz"
+DESCRIPTION="Modern GCC C/C++ compiler and an included, upgraded version of texinfo to boot"
+HOMEPAGE="http://www.gnu.org/software/gcc/gcc.html"
+
+DEPEND="virtual/glibc"
+RDEPEND="virtual/glibc >=sys-libs/zlib-1.1.4"
+if [ -z "`use build`" ]
+then
+	DEPEND="$DEPEND nls? ( sys-devel/gettext ) >=sys-libs/ncurses-5.2-r2"
+	RDEPEND="$RDEPEND >=sys-libs/ncurses-5.2-r2"
+fi
+
+build_multiple() {
+	#try to make sure that we should build multiple
+	#versions of gcc (dual install of gcc2 and gcc3)
+	profile="`readlink /etc/make.profile`"
+	if [ -z "`use build`" ] && \
+	   [ -z "`use bootstrap`" ] && \
+	   [ "`gcc --version | cut -f1 -d.`" -ne 3 ]
+	   [ "${profile/gcc3}" = "${profile}" ] && \
+	   [ "${GCCBUILD}" != "default" ]
+	then
+		return 0
+	else
+		ruturn 1
+	fi	  
+}
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	
+	# Now we integrate texinfo-${TV} into gcc.  It comes with texinfo-3.12.
+	cd ${S}
+	tar xzf ${DISTDIR}/texinfo-${TV}.tar.gz || die
+	#hack, because texinfo different in gcc 3.0+
+	mv ${S}/texinfo-${TV} ${S}/texinfo
+	cd ${S}/texinfo
+	if [ "`use build`" ]
+	then
+		patch -p0 < ${FILESDIR}/texinfo-${TV}-no-ncurses-gentoo.diff || die
+ 		touch *
+	fi
+
+	cd ${S}
+	patch -p1 <${FILESDIR}/gcc3-program-transform.patch || die
+}
+
+src_compile() {
+	local myconf=""
+	# use the system zlib!!!
+	myconf="--with-system-zlib"
+	if [ -z "`use build`" ]
+	then
+		myconf="${myconf} --enable-shared"
+	else
+		myconf="${myconf} --enable-languages=c"
+	fi
+	if [ -z "`use nls`" ] || [ "`use build`" ] ; then
+		myconf="${myconf} --disable-nls"
+	else
+		myconf="${myconf} --enable-nls --without-included-gettext"
+	fi
+
+	#only build with a program suffix if it is not our
+	#default compiler.  Also check $GCCBUILD until we got
+	#compilers sorted out.
+	#
+	#NOTE:  for software to detirmine gcc version, it will be easier
+	#       if we have gcc, gcc3 and gcc3.1, and NOT gcc-3.0.4.
+	if build_multiple
+	then
+		myconf="${myconf} --program-suffix=${GCC_SUFFIX}"
+	fi
+
+	# gcc does not like optimization
+
+	export CFLAGS="${CFLAGS/-O?/}"
+	export CXXFLAGS="${CXXFLAGS/-O?/}"
+
+	#build in a separate build tree
+	cd ${WORKDIR}
+	mkdir build
+	cd build
+
+	addwrite "/dev/zero"
+	${S}/configure --prefix=${LOC} \
+		--mandir=${LOC}/share/man \
+		--infodir=${LOC}/share/info \
+		--enable-shared \
+		--host=${CHOST} \
+		--build=${CHOST} \
+		--target=${CHOST} \
+		--enable-threads=posix \
+		--disable-checking  \
+		--with-local-prefix=${LOC}/local \
+		${myconf} || die
+
+	if [ -z "`use static`" ]
+	then
+		emake bootstrap-lean || die
+	else
+		emake LDFLAGS=-static bootstrap || die
+	fi
+}
+
+#thanks to mandrake for this function
+dispatch_libs() {
+	libname=$1 libversion=$2
+	rm -f $libname.so $libname.a
+
+	if build_multiple
+	then
+	# If we have multiple versions of GCC, leave libraries in $FULLPATH
+		ln -s ../../../$libname.so.$libversion $libname.so
+		rm -f ../../../$libname.so
+		cp -f ../../../$libname.a $libname.a
+		rm -f ../../../$libname.a
+	else
+		ln -sf ../../../$libname.so $libname.so
+		ln -sf ../../../$libname.a $libname.a
+	fi
+}
+
+src_install() {
+	#make install from the build directory
+	cd ${WORKDIR}/build
+	make prefix=${D}${LOC} \
+		mandir=${D}${LOC}/share/man \
+		infodir=${D}${LOC}/share/info \
+		install || die
+	
+	if build_multiple
+	then
+		[ -e ${D}/usr/bin/gcc${GCC_SUFFIX} ] || die "gcc not found in ${D}"
+	else
+		[ -e ${D}/usr/bin/gcc ] || die "gcc not found in ${D}"
+	fi
+	
+	FULLPATH=${LOC}/lib/gcc-lib/${CHOST}/${PV}
+	FULLPATH_D=${D}${LOC}/lib/gcc-lib/${CHOST}/${PV}
+	cd ${FULLPATH_D}
+	dodir /lib
+	dodir /etc/env.d
+	if build_multiple
+	then
+		dosym /usr/bin/cpp${GCC_SUFFIX} /lib/cpp${GCC_SUFFIX}
+		dosym gcc${GCC_SUFFIX} /usr/bin/cc${GCC_SUFFIX}
+		echo "LDPATH=${FULLPATH}" > ${D}/etc/env.d/05gcc${GCC_SUFFIX}
+	else
+		dosym /usr/bin/cpp /lib/cpp
+		dosym gcc /usr/bin/cc
+		echo "LDPATH=${FULLPATH}" > ${D}/etc/env.d/05gcc
+	fi
+
+	#make sure we dont have stuff lying around that
+	#can nuke multiple versions of gcc
+	if [ -z "`use build`" ]
+	then
+		cd ${FULLPATH_D}
+		#move symlinks to compiler-specific dir
+		dispatch_libs libstdc++  ${PV}
+		mv ../../../libsupc++.a libsupc++.a
+		dispatch_libs libgcj     2.0.0
+		dispatch_libs libgcjgc   1.0.1
+		mv libobjc* ../../../
+		dispatch_libs libobjc    1.0.0
+		dispatch_libs libobjc_gc 1.0.0
+
+		#move Java headers to compiler-specific dir
+		mv ${D}/usr/include/j*.h ${FULLPATH_D}/include/
+		mv ${D}/usr/include/{gcj,gnu,java} ${FULLPATH_D}/include/
+
+		#move libgcj.spec to compiler-specific directories
+		mv ${D}/usr/lib/libgcj.spec ${FULLPATH_D}/libgcj.spec
+
+		#rename jar because it could clash with Kaffe's jar if this gcc is
+		#primary compiler (aka don't have the -<version> extension)
+		cd ${D}/usr/bin
+		if build_multiple
+		then
+			mv jar${GCC_SUFFIX} gcj-jar${GCC_SUFFIX}
+		else
+			mv jar gcj-jar
+		fi
+
+		#move <cxxabi.h> to compiler-specific directories
+		mv ${D}/usr/include/g++-v3/cxxabi.h ${FULLPATH_D}/include/
+	fi
+
+	if build_multiple
+	then
+		cat >${D}/usr/bin/gcc${GCC_SUFFIX}-version <<EOF
+#!/bin/sh
+echo "${PV}"
+EOF
+		chmod +x ${D}/usr/bin/gcc${GCC_SUFFIX}-version
+	fi
+
+	cd ${S}
+    if [ -z "`use build`" ]
+    then
+		#do a full texinfo-${TV} install
+		
+		if ! build_multiple
+		then
+			cd ${WORKDIR}/build/texinfo
+		  	make DESTDIR=${D} \
+				infodir=${D}/usr/share/info \
+				install || die
+			
+			exeinto /usr/sbin
+			doexe ${FILESDIR}/mkinfodir
+
+			cd ${D}/usr/share/info
+			mv texinfo texinfo.info
+			for i in texinfo-*
+			do
+				mv ${i} texinfo.info-${i#texinfo-*}
+			done
+
+			cd ${S}/texinfo
+		   	docinto texinfo
+			dodoc AUTHORS ChangeLog COPYING INTRODUCTION NEWS README TODO 
+			docinto texinfo/info
+			dodoc info/README
+			docinto texinfo/makeinfo
+			dodoc makeinfo/README
+		fi
+
+		# end texinfo 4.0; begin more gcc stuff
+
+		cd ${S}
+		docinto /	
+		dodoc COPYING COPYING.LIB README* FAQ MAINTAINERS
+		docinto html
+		dodoc faq.html
+		cd ${S}/gcc
+		docinto gcc
+		dodoc BUGS ChangeLog* COPYING* FSFChangeLog* LANGUAGES NEWS PROBLEMS \
+			README* SERVICE TESTS.FLUNK
+	    cd ${S}/libchill
+	    docinto libchill
+	    dodoc ChangeLog
+	    cd ${S}/libf2c
+	    docinto libf2c
+	    dodoc ChangeLog changes.netlib README TODO
+		cd ${S}/libffi
+	    docinto libffi
+	    dodoc ChangeLog* LICENSE README
+		cd ${S}/libjava
+	    docinto libjava
+	    dodoc ChangeLog* COPYING LIBGJC_LICENSE README THANKS
+	    cd ${S}/libiberty
+	    docinto libiberty
+	    dodoc ChangeLog COPYING.LIB README
+	    cd ${S}/libio
+	    docinto libio
+	    dodoc ChangeLog NEWS README
+	    cd dbz
+	    docinto libio/dbz
+	    dodoc README
+	    cd ../stdio
+	    docinto libio/stdio
+	    dodoc ChangeLog*
+	    cd ${S}/libobjc
+	    docinto libobjc
+	    dodoc ChangeLog README* THREADS*
+		cd ${S}/libstdc++
+		docinto libstdc++
+		dodoc ChangeLog NEWS
+    else
+        rm -rf ${D}/usr/share/{man,info}
+		#do a minimal texinfo install (build image)
+		cd ${WORKDIR}/build/texinfo
+		dobin makeinfo/makeinfo util/{install-info,texi2dvi,texindex}
+	fi
+}
+