Attachment #51673 for bug #82689




#			ebuild functions, no direct code, no functions of more than 60 lines
#		Generalize any functions that make sense to generalize (i.e., anything
#			that might realistically see use elsewhere, or repetitively here)
inherit eutils flag-o-matic toolchain-funcs x11 multilib


# Make sure Portage does _NOT_ strip symbols.  We will do it later and make sure

HOMEPAGE="http://xorg.freedesktop.org/"

# Misc patches we may need to fetch ..
#X_PATCHES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-patches-${PATCH_VER}.tar.bz2
#	http://dev.gentoo.org/~cyfred/distfiles/${P}-patches-${PATCH_VER}.tar.bz2
#	mirror://GENTOO/${P}-patches-${PATCH_VER}.tar.bz2"
X_PATCHES=""
GENTOO_FILES=""
#GENTOO_FILES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-files-${FILES_VER}.tar.bz2
#	http://dev.gentoo.org/~cyfred/distfiles/${P}-files-${FILES_VER}.tar.bz2
#	mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2"

SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 )
	font-server? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 )

	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
	MIT SGI-B BSD || ( FTL GPL-2 )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ppc ~alpha ~x86-fbsd"

#dependency on sys-apps/util-linux removed for BSD testing -- lordnothing
DEPEND=">=sys-libs/ncurses-5.1
	>=sys-libs/zlib-1.1.3-r2
	>=sys-devel/flex-2.5.4a-r5

	opengl? ( >=x11-base/opengl-update-2.1.1 )
	>=x11-misc/ttmkfdir-3.0.9-r2
	>=sys-apps/sed-4
	sys-apps/util-linux
	dev-lang/perl
	media-libs/libpng
	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3

	ebegin "Setting up ${HOSTCONF}"
		cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} \
			|| die "host.def copy failed"
		echo "#define XVendorString \"Gentoo BSD (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \
			>> ${HOSTCONF}
			
		if use x86-fbsd; then
			echo "#define __FreeBSD__" >> ${HOSTCONF}
			echo "#undef linux" >> ${HOSTCONF}
		fi

		# Pending http://bugs.gentoo.org/show_bug.cgi?id=49038 and
		# http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=600

			replace-flags "-Os" "-O2"
		fi

#		if ( [ -e "${ROOT}/usr/src/linux" ] \
#			&&  ! kernel_is "2" "2" ) \
#			|| [ "$(uname -r | cut -d. -f1,2)" != "2.2" ]; then
#			echo "#define HasLinuxInput YES" >> ${HOSTCONF}
#		fi

		echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
		echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}

				echo "#define HasGlide3 YES" >> ${HOSTCONF}
			fi
# 			This won't work unless we can disable building the tdfx stuff
#			entirely :/
			use_build 3dfx HasGlide3
		fi

		if use x86; then

		use_build opengl BuildGLULibrary


# Architecture-specific stuff not needed for x86 commented out for BSD testing..
# maybe replace it when this ebuild works on x86 gentoo-bsd.. - lordnothing
			echo "#define BuildXF86DRI NO" >> config/cf/host.def
			echo "#undef DriDrivers" >> config/cf/host.def
			echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
		fi

#		if use hppa; then
#			echo "#define DoLoadableServer NO" >> ${HOSTCONF}
#			echo "#define BuildXF86DRI NO" >> config/cf/host.def
#			echo "#undef DriDrivers" >> config/cf/host.def
#			echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
#		fi

#		if use mips; then
#			echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF}
#		fi

		# Make xv optional for more minimal builds
		use_build xv BuildXvLibrary

		use_build xv BuildXF86RushExt
		use_build xv BuildXF86RushLibrary

#		if use alpha; then
#			echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \
#				i740 tdfx cirrus tseng fbdev \
#				ati vga v4l glint" >> ${HOSTCONF}
#		fi

#		if use ppc; then
#			echo "#define XF86CardDrivers mga glint s3virge sis savage trident \
#				chips tdfx fbdev ati DevelDrivers vga nv imstt \
#				XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF}
#		fi

#		if use ppc64; then
#			echo "#define MakeDllModules YES" >> ${HOSTCONF}
#			echo "#define XF86VgaHw YES" >> ${HOSTCONF}
#			echo "#define XF86FBDevHw YES" >> ${HOSTCONF}
#			echo "#define XF86CardDrivers fbdev v4l ati vga nv" >> ${HOSTCONF}
#		fi

