dependency fix

7 files changed, 18 insertions, 716 deletions

diff --git a/app-office/openoffice/ChangeLog b/app-office/openoffice/ChangeLog
index 5c4b072086c0..dcf62cddb9a8 100644
--- a/app-office/openoffice/ChangeLog
+++ b/app-office/openoffice/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/openoffice
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.70 2004/05/05 10:00:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/ChangeLog,v 1.71 2004/05/05 10:19:26 suka Exp $
+
+  05 May 2004; suka@gentoo.org -openoffice-1.0.3-r1.ebuild,
+  openoffice-1.0.3-r2.ebuild, openoffice-1.1.0-r4.ebuild,
+  openoffice-1.1.0-r5.ebuild, openoffice-1.1.1-r1.ebuild:
+  Dependency fix
 
 *openoffice-1.0.3-r2 (05 May 2004)
 
diff --git a/app-office/openoffice/files/digest-openoffice-1.0.3-r1 b/app-office/openoffice/files/digest-openoffice-1.0.3-r1
deleted file mode 100644
index c06239430854..000000000000
--- a/app-office/openoffice/files/digest-openoffice-1.0.3-r1
+++ /dev/null
@@ -1,5 +0,0 @@
-MD5 984146931906a7d53300b29f58f6a899 OOo_1.0.3_source.tar.bz2 165475319
-MD5 cd4dd34b623a8704fbc800de79705171 STLport-4.5.3.tar.gz 739943
-MD5 fdb06fdb5a4670b172f9fb738b717be9 gpc231.tar.Z 27917
-MD5 09775a4111e066f782866d8a57d8481b freetype-2.1.3.tar.bz2 790213
-MD5 ff3eb5095a74ae7a9b2918ef5874288f helpcontent_01_unix.tgz 12693536
diff --git a/app-office/openoffice/openoffice-1.0.3-r1.ebuild b/app-office/openoffice/openoffice-1.0.3-r1.ebuild
deleted file mode 100644
index 4ec127fe0d48..000000000000
--- a/app-office/openoffice/openoffice-1.0.3-r1.ebuild
+++ /dev/null
@@ -1,702 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3-r1.ebuild,v 1.11 2004/04/24 10:48:06 suka Exp $
-
-# IMPORTANT:  This is extremely alpha!!!
-
-# Notes:
-#
-#   This will take a HELL of a long time to compile, be warned.
-#   According to openoffice.org, it takes approximately 12 hours on a
-#   P3/600 with 256mb ram.  And thats where building is its only task.
-#
-#   It takes about 6 hours on my P4 1.8 with 512mb memory, and the
-#   build only needs about 2.1GB of disk space - Azarah.
-#
-#   You will also need a bucketload of diskspace ... in the order of
-#   4-5 gb free to store all the compiled files and installation
-#   directories.
-#
-#   The information on how to build and what is required comes from:
-#   http://www.openoffice.org/dev_docs/source/build_linux.html
-#   http://tools.openoffice.org/ext_comp.html
-#
-# Todo:
-#
-#  Support for installing more than one language pack.
-#  Support for installing native-dictionaries. (maybe ooodi is enough?)
-
-# Language Check
-[ -z ${LANGUAGE} ] && LANGUAGE=01
-
-case ${LANGUAGE} in
-	01|07|33|34|35|39|42|46|49|81|82|86|88)
-		LHELP=${LANGUAGE}
-		;;
-	*)
-		LHELP=01
-		HSUPPORT=false
-		;;
-esac
-case ${LANGUAGE} in
-	01|03|07|30|31|33|34|35|34c|37|39|45|46|48|49|55|66|81|82|86|88|90|91|96|97)
-		LANGUAGE=${LANGUAGE}
-		;;
-	*)
-		LANGUAGE=01
-		LSUPPORT=false
-		;;
-esac
-case $LANGUAGE in
-	# ENUS is always set
-	# 01) LENV="RES_ENUS";;
-	03) LENV="RES_PORT";;
-	07) LENV="RES_RUSS";;
-	30) LENV="RES_GREEK";;
-	33) LENV="RES_FREN";;
-	34) LENV="RES_SPAN";;
-	35) LENV="RES_FINN";;
-	34c|37) LENV="RES_CAT";;
-	39) LENV="RES_ITAL";;
-	45) LENV="RES_DAN";;
-	46) LENV="RES_SWED";;
-	48) LENV="RES_POL";;
-	49) LENV="RES_GER";;
-	55) LENV="RES_PORTBR";;
-	66) LENV="RES_THAI";;
-	81) LENV="RES_JAPN";;
-	82) LENV="RES_KOREAAN";;
-	86) LENV="RES_CHINSIM";;
-	88) LENV="RES_CHINTRAD";;
-	90) LENV="RES_TURK";;
-	91) LENV="RES_HINDI";;
-	96) LENV="RES_ARAB";;
-	97) LENV="RES_HEBREW";;
-esac
-
-inherit flag-o-matic eutils
-# Compile problems with these ...
-
-filter-flags "-funroll-loops"
-filter-flags "-fomit-frame-pointer"
-replace-flags "-O3" "-O2"
-
-ALLOWED_FLAGS="-O -O1 -O2 -Os -mcpu -march -pipe"
-strip-flags
-
-# Enable Bytecode Interpreter for freetype ...
-append-flags "-DTT_CONFIG_OPTION_BYTECODE_INTERPRETER"
-
-inherit gcc
-# We want gcc3 if possible!!!!
-export WANT_GCC_3="yes"
-
-inherit virtualx
-
-# Set $ECPUS to amount of processes multiprocessing build should use.
-# NOTE:  Setting this too high might cause dmake to segfault!!
-#        Setting this to anything but "1" on my pentium4 causes things
-#        to segfault :(
-[ -z "${ECPUS}" ] && export ECPUS="1"
-
-
-LOC="/opt"
-FT_VER="2.1.3"
-STLP_VER="4.5.3"
-
-INSTDIR="${LOC}/OpenOffice.org${PV}"
-S="${WORKDIR}/oo_${PV}_src"
-DESCRIPTION="OpenOffice.org, a full office productivity suite."
-SRC_URI="http://ny1.mirror.openoffice.org/stable/${PV}/OOo_${PV}_source.tar.bz2
-	http://sf1.mirror.openoffice.org/stable/${PV}/OOo_${PV}_source.tar.bz2
-	http://www.stlport.org/archive/STLport-${STLP_VER}.tar.gz
-	ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z
-	mirror://sourceforge/freetype/freetype-${FT_VER}.tar.bz2
-	ftp://ftp.services.openoffice.org/pub/OpenOffice.org/contrib/helpcontent/helpcontent_${LHELP}_unix.tgz"
-
-HOMEPAGE="http://www.openoffice.org/"
-
-LICENSE="LGPL-2 | SISSL-1.1"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
-IUSE="gnome kde"
-
-RDEPEND=">=sys-libs/glibc-2.1
-	>=dev-lang/perl-5.0
-	virtual/x11
-	app-arch/zip
-	app-arch/unzip
-	dev-libs/expat
-	>=virtual/jdk-1.3.1
-	virtual/lpr
-	ppc? ( >=sys-libs/glibc-2.2.5-r7
-	>=sys-devel/gcc-3.2 )" # needed for sqrtl patch recently introduced
-
-DEPEND="${RDEPEND}
-	app-shells/tcsh
-	!app-office/openoffice-bin
-	!app-arch/star"
-
-# fix a bug with tcsh and dircolors
-#
-# Azarah -- 10 April 2002
-export LS_COLORS=""
-
-pkg_setup() {
-
-	if [ "$(gcc-version)" != "3.2" ]
-	then
-		eerror
-		eerror "This build needs gcc-3.2 or later, but due to profile"
-		eerror "settings, it cannot DEPEND on it, so please merge it"
-		eerror "manually:"
-		eerror
-		eerror " #  ebuild ${PORTDIR}/sys-devel/gcc/gcc-3.2.1.ebuild merge"
-		eerror
-		eerror "Please make sure that you use the latest availible revision of"
-		eerror "gcc-3.2.  Thus if there is already a gcc-3.2.1-r2 out, use this"
-		eerror "rather than 3.2.1, etc."
-		eerror
-		eerror "As of writing, gcc-3.2.1 seemed to create the most stable builds."
-		eerror "Also, because OO is such a complex build, ONLY gcc-3.2.1 will be"
-		eerror "supported!"
-		eerror
-		eerror "This process is not highly recomended, as upgrading your compiler"
-		eerror "without upgrading your distribution can be detrimental to your "
-		eerror "installation of gentoo, unless you know what you're getting into"
-		eerror
-		die
-	fi
-
-	if [ -z "$(echo ${JDK_HOME} | grep "blackdown")" ] && [ "${FORCE_JAVA}" != "yes" ]
-	then
-		eerror
-		eerror "This ebuild has only been tested with the blackdown port of"
-		eerror "java.  If you use another java implementation, it could fail"
-		eerror "horribly, so please merge the blackdown-jdk and set it as"
-		eerror "system VM before proceeding:"
-		eerror
-		eerror " # emerge blackdown-jdk"
-		eerror " # java-config --set-system-vm=blackdown-jdk-<VERSION>"
-		eerror " # env-update"
-		eerror " # source /etc/profile"
-		eerror
-		eerror "Please adjust <VERSION> according to the version installed in"
-		eerror "/opt."
-		eerror
-		eerror "If you however want to test another JDK (not officially supported),"
-		eerror "you could do the following:"
-		eerror
-		eerror " # export FORCE_JAVA=yes"
-		eerror
-		die
-	fi
-
-	ewarn "****************************************************************"
-	ewarn " It is important to note that OpenOffice.org is a very fragile  "
-	ewarn " build when it comes to CFLAGS.  A number of flags have already "
-	ewarn " been filtered out.  If you experience difficulty merging this  "
-	ewarn " package and use agressive CFLAGS, lower the CFLAGS and try to  "
-	ewarn " merge again.					               "
-	ewarn "****************************************************************"
-
-	ewarn "****************************************************************"
-	ewarn " Selected Lanuage: ${LANGUAGE}                                  "
-	ewarn "                                                                "
-	ewarn " To build Openoffice in your native language start emerge with  "
-	ewarn "                LANGUAGE=XX emerge openoffice                   "
-	ewarn " To see all supported languagess visit. (as well as for the     "
-	ewarn " specific LANGUAGE=XX settings you might need		       "
-	ewarn "   http://l10n.openoffice.org/all_supported_languages.html      "
-	ewarn "                                                                "
-	ewarn " To install language specified dictionaries emerge ooodi        "
-	ewarn "****************************************************************"
-
-	if [ "${LSUPPORT}" = "false" ];
-	then
-		ewarn "****************************************************************"
-		ewarn "         Your language is not supported by OpenOffice,          "
-		ewarn "             falling back to default value !!!                  "
-		ewarn "****************************************************************"
-	elif [ "${HSUPPORT}" = "false" ];
-	then
-		ewarn "****************************************************************"
-		ewarn "      There are no helpfiles available for your language,       "
-		ewarn "             falling back to default value !!!                  "
-		ewarn "****************************************************************"
-	fi
-
-}
-
-oo_setup() {
-
-#	unset LANGUAGE
-#	unset LANG
-
-	export NEW_GCC="0"
-
-	if [ -x /usr/sbin/gcc-config ]
-	then
-		# Do we have a gcc that use the new layout and gcc-config ?
-		if /usr/sbin/gcc-config --get-current-profile &> /dev/null
-		then
-			export NEW_GCC="1"
-			export GCC_PROFILE="$(/usr/sbin/gcc-config --get-current-profile)"
-
-			# Just recheck gcc version ...
-			if [ "$(gcc-version)" != "3.2" ]
-			then
-				# See if we can get a gcc profile we know is proper ...
-				if /usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1 &> /dev/null
-				then
-					export PATH="$(/usr/sbin/gcc-config --get-bin-path ${CHOST}-3.2.1):${PATH}"
-					export GCC_PROFILE="${CHOST}-3.2.1"
-				else
-					eerror "This build needs gcc-3.2 or later!"
-					eerror
-					eerror "Use gcc-config to change your gcc profile:"
-					eerror
-					eerror "  # gcc-config $CHOST-3.2.1"
-					eerror
-					eerror "or whatever gcc version is relevant."
-					die
-				fi
-			fi
-		fi
-	fi
-
-	export JAVA_BINARY="`which java`"
-}
-
-src_unpack() {
-
-	oo_setup
-
-	cd ${WORKDIR}
-	unpack OOo_${PV}_source.tar.bz2 gpc231.tar.Z
-
-	# Install gpc
-	cd ${WORKDIR}/gpc231
-	cp gpc.* ${S}/external/gpc
-
-	cd ${S}
-
-	# This resolves missing symbols (Debian)
-	epatch ${FILESDIR}/${PV}/${PN}-1.0.1-compiler-flags.patch
-
-	# Misc Debian patches to fixup build
-	epatch ${FILESDIR}/${PV}/${PN}-1.0.1-no-mozab.patch
-	echo "moz     moz : NULL" > ${S}/moz/prj/build.lst
-
-	# Misc patches from Mandrake
-	epatch ${FILESDIR}/${PV}/${PN}-1.0.1-fix-asm.patch
-
-	# Get OO to use STLport-4.5.3 (Az)
-	cp ${DISTDIR}/STLport-${STLP_VER}.tar.gz ${S}/stlport/download || die
-	cd ${S}/stlport
-	if [ "${NEW_GCC}" -eq "1" ]
-	then
-		epatch ${FILESDIR}/${PV}/${PN}-1.0.1-use-STLport-4.5.3-newgcc.patch
-	else
-		epatch ${FILESDIR}/${PV}/${PN}-1.0.1-use-STLport-4.5.3.patch
-	fi
-	cd ${S}
-
-	# Seth -- Dec 1 2002
-	if [ "$(echo ${JAVA_BINARY} | egrep 'j(2s)?dk-1.4')" ]
-	then
-		epatch ${FILESDIR}/${PV}/${PN}-1.0.1-fix-jdk-1.4.0.patch
-	fi
-
-	# Debian patch to fix an xinteraction handler build error (Seth)
-	epatch ${FILESDIR}/${PV}/${PN}-1.0.1-xinteraction-fix.patch
-
-	# Get OO to build with freetype-2.1.3
-	einfo "Moving freetype-${FT_VER}.tar.bz2 in place ..."
-	cp ${DISTDIR}/freetype-${FT_VER}.tar.bz2 ${S}/freetype/download || die
-	# We need it as a .tar.gz ...
-	bzip2 -d ${S}/freetype/download/freetype-${FT_VER}.tar.bz2 || die
-	gzip -1 ${S}/freetype/download/freetype-${FT_VER}.tar
-	# OK, copy the new patch in place, and fixup some other things ...
-	cp ${FILESDIR}/${PV}/freetype-${FT_VER}.patch ${S}/freetype || die
-	epatch ${FILESDIR}/${PV}/${PN}-1.0.1-use-freetype-${FT_VER}.patch
-
-	# Now for our optimization flags ...
-	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
-		${S}/solenv/inc/unxlngi3.mk
-	perl -pi -e "s|^CFLAGSOPT=.*|CFLAGSOPT=${CFLAGS}|g" \
-		${S}/solenv/inc/unxlngi4.mk
-
-	# Some makefiles are not multiprocess ready (Mandrake)
-	cd ${S}; einfo "Fixing makefiles for multiprocess builds..."
-	for x in io/source/stm dtrans/source/X11 idlc/source nas zlib toolkit/util \
-		comphelper/util padmin/source svtools/util bridges/source/prot_uno \
-		ucb/source/ucp/ftpproxy framework/util framework/source/unotypes
-	do
-		perl -pi -e "s/^(PRJNAME)/MAXPROCESS=1\n\1/" ${x}/makefile.mk
-	done
-
-	epatch ${FILESDIR}/${PV}/${PN}-errno.patch
-#	einfo "Lets patch to get AA fonts..."
-#	epatch ${FILESDIR}/${PV}/${PN}-1.0.2-default-fonts.patch
-	epatch ${FILESDIR}/${PV}/${PN}-1.0.2-ft-antialias-advice.patch
-
-	#This patches the stupid printer problem (to upgrade to 1.0.3.1)
-	epatch ${FILESDIR}/${PV}/vcl.printcxx.OOO_STABLE_1_PORTS.100102.patch
-
-	# Patches for sparc
-	if [ "${ARCH}" = "sparc" ]
-	then
-		epatch $FILESDIR/${PV}/openoffice-1.0.3-sparc-gentoo.patch
-		epatch $FILESDIR/${PV}/openoffice-1.0.1-sparc.patch.bz2
-	fi
-
-}
-
-get_EnvSet() {
-
-	# Determine what Env file we should be using (Az)
-	export LinuxEnvSet="LinuxIntelEnv.Set"
-	use sparc && export LinuxEnvSet="LinuxSparcEnv.Set"
-	use sparc64 && export LinuxEnvSet="LinuxSparcEnv.Set"
-	use ppc && export LinuxEnvSet="LinuxPPCEnv.Set"
-	use alpha && export LinuxEnvSet="LinuxAlphaEnv.Set"
-
-	# Get build specific stuff (Az)
-	export SOLVER="$(awk '/^setenv UPD / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})"
-	export SOLPATH="$(awk '/^setenv INPATH / {gsub(/\"/, ""); print $3}' ${LinuxEnvSet})"
-}
-
-src_compile() {
-
-	local buildcmd=""
-
-	oo_setup
-
-	# Setup default compilers (We overide gcc2 if that is default here)
-	export CC="$(gcc-getCC)"
-	export CXX="$(gcc-getCXX)"
-
-	# http://www.gentoo.org/proj/en/hardened/etdyn-ssp.xml - #27761
-	if has_version "sys-devel/hardened-gcc"
-	then
-		export CC="${CC} -yet_exec"
-		export CXX="${CXX} -yet_exec"
-	fi
-
-	# Enable ccache for this build (Az)
-	if [ "${FEATURES/-ccache/}" = "${FEATURES}" -a \
-	     "${FEATURES/ccache/}" != "${FEATURES}" -a \
-	     -f /usr/bin/ccache -a -x /usr/bin/ccache ]
-	then
-		einfo "We're using ccache for this build..."
-		# Build uses its own env with $PATH, etc, so
-		# we take the easy way out. (Az)
-		export CC="/usr/bin/ccache ${CC}"
-		export CXX="/usr/bin/ccache ${CXX}"
-	fi
-
-	# Enable distcc for this build (Az)
-	if [ "${FEATURES/-distcc/}" = "${FEATURES}" -a \
-	     "${FEATURES/distcc/}" != "${FEATURES}" -a \
-		-f /usr/bin/distcc -a  -x /usr/bin/distcc ]
-	then
-		einfo "We're using distcc for this build..."
-		# Do not bump ECPUS if the user did not touch it, as currently
-		# it -PP do not work properly (segfaulting). (Az)
-		[ "$(echo ${DISTCC_HOSTS} | wc -w)" -gt 1 -a "${ECPUS}" -qt 1 ] && \
-			export ECPUS="$(echo ${DISTCC_HOSTS} | wc -w)"
-
-		export CC="/usr/bin/distcc ${CC}"
-		export CXX="/usr/bin/distcc ${CXX}"
-	fi
-
-	# Do NOT compile with a external STLport, as gcc-2.95.3 users will
-	# get linker errors due to the ABI being different (STLport will be
-	# compiled with 2.95.3, while OO is compiled with 3.x). (Az)
-	einfo "Configuring OpenOffice.org..."
-	cd ${S}/config_office
-	rm -f config.cache
-	./configure --enable-gcc3 \
-		--with-jdk-home=${JAVA_HOME} \
-		--with-x || die
-
-	cd ${S}
-	get_EnvSet
-
-	# Set language
-	[ ${LENV} ] && echo "setenv ${LENV} \"true\"" >> ${S}/${LinuxEnvSet}
-
-	# Do not include /usr/include in header search path, and
-	# same thing for internal gcc include dir, as gcc3 handles
-	# it correctly by default! (Az)
-	perl -pi -e "s| -I/usr/include||g" ${LinuxEnvSet}
-#	perl -pi -e "s| -I$(gcc-libpath)/include||g" ${LinuxEnvSet}
-
-	if [ "${NEW_GCC}" -eq "1" ]
-	then
-		local gcc_path="$(/usr/sbin/gcc-config --get-bin-path ${GCC_PROFILE})"
-
-		# Setup path for new gcc layout in $LinuxEnvSet, else the build
-		# environment will not find gcc ... (Az)
-		perl -pi -e "s|PATH \.:\$SOLARVER|PATH \.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet}
-		# New builds start quoting stuff ...
-		perl -pi -e "s|PATH \"\.:\$SOLARVER|PATH \"\.:${gcc_path}:\$SOLARVER|" ${LinuxEnvSet}
-	fi
-
-	# Should the build use multiprocessing?
-	# We use build.pl directly, as dmake tends to segfault. (Az)
-	if [ "${ECPUS}" -gt 1 ]
-	then
-		buildcmd="${S}/solenv/bin/build.pl -all -PP${ECPUS} product=full"
-	else
-		buildcmd="${S}/solenv/bin/build.pl -all product=full"
-	fi
-
-	if [ -z "$(grep 'CCCOMP' ${S}/${LinuxEnvSet})" ]
-	then
-		# Set CCCOMP and CXXCOMP.  This is still needed for STLport
-		echo "setenv CCCOMP \"${CC}\"" >> ${S}/${LinuxEnvSet}
-		echo "setenv CXXCOMP \"${CXX}\"" >> ${S}/${LinuxEnvSet}
-	fi
-
-	if [ "$(gcc-major-version)" -eq 3 ]
-	then
-		mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/{lib,inc}
-
-		einfo "Installing GCC related libs..."
-		# Workaround for missing libs with GCC3 (thanks to Debian) (Az)
-		cd ${S}/solver/${SOLVER}/${SOLPATH}/lib
-		cp $(gcc-libpath)/libstdc++.so.$(gcc-libstdcxx-major-version)* . || \
-			die "Could not copy gcc-libs!"
-		cp $(gcc-libpath)/libgcc_s.so* . || die "Could not copy gcc-libs!"
-		cd ${S}
-	fi
-
-	einfo "Bootstrapping OpenOffice.org..."
-	# Get things ready for bootstrap (Az)
-	chmod 0755 ${S}/solenv/bin/*.pl
-	mkdir -p ${S}/solver/${SOLVER}/${SOLPATH}/inc
-	touch ${S}/solver/${SOLVER}/${SOLPATH}/inc/minormkchanged.flg
-	# Bootstrap ...
-	./bootstrap
-
-	if [ "$(gcc-major-version)" -eq 3 ]
-	then
-		local LIBFILE="$(readlink `gcc-libpath`/libstdc++.so.`gcc-libstdcxx-major-version`)"
-		local LIBVERSION="$(echo ${LIBFILE} | sed -e 's|libstdc++\.so\.||g')"
-		# Get this beast to use the right version of libstdc++ ... (Az)
-		echo "LIBSTDCPP3:=${LIBVERSION}" >> \
-			${S}/solver/${SOLVER}/${SOLPATH}/inc/comp_ver.mk
-		cd ${S}
-	fi
-
-	# unpack help files
-	mkdir -p ${S}/solver/641/unxlngi4.pro/pck
-	cd ${S}/solver/641/unxlngi4.pro/pck
-	tar -xzf ${DISTDIR}/helpcontent_${LHELP}_unix.tgz
-	cd ${S}
-
-	einfo "Building OpenOffice.org..."
-	# Setup virtualmake
-	export maketype="tcsh"
-	echo "source ${S}/${LinuxEnvSet} && cd ${S}/instsetoo && ${buildcmd}" > build.tcsh
-	# Build needs X to compile! (Az)
-	virtualmake build.tcsh || die "Build failed!"
-
-	[ -d ${S}/instsetoo/${SOLPATH} ] || die "Cannot find build directory!"
-}
-
-src_install() {
-
-	# Sandbox issues; bug #11838
-	addpredict "/user"
-	addpredict "/share"
-	addpredict "/dev/dri"
-
-	get_EnvSet
-
-	# Added by Jason Wever <weeve@gentoo.org>
-	# For some weird reason, when you get done building
-	# the source on sparc, it doesn't have a readme file in place
-	# for the installation program (probably due to a non-supported
-	# arch/os combo.  This fixed that
-	if [ "${ARCH}" = "sparc" ]
-	then
-	cp ${S}/readlicense_oo/source/readme/unxlngi4/README \
-		${S}/instsetoo/unxlngs.pro/${LANGUAGE}/normal/README
-	fi
-
-
-	# The install part should now be relatively OK compared to
-	# what it was.  Basically we use autoresponse files to install
-	# unattended, running under a Xvfb if needed.  Afterwards we
-	# just cleanout ${D} from the registry, etc.  This way we
-	# do not need pre-generated registry, and also fixes some weird
-	# bugs related to the old way we did things.
-	#
-	# <azarah@gentoo.org> (9 Sep 2002)
-
-	# Autoresponse file for main installation
-	cat > ${T}/rsfile-global <<-"END_RS"
-		[ENVIRONMENT]
-		INSTALLATIONMODE=INSTALL_NETWORK
-		INSTALLATIONTYPE=STANDARD
-		DESTINATIONPATH=<destdir>
-		OUTERPATH=
-		LOGFILE=
-		LANGUAGELIST=<LANGUAGE>
-
-		[JAVA]
-		JavaSupport=preinstalled_or_none
-	END_RS
-
-	# Autoresponse file for user isntallation
-	cat > ${T}/rsfile-local <<-"END_RS"
-		[ENVIRONMENT]
-		INSTALLATIONMODE=INSTALL_WORKSTATION
-		INSTALLATIONTYPE=WORKSTATION
-		DESTINATIONPATH=<home>/.openoffice/<pv>
-
-		[JAVA]
-		JavaSupport=none
-	END_RS
-
-	# Fixing install location in response file
-	sed -e "s|<destdir>|${D}${INSTDIR}|" \
-		${T}/rsfile-global > ${T}/autoresponse
-
-	einfo "Installing OpenOffice.org into build root..."
-	dodir ${INSTDIR}
-	cd ${S}/instsetoo/${SOLPATH}/${LANGUAGE}/normal
-	# Setup virtualmake
-	export maketype="./setup"
-	# We need X to install...
-	virtualmake "-v -r:${T}/autoresponse"
-
-	echo
-	einfo "Removing build root from registry..."
-	# Remove totally useless stuff.
-	rm -f ${D}${INSTDIR}/program/{setup.log,sopatchlevel.sh}
-	# Remove build root from registry and co
-	egrep -rl "${D}" ${D}${INSTDIR}/* | \
-		xargs -i perl -pi -e "s|${D}||g" {} || :
-
-	einfo "Fixing permissions..."
-	# Fix permissions
-	find ${D}${INSTDIR}/ -type f -exec chmod a+r {} \;
-	chmod a+x ${D}${INSTDIR}/share/config/webcast/*.pl
-
-	# Fix symlinks
-	for x in "soffice program/spadmin" \
-		"program/setup setup" \
-		"program/spadmin spadmin"
-	do
-		dosym $(echo ${x} | awk '{print $1}') \
-			${INSTDIR}/$(echo ${x} | awk '{print $2}')
-	done
-
-	# Install user autoresponse file
-	insinto /etc/openoffice
-	sed -e "s|<pv>|${PV}|g" ${T}/rsfile-local > ${T}/autoresponse.conf
-	doins ${T}/autoresponse.conf
-
-	# Install wrapper script
-	exeinto /usr/bin
-	sed -e "s|<pv>|${PV}|g" \
-		${FILESDIR}/${PV}/ooffice-wrapper-1.3 > ${T}/ooffice
-	doexe ${T}/ooffice
-	sed -e "s|/soffice|/spadmin|g" \
-		${T}/ooffice > ${T}/oopadmin
-	doexe ${T}/oopadmin
-
-	# Component symlinks
-	dosym ooffice /usr/bin/oocalc
-	dosym ooffice /usr/bin/oodraw
-	dosym ooffice /usr/bin/ooimpress
-	dosym ooffice /usr/bin/oomath
-	dosym ooffice /usr/bin/oowriter
-	dosym ooffice /usr/bin/oosetup
-
-	einfo "Installing Menu shortcuts (need \"gnome\" or \"kde\" in USE)..."
-	if [ -n "`use gnome`" ]
-	then
-		insinto /usr/share/gnome/apps/OpenOffice.org
-		# Install the files needed for the catagory
-		doins ${D}${INSTDIR}/share/gnome/net/.directory
-		doins ${D}${INSTDIR}/share/gnome/net/.order
-
-		for x in ${D}${INSTDIR}/share/gnome/net/*.desktop
-		do
-			# We have to handle setup differently
-			perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
-			# Now fix the rest
-			perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
-			doins ${x}
-		done
-	fi
-
-	if [ -n "`use kde`" ]
-	then
-		local kdeloc="${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org${PV}"
-
-		# Portage do not work with the space ..
-		mv ${D}${INSTDIR}/share/kde/net/applnk/OpenOffice.org\ ${PV} ${kdeloc}
-
-		insinto /usr/share/applnk/OpenOffice.org
-		# Install the files needed for the catagory
-		doins ${kdeloc}/.directory
-		doins ${kdeloc}/.order
-		dodir /usr/share
-		# Install the icons and mime info
-		cp -a ${D}${INSTDIR}/share/kde/net/mimelnk/share/* ${D}/usr/share
-
-		for x in ${kdeloc}/*.desktop
-		do
-			# We have to handle setup differently
-			perl -pi -e "s:${INSTDIR}/program/setup:/usr/bin/oosetup:g" ${x}
-			# Now fix the rest
-			perl -pi -e "s:${INSTDIR}/program/s:/usr/bin/oo:g" ${x}
-			doins ${x}
-		done
-	fi
-
-	# Unneeded, as they get installed into /usr/share...
-	rm -rf ${D}${INSTDIR}/share/{cde,gnome,kde}
-
-	for f in ${D}/usr/share/gnome/apps/OpenOffice.org/* ; do
-		echo 'Categories=Application;Office;' >> ${f}
-	done
-
-	# Make sure these do not get nuked.
-	keepdir ${INSTDIR}/user/config/registry/instance/org/openoffice/{Office,ucb}
-	keepdir ${INSTDIR}/user/psprint/{driver,fontmetric}
-	keepdir ${INSTDIR}/user/{autocorr,backup,plugin,store,temp,template}
-}
-
-pkg_preinst() {
-
-	# The one with OO-1.0.0 was not valid
-	if [ -f ${ROOT}/etc/openoffice/autoresponse.conf ]
-	then
-		rm -f ${ROOT}/etc/openoffice/autoresponse.conf
-	fi
-}
-
-pkg_postinst() {
-
-	einfo "******************************************************************"
-	einfo " To start OpenOffice.org, run:"
-	einfo
-	einfo "   $ ooffice"
-	einfo
-	einfo " Also, for individual components, you can use any of:"
-	einfo
-	einfo "   oocalc, oodraw, ooimpress, oomath or oowriter"
-	einfo
-	einfo " If the fonts appear garbled in the user interface refer to "
-	einfo " Bug 8539, or http://www.openoffice.org/FAQs/fontguide.html#8"
-	einfo
-	einfo "******************************************************************"
-}
-
diff --git a/app-office/openoffice/openoffice-1.0.3-r2.ebuild b/app-office/openoffice/openoffice-1.0.3-r2.ebuild
index ea8488ee7cc1..9f817c1e6727 100644
--- a/app-office/openoffice/openoffice-1.0.3-r2.ebuild
+++ b/app-office/openoffice/openoffice-1.0.3-r2.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/app-office/openoffice/openoffice-1.0.3-r2.ebuild,v 1.1 2004/05/05 10:00:00 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.0.3-r2.ebuild,v 1.2 2004/05/05 10:19:26 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -135,7 +135,8 @@ RDEPEND=">=sys-libs/glibc-2.1
 DEPEND="${RDEPEND}
 	app-shells/tcsh
 	!app-office/openoffice-bin
-	!app-arch/star"
+	!app-arch/star
+	!dev-util/dmake"
 
 # fix a bug with tcsh and dircolors
 #
diff --git a/app-office/openoffice/openoffice-1.1.0-r4.ebuild b/app-office/openoffice/openoffice-1.1.0-r4.ebuild
index 6eabe41b947e..300b1103599d 100644
--- a/app-office/openoffice/openoffice-1.1.0-r4.ebuild
+++ b/app-office/openoffice/openoffice-1.1.0-r4.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/app-office/openoffice/openoffice-1.1.0-r4.ebuild,v 1.1 2004/04/25 11:34:24 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r4.ebuild,v 1.2 2004/05/05 10:19:26 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -83,7 +83,8 @@ DEPEND="${RDEPEND}
 	app-shells/tcsh
 	!app-office/openoffice-bin
 	sys-apps/findutils
-	!app-arch/star"
+	!app-arch/star
+	!dev-util/dmake"
 
 # fix a bug with tcsh and dircolors
 #
diff --git a/app-office/openoffice/openoffice-1.1.0-r5.ebuild b/app-office/openoffice/openoffice-1.1.0-r5.ebuild
index 7f426f1edeeb..2074c4774f00 100644
--- a/app-office/openoffice/openoffice-1.1.0-r5.ebuild
+++ b/app-office/openoffice/openoffice-1.1.0-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/app-office/openoffice/openoffice-1.1.0-r5.ebuild,v 1.1 2004/04/25 11:34:24 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.0-r5.ebuild,v 1.2 2004/05/05 10:19:26 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -77,7 +77,8 @@ RDEPEND=">=sys-libs/glibc-2.1
 DEPEND="${RDEPEND}
 	app-shells/tcsh
 	!app-office/openoffice-bin
-	sys-apps/findutils"
+	sys-apps/findutils
+	!dev-util/dmake"
 
 pkg_setup() {
 
diff --git a/app-office/openoffice/openoffice-1.1.1-r1.ebuild b/app-office/openoffice/openoffice-1.1.1-r1.ebuild
index 62f88bea8ed6..79bf5e327a74 100644
--- a/app-office/openoffice/openoffice-1.1.1-r1.ebuild
+++ b/app-office/openoffice/openoffice-1.1.1-r1.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/app-office/openoffice/openoffice-1.1.1-r1.ebuild,v 1.1 2004/04/25 11:34:24 suka Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice/openoffice-1.1.1-r1.ebuild,v 1.2 2004/05/05 10:19:26 suka Exp $
 
 # IMPORTANT:  This is extremely alpha!!!
 
@@ -79,7 +79,8 @@ DEPEND="${RDEPEND}
 	!app-office/openoffice-bin
 	>=virtual/jdk-1.4.1
 	sys-apps/findutils
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	!dev-util/dmake"
 
 pkg_setup() {