Update a bunch of packages.

Change-Id: I84dcdb91f0fcdc1491b8e82314e03cfd1a951af0 Reviewed-on: http://gerrit.chromium.org/gerrit/3712 Tested-by: Stéphane Marchesin <marcheu@chromium.org> Reviewed-by: Anush Elangovan <anush@chromium.org>
2025-09-27 16:41:11 +02:00 · 2011-07-06 20:26:12 -07:00 · 2011-07-06 20:26:12 -07:00 · e357b81178
commit e357b81178
parent 26b96105eb
71 changed files with 2146 additions and 0 deletions
--- a/sdk_container/src/third_party/portage-stable/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/dev-util/gtk-doc/gtk-doc-1.13-r2.ebuild
@ -0,0 +1,97 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/gtk-doc/Attic/gtk-doc-1.13-r2.ebuild,v 1.10 2010/11/14 15:40:27 eva dead $
+
+EAPI="2"
+
+inherit eutils elisp-common gnome2
+
+DESCRIPTION="GTK+ Documentation Generator"
+HOMEPAGE="http://www.gtk.org/gtk-doc/"
+
+LICENSE="GPL-2 FDL-1.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="debug doc emacs test"
+
+# app-editors/vim blocker needed due bug #333313
+RDEPEND=">=dev-libs/glib-2.6
+	>=dev-lang/perl-5.6
+	>=app-text/openjade-1.3.1
+	dev-libs/libxslt
+	>=dev-libs/libxml2-2.3.6
+	~app-text/docbook-xml-dtd-4.3
+	app-text/docbook-xsl-stylesheets
+	~app-text/docbook-sgml-dtd-3.0
+	>=app-text/docbook-dsssl-stylesheets-1.40
+	emacs? ( virtual/emacs )
+	!!>=app-editors/vim-7.3"
+
+DEPEND="${RDEPEND}
+	~dev-util/gtk-doc-am-${PV}
+	>=dev-util/pkgconfig-0.19
+	>=app-text/scrollkeeper-0.3.14
+	>=app-text/gnome-doc-utils-0.3.2
+	test? ( app-text/scrollkeeper-dtd )"
+
+SITEFILE=61${PN}-gentoo.el
+
+DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README TODO"
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Remove global Emacs keybindings.
+	epatch "${FILESDIR}/${PN}-1.8-emacs-keybindings.patch"
+
+	# gtk-doc.make puts $(DOC_MODULE)-overrides.txt in EXTRA_DIST,
+	# so this file must exist to be able to "make dist".
+	# fix bug #305191, upstream ##590625.
+	epatch "${FILESDIR}/${P}-scan-touch-module-overrides.patch"
+	# This restores a compatible behavior with previous versions of gtk-doc,
+	# which is required by many tarballs, fix bug #305191, upstream #605211
+	epatch "${FILESDIR}/${P}-fixxref-compat.patch"
+
+	# Fix bug 306569 by not loading vim plugins while calling vim in
+	# gtkdoc-fixxref for fixing vim syntax highlighting
+	epatch "${FILESDIR}/${P}-fixxref-vim-u-NONE.patch"
+}
+
+src_compile() {
+	gnome2_src_compile
+
+	use emacs && elisp-compile tools/gtk-doc.el
+}
+
+src_install() {
+	gnome2_src_install
+
+	# Don't install those files, they are in gtk-doc-am now
+	rm "${D}"/usr/share/aclocal/gtk-doc.m4 || die "failed to remove gtk-doc.m4"
+	rm "${D}"/usr/bin/gtkdoc-rebase || die "failed to remove gtkdoc-rebase"
+
+	if use doc; then
+		docinto doc
+		dodoc doc/*
+		docinto examples
+		dodoc examples/*
+	fi
+
+	if use emacs; then
+		elisp-install ${PN} tools/gtk-doc.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	if use emacs; then
+		elisp-site-regen
+		elog "gtk-doc does no longer define global key bindings for Emacs."
+		elog "You may set your own key bindings for \"gtk-doc-insert\" and"
+		elog "\"gtk-doc-insert-section\" in your ~/.emacs file."
+	fi
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
--- a/sdk_container/src/third_party/portage-stable/media-libs/glew/glew-1.5.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/media-libs/glew/glew-1.5.6.ebuild
@ -0,0 +1,57 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.5.6.ebuild,v 1.8 2010/10/29 05:41:52 jer Exp $
+
+EAPI=3
+inherit multilib toolchain-funcs
+
+DESCRIPTION="The OpenGL Extension Wrangler Library"
+HOMEPAGE="http://glew.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libXi
+	virtual/glu
+	virtual/opengl
+	x11-libs/libXext
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	myglewopts=(
+		GLEW_DEST="${ED}/usr"
+		LIBDIR="${ED}/usr/$(get_libdir)"
+		AR="$(tc-getAR)"
+		STRIP="true"
+		CC="$(tc-getCC)"
+		LD="$(tc-getCC) ${LDFLAGS}"
+		M_ARCH=""
+		LDFLAGS.EXTRA=""
+		POPT="${CFLAGS}"
+		)
+}
+
+src_prepare() {
+	sed -i \
+		-e '/INSTALL/s:-s::' \
+		-e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
+		Makefile || die
+
+	# don't do stupid Solaris specific stuff that won't work in Prefix
+	cp config/Makefile.linux config/Makefile.solaris || die
+}
+
+src_compile(){
+	emake "${myglewopts[@]}" || die
+}
+
+src_install() {
+	emake "${myglewopts[@]}" install || die
+	dodoc doc/*.txt README.txt TODO.txt || die
+	dohtml doc/*.{css,html,jpg,png} || die
+}
--- a/sdk_container/src/third_party/portage-stable/sys-devel/clang/clang-2.8-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/clang/clang-2.8-r3.ebuild
@ -0,0 +1,201 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/clang/clang-2.8-r3.ebuild,v 1.3 2011/03/14 21:41:19 grobian Exp $
+
+EAPI=3
+
+RESTRICT_PYTHON_ABIS="3.*"
+SUPPORT_PYTHON_ABIS="1"
+
+inherit eutils multilib python
+
+DESCRIPTION="C language family frontend for LLVM"
+HOMEPAGE="http://clang.llvm.org/"
+# Fetching LLVM as well: see http://llvm.org/bugs/show_bug.cgi?id=4840
+# Drop the -> on 2.9
+SRC_URI="http://llvm.org/releases/${PV}/llvm-${PV}.tgz -> llvm-${PV}-r1.tgz
+	http://llvm.org/releases/${PV}/${P}.tgz"
+
+LICENSE="UoI-NCSA"
+SLOT="0"
+KEYWORDS="amd64 arm x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="alltargets debug +static-analyzer system-cxx-headers test"
+
+# Note: for LTO support, clang will depend on binutils with gold plugins, and LLVM built after that - http://llvm.org/docs/GoldPlugin.html
+DEPEND="static-analyzer? ( dev-lang/perl )"
+RDEPEND="~sys-devel/llvm-${PV}[alltargets=]"
+
+S="${WORKDIR}/llvm-${PV}"
+
+src_prepare() {
+	mv "${WORKDIR}"/clang-${PV} "${S}"/tools/clang || die "clang source directory not found"
+
+	# Same as llvm doc patches
+	epatch "${FILESDIR}"/${PN}-2.7-fixdoc.patch
+
+	# Upstream backport, r117774 and r117775
+	epatch "${FILESDIR}"/${P}-alignof.patch
+	# Upstream backport, r119348
+	epatch "${FILESDIR}"/${P}-gcc-4.4.4.patch
+
+	# Fix toolchain lookup for Darwin/Prefix.
+	epatch "${FILESDIR}"/${PN}-2.8-darwin-prefix.patch
+	sed -e "s|@GENTOO_PORTAGE_CHOST_ARCH@|${CHOST%%-darwin*}-darwin|g" \
+		-e "s|@GENTOO_PORTAGE_CHOST@|${CHOST}|g" \
+		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}|g" \
+		-i tools/clang/lib/Driver/ToolChains.cpp \
+		|| die "fixing toolchain lookup"
+
+	# multilib-strict
+	sed -e "/PROJ_headers/s#lib/clang#$(get_libdir)/clang#" \
+		-i tools/clang/lib/Headers/Makefile \
+		|| die "clang Makefile failed"
+	# fix the static analyzer for in-tree install
+	sed -e 's/import ScanView/from clang \0/'  \
+		-i tools/clang/tools/scan-view/scan-view \
+		|| die "scan-view sed failed"
+	sed -e "/scanview.css\|sorttable.js/s#\$RealBin#${EPREFIX}/usr/share/${PN}#" \
+		-i tools/clang/tools/scan-build/scan-build \
+		|| die "scan-build sed failed"
+	# Specify python version
+	python_convert_shebangs 2 tools/clang/tools/scan-view/scan-view
+
+	# From llvm src_prepare
+	einfo "Fixing install dirs"
+	sed -e 's,^PROJ_docsdir.*,PROJ_docsdir := $(PROJ_prefix)/share/doc/'${PF}, \
+		-e 's,^PROJ_etcdir.*,PROJ_etcdir := '"${EPREFIX}"'/etc/llvm,' \
+		-e 's,^PROJ_libdir.*,PROJ_libdir := $(PROJ_prefix)/'$(get_libdir)/llvm, \
+		-i Makefile.config.in || die "Makefile.config sed failed"
+
+	einfo "Fixing rpath"
+	sed -e 's,\$(RPATH) -Wl\,\$(\(ToolDir\|LibDir\)),$(RPATH) -Wl\,'"${EPREFIX}"/usr/$(get_libdir)/llvm, \
+		-i Makefile.rules || die "rpath sed failed"
+}
+
+src_configure() {
+	local CONF_FLAGS="--enable-shared"
+
+	if use debug; then
+		CONF_FLAGS="${CONF_FLAGS} --disable-optimized"
+		einfo "Note: Compiling LLVM in debug mode will create huge and slow binaries"
+		# ...and you probably shouldn't use tmpfs, unless it can hold 900MB
+	else
+		CONF_FLAGS="${CONF_FLAGS} \
+			--enable-optimized \
+			--disable-assertions \
+			--disable-expensive-checks"
+	fi
+
+	# Setup the search path to include the Prefix includes
+	if use prefix ; then
+		CONF_FLAGS="${CONF_FLAGS} \
+			--with-c-include-dirs=${EPREFIX}/usr/include:/usr/include"
+	fi
+
+	if use alltargets; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=all"
+	else
+		CONF_FLAGS="${CONF_FLAGS} --enable-targets=host-only"
+	fi
+
+	if use amd64; then
+		CONF_FLAGS="${CONF_FLAGS} --enable-pic"
+	fi
+
+	# Skip llvm-gcc parts even if installed
+	CONF_FLAGS="${CONF_FLAGS} --with-llvmgccdir=/dev/null"
+
+	if use system-cxx-headers; then
+		# Try to get current gcc headers path
+		local CXX_PATH=$(gcc-config -X| cut -d: -f1 | sed 's,/include/g++-v4$,,')
+		CONF_FLAGS="${CONF_FLAGS} --with-c-include-dirs=/usr/include:${CXX_PATH}/include"
+		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-root=${CXX_PATH}/include/g++-v4"
+		CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-arch=$CHOST"
+		if has_multilib_profile; then
+			CONF_FLAGS="${CONF_FLAGS} --with-cxx-include-32bit-dir=32"
+		fi
+	fi
+
+	econf ${CONF_FLAGS} || die "econf failed"
+}
+
+src_compile() {
+	emake VERBOSE=1 KEEP_SYMBOLS=1 REQUIRES_RTTI=1 clang-only || die "emake failed"
+}
+
+src_test() {
+	cd "${S}"/test || die "cd failed"
+	emake site.exp || die "updating llvm site.exp failed"
+
+	cd "${S}"/tools/clang || die "cd clang failed"
+
+	echo ">>> Test phase [test]: ${CATEGORY}/${PF}"
+	if ! emake -j1 VERBOSE=1 test; then
+		hasq test $FEATURES && die "Make test failed. See above for details."
+		hasq test $FEATURES || eerror "Make test failed. See above for details."
+	fi
+}
+
+src_install() {
+	cd "${S}"/tools/clang || die "cd clang failed"
+	emake KEEP_SYMBOLS=1 DESTDIR="${D}" install || die "install failed"
+
+	if use static-analyzer ; then
+		dobin tools/scan-build/ccc-analyzer
+		dosym ccc-analyzer /usr/bin/c++-analyzer
+		dobin tools/scan-build/scan-build
+
+		insinto /usr/share/${PN}
+		doins tools/scan-build/scanview.css
+		doins tools/scan-build/sorttable.js
+
+		cd tools/scan-view || die "cd scan-view failed"
+		dobin scan-view
+		install-scan-view() {
+			insinto "$(python_get_sitedir)"/clang
+			doins Reporter.py Resources ScanView.py startfile.py
+			touch "${ED}"/"$(python_get_sitedir)"/clang/__init__.py
+		}
+		python_execute_function install-scan-view
+	fi
+
+	# Fix install_names on Darwin.  The build system is too complicated
+	# to just fix this, so we correct it post-install
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		for lib in libclang.dylib ; do
+			ebegin "fixing install_name of $lib"
+			install_name_tool -id "${EPREFIX}"/usr/lib/llvm/${lib} \
+				"${ED}"/usr/lib/llvm/${lib}
+			eend $?
+		done
+		for f in usr/bin/{c-index-test,clang} usr/lib/llvm/libclang.dylib ; do
+			ebegin "fixing references in ${f##*/}"
+			install_name_tool \
+				-change "@rpath/libclang.dylib" \
+					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
+				-change "${S}"/Release/lib/libLLVM-${PV}.dylib \
+					"${EPREFIX}"/usr/lib/llvm/libLLVM-${PV}.dylib \
+				-change "${S}"/Release/lib/libclang.dylib \
+					"${EPREFIX}"/usr/lib/llvm/libclang.dylib \
+				"${ED}"/$f
+			eend $?
+		done
+	fi
+}
+
+pkg_postinst() {
+	python_mod_optimize clang
+	if use system-cxx-headers; then
+		elog "C++ headers search path is hardcoded to the active gcc profile one"
+		elog "If you change the active gcc profile, or update gcc to a new version,"
+		elog "you will have to remerge this package to update the search path"
+	else
+		elog "If clang++ fails to find C++ headers on your system,"
+		elog "you can remerge clang with USE=system-cxx-headers to use C++ headers"
+		elog "from the active gcc profile"
+	fi
+}
+
+pkg_postrm() {
+	python_mod_cleanup clang
+}
--- a/sdk_container/src/third_party/portage-stable/sys-devel/clang/files/clang-2.7-fixdoc.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/clang/files/clang-2.7-fixdoc.patch
@ -0,0 +1,53 @@
+diff -Naur llvm-2.7.orig//tools/clang/docs/Makefile llvm-2.7/tools/clang/docs/Makefile
+--- llvm-2.7.orig//tools/clang/docs/Makefile	2010-04-26 18:38:45.000000000 +0200
+++ llvm-2.7/tools/clang/docs/Makefile	2010-04-26 18:41:08.000000000 +0200
+@@ -46,13 +46,12 @@
+ # 'make generated BUILD_FOR_WEBSITE=1'
+ generated:: doxygen
+ 
+-install-html: $(PROJ_OBJ_DIR)/html.tar.gz
+install-html:
+ 	$(Echo) Installing HTML documentation
+ 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html
+ 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/img
+ 	$(Verb) $(DataInstall) $(HTML) $(DESTDIR)$(PROJ_docsdir)/html
+ #	$(Verb) $(DataInstall) $(IMAGES) $(DESTDIR)$(PROJ_docsdir)/html/img
+-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/html.tar.gz $(DESTDIR)$(PROJ_docsdir)
+ 
+ $(PROJ_OBJ_DIR)/html.tar.gz: $(HTML)
+ 	$(Echo) Packaging HTML documentation
+@@ -64,12 +63,11 @@
+ install-doxygen: doxygen
+ 	$(Echo) Installing doxygen documentation
+ 	$(Verb) $(MKDIR) $(DESTDIR)$(PROJ_docsdir)/html/doxygen
+-	$(Verb) $(DataInstall) $(PROJ_OBJ_DIR)/doxygen.tar.gz $(DESTDIR)$(PROJ_docsdir)
+ 	$(Verb) cd $(PROJ_OBJ_DIR)/doxygen && \
+ 	  $(FIND) . -type f -exec \
+ 	    $(DataInstall) {} $(DESTDIR)$(PROJ_docsdir)/html/doxygen \;
+ 
+-doxygen: regendoc $(PROJ_OBJ_DIR)/doxygen.tar.gz
+doxygen: regendoc
+ 
+ regendoc:
+ 	$(Echo) Building doxygen documentation
+diff -Naur llvm-2.7.orig//tools/clang/docs/tools/Makefile llvm-2.7/tools/clang/docs/tools/Makefile
+--- llvm-2.7.orig//tools/clang/docs/tools/Makefile	2010-04-26 18:38:45.000000000 +0200
+++ llvm-2.7/tools/clang/docs/tools/Makefile	2010-04-26 18:41:29.000000000 +0200
+@@ -24,7 +24,7 @@
+ CLANG_VERSION := trunk
+ 
+ # If we are in BUILD_FOR_WEBSITE mode, default to the all target.
+-all:: html man ps
+all:: html man
+ 
+ clean:
+ 	rm -f pod2htm*.*~~ $(HTML) $(MAN) $(PS)
+@@ -58,7 +58,7 @@
+ ifdef ONLY_MAN_DOCS
+ INSTALL_TARGETS := install-man
+ else
+-INSTALL_TARGETS := install-html install-man install-ps
+INSTALL_TARGETS := install-html install-man
+ endif
+ 
+ .SUFFIXES:
--- a/sdk_container/src/third_party/portage-stable/sys-devel/clang/files/clang-2.8-alignof.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/clang/files/clang-2.8-alignof.patch
@ -0,0 +1,258 @@
+Index: include/llvm/ADT/StringMap.h
+===================================================================
+--- include/llvm/ADT/StringMap.h	(révision 117773)
+++ include/llvm/ADT/StringMap.h	(révision 117774)
+@@ -167,7 +167,7 @@
+ 
+     unsigned AllocSize = static_cast<unsigned>(sizeof(StringMapEntry))+
+       KeyLength+1;
+-    unsigned Alignment = alignof<StringMapEntry>();
+    unsigned Alignment = alignOf<StringMapEntry>();
+ 
+     StringMapEntry *NewItem =
+       static_cast<StringMapEntry*>(Allocator.Allocate(AllocSize,Alignment));
+Index: include/llvm/Support/AlignOf.h
+===================================================================
+--- include/llvm/Support/AlignOf.h	(révision 117773)
+++ include/llvm/Support/AlignOf.h	(révision 117774)
+@@ -49,12 +49,12 @@
+ 
+ };
+ 
+-/// alignof - A templated function that returns the mininum alignment of
+/// alignOf - A templated function that returns the mininum alignment of
+ ///  of a type.  This provides no extra functionality beyond the AlignOf
+ ///  class besides some cosmetic cleanliness.  Example usage:
+-///  alignof<int>() returns the alignment of an int.
+///  alignOf<int>() returns the alignment of an int.
+ template <typename T>
+-static inline unsigned alignof() { return AlignOf<T>::Alignment; }
+static inline unsigned alignOf() { return AlignOf<T>::Alignment; }
+ 
+ } // end namespace llvm
+ #endif
+Index: include/llvm/Support/Allocator.h
+===================================================================
+--- include/llvm/Support/Allocator.h	(révision 117773)
+++ include/llvm/Support/Allocator.h	(révision 117774)
+@@ -201,7 +201,7 @@
+       char *End = Slab == Allocator.CurSlab ? Allocator.CurPtr :
+                                               (char *)Slab + Slab->Size;
+       for (char *Ptr = (char*)(Slab+1); Ptr < End; Ptr += sizeof(T)) {
+-        Ptr = Allocator.AlignPtr(Ptr, alignof<T>());
+        Ptr = Allocator.AlignPtr(Ptr, alignOf<T>());
+         if (Ptr + sizeof(T) <= End)
+           reinterpret_cast<T*>(Ptr)->~T();
+       }
+Index: include/llvm/CodeGen/SlotIndexes.h
+===================================================================
+--- include/llvm/CodeGen/SlotIndexes.h	(révision 117773)
+++ include/llvm/CodeGen/SlotIndexes.h	(révision 117774)
+@@ -393,7 +393,7 @@
+       IndexListEntry *entry =
+         static_cast<IndexListEntry*>(
+           ileAllocator.Allocate(sizeof(IndexListEntry),
+-          alignof<IndexListEntry>()));
+          alignOf<IndexListEntry>()));
+ 
+       new (entry) IndexListEntry(mi, index);
+ 
+Index: tools/clang/lib/Basic/IdentifierTable.cpp
+===================================================================
+--- tools/clang/lib/Basic/IdentifierTable.cpp	(révision 117774)
+++ tools/clang/lib/Basic/IdentifierTable.cpp	(révision 117775)
+@@ -390,7 +390,7 @@
+   unsigned Size = sizeof(MultiKeywordSelector) + nKeys*sizeof(IdentifierInfo *);
+   MultiKeywordSelector *SI =
+     (MultiKeywordSelector*)SelTabImpl.Allocator.Allocate(Size,
+-                                         llvm::alignof<MultiKeywordSelector>());
+                                         llvm::alignOf<MultiKeywordSelector>());
+   new (SI) MultiKeywordSelector(nKeys, IIV);
+   SelTabImpl.Table.InsertNode(SI, InsertPos);
+   return Selector(SI);
+Index: tools/clang/lib/AST/ExprCXX.cpp
+===================================================================
+--- tools/clang/lib/AST/ExprCXX.cpp	(révision 117774)
+++ tools/clang/lib/AST/ExprCXX.cpp	(révision 117775)
+@@ -233,7 +233,7 @@
+   if (NumTemplateArgs != 0)
+     size += ExplicitTemplateArgumentList::sizeFor(NumTemplateArgs);
+ 
+-  void *Mem = C.Allocate(size, llvm::alignof<UnresolvedLookupExpr>());
+  void *Mem = C.Allocate(size, llvm::alignOf<UnresolvedLookupExpr>());
+   UnresolvedLookupExpr *E = new (Mem) UnresolvedLookupExpr(EmptyShell());
+   E->HasExplicitTemplateArgs = NumTemplateArgs != 0;
+   return E;
+@@ -261,7 +261,7 @@
+   if (NumResults) {
+     Results = static_cast<DeclAccessPair *>(
+                                 C.Allocate(sizeof(DeclAccessPair) * NumResults, 
+-                                           llvm::alignof<DeclAccessPair>()));
+                                           llvm::alignOf<DeclAccessPair>()));
+     memcpy(Results, &*Begin.getIterator(), 
+            NumResults * sizeof(DeclAccessPair));
+   }
+@@ -737,7 +737,7 @@
+   if (TemplateArgs)
+     size += ExplicitTemplateArgumentList::sizeFor(*TemplateArgs);
+ 
+-  void *Mem = C.Allocate(size, llvm::alignof<CXXDependentScopeMemberExpr>());
+  void *Mem = C.Allocate(size, llvm::alignOf<CXXDependentScopeMemberExpr>());
+   return new (Mem) CXXDependentScopeMemberExpr(C, Base, BaseType,
+                                                IsArrow, OperatorLoc,
+                                                Qualifier, QualifierRange,
+@@ -756,7 +756,7 @@
+ 
+   std::size_t size = sizeof(CXXDependentScopeMemberExpr) +
+                      ExplicitTemplateArgumentList::sizeFor(NumTemplateArgs);
+-  void *Mem = C.Allocate(size, llvm::alignof<CXXDependentScopeMemberExpr>());
+  void *Mem = C.Allocate(size, llvm::alignOf<CXXDependentScopeMemberExpr>());
+   CXXDependentScopeMemberExpr *E
+     =  new (Mem) CXXDependentScopeMemberExpr(C, 0, QualType(),
+                                              0, SourceLocation(), 0,
+@@ -812,7 +812,7 @@
+   if (TemplateArgs)
+     size += ExplicitTemplateArgumentList::sizeFor(*TemplateArgs);
+ 
+-  void *Mem = C.Allocate(size, llvm::alignof<UnresolvedMemberExpr>());
+  void *Mem = C.Allocate(size, llvm::alignOf<UnresolvedMemberExpr>());
+   return new (Mem) UnresolvedMemberExpr(C, 
+                              Dependent ? C.DependentTy : C.OverloadTy,
+                              Dependent, HasUnresolvedUsing, Base, BaseType,
+@@ -826,7 +826,7 @@
+   if (NumTemplateArgs != 0)
+     size += ExplicitTemplateArgumentList::sizeFor(NumTemplateArgs);
+ 
+-  void *Mem = C.Allocate(size, llvm::alignof<UnresolvedMemberExpr>());
+  void *Mem = C.Allocate(size, llvm::alignOf<UnresolvedMemberExpr>());
+   UnresolvedMemberExpr *E = new (Mem) UnresolvedMemberExpr(EmptyShell());
+   E->HasExplicitTemplateArgs = NumTemplateArgs != 0;
+   return E;
+Index: tools/clang/lib/AST/DeclObjC.cpp
+===================================================================
+--- tools/clang/lib/AST/DeclObjC.cpp	(révision 117774)
+++ tools/clang/lib/AST/DeclObjC.cpp	(révision 117775)
+@@ -711,7 +711,7 @@
+ void ObjCClassDecl::setClassList(ASTContext &C, ObjCInterfaceDecl*const*List,
+                                  const SourceLocation *Locs, unsigned Num) {
+   ForwardDecls = (ObjCClassRef*) C.Allocate(sizeof(ObjCClassRef)*Num,
+-                                            llvm::alignof<ObjCClassRef>());
+                                            llvm::alignOf<ObjCClassRef>());
+   for (unsigned i = 0; i < Num; ++i)
+     new (&ForwardDecls[i]) ObjCClassRef(List[i], Locs[i]);
+   
+Index: tools/clang/lib/AST/Stmt.cpp
+===================================================================
+--- tools/clang/lib/AST/Stmt.cpp	(révision 117774)
+++ tools/clang/lib/AST/Stmt.cpp	(révision 117775)
+@@ -416,7 +416,7 @@
+                                      Stmt *atFinallyStmt) {
+   unsigned Size = sizeof(ObjCAtTryStmt) + 
+     (1 + NumCatchStmts + (atFinallyStmt != 0)) * sizeof(Stmt *);
+-  void *Mem = Context.Allocate(Size, llvm::alignof<ObjCAtTryStmt>());
+  void *Mem = Context.Allocate(Size, llvm::alignOf<ObjCAtTryStmt>());
+   return new (Mem) ObjCAtTryStmt(atTryLoc, atTryStmt, CatchStmts, NumCatchStmts,
+                                  atFinallyStmt);
+ }
+@@ -426,7 +426,7 @@
+                                                  bool HasFinally) {
+   unsigned Size = sizeof(ObjCAtTryStmt) + 
+     (1 + NumCatchStmts + HasFinally) * sizeof(Stmt *);
+-  void *Mem = Context.Allocate(Size, llvm::alignof<ObjCAtTryStmt>());
+  void *Mem = Context.Allocate(Size, llvm::alignOf<ObjCAtTryStmt>());
+   return new (Mem) ObjCAtTryStmt(EmptyShell(), NumCatchStmts, HasFinally);  
+ }
+ 
+@@ -448,7 +448,7 @@
+   std::size_t Size = sizeof(CXXTryStmt);
+   Size += ((numHandlers + 1) * sizeof(Stmt));
+ 
+-  void *Mem = C.Allocate(Size, llvm::alignof<CXXTryStmt>());
+  void *Mem = C.Allocate(Size, llvm::alignOf<CXXTryStmt>());
+   return new (Mem) CXXTryStmt(tryLoc, tryBlock, handlers, numHandlers);
+ }
+ 
+@@ -457,7 +457,7 @@
+   std::size_t Size = sizeof(CXXTryStmt);
+   Size += ((numHandlers + 1) * sizeof(Stmt));
+ 
+-  void *Mem = C.Allocate(Size, llvm::alignof<CXXTryStmt>());
+  void *Mem = C.Allocate(Size, llvm::alignOf<CXXTryStmt>());
+   return new (Mem) CXXTryStmt(Empty, numHandlers);
+ }
+ 
+Index: tools/clang/lib/AST/Expr.cpp
+===================================================================
+--- tools/clang/lib/AST/Expr.cpp	(révision 117774)
+++ tools/clang/lib/AST/Expr.cpp	(révision 117775)
+@@ -257,7 +257,7 @@
+   if (TemplateArgs)
+     Size += ExplicitTemplateArgumentList::sizeFor(*TemplateArgs);
+   
+-  void *Mem = Context.Allocate(Size, llvm::alignof<DeclRefExpr>());
+  void *Mem = Context.Allocate(Size, llvm::alignOf<DeclRefExpr>());
+   return new (Mem) DeclRefExpr(Qualifier, QualifierRange, D, NameInfo,
+                                TemplateArgs, T);
+ }
+@@ -271,7 +271,7 @@
+   if (NumTemplateArgs)
+     Size += ExplicitTemplateArgumentList::sizeFor(NumTemplateArgs);
+   
+-  void *Mem = Context.Allocate(Size, llvm::alignof<DeclRefExpr>());
+  void *Mem = Context.Allocate(Size, llvm::alignOf<DeclRefExpr>());
+   return new (Mem) DeclRefExpr(EmptyShell());
+ }
+ 
+@@ -432,7 +432,7 @@
+   // any concatenated string tokens.
+   void *Mem = C.Allocate(sizeof(StringLiteral)+
+                          sizeof(SourceLocation)*(NumStrs-1),
+-                         llvm::alignof<StringLiteral>());
+                         llvm::alignOf<StringLiteral>());
+   StringLiteral *SL = new (Mem) StringLiteral(Ty);
+ 
+   // OPTIMIZE: could allocate this appended to the StringLiteral.
+@@ -452,7 +452,7 @@
+ StringLiteral *StringLiteral::CreateEmpty(ASTContext &C, unsigned NumStrs) {
+   void *Mem = C.Allocate(sizeof(StringLiteral)+
+                          sizeof(SourceLocation)*(NumStrs-1),
+-                         llvm::alignof<StringLiteral>());
+                         llvm::alignOf<StringLiteral>());
+   StringLiteral *SL = new (Mem) StringLiteral(QualType());
+   SL->StrData = 0;
+   SL->ByteLength = 0;
+@@ -714,7 +714,7 @@
+   if (targs)
+     Size += ExplicitTemplateArgumentList::sizeFor(*targs);
+ 
+-  void *Mem = C.Allocate(Size, llvm::alignof<MemberExpr>());
+  void *Mem = C.Allocate(Size, llvm::alignOf<MemberExpr>());
+   MemberExpr *E = new (Mem) MemberExpr(base, isarrow, memberdecl, nameinfo, ty);
+ 
+   if (hasQualOrFound) {
+Index: tools/clang/lib/AST/DeclCXX.cpp
+===================================================================
+--- tools/clang/lib/AST/DeclCXX.cpp	(révision 117774)
+++ tools/clang/lib/AST/DeclCXX.cpp	(révision 117775)
+@@ -1057,7 +1057,7 @@
+                                    unsigned NumIndices) {
+   void *Mem = Context.Allocate(sizeof(CXXBaseOrMemberInitializer) +
+                                sizeof(VarDecl *) * NumIndices,
+-                               llvm::alignof<CXXBaseOrMemberInitializer>());
+                               llvm::alignOf<CXXBaseOrMemberInitializer>());
+   return new (Mem) CXXBaseOrMemberInitializer(Context, Member, MemberLoc,
+                                               L, Init, R, Indices, NumIndices);
+ }
+Index: tools/clang/lib/Lex/TokenLexer.cpp
+===================================================================
+--- tools/clang/lib/Lex/TokenLexer.cpp	(révision 117774)
+++ tools/clang/lib/Lex/TokenLexer.cpp	(révision 117775)
+@@ -287,7 +287,7 @@
+     llvm::BumpPtrAllocator &Alloc = PP.getPreprocessorAllocator();
+     Token *Res =
+       static_cast<Token *>(Alloc.Allocate(sizeof(Token)*ResultToks.size(),
+-                                          llvm::alignof<Token>()));
+                                          llvm::alignOf<Token>()));
+     if (NumTokens)
+       memcpy(Res, &ResultToks[0], NumTokens*sizeof(Token));
+     Tokens = Res;
--- a/sdk_container/src/third_party/portage-stable/sys-devel/clang/files/clang-2.8-darwin-prefix.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/clang/files/clang-2.8-darwin-prefix.patch
@ -0,0 +1,127 @@
+This code looks as if it is written by Apple, lots of assumptions that
+only hold for them and their scenario.
+
+--- tools/clang/lib/Driver/ToolChains.cpp
+++ tools/clang/lib/Driver/ToolChains.cpp
+@@ -131,7 +131,7 @@
+   GCCVersion[2] = 1;
+ 
+   // Set up the tool chain paths to match gcc.
+-  ToolChainDir = "i686-apple-darwin";
+  ToolChainDir = "@GENTOO_PORTAGE_CHOST@";
+   ToolChainDir += llvm::utostr(DarwinVersion[0]);
+   ToolChainDir += "/";
+   ToolChainDir += llvm::utostr(GCCVersion[0]);
+@@ -141,9 +141,9 @@
+   ToolChainDir += llvm::utostr(GCCVersion[2]);
+ 
+   // Try the next major version if that tool chain dir is invalid.
+-  std::string Tmp = "/usr/lib/gcc/" + ToolChainDir;
+  std::string Tmp = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir;
+   if (!llvm::sys::Path(Tmp).exists()) {
+-    std::string Next = "i686-apple-darwin";
+    std::string Next = "@GENTOO_PORTAGE_CHOST_ARCH@";
+     Next += llvm::utostr(DarwinVersion[0] + 1);
+     Next += "/";
+     Next += llvm::utostr(GCCVersion[0]);
+@@ -155,7 +155,7 @@
+     // Use that if it exists, otherwise hope the user isn't linking.
+     //
+     // FIXME: Drop dependency on gcc's tool chain.
+-    Tmp = "/usr/lib/gcc/" + Next;
+    Tmp = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + Next;
+     if (llvm::sys::Path(Tmp).exists())
+       ToolChainDir = Next;
+   }
+@@ -168,7 +168,7 @@
+     Path += "/x86_64";
+     getFilePaths().push_back(Path);
+ 
+-    Path = "/usr/lib/gcc/";
+    Path = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/";
+     Path += ToolChainDir;
+     Path += "/x86_64";
+     getFilePaths().push_back(Path);
+@@ -179,7 +179,7 @@
+   Path += ToolChainDir;
+   getFilePaths().push_back(Path);
+ 
+-  Path = "/usr/lib/gcc/";
+  Path = "@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/";
+   Path += ToolChainDir;
+   getFilePaths().push_back(Path);
+ 
+@@ -188,7 +188,7 @@
+   Path += ToolChainDir;
+   getProgramPaths().push_back(Path);
+ 
+-  Path = "/usr/libexec/gcc/";
+  Path = "@GENTOO_PORTAGE_EPREFIX@/usr/libexec/gcc/";
+   Path += ToolChainDir;
+   getProgramPaths().push_back(Path);
+ 
+@@ -291,14 +291,14 @@
+ 
+   // FIXME: Derive these correctly.
+   if (getArchName() == "x86_64") {
+-    CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir +
+    CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir +
+                                          "/x86_64"));
+     // Intentionally duplicated for (temporary) gcc bug compatibility.
+-    CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir +
+    CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir +
+                                          "/x86_64"));
+   }
+ 
+-  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/" + ToolChainDir));
+  CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/" + ToolChainDir));
+ 
+   Tmp = getDriver().Dir + "/../lib/gcc/" + ToolChainDir;
+   if (llvm::sys::Path(Tmp).exists())
+@@ -306,18 +306,18 @@
+   Tmp = getDriver().Dir + "/../lib/gcc";
+   if (llvm::sys::Path(Tmp).exists())
+     CmdArgs.push_back(Args.MakeArgString("-L" + Tmp));
+-  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir));
+  CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir));
+   // Intentionally duplicated for (temporary) gcc bug compatibility.
+-  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir));
+  CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir));
+   Tmp = getDriver().Dir + "/../lib/" + ToolChainDir;
+   if (llvm::sys::Path(Tmp).exists())
+     CmdArgs.push_back(Args.MakeArgString("-L" + Tmp));
+   Tmp = getDriver().Dir + "/../lib";
+   if (llvm::sys::Path(Tmp).exists())
+     CmdArgs.push_back(Args.MakeArgString("-L" + Tmp));
+-  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir +
+  CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir +
+                                        "/../../../" + ToolChainDir));
+-  CmdArgs.push_back(Args.MakeArgString("-L/usr/lib/gcc/" + ToolChainDir +
+  CmdArgs.push_back(Args.MakeArgString("-L@GENTOO_PORTAGE_EPREFIX@/usr/lib/gcc/" + ToolChainDir +
+                                        "/../../.."));
+ }
+ 
+@@ -386,22 +386,7 @@
+   P.eraseComponent(); // .../usr/bin -> ../usr
+   P.appendComponent("lib");
+   P.appendComponent("gcc");
+-  switch (getTriple().getArch()) {
+-  default:
+-    assert(0 && "Invalid Darwin arch!");
+-  case llvm::Triple::x86:
+-  case llvm::Triple::x86_64:
+-    P.appendComponent("i686-apple-darwin10");
+-    break;
+-  case llvm::Triple::arm:
+-  case llvm::Triple::thumb:
+-    P.appendComponent("arm-apple-darwin10");
+-    break;
+-  case llvm::Triple::ppc:
+-  case llvm::Triple::ppc64:
+-    P.appendComponent("powerpc-apple-darwin10");
+-    break;
+-  }
+  P.appendComponent("@GENTOO_PORTAGE_CHOST@");
+   P.appendComponent("4.2.1");
+ 
+   // Determine the arch specific GCC subdirectory.
--- a/sdk_container/src/third_party/portage-stable/sys-devel/clang/files/clang-2.8-gcc-4.4.4.patch
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/clang/files/clang-2.8-gcc-4.4.4.patch
@ -0,0 +1,16 @@
+Index: tools/clang/lib/Frontend/InitHeaderSearch.cpp
+===================================================================
+--- tools/clang/lib/Frontend/InitHeaderSearch.cpp	(révision 119347)
+++ tools/clang/lib/Frontend/InitHeaderSearch.cpp	(révision 119348)
+@@ -745,6 +745,11 @@
+         "/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.3/include/g++-v4",
+         "x86_64-pc-linux-gnu", "32", "", triple);
+ 
+    // Gentoo amd64 gcc 4.4.4
+    AddGnuCPlusPlusIncludePaths(
+        "/usr/lib/gcc/x86_64-pc-linux-gnu/4.4.4/include/g++-v4",
+        "x86_64-pc-linux-gnu", "32", "", triple);
+
+     // Gentoo amd64 llvm-gcc trunk
+     AddGnuCPlusPlusIncludePaths(
+         "/usr/lib/llvm-gcc-4.2-9999/include/c++/4.2.1",
--- a/sdk_container/src/third_party/portage-stable/x11-apps/iceauth/iceauth-1.0.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/iceauth/iceauth-1.0.4.ebuild
@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/iceauth/iceauth-1.0.4.ebuild,v 1.9 2011/02/14 14:52:25 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="ICE authority file utility"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libICE"
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
--- a/sdk_container/src/third_party/portage-stable/x11-apps/mkfontdir/mkfontdir-1.0.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/mkfontdir/mkfontdir-1.0.6.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/mkfontdir/mkfontdir-1.0.6.ebuild,v 1.8 2011/02/14 14:55:47 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="create an index of X font files in a directory"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-apps/mkfontscale"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-apps/rgb/rgb-1.0.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/rgb/rgb-1.0.4.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/rgb/rgb-1.0.4.ebuild,v 1.9 2011/02/14 14:41:38 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="uncompile an rgb color-name database"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xauth/xauth-1.0.5.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xauth/xauth-1.0.5.ebuild,v 1.9 2011/02/14 23:41:01 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X authority file utility"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXmu"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable ipv6)"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xcursorgen/xcursorgen-1.0.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xcursorgen/xcursorgen-1.0.4.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xcursorgen/xcursorgen-1.0.4.ebuild,v 1.9 2011/02/14 23:02:32 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="create an X cursor file from a collection of PNG images"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="media-libs/libpng
+	x11-libs/libX11
+	x11-libs/libXcursor"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild
@ -0,0 +1,44 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdpyinfo/xdpyinfo-1.2.0.ebuild,v 1.7 2011/04/16 17:54:58 armin76 Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="Display information utility for X"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris ~x86-winnt"
+IUSE="dga dmx xinerama"
+
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXext
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/libXxf86vm
+	dga? ( x11-libs/libXxf86dga )
+	dmx? ( x11-libs/libdmx )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${RDEPEND}
+	x11-proto/compositeproto
+	x11-proto/inputproto
+	x11-proto/kbproto
+	x11-proto/renderproto
+	x11-proto/xf86vidmodeproto
+	x11-proto/xextproto
+	x11-proto/xproto
+	dga? ( x11-proto/xf86dgaproto )
+	dmx? ( x11-proto/dmxproto )
+	xinerama? ( x11-proto/xineramaproto )
+"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="--without-xf86misc
+		$(use_with dga)
+		$(use_with dmx)
+		$(use_with xinerama)
+	"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild,v 1.8 2011/02/14 23:40:56 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="query configuration information of DRI drivers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	virtual/opengl"
+DEPEND="${RDEPEND}
+	x11-proto/glproto"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	append-cppflags "-I${EPREFIX}/usr/lib64/opengl/xorg-x11/include/"
+
+}
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xhost/xhost-1.0.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xhost/xhost-1.0.4.ebuild
@ -0,0 +1,21 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xhost/xhost-1.0.4.ebuild,v 1.9 2011/02/14 23:41:03 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="Controls host and/or user access to a running X server."
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXmu
+	x11-libs/libXau"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable ipv6)"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xlsatoms/xlsatoms-1.1.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xlsatoms/xlsatoms-1.1.0.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsatoms/xlsatoms-1.1.0.ebuild,v 1.11 2010/11/01 12:54:47 scarabeus Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="list interned atoms defined on server"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libxcb"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xlsclients/xlsclients-1.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xlsclients/xlsclients-1.1.1.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xlsclients/xlsclients-1.1.1.ebuild,v 1.10 2011/02/14 18:43:22 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+	x11-libs/libxcb
+	x11-libs/xcb-util
+"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xmodmap/xmodmap-1.0.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xmodmap/xmodmap-1.0.5.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xmodmap/xmodmap-1.0.5.ebuild,v 1.9 2011/02/14 18:53:51 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="utility for modifying keymaps and pointer button mappings in X"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xprop/xprop-1.2.0.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xprop/xprop-1.2.0.ebuild,v 1.9 2011/02/14 18:54:49 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="property displayer for X"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xrandr/xrandr-1.3.4.ebuild
@ -0,0 +1,22 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrandr/xrandr-1.3.4.ebuild,v 1.9 2011/02/14 23:41:03 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="primitive command line interface to RandR extension"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrandr-1.3
+	x11-libs/libXrender
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_install() {
+	xorg-2_src_install
+	rm -f "${ED}"/usr/bin/xkeystone
+}
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xrdb/xrdb-1.0.9.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xrdb/xrdb-1.0.9.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xrdb/xrdb-1.0.9.ebuild,v 1.7 2011/04/11 17:42:43 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X server resource database utility"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXmu
+	x11-libs/libX11"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-apps/xwininfo/xwininfo-1.1.1.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xwininfo/xwininfo-1.1.1.ebuild,v 1.10 2011/06/15 11:46:32 mduft Exp $
+
+EAPI=3
+
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="window information utility for X"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libxcb-1.6
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	>=x11-proto/xproto-7.0.17"
+
+pkg_setup() {
+	# interix has a _very_ old iconv in libc, however, including
+	# iconv.h redefines those symbols to libiconv_*, which then
+	# are unresolved, as the configure check is old and dumb.
+	[[ ${CHOST} == *-interix* ]] &&
+		append-libs -liconv
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libICE/libICE-1.0.7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libICE/libICE-1.0.7.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libICE/libICE-1.0.7.ebuild,v 1.10 2011/06/22 18:24:07 grobian Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org ICE library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc ipv6"
+
+RDEPEND="x11-libs/xtrans
+	x11-proto/xproto"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libSM/libSM-1.2.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libSM/libSM-1.2.0.ebuild
@ -0,0 +1,42 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.12 2011/06/22 18:29:20 grobian Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org SM library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc ipv6 +uuid"
+
+RDEPEND=">=x11-libs/libICE-1.0.5
+	x11-libs/xtrans
+	x11-proto/xproto
+	!elibc_FreeBSD? ( !elibc_IRIX? ( !elibc_SunOS? (
+		uuid? ( >=sys-apps/util-linux-2.16 )
+	) ) )"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		$(use_with uuid libuuid)
+		--without-fop"
+	# do not use uuid even if available in libc (like on FreeBSD)
+	use uuid || export ac_cv_func_uuid_create=no
+	# solaris hack
+	if use uuid &&
+		[[ ${CHOST} == *-solaris* ]] &&
+		[[ ! -d ${EROOT}/usr/include/uuid ]] &&
+		[[ -d ${ROOT}/usr/include/uuid ]]
+	then
+		# ${ROOT} is proper here
+		export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid"
+		export LIBUUID_LIBS="-luuid"
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild,v 1.8 2011/02/14 23:11:30 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org XScrnSaver library"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	>=x11-proto/scrnsaverproto-1.2"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXaw/libXaw-1.0.9.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXaw/libXaw-1.0.9.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXaw/libXaw-1.0.9.ebuild,v 1.8 2011/06/22 18:57:33 grobian Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xaw library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXt
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-proto/xproto
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild
@ -0,0 +1,26 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild,v 1.4 2011/06/28 21:26:29 ranger Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xcomposite library"
+
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXfixes
+	>=x11-proto/compositeproto-0.4
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+	)
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXcursor/libXcursor-1.1.11.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXcursor/libXcursor-1.1.11.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXcursor/libXcursor-1.1.11.ebuild,v 1.9 2011/02/14 18:48:44 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xcursor library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrender-0.8.2
+	x11-libs/libXfixes
+	x11-libs/libX11
+	x11-proto/fixesproto"
+DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="--with-icondir=/usr/share/cursors/xorg-x11
+	--with-cursorpath=~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXdamage/libXdamage-1.1.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXdamage/libXdamage-1.1.3.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdamage/libXdamage-1.1.3.ebuild,v 1.9 2010/10/21 01:15:57 ranger Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xdamage library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXfixes
+	>=x11-proto/damageproto-1.1
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXdmcp/libXdmcp-1.1.0.ebuild,v 1.9 2011/02/14 14:38:15 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xdmcp library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc"
+
+RDEPEND="x11-proto/xproto"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXext/files/libXext-1.1.2-xhidden.patch
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXext/files/libXext-1.1.2-xhidden.patch
@ -0,0 +1,14 @@
+https://bugs.freedesktop.org/attachment.cgi?id=38376
+http://bugs.gentoo.org/show_bug.cgi?id=335619
+
+--- libXext-1.1.2/src/Xge.c
+++ libXext-1.1.2/src/Xge.c
+@@ -294,7 +294,7 @@
+ /*
+  * Extensions need to register callbacks for their events.
+  */
+-Bool
+_X_HIDDEN Bool
+ xgeExtRegister(Display* dpy, int offset, XExtensionHooks* callbacks)
+ {
+     XGEExtNode* newExt;
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXext/libXext-1.2.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXext/libXext-1.2.0.ebuild
@ -0,0 +1,25 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXext/libXext-1.2.0.ebuild,v 1.9 2011/02/14 18:45:28 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xext library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc"
+
+RDEPEND=">=x11-libs/libX11-1.2
+	>=x11-proto/xextproto-7.1
+	>=x11-proto/xproto-7.0.13"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.1.2-xhidden.patch" )
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXfixes/libXfixes-5.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXfixes/libXfixes-5.0.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfixes/libXfixes-5.0.ebuild,v 1.7 2011/04/16 18:08:25 armin76 Exp $
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfixes library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	>=x11-proto/fixesproto-5
+	x11-proto/xproto
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXft/libXft-2.2.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXft/libXft-2.2.0.ebuild
@ -0,0 +1,20 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXft/libXft-2.2.0.ebuild,v 1.10 2011/02/14 23:22:40 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="X.Org Xft library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrender-0.8.2
+	x11-libs/libX11
+	x11-libs/libXext
+	media-libs/freetype
+	media-libs/fontconfig
+	x11-proto/xproto
+	virtual/ttf-fonts"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXi/libXi-1.4.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXi/libXi-1.4.2.ebuild
@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXi/libXi-1.4.2.ebuild,v 1.6 2011/06/28 20:07:44 ranger Exp $
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xi library"
+KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.3
+	>=x11-libs/libXext-1.1
+	>=x11-proto/inputproto-2.0
+	>=x11-proto/xproto-7.0.13
+	>=x11-proto/xextproto-7.0.3"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	CONFIGURE_OPTIONS="$(use_enable doc specs)
+		$(use_with doc xmlto)
+		$(use_with doc asciidoc)
+		--without-fop"
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+
+	ewarn "Some special keys and keyboard layouts may stop working."
+	ewarn "To fix them, recompile xorg-server."
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXmu/libXmu-1.1.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXmu/libXmu-1.1.0.ebuild
@ -0,0 +1,27 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXmu/libXmu-1.1.0.ebuild,v 1.10 2011/06/22 18:43:31 grobian Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc ipv6"
+
+RDEPEND="x11-libs/libXt
+	x11-libs/libXext
+	x11-libs/libX11
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable ipv6)
+		$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXpm/libXpm-3.5.9.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXpm/libXpm-3.5.9.ebuild
@ -0,0 +1,31 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXpm/libXpm-3.5.9.ebuild,v 1.12 2011/06/22 18:37:11 grobian Exp $
+
+EAPI=3
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="X.Org Xpm library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXt
+	x11-libs/libXext
+	x11-proto/xextproto
+	x11-proto/xproto"
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_configure() {
+	# the gettext configure check and code in sxpm are incorrect; they assume
+	# gettext being in libintl, whereas Solaris has gettext by default
+	# resulting in libintl not being added to LIBS
+	[[ ${CHOST} == *-solaris* ]] && append-libs -lintl
+	xorg-2_src_configure
+}
+
+src_compile() {
+	xorg-2_src_compile
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXrandr/libXrandr-1.3.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXrandr/libXrandr-1.3.1.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrandr/libXrandr-1.3.1.ebuild,v 1.9 2011/02/14 22:56:13 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xrandr library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-proto/randrproto
+	x11-proto/renderproto
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXrender/libXrender-0.9.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXrender/libXrender-0.9.6.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXrender/libXrender-0.9.6.ebuild,v 1.10 2010/10/21 01:18:16 ranger Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xrender library"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	>=x11-proto/renderproto-0.9.3
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXtst/libXtst-1.2.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXtst/libXtst-1.2.0.ebuild
@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXtst/libXtst-1.2.0.ebuild,v 1.9 2011/02/14 23:22:40 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xtst library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc"
+
+RDEPEND="x11-libs/libX11
+	>=x11-libs/libXext-1.0.99.4
+	  x11-libs/libXi
+	x11-proto/inputproto
+	>=x11-proto/recordproto-1.13.99.1
+	>=x11-proto/xextproto-7.0.99.3"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXv/libXv-1.0.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXv/libXv-1.0.6.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXv/libXv-1.0.6.ebuild,v 1.9 2011/02/14 23:08:48 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xv library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-proto/videoproto
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXvMC/libXvMC-1.0.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXvMC/libXvMC-1.0.6.ebuild
@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXvMC/libXvMC-1.0.6.ebuild,v 1.8 2011/02/14 23:22:40 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org XvMC library"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXv
+	x11-proto/videoproto
+	x11-proto/xextproto"
+DEPEND="${RDEPEND}"
+PDEPEND="app-admin/eselect-xvmc"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild
@ -0,0 +1,18 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXxf86vm/libXxf86vm-1.1.1.ebuild,v 1.9 2011/02/14 22:57:04 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xxf86vm library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	>=x11-proto/xf86vidmodeproto-2.3
+	x11-proto/xextproto
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.1.0.ebuild,v 1.10 2011/02/14 14:39:15 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org fontenc library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+	x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="--with-encodingsdir=${EPREFIX}/usr/share/fonts/encodings"
--- a/sdk_container/src/third_party/portage-stable/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild
@ -0,0 +1,29 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libpciaccess/libpciaccess-0.12.1.ebuild,v 1.10 2011/06/24 13:17:08 darkside Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal zlib"
+
+DEPEND="zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_with zlib)
+		--with-pciids-path=${EPREFIX}/usr/share/misc"
+}
+
+src_install() {
+	xorg-2_src_install
+	if ! use minimal; then
+		dodir /usr/bin || die
+		${BASH} "${AUTOTOOLS_BUILD_DIR:-${S}}/libtool" --mode=install "$(type -P install)" -c "${AUTOTOOLS_BUILD_DIR:-${S}}/scanpci/scanpci" "${ED}"/usr/bin || die
+	fi
+}
--- a/sdk_container/src/third_party/portage-stable/x11-libs/xtrans/xtrans-1.2.6.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-libs/xtrans/xtrans-1.2.6.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/xtrans/xtrans-1.2.6.ebuild,v 1.9 2011/03/16 16:10:42 scarabeus Exp $
+
+EAPI=3
+
+XORG_PACKAGE_NAME="lib${PN}"
+# this package just installs some .c and .h files, no libraries
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="X.Org xtrans library"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	CONFIGURE_OPTIONS="$(use_enable doc docs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-misc/makedepend/makedepend-1.0.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-misc/makedepend/makedepend-1.0.3.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/makedepend/makedepend-1.0.3.ebuild,v 1.8 2011/02/14 14:42:39 xarthisius Exp $
+
+EAPI=3
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="create dependencies in makefiles"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	x11-proto/xproto"
--- a/sdk_container/src/third_party/portage-stable/x11-misc/read-edid/read-edid-1.4.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-misc/read-edid/read-edid-1.4.2.ebuild
@ -0,0 +1,24 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/read-edid-1.4.2.ebuild,v 1.7 2009/03/13 22:26:31 josejx Exp $
+
+DESCRIPTION="Get EDID information from a PnP monitor"
+HOMEPAGE="http://www.polypux.org/projects/read-edid/"
+SRC_URI="http://www.polypux.org/projects/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ppc ~sparc x86"
+IUSE=""
+DEPEND=""
+RDEPEND=""
+
+src_compile() {
+	econf --mandir=/usr/share/man || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog NEWS README
+}
--- a/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-0.90.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-misc/shared-mime-info/shared-mime-info-0.90.ebuild
@ -0,0 +1,59 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/shared-mime-info/shared-mime-info-0.90.ebuild,v 1.7 2011/04/30 17:45:01 armin76 Exp $
+
+EAPI=3
+inherit fdo-mime
+
+DESCRIPTION="The Shared MIME-info Database specification"
+HOMEPAGE="http://freedesktop.org/wiki/Software/shared-mime-info"
+SRC_URI="http://people.freedesktop.org/~hadess/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.6:2
+	>=dev-libs/libxml2-2.4"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	dev-util/intltool
+	sys-devel/gettext"
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-update-mimedb
+}
+
+src_compile() {
+	# http://bugs.gentoo.org/show_bug.cgi?id=347870
+	# https://bugs.freedesktop.org/show_bug.cgi?id=32127
+	emake -j1 || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc ChangeLog HACKING NEWS README
+
+	# in prefix, install an env.d entry such that prefix patch is used/added
+	if use prefix; then
+		echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share\"" > "${T}"/50mimeinfo
+		doenvd "${T}"/50mimeinfo
+	fi
+}
+
+pkg_postinst() {
+	use prefix && export XDG_DATA_DIRS="${EPREFIX}"/usr/share
+	fdo-mime_mime_database_update
+#	elog
+#	elog "The database format has changed between 0.60 and 0.70."
+#	elog "You may need to update all your local databases and caches."
+#	elog "To do so, please run the following command(s):"
+#	elog "(for each user) $ update-mime-database ~/.local/share/mime/"
+#	if [[ -d ${EROOT}/usr/local/share/mime ]]; then
+#		elog "(as root)       # update-mime-database ${EPREFIX}/usr/local/share/mime/"
+#	fi
+#	elog
+}
--- a/sdk_container/src/third_party/portage-stable/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild
@ -0,0 +1,16 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xbitmaps/xbitmaps-1.1.1.ebuild,v 1.9 2011/03/19 02:07:23 mr_bones_ Exp $
+
+EAPI=3
+
+XORG_MODULE=data/
+XORG_STATIC=no
+inherit xorg-2
+
+DESCRIPTION="X.Org bitmaps data"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/bigreqsproto/bigreqsproto-1.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/bigreqsproto/bigreqsproto-1.1.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/bigreqsproto/bigreqsproto-1.1.1.ebuild,v 1.8 2011/02/14 14:26:53 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org BigReqs protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-proto/compositeproto/compositeproto-0.4.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/compositeproto/compositeproto-0.4.2.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/compositeproto/compositeproto-0.4.2.ebuild,v 1.8 2011/02/14 14:20:37 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Composite protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/damageproto/damageproto-1.2.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/damageproto/damageproto-1.2.1.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/damageproto/damageproto-1.2.1.ebuild,v 1.8 2011/02/14 14:27:44 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Damage protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/dri2proto/dri2proto-2.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/dri2proto/dri2proto-2.3.ebuild
@ -0,0 +1,12 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/dri2proto/dri2proto-2.3.ebuild,v 1.9 2010/09/10 17:41:44 scarabeus Exp $
+
+inherit x-modular
+
+DESCRIPTION="X.Org DRI2 protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/fixesproto/fixesproto-5.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/fixesproto/fixesproto-5.0.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/fixesproto/fixesproto-5.0.ebuild,v 1.7 2011/04/16 18:07:21 armin76 Exp $
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Fixes protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-proto/xextproto-7.0.99.1"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/fontsproto/fontsproto-2.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/fontsproto/fontsproto-2.1.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/fontsproto/fontsproto-2.1.1.ebuild,v 1.8 2011/02/14 13:55:58 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Fonts protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-proto/glproto/glproto-1.4.12.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/glproto/glproto-1.4.12.ebuild
@ -0,0 +1,49 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.12.ebuild,v 1.9 2011/02/14 14:34:03 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+OPENGL_DIR="xorg-x11"
+
+DESCRIPTION="X.Org GL protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+LICENSE="SGI-B-2.0"
+IUSE=""
+
+RDEPEND="app-admin/eselect-opengl"
+DEPEND=""
+
+src_install() {
+	xorg-2_src_install
+	dynamic_libgl_install
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	switch_opengl_implem
+}
+
+dynamic_libgl_install() {
+	# next section is to setup the dynamic libGL stuff
+	ebegin "Moving GL files for dynamic switching"
+		dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+		local x=""
+		# glext.h added for #54984
+		for x in "${ED}"/usr/include/GL/{glxtokens.h,glxmd.h,glxproto.h}; do
+			if [[ -f ${x} || -L ${x} ]]; then
+				mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include
+			fi
+		done
+	eend 0
+}
+
+switch_opengl_implem() {
+	# Switch to the xorg implementation.
+	# Use new opengl-update that will not reset user selected
+	# OpenGL interface ...
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+}
--- a/sdk_container/src/third_party/portage-stable/x11-proto/kbproto/kbproto-1.0.5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/kbproto/kbproto-1.0.5.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/kbproto/kbproto-1.0.5.ebuild,v 1.8 2011/02/14 14:01:32 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org KB protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/randrproto/randrproto-1.3.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/randrproto/randrproto-1.3.2.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/randrproto/randrproto-1.3.2.ebuild,v 1.8 2011/02/14 13:53:18 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Randr protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/recordproto/recordproto-1.14.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/recordproto/recordproto-1.14.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/recordproto/recordproto-1.14.1.ebuild,v 1.8 2011/02/14 14:21:28 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Record protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="doc"
+
+RDEPEND="!<x11-libs/libXtst-1.0.99.2"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-proto/renderproto/renderproto-0.11.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/renderproto/renderproto-0.11.1.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/renderproto/renderproto-0.11.1.ebuild,v 1.8 2011/02/14 14:00:11 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org Render protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/resourceproto/resourceproto-1.1.1.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/resourceproto/resourceproto-1.1.1.ebuild,v 1.7 2011/03/05 17:49:24 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Resource protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/scrnsaverproto/scrnsaverproto-1.2.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/scrnsaverproto/scrnsaverproto-1.2.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/scrnsaverproto/scrnsaverproto-1.2.1.ebuild,v 1.8 2011/02/14 14:22:51 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org ScrnSaver protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="!<x11-libs/libXScrnSaver-1.2"
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-proto/trapproto/trapproto-3.4.3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/trapproto/trapproto-3.4.3.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/trapproto/trapproto-3.4.3.ebuild,v 1.19 2011/02/06 10:29:38 leio Exp $
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org Trap protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/videoproto/videoproto-2.3.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/videoproto/videoproto-2.3.1.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/videoproto/videoproto-2.3.1.ebuild,v 1.8 2011/02/14 13:57:31 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org Video protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/xcmiscproto/xcmiscproto-1.2.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/xcmiscproto/xcmiscproto-1.2.1.ebuild
@ -0,0 +1,23 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xcmiscproto/xcmiscproto-1.2.1.ebuild,v 1.8 2011/02/14 14:32:25 xarthisius Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org XCMisc protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( app-text/xmlto )"
+
+pkg_setup() {
+	xorg-2_pkg_setup
+
+	CONFIGURE_OPTIONS="$(use_enable doc specs)
+		$(use_with doc xmlto)
+		--without-fop"
+}
--- a/sdk_container/src/third_party/portage-stable/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild
@ -0,0 +1,14 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86bigfontproto/xf86bigfontproto-1.2.0.ebuild,v 1.12 2010/11/05 09:38:57 mduft Exp $
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org XF86BigFont protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/xf86dgaproto/xf86dgaproto-2.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/xf86dgaproto/xf86dgaproto-2.1.ebuild
@ -0,0 +1,13 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86dgaproto/xf86dgaproto-2.1.ebuild,v 1.10 2010/08/02 18:14:35 armin76 Exp $
+
+inherit x-modular
+
+DESCRIPTION="X.Org XF86DGA protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXxf86dga-1.0.99.1"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild,v 1.7 2011/03/05 17:50:36 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org XF86DRI protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86vidmodeproto/xf86vidmodeproto-2.3.1.ebuild,v 1.7 2011/03/05 17:49:59 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org XF86VidMode protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXxf86vm-1.0.99.1"
+DEPEND="${RDEPEND}"
--- a/sdk_container/src/third_party/portage-stable/x11-proto/xineramaproto/xineramaproto-1.2.1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/x11-proto/xineramaproto/xineramaproto-1.2.1.ebuild
@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-proto/xineramaproto/xineramaproto-1.2.1.ebuild,v 1.7 2011/03/05 17:51:07 xarthisius Exp $
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org Xinerama protocol headers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="!<x11-libs/libXinerama-1.0.99.1"
+DEPEND="${RDEPEND}"