#		if use sparc; then
#			echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \
#			suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
#			XF86OSCardDrivers XF86ExtraCardDrivers \
#			DevelDrivers" >> ${HOSTCONF}
#			if use hardened && ! use dlloader; then
#				einfo "Softening the assembler so cfb modules will play nice with sunffb"
#				echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
#				echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
#			fi
#			if ( [ -e "${ROOT}/usr/src/linux" ] \
#				&& ! kernel_is "2" "6" ) \
#				|| [ "$(uname -r | cut -d. -f1,2)" != "2.6" ]; then
#				einfo "Building for kernels less than 2.6 requires special treatment"
#				echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF}
#				einfo "Avoid bug #46593 for sparc32-SMP with kernel 2.4.xx"
#				echo "/* Add a line to avoid bug #56593 on sparc32 */" >> \
#				  programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
#			fi
#		fi

		# The definitions for fontconfig
		echo "#define UseFontconfig YES" >> ${HOSTCONF}

	unset MAKE_OPTS

	einfo "Building xorg-x11..."
#	if use debug; then
#		chmod u+x ${S}/config/util/makeg.sh
#		FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
#			|| die "debug make World failed"
#	else
		FAST=1 emake World MAKE=make DESTDIR="${D}" || die "make World failed"
#	fi

	if use nls; then
		emake -C ${S}/nls || die "nls build failed"

	# gcc3 related fix.  Do this during install, so that our
	# whole build will not be compiled without mmx instructions.
	if [ "$(gcc-version)" != "2.95" ] && use x86; then
			make install DESTDIR=${D} \
			|| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
					CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
					install DESTDIR=${D} || die "install failed"
	else
			make install MAKE=make DESTDIR=${D} || die "install failed"
	fi
	
	if use sdk; then
		einfo "Installing X.org X11 SDK..."
		make install.sdk MAKE=make DESTDIR=${D} || die "sdk install failed"
	fi

	if ! use minimal; then
		einfo "Installing man pages..."
		make install.man MAKE=make DESTDIR=${D} || die "man page install failed"
		einfo "Compressing man pages..."
		prepman /usr
	fi

	if use nls; then
		cd ${S}/nls
		make MAKE=make DESTDIR=${D} install || die "nls install failed"
	fi
}


Return to bug 82689

Lines 37-43 Link Here

(-)/usr/portage/x11-base/xorg-x11/xorg-x11-6.8.2.ebuild (-82 / +91 lines)
37	# ebuild functions, no direct code, no functions of more than 60 lines	37	# ebuild functions, no direct code, no functions of more than 60 lines
38	# Generalize any functions that make sense to generalize (i.e., anything	38	# Generalize any functions that make sense to generalize (i.e., anything
39	# that might realistically see use elsewhere, or repetitively here)	39	# that might realistically see use elsewhere, or repetitively here)
40	inherit eutils flag-o-matic toolchain-funcs x11 linux-info multilib	40	inherit eutils flag-o-matic toolchain-funcs x11 multilib
41		41
42		42
43	# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure	43	# Make sure Portage does _NOT_ strip symbols. We will do it later and make sure
Lines 60-72 Link Here
60	HOMEPAGE="http://xorg.freedesktop.org/"	60	HOMEPAGE="http://xorg.freedesktop.org/"
61		61
62	# Misc patches we may need to fetch ..	62	# Misc patches we may need to fetch ..
63	X_PATCHES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-patches-${PATCH_VER}.tar.bz2	63	#X_PATCHES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-patches-${PATCH_VER}.tar.bz2
64	http://dev.gentoo.org/~cyfred/distfiles/${P}-patches-${PATCH_VER}.tar.bz2	64	# http://dev.gentoo.org/~cyfred/distfiles/${P}-patches-${PATCH_VER}.tar.bz2
65	mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"	65	# mirror://GENTOO/${P}-patches-${PATCH_VER}.tar.bz2"
66		66	X_PATCHES=""
67	GENTOO_FILES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-files-${FILES_VER}.tar.bz2	67	GENTOO_FILES=""
68	http://dev.gentoo.org/~cyfred/distfiles/${P}-files-${FILES_VER}.tar.bz2	68	#GENTOO_FILES="http://dev.gentoo.org/~spyderous/${PN}/patchsets/${PV}/${P}-files-${FILES_VER}.tar.bz2
69	mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2"	69	# http://dev.gentoo.org/~cyfred/distfiles/${P}-files-${FILES_VER}.tar.bz2
		70	# mirror://gentoo/${P}-files-${FILES_VER}.tar.bz2"
