summaryrefslogtreecommitdiff
path: root/x11-misc/xorg-cf-files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /x11-misc/xorg-cf-files
reinit the tree, so we can have metadata
Diffstat (limited to 'x11-misc/xorg-cf-files')
-rw-r--r--x11-misc/xorg-cf-files/Manifest6
-rw-r--r--x11-misc/xorg-cf-files/files/xorg-cf-files-1.0.2-solaris-prefix.patch663
-rw-r--r--x11-misc/xorg-cf-files/metadata.xml8
-rw-r--r--x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild31
4 files changed, 708 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..8302fea1cb81
--- /dev/null
+++ b/x11-misc/xorg-cf-files/Manifest
@@ -0,0 +1,6 @@
+AUX xorg-cf-files-1.0.2-solaris-prefix.patch 23137 SHA256 5270962cfdc9f815fa61922c2b1388bd5e9b90aa053fbdcdd12828cdabce7799 SHA512 96c01caab1cc77a16e4e103e57a625df3fa6dea399a6ac7df64f821b20edec8025d8d7bd6f1e15a5e2509d3032726eee15710ca5f354e2fd7f0a33a569fa336f WHIRLPOOL 56c4d7cef47dc3fb031a67e9d2ccebb817d013a129abb68ba7010bef91f45ef7e237f5204443c360aa8fb1cedf56f15a16334446d56c8470eaba0174c6a0fc0a
+DIST xorg-cf-files-1.0.6.tar.bz2 337859 SHA256 4dcf5a9dbe3c6ecb9d2dd05e629b3d373eae9ba12d13942df87107fdc1b3934d SHA512 1749a5fbcda2c15c300028abce79a3304cfb10f215bf98cf30558144eb64f9fa06a69203159f44405224ed567ac5bc0ff1222e3656367f69acc99f44871424fa WHIRLPOOL ef7d0581bd2d36ba61ccd47d7928dff43839494252af37350582cbab7ca3740cecb7a0d2c913aeb73fafeef1cbde7e2daf7ca9425dad6a6a29dd922dc80d7c97
+EBUILD xorg-cf-files-1.0.6.ebuild 1728 SHA256 b0f2361d34ce204012bcb2bd007a7ec89e09a76e240b82fa1ee2f6d8a71e18f8 SHA512 f12986c415dc4cf118bb4ca49d73fdf9d66cb995bdc03ab49d7754652f304e9504927e99ce575dc6dc948f6a921e8e0d3b07f50cd3748e8f007c2ab0f01c969e WHIRLPOOL 75834af51ea7852198f8d505b4296f340b1945ca01955ec2d41e7b79be9ff1d9994572b78cee89ce3575293b9d9f9e3fa42b2c5a59cd958ccc52d7f7a1083164
+MISC ChangeLog 4278 SHA256 c504c320485a5c3f22b6c06625b059ae8be321c4676267a8c64bad72a069604f SHA512 da46ca48b666935abb73fcb864f76b121fa7ef5f53eb3fce486c1df04b4c984c673f09a531e62e32dcd2aab79739115d141239e5cd0405c6edd6d65886d21f9f WHIRLPOOL 22ab297c705b8b93eeb6718e8d1277517963f2f99e89dd81def8245b6b83510b15fc0cf8b73ac1fcbfe5149609ca319cb1610617fbda9a1be8903dcab6d99a19
+MISC ChangeLog-2015 8061 SHA256 9e66bd2304298ee1d3c5f31590ccb066d06ab040aa97a3c85c50fad275e0100b SHA512 669991602cf9ee4009cbba2131960044645c85fa4ce0971ecab4deb0b00c323c4e5a97bd0719f980db991eb206efc0242f0be28cb8ba8ec50f0e68219cad99a4 WHIRLPOOL 2dcbc6a309f6279464ee04f7470695510f92db4a9de5e428bc7a900d961ce642904dae5c3406b4e4269d96b7295828a5986c43fa66bc8702aa88cf4ebe229c82
+MISC metadata.xml 230 SHA256 677e4595d00a3098fde05ae33118b9ac05867dc5729c9cd579dc8badd1a28f68 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 WHIRLPOOL 4866c82c6428eae526c0a514c988e4119221f77b0e8bfb04fec713dd3ba516c69afc776a0c6f53c29abfd8507aa23801614db1ba544dd0a0dd4d6a9462c27306
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..e943b72b8a48
--- /dev/null
+++ b/x11-misc/xorg-cf-files/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer type="project">
+ <email>x11@gentoo.org</email>
+ <name>X11</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
new file mode 100644
index 000000000000..7b1588e9fac4
--- /dev/null
+++ b/x11-misc/xorg-cf-files/xorg-cf-files-1.0.6.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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 ~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 || die
+ 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 || die
+ sed -i -e 's/-DNOSTDHDRS//g' "${ED}"/usr/$(get_libdir)/X11/config/sun.cf || die
+
+ 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"
+}