Attachment #51674 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

				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

		# Needs GL headers
		use_build opengl BuildGLULibrary


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

			patch_exclude 7500
		fi

		if ! use gatos; then
			patch_exclude 9841_all_4.3.0-gatos-mesa
		fi

		if use debug; then
			patch_exclude 5901*acecad-debug

		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

	# 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 (-27 / +32 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 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 686-692 Link Here
686	# Needs GL headers	692	# Needs GL headers
687	use_build opengl BuildGLULibrary	693	use_build opengl BuildGLULibrary
688		694
689
690	if use hppa; then	695	if use hppa; then
691	echo "#define DoLoadableServer NO" >> ${HOSTCONF}	696	echo "#define DoLoadableServer NO" >> ${HOSTCONF}
692	echo "#define BuildXF86DRI NO" >> config/cf/host.def	697	echo "#define BuildXF86DRI NO" >> config/cf/host.def
Lines 896-904 Link Here
896	patch_exclude 7500	901	patch_exclude 7500
897	fi	902	fi
898		903
899	# if ! use gatos; then	904	if ! use gatos; then
900	# patch_exclude 9841_all_4.3.0-gatos-mesa	905	patch_exclude 9841_all_4.3.0-gatos-mesa
901	# fi	906	fi
902		907
903	if use debug; then	908	if use debug; then
904	patch_exclude 5901*acecad-debug	909	patch_exclude 5901*acecad-debug
Lines 956-962 Link Here
956	FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \	961	FAST=1 ${S}/config/util/makeg.sh World WORLDOPTS="" \
957	\|\| die "debug make World failed"	962	\|\| die "debug make World failed"
958	else	963	else
959	FAST=1 emake World WORLDOPTS="" \|\| die "make World failed"	964	FAST=1 emake World MAKE=make DESTDIR="${D}" \|\| die "make World failed"
960	fi	965	fi
961		966
962	if use nls; then	967	if use nls; then
Lines 975-1003 Link Here
975	# gcc3 related fix. Do this during install, so that our	980	# gcc3 related fix. Do this during install, so that our
976	# whole build will not be compiled without mmx instructions.	981	# whole build will not be compiled without mmx instructions.
977	if [ "$(gcc-version)" != "2.95" ] && use x86; then	982	if [ "$(gcc-version)" != "2.95" ] && use x86; then
978	make install DESTDIR=${D} \	983	make install DESTDIR=${D} \
979	\|\| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \	984	\|\| make CDEBUGFLAGS="${CDEBUGFLAGS} -mno-mmx" \
980	CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \	985	CXXDEBUGFLAGS="${CXXDEBUGFLAGS} -mno-mmx" \
981	install DESTDIR=${D} \|\| die "install failed"	986	install DESTDIR=${D} \|\| die "install failed"
982	else	987	else
983	make install DESTDIR=${D} \|\| die "install failed"	988	make install MAKE=make DESTDIR=${D} \|\| die "install failed"
984	fi	989	fi
985		990
986	if use sdk; then	991	if use sdk; then
987	einfo "Installing X.org X11 SDK..."	992	einfo "Installing X.org X11 SDK..."
988	make install.sdk DESTDIR=${D} \|\| die "sdk install failed"	993	make install.sdk MAKE=make DESTDIR=${D} \|\| die "sdk install failed"
989	fi	994	fi
990		995
991	if ! use minimal; then	996	if ! use minimal; then
992	einfo "Installing man pages..."	997	einfo "Installing man pages..."
993	make install.man DESTDIR=${D} \|\| die "man page install failed"	998	make install.man MAKE=make DESTDIR=${D} \|\| die "man page install failed"
994	einfo "Compressing man pages..."	999	einfo "Compressing man pages..."
995	prepman /usr	1000	prepman /usr
996	fi	1001	fi
997		1002
998	if use nls; then	1003	if use nls; then
999	cd ${S}/nls	1004	cd ${S}/nls
1000	make DESTDIR=${D} install \|\| die "nls install failed"	1005	make MAKE=make DESTDIR=${D} install \|\| die "nls install failed"
1001	fi	1006	fi
1002	}	1007	}
1003		1008