proj/gentoo: Initial commit

This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed

6 files changed, 762 insertions, 0 deletions

diff --git a/x11-misc/xorg-cf-files/Manifest b/x11-misc/xorg-cf-files/Manifest
new file mode 100644
index 000000000000..af31ecad8357
--- /dev/null
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -0,0 +1,2 @@
+DIST xorg-cf-files-1.0.4.tar.bz2 367380 SHA256 36e9ce83e4978f59909c6f44c43002d9b240ae66e23984ea1086f0b18c810669 SHA512 e00ba2273b8ec7ca4ae84c176075170ae74162064463e9b48fb5c6ad62f7984a93fafa626caf0a9079b796f4deec57759a1d0fc148e77793eae130a9441baf42 WHIRLPOOL bee8bd9b8b72e19bf1429aefe86db6b4eed39132e4080f9e3c9a4acb9d6b40e73e5d6dfd75304d29654feaa4c88f64ffd34c097896417ab3285e10090c3915ff
+DIST xorg-cf-files-1.0.5.tar.bz2 377835 SHA256 ed23b85043edecc38fad4229e0ebdb7ff80b570e746bc03a7c8678d601be7ed4 SHA512 139d2c51538257eac79118ea367cdfbebebcd095f353e784b61c109e008bf8e43eb4ef15bb0c8df74339dbed9d96af4c4d1e023c23d02d5de31dc2ea5b85ce5c WHIRLPOOL 8621de9d25a9672d30d9ee3ed6a617e9c9e9d5a34c945fa458b0318b9bf157569f97ea1697efc463f3bb0ae8c6d0335dd30a6b5499c6baf00c5e172aaa5bf95b
diff --git a/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch
new file mode 100644
index 000000000000..b797b2588d1d
--- /dev/null
+++ b/x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch
@@ -0,0 +1,663 @@
+--- sunLib.rules.orig	2008-12-18 13:43:19.032933408 +0100
++++ sunLib.rules	2008-12-18 13:51:12.494555406 +0100
+@@ -7,127 +7,268 @@
+ XCOMM $XFree86: xc/config/cf/sunLib.rules,v 1.3 2001/01/17 16:38:49 dawes Exp $
+ 
+ #ifndef HasSharedLibraries
+-#define HasSharedLibraries YES
++# define HasSharedLibraries YES
+ #endif
+-#ifndef SharedDataSeparation
+-#define SharedDataSeparation YES
++#ifndef ForceNormalLib
++# define ForceNormalLib NO
+ #endif
+-#ifndef SharedCodeDef
+-#define SharedCodeDef -DSHAREDCODE
+-#endif
+-#ifndef SharedLibraryDef
+-#define SharedLibraryDef -DSUNSHLIB
+-#endif
+-#ifndef ShLibIncludeFile
+-#define ShLibIncludeFile <sunLib.tmpl>
+-#endif
+-#ifndef SharedLibraryLoadFlags
+-#define SharedLibraryLoadFlags -assert pure-text
+-#endif
+-#ifndef PositionIndependentCFlags
+-#if HasGcc2
+-#define PositionIndependentCFlags -fPIC
+-#else
+-#define PositionIndependentCFlags -pic
++
++#ifndef UseRpath
++#define UseRpath NO
+ #endif
++
++#ifndef SharedOldX
++# define SharedOldX NO
+ #endif
+-#ifndef PositionIndependentCplusplusFlags
+-#if HasGcc2ForCplusplus
+-#define PositionIndependentCplusplusFlags -fPIC
++# ifndef SharedDataSeparation
++#  define SharedDataSeparation NO
++# endif
++# ifndef SharedCodeDef
++#  define SharedCodeDef /**/
++# endif
++# ifndef SharedLibraryDef
++#  define SharedLibraryDef /**/
++# endif
++# ifndef ShLibIncludeFile
++#  define ShLibIncludeFile <sunLib.tmpl>
++# endif
++#ifndef RpathLoadFlags
++#if UseRpath
++#define RpathLoadFlags -R$(USRLIBDIRPATH)
+ #else
+-#define PositionIndependentCplusplusFlags -pic
++#define RpathLoadFlags /**/
+ #endif
+ #endif
+-
+-/*
+- * SharedDSLibDependencies - shared library dependencies with data separation
+- */
+-#ifndef SharedDSLibDependencies
+-#define SharedDSLibDependencies(libname,libsource,revname) _UseCat($(USRLIBDIR)/lib,libsource/lib,libname.sa.$(revname))
++#ifndef LibraryRpathLoadFlags
++#define LibraryRpathLoadFlags RpathLoadFlags
+ #endif
++# ifndef SharedLibraryLoadFlags
++#  define SharedLibraryLoadFlags -shared
++# endif
++# ifndef PositionIndependentCFlags
++#  define PositionIndependentCFlags -fPIC
++# endif
++# ifndef PositionIndependentCplusplusFlags
++#  define PositionIndependentCplusplusFlags -fPIC
++# endif
++# ifndef ExtraLoadFlags
++#  if LinuxBinUtilsMajorVersion >= 26
++#   ifdef UseInstalled
++#    if LinuxBinUtilsMajorVersion < 27
++#     define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(USRLIBDIRPATH)
++#    endif
++#   else
++#    define ExtraLoadFlags RpathLoadFlags -Wl,-rpath-link,$(BUILDLIBDIR)
++#   endif
++#  else
++#   define ExtraLoadFlags RpathLoadFlags
++#  endif
++# endif
++# ifndef HardCodeLibdirFlag
++#  define HardCodeLibdirFlag RpathLoadFlags
++# endif
++# if !defined(ShlibGlobalsFlags)
++#  define ShlibGlobalsFlags -Wl,-Bsymbolic
++# endif
+ 
+ /*
+  * InstallSharedLibrary - generate rules to install the shared library.
++ * NOTE: file must be executable, hence "INSTBINFLAGS"
+  */
+-#ifndef InstallSharedLibrary
+-#define	InstallSharedLibrary(libname,rev,dest)				@@\
+-InstallTarget(install,Concat(lib,libname.so.rev),$(INSTLIBFLAGS),dest)
+-#endif /* InstallSharedLibrary */
++# ifndef InstallSharedLibrary
++#  define	InstallSharedLibrary(libname,rev,dest)			@@\
++install:: Concat(lib,libname.so.rev) 					@@\
++	MakeDir($(DESTDIR)dest)						@@\
++	$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.rev) $(DESTDIR)dest @@\
++	@T=`echo Concat($(DESTDIR)dest/lib,libname.so.rev) | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`;\
++	  set -x; $(RM) $$T && $(LN) Concat(lib,libname.so.rev) $$T	@@\
++	@if $(SOSYMLINK); then (set -x; \
++	  $(RM) Concat($(DESTDIR)dest/lib,libname.so); \		@@\
++	  $(LN) Concat(lib,libname.so.rev) Concat($(DESTDIR)dest/lib,libname.so)); fi
++# endif /* InstallSharedLibrary */
++
++# ifndef InstallSharedLibtoolLibrary
++
++#  define SetRevisions(rev) V=`expr rev : '\([^:]*\)'`; \		@@\
++		R=`expr rev : '.*:\([^:]*\):'`; \			@@\
++		A=`expr rev : '.*:\([^:]*\)'`; \			@@\
++		MAJ=`expr $$V - $$A`; \					@@\
++		MIN=$$A.$$R
++
++#  define	InstallSharedLibtoolLibrary(libname,rev,dest)		@@\
++install:: Concat(lib,libname.so) 					@@\
++	MakeDir($(DESTDIR)dest)						@@\
++	@set +e; SetRevisions(rev); \					@@\
++		set -xe; \						@@\
++		$(INSTALL) $(INSTALLFLAGS) $(INSTBINFLAGS) Concat(lib,libname.so.$$MAJ.$$MIN) $(DESTDIR)dest; \ @@\
++		$(RM) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \	@@\
++		$(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so.$$MAJ); \ @@\
++		$(RM) Concat($(DESTDIR)dest/lib,libname.so); \		@@\
++		$(LN) Concat(lib,libname.so.$$MAJ.$$MIN) Concat($(DESTDIR)dest/lib,libname.so)
++# endif /* InstallSharedLibrary */
+ 
+ /*
+  * InstallSharedLibraryData - generate rules to install the shared library data
+  */
+-#ifndef InstallSharedLibraryData
+-#define	InstallSharedLibraryData(libname,rev,dest)			@@\
+-install:: Concat(lib,libname.sa.rev)					@@\
+-	MakeDir($(DESTDIR)dest)						@@\
+-	$(INSTALL) $(INSTALLFLAGS) $(INSTLIBFLAGS) Concat(lib,libname.sa.rev) $(DESTDIR)dest @@\
+-	RanLibrary($(RANLIBINSTFLAGS) Concat($(DESTDIR)dest/lib,libname.sa.rev))
+-#endif /* InstallSharedLibraryData */
+-
+-#if HasPurify
+-#define PureCleanSharedLibrary(libname,rev)				@@\
+-clean clean.pure::							@@\
+-	$(RM) Concat3(lib,libname,_pure_*.so.rev)
+-#else
+-#define PureCleanSharedLibrary(libname,rev) /**/
+-#endif
++# ifndef InstallSharedLibraryData
++#  define	InstallSharedLibraryData(libname,rev,dest)
++# endif /* InstallSharedLibraryData */
++
+ 
+ /*
+  * SharedLibraryTarget - generate rules to create a shared library;
+  * build it into a different name so that we do not hose people by having
+  * the library gone for long periods.
+  */
+-#ifndef SharedLibraryTarget
+-#define SharedLibraryTarget(libname,rev,solist,down,up)			@@\
++# ifndef SharedLibraryTarget
++#  define SharedLibraryTarget(libname,rev,solist,down,up)		@@\
+ AllTarget(Concat(lib,libname.so.rev))					@@\
+ 									@@\
+ Concat(lib,libname.so.rev):  solist $(EXTRALIBRARYDEPS)			@@\
+ 	$(RM) $@~							@@\
+-	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
++	@SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; (set -x; \	@@\
++		cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)) || exit 1; \ @@\
++		(set -x; $(RM) $$SONAME; $(LN) $@ $$SONAME); \		@@\
++		LinkBuildSonameLibrary($$SONAME)			@@\
+ 	$(RM) $@ 							@@\
+ 	$(MV) $@~ $@							@@\
++	@if $(SOSYMLINK); then (set -x; \				@@\
++	  $(RM) Concat(lib,libname.so); \				@@\
++	  $(LN) $@ Concat(lib,libname.so)); fi				@@\
+ 	LinkBuildLibrary($@)						@@\
++	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
+ 									@@\
+ clean::									@@\
+-	$(RM) Concat(lib,libname.so.rev)				@@\
++	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
++	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
++	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++
++# endif /* SharedLibraryTarget */
++
++
++# ifndef SharedLibtoolLibraryTarget
++#  define SharedLibtoolLibraryTarget(libname,rev,solist,down,up)	@@\
++AllTarget(Concat(lib,libname.so))					@@\
++									@@\
++Concat(lib,libname.so):  solist $(EXTRALIBRARYDEPS)			@@\
++	$(RM) $@~							@@\
++	@set +e; SetRevisions(rev); set -e; \				@@\
++		SONAME=$@.$$MAJ; \					@@\
++		(set -x; \						@@\
++		$(RM) $@.$$MAJ.$$MIN~; \				@@\
++		cd down; $(CC) -o up/$@.$$MAJ.$$MIN~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)) || exit 1; \ @@\
++		(set -x; \						@@\
++		$(RM) $$SONAME; $(LN) $@.$$MAJ.$$MIN $$SONAME); \	@@\
++		LinkBuildSonameLibrary($$SONAME); \			@@\
++		(set -x; \						@@\
++		$(RM) $@.$$MAJ.$$MIN; \					@@\
++		$(MV) $@.$$MAJ.$$MIN~ $@.$$MAJ.$$MIN; \			@@\
++	  	$(RM) $@; \						@@\
++	  	$(LN) $@.$$MAJ.$$MIN $@); \				@@\
++		LinkBuildLibraryInline($@.$$MAJ.$$MIN); \		@@\
++		LinkBuildLibraryInline($@)				@@\
+ 									@@\
+-PureCleanSharedLibrary(libname,rev)
+-#endif /* SharedLibraryTarget */
++clean::									@@\
++	@set +e; SetRevisions(rev); \					@@\
++		set -xe; \						@@\
++		$(RM) Concat(lib,libname.so.$$MAJ); \			@@\
++		$(RM) Concat(lib,libname.so.$$MAJ.$$MIN)		@@\
++	$(RM) Concat(lib,libname.so)
++
++# endif /* SharedLibtoolLibraryTarget */
+ 
+ /*
+  * SharedDepLibraryTarget - generate rules to create a shared library.
+  */
+-#ifndef SharedDepLibraryTarget
+-#define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
++# ifndef SharedDepLibraryTarget
++#   define SharedDepLibraryTarget(libname,rev,deplist,solist,down,up)	@@\
+ AllTarget(Concat(lib,libname.so.rev))					@@\
+ 									@@\
+ Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
+ 	$(RM) $@~							@@\
+-	(cd down; $(LD) -o up/$@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS)) @@\
++	@SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \		@@\
++		(cd down; $(CC) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)); \ @@\
++		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
++		LinkBuildSonameLibrary($$SONAME)			@@\
+ 	$(RM) $@ 							@@\
+ 	$(MV) $@~ $@							@@\
++	@if $(SOSYMLINK); then (set -x; \				@@\
++	  $(RM) Concat(lib,libname.so); \				@@\
++	  $(LN) $@ Concat(lib,libname.so)); fi				@@\
+ 	LinkBuildLibrary($@)						@@\
++	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
+ 									@@\
+ clean::									@@\
+-	$(RM) Concat(lib,libname.so.rev)				@@\
+-									@@\
+-PureCleanSharedLibrary(libname,rev)
++	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
++	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
++	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++
+ #endif /* SharedDepLibraryTarget */
+ 
+ /*
+- * SharedLibraryDataTarget - generate rules to create shlib data file;
++ * SharedDepCplusplusLibraryTarget - generate rules to create a shared library.
+  */
+-#ifndef SharedLibraryDataTarget
+-#define SharedLibraryDataTarget(libname,rev,salist)			@@\
+-AllTarget(Concat(lib,libname.sa.rev))					@@\
++#ifndef SharedDepCplusplusLibraryTarget
++#define SharedDepCplusplusLibraryTarget(libname,rev,deplist,solist,down,up) @@\
++AllTarget(Concat(lib,libname.so.rev))					@@\
+ 									@@\
+-Concat(lib,libname.sa.rev):  salist					@@\
+-	$(RM) $@							@@\
+-	$(AR) $@ salist							@@\
+-	RanLibrary($@)							@@\
++Concat(lib,libname.so.rev):  deplist $(EXTRALIBRARYDEPS)		@@\
++	$(RM) $@~							@@\
++	@SONAME=`echo $@ | sed 's/\(lib[^\.]*\.so\.[0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; set -x; \		@@\
++		(cd down; $(CXX) -o up/$@~ $(SHLIBLDFLAGS) -Wl,-soname,$$SONAME solist $(REQUIREDLIBS)); \ @@\
++		$(RM) $$SONAME; $(LN) $@ $$SONAME; \			@@\
++		LinkBuildSonameLibrary($$SONAME)			@@\
++	$(RM) $@ 							@@\
++	$(MV) $@~ $@							@@\
++	@if $(SOSYMLINK); then (set -x; \				@@\
++	  $(RM) Concat(lib,libname.so); \				@@\
++	  $(LN) $@ Concat(lib,libname.so)); fi				@@\
+ 	LinkBuildLibrary($@)						@@\
++	LinkBuildLibraryMaybe(Concat(lib,libname.so),$(SOSYMLINK))	@@\
+ 									@@\
+ clean::									@@\
+-	$(RM) Concat(lib,libname.sa.rev)
+-#endif /* SharedLibraryDataTarget */
++	@MAJREV=`echo rev | sed 's/\([0-9]*\)\(\.[0-9]*\)\{1,2\}/\1/'`; \	@@\
++	set -x; $(RM) Concat(lib,libname.so.$$MAJREV)			@@\
++	$(RM) Concat(lib,libname.so.rev) Concat(lib,libname.so)
++
++#endif /* SharedDepCplusplusLibraryTarget */
++
++# ifndef SharedDepModuleTarget
++#  define SharedDepModuleTarget(name,deps,solist)			@@\
++AllTarget(name)								@@\
++									@@\
++name: deps								@@\
++	$(RM) $@~							@@\
++	$(CC) -o $@~ $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
++	$(RM) $@							@@\
++	$(MV) $@~ $@							@@\
++									@@\
++clean::									@@\
++	$(RM) name
++
++# endif /* SharedDepModuleTarget */
++
++# ifndef SharedDriModuleTarget
++#  define SharedDriModuleTarget(name,deps,solist)			@@\
++AllTarget(name)								@@\
++									@@\
++name: deps								@@\
++	$(RM) $@~ $@.map						@@\
++	@(echo 'DRI_MODULE { global: __dri*; local: *; };' > $@.map)	@@\
++	$(CC) -o $@~ -Wl,--version-script=$@.map $(SHLIBLDFLAGS) solist $(REQUIREDLIBS) @@\
++	$(RM) $@ $@.map							@@\
++	$(MV) $@~ $@							@@\
++									@@\
++clean::									@@\
++	$(RM) name							@@\
++	$(RM) name.map
++
++# endif /* SharedDriModuleTarget */
++
++/*
++ * SharedLibraryDataTarget - generate rules to create shlib data file;
++ */
++# ifndef SharedLibraryDataTarget
++#  define SharedLibraryDataTarget(libname,rev,salist)
++# endif /* SharedLibraryTarget */
++
+--- sunLib.tmpl.orig	2008-12-18 13:43:14.856762538 +0100
++++ sunLib.tmpl	2008-12-18 13:53:25.489781023 +0100
+@@ -7,252 +7,71 @@
+ 
+ XCOMM $XFree86: xc/config/cf/sunLib.tmpl,v 3.12tsi Exp $
+ 
+-/*
+- * SunOS shared library template
+- */
+-
+-#if OSMajorVersion <= 4
+-
+-# if SunPost411FCSLd
+-#  define SharedXmuReqs $(LDPRELIBS) $(XTOOLLIB) $(XLIB)
+-#  define SharedXrenderReqs $(LDPRELIB) $(XLIB)
+-# endif
+-
+-#ifndef SharedX11Rev
+-#define SharedX11Rev 4.30
+-#endif
+-#ifndef SharedOldXRev
+-#define SharedOldXRev 4.20
+-#endif
+-#ifndef SharedXtRev
+-#define SharedXtRev 4.20
+-#endif
+-#ifndef SharedXawRev
+-#define SharedXawRev 6.10
+-#endif
+-#ifndef SharedXmuRev
+-#define SharedXmuRev 4.20
+-#endif
+-#ifndef SharedXextRev
+-#define SharedXextRev 4.50
+-#endif
+-#ifndef SharedXiRev
+-#define SharedXiRev 4.20
+-#endif
+-#ifndef SharedXtstRev
+-#define SharedXtstRev 1.20
+-#endif
+-
+-#else				/* else it's Solaris */
+-
+-/* Solaris uses single digit library versions, and versions of libraries
+- * defined in SVID specs should match the versions specified there.
+- */
+-
+-#ifndef SharedX11Rev
+-# define SharedX11Rev 4
+-#endif
+-#ifndef SharedOldXRev
+-# define SharedOldXRev 6
+-#endif
+-#ifndef SharedXextRev
+-# define SharedXextRev 0
+-#endif
+-#ifndef SharedXauRev
+-# define SharedXauRev 6
+-#endif
+-#ifndef SharedXdmcpRev
+-# define SharedXdmcpRev 6
+-#endif
+-#ifndef SharedXmuRev
+-# define SharedXmuRev 4
+-#endif
+-#ifndef SharedXmuuRev
+-# define SharedXmuuRev 1
+-#endif
+-#ifndef SharedXpRev
+-# define SharedXpRev 1
+-#endif
+-#ifndef SharedXpmRev
+-# define SharedXpmRev 4
+-#endif
+-#ifndef SharedXtRev
+-# define SharedXtRev 4
+-#endif
+-#ifndef SharedXaw6Rev
+-# define SharedXaw6Rev 5
+-#endif
+-#ifndef SharedXiRev
+-# define SharedXiRev 5
+-#endif
+-#ifndef SharedXtstRev
+-# define SharedXtstRev 1
+-#endif
+-#ifndef SharedFSRev
+-# define SharedFSRev 5
+-#endif
+-#ifndef SharedICERev
+-# define SharedICERev 6
+-#endif
+-#ifndef SharedSMRev
+-# define SharedSMRev 6
+-#endif
+-#ifndef SharedXcursor
+-# define SharedXcursorRev 1
+-#endif
+-#ifndef SharedXdamageRev
+-# define SharedXdamageRev 1
+-#endif
+-#ifndef SharedXevieRev
+-# define SharedXevieRev 1
+-#endif
+-#ifndef SharedXfixesRev
+-# define SharedXfixesRev 1
+-#endif
+-#ifndef SharedXftRev
+-# define SharedXftRev 2
+-#endif
+-#ifndef SharedXineramaRev
+-# define SharedXineramaRev 1
+-#endif
+-#ifndef SharedXrenderRev
+-# define SharedXrenderRev 1
+-#endif
+-#ifndef SharedXResRev
+-# define SharedXResRev 1
+-#endif
+-#ifndef SharedXvRev
+-# define SharedXvRev 1
+-#endif
+-#ifndef SharedXvMCRev
+-# define SharedXvMCRev 1
+-#endif
+-#ifndef SharedXrandrRev
+-# define SharedXrandrRev 2
+-#endif
+-#ifndef SharedXssRev
+-# define SharedXssRev 1
+-#endif
+-#ifndef SharedFontconfigRev
+-# define SharedFontconfigRev 1
+-#endif
+-#ifndef SharedGlxRev
+-# define SharedGlxRev 1
+-#endif
+-#ifndef SharedGluRev
+-# define SharedGluRev 1
+-#endif
+-#ifndef SharedGLwRev
+-# define SharedGLwRev 1
+-#endif
+-#ifndef SharedOSMesaRev
+-# define SharedOSMesaRev 4
+-#endif
+-#ifndef SharedxkbfileRev
+-# define SharedxkbfileRev 5
+-#endif
+-#ifndef SharedXxf86miscRev
+-# define SharedXxf86miscRev 1
+-#endif
+-#ifndef SharedXxf86vmRev
+-# define SharedXxf86vmRev 1
+-#endif
+-
+-# if ThreadedX
+-#  if OSMinorVersion > 3
+-#   define SharedThreadReqs /**/
+-#  endif
+-# endif
+-
+-# define SharedX11Reqs $(LDPRELIB) SharedThreadReqs $(EXTRA_LIBRARIES) -lc DlLibrary
+-# define SharedXlibi18nReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedOldXReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXtReqs $(LDPRELIB) $(XLIBONLY) $(SMLIB) $(ICELIB) -lc
+-# define SharedXawReqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB) -lc
+-# define SharedXaw7Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB) -lc
+-# define SharedXaw6Reqs $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB) -lc
+-# define SharedXmuReqs $(LDPRELIB) $(XTOOLLIB) $(XLIB) -lnsl -lc
+-# define SharedXmuuReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXextReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXiReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXtstReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedFSReqs $(EXTRA_LIBRARIES) -lc
+-# define SharedICEReqs $(EXTRA_LIBRARIES) -lc
+-# define SharedSMReqs $(LDPRELIB) $(ICELIB) $(EXTRA_LIBRARIES) -lc
+-# define SharedXineramaReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXpReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXpmReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXResReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXrenderReqs $(LDPRELIB) $(XLIBONLY) -lc
+-# define SharedXrandrReqs  $(LDPRELIB) $(XRENDERLIB) $(XLIB) -lc
+-# define SharedXssReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXvReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXvMCReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXfontReqs $(LDPRELIB) $(FREETYPE2LIB) GzipLibrary -lsocket MathLibrary -lc
+-# define SharedXfontcacheReqs $(LDPRELIB) $(XLIB)
+-# define SharedFontencReqs $(LDPRELIB) GzipLibrary -lc
+-# define SharedXxf86dgaReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXxf86miscReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXxf86vmReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedDPSReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIBONLY) $(EXTRA_LIBRARIES) -lc
+-# define SharedDPSTKReqs $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIBONLY) -lc
+-# define SharedPSResReqs -lc
+-# define SharedGLReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedGLUReqs $(LDPRELIBS) $(XLIB) $(GLXLIB) $(CXXLIB) MathLibrary -lc
+-# define SharedGLwReqs $(LDPRELIBS) $(MOTIFLIB) $(GLXLIB) $(XTOOLLIB) $(XLIB)
+-# define SharedOSMesaReqs $(LDPRELIB) $(XLIB) $(GLXLIB) MathLibrary -lc
+-# define SharedxkbfileReqs $(LDPRELIB) $(XONLYLIB) -lc
+-# define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB) MathLibrary -lc
+-# define SharedXfixesReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXdamageReqs $(LDPRELIB) $(XLIB) -lc
+-# define SharedXauReqs -lc
+-# define SharedXdmcpReqs -lsocket -lc
+-# define SharedXcompositeReqs $(LDPRELIB) $(XDAMAGELIB) $(XFIXESLIB) $(XLIB) -lc
+-# define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XONLYLIB) -lc
+-# define SharedXevieReqs $(LDPRELIB) $(XLIB)
+-
+-# define FixupLibReferences() /**/
+-
+-# define SharedPamReqs DlLibrary
+-# define SharedPamUnixReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lnsl -lmp -lcmd SharedThreadReqs
+-# define SharedPamSampleReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
+-# define SharedPamDialAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) SharedThreadReqs
+-# define SharedPamRhostsAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -lsocket SharedThreadReqs
+-# define SharedPamDceAuthReqs $(LDPRELIBS) -lpam $(LDPOSTLIBS) -ldce -lnsl -lsocket SharedThreadReqs
+-# define SharedTtReqs -lnsl -lsocket -lintl DlLibrary -lc -lw
+-# define SharedDtSvcReqs $(LDPRELIBS) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
+-# define SharedDtMmdbReqs $(LDPRELIBS) $(DTSVCLIB) $(TTLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) SharedThreadReqs -lgen -lc -lsocket -lnsl DlLibrary
+-# define SharedDtSearchReqs -lm -lc
+-# define SharedDtWidgetReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
+-# define SharedDtHelpReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lgen -lm -lc
+-# define SharedDtPrintReqs $(LDPRELIBS) $(DTSVCLIB) $(DTHELPLIB) $(XMLIB) -lintl $(LDPOSTLIBS) -lw -lm -lc
+-# define SharedDtTermReqs SharedDtHelpReqs DlLibrary -lgen
+-# define SharedDtMrmReqs $(LDPRELIBS) $(DTTERMLIB) $(DTPRINTLIB) $(DTHELPLIB) $(DTWIDGETLIB) $(MRESOURCELIB) $(XMLIB) $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS) -lw -lsocket -lnsl -lc
+-# define SharedDtMailReqs $(LDPRELIBS) -lw $(CXXLIB) -lm DlLibrary
+-# define SharedCsaReqs $(LDPRELIBS) $(DTSVCLIB) $(XMLIB) SharedXmReqs
+-
+-# define DtClientExtraLibs -lintl
+-
+-/* The inbuf paramter to iconv(3) is "const char**", not "char **" */
+-ICONV_INBUF_DEFINE = -DICONV_INBUF_CONST=const
+-
+-# if HasCplusplus
+-#  if HasGcc2ForCplusplus
+-UNSHARED_CXXLIB = -static -lC
+-#  elif HasSunCplusplus
+-#   if CplusplusCompilerMajorVersion > 3
+-#    ifdef CplusplusWhatdir
+-UNSHARED_CXXLIB = -Bstatic -L`CplusplusWhatdir CC`/../lib -lC -Bdynamic
+-#    else
+-UNSHARED_CXXLIB = -Bstatic -L/opt/SUNWspro/SC4.0/lib -lC -Bdynamic
+-#    endif
+-#   else
+-UNSHARED_CXXLIB = -Bstatic -lC -Bdynamic -lm -lc -Bstatic
+-#   endif
+-#  endif
+-# endif
+-
+-# define IafSysLib	/**/
+-# include <sv4Lib.tmpl>
++#ifndef FixupLibReferences
++#define FixupLibReferences()						@@\
++XMULIBONLY = -lXmu							@@\
++XMULIB = $(XMULIBONLY) $(XTOOLLIB) $(XLIB)
++#endif
++
++#ifndef XawClientLibs
++#define XawClientLibs $(XAWLIB) $(XMULIBONLY) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWCLIENTLIBS) $(XLIB)
++#endif
++
++#define SharedX11Reqs
++#define SharedXlibi18nReqs $(LDPRELIB) $(XONLYLIB)
++#define SharedOldXReqs	  $(LDPRELIB) $(XONLYLIB)
++#define SharedXtReqs	  $(LDPRELIB) $(XONLYLIB) $(SMLIB) $(ICELIB)
++#define SharedXaw6Reqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XLIB)
++#define SharedXaw7Reqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(XLIB)
++#define SharedXawReqs	  $(LDPRELIB) $(XMULIB) $(XTOOLLIB) $(XPMLIB) $(EXTRAXAWREQS) $(XLIB)
++#define SharedXmuReqs	  $(LDPRELIB) $(XTOOLLIB) $(XLIB)
++#define SharedXmuuReqs	  $(LDPRELIB) $(XONLYLIB)
++#define SharedXextReqs	  $(LDPRELIB) $(XONLYLIB)
++#define SharedXiReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXpReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXpmReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXrandrReqs  $(LDPRELIB) $(XRENDERLIB) $(XLIB)
++#define SharedXrenderReqs $(LDPRELIB) $(XLIB)
++#define SharedXtstReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXvReqs	  $(LDPRELIB) $(XLIB)
++#define SharedSMReqs	  $(LDPRELIB) $(ICELIB)
++#define SharedXcursorReqs $(LDPRELIB) $(XRENDERLIB) $(XLIB)
++#define SharedFontencReqs $(LDPRELIB) GzipLibrary
++
++#if GlxUseBuiltInDRIDriver
++#define ExtraSharedGLReqs /**/
++#else
++#define ExtraSharedGLReqs -ldl
++#endif
++#define SharedGLReqs	  $(LDPRELIB) $(XLIB) ExtraSharedGLReqs
++#ifndef SharedGLUReqs
++#define SharedGLUReqs	  $(LDPRELIB) $(XLIB) $(GLXLIB)
++#endif
++#define SharedDPSReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
++#define SharedDPSTKReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(DPSLIB) $(XLIB)
++#define SharedpsresReqs	  $(LDPRELIB) $(SMLIB) $(ICELIB) $(XTOOLLIB) $(XLIB)
++
++#define SharedXResReqs	  $(LDPRELIB) $(XLIB)
++#define SharedXfontcacheReqs	$(LDPRELIB) $(XLIB)
++#define SharedXineramaReqs	$(LDPRELIB) $(XLIB)
++#define SharedXssReqs	$(LDPRELIB) $(XLIB)
++#define SharedXvMCReqs	$(LDPRELIB) $(XLIB)
++#define SharedXxf86dgaReqs	$(LDPRELIB) $(XLIB)
++#define SharedXxf86miscReqs	$(LDPRELIB) $(XLIB)
++#define SharedXxf86vmReqs	$(LDPRELIB) $(XLIB)
++#define SharedxkbfileReqs	$(LDPRELIB) $(XONLYLIB)
++#define SharedxkbuiReqs $(LDPRELIB) $(XKBFILELIB) $(XONLYLIB)
++
++#ifndef SharedXReqs
++# define SharedXReqs $(XTOOLLIB) $(XPLIB) $(XLIB) $(LDPOSTLIBS)
++#endif
++
++#ifndef SharedXmReqs
++# define SharedXmReqs $(LDPRELIBS) SharedXReqs -lc
++#endif
+ 
++#ifndef SharedTtReqs
++# define SharedTtReqs $(LDPRELIBS) SharedXReqs $(CXXLIB)
+ #endif
++
++#define NoMessageCatalog
diff --git a/x11-misc/xorg-cf-files/metadata.xml b/x11-misc/xorg-cf-files/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-misc/xorg-cf-files/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+</pkgmetadata>
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild
new file mode 100644
index 000000000000..a640f2faa619
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4-r1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit xorg-2
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
+)
+
+src_install() {
+	xorg-2_src_install
+	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> "${ED}"/usr/$(get_libdir)/X11/config/host.def
+	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+	sed -i -e "/#  define Solaris64bitSubdir/d" "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+	sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+
+	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+}
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild
new file mode 100644
index 000000000000..de5f9564baa7
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
+)
+
+src_install() {
+	xorg-2_src_install
+	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> ${ED}/usr/$(get_libdir)/X11/config/host.def
+	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" ${ED}/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" ${ED}/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+	sed -i -e "/#  define Solaris64bitSubdir/d" ${ED}/usr/$(get_libdir)/X11/config/sun.cf
+	sed -i -e 's/-DNOSTDHDRS//g' ${ED}/usr/$(get_libdir)/X11/config/sun.cf
+}
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
new file mode 100644
index 000000000000..12bb563a3106
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit xorg-2
+
+DESCRIPTION="Old Imake-related build files"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.0.2-solaris-prefix.patch
+)
+
+src_install() {
+	xorg-2_src_install
+	echo "#define ManDirectoryRoot ${EPREFIX}/usr/share/man" >> "${ED}"/usr/$(get_libdir)/X11/config/host.def
+	sed -i -e "s/LibDirName *lib$/LibDirName $(get_libdir)/" "${ED}"/usr/$(get_libdir)/X11/config/Imake.tmpl || die "failed libdir sed"
+	sed -i -e "s|LibDir Concat(ProjectRoot,/lib/X11)|LibDir Concat(ProjectRoot,/$(get_libdir)/X11)|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed libdir sed"
+	sed -i -e "s|\(EtcX11Directory \)\(/etc/X11$\)|\1${EPREFIX}\2|" "${ED}"/usr/$(get_libdir)/X11/config/X11.tmpl || die "failed etcx11dir sed"
+	sed -i -e "/#  define Solaris64bitSubdir/d" "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+	sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf
+
+	sed -r -i -e "s|LibDirName[[:space:]]+lib.*$|LibDirName $(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|SystemUsrLibDir[[:space:]]+/usr/lib.*$|SystemUsrLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+	sed -r -i -e "s|TkLibDir[[:space:]]+/usr/lib.*$|TkLibDir /usr/$(get_libdir)|" "${ED}"/usr/$(get_libdir)/X11/config/linux.cf || die "failed libdir sed"
+}