70		71
71	SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 )	72	SRC_URI="!minimal? ( mirror://gentoo/eurofonts-X11.tar.bz2 )
72	font-server? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 )	73	font-server? ( http://dev.gentoo.org/~cyfred/xorg/${PN}/patchsets/${PV}/xfsft-encodings-${XFSFT_ENC_VER}.tar.bz2 )
Lines 90-97 Link Here
90	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0	91	nokia tektronix the-open-group todd-c-miller x-truetype xfree86-1.0
91	MIT SGI-B BSD \|\| ( FTL GPL-2 )"	92	MIT SGI-B BSD \|\| ( FTL GPL-2 )"
92	SLOT="0"	93	SLOT="0"
93	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ppc ~alpha"	94	KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~mips ~ppc64 ~sparc ~x86 ppc ~alpha ~x86-fbsd"
94		95
		96	#dependency on sys-apps/util-linux removed for BSD testing -- lordnothing
95	DEPEND=">=sys-libs/ncurses-5.1	97	DEPEND=">=sys-libs/ncurses-5.1
96	>=sys-libs/zlib-1.1.3-r2	98	>=sys-libs/zlib-1.1.3-r2
97	>=sys-devel/flex-2.5.4a-r5	99	>=sys-devel/flex-2.5.4a-r5
Lines 101-107 Link Here
101	opengl? ( >=x11-base/opengl-update-2.1.1 )	103	opengl? ( >=x11-base/opengl-update-2.1.1 )
102	>=x11-misc/ttmkfdir-3.0.9-r2	104	>=x11-misc/ttmkfdir-3.0.9-r2
103	>=sys-apps/sed-4	105	>=sys-apps/sed-4
104	sys-apps/util-linux
105	dev-lang/perl	106	dev-lang/perl
106	media-libs/libpng	107	media-libs/libpng
107	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3	108	!<=app-emulation/emul-linux-x86-xlibs-1.2-r3
Lines 504-511 Link Here
504	ebegin "Setting up ${HOSTCONF}"	505	ebegin "Setting up ${HOSTCONF}"
505	cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} \	506	cd ${S}; cp ${FILES_DIR}/site.def ${HOSTCONF} \
506	\|\| die "host.def copy failed"	507	\|\| die "host.def copy failed"
507	echo "#define XVendorString \"Gentoo Linux (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \	508	echo "#define XVendorString \"Gentoo BSD (The X.Org Foundation ${PV}, revision ${PR}-${PATCH_VER})\"" \
508	>> ${HOSTCONF}	509	>> ${HOSTCONF}
		510
		511	if use x86-fbsd; then
		512	echo "#define __FreeBSD__" >> ${HOSTCONF}
		513	echo "#undef linux" >> ${HOSTCONF}
		514	fi
509		515
510	# Pending http://bugs.gentoo.org/show_bug.cgi?id=49038 and	516	# Pending http://bugs.gentoo.org/show_bug.cgi?id=49038 and
511	# http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=600	517	# http://freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=600
Lines 609-619 Link Here
609	replace-flags "-Os" "-O2"	615	replace-flags "-Os" "-O2"
610	fi	616	fi
611		617
612	if ( [ -e "${ROOT}/usr/src/linux" ] \	618	# if ( [ -e "${ROOT}/usr/src/linux" ] \
613	&& ! kernel_is "2" "2" ) \	619	# && ! kernel_is "2" "2" ) \
614	\|\| [ "$(uname -r \| cut -d. -f1,2)" != "2.2" ]; then	620	# \|\| [ "$(uname -r \| cut -d. -f1,2)" != "2.2" ]; then
615	echo "#define HasLinuxInput YES" >> ${HOSTCONF}	621	# echo "#define HasLinuxInput YES" >> ${HOSTCONF}
616	fi	622	# fi
617		623
618	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}	624	echo "#define CcCmd $(tc-getCC)" >> ${HOSTCONF}
619	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}	625	echo "#define OptimizedCDebugFlags ${CFLAGS} GccAliasingArgs" >> ${HOSTCONF}
Lines 659-666 Link Here
659	echo "#define HasGlide3 YES" >> ${HOSTCONF}	665	echo "#define HasGlide3 YES" >> ${HOSTCONF}
660	fi	666	fi
661	# This won't work unless we can disable building the tdfx stuff	667	# This won't work unless we can disable building the tdfx stuff
662	# entirely :/	668	# entirely :/
663	# use_build 3dfx HasGlide3	669	use_build 3dfx HasGlide3
664	fi	670	fi
665		671
666	if use x86; then	672	if use x86; then
Lines 687-702 Link Here
687	use_build opengl BuildGLULibrary	693	use_build opengl BuildGLULibrary
688		694
689		695
690	if use hppa; then	696	# Architecture-specific stuff not needed for x86 commented out for BSD testing..
691	echo "#define DoLoadableServer NO" >> ${HOSTCONF}	697	# maybe replace it when this ebuild works on x86 gentoo-bsd.. - lordnothing
692	echo "#define BuildXF86DRI NO" >> config/cf/host.def
693	echo "#undef DriDrivers" >> config/cf/host.def
694	echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
695	fi
696		698
697	if use mips; then	699	# if use hppa; then
698	echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF}	700	# echo "#define DoLoadableServer NO" >> ${HOSTCONF}
699	fi	701	# echo "#define BuildXF86DRI NO" >> config/cf/host.def
		702	# echo "#undef DriDrivers" >> config/cf/host.def
		703	# echo "#define XF86CardDrivers fbdev" >> config/cf/host.def
		704	# fi
		705
		706	# if use mips; then
		707	# echo "#define XF86CardDrivers fbdev newport" >> ${HOSTCONF}
		708	# fi
700		709
701	# Make xv optional for more minimal builds	710	# Make xv optional for more minimal builds
702	use_build xv BuildXvLibrary	711	use_build xv BuildXvLibrary
Lines 705-749 Link Here
705	use_build xv BuildXF86RushExt	714	use_build xv BuildXF86RushExt
706	use_build xv BuildXF86RushLibrary	715	use_build xv BuildXF86RushLibrary
707		716
708	if use alpha; then	717	# if use alpha; then
709	echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \	718	# echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \
710	i740 tdfx cirrus tseng fbdev \	719	# i740 tdfx cirrus tseng fbdev \
711	ati vga v4l glint" >> ${HOSTCONF}	720	# ati vga v4l glint" >> ${HOSTCONF}
712	fi	721	# fi
713		722
714	if use ppc; then	723	# if use ppc; then
715	echo "#define XF86CardDrivers mga glint s3virge sis savage trident \	724	# echo "#define XF86CardDrivers mga glint s3virge sis savage trident \
716	chips tdfx fbdev ati DevelDrivers vga nv imstt \	725	# chips tdfx fbdev ati DevelDrivers vga nv imstt \
717	XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF}	726	# XF86OSCardDrivers XF86ExtraCardDrivers" >> ${HOSTCONF}
718	fi	727	# fi
719		728
720	if use ppc64; then	729	# if use ppc64; then
721	echo "#define MakeDllModules YES" >> ${HOSTCONF}	730	# echo "#define MakeDllModules YES" >> ${HOSTCONF}
722	echo "#define XF86VgaHw YES" >> ${HOSTCONF}	731	# echo "#define XF86VgaHw YES" >> ${HOSTCONF}
723	echo "#define XF86FBDevHw YES" >> ${HOSTCONF}	732	# echo "#define XF86FBDevHw YES" >> ${HOSTCONF}
724	echo "#define XF86CardDrivers fbdev v4l ati vga nv" >> ${HOSTCONF}	733	# echo "#define XF86CardDrivers fbdev v4l ati vga nv" >> ${HOSTCONF}
725	fi	734	# fi
726		735
727	if use sparc; then	736	# if use sparc; then
728	echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \	737	# echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \
729	suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \	738	# suntcx sunbw2 glint mga tdfx ati savage vesa vga fbdev \
730	XF86OSCardDrivers XF86ExtraCardDrivers \	739	# XF86OSCardDrivers XF86ExtraCardDrivers \
731	DevelDrivers" >> ${HOSTCONF}	740	# DevelDrivers" >> ${HOSTCONF}
732	if use hardened && ! use dlloader; then	741	# if use hardened && ! use dlloader; then
733	einfo "Softening the assembler so cfb modules will play nice with sunffb"	742	# einfo "Softening the assembler so cfb modules will play nice with sunffb"
734	echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}	743	# echo "#define AsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
735	echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}	744	# echo "#define ModuleAsCmd CcCmd -c -x assembler -fno-pie -fno-PIE" >> ${HOSTCONF}
736	fi	745	# fi
737	if ( [ -e "${ROOT}/usr/src/linux" ] \	746	# if ( [ -e "${ROOT}/usr/src/linux" ] \
738	&& ! kernel_is "2" "6" ) \	747	# && ! kernel_is "2" "6" ) \
739	\|\| [ "$(uname -r \| cut -d. -f1,2)" != "2.6" ]; then	748	# \|\| [ "$(uname -r \| cut -d. -f1,2)" != "2.6" ]; then
740	einfo "Building for kernels less than 2.6 requires special treatment"	749	# einfo "Building for kernels less than 2.6 requires special treatment"
741	echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF}	750	# echo "#define UseDeprecatedKeyboardDriver YES" >> ${HOSTCONF}
742	einfo "Avoid bug #46593 for sparc32-SMP with kernel 2.4.xx"	751	# einfo "Avoid bug #46593 for sparc32-SMP with kernel 2.4.xx"
743	echo "/* Add a line to avoid bug #56593 on sparc32 */" >> \	752	# echo "/* Add a line to avoid bug #56593 on sparc32 */" >> \
744	programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c	753	# programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c
745	fi	754	# fi
746	fi	755	# fi
747		756
748	# The definitions for fontconfig	757	# The definitions for fontconfig
749	echo "#define UseFontconfig YES" >> ${HOSTCONF}	758	echo "#define UseFontconfig YES" >> ${HOSTCONF}
Lines 951-963 Link Here
951	unset MAKE_OPTS	960	unset MAKE_OPTS
952		961
953	einfo "Building xorg-x11..."	962	einfo "Building xorg-x11..."
954	if use debug; then	963	# if use debug; then
955	chmod u+x ${S}/config/util/makeg.sh	964	# chmod u+x ${S}/config/util/makeg.sh
956	FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \	965	# FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
957	\|\| die "debug make World failed"	966	# \|\| die "debug make World failed"
958	else	967	# else
959	FAST=1 emake World WORLDOPTS="" \|\| die "make World failed"	968	FAST=1 emake World MAKE=make DESTDIR="${D}" \|\| die "make World failed"
960	fi	969	# fi
961		970
962	if use nls; then	971	if use nls; then
963	emake -C ${S}/nls \|\| die "nls build failed"	972	emake -C ${S}/nls \|\| die "nls build failed"
Lines 975-1003 Link Here
975	# gcc3 related fix. Do this during install, so that our	984	# gcc3 related fix. Do this during install, so that our
976	# whole build will not be compiled without mmx instructions.	985	# whole build will not be compiled without mmx instructions.
977	if [ "$(gcc-version)" != "2.95" ] && use x86; then	986	if [ "$(gcc-version)" != "2.95" ] && use x86; then
978	make install DESTDIR=${D} \	987	make install DESTDIR=${D} \
979	\|\| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \	988	\|\| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
980	CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \	989	CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
981	install DESTDIR=${D} \|\| die "install failed"	990	install DESTDIR=${D} \|\| die "install failed"
982	else	991	else
983	make install DESTDIR=${D} \|\| die "install failed"	992	make install MAKE=make DESTDIR=${D} \|\| die "install failed"
984	fi	993	fi
985		994
986	if use sdk; then	995	if use sdk; then
987	einfo "Installing X.org X11 SDK..."	996	einfo "Installing X.org X11 SDK..."
988	make install.sdk DESTDIR=${D} \|\| die "sdk install failed"	997	make install.sdk MAKE=make DESTDIR=${D} \|\| die "sdk install failed"
989	fi	998	fi
990		999
991	if ! use minimal; then	1000	if ! use minimal; then
992	einfo "Installing man pages..."	1001	einfo "Installing man pages..."
993	make install.man DESTDIR=${D} \|\| die "man page install failed"	1002	make install.man MAKE=make DESTDIR=${D} \|\| die "man page install failed"
994	einfo "Compressing man pages..."	1003	einfo "Compressing man pages..."
995	prepman /usr	1004	prepman /usr
996	fi	1005	fi
997		1006
998	if use nls; then	1007	if use nls; then
999	cd ${S}/nls	1008	cd ${S}/nls
1000	make DESTDIR=${D} install \|\| die "nls install failed"	1009	make MAKE=make DESTDIR=${D} install \|\| die "nls install failed"
1001	fi	1010	fi
1002	}	1011	}
1003		1012