summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-apps
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
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
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/amlc/Manifest1
-rw-r--r--x11-apps/amlc/amlc-0.5.1.ebuild28
-rw-r--r--x11-apps/amlc/metadata.xml5
-rw-r--r--x11-apps/appres/Manifest1
-rw-r--r--x11-apps/appres/appres-1.0.4.ebuild15
-rw-r--r--x11-apps/appres/metadata.xml5
-rw-r--r--x11-apps/ardesia/Manifest1
-rw-r--r--x11-apps/ardesia/ardesia-1.0.ebuild37
-rw-r--r--x11-apps/ardesia/metadata.xml31
-rw-r--r--x11-apps/bdftopcf/Manifest2
-rw-r--r--x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild14
-rw-r--r--x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild14
-rw-r--r--x11-apps/bdftopcf/metadata.xml5
-rw-r--r--x11-apps/beforelight/Manifest1
-rw-r--r--x11-apps/beforelight/beforelight-1.0.5.ebuild16
-rw-r--r--x11-apps/beforelight/metadata.xml5
-rw-r--r--x11-apps/bitmap/Manifest2
-rw-r--r--x11-apps/bitmap/bitmap-1.0.7.ebuild17
-rw-r--r--x11-apps/bitmap/bitmap-1.0.8.ebuild17
-rw-r--r--x11-apps/bitmap/metadata.xml5
-rw-r--r--x11-apps/ccsm/Manifest1
-rw-r--r--x11-apps/ccsm/ccsm-0.8.4-r4.ebuild51
-rw-r--r--x11-apps/ccsm/ccsm-0.8.4-r5.ebuild54
-rw-r--r--x11-apps/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch16
-rw-r--r--x11-apps/ccsm/metadata.xml6
-rw-r--r--x11-apps/editres/Manifest1
-rw-r--r--x11-apps/editres/editres-1.0.6.ebuild18
-rw-r--r--x11-apps/editres/metadata.xml5
-rw-r--r--x11-apps/fonttosfnt/Manifest1
-rw-r--r--x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild14
-rw-r--r--x11-apps/fonttosfnt/metadata.xml5
-rw-r--r--x11-apps/fslsfonts/Manifest2
-rw-r--r--x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild15
-rw-r--r--x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild15
-rw-r--r--x11-apps/fslsfonts/metadata.xml5
-rw-r--r--x11-apps/fstobdf/Manifest2
-rw-r--r--x11-apps/fstobdf/fstobdf-1.0.5.ebuild15
-rw-r--r--x11-apps/fstobdf/fstobdf-1.0.6.ebuild15
-rw-r--r--x11-apps/fstobdf/metadata.xml5
-rw-r--r--x11-apps/fusion-icon/Manifest1
-rw-r--r--x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch22
-rw-r--r--x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild57
-rw-r--r--x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild62
-rw-r--r--x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild47
-rw-r--r--x11-apps/fusion-icon/metadata.xml6
-rw-r--r--x11-apps/iceauth/Manifest2
-rw-r--r--x11-apps/iceauth/iceauth-1.0.6.ebuild16
-rw-r--r--x11-apps/iceauth/iceauth-1.0.7.ebuild16
-rw-r--r--x11-apps/iceauth/metadata.xml5
-rw-r--r--x11-apps/ico/Manifest1
-rw-r--r--x11-apps/ico/ico-1.0.4.ebuild14
-rw-r--r--x11-apps/ico/metadata.xml5
-rw-r--r--x11-apps/intel-gpu-tools/Manifest3
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.10-clang.patch44
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch37
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild60
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild60
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild40
-rw-r--r--x11-apps/intel-gpu-tools/metadata.xml10
-rw-r--r--x11-apps/listres/Manifest1
-rw-r--r--x11-apps/listres/listres-1.0.3.ebuild16
-rw-r--r--x11-apps/listres/metadata.xml5
-rw-r--r--x11-apps/luit/Manifest1
-rw-r--r--x11-apps/luit/luit-1.1.1.ebuild23
-rw-r--r--x11-apps/luit/metadata.xml5
-rw-r--r--x11-apps/mesa-progs/Manifest2
-rw-r--r--x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild110
-rw-r--r--x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild90
-rw-r--r--x11-apps/mesa-progs/metadata.xml10
-rw-r--r--x11-apps/metadata.xml27
-rw-r--r--x11-apps/mkfontdir/Manifest1
-rw-r--r--x11-apps/mkfontdir/metadata.xml5
-rw-r--r--x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild14
-rw-r--r--x11-apps/mkfontscale/Manifest2
-rw-r--r--x11-apps/mkfontscale/metadata.xml5
-rw-r--r--x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild23
-rw-r--r--x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild24
-rw-r--r--x11-apps/oclock/Manifest1
-rw-r--r--x11-apps/oclock/metadata.xml5
-rw-r--r--x11-apps/oclock/oclock-1.0.3.ebuild18
-rw-r--r--x11-apps/python-whiteboard/Manifest1
-rw-r--r--x11-apps/python-whiteboard/metadata.xml29
-rw-r--r--x11-apps/python-whiteboard/python-whiteboard-20101012.ebuild36
-rw-r--r--x11-apps/radeontop/Manifest2
-rw-r--r--x11-apps/radeontop/metadata.xml11
-rw-r--r--x11-apps/radeontop/radeontop-0.7-r1.ebuild47
-rw-r--r--x11-apps/radeontop/radeontop-0.8.ebuild48
-rw-r--r--x11-apps/radeontop/radeontop-9999.ebuild37
-rw-r--r--x11-apps/rgb/Manifest2
-rw-r--r--x11-apps/rgb/metadata.xml5
-rw-r--r--x11-apps/rgb/rgb-1.0.5.ebuild15
-rw-r--r--x11-apps/rgb/rgb-1.0.6.ebuild15
-rw-r--r--x11-apps/rstart/Manifest1
-rw-r--r--x11-apps/rstart/metadata.xml5
-rw-r--r--x11-apps/rstart/rstart-1.0.5.ebuild14
-rw-r--r--x11-apps/scripts/Manifest1
-rw-r--r--x11-apps/scripts/metadata.xml5
-rw-r--r--x11-apps/scripts/scripts-1.0.1-r1.ebuild21
-rw-r--r--x11-apps/sessreg/Manifest2
-rw-r--r--x11-apps/sessreg/metadata.xml5
-rw-r--r--x11-apps/sessreg/sessreg-1.0.8.ebuild15
-rw-r--r--x11-apps/sessreg/sessreg-1.1.0.ebuild15
-rw-r--r--x11-apps/setxkbmap/Manifest2
-rw-r--r--x11-apps/setxkbmap/metadata.xml5
-rw-r--r--x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild16
-rw-r--r--x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild16
-rw-r--r--x11-apps/showfont/Manifest2
-rw-r--r--x11-apps/showfont/metadata.xml5
-rw-r--r--x11-apps/showfont/showfont-1.0.4.ebuild14
-rw-r--r--x11-apps/showfont/showfont-1.0.5.ebuild14
-rw-r--r--x11-apps/simple-ccsm/Manifest1
-rw-r--r--x11-apps/simple-ccsm/metadata.xml6
-rw-r--r--x11-apps/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild54
-rw-r--r--x11-apps/smproxy/Manifest2
-rw-r--r--x11-apps/smproxy/metadata.xml5
-rw-r--r--x11-apps/smproxy/smproxy-1.0.5.ebuild15
-rw-r--r--x11-apps/smproxy/smproxy-1.0.6.ebuild15
-rw-r--r--x11-apps/spotlighter/Manifest1
-rw-r--r--x11-apps/spotlighter/metadata.xml24
-rw-r--r--x11-apps/spotlighter/spotlighter-0.1.ebuild28
-rw-r--r--x11-apps/transset/Manifest2
-rw-r--r--x11-apps/transset/files/transset-1.0.0-no_transset-df.patch21
-rw-r--r--x11-apps/transset/metadata.xml5
-rw-r--r--x11-apps/transset/transset-1.0.0.ebuild19
-rw-r--r--x11-apps/transset/transset-1.0.1.ebuild17
-rw-r--r--x11-apps/viewres/Manifest1
-rw-r--r--x11-apps/viewres/metadata.xml5
-rw-r--r--x11-apps/viewres/viewres-1.0.4.ebuild17
-rw-r--r--x11-apps/whyteboard/Manifest2
-rw-r--r--x11-apps/whyteboard/files/whyteboard.desktop13
-rw-r--r--x11-apps/whyteboard/metadata.xml25
-rw-r--r--x11-apps/whyteboard/whyteboard-0.41.1.ebuild49
-rw-r--r--x11-apps/x11perf/Manifest2
-rw-r--r--x11-apps/x11perf/metadata.xml5
-rw-r--r--x11-apps/x11perf/x11perf-1.5.4.ebuild18
-rw-r--r--x11-apps/x11perf/x11perf-1.6.0.ebuild18
-rw-r--r--x11-apps/xauth/Manifest2
-rw-r--r--x11-apps/xauth/metadata.xml5
-rw-r--r--x11-apps/xauth/xauth-1.0.8.ebuild25
-rw-r--r--x11-apps/xauth/xauth-1.0.9-r1.ebuild35
-rw-r--r--x11-apps/xauth/xauth-1.0.9-r2.ebuild34
-rw-r--r--x11-apps/xauth/xauth-1.0.9.ebuild25
-rw-r--r--x11-apps/xbacklight/Manifest1
-rw-r--r--x11-apps/xbacklight/metadata.xml5
-rw-r--r--x11-apps/xbacklight/xbacklight-1.2.1.ebuild15
-rw-r--r--x11-apps/xbiff/Manifest1
-rw-r--r--x11-apps/xbiff/metadata.xml5
-rw-r--r--x11-apps/xbiff/xbiff-1.0.3.ebuild19
-rw-r--r--x11-apps/xcalc/Manifest2
-rw-r--r--x11-apps/xcalc/metadata.xml5
-rw-r--r--x11-apps/xcalc/xcalc-1.0.5.ebuild17
-rw-r--r--x11-apps/xcalc/xcalc-1.0.6.ebuild17
-rw-r--r--x11-apps/xclipboard/Manifest2
-rw-r--r--x11-apps/xclipboard/metadata.xml5
-rw-r--r--x11-apps/xclipboard/xclipboard-1.1.2.ebuild17
-rw-r--r--x11-apps/xclipboard/xclipboard-1.1.3.ebuild17
-rw-r--r--x11-apps/xclock/Manifest2
-rw-r--r--x11-apps/xclock/metadata.xml5
-rw-r--r--x11-apps/xclock/xclock-1.0.6.ebuild20
-rw-r--r--x11-apps/xclock/xclock-1.0.7.ebuild20
-rw-r--r--x11-apps/xcmsdb/Manifest2
-rw-r--r--x11-apps/xcmsdb/metadata.xml5
-rw-r--r--x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild14
-rw-r--r--x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild14
-rw-r--r--x11-apps/xconsole/Manifest1
-rw-r--r--x11-apps/xconsole/metadata.xml5
-rw-r--r--x11-apps/xconsole/xconsole-1.0.6.ebuild16
-rw-r--r--x11-apps/xcursorgen/Manifest2
-rw-r--r--x11-apps/xcursorgen/metadata.xml5
-rw-r--r--x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild16
-rw-r--r--x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild16
-rw-r--r--x11-apps/xdbedizzy/Manifest1
-rw-r--r--x11-apps/xdbedizzy/metadata.xml5
-rw-r--r--x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild17
-rw-r--r--x11-apps/xditview/Manifest2
-rw-r--r--x11-apps/xditview/metadata.xml5
-rw-r--r--x11-apps/xditview/xditview-1.0.3.ebuild17
-rw-r--r--x11-apps/xditview/xditview-1.0.4.ebuild17
-rw-r--r--x11-apps/xdm/Manifest1
-rw-r--r--x11-apps/xdm/files/Xsession73
-rw-r--r--x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch18
-rw-r--r--x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch41
-rw-r--r--x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch37
-rw-r--r--x11-apps/xdm/files/xdm-consolekit.patch230
-rw-r--r--x11-apps/xdm/metadata.xml9
-rw-r--r--x11-apps/xdm/xdm-1.1.11-r1.ebuild67
-rw-r--r--x11-apps/xdm/xdm-1.1.11-r2.ebuild73
-rw-r--r--x11-apps/xdm/xdm-1.1.11-r3.ebuild79
-rw-r--r--x11-apps/xdpyinfo/Manifest2
-rw-r--r--x11-apps/xdpyinfo/metadata.xml9
-rw-r--r--x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild46
-rw-r--r--x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild46
-rw-r--r--x11-apps/xdriinfo/Manifest2
-rw-r--r--x11-apps/xdriinfo/metadata.xml5
-rw-r--r--x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild23
-rw-r--r--x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild23
-rw-r--r--x11-apps/xedit/Manifest2
-rw-r--r--x11-apps/xedit/metadata.xml5
-rw-r--r--x11-apps/xedit/xedit-1.2.1.ebuild17
-rw-r--r--x11-apps/xedit/xedit-1.2.2.ebuild17
-rw-r--r--x11-apps/xev/Manifest2
-rw-r--r--x11-apps/xev/metadata.xml5
-rw-r--r--x11-apps/xev/xev-1.2.1.ebuild17
-rw-r--r--x11-apps/xev/xev-1.2.2.ebuild17
-rw-r--r--x11-apps/xeyes/Manifest1
-rw-r--r--x11-apps/xeyes/metadata.xml5
-rw-r--r--x11-apps/xeyes/xeyes-1.1.1.ebuild19
-rw-r--r--x11-apps/xf86dga/Manifest1
-rw-r--r--x11-apps/xf86dga/metadata.xml5
-rw-r--r--x11-apps/xf86dga/xf86dga-1.0.3.ebuild17
-rw-r--r--x11-apps/xfd/Manifest1
-rw-r--r--x11-apps/xfd/metadata.xml5
-rw-r--r--x11-apps/xfd/xfd-1.1.2.ebuild21
-rw-r--r--x11-apps/xfontsel/Manifest2
-rw-r--r--x11-apps/xfontsel/metadata.xml5
-rw-r--r--x11-apps/xfontsel/xfontsel-1.0.4.ebuild18
-rw-r--r--x11-apps/xfontsel/xfontsel-1.0.5.ebuild18
-rw-r--r--x11-apps/xgamma/Manifest2
-rw-r--r--x11-apps/xgamma/metadata.xml5
-rw-r--r--x11-apps/xgamma/xgamma-1.0.5.ebuild16
-rw-r--r--x11-apps/xgamma/xgamma-1.0.6.ebuild16
-rw-r--r--x11-apps/xgc/Manifest2
-rw-r--r--x11-apps/xgc/metadata.xml5
-rw-r--r--x11-apps/xgc/xgc-1.0.4.ebuild15
-rw-r--r--x11-apps/xgc/xgc-1.0.5.ebuild15
-rw-r--r--x11-apps/xhost/Manifest2
-rw-r--r--x11-apps/xhost/metadata.xml5
-rw-r--r--x11-apps/xhost/xhost-1.0.6.ebuild21
-rw-r--r--x11-apps/xhost/xhost-1.0.7.ebuild21
-rw-r--r--x11-apps/xinit/Manifest2
-rw-r--r--x11-apps/xinit/files/00-xhost7
-rw-r--r--x11-apps/xinit/files/0001-Gentoo-customizations.patch61
-rw-r--r--x11-apps/xinit/files/Xsession107
-rw-r--r--x11-apps/xinit/files/Xsession.desktop8
-rw-r--r--x11-apps/xinit/files/chooser.sh52
-rw-r--r--x11-apps/xinit/files/startDM.sh31
-rw-r--r--x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch61
-rw-r--r--x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch21
-rw-r--r--x11-apps/xinit/files/xserverrc2
-rw-r--r--x11-apps/xinit/files/xserverrc.16
-rw-r--r--x11-apps/xinit/metadata.xml14
-rw-r--r--x11-apps/xinit/xinit-1.3.3-r1.ebuild67
-rw-r--r--x11-apps/xinit/xinit-1.3.3.ebuild67
-rw-r--r--x11-apps/xinit/xinit-1.3.4-r1.ebuild75
-rw-r--r--x11-apps/xinit/xinit-1.3.4.ebuild67
-rw-r--r--x11-apps/xinput/Manifest1
-rw-r--r--x11-apps/xinput/metadata.xml8
-rw-r--r--x11-apps/xinput/xinput-1.6.1.ebuild19
-rw-r--r--x11-apps/xinput_calibrator/Manifest1
-rw-r--r--x11-apps/xinput_calibrator/metadata.xml5
-rw-r--r--x11-apps/xinput_calibrator/xinput_calibrator-0.7.5.ebuild30
-rw-r--r--x11-apps/xkbcomp/Manifest2
-rw-r--r--x11-apps/xkbcomp/metadata.xml5
-rw-r--r--x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild15
-rw-r--r--x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild15
-rw-r--r--x11-apps/xkbevd/Manifest2
-rw-r--r--x11-apps/xkbevd/metadata.xml5
-rw-r--r--x11-apps/xkbevd/xkbevd-1.1.3.ebuild17
-rw-r--r--x11-apps/xkbevd/xkbevd-1.1.4.ebuild17
-rw-r--r--x11-apps/xkbprint/Manifest2
-rw-r--r--x11-apps/xkbprint/metadata.xml5
-rw-r--r--x11-apps/xkbprint/xkbprint-1.0.3.ebuild14
-rw-r--r--x11-apps/xkbprint/xkbprint-1.0.4.ebuild14
-rw-r--r--x11-apps/xkbset/Manifest1
-rw-r--r--x11-apps/xkbset/files/xkbset-0.5-ldflags.patch11
-rw-r--r--x11-apps/xkbset/metadata.xml10
-rw-r--r--x11-apps/xkbset/xkbset-0.5-r1.ebuild41
-rw-r--r--x11-apps/xkbutils/Manifest1
-rw-r--r--x11-apps/xkbutils/metadata.xml5
-rw-r--r--x11-apps/xkbutils/xkbutils-1.0.4.ebuild19
-rw-r--r--x11-apps/xkill/Manifest1
-rw-r--r--x11-apps/xkill/metadata.xml5
-rw-r--r--x11-apps/xkill/xkill-1.0.4.ebuild16
-rw-r--r--x11-apps/xload/Manifest1
-rw-r--r--x11-apps/xload/metadata.xml5
-rw-r--r--x11-apps/xload/xload-1.1.2.ebuild19
-rw-r--r--x11-apps/xlogo/Manifest1
-rw-r--r--x11-apps/xlogo/metadata.xml5
-rw-r--r--x11-apps/xlogo/xlogo-1.0.4.ebuild24
-rw-r--r--x11-apps/xlsatoms/Manifest2
-rw-r--r--x11-apps/xlsatoms/metadata.xml5
-rw-r--r--x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild14
-rw-r--r--x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild14
-rw-r--r--x11-apps/xlsclients/Manifest2
-rw-r--r--x11-apps/xlsclients/metadata.xml5
-rw-r--r--x11-apps/xlsclients/xlsclients-1.1.2.ebuild17
-rw-r--r--x11-apps/xlsclients/xlsclients-1.1.3.ebuild17
-rw-r--r--x11-apps/xlsfonts/Manifest2
-rw-r--r--x11-apps/xlsfonts/metadata.xml5
-rw-r--r--x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild14
-rw-r--r--x11-apps/xlsfonts/xlsfonts-1.0.5.ebuild14
-rw-r--r--x11-apps/xmag/Manifest2
-rw-r--r--x11-apps/xmag/metadata.xml5
-rw-r--r--x11-apps/xmag/xmag-1.0.5.ebuild18
-rw-r--r--x11-apps/xmag/xmag-1.0.6.ebuild18
-rw-r--r--x11-apps/xman/Manifest2
-rw-r--r--x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch60
-rw-r--r--x11-apps/xman/metadata.xml5
-rw-r--r--x11-apps/xman/xman-1.1.3-r1.ebuild22
-rw-r--r--x11-apps/xman/xman-1.1.3.ebuild18
-rw-r--r--x11-apps/xman/xman-1.1.4.ebuild22
-rw-r--r--x11-apps/xmessage/Manifest2
-rw-r--r--x11-apps/xmessage/metadata.xml5
-rw-r--r--x11-apps/xmessage/xmessage-1.0.3.ebuild16
-rw-r--r--x11-apps/xmessage/xmessage-1.0.4.ebuild16
-rw-r--r--x11-apps/xmodmap/Manifest2
-rw-r--r--x11-apps/xmodmap/metadata.xml5
-rw-r--r--x11-apps/xmodmap/xmodmap-1.0.8.ebuild15
-rw-r--r--x11-apps/xmodmap/xmodmap-1.0.9.ebuild15
-rw-r--r--x11-apps/xmore/Manifest1
-rw-r--r--x11-apps/xmore/metadata.xml5
-rw-r--r--x11-apps/xmore/xmore-1.0.2.ebuild17
-rw-r--r--x11-apps/xpr/Manifest1
-rw-r--r--x11-apps/xpr/metadata.xml5
-rw-r--r--x11-apps/xpr/xpr-1.0.4.ebuild13
-rw-r--r--x11-apps/xprop/Manifest1
-rw-r--r--x11-apps/xprop/metadata.xml5
-rw-r--r--x11-apps/xprop/xprop-1.2.2.ebuild16
-rw-r--r--x11-apps/xrandr/Manifest2
-rw-r--r--x11-apps/xrandr/metadata.xml5
-rw-r--r--x11-apps/xrandr/xrandr-1.4.1.ebuild22
-rw-r--r--x11-apps/xrandr/xrandr-1.4.3.ebuild22
-rw-r--r--x11-apps/xrdb/Manifest1
-rw-r--r--x11-apps/xrdb/metadata.xml8
-rw-r--r--x11-apps/xrdb/xrdb-1.1.0.ebuild15
-rw-r--r--x11-apps/xrefresh/Manifest1
-rw-r--r--x11-apps/xrefresh/metadata.xml5
-rw-r--r--x11-apps/xrefresh/xrefresh-1.0.5.ebuild14
-rw-r--r--x11-apps/xset/Manifest1
-rw-r--r--x11-apps/xset/metadata.xml5
-rw-r--r--x11-apps/xset/xset-1.2.3.ebuild23
-rw-r--r--x11-apps/xsetroot/Manifest1
-rw-r--r--x11-apps/xsetroot/metadata.xml5
-rw-r--r--x11-apps/xsetroot/xsetroot-1.1.1.ebuild17
-rw-r--r--x11-apps/xsm/Manifest1
-rw-r--r--x11-apps/xsm/metadata.xml8
-rw-r--r--x11-apps/xsm/xsm-1.0.3.ebuild33
-rw-r--r--x11-apps/xstdcmap/Manifest1
-rw-r--r--x11-apps/xstdcmap/metadata.xml5
-rw-r--r--x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild14
-rw-r--r--x11-apps/xtitle/Manifest2
-rw-r--r--x11-apps/xtitle/metadata.xml12
-rw-r--r--x11-apps/xtitle/xtitle-1.0.2.ebuild30
-rw-r--r--x11-apps/xtitle/xtitle-1.0.3.ebuild30
-rw-r--r--x11-apps/xtrap/Manifest1
-rw-r--r--x11-apps/xtrap/metadata.xml5
-rw-r--r--x11-apps/xtrap/xtrap-1.0.2-r1.ebuild14
-rw-r--r--x11-apps/xvidtune/Manifest2
-rw-r--r--x11-apps/xvidtune/metadata.xml5
-rw-r--r--x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild19
-rw-r--r--x11-apps/xvidtune/xvidtune-1.0.3.ebuild19
-rw-r--r--x11-apps/xvinfo/Manifest2
-rw-r--r--x11-apps/xvinfo/metadata.xml5
-rw-r--r--x11-apps/xvinfo/xvinfo-1.1.2.ebuild16
-rw-r--r--x11-apps/xvinfo/xvinfo-1.1.3.ebuild16
-rw-r--r--x11-apps/xwarppointer/Manifest1
-rw-r--r--x11-apps/xwarppointer/metadata.xml7
-rw-r--r--x11-apps/xwarppointer/xwarppointer-1-r2.ebuild37
-rw-r--r--x11-apps/xwd/Manifest1
-rw-r--r--x11-apps/xwd/metadata.xml5
-rw-r--r--x11-apps/xwd/xwd-1.0.6.ebuild19
-rw-r--r--x11-apps/xwininfo/Manifest2
-rw-r--r--x11-apps/xwininfo/metadata.xml5
-rw-r--r--x11-apps/xwininfo/xwininfo-1.1.2.ebuild25
-rw-r--r--x11-apps/xwininfo/xwininfo-1.1.3.ebuild25
-rw-r--r--x11-apps/xwud/Manifest1
-rw-r--r--x11-apps/xwud/metadata.xml5
-rw-r--r--x11-apps/xwud/xwud-1.0.4.ebuild15
368 files changed, 5658 insertions, 0 deletions
diff --git a/x11-apps/amlc/Manifest b/x11-apps/amlc/Manifest
new file mode 100644
index 00000000000..d5112ea1506
--- /dev/null
+++ b/x11-apps/amlc/Manifest
@@ -0,0 +1 @@
+DIST amlc-0.5.1.cpp 18007 SHA256 25640764341dea2bc259b20bdbc3500aff140528f7e3aff06fe66f06426ee405 SHA512 93fb63fe8b07f1dae16d90ea3995a28329e5e4d98ae28fe8028d65029612b4874824908a63a7898d8bc66568521306843504eb5f54a5c99cb529568e289022c8 WHIRLPOOL 135bc5e92f810f32691b776bf1f01bb9ee2b40cdcd9ab463444cd73980c4f941e2a59ccd1345bf07d8d114ff221aa347f1ba0715fdd72a9dab016b467dd930de
diff --git a/x11-apps/amlc/amlc-0.5.1.ebuild b/x11-apps/amlc/amlc-0.5.1.ebuild
new file mode 100644
index 00000000000..6b0f94cfe94
--- /dev/null
+++ b/x11-apps/amlc/amlc-0.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit toolchain-funcs
+
+DESCRIPTION="Another Modeline Calculator, generates quality X11 display configs easily"
+HOMEPAGE="http://sourceforge.net/projects/amlc.berlios/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.cpp"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+S=${WORKDIR}
+
+src_prepare() {
+ cp "${DISTDIR}"/${P}.cpp "${S}"
+}
+
+src_compile() {
+ $(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} ${P}.cpp -o ${PN} || die
+}
+
+src_install() {
+ dobin ${PN}
+}
diff --git a/x11-apps/amlc/metadata.xml b/x11-apps/amlc/metadata.xml
new file mode 100644
index 00000000000..540f810e069
--- /dev/null
+++ b/x11-apps/amlc/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>desktop-misc</herd>
+</pkgmetadata>
diff --git a/x11-apps/appres/Manifest b/x11-apps/appres/Manifest
new file mode 100644
index 00000000000..b7e796094e5
--- /dev/null
+++ b/x11-apps/appres/Manifest
@@ -0,0 +1 @@
+DIST appres-1.0.4.tar.bz2 117949 SHA256 9f614e9427cd9641a4a801ed5055700afa410674c0b7aa186b86078f11b83e8d SHA512 f07e672bd335308e58495685e5e7748684283aac28a96ea716edefe99ff281ec1f9b264e853ec0ce0f64cf54d9208d70dd3112a5a4219e0a38bfdc0fab8c9d98 WHIRLPOOL 12cecb82f647468473a7e3ef1477255e588e1752dd54d3cf702dbb579cc2024fe52c451e6f6edccf6a274ae0a2035fe0cc05e17657dfd07b1059dd26e1a6a914
diff --git a/x11-apps/appres/appres-1.0.4.ebuild b/x11-apps/appres/appres-1.0.4.ebuild
new file mode 100644
index 00000000000..b38794336bc
--- /dev/null
+++ b/x11-apps/appres/appres-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="list X application resource database"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/appres/metadata.xml b/x11-apps/appres/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/appres/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-apps/ardesia/Manifest b/x11-apps/ardesia/Manifest
new file mode 100644
index 00000000000..66242c315e0
--- /dev/null
+++ b/x11-apps/ardesia/Manifest
@@ -0,0 +1 @@
+DIST ardesia-1.0.tar.bz2 2831274 SHA256 6386ef36353220951d0f6c891df62976e171c359fad99451cd017e3c79b8ef32 SHA512 cbd3a95cd8a628830f79d9920dd7a58af295fbc335648f4bdaf720cbcc8d87a74da52195649b54f3b651aa52b4d655505f47d081511468caabace21e40481e00 WHIRLPOOL bb40783111fca1f3bb5a3ddf4ebab72bf5b073b836d2afd8681bc00bb5c1c6b23002ca0acc80680e5ac2dafb0c7c7770950d468edc64f05b8d58c843e9b08d90
diff --git a/x11-apps/ardesia/ardesia-1.0.ebuild b/x11-apps/ardesia/ardesia-1.0.ebuild
new file mode 100644
index 00000000000..9ceffa501eb
--- /dev/null
+++ b/x11-apps/ardesia/ardesia-1.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+HOMEPAGE="http://code.google.com/p/ardesia/"
+SRC_URI="http://ardesia.googlecode.com/files/${P}.tar.bz2"
+DESCRIPTION="Color, record and share free-hand annotations on screen and on network"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cwiid"
+
+RDEPEND="dev-libs/atk
+ dev-libs/libsigsegv
+ media-libs/fontconfig
+ media-libs/libpng
+ sci-libs/gsl
+ sys-devel/gettext
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ gnome-extra/libgsf
+ cwiid? ( app-misc/cwiid )"
+DEPEND="${RDEPEND}
+ x11-misc/xdg-utils"
+
+src_install() {
+ emake DESTDIR="${D}" ardesiadocdir="/usr/share/doc/${P}" install || die "make install ardesia failed"
+}
+
+pkg_postinst() {
+ elog "Ardesia requires a Composite Manager, such as Compiz"
+ elog "Metacity with compositing, Kwin, etc in order to run"
+ echo
+}
diff --git a/x11-apps/ardesia/metadata.xml b/x11-apps/ardesia/metadata.xml
new file mode 100644
index 00000000000..1ab49764512
--- /dev/null
+++ b/x11-apps/ardesia/metadata.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>proxy-maintainers</herd>
+<maintainer>
+ <email>ziapannocchia@gmail.com</email>
+ <name>Marco Clocchiatti</name>
+ <description>Proxy maintainer. CC him on bugs</description>
+</maintainer>
+<longdescription lang="en">
+Ardesia enables you to make colored free-hand annotations on your computer screen,
+record it and share on the network.
+</longdescription>
+<use>
+ <flag name="cwiid">
+ cwiid support: collection of Linux tools written in C for interfacing to
+ the Nintendo Wiimote.
+ </flag>
+</use>
+<upstream>
+ <maintainer status="active">
+ <email>alpha@paranoici.org</email>
+ <name>Pietro Pilloli</name>
+ </maintainer>
+ <changelog>http://code.google.com/p/ardesia/source/list</changelog>
+ <doc>http://code.google.com/p/ardesia/wiki/FAQ</doc>
+ <bugs-to>http://code.google.com/p/ardesia/issues/list</bugs-to>
+ <remote-id type="google-code">http://code.google.com/p/ardesia</remote-id>
+</upstream>
+</pkgmetadata>
+
diff --git a/x11-apps/bdftopcf/Manifest b/x11-apps/bdftopcf/Manifest
new file mode 100644
index 00000000000..dca685eabfa
--- /dev/null
+++ b/x11-apps/bdftopcf/Manifest
@@ -0,0 +1,2 @@
+DIST bdftopcf-1.0.4.tar.bz2 116380 SHA256 eaf59057ba3d7cffe29526562ce50868da7da823487a4cfb3e16946e5ffd2798 SHA512 af18bd3a68d4811ab70f69fa7e871ca87650a4a28e13567db5ed40cba6a0c8006928ad5828dcc16a624bc38917f53bcf7470f3b1b3b2fca0379ecf03114a3a52 WHIRLPOOL ce7115361d65d2df657ee134b6090dc7394e54909de93bfc961ce0ab3e63bd73d9321f412f998ab86b04f8416b6d0a2d266c8632047f826b63223f2fc0e6aa74
+DIST bdftopcf-1.0.5.tar.bz2 123291 SHA256 38f447be0c61f94c473f128cf519dd0cff63b5d7775240a2e895a183a61e2026 SHA512 9c6a156c8932579ee37699efaee3b1421d04d55ca0a62ca850a69cc65c21c7d9366b5a090b6a40e927504df16fecfdb484606052adc1038ca25e797f7e8c86c3 WHIRLPOOL 6cc6ac1099a98e35ff1c6ff6d410f6e2c33c812c637517b6e8c32c6f041f56364b5b826d25f7b67bca581c9e8cee408b123dcabb49494556948e822aa7f0376e
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild
new file mode 100644
index 00000000000..613f2aa81b7
--- /dev/null
+++ b/x11-apps/bdftopcf/bdftopcf-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org bdftopcf application"
+
+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="x11-libs/libXfont"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild b/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild
new file mode 100644
index 00000000000..07b7c68d0db
--- /dev/null
+++ b/x11-apps/bdftopcf/bdftopcf-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org bdftopcf application"
+
+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="x11-libs/libXfont"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/bdftopcf/metadata.xml b/x11-apps/bdftopcf/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/bdftopcf/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-apps/beforelight/Manifest b/x11-apps/beforelight/Manifest
new file mode 100644
index 00000000000..84ec6a45149
--- /dev/null
+++ b/x11-apps/beforelight/Manifest
@@ -0,0 +1 @@
+DIST beforelight-1.0.5.tar.bz2 119358 SHA256 8fcab6f15148ca680c0d3da8de7dcb41f8e6a076f442cf8bdcf272be9e348166 SHA512 f6cc794159cda89ac060a43d190fa72419dbcf503a97093b4c0f05315389085ff804c2891e00da2843709e97633973010165f9d68ceb0dcc76eed150f9c75968 WHIRLPOOL 85b1df978f3a687c6103d7f02c7353bbe2a7db7793371af293e97929dfe2b0aae325d7fd3a9fda3e1e89eca8ee9f8e788fe4089e22f081a7468cc6c343707a95
diff --git a/x11-apps/beforelight/beforelight-1.0.5.ebuild b/x11-apps/beforelight/beforelight-1.0.5.ebuild
new file mode 100644
index 00000000000..5093e6231e3
--- /dev/null
+++ b/x11-apps/beforelight/beforelight-1.0.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Sample implementation of screen saver"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libXScrnSaver
+ x11-libs/libXt
+ x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/beforelight/metadata.xml b/x11-apps/beforelight/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/beforelight/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-apps/bitmap/Manifest b/x11-apps/bitmap/Manifest
new file mode 100644
index 00000000000..060627bc667
--- /dev/null
+++ b/x11-apps/bitmap/Manifest
@@ -0,0 +1,2 @@
+DIST bitmap-1.0.7.tar.bz2 169437 SHA256 7ea2823a930ddfe3bfc0c7fbb16a5b463222edf05284c5cdc40a6d3c5c3988af SHA512 4f445879e301910f3a9503ba1d2a88974848b35a0b66a57061d8d45a5d27441d30fe3c3cdedd9b637cef2f3f77a8b81786c2ecaff3f6884364037f1aaa69cd30 WHIRLPOOL 3fde660525e1cdb111867e255260ca85e13c142295557a35ab863db6e63e3343b4070e0da7af0ae0d9569119f46aaf3b8325794d9859907fc9b4885a441b1970
+DIST bitmap-1.0.8.tar.bz2 177558 SHA256 806cdeb80f5466ba9121e8cc6c6af82d3e4b32ef1a57bc5a76c15887640ec35d SHA512 caa9f112254d59b3d0ad2d455dd8a896923250984f82135b8b7bf79a8645aff2e1a1c4cae6c8b1ba0cb2fcd89c4a6724091cb8c50b22d6524a53cca64585e303 WHIRLPOOL db828f8daed407313a5d8516173d32d286b05c9428b101904bfddd6d90bb1800032dc98fdb78ac2de8538ace43a513f264f2d7163720e8ee6fe65aa508b5a1ad
diff --git a/x11-apps/bitmap/bitmap-1.0.7.ebuild b/x11-apps/bitmap/bitmap-1.0.7.ebuild
new file mode 100644
index 00000000000..9fcba1238f3
--- /dev/null
+++ b/x11-apps/bitmap/bitmap-1.0.7.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org bitmap application"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXaw
+ x11-libs/libXt
+ x11-misc/xbitmaps"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/bitmap/bitmap-1.0.8.ebuild b/x11-apps/bitmap/bitmap-1.0.8.ebuild
new file mode 100644
index 00000000000..1c8d47e3ab8
--- /dev/null
+++ b/x11-apps/bitmap/bitmap-1.0.8.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org bitmap application"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXaw
+ x11-libs/libXt
+ x11-misc/xbitmaps"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/bitmap/metadata.xml b/x11-apps/bitmap/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/bitmap/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-apps/ccsm/Manifest b/x11-apps/ccsm/Manifest
new file mode 100644
index 00000000000..888f47b19e7
--- /dev/null
+++ b/x11-apps/ccsm/Manifest
@@ -0,0 +1 @@
+DIST ccsm-0.8.4.tar.bz2 475864 SHA256 46b9da032cf29e71aec0823799861d926937ad41f4edea3be718ac6a8532c16d SHA512 1991f25ca4f04363006bacd5267cb54c7e24817b263996c7172f58180ca0acf94050220938d4fa87081c93fde23ca0b44a333f9b675950e4c5187903a03692c5 WHIRLPOOL a6730161d07a8c5158700566df31653a7adcf117e791a5b4076b67b68a4ce4c7ff3f88a5710c1fce29d38eccbbade095710f5a73277c54809e5431b3c52c1fe0
diff --git a/x11-apps/ccsm/ccsm-0.8.4-r4.ebuild b/x11-apps/ccsm/ccsm-0.8.4-r4.ebuild
new file mode 100644
index 00000000000..9bc964a048b
--- /dev/null
+++ b/x11-apps/ccsm/ccsm-0.8.4-r4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+DESCRIPTION="Compizconfig Settings Manager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ >=dev-python/compizconfig-python-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
+ gnome-base/librsvg
+"
+
+DOCS=( AUTHORS )
+
+python_prepare_all() {
+ # return error if wrong arguments passed to setup.py
+ sed -i -e 's/raise SystemExit/\0(1)/' setup.py || die 'sed on setup.py failed'
+ # fix desktop file
+ sed -i \
+ -e '/Categories/s/Compiz/X-\0/' \
+ -e '/Encoding/d' \
+ ccsm.desktop.in || die 'sed on ccsm.desktop.in failed'
+
+ # correct gettext behavior
+ if [[ -n "${LINGUAS+x}" ]] ; then
+ for i in $(cd po ; echo *po | sed 's/\.po//g') ; do
+ if ! has ${i} ${LINGUAS} ; then
+ rm po/${i}.po || die
+ fi
+ done
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ #set prefix
+ mydistutilsargs=( build --prefix=/usr )
+}
diff --git a/x11-apps/ccsm/ccsm-0.8.4-r5.ebuild b/x11-apps/ccsm/ccsm-0.8.4-r5.ebuild
new file mode 100644
index 00000000000..dc9ec7f0795
--- /dev/null
+++ b/x11-apps/ccsm/ccsm-0.8.4-r5.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1
+
+DESCRIPTION="Compizconfig Settings Manager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+ >=dev-python/compizconfig-python-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
+ gnome-base/librsvg
+"
+
+# missing icons and text fix, bug #487106
+PATCHES=( "${FILESDIR}/${P}-pygobject-glib-fix.patch" )
+
+DOCS=( AUTHORS )
+
+python_prepare_all() {
+ # return error if wrong arguments passed to setup.py
+ sed -i -e 's/raise SystemExit/\0(1)/' setup.py || die 'sed on setup.py failed'
+ # fix desktop file
+ sed -i \
+ -e '/Categories/s/Compiz/X-\0/' \
+ -e '/Encoding/d' \
+ ccsm.desktop.in || die 'sed on ccsm.desktop.in failed'
+
+ # correct gettext behavior
+ if [[ -n "${LINGUAS+x}" ]] ; then
+ for i in $(cd po ; echo *po | sed 's/\.po//g') ; do
+ if ! has ${i} ${LINGUAS} ; then
+ rm po/${i}.po || die
+ fi
+ done
+ fi
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ #set prefix
+ mydistutilsargs=( build --prefix=/usr )
+}
diff --git a/x11-apps/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch b/x11-apps/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch
new file mode 100644
index 00000000000..9b325af7f34
--- /dev/null
+++ b/x11-apps/ccsm/files/ccsm-0.8.4-pygobject-glib-fix.patch
@@ -0,0 +1,16 @@
+Fix missing icon and text with new PyGObject
+Gentoo bugreport - https://bugs.gentoo.org/show_bug.cgi?id=487106
+Patch by Small_Penguin <dark.shadow AT gmx.at>
+
+diff -Naur ccsm-0.8.4~/ccm/Utils.py ccsm-0.8.4/ccm/Utils.py
+--- ccsm-0.8.4~/ccm/Utils.py 2009-10-14 03:05:30.000000000 +0200
++++ ccsm-0.8.4/ccm/Utils.py 2013-10-05 10:16:10.050030522 +0200
+@@ -184,7 +184,7 @@
+ if has_focus:
+ self.unset_flags (gtk.HAS_FOCUS)
+
+- ret = super (PrettyButton, self).do_expose_event (self, event)
++ ret = gtk.Button.do_expose_event (self, event)
+
+ if has_focus:
+ self.set_flags (gtk.HAS_FOCUS)
diff --git a/x11-apps/ccsm/metadata.xml b/x11-apps/ccsm/metadata.xml
new file mode 100644
index 00000000000..9472ccd2469
--- /dev/null
+++ b/x11-apps/ccsm/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-effects</herd>
+<longdescription lang="en">Compizconfig Settings Manager.</longdescription>
+</pkgmetadata>
diff --git a/x11-apps/editres/Manifest b/x11-apps/editres/Manifest
new file mode 100644
index 00000000000..9bf20bec448
--- /dev/null
+++ b/x11-apps/editres/Manifest
@@ -0,0 +1 @@
+DIST editres-1.0.6.tar.bz2 156155 SHA256 3b66d1240bde853872bbb341c4b8fb029094d0a5d21347a58831f15b162c4df0 SHA512 c070709ce926802696d43d27256cea125c04021ad7555e1ea6c90650bf9e9fdd8da7786ebc99d6cf6a2dac73db041d489d34e6b2f6ceb6b396b6e96711b1c510 WHIRLPOOL 434b7520e2474d72ab8a51ebfdaba5bdce3eaf6aee03c44c73ad60b6b4e0a4436687328ad638aa7b7b08464f67b6321a09fb45cddc54710a4867ffa47b428704
diff --git a/x11-apps/editres/editres-1.0.6.ebuild b/x11-apps/editres/editres-1.0.6.ebuild
new file mode 100644
index 00000000000..2643f252ed8
--- /dev/null
+++ b/x11-apps/editres/editres-1.0.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="a dynamic resource editor for X Toolkit applications"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/editres/metadata.xml b/x11-apps/editres/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/editres/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-apps/fonttosfnt/Manifest b/x11-apps/fonttosfnt/Manifest
new file mode 100644
index 00000000000..07018cb548e
--- /dev/null
+++ b/x11-apps/fonttosfnt/Manifest
@@ -0,0 +1 @@
+DIST fonttosfnt-1.0.4.tar.bz2 106121 SHA256 3feaaab499b3f9c7e9b8bdc725dd40fde65b2fbb73794845d7f682746470f594
diff --git a/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild b/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
new file mode 100644
index 00000000000..885d7b4904e
--- /dev/null
+++ b/x11-apps/fonttosfnt/fonttosfnt-1.0.4-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org fonttosfnt application"
+KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ =media-libs/freetype-2*
+ x11-libs/libfontenc"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fonttosfnt/metadata.xml b/x11-apps/fonttosfnt/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/fonttosfnt/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-apps/fslsfonts/Manifest b/x11-apps/fslsfonts/Manifest
new file mode 100644
index 00000000000..4a48f875a11
--- /dev/null
+++ b/x11-apps/fslsfonts/Manifest
@@ -0,0 +1,2 @@
+DIST fslsfonts-1.0.4.tar.bz2 117901 SHA256 a38072eebfd195478ea673ebef33c8df0f6f571c5fe19d85248fe9b532d6921c SHA512 85619bd66389670c520f2bff495f574c73f17794e7fa4491f27f51f768a4800709b87c467c1f830ca1453ca4bfe1c00126f5e873d6fd128de22063d8ffcbb8b9 WHIRLPOOL 955f9a67b3d1a36c26a62300af2bf620121f248278184361e6a5b6c11b74d090dbe239ffec87cf2b888297eab2b26410dffb253c5e14feaac7306496f5499418
+DIST fslsfonts-1.0.5.tar.bz2 125650 SHA256 f1ed55093356b78daec2678d22f52d42ec11fe88575562d734396962e626d7f6 SHA512 3a30598ace981c7396bfe44f0d8f76d40fca3f77158dceb3914a524594a12187dcad0b0f225fa81f251f0b7896bf046cec4ba610b4676da9be311eec5d8c6cc2 WHIRLPOOL 4ffc0d78701c81fd0bfd7f58bda98fb840002614fa276c6bf18a1cc03bad1ffc75ecdceecc4c6bc22e0b29c02c1b21fd6e789fe109e6fc7adb8fee4568ca40df
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild
new file mode 100644
index 00000000000..62c4743d235
--- /dev/null
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="list fonts served by X font server"
+KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-proto/xproto
+ x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild b/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild
new file mode 100644
index 00000000000..f36342aefd4
--- /dev/null
+++ b/x11-apps/fslsfonts/fslsfonts-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="list fonts served by X font server"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-proto/xproto
+ x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fslsfonts/metadata.xml b/x11-apps/fslsfonts/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/fslsfonts/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-apps/fstobdf/Manifest b/x11-apps/fstobdf/Manifest
new file mode 100644
index 00000000000..c6601b99e76
--- /dev/null
+++ b/x11-apps/fstobdf/Manifest
@@ -0,0 +1,2 @@
+DIST fstobdf-1.0.5.tar.bz2 119822 SHA256 9c44ef069174ec501fa848fe0dfa41c06c2367df84721e94b3bca670608f15a8 SHA512 662ceda5771247535873aca66f8cac5cec9673da1b627ddfb4d56ac854f56fee467a339502885a961b1906b913095cfa6135f337363983c0e971eba48cd0987c WHIRLPOOL 0b4b01ed41f6cbbe74490e61d5227a5102b0a450284ad5c856227f1c6601d7fe26a1f9a204c78a3cf82e79a4f06aa5d61650b7cda3466b40533cbf137e570114
+DIST fstobdf-1.0.6.tar.bz2 127170 SHA256 66cf550326c993e7043f260a8ec4a533a3bf9d8f0e7397a6fe9cca803732e92e SHA512 ec5b8f62019ba51725bb47241d4fc244412f354e7c12094ed884109a88e3db9d25d41a6142fd002e6c49877b4c7f2c5dde549682dcc05f7ce102621d2c71671f WHIRLPOOL 6b435bb348de466da64930bbe41352d38f1054698e955d2d958d214668c8e0f3d7d0c21a0c87d67006f5d0005e004ee9df1e685dd2ef60fe011e23757c2d9be3
diff --git a/x11-apps/fstobdf/fstobdf-1.0.5.ebuild b/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
new file mode 100644
index 00000000000..37af2dc7274
--- /dev/null
+++ b/x11-apps/fstobdf/fstobdf-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="generate BDF font from X font server"
+KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fstobdf/fstobdf-1.0.6.ebuild b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
new file mode 100644
index 00000000000..f0f9e96cc5a
--- /dev/null
+++ b/x11-apps/fstobdf/fstobdf-1.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="generate BDF font from X font server"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/fstobdf/metadata.xml b/x11-apps/fstobdf/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/fstobdf/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-apps/fusion-icon/Manifest b/x11-apps/fusion-icon/Manifest
new file mode 100644
index 00000000000..e6d452d5973
--- /dev/null
+++ b/x11-apps/fusion-icon/Manifest
@@ -0,0 +1 @@
+DIST fusion-icon-0.1.tar.gz 30508 SHA256 2e6757fd4fb8ed7d1640fcabfbe10a39f36cf41504eda0dd13605db70273fe79 SHA512 0c22d0c7a22a9c20f1285114f8b785aff6cf863d4fe3ea1198618b13d7144f459f131dccf885442908fcd82ab4ff69e5fc42e95314836725b0e51fa3190c2bcc WHIRLPOOL 7534f46df3965aa963a95b4ec796c5ef99980c9640a6d0ced6a542d5b22430b9c996d11236bbdf1c8f9f9b00bcf4346e9aaca85da571a81c16777c4e33b3b719
diff --git a/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch b/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch
new file mode 100644
index 00000000000..4829e18e60e
--- /dev/null
+++ b/x11-apps/fusion-icon/files/fusion-icon-0.1-qt4-interface-subprocess-call.patch
@@ -0,0 +1,22 @@
+--- FusionIcon/interface_qt4/main.py.orig 2012-06-05 17:54:13.000000000 +0400
++++ FusionIcon/interface_qt4/main.py 2012-06-05 18:01:13.000000000 +0400
+@@ -19,6 +19,7 @@
+ import sys, os, time
+ from PyQt4 import QtGui, QtCore
+ from FusionIcon.start import wms, apps, options, decorators, init
++import subprocess
+
+ class Build(QtGui.QApplication):
+ def reload_wm(self):
+@@ -63,9 +64,9 @@
+ actionWD.setChecked(True)
+ self.Tray.menu = QtGui.QMenu()
+ if 'ccsm' in apps:
+- self.Tray.menu.addAction(apps['ccsm'].label, lambda: run(['ccsm']))
++ self.Tray.menu.addAction(apps['ccsm'].label, lambda: subprocess.call(['ccsm']))
+ if 'emerald theme manager' in apps:
+- self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: run(apps['emerald theme manager'].command))
++ self.Tray.menu.addAction(apps['emerald theme manager'].label, lambda: subprocess.call(apps['emerald theme manager'].command))
+ if 'ccsm' in apps or 'emerald theme manager' in apps:
+ self.Tray.menu.addSeparator()
+ self.Tray.menu.addAction("Reload Window Manager", self.reload_wm)
diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild
new file mode 100644
index 00000000000..79515c6a803
--- /dev/null
+++ b/x11-apps/fusion-icon/fusion-icon-0.1-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit distutils gnome2-utils
+
+MINIMUM_COMPIZ_RELEASE=0.6.0
+
+DESCRIPTION="Compiz Fusion Tray Icon and Manager"
+HOMEPAGE="http://compiz.org"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk qt4"
+
+REQUIRED_USE="|| ( gtk qt4 )"
+
+RDEPEND="
+ >=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE}
+ >=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE}
+ x11-apps/xvinfo
+ gtk? ( >=dev-python/pygtk-2.10:2 )
+ qt4? ( dev-python/PyQt4[X] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PYTHON_MODNAME="FusionIcon"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_install() {
+ distutils_src_install
+
+ use gtk || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_gtk"
+ use qt4 || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_qt4"
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+
+ use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ distutils_pkg_postrm
+
+ use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild
new file mode 100644
index 00000000000..2c1bf38c376
--- /dev/null
+++ b/x11-apps/fusion-icon/fusion-icon-0.1-r3.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+PYTHON_DEPEND="2"
+
+inherit distutils eutils gnome2-utils
+
+MINIMUM_COMPIZ_RELEASE=0.6.0
+
+DESCRIPTION="Compiz Fusion Tray Icon and Manager"
+HOMEPAGE="http://compiz.org"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk qt4"
+
+REQUIRED_USE="|| ( gtk qt4 )"
+
+RDEPEND="
+ >=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE}
+ >=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE}
+ x11-apps/xvinfo
+ gtk? ( >=dev-python/pygtk-2.10:2 )
+ qt4? ( dev-python/PyQt4[X] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PYTHON_MODNAME="FusionIcon"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-qt4-interface-subprocess-call.patch
+ distutils_src_prepare
+}
+
+src_install() {
+ distutils_src_install
+
+ use gtk || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_gtk"
+ use qt4 || rm -fr "${ED}$(python_get_sitedir)/FusionIcon/interface_qt4"
+}
+
+pkg_postinst() {
+ distutils_pkg_postinst
+
+ use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ distutils_pkg_postrm
+
+ use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild b/x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild
new file mode 100644
index 00000000000..c61d9f1e9c9
--- /dev/null
+++ b/x11-apps/fusion-icon/fusion-icon-0.1-r4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils gnome2-utils
+
+MINIMUM_COMPIZ_RELEASE=0.6.0
+
+DESCRIPTION="Compiz Fusion Tray Icon and Manager"
+HOMEPAGE="http://compiz.org"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk qt4"
+
+REQUIRED_USE="|| ( gtk qt4 )"
+
+RDEPEND="
+ >=dev-python/compizconfig-python-${MINIMUM_COMPIZ_RELEASE}
+ >=x11-wm/compiz-${MINIMUM_COMPIZ_RELEASE}
+ x11-apps/xvinfo
+ gtk? ( >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] )
+ qt4? ( dev-python/PyQt4[X,${PYTHON_USEDEP}] )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+PATCHES=( "${FILESDIR}"/${P}-qt4-interface-subprocess-call.patch )
+
+python_install() {
+ distutils-r1_python_install
+ use gtk || rm -r "${D}$(python_get_sitedir)/FusionIcon/interface_gtk" || die
+ use qt4 || rm -r "${D}$(python_get_sitedir)/FusionIcon/interface_qt4" || die
+}
+
+pkg_postinst() {
+ use gtk && gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ use gtk && gnome2_icon_cache_update
+}
diff --git a/x11-apps/fusion-icon/metadata.xml b/x11-apps/fusion-icon/metadata.xml
new file mode 100644
index 00000000000..b19d78282b3
--- /dev/null
+++ b/x11-apps/fusion-icon/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-effects</herd>
+<longdescription lang="en">Compiz Fusion Tray Icon and Manager.</longdescription>
+</pkgmetadata>
diff --git a/x11-apps/iceauth/Manifest b/x11-apps/iceauth/Manifest
new file mode 100644
index 00000000000..0a7c9233210
--- /dev/null
+++ b/x11-apps/iceauth/Manifest
@@ -0,0 +1,2 @@
+DIST iceauth-1.0.6.tar.bz2 133531 SHA256 bd990837353b439e6f45d478a87b8dbfa3f67d72d903e7a9ed4eb8de52f2e2f4 SHA512 45a89d9742570f837225313032a63d66e658c379e7f6b776836e5aeed17443b26faa48ff23645517bf32353fb346de13b62c61d43f1fb1b044686d9fd4c4578d WHIRLPOOL 55782babd470118313617f0658ab0e97809a6135e6fdbf0d74671b797eccf65ece8bb1d4119fe2e280c83ba1a67fe6eaaeb3ac4523e13c22d47fb03553e0e494
+DIST iceauth-1.0.7.tar.bz2 135656 SHA256 1216af2dee99b318fcf8bf9a259915273bcb37a7f1e7859af4f15d0ebf6f3f0a SHA512 4fe08b3137904c99219456716879cbdf5b49ca9bf390011ffb44b1e896f9a6e008b5f761346a533e682f5cfbf18d18a859c74ad4268ec8d40002ffb79c33bcd7 WHIRLPOOL d52d4b027f0590f7435457b1e2930575f3b2344a589a1f57a5db81549267cae93f68d09a1f362bf9ba4c1b7d9b1d8dd39a921c245d5f1178090862b421b3074e
diff --git a/x11-apps/iceauth/iceauth-1.0.6.ebuild b/x11-apps/iceauth/iceauth-1.0.6.ebuild
new file mode 100644
index 00000000000..2f965c323b0
--- /dev/null
+++ b/x11-apps/iceauth/iceauth-1.0.6.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="ICE authority file utility"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~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"
diff --git a/x11-apps/iceauth/iceauth-1.0.7.ebuild b/x11-apps/iceauth/iceauth-1.0.7.ebuild
new file mode 100644
index 00000000000..033c58481fb
--- /dev/null
+++ b/x11-apps/iceauth/iceauth-1.0.7.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="ICE authority file utility"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~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"
diff --git a/x11-apps/iceauth/metadata.xml b/x11-apps/iceauth/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/iceauth/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-apps/ico/Manifest b/x11-apps/ico/Manifest
new file mode 100644
index 00000000000..c43ce7aeebf
--- /dev/null
+++ b/x11-apps/ico/Manifest
@@ -0,0 +1 @@
+DIST ico-1.0.4.tar.bz2 127619 SHA256 2932767098f95ca129a0c7f0fecb0a18c789a79c1747f7423fdfe9f4e0c53590 SHA512 f7200fc04e7d0442215a3fe1f53456fe6bcd14eb2e2fd048cbe7f5700ad28e10ea8ef72ab98d3cd232c801b037fdac5ac4367ba98484f2912de0715a23f82e5d WHIRLPOOL 26dc20e91710a583cdb0963639402cd63f4726492b951a10f5ec6299ec014a72cb11ce18a7aab7fbf0dd36b2b3ae998bf85d28461c5bc98208591a5f4e559627
diff --git a/x11-apps/ico/ico-1.0.4.ebuild b/x11-apps/ico/ico-1.0.4.ebuild
new file mode 100644
index 00000000000..198a635d831
--- /dev/null
+++ b/x11-apps/ico/ico-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="animate an icosahedron or other polyhedron"
+KEYWORDS="amd64 arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/ico/metadata.xml b/x11-apps/ico/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/ico/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-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
new file mode 100644
index 00000000000..f8b3cc64492
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -0,0 +1,3 @@
+DIST intel-gpu-tools-1.10.tar.bz2 1501523 SHA256 6df2bef12d7cd252d702e4412937fbdc48fa954dd5f7f6988f567912f63b9874 SHA512 b6d5e2b377534a2132a22e22af5786086360646ea6d788b863e7424dd68898c6e35c31c2620f4301b00659cea56aa5739609781d8324c04929bba367f61fc8da WHIRLPOOL 916d97f24972fc9f3dad52b80193921e2fff309345d7c977d9bee89d0f03db361ce167c52eaeda311ba87d4de11a4bdc1824ed27c79bf11a64581ecb085ef5bf
+DIST intel-gpu-tools-1.11.tar.bz2 1586385 SHA256 48823450452b57c52c74e00c8c763ed7cdd0c81cc877e8c2f619f7f6c45dade4 SHA512 4d36240dbc5b40ba452d49a7d7af9512f8ace923a2f87bfb3d6bec32053390e672308f1bac0dc5f83ff5430ad9806a9f5e487ca2b27ac4bc941de2c21fd5826f WHIRLPOOL d443b48b32b0101b6e0a3767933d910619ee02a6c082c026034ec5d814bbd121f370566e6a09a283988a24e955f4d0aa02829764ade766d25a4e6008947a3db3
+DIST intel-gpu-tools-1.7.tar.bz2 11780573 SHA256 22612343bbd9b518b9f92a983555dbbcae8040ee577a38277dbf873c8900207a SHA512 13181db6d2424fa27c97c30ecb83b8554fc2e9ce98bec7b7735f919aa9d7e2563c3e1860dc6e5aedf3918c029acb205b8fcf6a32de1567f557f8cd98c09a5d98 WHIRLPOOL f66e0710377aa4f46067840efd1cf70814e10cd81ff24ebb5db21b901787846f63b1461502ec01ba7383ead76e985c25860801355a9582d5509a861fa70aacb0
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.10-clang.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.10-clang.patch
new file mode 100644
index 00000000000..2f7b7a2c1ba
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.10-clang.patch
@@ -0,0 +1,44 @@
+fix from upstream for building w/clang
+
+From 95019c2a3c4ed5943ad16e17c8dcf36fd6492adc Mon Sep 17 00:00:00 2001
+From: Yunlian Jiang <yunlian@google.com>
+Date: Tue, 26 May 2015 10:22:31 -0700
+Subject: [PATCH] debugger: remove unnecessary struct per_thread_data
+
+This removes unnecessary 'struct per_thread_data' and avoids the
+compilation error 'variable length array in structure extension
+will never be supported' by clang. The bug entry is
+https://code.google.com/p/chromium/issues/detail?id=476001
+
+Cc: Benjamin Widawsky <benjamin.widawsky@intel.com>
+Cc: Thomas Wood <thomas.wood@intel.com>
+Signed-off-by: Yunlian Jiang <yunlian@google.com>
+Signed-off-by: Thomas Wood <thomas.wood@intel.com>
+---
+ debugger/eudb.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/debugger/eudb.c b/debugger/eudb.c
+index 0e810db..39c5cca 100644
+--- a/debugger/eudb.c
++++ b/debugger/eudb.c
+@@ -207,15 +207,11 @@ wait_for_attn(int timeout, int *out_bits) {
+ #define eu_tid(bit) eu_info->debuggees[bit].tid
+ static struct eu_state *
+ find_eu_shmem(int bit, volatile uint8_t *buf) {
+- struct per_thread_data {
+- uint8_t ____[dh.per_thread_scratch];
+- }__attribute__((packed)) *data;
+ struct eu_state *eu;
+ int mem_tid, mem_euid, i;
+
+- data = (struct per_thread_data *)buf;
+ for(i = 0; i < eu_info->num_threads; i++) {
+- eu = (struct eu_state *)&data[i];
++ eu = (struct eu_state *)(buf + i * dh.per_thread_scratch);
+ mem_tid = eu->sr0 & 0x7;
+ mem_euid = (eu->sr0 >> 8) & 0xf;
+ if (mem_tid == eu_tid(bit) && mem_euid == eu_id(bit))
+--
+2.4.1
+
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch
new file mode 100644
index 00000000000..3b87f69ac59
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch
@@ -0,0 +1,37 @@
+From e9e9df216180bcecc5d4c17bbe48b2efd88b3ed2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Mon, 18 Aug 2014 00:44:32 +0200
+Subject: [PATCH] shader-debugger: Force file/stdout IO as UTF-8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Not all locales on linux are UTF-8, the most notable being the C locale.
+Python will use the ASCII codec for stream IO in this case and will barf
+on the Copyright sign at the top of .g4a files.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519434
+Signed-off-by: Rémi Cardona <remi@gentoo.org>
+---
+ debugger/system_routine/pre_cpp.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/debugger/system_routine/pre_cpp.py b/debugger/system_routine/pre_cpp.py
+index effea0e..584d2af 100755
+--- a/debugger/system_routine/pre_cpp.py
++++ b/debugger/system_routine/pre_cpp.py
+@@ -33,7 +33,10 @@
+
+ import sys,re
+
+-file = open(sys.argv[1], "r")
++# make sure both input file and stdout are handled as utf-8 text, regardless
++# of current locale (eg. LANG=C which tells python to use ascii encoding)
++sys.stdout = open(sys.__stdout__.fileno(), "a", encoding="utf-8")
++file = open(sys.argv[1], "r", encoding="utf-8")
+
+ lines = file.readlines()
+ len(lines)
+--
+2.0.4
+
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
new file mode 100644
index 00000000000..e0296a17a12
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+KEYWORDS="~amd64 ~x86"
+IUSE="python test-programs video_cards_nouveau"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+DEPEND="dev-libs/glib:2
+ >=x11-libs/cairo-1.12.0
+ >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?]
+ >=x11-libs/libpciaccess-0.10
+ python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-clang.patch" )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable python dumper)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable test-programs tests)
+ )
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+ if use test-programs; then
+ local testprogram
+ pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
+ for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+ if [[ -f ${testprogram} ]]; then
+ dobin "${testprogram}"
+ fi
+ done
+ popd
+ fi
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ if use test-programs; then
+ elog "Test programs for DRM driver development were installed. These are not"
+ elog "designed to run outside their source tree, so may or may not work as"
+ elog "intended."
+ fi
+}
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
new file mode 100644
index 00000000000..8251c6f968d
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+KEYWORDS="~amd64 ~x86"
+IUSE="python test-programs unwind video_cards_nouveau"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+DEPEND="dev-libs/glib:2
+ >=x11-libs/cairo-1.12.0
+ >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?]
+ >=x11-libs/libpciaccess-0.10
+ python? ( ${PYTHON_DEPS} )
+ unwind? ( sys-libs/libunwind )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable python dumper)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable test-programs tests)
+ $(use_with unwind libunwind)
+ )
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+ if use test-programs; then
+ local testprogram
+ pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
+ for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+ if [[ -f ${testprogram} ]]; then
+ dobin "${testprogram}"
+ fi
+ done
+ popd
+ fi
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ if use test-programs; then
+ elog "Test programs for DRM driver development were installed. These are not"
+ elog "designed to run outside their source tree, so may or may not work as"
+ elog "intended."
+ fi
+}
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild
new file mode 100644
index 00000000000..7d27f37019b
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+KEYWORDS="amd64 x86"
+IUSE="python video_cards_nouveau"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+DEPEND="dev-libs/glib:2
+ >=x11-libs/cairo-1.12.0
+ >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?]
+ >=x11-libs/libpciaccess-0.10
+ python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch"
+ "${FILESDIR}/${PN}-1.10-clang.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable python dumper)
+ $(use_enable video_cards_nouveau nouveau)
+ --disable-tests #484618
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml
new file mode 100644
index 00000000000..fe7694404ff
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<use>
+ <flag name='python'>Install python based register dumper utilities</flag>
+ <flag name='test-programs'>Install test programs for DRM driver development</flag>
+ <flag name='unwind'>Provide automatic stack traces on test failures</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-apps/listres/Manifest b/x11-apps/listres/Manifest
new file mode 100644
index 00000000000..8b2d70d5aeb
--- /dev/null
+++ b/x11-apps/listres/Manifest
@@ -0,0 +1 @@
+DIST listres-1.0.3.tar.bz2 115429 SHA256 c3d71e9a01650e3fd470189a749cd0202ef03d9e399350a7a7443d7595ed478e
diff --git a/x11-apps/listres/listres-1.0.3.ebuild b/x11-apps/listres/listres-1.0.3.ebuild
new file mode 100644
index 00000000000..90c3e2be5de
--- /dev/null
+++ b/x11-apps/listres/listres-1.0.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="list resources in widgets"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/listres/metadata.xml b/x11-apps/listres/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/listres/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-apps/luit/Manifest b/x11-apps/luit/Manifest
new file mode 100644
index 00000000000..936682f3412
--- /dev/null
+++ b/x11-apps/luit/Manifest
@@ -0,0 +1 @@
+DIST luit-1.1.1.tar.bz2 140044 SHA256 30b0e787cb07a0f504b70f1d6123930522111ce9d4276f6683a69b322b49c636 SHA512 e834e89fca9987f6d82701f53d3c450cc64b93a804b11465b4a7ec5cb3a5c4ef30115df57dec3cbdbafa46e4a4f1bb4759b723123e2ff2f6b1c12207015638e6 WHIRLPOOL 66d850ba9f13cfe88c0c619dbdc77554fdce7e078fdc62d936b858b879e8d4ce65f1538079e0fd70ab01c254d3fbb3da4c2291b9588763ddb546a6d9d398893c
diff --git a/x11-apps/luit/luit-1.1.1.ebuild b/x11-apps/luit/luit-1.1.1.ebuild
new file mode 100644
index 00000000000..ce6525a9313
--- /dev/null
+++ b/x11-apps/luit/luit-1.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+XORG_EAUTORECONF=yes
+
+inherit xorg-2
+
+DESCRIPTION="Locale and ISO 2022 support for Unicode terminals"
+
+KEYWORDS="alpha amd64 arm 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="sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libfontenc"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ # posix_openpt() call needs POSIX 2004, bug #415949
+ sed -i 's/-D_XOPEN_SOURCE=500/-D_XOPEN_SOURCE=600/' configure.ac || die
+ xorg-2_src_prepare
+}
diff --git a/x11-apps/luit/metadata.xml b/x11-apps/luit/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/luit/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-apps/mesa-progs/Manifest b/x11-apps/mesa-progs/Manifest
new file mode 100644
index 00000000000..7cadfc5e662
--- /dev/null
+++ b/x11-apps/mesa-progs/Manifest
@@ -0,0 +1,2 @@
+DIST mesa-demos-8.1.0.tar.bz2 10045237 SHA256 9703fa0646b32a1e68d2abf5628f936f77bf97c69ffcaac90de380820a87a828 SHA512 4832690cd7fb7bb4caccde039cb68baf9213e102ca9212541da499941879b719c1a7ee4038b3e0fde42a92bd6589a90b8ec842982aba81ff507e6ea55054a9ed WHIRLPOOL b9495d62f092d92e50a90cff42d6b21945c1dfd12113492932bba0a981c84ec87c2292492be49b27458a3cdbe36a3aad361a17d367f84b8e63fe1878331d4e59
+DIST mesa-demos-8.2.0.tar.bz2 10071635 SHA256 e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92 SHA512 590e9fb66e23c0ad526754e9084858eb3e1fa906be55ee6121089325254b970e135e04d53c634cabd13d59c572ea39a4a877bce14b120d73850aafd159a5c8de WHIRLPOOL faa4dfb6ee32d81a4569f883d587ea96e76da1c97df26effaff1fc2827b359de40bb61a5b87f46e13993bada2d37ca333cfb1f2023f953829c4d6fb886553899
diff --git a/x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild
new file mode 100644
index 00000000000..a92915a7439
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.1.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=${PN/progs/demos}
+MY_P=${MY_PN}-${PV}
+EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//}"
+EGIT_PROJECT="mesa-progs"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-2"
+ EXPERIMENTAL="true"
+fi
+
+inherit base autotools toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+if [[ ${PV} == 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="egl gles1 gles2"
+
+COMMON_DEPEND="
+ egl? ( media-libs/glew )
+ gles1? ( media-libs/glew )
+ gles2? ( media-libs/glew )
+ media-libs/mesa[egl?,gles1?,gles2?]
+ virtual/opengl
+ x11-libs/libX11"
+# glew and glu are only needed by the configure script when building.
+# They are not actually required by the installed programs.
+DEPEND="${COMMON_DEPEND}
+ virtual/glu
+ x11-proto/xproto"
+# old gnash installs eglinfo too, bug #463654
+RDEPEND="${COMMON_DEPEND}
+ egl? ( !<=www-plugins/gnash-0.8.10_p20120903[egl] )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ default
+ [[ $PV = 9999* ]] && git-2_src_unpack
+}
+
+src_prepare() {
+ base_src_prepare
+
+ eautoreconf
+}
+
+src_configure() {
+ # We're not using the complete buildsystem if we only want to build
+ # glxinfo and glxgears.
+ if use egl || use gles1 || use gles2; then
+ default_src_configure
+ fi
+}
+
+src_compile() {
+ if ! use egl && ! use gles1 && ! use gles2; then
+ tc-export CC
+ emake LDLIBS='-lX11 -lGL' src/xdemos/glxinfo
+ emake LDLIBS='-lX11 -lGL -lm' src/xdemos/glxgears
+ else
+ emake -C src/xdemos glxgears glxinfo
+ fi
+
+ if use egl; then
+ emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+ emake -C src/egl/eglut/ libeglut_screen.la libeglut_x11.la
+ emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+ emake LDLIBS="-lGL -lEGL -lm" -C src/egl/opengl/ eglgears_screen
+
+ if use gles1; then
+ emake LDLIBS="-lGLESv1_CM -lEGL -lX11" -C src/egl/opengles1/ es1_info
+ emake LDLIBS="-lGLESv1_CM -lEGL -lX11 -lm" -C src/egl/opengles1/ gears_x11
+ emake LDLIBS="-lGLESv1_CM -lEGL -lm" -C src/egl/opengles1/ gears_screen
+ fi
+ if use gles2; then
+ emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
+ emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
+ emake LDLIBS="-lGLESv2 -lEGL -lm" -C src/egl/opengles2/ es2gears_screen
+ fi
+ fi
+}
+
+src_install() {
+ dobin src/xdemos/{glxgears,glxinfo}
+ if use egl; then
+ dobin src/egl/opengl/egl{info,gears_{screen,x11}}
+
+ if use gles1; then
+ dobin src/egl/opengles1/es1_info
+ newbin src/egl/opengles1/gears_screen es1gears_screen
+ newbin src/egl/opengles1/gears_x11 es1gears_x11
+ fi
+
+ use gles2 && dobin src/egl/opengles2/es2{_info,gears_{screen,x11}}
+ fi
+}
diff --git a/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
new file mode 100644
index 00000000000..0b5692dc44b
--- /dev/null
+++ b/x11-apps/mesa-progs/mesa-progs-8.2.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+MY_PN=${PN/progs/demos}
+MY_P=${MY_PN}-${PV}
+EGIT_REPO_URI="git://anongit.freedesktop.org/${MY_PN/-//}"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+ EXPERIMENTAL="true"
+fi
+
+inherit base autotools toolchain-funcs ${GIT_ECLASS}
+
+DESCRIPTION="Mesa's OpenGL utility and demo programs (glxgears and glxinfo)"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+if [[ ${PV} == 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="ftp://ftp.freedesktop.org/pub/${MY_PN/-//}/${PV}/${MY_P}.tar.bz2"
+fi
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE="egl gles1 gles2"
+
+RDEPEND="
+ media-libs/freeglut
+ media-libs/glew
+ media-libs/mesa[egl?,gles1?,gles2?]
+ virtual/opengl
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ virtual/glu
+ x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+EGIT_CHECKOUT_DIR=${S}
+
+src_unpack() {
+ default
+ [[ $PV = 9999* ]] && git-r3_src_unpack
+}
+
+src_prepare() {
+ base_src_prepare
+
+ eautoreconf
+}
+
+src_compile() {
+ emake -C src/xdemos glxgears glxinfo
+
+ if use egl; then
+ emake LDLIBS="-lEGL" -C src/egl/opengl/ eglinfo
+ emake -C src/egl/eglut/ libeglut_screen.la libeglut_x11.la
+ emake LDLIBS="-lGL -lEGL -lX11 -lm" -C src/egl/opengl/ eglgears_x11
+ emake LDLIBS="-lGL -lEGL -lm" -C src/egl/opengl/ eglgears_screen
+
+ if use gles1; then
+ emake LDLIBS="-lGLESv1_CM -lEGL -lX11" -C src/egl/opengles1/ es1_info
+ emake LDLIBS="-lGLESv1_CM -lEGL -lX11 -lm" -C src/egl/opengles1/ gears_x11
+ emake LDLIBS="-lGLESv1_CM -lEGL -lm" -C src/egl/opengles1/ gears_screen
+ fi
+ if use gles2; then
+ emake LDLIBS="-lGLESv2 -lEGL -lX11" -C src/egl/opengles2/ es2_info
+ emake LDLIBS="-lGLESv2 -lEGL -lX11 -lm" -C src/egl/opengles2/ es2gears_x11
+ emake LDLIBS="-lGLESv2 -lEGL -lm" -C src/egl/opengles2/ es2gears_screen
+ fi
+ fi
+}
+
+src_install() {
+ dobin src/xdemos/{glxgears,glxinfo}
+ if use egl; then
+ dobin src/egl/opengl/egl{info,gears_{screen,x11}}
+
+ if use gles1; then
+ dobin src/egl/opengles1/es1_info
+ newbin src/egl/opengles1/gears_screen es1gears_screen
+ newbin src/egl/opengles1/gears_x11 es1gears_x11
+ fi
+
+ use gles2 && dobin src/egl/opengles2/es2{_info,gears_{screen,x11}}
+ fi
+}
diff --git a/x11-apps/mesa-progs/metadata.xml b/x11-apps/mesa-progs/metadata.xml
new file mode 100644
index 00000000000..f9f35a8d8be
--- /dev/null
+++ b/x11-apps/mesa-progs/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<use>
+ <flag name='egl'>Build EGL utilities</flag>
+ <flag name='gles1'>Build OpenGL ES 1 utilities</flag>
+ <flag name='gles2'>Build OpenGL ES 2 utilities</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-apps/metadata.xml b/x11-apps/metadata.xml
new file mode 100644
index 00000000000..acb438fa4de
--- /dev/null
+++ b/x11-apps/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ x11-apps contains applications distributed as part of X.Org X11.
+ </longdescription>
+ <longdescription lang="ja">
+ x11-appsカテゴリにはX.Org X11のパッケージソフトが含まれます。
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie x11-apps enthält Applikationen welche mit X.Org
+ X11 ausgeliefert werden.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria x11-apps contém aplicações distribuídas como parte
+ do X.Org X11.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria x11-apps zawiera programy wchodzące w skład środowiska
+ graficznego X.Org X11.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría x11-apps contiene aplicaciones que se distribuyen como
+ parte de X.Org X11.
+ </longdescription>
+</catmetadata>
+
diff --git a/x11-apps/mkfontdir/Manifest b/x11-apps/mkfontdir/Manifest
new file mode 100644
index 00000000000..21762b951a6
--- /dev/null
+++ b/x11-apps/mkfontdir/Manifest
@@ -0,0 +1 @@
+DIST mkfontdir-1.0.7.tar.bz2 108195 SHA256 56d52a482df130484e51fd066d1b6eda7c2c02ddbc91fe6e2be1b9c4e7306530 SHA512 96d1920565514f90621e18a87fb5a2db9e052d1bffc6552d9659e065a21e252ab98b4e62013755032b98ed6d8c3381eb75c3c8e02651766ee4791ca622dcef1f WHIRLPOOL 3f6ee8424bc57c2d3ccc7b293402124a3823697bd37438601eb17b7675b72b6b9531432d07bef137e28bf6d40c89fa6b8e08970d7338b942a579b9eecfce965f
diff --git a/x11-apps/mkfontdir/metadata.xml b/x11-apps/mkfontdir/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/mkfontdir/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-apps/mkfontdir/mkfontdir-1.0.7.ebuild b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
new file mode 100644
index 00000000000..5e70d468c32
--- /dev/null
+++ b/x11-apps/mkfontdir/mkfontdir-1.0.7.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="create an index of X font files in a directory"
+
+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="x11-apps/mkfontscale"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/mkfontscale/Manifest b/x11-apps/mkfontscale/Manifest
new file mode 100644
index 00000000000..9076210cd61
--- /dev/null
+++ b/x11-apps/mkfontscale/Manifest
@@ -0,0 +1,2 @@
+DIST mkfontscale-1.1.1.tar.bz2 139923 SHA256 244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731 SHA512 7a6da239b2f166c6283090c219889e998be9332ee1e8eb4d84bbdf0cb58125a3773fe7ee97774d86f2cd5385dc49636a797c7b9c25c6c8bbe24b898329f97220 WHIRLPOOL 36584d969899c135b5efe3c8323a721bde5ff7b7909741d94f1548b8d9f6b8e57527a522edcf34ba2c5f076f01fed454e7d12bee39d345e0513b76fcec29c4d8
+DIST mkfontscale-1.1.2.tar.bz2 141728 SHA256 8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20 SHA512 5c3331f66cd523afe95347aa36440655ba8fdbc716c5987a24ad624c1fbd718c4a8d67aa36330f6d5ab2eb5a6195a409a041954568c0a3375c0e2aeb6a955601 WHIRLPOOL 0a915e4915250bac3d057e8d997188c2955c6e4d6d0ef0299b53d39afdd2ae55e5958fd32de721178520b5533e4452f43c29ed4aba869eaba8408ca730578045
diff --git a/x11-apps/mkfontscale/metadata.xml b/x11-apps/mkfontscale/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/mkfontscale/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-apps/mkfontscale/mkfontscale-1.1.1.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
new file mode 100644
index 00000000000..d1475926375
--- /dev/null
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.1.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="create an index of scalable font files for X"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libfontenc
+ media-libs/freetype:2"
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+ app-arch/gzip
+ app-arch/bzip2"
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-bzip2
+)
diff --git a/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
new file mode 100644
index 00000000000..67a7d3a0086
--- /dev/null
+++ b/x11-apps/mkfontscale/mkfontscale-1.1.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="create an index of scalable font files for X"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libfontenc
+ media-libs/freetype:2
+ sys-libs/zlib
+ app-arch/bzip2"
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+ app-arch/gzip"
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-bzip2
+)
diff --git a/x11-apps/oclock/Manifest b/x11-apps/oclock/Manifest
new file mode 100644
index 00000000000..a33b3623368
--- /dev/null
+++ b/x11-apps/oclock/Manifest
@@ -0,0 +1 @@
+DIST oclock-1.0.3.tar.bz2 122758 SHA256 54f5fb85f5828705683f457e559fb18753332db15ae82da561b0ae5a63915091
diff --git a/x11-apps/oclock/metadata.xml b/x11-apps/oclock/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/oclock/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-apps/oclock/oclock-1.0.3.ebuild b/x11-apps/oclock/oclock-1.0.3.ebuild
new file mode 100644
index 00000000000..d5825bf3041
--- /dev/null
+++ b/x11-apps/oclock/oclock-1.0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="round X clock"
+
+KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libxkbfile"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/python-whiteboard/Manifest b/x11-apps/python-whiteboard/Manifest
new file mode 100644
index 00000000000..440a2dc4c49
--- /dev/null
+++ b/x11-apps/python-whiteboard/Manifest
@@ -0,0 +1 @@
+DIST python-whiteboard-20101012.tar.bz2 131944 SHA256 0270ab3f636ba079261a6e9e093fd5f622e91b07399d4773c050c8904db61630
diff --git a/x11-apps/python-whiteboard/metadata.xml b/x11-apps/python-whiteboard/metadata.xml
new file mode 100644
index 00000000000..53c49846ae4
--- /dev/null
+++ b/x11-apps/python-whiteboard/metadata.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ <description>Maintainer. Assign bugs to him</description>
+ </maintainer>
+ <maintainer>
+ <email>ziapannocchia@gmail.com</email>
+ <name>Marco Clocchiatti</name>
+ <description>Proxy maintainer. CC him on bugs</description>
+ </maintainer>
+ <longdescription lang="en">
+ Build and operate an electronic whiteboard using gnu/linux, a wiimote and an IR pen.
+ </longdescription>
+ <upstream>
+ <maintainer status="active">
+ <email/>
+ <name>Pietro Pilloli</name>
+ </maintainer>
+ <changelog>https://github.com/pnegre/python-whiteboard/commits/master</changelog>
+ <doc>https://github.com/pnegre/python-whiteboard/wiki</doc>
+ <bugs-to>http://groups.google.com/group/python-whiteboard</bugs-to>
+ <remote-id type="sourceforge">git://github.com/pnegre/python-whiteboard.git</remote-id>
+ <remote-id type="github">pnegre/python-whiteboard</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-apps/python-whiteboard/python-whiteboard-20101012.ebuild b/x11-apps/python-whiteboard/python-whiteboard-20101012.ebuild
new file mode 100644
index 00000000000..bf1a73fd954
--- /dev/null
+++ b/x11-apps/python-whiteboard/python-whiteboard-20101012.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit python multilib
+
+SRC_URI="http://dev.gentoo.org/~lxnay/${PN}/${P}.tar.bz2"
+
+KEYWORDS="~x86 ~amd64"
+DESCRIPTION="Build and operate a electronic whiteboard Wiimote and IR Pen"
+HOMEPAGE="http://github.com/pnegre/python-whiteboard"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+
+RDEPEND="app-misc/cwiid[python]
+ dev-python/numpy
+ dev-python/pybluez
+ dev-python/PyQt4
+ dev-python/python-xlib"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+}
+
+pkg_postinst() {
+ python_mod_optimize "/usr/$(get_libdir)/${PN}"
+}
+
+pkg_postrm() {
+ python_mod_cleanup "/usr/$(get_libdir)/${PN}"
+}
diff --git a/x11-apps/radeontop/Manifest b/x11-apps/radeontop/Manifest
new file mode 100644
index 00000000000..03d8e4d3325
--- /dev/null
+++ b/x11-apps/radeontop/Manifest
@@ -0,0 +1,2 @@
+DIST radeontop-0.7.tar.gz 28353 SHA256 57542644d95a05e321223b2137836cc300935d8615110ed134c2d83e3ff0058d SHA512 92d98c0849ebfabaa0b7086461e41c736020e4a9af1e5e31dc0d2e098496a6eebb878fd4a5694035a9bb48f33267e31802063e413becf8f9c2924355fdf60b81 WHIRLPOOL 045c1ee5a6dcc1c2fbe6ec86fabad9723938298685e37fa0efc6967ab621ac9087832a10b636424e8d9f1c8fdb5d403a64a1fe0a0bea79810ed7d5f751723a10
+DIST radeontop-0.8.tar.gz 29719 SHA256 4430e1aaca895d70ea496a9b14010d9d94cadd6269b28a66104af89ff29d8489 SHA512 8c711377a617cc071599ef2c3355bb1f5e68aa69e2999396272a93657c5ba448005e0829dea34666e88466c9fd7da2f58cf44ccd542be4d63a72b3ae3e1fc04a WHIRLPOOL 4c95e3aca57ad75d71f15969b91131eb7e4a73e686ca22cc2df8f2e946327ccc41d8dabc02930e3d2cdb292758887864ce4ab3e4a1c6bf799c934fe1df857665
diff --git a/x11-apps/radeontop/metadata.xml b/x11-apps/radeontop/metadata.xml
new file mode 100644
index 00000000000..b636395628b
--- /dev/null
+++ b/x11-apps/radeontop/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>nikoli@gmx.us</email>
+ </maintainer>
+ <herd>proxy-maintainers</herd>
+ <upstream>
+ <remote-id type="github">clbr/radeontop</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-apps/radeontop/radeontop-0.7-r1.ebuild b/x11-apps/radeontop/radeontop-0.7-r1.ebuild
new file mode 100644
index 00000000000..b0f467c7eef
--- /dev/null
+++ b/x11-apps/radeontop/radeontop-0.7-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utility to view Radeon GPU utilization"
+HOMEPAGE="https://github.com/clbr/radeontop"
+LICENSE="GPL-3"
+SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ sys-libs/ncurses
+ x11-libs/libpciaccess
+ nls? ( sys-libs/ncurses[unicode] virtual/libintl )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ epatch_user
+
+cat > include/version.h << EOF || die
+#ifndef VER_H
+#define VER_H
+
+#define VERSION "${PV}"
+
+#endif
+EOF
+ >getver.sh || die
+ touch .git || die
+}
+
+src_configure() {
+ tc-export CC
+ export nls=$(usex nls 1 0)
+ # Do not add -g or -s to CFLAGS
+ export plain=1
+}
diff --git a/x11-apps/radeontop/radeontop-0.8.ebuild b/x11-apps/radeontop/radeontop-0.8.ebuild
new file mode 100644
index 00000000000..fc899a07271
--- /dev/null
+++ b/x11-apps/radeontop/radeontop-0.8.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Utility to view Radeon GPU utilization"
+HOMEPAGE="https://github.com/clbr/radeontop"
+LICENSE="GPL-3"
+SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+ sys-libs/ncurses
+ x11-libs/libpciaccess
+ x11-libs/libdrm
+ nls? ( sys-libs/ncurses[unicode] virtual/libintl )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ epatch_user
+
+cat > include/version.h << EOF || die
+#ifndef VER_H
+#define VER_H
+
+#define VERSION "${PV}"
+
+#endif
+EOF
+ >getver.sh || die
+ touch .git || die
+}
+
+src_configure() {
+ tc-export CC
+ export nls=$(usex nls 1 0)
+ # Do not add -g or -s to CFLAGS
+ export plain=1
+}
diff --git a/x11-apps/radeontop/radeontop-9999.ebuild b/x11-apps/radeontop/radeontop-9999.ebuild
new file mode 100644
index 00000000000..083144eb06b
--- /dev/null
+++ b/x11-apps/radeontop/radeontop-9999.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs git-r3
+
+DESCRIPTION="Utility to view Radeon GPU utilization"
+HOMEPAGE="https://github.com/clbr/radeontop"
+LICENSE="GPL-3"
+EGIT_REPO_URI="https://github.com/clbr/radeontop.git"
+
+SLOT="0"
+KEYWORDS=""
+IUSE="nls"
+
+RDEPEND="
+ sys-libs/ncurses
+ x11-libs/libpciaccess
+ x11-libs/libdrm
+ nls? ( sys-libs/ncurses[unicode] virtual/libintl )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+src_prepare() {
+ epatch_user
+}
+
+src_configure() {
+ tc-export CC
+ export nls=$(usex nls 1 0)
+ # Do not add -g or -s to CFLAGS
+ export plain=1
+}
diff --git a/x11-apps/rgb/Manifest b/x11-apps/rgb/Manifest
new file mode 100644
index 00000000000..8915acb98b0
--- /dev/null
+++ b/x11-apps/rgb/Manifest
@@ -0,0 +1,2 @@
+DIST rgb-1.0.5.tar.bz2 130900 SHA256 8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857 SHA512 2e4ad2b0f5539375986d455b47cb5f10e50841198ee242ee430e021e9ddbffec1304259c259c7a6b7e0cd4b244ecedcb5818baac35deb4447da53c2ddba3ad43 WHIRLPOOL 46f2947696bcebecd36880808388260dba562b11b007508d59a9fd1cfbb730d9cfea57e49cbcfc84115ffe58ef6db0a8f25dcb10607b105e7e8f90f6bbbfe3ff
+DIST rgb-1.0.6.tar.bz2 139225 SHA256 bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0 SHA512 92c8885a0e1482065a8b86f7be890859a5eab6b9d57ff219e916cbbd10cd185deec1c5db25dae8c405a343ab0e2ddaba3ddfe0b567d06534405f102e1845654e WHIRLPOOL 285913c14d8405402b407172721e54f4cee142bfbb8d54ccf7d1616b5ec30935967b82de249013064c73b105c5256a71fc008f4caadc2dd0275ee2e1dacc3a89
diff --git a/x11-apps/rgb/metadata.xml b/x11-apps/rgb/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/rgb/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-apps/rgb/rgb-1.0.5.ebuild b/x11-apps/rgb/rgb-1.0.5.ebuild
new file mode 100644
index 00000000000..61d165ec9cf
--- /dev/null
+++ b/x11-apps/rgb/rgb-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="uncompile an rgb color-name database"
+
+KEYWORDS="alpha amd64 arm 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 ~x86-winnt"
+IUSE=""
+RDEPEND=""
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
diff --git a/x11-apps/rgb/rgb-1.0.6.ebuild b/x11-apps/rgb/rgb-1.0.6.ebuild
new file mode 100644
index 00000000000..d7046a5ff0e
--- /dev/null
+++ b/x11-apps/rgb/rgb-1.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="uncompile an rgb color-name database"
+
+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 ~x86-winnt"
+IUSE=""
+RDEPEND=""
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
diff --git a/x11-apps/rstart/Manifest b/x11-apps/rstart/Manifest
new file mode 100644
index 00000000000..4b70dbff2e2
--- /dev/null
+++ b/x11-apps/rstart/Manifest
@@ -0,0 +1 @@
+DIST rstart-1.0.5.tar.bz2 144607 SHA256 29134e9fdffc8d6ac6904c293b392ba6a493ce571fbd2015485b19a8e4d0ffeb SHA512 bda43dd29f95ba5ea4ab42e78069c4011afc6987d00dc580250aec8bec217fabb67577a3038607468de1739d54da596a43cea4c1f5be72e3e572ae6d5abbc09a WHIRLPOOL 72bcb0f72311949edeb91cccb904061cbff2faacc957874e8d422d636f530d9ad95171a931438d2e04be736c27f60160b5598e8d08d97d355f223199d26d6615
diff --git a/x11-apps/rstart/metadata.xml b/x11-apps/rstart/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/rstart/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-apps/rstart/rstart-1.0.5.ebuild b/x11-apps/rstart/rstart-1.0.5.ebuild
new file mode 100644
index 00000000000..8da9ccbed78
--- /dev/null
+++ b/x11-apps/rstart/rstart-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org rstart application"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-proto/xproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/scripts/Manifest b/x11-apps/scripts/Manifest
new file mode 100644
index 00000000000..2778a54ec6a
--- /dev/null
+++ b/x11-apps/scripts/Manifest
@@ -0,0 +1 @@
+DIST scripts-1.0.1.tar.bz2 72301 SHA256 1b154b4359302ca499818c45396325aef9ff364d6ff4ce5c3769e4803994a136 SHA512 dd058c5d5b34dfb7b996e28c78ce8169809d9e0b0233b1e0f4f5ec223c62affe1e6e561869d7cc47948efbb56bd4b67f69e01f27e2133a15206fd3013c284226 WHIRLPOOL 90fe1e07db105ea8388d109a15927795af842fe408d8803298af901ade20922cc22e466ee1a86d2a3f24a855f8df0a825515c0ce4592c7bbbdd8977bc9d42656
diff --git a/x11-apps/scripts/metadata.xml b/x11-apps/scripts/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/scripts/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-apps/scripts/scripts-1.0.1-r1.ebuild b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
new file mode 100644
index 00000000000..33164fc1c36
--- /dev/null
+++ b/x11-apps/scripts/scripts-1.0.1-r1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+XORG_STATIC="no"
+inherit xorg-2
+
+DESCRIPTION="start an X program on a remote machine"
+KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ xorg-2_src_install
+
+ # Requires ksh, assumes hostname(1) is in /usr/bin
+ rm "${ED}"/usr/bin/xauth_switch_to_sun-des-1
+}
diff --git a/x11-apps/sessreg/Manifest b/x11-apps/sessreg/Manifest
new file mode 100644
index 00000000000..663690a690b
--- /dev/null
+++ b/x11-apps/sessreg/Manifest
@@ -0,0 +1,2 @@
+DIST sessreg-1.0.8.tar.bz2 126979 SHA256 0e2accc6272fcc2321aef7370f4ccf0df0fe259b2e942938264e2aaedee6c4c3 SHA512 aecf6def3d1b5981aacb1be393867bf3b841234be54499e77bd3cd61281d8a4479a52f95d27f3cbfae1dafe7cd295bbf6c0594fc5180cfaca0dd1b4dd3f314bd WHIRLPOOL a4a28a46d097f0151f5391faee26b98b22a439813bb8b015d1151edbd7ff2ed97be21053f62a4a39e4b47294d79df35c364753bab2a1ba4391c1f93a3ed5cea7
+DIST sessreg-1.1.0.tar.bz2 134484 SHA256 551177657835e0902b5eee7b19713035beaa1581bbd3c6506baa553e751e017c SHA512 5d9010874696bbc53a6271f30c089690cb341ede992f6be0914474a03ff4468e01e6a4ce7e6a437b96751fdf0ccced52b374126e5caeac6747edecd049841116 WHIRLPOOL 49598223e92a5113f7b6fc9ae08680d4e7523fc97a1161c5dc4c316ca14fde5511ce24652840de2a275ac5675eadaa03acee61ae6a6e3ee898c0932751ecd7dd
diff --git a/x11-apps/sessreg/metadata.xml b/x11-apps/sessreg/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/sessreg/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-apps/sessreg/sessreg-1.0.8.ebuild b/x11-apps/sessreg/sessreg-1.0.8.ebuild
new file mode 100644
index 00000000000..6f81cbcccfc
--- /dev/null
+++ b/x11-apps/sessreg/sessreg-1.0.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="manage utmp/wtmp entries for non-init clients"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
diff --git a/x11-apps/sessreg/sessreg-1.1.0.ebuild b/x11-apps/sessreg/sessreg-1.1.0.ebuild
new file mode 100644
index 00000000000..ae366d07209
--- /dev/null
+++ b/x11-apps/sessreg/sessreg-1.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="manage utmp/wtmp entries for non-init clients"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
diff --git a/x11-apps/setxkbmap/Manifest b/x11-apps/setxkbmap/Manifest
new file mode 100644
index 00000000000..f7d0d04adb8
--- /dev/null
+++ b/x11-apps/setxkbmap/Manifest
@@ -0,0 +1,2 @@
+DIST setxkbmap-1.3.0.tar.bz2 125844 SHA256 3d305c9d1f38224169b2e501ef0665cc3ab52d4dbc2b9a60c9dbb047f77ddec6 SHA512 d4843485f44a9204d1aa8bf16b3ad661747be119b0b5f38ced74dc35773519765af07fd290ab0265766de6206138e085a775bfc6edae6a232f2da9c260c0b581 WHIRLPOOL cbe29496b115c0963cd44634640659921136f3a6372f1c7bc7cffebf67ee7be86471afaa4d80475eb9e12921a6ebfd3250b509cba4e5c0a1dd560105d06e5e20
+DIST setxkbmap-1.3.1.tar.bz2 133817 SHA256 a9ddb3963f263ba13f0ea105d8c45a531832140530217cc559587bb94f02d3e1 SHA512 5ddc2fc40ddc5a35815606998d3f111e3c2b8d915bf609462c703f9f691a0b3a6477ee98837c0a28f11dd3f0a30f17a3bcdfa38d4ca45140e521c74d043ecdee WHIRLPOOL 994958e2b0ce773a274897056a13a5461856e68c101b93c8e4650d598ea8f401e4e57e2f18ef3ada0194a4d7fa94020915b6aec84bdf958359b3fff55b966f2d
diff --git a/x11-apps/setxkbmap/metadata.xml b/x11-apps/setxkbmap/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/setxkbmap/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-apps/setxkbmap/setxkbmap-1.3.0.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
new file mode 100644
index 00000000000..ecbe2128369
--- /dev/null
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="Controls the keyboard layout of a running X server"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="x11-libs/libxkbfile
+ x11-libs/libX11"
+RDEPEND="${RDEPEND}
+ x11-misc/xkeyboard-config"
diff --git a/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild b/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild
new file mode 100644
index 00000000000..c5dc988cbef
--- /dev/null
+++ b/x11-apps/setxkbmap/setxkbmap-1.3.1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Controls the keyboard layout of a running X server"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+DEPEND="x11-libs/libxkbfile
+ x11-libs/libX11"
+RDEPEND="${RDEPEND}
+ x11-misc/xkeyboard-config"
diff --git a/x11-apps/showfont/Manifest b/x11-apps/showfont/Manifest
new file mode 100644
index 00000000000..f2ea7ee0169
--- /dev/null
+++ b/x11-apps/showfont/Manifest
@@ -0,0 +1,2 @@
+DIST showfont-1.0.4.tar.bz2 118199 SHA256 36b63fcc1d7a02211146a4875425abca0a6db0d508f6144f6c7b1602077b22a1 SHA512 5514aec3eca18f714b14b60a085e7f6edafa6f661567876cbcf965d67e90f031dd02d60cc71f8f1889b8e94c99a7f4f8adc8cb3acc1054a83dc8bc36656be0cb WHIRLPOOL 37d2992d051fb1a62b5e4ae87482e59e7f574fe31b7f7b2959d422dcaf21d1318f05067f413ee6a714c51fcef7a5297e5a7f20227f3af1ab4edc9ee66f59aff3
+DIST showfont-1.0.5.tar.bz2 125618 SHA256 e9735c1c530b8a52edfab7415cc0fd7f8d2889095114f4cb689a27476461ac89 SHA512 d90d6d99ca573f2632435ccfd46de606994e3792deb58bab6261ff950481ec71eef032b828da0ee5333d6946c5f54594dfb2dadf930825971d3f4baa5c0ff6fd WHIRLPOOL c70ea8f004513b4f90d1c15949405d3f13a0239e51ac83aba94001fa0cc07390c6e7e6b4ab75797d24662d7793bad2766bedb836d37d63da15bfc0def031fbff
diff --git a/x11-apps/showfont/metadata.xml b/x11-apps/showfont/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/showfont/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-apps/showfont/showfont-1.0.4.ebuild b/x11-apps/showfont/showfont-1.0.4.ebuild
new file mode 100644
index 00000000000..390b0138a4d
--- /dev/null
+++ b/x11-apps/showfont/showfont-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="font dumper for X font server"
+KEYWORDS="amd64 arm ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/showfont/showfont-1.0.5.ebuild b/x11-apps/showfont/showfont-1.0.5.ebuild
new file mode 100644
index 00000000000..b6318aec112
--- /dev/null
+++ b/x11-apps/showfont/showfont-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="font dumper for X font server"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libFS"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/simple-ccsm/Manifest b/x11-apps/simple-ccsm/Manifest
new file mode 100644
index 00000000000..821bd0a4a4a
--- /dev/null
+++ b/x11-apps/simple-ccsm/Manifest
@@ -0,0 +1 @@
+DIST simple-ccsm-0.8.4.tar.bz2 62423 SHA256 15b24408be48f1e3c69735362dd65ea6b3ddded80e63b87ec40268e2f0f652a3 SHA512 f60a689e18fcea494eacc4eaa8718d77b846af6790cb5de056ecd432fd8b5190ebd4ce6669744b3da408e492f68012503f420e28e66be83b747b2e532b152158 WHIRLPOOL 32cd613ac9ed2e82eb6aa61291824d782a3b3fd7758b36e13cbe0ec28007f3633a95cdaa0fce00db720795039cd73b7244f1100f80ad933a67e21cd498f6f421
diff --git a/x11-apps/simple-ccsm/metadata.xml b/x11-apps/simple-ccsm/metadata.xml
new file mode 100644
index 00000000000..7c85fbdd4d6
--- /dev/null
+++ b/x11-apps/simple-ccsm/metadata.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-effects</herd>
+<longdescription lang="en">Simplified Compizconfig Settings Manager.</longdescription>
+</pkgmetadata>
diff --git a/x11-apps/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild b/x11-apps/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild
new file mode 100644
index 00000000000..ef064ce7560
--- /dev/null
+++ b/x11-apps/simple-ccsm/simple-ccsm-0.8.4-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+DISTUTILS_IN_SOURCE_BUILD=1
+inherit distutils-r1 gnome2-utils
+
+DESCRIPTION="Simplified Compizconfig Settings Manager"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+DEPEND="
+ dev-util/intltool
+ virtual/pkgconfig"
+RDEPEND="
+ >=dev-python/compizconfig-python-${PV}[${PYTHON_USEDEP}]
+ >=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}]
+ >=x11-apps/ccsm-${PV}[${PYTHON_USEDEP}]
+"
+
+python_prepare_all() {
+ # return error if wrong arguments passed to setup.py
+ sed -i -e 's/raise SystemExit/\0(1)/' setup.py || die 'sed on setup.py failed'
+ # fix desktop file
+ sed -i \
+ -e '/Categories/s/Compiz/X-\0/' \
+ -e '/Encoding/d' \
+ "${PN}".desktop.in || die "sed on ${PN}.desktop.in failed"
+
+ distutils-r1_python_prepare_all
+}
+
+python_configure_all() {
+ mydistutilsargs=( build --prefix=/usr )
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/x11-apps/smproxy/Manifest b/x11-apps/smproxy/Manifest
new file mode 100644
index 00000000000..85c0343f75d
--- /dev/null
+++ b/x11-apps/smproxy/Manifest
@@ -0,0 +1,2 @@
+DIST smproxy-1.0.5.tar.bz2 118207 SHA256 c72ccb094e4971ec2339ee06439114e86ffdcdf449a6accd5552e817142fd609
+DIST smproxy-1.0.6.tar.bz2 132046 SHA256 6cf19155a2752237f36dbf8bc4184465ea190d2652f887faccb4e2a6ebf77266 SHA512 4945c92c0f07c5dba5698889f415e78ce406939f4a36eb977309488c27385ce4ce04235c4e850a90a451fea8d7885ded7c6b18db71335c7731b38aaeefa9fcb7 WHIRLPOOL 479934d50d30d4d54ea05dccda74f791492abe5f1dd786e6d574d4c8ee40c3f244146cac95f2a24227f602a88c9a3e1560e5cc26da0189f097b8cf46d70ca205
diff --git a/x11-apps/smproxy/metadata.xml b/x11-apps/smproxy/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/smproxy/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-apps/smproxy/smproxy-1.0.5.ebuild b/x11-apps/smproxy/smproxy-1.0.5.ebuild
new file mode 100644
index 00000000000..b6ca11a964b
--- /dev/null
+++ b/x11-apps/smproxy/smproxy-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="Session Manager Proxy"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXt
+ x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/smproxy/smproxy-1.0.6.ebuild b/x11-apps/smproxy/smproxy-1.0.6.ebuild
new file mode 100644
index 00000000000..253a46e59bc
--- /dev/null
+++ b/x11-apps/smproxy/smproxy-1.0.6.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Session Manager Proxy"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXt
+ x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/spotlighter/Manifest b/x11-apps/spotlighter/Manifest
new file mode 100644
index 00000000000..39504e3a428
--- /dev/null
+++ b/x11-apps/spotlighter/Manifest
@@ -0,0 +1 @@
+DIST spotlighter-0.1.tar.gz 331020 SHA256 80e1db22164edefd0251caf376a6ce0e0c5bd6d3cf0fd9ca4f1675e612ba9ec5
diff --git a/x11-apps/spotlighter/metadata.xml b/x11-apps/spotlighter/metadata.xml
new file mode 100644
index 00000000000..aa721ff1627
--- /dev/null
+++ b/x11-apps/spotlighter/metadata.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ <description>Maintainer. Assign bugs to him</description>
+ </maintainer>
+ <maintainer>
+ <email>ziapannocchia@gmail.com</email>
+ <name>Marco Clocchiatti</name>
+ <description>Proxy maintainer. CC him on bugs</description>
+ </maintainer>
+ <longdescription lang="en">Spotlighter is a tool that show a movable and resizable spotlight
+ on the desktop screen.
+ You can use this to hide and show objects on the desktop.
+ This program has been implemented for educational purposes.</longdescription>
+ <use>
+ </use>
+ <upstream>
+ <remote-id type="google-code">ardesia</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-apps/spotlighter/spotlighter-0.1.ebuild b/x11-apps/spotlighter/spotlighter-0.1.ebuild
new file mode 100644
index 00000000000..00c8479728e
--- /dev/null
+++ b/x11-apps/spotlighter/spotlighter-0.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+SRC_URI="http://ardesia.googlecode.com/files/${P}.tar.gz"
+DESCRIPTION="Shows a movable and resizable spotlight on the screen"
+HOMEPAGE="http://code.google.com/p/ardesia/"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+IUSE=""
+
+COMMON_DEPEND="sys-devel/gettext
+ x11-libs/gtk+:2"
+DEPEND="${COMMON_DEPEND}
+ dev-util/intltool"
+RDEPEND="${COMMON_DEPEND}
+ dev-libs/atk
+ media-libs/fontconfig
+ >=media-libs/libpng-1.2
+ sci-libs/gsl"
+
+src_install() {
+ emake DESTDIR="${D}" install || die "make install failed"
+}
diff --git a/x11-apps/transset/Manifest b/x11-apps/transset/Manifest
new file mode 100644
index 00000000000..3f3ae1dce98
--- /dev/null
+++ b/x11-apps/transset/Manifest
@@ -0,0 +1,2 @@
+DIST transset-1.0.0.tar.bz2 118557 SHA256 19ee2525c4044743c49a95e43716bc3bd1dddf527e47585ee118e650b83a7e8f
+DIST transset-1.0.1.tar.bz2 121199 SHA256 70c3d033874fe48286bc4971d5de9027f2e8ccd0f21b7506fe1bb4472218036d SHA512 709a693cedc877f981179376105ac071ea5cf553c4388ecc7b974547050104fbc2cc64292f86f047b70acf7d85e7dca1ed7cd004b73652f4854275c8a514fd1d WHIRLPOOL 86cdc0ad3d82e51ca568e2324ed4a96e92dd6c802e345e98a34804065576b3e8a815084ab5aa423c253275c3d16889c14fd8f5e3b04aeb46d360910a247e3dd3
diff --git a/x11-apps/transset/files/transset-1.0.0-no_transset-df.patch b/x11-apps/transset/files/transset-1.0.0-no_transset-df.patch
new file mode 100644
index 00000000000..81a1bd6e048
--- /dev/null
+++ b/x11-apps/transset/files/transset-1.0.0-no_transset-df.patch
@@ -0,0 +1,21 @@
+From a2485424bd0f184700dd0a4f0823fb4c4cf25f66 Mon Sep 17 00:00:00 2001
+From: Arnaud Fontaine <arnau@debian.org>
+Date: Thu, 07 Jun 2012 10:33:28 +0000
+Subject: Fix program name in usage information, transset instead of transset-df.
+
+---
+diff --git a/transSet.c b/transSet.c
+index 899c14a..ea591bc 100644
+--- a/transSet.c
++++ b/transSet.c
+@@ -44,7 +44,7 @@ Window target_win;
+ void
+ Usage (void)
+ {
+- fprintf (stderr, "usage: transset-df [-options ...] [opacity]\n");
++ fprintf (stderr, "usage: transset [-options ...] [opacity]\n");
+ fprintf (stderr, "options:\n");
+
+ fprintf (stderr,
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/transset/metadata.xml b/x11-apps/transset/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/transset/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-apps/transset/transset-1.0.0.ebuild b/x11-apps/transset/transset-1.0.0.ebuild
new file mode 100644
index 00000000000..f71dc0933ae
--- /dev/null
+++ b/x11-apps/transset/transset-1.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="An utility for setting opacity property"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/xapps http://cgit.freedesktop.org/xorg/app/transset/"
+
+LICENSE="SGI-B-2.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+ >=x11-proto/xproto-7.0.17"
+
+PATCHES=( "${FILESDIR}"/${P}-no_transset-df.patch )
diff --git a/x11-apps/transset/transset-1.0.1.ebuild b/x11-apps/transset/transset-1.0.1.ebuild
new file mode 100644
index 00000000000..60edd9737ce
--- /dev/null
+++ b/x11-apps/transset/transset-1.0.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="An utility for setting opacity property"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/xapps http://cgit.freedesktop.org/xorg/app/transset/"
+
+LICENSE="SGI-B-2.0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+ >=x11-proto/xproto-7.0.17"
diff --git a/x11-apps/viewres/Manifest b/x11-apps/viewres/Manifest
new file mode 100644
index 00000000000..becd879dc55
--- /dev/null
+++ b/x11-apps/viewres/Manifest
@@ -0,0 +1 @@
+DIST viewres-1.0.4.tar.bz2 126186 SHA256 d9c11b44908d91926df8b33428ae04c86c85e4f8380e9b5e68326a651c872e59 SHA512 79edf987cb6232f604e31320fd6737325d2559dd6f0eaef667731b5790a709c81519b41ff5dc8f9aabb49a2a245b10584ed85c94c24ab82f466c776c182aa9f0 WHIRLPOOL 526e03fd7da8b83905040d2948657e5a0f852ee9e15b1e5f08757e1ab8626cf7b0153c2a020fa89729a74a5871551372afb9feef723145574e149214d387dee5
diff --git a/x11-apps/viewres/metadata.xml b/x11-apps/viewres/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/viewres/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-apps/viewres/viewres-1.0.4.ebuild b/x11-apps/viewres/viewres-1.0.4.ebuild
new file mode 100644
index 00000000000..6e2cfbf7d43
--- /dev/null
+++ b/x11-apps/viewres/viewres-1.0.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="graphical class browser for Xt"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXt
+ x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/whyteboard/Manifest b/x11-apps/whyteboard/Manifest
new file mode 100644
index 00000000000..8018075a7ff
--- /dev/null
+++ b/x11-apps/whyteboard/Manifest
@@ -0,0 +1,2 @@
+DIST whyteboard-0.41.1.tar.gz 372110 SHA256 2d054981736f905a5c690b73bf2eedbb32337e61e099e87aeae52681f9d83125 SHA512 c2f789846c5c611047b590109a49b6c28c51e5c84a7d2399f025b5b79d3c633577106aba79f76f0244bc175cbd3169cd8a53221d08ca94ddf39be01406fd429e WHIRLPOOL fd24754077f07f12c9401878b7ecf34a30e0539b36ae97216386f8b68989241316f7c9705b5e8296685bd28d9ace4c2cb96baa5f22cb6102f42aa1ccea9642f4
+DIST whyteboard.png 7601 SHA256 cd1188ebc24c7fc139052269a528e12c4cb4943195c626a73604ea9b2cf042af SHA512 384b0e6de138d3d193c3fbf02dbfe53273d24d88e9665b04cbc8b826d29b7aa7ff8ad916a39cfb6e44d0518da1229546a230369d55b1ae86cab5152ceb33f4fe WHIRLPOOL 5894486aff445929558f494e71cab58cf3f7ceb3c4a0d43ff8524bca47ac69532a2fd044bcbb938ac0edae268439b422809be8e66e840dfccdd9074a7129367b
diff --git a/x11-apps/whyteboard/files/whyteboard.desktop b/x11-apps/whyteboard/files/whyteboard.desktop
new file mode 100644
index 00000000000..958e6369008
--- /dev/null
+++ b/x11-apps/whyteboard/files/whyteboard.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Type=Application
+Name=Whyteboard
+GenericName=Panting App
+GenericName[it]=lavagna
+Comment=Simple whiteboard and PDF annotator
+Exec=whyteboard %U
+TryExec=whyteboard
+Icon=/usr/share/pixmaps/whyteboard.png
+Terminal=false
+Categories=GNOME;GTK;Utility;
+StartupNotify=true
+MimeType=image/png;image/svg+xml;
diff --git a/x11-apps/whyteboard/metadata.xml b/x11-apps/whyteboard/metadata.xml
new file mode 100644
index 00000000000..e86319d033f
--- /dev/null
+++ b/x11-apps/whyteboard/metadata.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>lxnay@gentoo.org</email>
+ <name>Fabio Erculiani</name>
+ <description>Maintainer. Assign bugs to him</description>
+ </maintainer>
+ <maintainer>
+ <email>ziapannocchia@gmail.com</email>
+ <name>Marco Clocchiatti</name>
+ <description>Proxy maintainer. CC him on bugs</description>
+ </maintainer>
+ <longdescription lang="en">A simple image, PDF and postscript file annotator.</longdescription>
+ <upstream>
+ <maintainer status="active">
+ <email/>
+ <name>Steven Sproat</name>
+ </maintainer>
+ <remote-id type="google-code">http://whyteboard.org/</remote-id>
+ </upstream>
+ <use>
+ </use>
+</pkgmetadata>
diff --git a/x11-apps/whyteboard/whyteboard-0.41.1.ebuild b/x11-apps/whyteboard/whyteboard-0.41.1.ebuild
new file mode 100644
index 00000000000..b29b060fefc
--- /dev/null
+++ b/x11-apps/whyteboard/whyteboard-0.41.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1 multilib
+
+DESCRIPTION="A simple image, PDF and postscript file annotator"
+HOMEPAGE="http://code.google.com/p/whyteboard"
+SRC_URI="
+ http://whyteboard.googlecode.com/files/${P}.tar.gz
+ http://dev.gentoo.org/~lxnay/${PN}/${PN}.png"
+
+LICENSE="ISC"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="${PYTHON_DEPS}"
+RDEPEND="${DEPEND}
+ dev-python/wxpython:*[${PYTHON_USEDEP}]
+ media-gfx/imagemagick"
+
+src_install() {
+ doicon "${DISTDIR}"/${PN}.png
+ domenu "${FILESDIR}"/${PN}.desktop
+
+ dodoc CHANGELOG.txt DEVELOPING.txt README.txt TODO.txt
+
+ python_domodule images locale ${PN} ${PN}-help ${PN}.py
+
+ cat >> "${T}/${PN}" <<- EOF
+ #!/bin/sh
+ exec ${PYTHON} -O "$(python_get_sitedir)/${PN}/${PN}.py"
+ EOF
+ dobin "${T}/${PN}"
+
+ python_optimize
+}
+
+pkg_preinst() {
+ echo
+ elog "This application is very experimental and some features"
+ elog "are not yet implemented, however you can live with it"
+ echo
+}
diff --git a/x11-apps/x11perf/Manifest b/x11-apps/x11perf/Manifest
new file mode 100644
index 00000000000..8df74df81b9
--- /dev/null
+++ b/x11-apps/x11perf/Manifest
@@ -0,0 +1,2 @@
+DIST x11perf-1.5.4.tar.bz2 167655 SHA256 24ee8857a2bf414b360addabf1c27ef797f7f504ee9bc409c151760bfbe53184
+DIST x11perf-1.6.0.tar.bz2 191086 SHA256 e87098dec1947572d70c62697a7b70bde1ab5668237d4660080eade6bc096751 SHA512 a9508c9dd6db2663b5bd30f5e1f5f80b1d22ce5221ae3dc292e746f8e554fda2d3130f7311f2545e20244dceb51e867fe80fec82c9ac5911dcdc90a73b231623 WHIRLPOOL f533fea45a31a70a76ce6e02d0bbd0a33e1fc8fa622b501abfda45a41899c767bba6320745590f1922983b1a137c4b9f8e132746ec0993e819dae90f41783c86
diff --git a/x11-apps/x11perf/metadata.xml b/x11-apps/x11perf/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/x11perf/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-apps/x11perf/x11perf-1.5.4.ebuild b/x11-apps/x11perf/x11perf-1.5.4.ebuild
new file mode 100644
index 00000000000..0e1b823ebee
--- /dev/null
+++ b/x11-apps/x11perf/x11perf-1.5.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X rendering operation stress test utility"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXft
+ x11-libs/libXrender
+ x11-libs/libXext"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/x11perf/x11perf-1.6.0.ebuild b/x11-apps/x11perf/x11perf-1.6.0.ebuild
new file mode 100644
index 00000000000..3593292498a
--- /dev/null
+++ b/x11-apps/x11perf/x11perf-1.6.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="X rendering operation stress test utility"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXft
+ x11-libs/libXrender
+ x11-libs/libXext"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xauth/Manifest b/x11-apps/xauth/Manifest
new file mode 100644
index 00000000000..4b37772c707
--- /dev/null
+++ b/x11-apps/xauth/Manifest
@@ -0,0 +1,2 @@
+DIST xauth-1.0.8.tar.bz2 146794 SHA256 a8696ae7a50c699d5fb3a41408b60d98843d19ea46e9f09e391cb98c8f7fd4f7 SHA512 7eb55ad0db16d6f3146413d47b8d3a7dca4cdefa8d9d1421149bc14fd6a78168c7098f3665a3cb413a76566e4dec1e51ae9372336f9be3370fdd3cb5245489d3 WHIRLPOOL abeead3d9535b4b242ec459fc4386d730838cb8b39428a7128b7865d0a00f01ea000a017371bf930d1c9beb9d273df562fc9948f22c164725ee550ebc623d890
+DIST xauth-1.0.9.tar.bz2 154976 SHA256 56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f SHA512 e7b8e950a3e9e36131041692a22b2390c75df94fa8b5f4ea2ef2d79778e000865b1b0ec5930612dedb782d451022ee52c7c9a404d249809adb4b905b66f44d0b WHIRLPOOL 16f2686a181281610df55d405738d0a39fd7fa891a58606b13abed3754179802e1b22a938ef43d6d4205dfa8ff7f764f5e1c5323e58bed080ccd33ca4f4f0134
diff --git a/x11-apps/xauth/metadata.xml b/x11-apps/xauth/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xauth/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-apps/xauth/xauth-1.0.8.ebuild b/x11-apps/xauth/xauth-1.0.8.ebuild
new file mode 100644
index 00000000000..dd3b2195466
--- /dev/null
+++ b/x11-apps/xauth/xauth-1.0.8.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="X authority file utility"
+
+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 ~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() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ )
+ xorg-2_pkg_setup
+}
diff --git a/x11-apps/xauth/xauth-1.0.9-r1.ebuild b/x11-apps/xauth/xauth-1.0.9-r1.ebuild
new file mode 100644
index 00000000000..ed1c75e9277
--- /dev/null
+++ b/x11-apps/xauth/xauth-1.0.9-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils xorg-2
+
+DESCRIPTION="X authority file utility"
+
+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 ~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}"
+
+RESTRICT="test"
+# Tests dependend on dev-util/cmdtest awaiting keywording, bug #511202.
+# test? ( dev-util/cmdtest )
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ )
+ xorg-2_src_configure
+}
+
+src_test() {
+ # Address sandbox failure, bug #527574
+ addwrite /proc/self/comm
+ autotools-utils_src_test
+}
diff --git a/x11-apps/xauth/xauth-1.0.9-r2.ebuild b/x11-apps/xauth/xauth-1.0.9-r2.ebuild
new file mode 100644
index 00000000000..ca4a5217f07
--- /dev/null
+++ b/x11-apps/xauth/xauth-1.0.9-r2.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils xorg-2
+
+DESCRIPTION="X authority file utility"
+
+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 ~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}"
+
+# Tests dependend on dev-util/cmdtest awaiting keywording, bug #511202.
+# test? ( dev-util/cmdtest )
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ )
+ xorg-2_src_configure
+}
+
+src_test() {
+ # Address sandbox failure, bug #527574
+ addwrite /proc/self/comm
+ autotools-utils_src_test
+}
diff --git a/x11-apps/xauth/xauth-1.0.9.ebuild b/x11-apps/xauth/xauth-1.0.9.ebuild
new file mode 100644
index 00000000000..3f565755784
--- /dev/null
+++ b/x11-apps/xauth/xauth-1.0.9.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="X authority file utility"
+
+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 ~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() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ )
+ xorg-2_pkg_setup
+}
diff --git a/x11-apps/xbacklight/Manifest b/x11-apps/xbacklight/Manifest
new file mode 100644
index 00000000000..f0f510c03fc
--- /dev/null
+++ b/x11-apps/xbacklight/Manifest
@@ -0,0 +1 @@
+DIST xbacklight-1.2.1.tar.bz2 117607 SHA256 17f6cf51a35eaa918abec36b7871d28b712c169312e22a0eaf1ffe8d6468362b SHA512 9a0afebea2fe155ab7d1ad00ef27566daeb7dc4fd47523511f1b8e8ac30977f938a08783bc0c7443fe92ebff1c17c68c78d44db08b32768d7831128130e0637d WHIRLPOOL fa72995cf28828226fc5d132da854ca9029a6654b160c2de500d5f6903e9267af460f4ee5a7c5ca1e7a71e096cb12f091556002b9dbc49001ea37c3c8d57c455
diff --git a/x11-apps/xbacklight/metadata.xml b/x11-apps/xbacklight/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xbacklight/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-apps/xbacklight/xbacklight-1.2.1.ebuild b/x11-apps/xbacklight/xbacklight-1.2.1.ebuild
new file mode 100644
index 00000000000..a1783a6d643
--- /dev/null
+++ b/x11-apps/xbacklight/xbacklight-1.2.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="Sets backlight level using the RandR 1.2 BACKLIGHT output property"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libxcb
+ >=x11-libs/xcb-util-0.3.8"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xbiff/Manifest b/x11-apps/xbiff/Manifest
new file mode 100644
index 00000000000..1ce002c46ec
--- /dev/null
+++ b/x11-apps/xbiff/Manifest
@@ -0,0 +1 @@
+DIST xbiff-1.0.3.tar.bz2 116043 RMD160 05a38bee9e9207e4630691ee430faefa055698eb SHA1 17337a951264f0f96f6d03893f9dfd9cf8f12a5a SHA256 aa1db4f31f7afcfe131bda7ff6e380ff7de41cf1a7009464783043c817c47ce8
diff --git a/x11-apps/xbiff/metadata.xml b/x11-apps/xbiff/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xbiff/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-apps/xbiff/xbiff-1.0.3.ebuild b/x11-apps/xbiff/xbiff-1.0.3.ebuild
new file mode 100644
index 00000000000..d84e1d58f69
--- /dev/null
+++ b/x11-apps/xbiff/xbiff-1.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="mailbox flag for X"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-misc/xbitmaps
+ x11-libs/libXext"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcalc/Manifest b/x11-apps/xcalc/Manifest
new file mode 100644
index 00000000000..e5e1b28c80a
--- /dev/null
+++ b/x11-apps/xcalc/Manifest
@@ -0,0 +1,2 @@
+DIST xcalc-1.0.5.tar.bz2 135451 SHA256 448f3aca106e86fbc051172cc4ea51eebce2fac096a7a971b8561b9b85697ae4 SHA512 8ca9cc8fda4cc0b4578342311e3cfa7ce69084f10bec7eca4b0cf6d2ad11bb7f188d89ad15b12b17a514fb02eb9758df96d514e605aa4bfe7e23fa028591a7ea WHIRLPOOL 31ad6759b674811351a554950621da010a41de11b763257d153ecd3c052a4eb6ca341371a7bc3ad241074ec7845bea327670b144369301e6a02255a899b29585
+DIST xcalc-1.0.6.tar.bz2 142808 SHA256 2f73c7160c09dc32586ea07daa408ac897c0a16eaa98cad9f9e4ee98cd9057d8 SHA512 61b921b6a3fefea20bd9e7ad0b308f589f2aeaafe9316df94cc739a005be6c180bdafc981b8957230f46c9fc1c0e266829a55b473ae26b1377c705796175c908 WHIRLPOOL 57436e9fc64f9365b038a1e047379fa9f5bd74eb56e1a150bfedf8a38ab1bb35c8372997ddb3f3350b2fc1efdea4528ed11861949899caef5de8a07828979b9f
diff --git a/x11-apps/xcalc/metadata.xml b/x11-apps/xcalc/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xcalc/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-apps/xcalc/xcalc-1.0.5.ebuild b/x11-apps/xcalc/xcalc-1.0.5.ebuild
new file mode 100644
index 00000000000..b4d0f3be3ba
--- /dev/null
+++ b/x11-apps/xcalc/xcalc-1.0.5.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="scientific calculator for X"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcalc/xcalc-1.0.6.ebuild b/x11-apps/xcalc/xcalc-1.0.6.ebuild
new file mode 100644
index 00000000000..11d032c28cf
--- /dev/null
+++ b/x11-apps/xcalc/xcalc-1.0.6.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="scientific calculator for X"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xclipboard/Manifest b/x11-apps/xclipboard/Manifest
new file mode 100644
index 00000000000..ae3f2bab9d3
--- /dev/null
+++ b/x11-apps/xclipboard/Manifest
@@ -0,0 +1,2 @@
+DIST xclipboard-1.1.2.tar.bz2 124971 SHA256 5f3b12da1eae4ed24883d8a5633b6150a0291deede818aeb5c9e827599b6429e SHA512 7e1dd40aec91caa7481c0ca0422f5b22c0bfddf8a264247c806393f3d567dde0c795439b05ba19bfa628d6dd323b851ae363f37492d481a1443988e2b6c114cf WHIRLPOOL f72104c02e4bafebf1f67d53d15a608c981a322acb04338bea1feb7a6dd6983c9740327b2a519e1b8b678dbe35d8bb9a28bc26637b7b42d7787af99896ac65d1
+DIST xclipboard-1.1.3.tar.bz2 132406 SHA256 9c0e0a1f4f1d49f73c6cf3ccd27b5ca0e18afc63679f1a1ee466b1d82446ebb5 SHA512 84a51d11851756422eb23e67b2721d2bcb2ac248fa32c0837423b6169144dff76717c22611ad3c93633e09a44dc70c847a2470d3988eff0b24d77e252a4e147e WHIRLPOOL 69741b7c43075dadb50a89d094afa13f24a14ac17fbc93232899739a7f97a829f1992b08600d99f967c2246c409b0b8c37c311f211c119c8c77c170ec3e31dfb
diff --git a/x11-apps/xclipboard/metadata.xml b/x11-apps/xclipboard/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xclipboard/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-apps/xclipboard/xclipboard-1.1.2.ebuild b/x11-apps/xclipboard/xclipboard-1.1.2.ebuild
new file mode 100644
index 00000000000..00843b387d3
--- /dev/null
+++ b/x11-apps/xclipboard/xclipboard-1.1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="interchange between cut buffer and selection"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libXaw
+ x11-libs/libxkbfile
+ x11-libs/libXmu
+ >=x11-libs/libXt-1.1
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xclipboard/xclipboard-1.1.3.ebuild b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
new file mode 100644
index 00000000000..e030aeb2cc6
--- /dev/null
+++ b/x11-apps/xclipboard/xclipboard-1.1.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="interchange between cut buffer and selection"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libXaw
+ x11-libs/libxkbfile
+ x11-libs/libXmu
+ >=x11-libs/libXt-1.1
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xclock/Manifest b/x11-apps/xclock/Manifest
new file mode 100644
index 00000000000..ba0076b3a8e
--- /dev/null
+++ b/x11-apps/xclock/Manifest
@@ -0,0 +1,2 @@
+DIST xclock-1.0.6.tar.bz2 156817 SHA256 21bb6f57b0a158c05a47558302321c4764a8d2e1b8e5d4ad23e3809b4cee3fd0 SHA512 78431bc38b15f395a69b672c618bf4126e73727f4df5e8a2744a258d0b856ab4c0f918ef4ff16994cc48f3ce61b291c632e150f19ee9b3dc9ffeb470c7cdae3a WHIRLPOOL c1ef3001c0a86026d7de6130d1765d0bc9fd9462dbc6927c6c50981db3685c5f6e84f421919fd709a26c061beb321776d7d6c302301b835a3ca68ceba2c63ddf
+DIST xclock-1.0.7.tar.bz2 164035 SHA256 23ceeca94e3e20a6c26a703ac7f789066d4517f8d2cb717ae7cb28a617d97dd0 SHA512 56689bdae6c83e9e1da5c4c48cf1136ca8b4f45b177f27bc1deeb24758e2c180035b639e8df72e3ebf32dc301bceb59118309fcce2ffab54e5abe9bfa645e607 WHIRLPOOL ebcc870b133d6ae03e39f3bc8f8eb65775ab9dda60fafa91d8609a002e0e797c2dda0879bd5a8c36fb5e2dbcc921defb2a35633fd902700c773a6c402baf7355
diff --git a/x11-apps/xclock/metadata.xml b/x11-apps/xclock/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xclock/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-apps/xclock/xclock-1.0.6.ebuild b/x11-apps/xclock/xclock-1.0.6.ebuild
new file mode 100644
index 00000000000..afa34cb37db
--- /dev/null
+++ b/x11-apps/xclock/xclock-1.0.6.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="analog / digital clock for X"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXrender
+ x11-libs/libXft
+ x11-libs/libxkbfile
+ x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xclock/xclock-1.0.7.ebuild b/x11-apps/xclock/xclock-1.0.7.ebuild
new file mode 100644
index 00000000000..f66fac90c4e
--- /dev/null
+++ b/x11-apps/xclock/xclock-1.0.7.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="analog / digital clock for X"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXrender
+ x11-libs/libXft
+ x11-libs/libxkbfile
+ x11-libs/libXaw"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcmsdb/Manifest b/x11-apps/xcmsdb/Manifest
new file mode 100644
index 00000000000..a26557fe567
--- /dev/null
+++ b/x11-apps/xcmsdb/Manifest
@@ -0,0 +1,2 @@
+DIST xcmsdb-1.0.4.tar.bz2 136502 SHA256 e460b9bee74200fac42294ae3762308b8c6024186d317f70a36acf41c338ba0e
+DIST xcmsdb-1.0.5.tar.bz2 145419 SHA256 e5585361bb8b6a05bb814a8d0e444ee93e0f00180881d3070aff4571e97f67c6 SHA512 e47bfce87d7531e7809c300e01120c3e8d6001130d9a6c9f6de5bc19651d8712d273a6f54452223bd8c4bff4612b5ecae8db45eddb022da945ed6e14c9c84ae4 WHIRLPOOL 46acb8bed2eaf99e434e8af342b4f799df5388541983a99ab5d3f958a01a0a89e20e8e1494c7a32cd16bc4217a1c4fb10d7954f3af69cb5768aafeed8d62886b
diff --git a/x11-apps/xcmsdb/metadata.xml b/x11-apps/xcmsdb/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xcmsdb/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-apps/xcmsdb/xcmsdb-1.0.4.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
new file mode 100644
index 00000000000..c3ddc56e83f
--- /dev/null
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="Device Color Characterization utility for X Color Management System"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
new file mode 100644
index 00000000000..c498ee96119
--- /dev/null
+++ b/x11-apps/xcmsdb/xcmsdb-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Device Color Characterization utility for X Color Management System"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xconsole/Manifest b/x11-apps/xconsole/Manifest
new file mode 100644
index 00000000000..3308f4f1ac8
--- /dev/null
+++ b/x11-apps/xconsole/Manifest
@@ -0,0 +1 @@
+DIST xconsole-1.0.6.tar.bz2 132225 SHA256 e561959b6ee8b735a32c1050015cfd8c551ed162cabb6cb72e36ce72966855d1 SHA512 115b3a03098ae3e06ba16af67afcd11c5a7906980ca04e8ec8ddd2c1dd4d02aab7a8952fd7f428861ad158052b9da8de11eab193de73e1f7264aca424e7cc620 WHIRLPOOL e3b99368138b4d09b492cabfdc0dbf12d6952d89a646a204f64d880427802889ea61467d455a3bc43d2c0d0047b5ca71df75624e52f0385298233cabb0d4e4a1
diff --git a/x11-apps/xconsole/metadata.xml b/x11-apps/xconsole/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xconsole/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-apps/xconsole/xconsole-1.0.6.ebuild b/x11-apps/xconsole/xconsole-1.0.6.ebuild
new file mode 100644
index 00000000000..ae315633633
--- /dev/null
+++ b/x11-apps/xconsole/xconsole-1.0.6.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="monitor system console messages with X"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE=""
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcursorgen/Manifest b/x11-apps/xcursorgen/Manifest
new file mode 100644
index 00000000000..d6cf428150c
--- /dev/null
+++ b/x11-apps/xcursorgen/Manifest
@@ -0,0 +1,2 @@
+DIST xcursorgen-1.0.5.tar.bz2 116340 SHA256 bc7171a0fa212da866fca2301241630e2009aea8c4ddb75f21b51a31c2e4c581 SHA512 9641ff9ea2ab22db23b0d6888ec9fb237961037b8b26ce00b47214d42824df7fe76a10b6ca9eb8d0bd2b127fcf22c445f9f10ccc5af4479ebd999d39b750b533 WHIRLPOOL 55a5cdc0a6fce49c1a7aa81379da9b62bd288b13b5f04b0730b6ea535c4f4ca3d079cf0908e7f420f787adf9126bb92992f9c2cf040eaefc4ff478b03de9ba42
+DIST xcursorgen-1.0.6.tar.bz2 124545 SHA256 31c8910f54eb175a8a74a60e7662697467e21a8bf948220a6048a93924b3f66c SHA512 3b464b7be3cec8c6d2bf4538266108bdc09e1dae4053d573f7f38e004929b41be0d996aa54918490fa040655644e2b0d4fab1ec24cca014d77bdb91c41ab1db4 WHIRLPOOL ecccd46753d23dc4bcc5370b7f4c8ca0ca3e4928ede49b6d3486e73ea45cfcaaaa19eaa72c1d7be25d35a64dacdc7812a7bcd5e7db665d7cde9219c5b710facf
diff --git a/x11-apps/xcursorgen/metadata.xml b/x11-apps/xcursorgen/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xcursorgen/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-apps/xcursorgen/xcursorgen-1.0.5.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild
new file mode 100644
index 00000000000..b04c81e9b9a
--- /dev/null
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+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 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXcursor
+ media-libs/libpng:0"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild b/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild
new file mode 100644
index 00000000000..03a9d5a6bc1
--- /dev/null
+++ b/x11-apps/xcursorgen/xcursorgen-1.0.6.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+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 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXcursor
+ media-libs/libpng:0="
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xdbedizzy/Manifest b/x11-apps/xdbedizzy/Manifest
new file mode 100644
index 00000000000..83e5df8c726
--- /dev/null
+++ b/x11-apps/xdbedizzy/Manifest
@@ -0,0 +1 @@
+DIST xdbedizzy-1.1.0.tar.bz2 110340 RMD160 d0542549284b8b812a68fc4683d02ffa47a82d00 SHA1 281bee72116311e2d8393ae53ea832e9d267eded SHA256 66507b359eb87a7649c9f78aadb7b11efc0a5ffacf9b259392ed54be42cc0d09
diff --git a/x11-apps/xdbedizzy/metadata.xml b/x11-apps/xdbedizzy/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xdbedizzy/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-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
new file mode 100644
index 00000000000..399dbceb7ce
--- /dev/null
+++ b/x11-apps/xdbedizzy/xdbedizzy-1.1.0.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xdbedizzy application"
+KEYWORDS="amd64 arm ~mips ppc ppc64 s390 sh ~sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXext
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ x11-proto/xproto"
diff --git a/x11-apps/xditview/Manifest b/x11-apps/xditview/Manifest
new file mode 100644
index 00000000000..50f72fe9d84
--- /dev/null
+++ b/x11-apps/xditview/Manifest
@@ -0,0 +1,2 @@
+DIST xditview-1.0.3.tar.bz2 143012 SHA256 30f0eaee7e740a080cfb29e3f57a1202e6a5a19a0bfb099c89060cc2986e0328 SHA512 74b7a7a483eda731840d2150bfab75628b91407f176b6cb64b03b992c05b6ff2426837489a12b12566b05450fc446e7433a541a4d0c52e27f843bef06fc91f67 WHIRLPOOL ae92a79218d3f2fd836926cb9131b159ba5666617e7b134b3eb100acae85f79a8007cfa14870fc581b158728b99181bf9622be7462dd5d252377a2831dc41b2c
+DIST xditview-1.0.4.tar.bz2 148842 SHA256 307f8df1bc3e90a7fba74dfe16840891c365abc027fbd556027eb057e5d1ff73 SHA512 7a0d023cd28ffc63c771814e028e79d20f8b56671a7a558c41ef062ef2d40079b5d37a5cf026b7ad3670da6866a087ae4888cea96d6d9e8a137e115174d637d2 WHIRLPOOL bab763ebce0bff923e62afb761ad62edae3c22e36229c8dfbedccbb02eb31705ccd03068975f789ac6d316ba4e5fd7a384fd985da4fa282ac211c5e62440c16a
diff --git a/x11-apps/xditview/metadata.xml b/x11-apps/xditview/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xditview/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-apps/xditview/xditview-1.0.3.ebuild b/x11-apps/xditview/xditview-1.0.3.ebuild
new file mode 100644
index 00000000000..fd91bd9d7bc
--- /dev/null
+++ b/x11-apps/xditview/xditview-1.0.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="display ditroff output"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xditview/xditview-1.0.4.ebuild b/x11-apps/xditview/xditview-1.0.4.ebuild
new file mode 100644
index 00000000000..3c2bded53aa
--- /dev/null
+++ b/x11-apps/xditview/xditview-1.0.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="display ditroff output"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xdm/Manifest b/x11-apps/xdm/Manifest
new file mode 100644
index 00000000000..87976e7526f
--- /dev/null
+++ b/x11-apps/xdm/Manifest
@@ -0,0 +1 @@
+DIST xdm-1.1.11.tar.bz2 446612 SHA256 d4da426ddea0124279a3f2e00a26db61944690628ee818a64df9d27352081c47 SHA512 fe6f2b7817c0f7f07a1f5f497edcdfa15b93986fd87f314daa472dac8625327ef46ebbf40d27fe8d4a8a2f8d5af8a01c4438a29356740e0eb350f2bd0c7ec0d5 WHIRLPOOL e505cfc5615d93ce8911f30b10b99698b38fa71dd468770616b95d34a0da2212f080f12a1457c715fc58beea56f4d9adc2f41dd63e3bf431b8d85182f0c250d8
diff --git a/x11-apps/xdm/files/Xsession b/x11-apps/xdm/files/Xsession
new file mode 100644
index 00000000000..ffeef4c8742
--- /dev/null
+++ b/x11-apps/xdm/files/Xsession
@@ -0,0 +1,73 @@
+#!/bin/bash --login
+#
+# $Xorg: Xsession,v 1.4 2000/08/17 19:54:17 cpqbld Exp $
+#
+#
+#
+#
+# $XFree86: xc/programs/xdm/config/Xsession,v 1.3 2001/01/17 23:45:24 dawes Exp $
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+do
+ if ( cp /dev/null "$errfile" 2> /dev/null )
+ then
+ chmod 600 "$errfile"
+ exec > "$errfile" 2>&1
+ break
+ fi
+done
+
+# handle KDM
+if [ -n "$1" ]; then
+ export XSESSION="$1"
+fi
+
+xinitdir=/usr/X11R6/lib/X11/xinit
+startup=$HOME/.xsession
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=$xinitdir/.Xresources
+sysmodmap=$xinitdir/.Xmodmap
+
+# First run the system default. Because KDE uses this
+# to switch sessions, we MUST first check the system
+# default, and then ~/.xsession. If the user Do not
+# want this, he should override XSESSION, or at least
+# clear it.
+if [ -n "`/etc/X11/chooser.sh`" ]; then
+ exec "`/etc/X11/chooser.sh`"
+# If not defined, try the user's ~/.xsession
+elif [ -s "$startup" ]; then
+
+ # merge in defaults and keymaps
+
+ if [ -f $sysresources ]; then
+ xrdb -merge $sysresources
+ fi
+
+ if [ -f $sysmodmap ]; then
+ xmodmap $sysmodmap
+ fi
+
+ if [ -f $userresources ]; then
+ xrdb -merge $userresources
+ fi
+
+ if [ -f $usermodmap ]; then
+ xmodmap $usermodmap
+ fi
+
+ if [ -x "$startup" ]; then
+ exec "$startup"
+ else
+ exec /bin/sh "$startup"
+ fi
+# Lastly, xsm as failsafe
+else
+ if [ -r "$userresources" ]; then
+ xrdb -load "$userresources"
+ fi
+ exec xsm
+fi
+
diff --git a/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch b/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch
new file mode 100644
index 00000000000..db948094b75
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.11-arc4random-include.patch
@@ -0,0 +1,18 @@
+diff -ur a/xdm/genauth.c b/xdm/genauth.c
+--- a/xdm/genauth.c 2011-09-25 09:35:47.000000000 +0200
++++ b/xdm/genauth.c 2014-01-06 16:28:09.664060603 +0100
+@@ -40,6 +40,14 @@
+
+ #include <errno.h>
+
++#ifdef HAVE_ARC4RANDOM
++# ifdef __linux__
++# include <bsd/stdlib.h>
++# else
++# include <stdlib.h>
++# endif
++#endif
++
+ #include <time.h>
+ #define Time_t time_t
+
diff --git a/x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch b/x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch
new file mode 100644
index 00000000000..34ae7ceb3cd
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.11-cve-2013-2179.patch
@@ -0,0 +1,41 @@
+From 8d1eb5c74413e4c9a21f689fc106949b121c0117 Mon Sep 17 00:00:00 2001
+From: mancha <mancha1@hush.com>
+Date: Wed, 22 May 2013 14:20:26 +0000
+Subject: Handle NULL returns from glibc 2.17+ crypt().
+
+Starting with glibc 2.17 (eglibc 2.17), crypt() fails with EINVAL
+(w/ NULL return) if the salt violates specifications. Additionally,
+on FIPS-140 enabled Linux systems, DES/MD5-encrypted passwords
+passed to crypt() fail with EPERM (w/ NULL return).
+
+If using glibc's crypt(), check return value to avoid a possible
+NULL pointer dereference.
+
+Reviewed-by: Matthieu Herrb <matthieu@herrb.eu>
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+diff --git a/greeter/verify.c b/greeter/verify.c
+index db3cb7d..b009e2b 100644
+--- a/greeter/verify.c
++++ b/greeter/verify.c
+@@ -329,6 +329,7 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
+ struct spwd *sp;
+ # endif
+ char *user_pass = NULL;
++ char *crypted_pass = NULL;
+ # endif
+ # ifdef __OpenBSD__
+ char *s;
+@@ -464,7 +465,9 @@ Verify (struct display *d, struct greet_info *greet, struct verify_info *verify)
+ # if defined(ultrix) || defined(__ultrix__)
+ if (authenticate_user(p, greet->password, NULL) < 0)
+ # else
+- if (strcmp (crypt (greet->password, user_pass), user_pass))
++ crypted_pass = crypt (greet->password, user_pass);
++ if ((crypted_pass == NULL)
++ || (strcmp (crypted_pass, user_pass)))
+ # endif
+ {
+ if(!greet->allow_null_passwd || strlen(p->pw_passwd) > 0) {
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch b/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch
new file mode 100644
index 00000000000..0a3f32bbea0
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-1.1.11-setproctitle-include.patch
@@ -0,0 +1,37 @@
+diff -ur a/xdm/choose.c b/xdm/choose.c
+--- a/xdm/choose.c 2011-09-25 09:35:47.000000000 +0200
++++ b/xdm/choose.c 2014-01-06 16:33:09.628065364 +0100
+@@ -54,6 +54,14 @@
+ # include <tiuser.h>
+ # endif
+
++# ifdef HAVE_SETPROCTITLE
++# ifdef __linux__
++# include <bsd/unistd.h>
++# else
++# include <unistd.h>
++# endif
++# endif
++
+ # include <time.h>
+ # define Time_t time_t
+
+diff -ur a/xdm/session.c b/xdm/session.c
+--- a/xdm/session.c 2011-09-25 09:35:47.000000000 +0200
++++ b/xdm/session.c 2014-01-06 16:40:57.508072789 +0100
+@@ -54,6 +54,15 @@
+ # include <usersec.h>
+ #endif
+
++# ifdef HAVE_SETPROCTITLE
++# include <sys/types.h>
++# ifdef __linux__
++# include <bsd/unistd.h>
++# else
++# include <unistd.h>
++# endif
++# endif
++
+ #ifndef USE_PAM /* PAM modules should handle these */
+ # ifdef SECURE_RPC
+ # include <rpc/rpc.h>
diff --git a/x11-apps/xdm/files/xdm-consolekit.patch b/x11-apps/xdm/files/xdm-consolekit.patch
new file mode 100644
index 00000000000..fbacd36fc07
--- /dev/null
+++ b/x11-apps/xdm/files/xdm-consolekit.patch
@@ -0,0 +1,230 @@
+http://bugs.gentoo.org/360987
+http://projects.archlinux.org/svntogit/packages.git/plain/trunk/xdm-consolekit.patch?h=packages/xorg-xdm
+http://lists.x.org/archives/xorg-devel/2011-February/019615.html
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=615020
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -362,6 +362,20 @@
+
+ AM_CONDITIONAL(DYNAMIC_GREETER, test x$DYNAMIC_GREETER = xyes)
+
++# ConsoleKit support
++AC_ARG_WITH(consolekit, AC_HELP_STRING([--with-consolekit], [Use ConsoleKit]),
++ [USE_CONSOLEKIT=$withval], [USE_CONSOLEKIT=yes])
++if test x"$USE_CONSOLEKIT" != xno; then
++ PKG_CHECK_MODULES(CK_CONNECTOR, ck-connector,
++ [USE_CONSOLEKIT=yes], [USE_CONSOLEKIT=no])
++ if test x"$USE_CONSOLEKIT" = xyes; then
++ AC_DEFINE([USE_CONSOLEKIT], 1, [Define to 1 to use ConsoleKit])
++ XDM_CFLAGS="$XDM_CFLAGS $CK_CONNECTOR_CFLAGS -DUSE_CONSOLEKIT"
++ XDM_LIBS="$XDM_LIBS $CK_CONNECTOR_LIBS"
++ fi
++fi
++dnl AM_CONDITIONAL(USE_CONSOLEKIT, test$USE_CONSOLEKIT = xyes)
++
+ #
+ # XDM
+ #
+--- a/xdm/session.c
++++ b/xdm/session.c
+@@ -66,6 +66,11 @@
+ #endif
+ #endif /* USE_PAM */
+
++#ifdef USE_CONSOLEKIT
++#include <ck-connector.h>
++#include <dbus/dbus.h>
++#endif
++
+ #ifdef __SCO__
+ #include <prot.h>
+ #endif
+@@ -472,6 +477,97 @@
+ }
+ }
+
++#ifdef USE_CONSOLEKIT
++
++static CkConnector *connector;
++
++static int openCKSession(struct verify_info *verify, struct display *d)
++{
++ int ret;
++ DBusError error;
++ char *remote_host_name = "";
++ dbus_bool_t is_local;
++ char *display_name = "";
++ char *display_device = "";
++ char devtmp[16];
++
++ if (!use_consolekit)
++ return 1;
++
++ is_local = d->displayType.location == Local;
++ if (d->peerlen > 0 && d->peer)
++ remote_host_name = d->peer;
++ if (d->name)
++ display_name = d->name;
++ /* how can we get the corresponding tty at best...? */
++ if (d->windowPath) {
++ display_device = strchr(d->windowPath, ':');
++ if (display_device && display_device[1])
++ display_device++;
++ else
++ display_device = d->windowPath;
++ snprintf(devtmp, sizeof(devtmp), "/dev/tty%s", display_device);
++ display_device = devtmp;
++ }
++
++ connector = ck_connector_new();
++ if (!connector) {
++ LogOutOfMem("ck_connector");
++ return 0;
++ }
++
++ dbus_error_init(&error);
++ ret = ck_connector_open_session_with_parameters(
++ connector, &error,
++ "unix-user", &verify->uid,
++ "x11-display", &display_name,
++ "x11-display-device", &display_device,
++ "remote-host-name", &remote_host_name,
++ "is-local", &is_local,
++ NULL);
++ if (!ret) {
++ if (dbus_error_is_set(&error)) {
++ LogError("Dbus error: %s\n", error.message);
++ dbus_error_free(&error);
++ } else {
++ LogError("ConsoleKit error\n");
++ }
++ LogError("console-kit-daemon not running?\n");
++ ck_connector_unref(connector);
++ connector = NULL;
++ return 0;
++ }
++
++ verify->userEnviron = setEnv(verify->userEnviron,
++ "XDG_SESSION_COOKIE", ck_connector_get_cookie(connector));
++ return 1;
++}
++
++static void closeCKSession(void)
++{
++ DBusError error;
++
++ if (!connector)
++ return;
++
++ dbus_error_init(&error);
++ if (!ck_connector_close_session(connector, &error)) {
++ if (dbus_error_is_set(&error)) {
++ LogError("Dbus error: %s\n", error.message);
++ dbus_error_free(&error);
++ } else {
++ LogError("ConsoleKit close error\n");
++ }
++ LogError("console-kit-daemon not running?\n");
++ }
++ ck_connector_unref(connector);
++ connector = NULL;
++}
++#else
++#define openCKSession(v,d) 1
++#define closeCKSession()
++#endif
++
+ void
+ SessionExit (struct display *d, int status, int removeAuth)
+ {
+@@ -486,6 +580,8 @@
+ }
+ #endif
+
++ closeCKSession();
++
+ /* make sure the server gets reset after the session is over */
+ if (d->serverPid >= 2 && d->resetSignal)
+ kill (d->serverPid, d->resetSignal);
+@@ -568,6 +664,10 @@
+ #ifdef USE_PAM
+ if (pamh) pam_open_session(pamh, 0);
+ #endif
++
++ if (!openCKSession(verify, d))
++ return 0;
++
+ switch (pid = fork ()) {
+ case 0:
+ CleanUpChild ();
+--- a/include/dm.h
++++ b/include/dm.h
+@@ -325,6 +325,9 @@
+ extern char *prngdSocket;
+ extern int prngdPort;
+ # endif
++#ifdef USE_CONSOLEKIT
++extern int use_consolekit;
++#endif
+
+ extern char *greeterLib;
+ extern char *willing;
+--- a/xdm/resource.c
++++ b/xdm/resource.c
+@@ -68,6 +68,9 @@
+ char *prngdSocket;
+ int prngdPort;
+ #endif
++#ifdef USE_CONSOLEKIT
++int use_consolekit;
++#endif
+
+ char *greeterLib;
+ char *willing;
+@@ -258,6 +261,10 @@
+ "false"} ,
+ { "willing", "Willing", DM_STRING, &willing,
+ ""} ,
++#ifdef USE_CONSOLEKIT
++{ "consoleKit", "ConsoleKit", DM_BOOL, (char **) &use_consolekit,
++ "true"} ,
++#endif
+ };
+
+ # define NUM_DM_RESOURCES (sizeof DmResources / sizeof DmResources[0])
+@@ -440,7 +447,11 @@
+ {"-debug", "*debugLevel", XrmoptionSepArg, (caddr_t) NULL },
+ {"-xrm", NULL, XrmoptionResArg, (caddr_t) NULL },
+ {"-daemon", ".daemonMode", XrmoptionNoArg, "true" },
+-{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" }
++{"-nodaemon", ".daemonMode", XrmoptionNoArg, "false" },
++#ifdef USE_CONSOLEKIT
++{"-consolekit", ".consoleKit", XrmoptionNoArg, "true" },
++{"-noconsolekit", ".consoleKit", XrmoptionNoArg, "false" }
++#endif
+ };
+
+ static int originalArgc;
+--- a/man/xdm.man
++++ b/man/xdm.man
+@@ -51,6 +51,8 @@
+ ] [
+ .B \-session
+ .I session_program
++] [
++.B \-noconsolekit
+ ]
+ .SH DESCRIPTION
+ .I Xdm
+@@ -218,6 +220,10 @@
+ .IP "\fB\-xrm\fP \fIresource_specification\fP"
+ Allows an arbitrary resource to be specified, as in most
+ X Toolkit applications.
++.IP "\fB\-noconsolekit\fP"
++Specifies ``false'' as the value for the \fBDisplayManager.consoleKit\fP
++resource.
++This suppresses the session management using ConsoleKit.
+ .SH RESOURCES
+ At many stages the actions of
+ .I xdm
diff --git a/x11-apps/xdm/metadata.xml b/x11-apps/xdm/metadata.xml
new file mode 100644
index 00000000000..7582fba5689
--- /dev/null
+++ b/x11-apps/xdm/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>x11</herd>
+ <use>
+ <flag name='consolekit'>Enable native <pkg>sys-auth/consolekit</pkg> support</flag>
+ <flag name='xdm-auth'>Enable XDM-AUTHENTICATION-1 support</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-apps/xdm/xdm-1.1.11-r1.ebuild b/x11-apps/xdm/xdm-1.1.11-r1.ebuild
new file mode 100644
index 00000000000..6afee5ada7a
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.11-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_EAUTORECONF=yes
+
+inherit multilib xorg-2 pam systemd
+
+DEFAULTVT=vt7
+
+DESCRIPTION="X.Org xdm application"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE="consolekit ipv6 pam"
+
+RDEPEND="x11-apps/xrdb
+ x11-libs/libXdmcp
+ x11-libs/libXaw
+ >=x11-apps/xinit-1.0.2-r3
+ x11-libs/libXinerama
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-apps/sessreg
+ x11-apps/xconsole
+ consolekit? ( sys-auth/consolekit )
+ pam? ( virtual/pam )
+ !<sys-apps/systemd-187"
+DEPEND="${RDEPEND}
+ consolekit? ( !=sys-auth/pambase-20101024-r1 )
+ x11-proto/xineramaproto
+ x11-proto/xproto"
+
+pkg_setup() {
+ PATCHES=( "${FILESDIR}"/${PN}-consolekit.patch )
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_with pam)
+ "$(systemd_with_unitdir)"
+ --with-default-vt=${DEFAULTVT}
+ --with-xdmconfigdir=/etc/X11/xdm
+ $(use_with consolekit)
+ )
+}
+
+src_prepare() {
+ # fedora invented that in -187...
+ sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
+ xdm.service.in || die
+
+ xorg-2_src_prepare
+}
+
+src_install() {
+ xorg-2_src_install
+
+ exeinto /usr/$(get_libdir)/X11/xdm
+ doexe "${FILESDIR}"/Xsession
+
+ use pam && pamd_mimic system-local-login xdm auth account session
+
+ # Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
+ keepdir /var/lib/xdm
+}
diff --git a/x11-apps/xdm/xdm-1.1.11-r2.ebuild b/x11-apps/xdm/xdm-1.1.11-r2.ebuild
new file mode 100644
index 00000000000..d20f481a061
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.11-r2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_EAUTORECONF=yes
+
+inherit multilib xorg-2 pam systemd
+
+DEFAULTVT=vt7
+
+DESCRIPTION="X.Org xdm application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="consolekit ipv6 pam"
+
+RDEPEND="x11-apps/xrdb
+ x11-libs/libXdmcp
+ x11-libs/libXaw
+ >=x11-apps/xinit-1.0.2-r3
+ x11-libs/libXinerama
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-apps/sessreg
+ x11-apps/xconsole
+ consolekit? ( sys-auth/consolekit )
+ pam? ( virtual/pam )
+ !<sys-apps/systemd-187"
+DEPEND="${RDEPEND}
+ consolekit? ( !=sys-auth/pambase-20101024-r1 )
+ x11-proto/xineramaproto
+ x11-proto/xproto"
+
+pkg_setup() {
+ PATCHES=( "${FILESDIR}"/${PN}-consolekit.patch )
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_with pam)
+ "$(systemd_with_unitdir)"
+ --with-default-vt=${DEFAULTVT}
+ --with-xdmconfigdir=/etc/X11/xdm
+ $(use_with consolekit)
+ )
+}
+
+src_prepare() {
+ # fedora invented that in -187...
+ sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
+ xdm.service.in || die
+
+ # disable XDM-AUTHENTICATION-1 wrt bug #445662.
+ # it causes issue with libreoffice and SDL games (bug #306223).
+ sed -i -e '/authorize/a\
+DisplayManager*authName: MIT-MAGIC-COOKIE-1' \
+ config/xdm-config.cpp || die
+
+ xorg-2_src_prepare
+}
+
+src_install() {
+ xorg-2_src_install
+
+ exeinto /usr/$(get_libdir)/X11/xdm
+ doexe "${FILESDIR}"/Xsession
+
+ use pam && pamd_mimic system-local-login xdm auth account session
+
+ # Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
+ keepdir /var/lib/xdm
+}
diff --git a/x11-apps/xdm/xdm-1.1.11-r3.ebuild b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
new file mode 100644
index 00000000000..9b25e25ed00
--- /dev/null
+++ b/x11-apps/xdm/xdm-1.1.11-r3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_EAUTORECONF=yes
+
+inherit multilib xorg-2 pam systemd
+
+DEFAULTVT=vt7
+
+DESCRIPTION="X.Org xdm application"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="consolekit ipv6 pam xdm-auth"
+
+RDEPEND="x11-apps/xrdb
+ x11-libs/libXdmcp
+ x11-libs/libXaw
+ >=x11-apps/xinit-1.0.2-r3
+ x11-libs/libXinerama
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-apps/sessreg
+ x11-apps/xconsole
+ consolekit? ( sys-auth/consolekit )
+ pam? ( virtual/pam )
+ !<sys-apps/systemd-187"
+DEPEND="${RDEPEND}
+ consolekit? ( !=sys-auth/pambase-20101024-r1 )
+ x11-proto/xineramaproto
+ x11-proto/xproto"
+
+pkg_setup() {
+ PATCHES=(
+ "${FILESDIR}"/${PN}-consolekit.patch
+ "${FILESDIR}"/${P}-cve-2013-2179.patch
+ "${FILESDIR}"/${PN}-1.1.11-arc4random-include.patch
+ "${FILESDIR}"/${PN}-1.1.11-setproctitle-include.patch
+ )
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_with pam)
+ "$(systemd_with_unitdir)"
+ --with-default-vt=${DEFAULTVT}
+ --with-xdmconfigdir=/etc/X11/xdm
+ $(use_with consolekit)
+ )
+}
+
+src_prepare() {
+ # fedora invented that in -187...
+ sed -i -e 's:^Alias=.*$:Alias=display-manager.service:' \
+ xdm.service.in || die
+
+ # disable XDM-AUTHENTICATION-1 wrt bug #445662.
+ # it causes issue with libreoffice and SDL games (bug #306223).
+ if use !xdm-auth; then
+ sed -i -e '/authorize/a\
+DisplayManager*authName: MIT-MAGIC-COOKIE-1' \
+ config/xdm-config.cpp || die
+ fi
+ xorg-2_src_prepare
+}
+
+src_install() {
+ xorg-2_src_install
+
+ exeinto /usr/$(get_libdir)/X11/xdm
+ doexe "${FILESDIR}"/Xsession
+
+ use pam && pamd_mimic system-local-login xdm auth account session
+
+ # Keep /var/lib/xdm. This is where authfiles are stored. See #286350.
+ keepdir /var/lib/xdm
+}
diff --git a/x11-apps/xdpyinfo/Manifest b/x11-apps/xdpyinfo/Manifest
new file mode 100644
index 00000000000..8268044b346
--- /dev/null
+++ b/x11-apps/xdpyinfo/Manifest
@@ -0,0 +1,2 @@
+DIST xdpyinfo-1.3.1.tar.bz2 136412 SHA256 aef9285069a517ed870e5d8a02d13f7d8a953d7f7220146da563e04c7f128b94 SHA512 1d9f5948f04bf555181f7989bd25dd4559226f757a8452493cfa7ba0ed33112502df28ea702e48c384e801360ea1b6374a1e3f626bd56b7a855016c12b7ad927 WHIRLPOOL e58937ca09d7b80fa7502979dba66b491c1bbe8ff7aee3ccece6245f348658e3fae9cbf3e152ec76c2e517c1d37630e8a8d89fdc37d6cdd1b97cd94373e24b87
+DIST xdpyinfo-1.3.2.tar.bz2 141351 SHA256 30238ed915619e06ceb41721e5f747d67320555cc38d459e954839c189ccaf51 SHA512 2c9097c13778c7a7fe5a9b3ee04b28512ff6028231eca91ecdf6104c742be470678920d37a4f540fece7e39dccbea34802271f359ab80618027b2856c8912e7d WHIRLPOOL 1635b93df53141f40f9fd396616259361452163b6f44e7d904a4780cc7a19e2411b9bb18a139b3123433ec26fbc66d5ad3845787b51edcf8a04123165bbb2b96
diff --git a/x11-apps/xdpyinfo/metadata.xml b/x11-apps/xdpyinfo/metadata.xml
new file mode 100644
index 00000000000..1400b5f618c
--- /dev/null
+++ b/x11-apps/xdpyinfo/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<use>
+ <flag name='dmx'>Builds support for Distributed Multiheaded X
+ <pkg>x11-base/xorg-server</pkg></flag>
+</use>
+</pkgmetadata>
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
new file mode 100644
index 00000000000..3660d84c4d2
--- /dev/null
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Display information utility for X"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~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
+ x11-libs/libxcb
+ 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() {
+ XORG_CONFIGURE_OPTIONS=(
+ "--without-xf86misc"
+ $(use_with dga)
+ $(use_with dmx)
+ $(use_with xinerama)
+ )
+
+}
diff --git a/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
new file mode 100644
index 00000000000..2220f8dce70
--- /dev/null
+++ b/x11-apps/xdpyinfo/xdpyinfo-1.3.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Display information utility for X"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~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
+ x11-libs/libxcb
+ 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() {
+ XORG_CONFIGURE_OPTIONS=(
+ "--without-xf86misc"
+ $(use_with dga)
+ $(use_with dmx)
+ $(use_with xinerama)
+ )
+
+}
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
new file mode 100644
index 00000000000..24b74457724
--- /dev/null
+++ b/x11-apps/xdriinfo/Manifest
@@ -0,0 +1,2 @@
+DIST xdriinfo-1.0.4.tar.bz2 104296 SHA256 35c6e43d3b68ef5d93d013b4517014fb890bad96b2c801abf4f607927a94cb1c
+DIST xdriinfo-1.0.5.tar.bz2 121276 SHA256 4cba3766ef89557422062287248adeb933999071bad6f3ef9c0a478a3c680119 SHA512 6b7a3641f488d305f950c494464fd4b674ab3aaed5c7159d6d8ddad4587c18d680e5854bd80666444f1dee52eb4f46b45709a6d9c333593fe045c73e738524de WHIRLPOOL 771caf038bb15f174b85e5e930f5822ce559f53bd1b191206bf0a55f2f4619a0b018866b1bbe84adf55dbd6c7d4bec696b62ce89f57f9bd1223e7644da7c4e18
diff --git a/x11-apps/xdriinfo/metadata.xml b/x11-apps/xdriinfo/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xdriinfo/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-apps/xdriinfo/xdriinfo-1.0.4.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
new file mode 100644
index 00000000000..5e617ccd0ef
--- /dev/null
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.4.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="query configuration information of DRI drivers"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~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/"
+
+}
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
new file mode 100644
index 00000000000..ec780faea6c
--- /dev/null
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.5.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2 flag-o-matic multilib
+
+DESCRIPTION="query configuration information of DRI drivers"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~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/$(get_libdir)/opengl/xorg-x11/include/"
+
+}
diff --git a/x11-apps/xedit/Manifest b/x11-apps/xedit/Manifest
new file mode 100644
index 00000000000..c07297de70c
--- /dev/null
+++ b/x11-apps/xedit/Manifest
@@ -0,0 +1,2 @@
+DIST xedit-1.2.1.tar.bz2 520614 SHA256 89b0b0f86b0b5ab2898ee669d394b28c6ac5a9a53f8fae1726ba5664cd36c98e SHA512 8c0675e39219ce4da02f2fc09ba39a5ff774213d155ad2dfd55e7672ab896219e815b12a4a86f3c72dfd6fd32e75bcdaaefdecab81fa5a10aebf0ed6b88e5af7 WHIRLPOOL af96c09cd1fa4ffdf4cc50cb01280f1c8473624c52b8437ce5daecba391e3a9eec9a511bbb913cdc7538b7eb2184727857a1ca69cf88f3609579741fd32b5a5c
+DIST xedit-1.2.2.tar.bz2 525861 SHA256 69aa42885dfc06332ca22eb01cc7187e49206e6d65b74113a8ee4cc345fc2927 SHA512 24d8e23a2ad1a2e81f6606928bb032f25b70b76da83b65341367bc4111d011abe89f9e30402d057854f2ccdaa9c1ef0d7c55bf29b81ab2d050a8f448cf3eeb5d WHIRLPOOL d7c61114e4b4b4afccf9ebefe36fda3c27f40bc0d490b07915278f9b6536393fc5e7320a537627efcaea5f69f50c25b234cd523a95438c8d3543082990d32178
diff --git a/x11-apps/xedit/metadata.xml b/x11-apps/xedit/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xedit/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-apps/xedit/xedit-1.2.1.ebuild b/x11-apps/xedit/xedit-1.2.1.ebuild
new file mode 100644
index 00000000000..064fb23f5c6
--- /dev/null
+++ b/x11-apps/xedit/xedit-1.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="simple text editor for X"
+KEYWORDS="amd64 hppa ~mips ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xedit/xedit-1.2.2.ebuild b/x11-apps/xedit/xedit-1.2.2.ebuild
new file mode 100644
index 00000000000..0e454944d2f
--- /dev/null
+++ b/x11-apps/xedit/xedit-1.2.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="simple text editor for X"
+KEYWORDS="~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xev/Manifest b/x11-apps/xev/Manifest
new file mode 100644
index 00000000000..e2cbad6a412
--- /dev/null
+++ b/x11-apps/xev/Manifest
@@ -0,0 +1,2 @@
+DIST xev-1.2.1.tar.bz2 125884 SHA256 11f17fab097f17d9efc51ea9d0e3140bea3904eb3c486afa7c8c3eedab496243 SHA512 6fbe8e69eeeafff4561b695293f23d9ce0f20261474f4a0f0281278b13f11e7ed9efd49f2712586f909e3e7a26b9fe39f8e98b50a2bf189d077668fc67388d19 WHIRLPOOL a3f82a81feeada1ee10707c685d5857e8ee2e9c85be6f35d714cb7f56fc26b828c381382207aabc77d09c3726dfc93949b1411e6b4d97bd1c0433b9291622845
+DIST xev-1.2.2.tar.bz2 132596 SHA256 d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f SHA512 453fc18072e4d4fd088a1b2e918f3772aaa2c56b36c082deb41ec4d434d1579de75f447fc4e0507086c170152e02d6db8b60dc7fd87ae18a2e817448bd628fca WHIRLPOOL b3ff75ad2a55a3015fd2de67af37b80a2df5ad891325f93ce9f1b8b0fc8d8a05ca9588bea8ade3f37b3b546670acd8f3902c1cae7362d062da0b4101414cbf94
diff --git a/x11-apps/xev/metadata.xml b/x11-apps/xev/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xev/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-apps/xev/xev-1.2.1.ebuild b/x11-apps/xev/xev-1.2.1.ebuild
new file mode 100644
index 00000000000..521568a9572
--- /dev/null
+++ b/x11-apps/xev/xev-1.2.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="print contents of X events"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
diff --git a/x11-apps/xev/xev-1.2.2.ebuild b/x11-apps/xev/xev-1.2.2.ebuild
new file mode 100644
index 00000000000..134c693d203
--- /dev/null
+++ b/x11-apps/xev/xev-1.2.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Print contents of X events"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
diff --git a/x11-apps/xeyes/Manifest b/x11-apps/xeyes/Manifest
new file mode 100644
index 00000000000..e2ebab8d0e8
--- /dev/null
+++ b/x11-apps/xeyes/Manifest
@@ -0,0 +1 @@
+DIST xeyes-1.1.1.tar.bz2 113757 RMD160 cc232409952e59e6d8e634c2728edde88bc4ed62 SHA1 efe6116d31a7f69e4fb6038613e52b0960b9b61c SHA256 975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521
diff --git a/x11-apps/xeyes/metadata.xml b/x11-apps/xeyes/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xeyes/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-apps/xeyes/xeyes-1.1.1.ebuild b/x11-apps/xeyes/xeyes-1.1.1.ebuild
new file mode 100644
index 00000000000..1d574c7b571
--- /dev/null
+++ b/x11-apps/xeyes/xeyes-1.1.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xeyes application"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~sparc64-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXrender"
+DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="--with-xrender"
diff --git a/x11-apps/xf86dga/Manifest b/x11-apps/xf86dga/Manifest
new file mode 100644
index 00000000000..8d3fdad3425
--- /dev/null
+++ b/x11-apps/xf86dga/Manifest
@@ -0,0 +1 @@
+DIST xf86dga-1.0.3.tar.bz2 104935 RMD160 4243e1b567fcc4b649ee413e51ca8987104984f3 SHA1 030659e3728f5f7142e1cf727f147aceeabe4b9e SHA256 b4d87411049d5edb6f33b7e57bceb5a07e41ec5c48900aef492fb0ff74e6a252
diff --git a/x11-apps/xf86dga/metadata.xml b/x11-apps/xf86dga/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xf86dga/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-apps/xf86dga/xf86dga-1.0.3.ebuild b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
new file mode 100644
index 00000000000..035e8012ff6
--- /dev/null
+++ b/x11-apps/xf86dga/xf86dga-1.0.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="test program for the XFree86-DGA extension"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ >=x11-libs/libXxf86dga-1.1"
+DEPEND="${RDEPEND}
+ x11-proto/xf86dgaproto"
diff --git a/x11-apps/xfd/Manifest b/x11-apps/xfd/Manifest
new file mode 100644
index 00000000000..087c22b7d36
--- /dev/null
+++ b/x11-apps/xfd/Manifest
@@ -0,0 +1 @@
+DIST xfd-1.1.2.tar.bz2 137632 SHA256 c1a32222fbb891e46f9a82ebab005bc5e54ce006a2586195ec9ea7ab308e2759 SHA512 3a158f697dd40c5b650b3d80ad1692d668d9d9bcf586a437fd3dcebf9e8fffb773855df290260995464d5f36cb22e768d1d71de8e61d7cca80eaa4d25c029745 WHIRLPOOL 0945666ff9ea20426801253851da29cd488e895311ae22f03e74015f890f8ead36bcfa32b8bb1d3372980e25646381dfb1335a6713127cfde7821b898d5629e2
diff --git a/x11-apps/xfd/metadata.xml b/x11-apps/xfd/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xfd/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-apps/xfd/xfd-1.1.2.ebuild b/x11-apps/xfd/xfd-1.1.2.ebuild
new file mode 100644
index 00000000000..5443eb6e0d9
--- /dev/null
+++ b/x11-apps/xfd/xfd-1.1.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xfd application"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="media-libs/freetype:2
+ media-libs/fontconfig
+ x11-libs/libXft
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-libs/libXrender
+ x11-libs/libXaw"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
diff --git a/x11-apps/xfontsel/Manifest b/x11-apps/xfontsel/Manifest
new file mode 100644
index 00000000000..63bc2c2b2b0
--- /dev/null
+++ b/x11-apps/xfontsel/Manifest
@@ -0,0 +1,2 @@
+DIST xfontsel-1.0.4.tar.bz2 136256 SHA256 25491e9b7762607299f8a7099c97452d9b83e92266f8b0579b380ca01e5a5f7e SHA512 0c5eeb39b77a10607dce4c42f710864b750de04b06b4d746ed804757b6d1e4357679d52d30155f506c69f5186162da756132689b5e38bd9694bfaf9d004ee452 WHIRLPOOL b06d10f7d818daa73cd4c9fde987f92acfbbc3aead77a6147da9c26a851b8d53173178974b19b67c0c6124bfdf246732cf1bf29675362fdb4904ebdef9d63f32
+DIST xfontsel-1.0.5.tar.bz2 139801 SHA256 170d8550b96fb47b04db6181b947e6f6b8b97f4df5d691c351a278480cc931bf SHA512 df7a49286b94f64c610ab990d66376dedc12e3e8fa1d803641f466c3f6ebfdd06e81e4c7be39f8e6234928305f397d877579c39cf24c319dd5deead56f2578a4 WHIRLPOOL 8afe6704baab55503d6ef69d02d8ce46b1813ee2314134d8446f2f7218407551513acef0bd9c564e12fddb950cbc4ff87d30b69acddd40efeb9f17c128cddacf
diff --git a/x11-apps/xfontsel/metadata.xml b/x11-apps/xfontsel/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xfontsel/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-apps/xfontsel/xfontsel-1.0.4.ebuild b/x11-apps/xfontsel/xfontsel-1.0.4.ebuild
new file mode 100644
index 00000000000..9034195fdd3
--- /dev/null
+++ b/x11-apps/xfontsel/xfontsel-1.0.4.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="point and click selection of X11 font names"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xfontsel/xfontsel-1.0.5.ebuild b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
new file mode 100644
index 00000000000..35bc633ed4b
--- /dev/null
+++ b/x11-apps/xfontsel/xfontsel-1.0.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="point and click selection of X11 font names"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgamma/Manifest b/x11-apps/xgamma/Manifest
new file mode 100644
index 00000000000..5a6d0e81c18
--- /dev/null
+++ b/x11-apps/xgamma/Manifest
@@ -0,0 +1,2 @@
+DIST xgamma-1.0.5.tar.bz2 115035 SHA256 e322a2fea80d559c09d6bc285ebe1a9e454dbeae2a07116cb7d2207db9d2c310
+DIST xgamma-1.0.6.tar.bz2 123105 SHA256 0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3 SHA512 2d41798e15ac8c6f6731a2da29589207d936eaee1223ce6f3ca948e67d63c5c8b955d11c7db092dcd8c66a6209bd15c1de3dc1446dad4b4277134f010c6fc47a WHIRLPOOL 83ba23e63a587f3600f6fa8528fd4bb437e78983956d2dcc4fc3dd4c050624cd7fef97f4c1b5044e20225e79168b63b5f8ff01c3ca90826c83722ec2d0fcf89c
diff --git a/x11-apps/xgamma/metadata.xml b/x11-apps/xgamma/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xgamma/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-apps/xgamma/xgamma-1.0.5.ebuild b/x11-apps/xgamma/xgamma-1.0.5.ebuild
new file mode 100644
index 00000000000..553b26df4b4
--- /dev/null
+++ b/x11-apps/xgamma/xgamma-1.0.5.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="Alter a monitor's gamma correction through the X server"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXxf86vm
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto"
diff --git a/x11-apps/xgamma/xgamma-1.0.6.ebuild b/x11-apps/xgamma/xgamma-1.0.6.ebuild
new file mode 100644
index 00000000000..368c176a3b5
--- /dev/null
+++ b/x11-apps/xgamma/xgamma-1.0.6.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Alter a monitor's gamma correction through the X server"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXxf86vm
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto"
diff --git a/x11-apps/xgc/Manifest b/x11-apps/xgc/Manifest
new file mode 100644
index 00000000000..71656631e23
--- /dev/null
+++ b/x11-apps/xgc/Manifest
@@ -0,0 +1,2 @@
+DIST xgc-1.0.4.tar.bz2 180138 SHA256 5ed8dc52619ed563ad51b8428a1e1678cdd40b30e8160396ee9e41b46f247e8d SHA512 c2156eb1c6dcc838d9b21ac9e45b188a92dadc991875c3c9497a18bae36212c01cf4c2c6df04830664da4e010880d2d84663e00aaa5e17082211ba969d480390 WHIRLPOOL e56291bf58b8c1886b9b5a24e34f7cf31599ac06faf5c6aefeab452cc7076b2546fda3678064c44031f6c482c0bea4b1d1c3c5e02d19b1321a694217c62143ba
+DIST xgc-1.0.5.tar.bz2 188307 SHA256 14828d9bda358ad57efc0206bc416ee33ba542091edb186485cca5389adc2f5e SHA512 5943d13b9e0ed5e1b66d26eaa4b39d16d71f0df23e3ea93bfc397b6303516b161c2b60b24679ed75b640bf2493e66682d35efc7cedd41c5b57caa65f309a8314 WHIRLPOOL 4cdbc9b82254a91b5f53a44f9e0902f73636aa0d7924898793e077853612f17c64029a8b53eaee7966b55d3ea658ece8525b483e90734249cba9e5b5dd4e4d65
diff --git a/x11-apps/xgc/metadata.xml b/x11-apps/xgc/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xgc/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-apps/xgc/xgc-1.0.4.ebuild b/x11-apps/xgc/xgc-1.0.4.ebuild
new file mode 100644
index 00000000000..5ec538e817a
--- /dev/null
+++ b/x11-apps/xgc/xgc-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X graphics demo"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xgc/xgc-1.0.5.ebuild b/x11-apps/xgc/xgc-1.0.5.ebuild
new file mode 100644
index 00000000000..43b36670901
--- /dev/null
+++ b/x11-apps/xgc/xgc-1.0.5.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X graphics demo"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xhost/Manifest b/x11-apps/xhost/Manifest
new file mode 100644
index 00000000000..825d1df18d1
--- /dev/null
+++ b/x11-apps/xhost/Manifest
@@ -0,0 +1,2 @@
+DIST xhost-1.0.6.tar.bz2 133176 SHA256 a6f5b922df0a7be5d3ba43f525fa8e69c539c738418f013a0b7adaa423a89dc2 SHA512 4e9b8b5b3a13b995e4f3596b26fa637d5892936090516eef1eb296c257358496ed5ad7b5c1e924003fcc18b6c8d4592f83e515d66a605a895f1d9fdc5d064f1a WHIRLPOOL 012c875be11a4cb6e4df884659fc08218e2f1ee3d8499c60bcd7d5227a7a0bad23c41fdfbf566eafc690b61dfdedab9e88bc47e8123816190baf871b616226f9
+DIST xhost-1.0.7.tar.bz2 135767 SHA256 93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a SHA512 670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7 WHIRLPOOL 4960cf6263d698a2e016e493441d358a44670251ac5c4e7545913de57c9e0e7064efa9dcc421dd6dd6f4c545d2265adc4f41d99701764a20d84d2adee37c6574
diff --git a/x11-apps/xhost/metadata.xml b/x11-apps/xhost/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xhost/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-apps/xhost/xhost-1.0.6.ebuild b/x11-apps/xhost/xhost-1.0.6.ebuild
new file mode 100644
index 00000000000..42a2f8a6a29
--- /dev/null
+++ b/x11-apps/xhost/xhost-1.0.6.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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() {
+ XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)"
+}
diff --git a/x11-apps/xhost/xhost-1.0.7.ebuild b/x11-apps/xhost/xhost-1.0.7.ebuild
new file mode 100644
index 00000000000..b89c1e30edd
--- /dev/null
+++ b/x11-apps/xhost/xhost-1.0.7.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-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() {
+ XORG_CONFIGURE_OPTIONS="$(use_enable ipv6)"
+}
diff --git a/x11-apps/xinit/Manifest b/x11-apps/xinit/Manifest
new file mode 100644
index 00000000000..f8fa78aa366
--- /dev/null
+++ b/x11-apps/xinit/Manifest
@@ -0,0 +1,2 @@
+DIST xinit-1.3.3.tar.bz2 163905 SHA256 74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af SHA512 345d9a00991e25df0a565f5b7edfbf504df9e019fc8ca2d31e4d2899e4765d7a18f0fffec0b4dda5eef99982cf8482925656a4e18576105f267393de51257d65 WHIRLPOOL 106656351391ff8de397394d56ea225f910f82be3cbacaf81c0735d2a259437632bd5428fc96900a0b88146fd11f8d8670f07f3dd2869b44ff6525c399b936f4
+DIST xinit-1.3.4.tar.bz2 165881 SHA256 75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3 SHA512 ac31e4cac86fc5dd4c0e15cf37cb9ac470ef3ace4f86d0063c7e1091342fe64d41fcd12c1840bd8e1cef4cdd7f66bd2fa76bd4061641e9c70941d76d73d0df2e WHIRLPOOL 2362d69caffcaca6e6d284fcc7438fa6a81c36e79a20f23d32a67a5de9e6d64a9680d2f513e6718312d6e25117af90f28c17f70da0189595021198390eb12222
diff --git a/x11-apps/xinit/files/00-xhost b/x11-apps/xinit/files/00-xhost
new file mode 100644
index 00000000000..82cf10381e6
--- /dev/null
+++ b/x11-apps/xinit/files/00-xhost
@@ -0,0 +1,7 @@
+#!/bin/sh
+# Allow all local connections from the current UID
+# This fixes issues with hostname changes (usually by dhcp clients)
+# see bug 287498 for more info
+
+[ -x /usr/bin/xhost ] && [ -x /usr/bin/id ] &&
+ xhost +si:localuser:`id -un` > /dev/null 2>&1
diff --git a/x11-apps/xinit/files/0001-Gentoo-customizations.patch b/x11-apps/xinit/files/0001-Gentoo-customizations.patch
new file mode 100644
index 00000000000..a25ef4ba2a4
--- /dev/null
+++ b/x11-apps/xinit/files/0001-Gentoo-customizations.patch
@@ -0,0 +1,61 @@
+From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <scarabeus@gentoo.org>
+Date: Mon, 1 Nov 2010 16:46:36 +0100
+Subject: [PATCH] Gentoo customizations.
+
+
+Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org>
+---
+ xinitrc.cpp | 26 ++++++++++++++++++--------
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/xinitrc.cpp b/xinitrc.cpp
+index 049a8e4..80c3ad9 100644
+--- a/xinitrc.cpp
++++ b/xinitrc.cpp
+@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
+
+ userresources=$HOME/.Xresources
+ usermodmap=$HOME/.Xmodmap
+-sysresources=XINITDIR/.Xresources
+-sysmodmap=XINITDIR/.Xmodmap
++sysresources=XINITDIR/Xresources
++sysmodmap=XINITDIR/Xmodmap
+
+ XCOMM merge in defaults and keymaps
+
+@@ -84,15 +84,25 @@ fi
+ XCOMM This is the fallback case if nothing else is executed above
+ #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
+
++if [ -n "`/etc/X11/chooser.sh`" ]; then
++ command="`/etc/X11/chooser.sh`"
++else
++ failsafe="yes"
++fi
++
+ if [ -d XINITDIR/xinitrc.d ] ; then
+- for f in XINITDIR/xinitrc.dXSLASHGLOB.sh ; do
++ for f in XINITDIR/xinitrc.dXSLASHGLOB ; do
+ [ -x "$f" ] && . "$f"
+ done
+ unset f
+ fi
+
+-TWM &
+-XCLOCK -geometry 50x50-1+1 &
+-XTERM -geometry 80x50+494+51 &
+-XTERM -geometry 80x20+494-0 &
+-exec XTERM -geometry 80x66+0+0 -name login
++if [ -n "$failsafe" ]; then
++ TWM &
++ XCLOCK -geometry 50x50-1+1 &
++ XTERM -geometry 80x50+494+51 &
++ XTERM -geometry 80x20+494-0 &
++ exec XTERM -geometry 80x66+0+0 -name login
++else
++ exec $command
++fi
+--
+1.7.3.1
+
diff --git a/x11-apps/xinit/files/Xsession b/x11-apps/xinit/files/Xsession
new file mode 100644
index 00000000000..c86ccee19ff
--- /dev/null
+++ b/x11-apps/xinit/files/Xsession
@@ -0,0 +1,107 @@
+#!/bin/sh
+# $XConsortium: Xsession /main/10 1995/12/18 18:21:28 gildea $
+
+case $# in
+1)
+ case $1 in
+ failsafe)
+ exec xterm -geometry 80x24-0-0
+ ;;
+ esac
+esac
+
+# redirect errors to a file in user's home directory if we can
+for errfile in "$HOME/.xsession-errors" "${TMPDIR-/tmp}/xses-$USER" "/tmp/xses-$USER"
+do
+ if ( cp /dev/null "$errfile" 2> /dev/null )
+ then
+ chmod 600 "$errfile"
+ exec > "$errfile" 2>&1
+ break
+ fi
+done
+
+# clean up after xbanner
+if which freetemp 2> /dev/null ; then
+ freetemp
+fi
+
+startup=$HOME/.xsession
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+userxkbmap=$HOME/.Xkbmap
+
+sysresources=/etc/X11/Xresources
+sysmodmap=/etc/X11/Xmodmap
+sysxkbmap=/etc/X11/Xkbmap
+
+rh6sysresources=/etc/X11/xinit/Xresources
+rh6sysmodmap=/etc/X11/xinit/Xmodmap
+
+
+# merge in defaults
+if [ -f "$rh6sysresources" ]; then
+ xrdb -merge "$rh6sysresources"
+fi
+
+if [ -f "$sysresources" ]; then
+ xrdb -merge "$sysresources"
+fi
+
+if [ -f "$userresources" ]; then
+ xrdb -merge "$userresources"
+fi
+
+# merge in keymaps
+if [ -f "$sysxkbmap" ]; then
+ setxkbmap `cat "$sysxkbmap"`
+ XKB_IN_USE=yes
+fi
+
+if [ -f "$userxkbmap" ]; then
+ setxkbmap `cat "$userxkbmap"`
+ XKB_IN_USE=yes
+fi
+
+#
+# Eeek, this seems like too much magic here
+#
+if [ -z "$XKB_IN_USE" -a ! -L /etc/X11/X ]; then
+ if grep '^exec.*/Xsun' /etc/X11/X > /dev/null 2>&1 && [ -f /etc/X11/XF86Config ]; then
+ xkbsymbols=`sed -n -e 's/^[ ]*XkbSymbols[ ]*"\(.*\)".*$/\1/p' /etc/X11/XF86Config`
+ if [ -n "$xkbsymbols" ]; then
+ setxkbmap -symbols "$xkbsymbols"
+ XKB_IN_USE=yes
+ fi
+ fi
+fi
+
+# xkb and xmodmap don't play nice together
+if [ -z "$XKB_IN_USE" ]; then
+ if [ -f "$rh6sysmodmap" ]; then
+ xmodmap "$rh6sysmodmap"
+ fi
+
+ if [ -f "$sysmodmap" ]; then
+ xmodmap "$sysmodmap"
+ fi
+
+ if [ -f "$usermodmap" ]; then
+ xmodmap "$usermodmap"
+ fi
+fi
+
+unset XKB_IN_USE
+
+if [ -x "$startup" ]; then
+ exec "$startup"
+elif [ -x "$HOME/.Xclients" ]; then
+ exec "$HOME/.Xclients"
+elif [ -x /etc/X11/xinit/Xclients ]; then
+ exec /etc/X11/xinit/Xclients
+elif [ -x /etc/X11/Xclients ]; then
+ exec /etc/X11/Xclients
+else
+ exec xsm
+fi
diff --git a/x11-apps/xinit/files/Xsession.desktop b/x11-apps/xinit/files/Xsession.desktop
new file mode 100644
index 00000000000..0c5adb9d84f
--- /dev/null
+++ b/x11-apps/xinit/files/Xsession.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=XSession
+Comment=This session logs you into your custom Xsession
+Exec=/etc/X11/Sessions/Xsession
+TryExec=/etc/X11/Sessions/Xsession
+# no icon yet, only the top three are currently used
+Icon=
+Type=Application
diff --git a/x11-apps/xinit/files/chooser.sh b/x11-apps/xinit/files/chooser.sh
new file mode 100644
index 00000000000..6d14a71d43e
--- /dev/null
+++ b/x11-apps/xinit/files/chooser.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# Author: Martin Schlemmer <azarah@gentoo.org>
+# $Id$
+
+# Find a match for $XSESSION in /etc/X11/Sessions
+GENTOO_SESSION=""
+for x in /etc/X11/Sessions/* ; do
+ if [ "`echo ${x##*/} | awk '{ print toupper($1) }'`" \
+ = "`echo ${XSESSION} | awk '{ print toupper($1) }'`" ]; then
+ GENTOO_SESSION=${x}
+ break
+ fi
+done
+
+GENTOO_EXEC=""
+
+if [ -n "${XSESSION}" ]; then
+ if [ -f /etc/X11/Sessions/${XSESSION} ]; then
+ if [ -x /etc/X11/Sessions/${XSESSION} ]; then
+ GENTOO_EXEC="/etc/X11/Sessions/${XSESSION}"
+ else
+ GENTOO_EXEC="/bin/sh /etc/X11/Sessions/${XSESSION}"
+ fi
+ elif [ -n "${GENTOO_SESSION}" ]; then
+ if [ -x "${GENTOO_SESSION}" ]; then
+ GENTOO_EXEC="${GENTOO_SESSION}"
+ else
+ GENTOO_EXEC="/bin/sh ${GENTOO_SESSION}"
+ fi
+ else
+ x=""
+ y=""
+
+ for x in "${XSESSION}" \
+ "`echo ${XSESSION} | awk '{ print toupper($1) }'`" \
+ "`echo ${XSESSION} | awk '{ print tolower($1) }'`"
+ do
+ # Fall through ...
+ if [ -x "`which ${x} 2>/dev/null`" ]; then
+ GENTOO_EXEC="`which ${x} 2>/dev/null`"
+ break
+ fi
+ done
+ fi
+fi
+
+echo "${GENTOO_EXEC}"
+
+
+# vim:ts=4
diff --git a/x11-apps/xinit/files/startDM.sh b/x11-apps/xinit/files/startDM.sh
new file mode 100644
index 00000000000..02656595c12
--- /dev/null
+++ b/x11-apps/xinit/files/startDM.sh
@@ -0,0 +1,31 @@
+#!/bin/sh
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Id$
+
+# We need to source /etc/profile for stuff like $LANG to work
+# bug #10190.
+. /etc/profile
+
+. /etc/init.d/functions.sh
+
+# baselayout-1 compat
+if ! type get_options >/dev/null 2>/dev/null ; then
+ [ -r "${svclib}"/sh/rc-services.sh ] && . "${svclib}"/sh/rc-services.sh
+fi
+
+# Great new Gnome2 feature, AA
+# We enable this by default
+export GDK_USE_XFT=1
+
+export SVCNAME=xdm
+EXEC="$(get_options service)"
+NAME="$(get_options name)"
+PIDFILE="$(get_options pidfile)"
+START_STOP_ARGS="$(get_options start_stop_args)"
+
+start-stop-daemon --start --exec ${EXEC} \
+${NAME:+--name} ${NAME} ${PIDFILE:+--pidfile} ${PIDFILE} ${START_STOP_ARGS} || \
+eerror "ERROR: could not start the Display Manager"
+
+# vim:ts=4
diff --git a/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
new file mode 100644
index 00000000000..48dceabc500
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.3.3-gentoo-customizations.patch
@@ -0,0 +1,61 @@
+From d24cea5021fab8a11b1492a031319939d133d221 Mon Sep 17 00:00:00 2001
+From: Tomas Chvatal <scarabeus@gentoo.org>
+Date: Mon, 1 Nov 2010 16:46:36 +0100
+Subject: [PATCH] Gentoo customizations.
+
+
+Signed-off-by: Tomas Chvatal <scarabeus@gentoo.org>
+---
+ xinitrc.cpp | 26 ++++++++++++++++++--------
+ 1 files changed, 18 insertions(+), 8 deletions(-)
+
+diff --git a/xinitrc.cpp b/xinitrc.cpp
+index 049a8e4..80c3ad9 100644
+--- a/xinitrc.cpp
++++ b/xinitrc.cpp
+@@ -2,8 +2,8 @@ XCOMM!SHELL_CMD
+
+ userresources=$HOME/.Xresources
+ usermodmap=$HOME/.Xmodmap
+-sysresources=XINITDIR/.Xresources
+-sysmodmap=XINITDIR/.Xmodmap
++sysresources=XINITDIR/Xresources
++sysmodmap=XINITDIR/Xmodmap
+
+ XCOMM merge in defaults and keymaps
+
+@@ -84,15 +84,25 @@ fi
+ XCOMM This is the fallback case if nothing else is executed above
+ #endif /* !defined(__SCO__) && !defined(__UNIXWARE__) */
+
++if [ -n "`/etc/X11/chooser.sh`" ]; then
++ command="`/etc/X11/chooser.sh`"
++else
++ failsafe="yes"
++fi
++
+ if [ -d XINITDIR/xinitrc.d ] ; then
+- for f in XINITDIR/xinitrc.d/?*.sh ; do
++ for f in XINITDIR/xinitrc.d/?* ; do
+ [ -x "$f" ] && . "$f"
+ done
+ unset f
+ fi
+
+-TWM &
+-XCLOCK -geometry 50x50-1+1 &
+-XTERM -geometry 80x50+494+51 &
+-XTERM -geometry 80x20+494-0 &
+-exec XTERM -geometry 80x66+0+0 -name login
++if [ -n "$failsafe" ]; then
++ TWM &
++ XCLOCK -geometry 50x50-1+1 &
++ XTERM -geometry 80x50+494+51 &
++ XTERM -geometry 80x20+494-0 &
++ exec XTERM -geometry 80x66+0+0 -name login
++else
++ exec $command
++fi
+--
+1.7.3.1
+
diff --git a/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch b/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
new file mode 100644
index 00000000000..362b420cfc8
--- /dev/null
+++ b/x11-apps/xinit/files/xinit-1.3.4-startx-current-vt.patch
@@ -0,0 +1,21 @@
+diff -ur a/startx.cpp b/startx.cpp
+--- a/startx.cpp 2014-09-11 19:31:42.000000000 +0200
++++ b/startx.cpp 2015-02-08 19:09:56.416428623 +0100
+@@ -188,17 +188,6 @@
+ if [ x"$server" = x ]; then
+ server=$defaultserver
+
+-#ifdef __linux__
+- XCOMM When starting the defaultserver start X on the current tty to avoid
+- XCOMM the startx session being seen as inactive:
+- XCOMM "https://bugzilla.redhat.com/show_bug.cgi?id=806491"
+- tty=$(tty)
+- if expr match "$tty" '^/dev/tty[0-9]\+$' > /dev/null; then
+- tty_num=$(echo "$tty" | grep -oE '[0-9]+$')
+- vtarg="vt$tty_num"
+- fi
+-#endif
+-
+ XCOMM For compatibility reasons, only use xserverrc if there were no server command line arguments
+ if [ x"$serverargs" = x -a x"$display" = x ]; then
+ if [ -f "$userserverrc" ]; then
diff --git a/x11-apps/xinit/files/xserverrc b/x11-apps/xinit/files/xserverrc
new file mode 100644
index 00000000000..b4de2528749
--- /dev/null
+++ b/x11-apps/xinit/files/xserverrc
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/bin/X -nolisten tcp "$@"
diff --git a/x11-apps/xinit/files/xserverrc.1 b/x11-apps/xinit/files/xserverrc.1
new file mode 100644
index 00000000000..6b57eeba6da
--- /dev/null
+++ b/x11-apps/xinit/files/xserverrc.1
@@ -0,0 +1,6 @@
+#!/bin/sh
+if [ -z "$XDG_VTNR" ]; then
+ exec /usr/bin/X -nolisten tcp "$@"
+else
+ exec /usr/bin/X -nolisten tcp "$@" vt$XDG_VTNR
+fi
diff --git a/x11-apps/xinit/metadata.xml b/x11-apps/xinit/metadata.xml
new file mode 100644
index 00000000000..f64433cf017
--- /dev/null
+++ b/x11-apps/xinit/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>x11</herd>
+ <use>
+ <flag name='minimal'>
+ Control dependencies on legacy apps (xterm, twm, ...). Safe to
+ enable if you use a modern desktop environment.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:x.org:xinit</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-apps/xinit/xinit-1.3.3-r1.ebuild b/x11-apps/xinit/xinit-1.3.3-r1.ebuild
new file mode 100644
index 00000000000..a3267abae0f
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.3-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal"
+
+RDEPEND="
+ !<x11-base/xorg-server-1.8.0
+ x11-apps/xauth
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+ !minimal? (
+ x11-apps/xclock
+ x11-apps/xsm
+ x11-terms/xterm
+ x11-wm/twm
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --with-xinitdir="${EPREFIX}"/etc/X11/xinit
+ )
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+
+ exeinto /etc/X11
+ doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}"/Xsession
+ exeinto /etc/X11/xinit
+ newexe "${FILESDIR}"/xserverrc.1 xserverrc
+ exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}"/00-xhost
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}"/Xsession.desktop
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+ ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+ ewarn "any executable. When you run startx, it will run this as the login session."
+ ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+ ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+ ewarn "Here's an example of setting it for the whole system:"
+ ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+ ewarn " env-update && source /etc/profile"
+}
diff --git a/x11-apps/xinit/xinit-1.3.3.ebuild b/x11-apps/xinit/xinit-1.3.3.ebuild
new file mode 100644
index 00000000000..561f69dcf28
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal"
+
+RDEPEND="
+ !<x11-base/xorg-server-1.8.0
+ x11-apps/xauth
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+ !minimal? (
+ x11-apps/xclock
+ x11-apps/xsm
+ x11-terms/xterm
+ x11-wm/twm
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --with-xinitdir=/etc/X11/xinit
+ )
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+
+ exeinto /etc/X11
+ doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}"/Xsession
+ exeinto /etc/X11/xinit
+ doexe "${FILESDIR}"/xserverrc
+ exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}/00-xhost"
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}/Xsession.desktop"
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+ ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+ ewarn "any executable. When you run startx, it will run this as the login session."
+ ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+ ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+ ewarn "Here's an example of setting it for the whole system:"
+ ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+ ewarn " env-update && source /etc/profile"
+}
diff --git a/x11-apps/xinit/xinit-1.3.4-r1.ebuild b/x11-apps/xinit/xinit-1.3.4-r1.ebuild
new file mode 100644
index 00000000000..a81c864dcec
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.4-r1.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal systemd"
+
+RDEPEND="
+ !<x11-base/xorg-server-1.8.0
+ x11-apps/xauth
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+ !minimal? (
+ x11-apps/xclock
+ x11-apps/xsm
+ x11-terms/xterm
+ x11-wm/twm
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
+)
+
+src_prepare() {
+ # this patch breaks startx on non-systemd systems, bug #526802
+ if use !systemd; then
+ PATCHES+=( "${FILESDIR}"/${PN}-1.3.4-startx-current-vt.patch )
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --with-xinitdir="${EPREFIX}"/etc/X11/xinit
+ )
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+
+ exeinto /etc/X11
+ doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}"/Xsession
+ exeinto /etc/X11/xinit
+ newexe "${FILESDIR}"/xserverrc.1 xserverrc
+ exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}"/00-xhost
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}"/Xsession.desktop
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+ ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+ ewarn "any executable. When you run startx, it will run this as the login session."
+ ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+ ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+ ewarn "Here's an example of setting it for the whole system:"
+ ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+ ewarn " env-update && source /etc/profile"
+}
diff --git a/x11-apps/xinit/xinit-1.3.4.ebuild b/x11-apps/xinit/xinit-1.3.4.ebuild
new file mode 100644
index 00000000000..ee3430fb041
--- /dev/null
+++ b/x11-apps/xinit/xinit-1.3.4.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X Window System initializer"
+
+LICENSE="${LICENSE} GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="+minimal"
+
+RDEPEND="
+ !<x11-base/xorg-server-1.8.0
+ x11-apps/xauth
+ x11-libs/libX11
+"
+DEPEND="${RDEPEND}"
+PDEPEND="x11-apps/xrdb
+ !minimal? (
+ x11-apps/xclock
+ x11-apps/xsm
+ x11-terms/xterm
+ x11-wm/twm
+ )
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.3.3-gentoo-customizations.patch"
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --with-xinitdir="${EPREFIX}"/etc/X11/xinit
+ )
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+
+ exeinto /etc/X11
+ doexe "${FILESDIR}"/chooser.sh "${FILESDIR}"/startDM.sh
+ exeinto /etc/X11/Sessions
+ doexe "${FILESDIR}"/Xsession
+ exeinto /etc/X11/xinit
+ newexe "${FILESDIR}"/xserverrc.1 xserverrc
+ exeinto /etc/X11/xinit/xinitrc.d/
+ doexe "${FILESDIR}"/00-xhost
+
+ insinto /usr/share/xsessions
+ doins "${FILESDIR}"/Xsession.desktop
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+ ewarn "If you use startx to start X instead of a login manager like gdm/kdm,"
+ ewarn "you can set the XSESSION variable to anything in /etc/X11/Sessions/ or"
+ ewarn "any executable. When you run startx, it will run this as the login session."
+ ewarn "You can set this in a file in /etc/env.d/ for the entire system,"
+ ewarn "or set it per-user in ~/.bash_profile (or similar for other shells)."
+ ewarn "Here's an example of setting it for the whole system:"
+ ewarn " echo XSESSION=\"Gnome\" > /etc/env.d/90xsession"
+ ewarn " env-update && source /etc/profile"
+}
diff --git a/x11-apps/xinput/Manifest b/x11-apps/xinput/Manifest
new file mode 100644
index 00000000000..6605e4ca2ea
--- /dev/null
+++ b/x11-apps/xinput/Manifest
@@ -0,0 +1 @@
+DIST xinput-1.6.1.tar.bz2 152587 SHA256 b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f SHA512 b7770152837ee1f1d44e2737c0955d021441c4a8896edd63a6de896624315f1dc8c0391ce3ef23551ff584b0ed549103ae436bbfcab26f97cfc9f6dfb156f22a WHIRLPOOL 14d9da0390d5b40cc81fe6934554ec52d5be74d008a9c23504df7acdeef64cb17e11849445dd1cc21b931f46dd49e8f56769955a9ed611fa560d58e67caadb62
diff --git a/x11-apps/xinput/metadata.xml b/x11-apps/xinput/metadata.xml
new file mode 100644
index 00000000000..962587d4405
--- /dev/null
+++ b/x11-apps/xinput/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>x11</herd>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:x.org:xinput</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-apps/xinput/xinput-1.6.1.ebuild b/x11-apps/xinput/xinput-1.6.1.ebuild
new file mode 100644
index 00000000000..4a48c8e1a7e
--- /dev/null
+++ b/x11-apps/xinput/xinput-1.6.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Utility to set XInput device parameters"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.3
+ x11-libs/libXext
+ >=x11-libs/libXi-1.5.99.1
+ x11-libs/libXinerama
+ x11-libs/libXrandr"
+DEPEND="${RDEPEND}
+ >=x11-proto/inputproto-2.1.99.1"
diff --git a/x11-apps/xinput_calibrator/Manifest b/x11-apps/xinput_calibrator/Manifest
new file mode 100644
index 00000000000..d48cc80161e
--- /dev/null
+++ b/x11-apps/xinput_calibrator/Manifest
@@ -0,0 +1 @@
+DIST xinput_calibrator-0.7.5.tar.gz 355313 SHA256 baa4ddca49ec94c27ba4c715bfa26692fec1132103e927213c3169e475d3d971 SHA512 dc022f4de6d7b57912373a571ef0598c7b9d91cdbc3f63bb2b32c6149e43f67eaf820dc0289349d527314381d5195cf8891f6bcb9847110662dd75875f76b9de WHIRLPOOL cfcc750bdf1885e616b0d82b15d8ad9aadc27cf8bc07f9e4b1ebd9aecc3626677d2abe1beb8f5999b0402c5b59225a0395785a998cd6298b756899987c833440
diff --git a/x11-apps/xinput_calibrator/metadata.xml b/x11-apps/xinput_calibrator/metadata.xml
new file mode 100644
index 00000000000..6cc3982431f
--- /dev/null
+++ b/x11-apps/xinput_calibrator/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-apps/xinput_calibrator/xinput_calibrator-0.7.5.ebuild b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5.ebuild
new file mode 100644
index 00000000000..3073dfe1919
--- /dev/null
+++ b/x11-apps/xinput_calibrator/xinput_calibrator-0.7.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools-utils
+
+DESCRIPTION="A generic touchscreen calibration program for X.Org"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/xinput_calibrator"
+SRC_URI="mirror://github/tias/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+IUSE="gtk"
+
+DEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXi
+ x11-libs/libXrandr
+ x11-proto/inputproto
+ gtk? ( dev-cpp/gtkmm:2.4 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local myeconfargs=(
+ --with-gui=$(use gtk && echo "gtkmm" || echo "x11")
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-apps/xkbcomp/Manifest b/x11-apps/xkbcomp/Manifest
new file mode 100644
index 00000000000..8e245c09d6a
--- /dev/null
+++ b/x11-apps/xkbcomp/Manifest
@@ -0,0 +1,2 @@
+DIST xkbcomp-1.2.4.tar.bz2 242185 SHA256 91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d SHA512 51d6ba1dc4d9c4b8f52320990326f50ac4cc4fb45a939875308d23fe366dc287cbd252759a839a4780c165fc1e972b8cf031cd26622a10a19cb190e38d1d68c4 WHIRLPOOL 2151f5348758226badedef332183cfcfb5d4d50013a665c22f84bcf84ebce5e5ea41a6342816edab7f34392bb11e724bae5e7713e50f2f796bb6766b97f5c00b
+DIST xkbcomp-1.3.0.tar.bz2 246389 SHA256 cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a SHA512 c1661a97ff1ca054647486de33c430dd44f18168074e636dd5acefd324834ec3098f91930329734303c3e9fdde56ea1f5953702e91601db6642a18d21c955184 WHIRLPOOL f811b75d4d480b68bd519df20dc4f81c3275a2a247ac7d272e0d145907bd878704ffb8f780cab4f303ebb213db27dbfdcaf1bd4e1aafb1724fb2786a8cc6908f
diff --git a/x11-apps/xkbcomp/metadata.xml b/x11-apps/xkbcomp/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xkbcomp/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-apps/xkbcomp/xkbcomp-1.2.4.ebuild b/x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild
new file mode 100644
index 00000000000..4c9631ac53d
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.2.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="compile XKB keyboard description"
+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 ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+ sys-devel/bison"
diff --git a/x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild b/x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild
new file mode 100644
index 00000000000..898c6e2d9e9
--- /dev/null
+++ b/x11-apps/xkbcomp/xkbcomp-1.3.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="compile XKB keyboard description"
+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 ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+ sys-devel/bison"
diff --git a/x11-apps/xkbevd/Manifest b/x11-apps/xkbevd/Manifest
new file mode 100644
index 00000000000..3b8f6f7099f
--- /dev/null
+++ b/x11-apps/xkbevd/Manifest
@@ -0,0 +1,2 @@
+DIST xkbevd-1.1.3.tar.bz2 147027 SHA256 55b2484f9851112c2685d503b64b319f0f98fce74863ef735ecd52b52ceb0116
+DIST xkbevd-1.1.4.tar.bz2 151991 SHA256 2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a SHA512 7628eddd0e1dc0c4df8e61eb3f6a6bf0e9d92a87e96bb2f5248ba5bd3d99d868885c36860b78e8ea2eaba3bb9a420067ef95c4d58c1254fa3d12fb25dd4e60e7 WHIRLPOOL 850e89027569e94272f6c3f5f870c962b972f11f15a3edfcd018dca9dd95cea51c0b71f04ee94ff77bcee4c14b1d951d409dd0cdb4634a1d8843d603762f9f73
diff --git a/x11-apps/xkbevd/metadata.xml b/x11-apps/xkbevd/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xkbevd/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-apps/xkbevd/xkbevd-1.1.3.ebuild b/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
new file mode 100644
index 00000000000..f8f60d50940
--- /dev/null
+++ b/x11-apps/xkbevd/xkbevd-1.1.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="XKB event daemon"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+ sys-devel/bison"
diff --git a/x11-apps/xkbevd/xkbevd-1.1.4.ebuild b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
new file mode 100644
index 00000000000..fc4255d8585
--- /dev/null
+++ b/x11-apps/xkbevd/xkbevd-1.1.4.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="XKB event daemon"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libxkbfile"
+DEPEND="${RDEPEND}
+ sys-devel/bison"
diff --git a/x11-apps/xkbprint/Manifest b/x11-apps/xkbprint/Manifest
new file mode 100644
index 00000000000..89628c228b6
--- /dev/null
+++ b/x11-apps/xkbprint/Manifest
@@ -0,0 +1,2 @@
+DIST xkbprint-1.0.3.tar.bz2 146090 SHA256 fa846db8e588018134bd550f80eb129e4ddfdb96f3b157603a57ae2cdf5892c0
+DIST xkbprint-1.0.4.tar.bz2 163810 SHA256 0b3faab8fefad03dfb7e866f634cf859822801de6b5fc6cf5e0a62857ed93e12 SHA512 bb65a93ae737cd4b78787fef51972f4d0072a272166f82103bfaa92cf275db6363fae3530539b7c9a4139f6b87512019ac15ab3478d4ad05967ad18a8e80033a WHIRLPOOL 5a400dbd54ebcf64a0c5085f08bbacb84a7ad617f093472eccb91e6add576aa326e06f7182fbf98b21136ef6ad6e5fd4a2dd169154e6d3dd09a0d68fc30b451d
diff --git a/x11-apps/xkbprint/metadata.xml b/x11-apps/xkbprint/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xkbprint/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-apps/xkbprint/xkbprint-1.0.3.ebuild b/x11-apps/xkbprint/xkbprint-1.0.3.ebuild
new file mode 100644
index 00000000000..cec5e001017
--- /dev/null
+++ b/x11-apps/xkbprint/xkbprint-1.0.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="print an XKB keyboard description"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh ~sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libxkbfile
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbprint/xkbprint-1.0.4.ebuild b/x11-apps/xkbprint/xkbprint-1.0.4.ebuild
new file mode 100644
index 00000000000..0978da6ab04
--- /dev/null
+++ b/x11-apps/xkbprint/xkbprint-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Print an XKB keyboard description"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+RDEPEND="x11-libs/libxkbfile
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xkbset/Manifest b/x11-apps/xkbset/Manifest
new file mode 100644
index 00000000000..9647eccd8e2
--- /dev/null
+++ b/x11-apps/xkbset/Manifest
@@ -0,0 +1 @@
+DIST xkbset-0.5.tar.gz 13933 SHA256 01c2579495b39e00d870f50225c441888dc88021e9ee3b693a842dd72554d172 SHA512 64de1a18076c0e0fd3e3189444b6033880028f53777566286caf935bfafcf062ccbd408d20926e2a4febb77d15b026349e0288f2aa93c815ddd9437b96589d8c WHIRLPOOL 225d5f0e35ed7efb7c6b122f87d607ba25dd5f3bf92e9daea1a580f7b488f7ad2141c57d755fbdda8c723de4d4c482846448ab341ebbec96bb0e118a713a946c
diff --git a/x11-apps/xkbset/files/xkbset-0.5-ldflags.patch b/x11-apps/xkbset/files/xkbset-0.5-ldflags.patch
new file mode 100644
index 00000000000..69dda8739d7
--- /dev/null
+++ b/x11-apps/xkbset/files/xkbset-0.5-ldflags.patch
@@ -0,0 +1,11 @@
+--- xkbset-0.5/Makefile
++++ xkbset-0.5/Makefile
+@@ -11,7 +11,7 @@
+ all: xkbset xkbset.1
+
+ xkbset: getargs.o print.o usage.o main.o misc.o
+- ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} getargs.o print.o usage.o main.o misc.o -o $@ ${LIBS}
++ ${CC} ${CFLAGS} ${LDFLAGS} ${INC_PATH} ${LIB_PATH} getargs.o print.o usage.o main.o misc.o -o $@ ${LIBS}
+
+ getargs.o: getargs.c xkbset.h
+ ${CC} ${CFLAGS} ${INC_PATH} ${LIB_PATH} -c getargs.c
diff --git a/x11-apps/xkbset/metadata.xml b/x11-apps/xkbset/metadata.xml
new file mode 100644
index 00000000000..03b143fb398
--- /dev/null
+++ b/x11-apps/xkbset/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+<email>jer@gentoo.org</email>
+</maintainer>
+<use>
+<flag name='tk'>Install the <pkg>dev-perl/perl-tk</pkg> based xkbset-gui utility</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-apps/xkbset/xkbset-0.5-r1.ebuild b/x11-apps/xkbset/xkbset-0.5-r1.ebuild
new file mode 100644
index 00000000000..ad440cc4be3
--- /dev/null
+++ b/x11-apps/xkbset/xkbset-0.5-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Manage xkb features such as MouseKeys, AccessX, StickyKeys, BounceKeys and SlowKeys"
+HOMEPAGE="http://www.math.missouri.edu/~stephen/software/"
+SRC_URI="http://www.math.missouri.edu/~stephen/software/xkbset/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="tk"
+
+CDEPEND="
+ x11-libs/libX11
+"
+DEPEND="
+ ${CDEPEND}
+"
+RDEPEND="
+ ${CDEPEND}
+ tk? ( dev-perl/perl-tk )
+"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-ldflags.patch
+}
+
+src_compile() {
+ emake CC=$(tc-getCC) INC_PATH= LIB_PATH=
+}
+
+src_install() {
+ dobin xkbset
+ use tk && dobin xkbset-gui
+ doman xkbset.1
+ dodoc README TODO
+}
diff --git a/x11-apps/xkbutils/Manifest b/x11-apps/xkbutils/Manifest
new file mode 100644
index 00000000000..9097241e48b
--- /dev/null
+++ b/x11-apps/xkbutils/Manifest
@@ -0,0 +1 @@
+DIST xkbutils-1.0.4.tar.bz2 131269 SHA256 d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130 SHA512 5bb6cb52ac02a4ec18332559853815585ca86e00e8c6452483af10c4db75811fe00952575dbbad5b7d03b9d6498830fb45d617b1b3c5c1cea8445f1131856a4d WHIRLPOOL 4226604655c6c12742254f4beed43d4e9e0ae42f472f3620f14685fdecfe0c5e28c0a3821853c44760df3069f217669959133222a2ba0f9d1e41d9d8961d9a74
diff --git a/x11-apps/xkbutils/metadata.xml b/x11-apps/xkbutils/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xkbutils/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-apps/xkbutils/xkbutils-1.0.4.ebuild b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
new file mode 100644
index 00000000000..678da35851f
--- /dev/null
+++ b/x11-apps/xkbutils/xkbutils-1.0.4.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xkbutils application"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXaw"
+DEPEND="${RDEPEND}
+ x11-proto/xproto
+ x11-proto/inputproto"
diff --git a/x11-apps/xkill/Manifest b/x11-apps/xkill/Manifest
new file mode 100644
index 00000000000..a4d20c46505
--- /dev/null
+++ b/x11-apps/xkill/Manifest
@@ -0,0 +1 @@
+DIST xkill-1.0.4.tar.bz2 124828 SHA256 88ef2a304f32f24b255e879f03c1dcd3a2be3e71d5562205414f267d919f812e SHA512 14d1fc0eff96a62d66307f09efc599639ee70be4bf580e2857569326881bfdcae7a8a21640509875218dd2b88575b4801ab0c43c4295550dc71141a579483545 WHIRLPOOL 680cd355eaaabe99d724056676f789a1ed24398179d98d4ee98a82264216e92a3cd0328b8f8f7164ae9690cc8cc768dea04b21be3715acc0cbe126a503fcf27a
diff --git a/x11-apps/xkill/metadata.xml b/x11-apps/xkill/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xkill/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-apps/xkill/xkill-1.0.4.ebuild b/x11-apps/xkill/xkill-1.0.4.ebuild
new file mode 100644
index 00000000000..9e20d0cdbbd
--- /dev/null
+++ b/x11-apps/xkill/xkill-1.0.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="kill a client by its X resource"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXmu"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xload/Manifest b/x11-apps/xload/Manifest
new file mode 100644
index 00000000000..ff3832d57dd
--- /dev/null
+++ b/x11-apps/xload/Manifest
@@ -0,0 +1 @@
+DIST xload-1.1.2.tar.bz2 136745 SHA256 83f8e6260435f1df2e2e5036bb3325688b79f0b33069ef445eff5058d127e078 SHA512 9c83d26bbb135cc0f2b3ef7f25b081cda5d080dd02b1c89195b40825a7d71211965b34336c853eb455472d9748f3edf64108455584b34b81673e2548806f423d WHIRLPOOL 9b37fd9b834a3c238543e485962316b5709a6c949b4198dfc92e02c2ee3e56b874c3ba870dab30d2ed52e2cf96cc8008f9a1c92b7ffd9b457972840256c26cb3
diff --git a/x11-apps/xload/metadata.xml b/x11-apps/xload/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xload/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-apps/xload/xload-1.1.2.ebuild b/x11-apps/xload/xload-1.1.2.ebuild
new file mode 100644
index 00000000000..8ffcfd632ba
--- /dev/null
+++ b/x11-apps/xload/xload-1.1.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="system load average display for X"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
diff --git a/x11-apps/xlogo/Manifest b/x11-apps/xlogo/Manifest
new file mode 100644
index 00000000000..298452f9a09
--- /dev/null
+++ b/x11-apps/xlogo/Manifest
@@ -0,0 +1 @@
+DIST xlogo-1.0.4.tar.bz2 125967 SHA256 17af6f4fb73e7310e087fbfe5d773bab2b0d6f37a894ae5ee32de4693af6ba92
diff --git a/x11-apps/xlogo/metadata.xml b/x11-apps/xlogo/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xlogo/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-apps/xlogo/xlogo-1.0.4.ebuild b/x11-apps/xlogo/xlogo-1.0.4.ebuild
new file mode 100644
index 00000000000..5c581f67033
--- /dev/null
+++ b/x11-apps/xlogo/xlogo-1.0.4.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="X Window System logo"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix"
+IUSE=""
+
+RDEPEND="x11-libs/libXrender
+ x11-libs/libXext
+ x11-libs/libXt
+ x11-libs/libXft
+ x11-libs/libXaw
+ x11-libs/libSM
+ x11-libs/libXmu
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="--with-render"
diff --git a/x11-apps/xlsatoms/Manifest b/x11-apps/xlsatoms/Manifest
new file mode 100644
index 00000000000..e85f0927295
--- /dev/null
+++ b/x11-apps/xlsatoms/Manifest
@@ -0,0 +1,2 @@
+DIST xlsatoms-1.1.1.tar.bz2 116501 SHA256 3b8bd98c1ca9789178db80bca75556b0c76e5092403014995d5ddaa3117536f9
+DIST xlsatoms-1.1.2.tar.bz2 123157 SHA256 47e5dc7c3dbda6db2cf8c00cedac1722835c1550aa21cfdbc9ba83906694dea4 SHA512 f29001de22818792212312f1b9daee1bf7afa2ef2ae945cd8c14bdc1a7bb40064d3878c5efea60458ac0bf515ab1ece16fa90cbd2b0a879a5f07f3aa3e6a0baa WHIRLPOOL efafc8d31b8b6ec0864cd1ef62e1aabd931a46302484062711d6d07d40547837d457e12a488c3965322fe2e4ccd1d3df11711c92ae980f7a632ada7f6e077c8d
diff --git a/x11-apps/xlsatoms/metadata.xml b/x11-apps/xlsatoms/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xlsatoms/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-apps/xlsatoms/xlsatoms-1.1.1.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
new file mode 100644
index 00000000000..ea25a3a41cb
--- /dev/null
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="list interned atoms defined on server"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libxcb"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild b/x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild
new file mode 100644
index 00000000000..b72854c7e75
--- /dev/null
+++ b/x11-apps/xlsatoms/xlsatoms-1.1.2.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="list interned atoms defined on server"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libxcb"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/Manifest b/x11-apps/xlsclients/Manifest
new file mode 100644
index 00000000000..f016a437f98
--- /dev/null
+++ b/x11-apps/xlsclients/Manifest
@@ -0,0 +1,2 @@
+DIST xlsclients-1.1.2.tar.bz2 114703 SHA256 1ce5f3987b63ea79b3f8421fcb1dd9c739e99efa97f280eafd8e93574b9027d1 SHA512 c217c17ddd937fd27b11706e6453a6171037bc33f9d108c0bf717dd5f2a0580eb82bb9085342d81d526c75d8aaa0a2d911e6ebcaa12ac8cafce4caa726ac93e8 WHIRLPOOL 2cb1fc41b4a88b2ac8999f5a2401afdd10987e4ffe7bf7602e6d495a7fc2ea1cd95a229bcb2067faff10cbb9130fa7c5d94d803f92228519ba28d82aab21f4a4
+DIST xlsclients-1.1.3.tar.bz2 127324 SHA256 5d9666fcc6c3de210fc70d5a841a404955af709a616fde530fe4e8f7723e3d3d SHA512 4266068b96bb0bf565021fbda726511a387800fcc81b6b53f3fb847ca6a4de50811f66ca1423a56414619ad6f3b4d2dfb235106a1eacf9e5def8cf49c2b2ba85 WHIRLPOOL 6d37ebef099e8d2ca511442ef21cea9dd698f2a920abfc7e0549889f71df4b2a0608029daab8b547cba667933f321c6eb87507c501d0d8e3a5f5d83dea519d94
diff --git a/x11-apps/xlsclients/metadata.xml b/x11-apps/xlsclients/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xlsclients/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-apps/xlsclients/xlsclients-1.1.2.ebuild b/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
new file mode 100644
index 00000000000..83d3867252d
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-1.1.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+ >=x11-libs/libxcb-1.7
+ >=x11-libs/xcb-util-0.3.8
+"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsclients/xlsclients-1.1.3.ebuild b/x11-apps/xlsclients/xlsclients-1.1.3.ebuild
new file mode 100644
index 00000000000..440b71b4f69
--- /dev/null
+++ b/x11-apps/xlsclients/xlsclients-1.1.3.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsclients application"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="
+ >=x11-libs/libxcb-1.7
+ >=x11-libs/xcb-util-0.3.8
+"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/Manifest b/x11-apps/xlsfonts/Manifest
new file mode 100644
index 00000000000..6a8910cb39e
--- /dev/null
+++ b/x11-apps/xlsfonts/Manifest
@@ -0,0 +1,2 @@
+DIST xlsfonts-1.0.4.tar.bz2 124533 SHA256 28179185ec2bf81dfe13652d65bdb2a4ae74e2775df591a62d66a70f80e90cd2
+DIST xlsfonts-1.0.5.tar.bz2 131072 SHA256 40295bec35077cee93be2e4c26cc00268ed6ace779ae6e97766a866c1e3927fa SHA512 e20f9efa0fa33980486671abd4ef59a82fd3df033d9c1b24db8c5b2b27ada93f03dba1e3ad586a35f3b7893bef5e8f14186f1914ab3507862cce4e104199a490 WHIRLPOOL 9744290878ebe076d680dcb1e75cc47535f68812128fda27168cc5978d7f5b24c0f2c2cf434c61a682bfd771b1a69cdb69790e7f567a065ad1c1cea158d96a6a
diff --git a/x11-apps/xlsfonts/metadata.xml b/x11-apps/xlsfonts/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xlsfonts/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-apps/xlsfonts/xlsfonts-1.0.4.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
new file mode 100644
index 00000000000..af79c88e402
--- /dev/null
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.4.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsfonts application"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xlsfonts/xlsfonts-1.0.5.ebuild b/x11-apps/xlsfonts/xlsfonts-1.0.5.ebuild
new file mode 100644
index 00000000000..91eb9c83a8a
--- /dev/null
+++ b/x11-apps/xlsfonts/xlsfonts-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xlsfonts application"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE=""
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/Manifest b/x11-apps/xmag/Manifest
new file mode 100644
index 00000000000..3c8f50bd90b
--- /dev/null
+++ b/x11-apps/xmag/Manifest
@@ -0,0 +1,2 @@
+DIST xmag-1.0.5.tar.bz2 136976 SHA256 4ace8795cf756be4ba387f30366045594ce26adda2f5ffe1f8e896825d0932c6 SHA512 2f17a672b4b21842ea194fb6bee387c44cff510dad70f487a13de14d6a24f5c7b8f03c06fb30f7ca62753a44827c1fed67ac4d2d3550780f16ffdd932e4a8bfa WHIRLPOOL 243c1ca3937662d42c5d532f68489e91787dcea6bd83bead4c8d11262a7474ff7af9e9ee750086f78002a475614ea61d31b176e02b910eaee16fa90ec49c38ee
+DIST xmag-1.0.6.tar.bz2 143112 SHA256 87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161 SHA512 98f3c8e0c58f31cd4f1736ba9c5cd68dba3b2e2de6191988de8ae3e91b1d310803461840189ad56be45ee57c9ca05a2c63544a49b02ce6f79f2ebc14c59613de WHIRLPOOL af1df3554a5a204667abea861dfcaa76e44697386b31e34f1d02503ef1a0de0b0071ead8e77c9edab00d16d59433842dd87c9c601410f98d6944244be0b0c92c
diff --git a/x11-apps/xmag/metadata.xml b/x11-apps/xmag/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xmag/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-apps/xmag/xmag-1.0.5.ebuild b/x11-apps/xmag/xmag-1.0.5.ebuild
new file mode 100644
index 00000000000..9914d7ff41a
--- /dev/null
+++ b/x11-apps/xmag/xmag-1.0.5.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xmag application"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmag/xmag-1.0.6.ebuild b/x11-apps/xmag/xmag-1.0.6.ebuild
new file mode 100644
index 00000000000..1b08157e4e6
--- /dev/null
+++ b/x11-apps/xmag/xmag-1.0.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xmag application"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libXt
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xman/Manifest b/x11-apps/xman/Manifest
new file mode 100644
index 00000000000..59e0368d157
--- /dev/null
+++ b/x11-apps/xman/Manifest
@@ -0,0 +1,2 @@
+DIST xman-1.1.3.tar.bz2 184340 SHA256 405211b606a7fa420029897f099dc107791bb4c29bc88481c6efac9c4590bb1a SHA512 7c6475434984205f359ff3cb47a41282536be6aefe7bc6e970736c4372b23b5de01a26864d7f5b2cae2f770eeef6d254ebbdf6db717b5efab0042a47cb7497be WHIRLPOOL bb3870840c627ac12122dbf038c2488e9c6e7dbf243d3efa74c8fa26f5bb07c261aa5550ccf36cb37314b4344b2e96a3b862b58b8d1dac1f6e78d2519cb86f0d
+DIST xman-1.1.4.tar.bz2 188259 SHA256 b3fa9d2e3f3745c529eb0b6ee4f0e00d936457d11e5221b2efad06ff7c84df29 SHA512 785e973eb15b0300de08aace24f3604dfee61421c7f64ea4cde2e280480bf5d3ad797ab8208668dc023a375494f8db7534fbcaa1c1ef16e79464fdd017b5da68 WHIRLPOOL 846fc19937832074e04ec69b9b4f05c1966b00dccc28993b168659b478b7ace6ef88c473fb4c9cf378e0fd96b26f7b571d0b532eae89ec28d64a413f4af9c88f
diff --git a/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch b/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch
new file mode 100644
index 00000000000..f42ce577c2b
--- /dev/null
+++ b/x11-apps/xman/files/xman-1.1.3-mandb-2.7.patch
@@ -0,0 +1,60 @@
+From 438763b6e231410b95b5e352feb65c63cd54de6a Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Fri, 7 Nov 2014 16:19:57 +0000
+Subject: [PATCH] If we have man-db, don't try and emulate man's pipeline
+
+Just let man itself do the formatting / zsoelim / ... dance.
+
+Debian bug#764792 <https://bugs.debian.org/764792>
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ xman/configure.ac | 5 +++++
+ xman/misc.c | 8 ++++++++
+ 2 files changed, 13 insertions(+)
+
+diff --git a/xman/configure.ac b/xman/configure.ac
+index 9a80cbb..8bb44f2 100644
+--- a/xman/configure.ac
++++ b/xman/configure.ac
+@@ -44,6 +44,11 @@ if test "x$GROFF" = "xfound" ; then
+ AC_DEFINE([HAS_GROFF], 1, [Define to 1 if you have the groff package.])
+ fi
+
++AC_CHECK_PROG([MANDB], [mandb], [yes], [no])
++if test x"$MANDB" = xyes; then
++ AC_DEFINE([HAVE_MANDB], 1, [Define if the man implementation is man-db])
++fi
++
+ AC_CHECK_FUNCS([mkstemp])
+
+ AC_ARG_WITH(helpdir,
+diff --git a/xman/misc.c b/xman/misc.c
+index 06891cd..da8744a 100644
+--- a/xman/misc.c
++++ b/xman/misc.c
+@@ -661,6 +661,13 @@ static Boolean
+ ConstructCommand(char *cmdbuf, const char *path,
+ const char *filename, const char *tempfile)
+ {
++#ifdef HAVE_MANDB
++ int used = snprintf(cmdbuf, BUFSIZ, "man -l %s > %s 2>/dev/null",
++ filename, tempfile);
++ if (used >= BUFSIZ - 1)
++ return FALSE;
++ return TRUE;
++#else
+ /* The original code did the following to produce a command line:
+ * sprintf(cmdbuf,"cd %s ; %s %s %s > %s %s", path, TBL,
+ * filename, FORMAT, man_globals->tempfile, "2> /dev/null");
+@@ -783,6 +790,7 @@ ConstructCommand(char *cmdbuf, const char *path,
+ return (FALSE);
+
+ return (TRUE);
++#endif /* man-db */
+ }
+ #endif /* HANDLE_ROFFSEQ */
+
+--
+2.1.1
+
diff --git a/x11-apps/xman/metadata.xml b/x11-apps/xman/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xman/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-apps/xman/xman-1.1.3-r1.ebuild b/x11-apps/xman/xman-1.1.3-r1.ebuild
new file mode 100644
index 00000000000..431922e0d30
--- /dev/null
+++ b/x11-apps/xman/xman-1.1.3-r1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_EAUTORECONF=yes
+inherit xorg-2
+
+DESCRIPTION="Manual page display program for the X Window System"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-proto/xproto"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.3-mandb-2.7.patch
+)
diff --git a/x11-apps/xman/xman-1.1.3.ebuild b/x11-apps/xman/xman-1.1.3.ebuild
new file mode 100644
index 00000000000..9cb8ab30d26
--- /dev/null
+++ b/x11-apps/xman/xman-1.1.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="Manual page display program for the X Window System"
+
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-proto/xproto"
+RDEPEND="${DEPEND}
+ !>=sys-apps/man-db-2.7"
diff --git a/x11-apps/xman/xman-1.1.4.ebuild b/x11-apps/xman/xman-1.1.4.ebuild
new file mode 100644
index 00000000000..431922e0d30
--- /dev/null
+++ b/x11-apps/xman/xman-1.1.4.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_EAUTORECONF=yes
+inherit xorg-2
+
+DESCRIPTION="Manual page display program for the X Window System"
+
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libXaw
+ x11-libs/libXt
+ x11-libs/libXmu
+ x11-proto/xproto"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.3-mandb-2.7.patch
+)
diff --git a/x11-apps/xmessage/Manifest b/x11-apps/xmessage/Manifest
new file mode 100644
index 00000000000..66a58c5e63f
--- /dev/null
+++ b/x11-apps/xmessage/Manifest
@@ -0,0 +1,2 @@
+DIST xmessage-1.0.3.tar.bz2 110604 SHA256 cfa35d3ad4ad1306e49878163982e9d54872a20a497e77ab0a8d5de05c8b3d5b SHA512 7698dd6d02b2234e5463de7c7493a1ba1498f0434108e941271eca32e0a60d5c1affb6b21ac5fc94bc1962ba2d1853d669f1c1290aa4e669aff6c06411d5aa41 WHIRLPOOL 4044d55ef657872cc47d5b945631b4edb9b82ac65ff4ad41e0b33a47808df01047a5087a8d67d52e42ff8d4cc3f48bacd1382849d446542cde160ac4790e3d21
+DIST xmessage-1.0.4.tar.bz2 125011 SHA256 bcdf4b461c439bb3ade6e1e41c47d6218b912da8e9396b7ad70856db2f95ab68 SHA512 a087fb09595bf0b188a4525b45e9b607acd063cceae36c69c78a48674fb7eca1c82d5c2d2770c7f4425b499e4c002bfc0e377935308c218a330a2b4994b94ebd WHIRLPOOL 10e5609685ded588b23a01265f165f9624f22e2adea622381be13cc3f428027958aa2b333eb6b138d2f4710ee6f8fe6acffaa350f73174363cc5fcb31b2bd8da
diff --git a/x11-apps/xmessage/metadata.xml b/x11-apps/xmessage/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xmessage/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-apps/xmessage/xmessage-1.0.3.ebuild b/x11-apps/xmessage/xmessage-1.0.3.ebuild
new file mode 100644
index 00000000000..ff96c311fab
--- /dev/null
+++ b/x11-apps/xmessage/xmessage-1.0.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmessage/xmessage-1.0.4.ebuild b/x11-apps/xmessage/xmessage-1.0.4.ebuild
new file mode 100644
index 00000000000..e2bbfe576d6
--- /dev/null
+++ b/x11-apps/xmessage/xmessage-1.0.4.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="display a message or query in a window (X-based /bin/echo)"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXt"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/Manifest b/x11-apps/xmodmap/Manifest
new file mode 100644
index 00000000000..ff09a218e20
--- /dev/null
+++ b/x11-apps/xmodmap/Manifest
@@ -0,0 +1,2 @@
+DIST xmodmap-1.0.8.tar.bz2 141026 SHA256 efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3 SHA512 716cd1ee2cdb1db31b84c018eb223fb3eb05d499a7e76e0bdf038b58a5f71dd17631c8ce39d8108f6c47fe11fad718016f2891baa813b35a9dc607d3a3946a63 WHIRLPOOL 2f33c7ceb879b13605f1d5d3a50c4896d58845477034a1cadc3a74938e4839ab4879db6c518861803efc8ba4d719c295b34c84bd70ee7e9d746d42bd837dac70
+DIST xmodmap-1.0.9.tar.bz2 142565 SHA256 b7b0e5cc5f10d0fb6d2d6ea4f00c77e8ac0e847cc5a73be94cd86139ac4ac478 SHA512 6e50f2ba072ec171bd3fc34f75b21c63f9834f3c0f1608c857f80a4b2c8a9696b03dde79f8342bf67504b759297bc24a64056a625d295a4f89dd31eb938400ac WHIRLPOOL 97435f194a8bcde50f4298e8206f430907b9086b1413086a20be859e84c02472e83e16d2d68b81f58517a3ed8e29ae4dcf7e29335ce8efdcd2122da3e0c2a49f
diff --git a/x11-apps/xmodmap/metadata.xml b/x11-apps/xmodmap/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xmodmap/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-apps/xmodmap/xmodmap-1.0.8.ebuild b/x11-apps/xmodmap/xmodmap-1.0.8.ebuild
new file mode 100644
index 00000000000..fba0b3dd363
--- /dev/null
+++ b/x11-apps/xmodmap/xmodmap-1.0.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmodmap/xmodmap-1.0.9.ebuild b/x11-apps/xmodmap/xmodmap-1.0.9.ebuild
new file mode 100644
index 00000000000..c1e4a0eb710
--- /dev/null
+++ b/x11-apps/xmodmap/xmodmap-1.0.9.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+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 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xmore/Manifest b/x11-apps/xmore/Manifest
new file mode 100644
index 00000000000..a83398292ec
--- /dev/null
+++ b/x11-apps/xmore/Manifest
@@ -0,0 +1 @@
+DIST xmore-1.0.2.tar.bz2 107340 RMD160 d92615867445f60229c991d9dc59b8a99a60815d SHA1 7db4e5feb82d5d05038722d3af00d28e103bed18 SHA256 2a13f97891a3fd497074acc8ac8069f8583add5db4d3bf34a5da6a92bd61b9e2
diff --git a/x11-apps/xmore/metadata.xml b/x11-apps/xmore/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xmore/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-apps/xmore/xmore-1.0.2.ebuild b/x11-apps/xmore/xmore-1.0.2.ebuild
new file mode 100644
index 00000000000..56c10d89e1b
--- /dev/null
+++ b/x11-apps/xmore/xmore-1.0.2.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+inherit xorg-2
+
+DESCRIPTION="plain text display program for the X Window System"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh ~sparc x86"
+IUSE=""
+
+RDEPEND="
+ x11-libs/libXaw
+ x11-libs/libXt
+"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xpr/Manifest b/x11-apps/xpr/Manifest
new file mode 100644
index 00000000000..b805e06df6b
--- /dev/null
+++ b/x11-apps/xpr/Manifest
@@ -0,0 +1 @@
+DIST xpr-1.0.4.tar.bz2 143144 SHA256 fed98df31eb93d3dca4688cb535aabad06be572e70ace3b1685679c18dd86cb5
diff --git a/x11-apps/xpr/metadata.xml b/x11-apps/xpr/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xpr/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-apps/xpr/xpr-1.0.4.ebuild b/x11-apps/xpr/xpr-1.0.4.ebuild
new file mode 100644
index 00000000000..aa6dce5bebe
--- /dev/null
+++ b/x11-apps/xpr/xpr-1.0.4.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org xpr application"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+RDEPEND="x11-libs/libXmu
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xprop/Manifest b/x11-apps/xprop/Manifest
new file mode 100644
index 00000000000..852204322a1
--- /dev/null
+++ b/x11-apps/xprop/Manifest
@@ -0,0 +1 @@
+DIST xprop-1.2.2.tar.bz2 145556 SHA256 9bee88b1025865ad121f72d32576dd3027af1446774aa8300cce3c261d869bc6 SHA512 934a46423d4904e57a3f5fc4ffed469f85a9bb6a3544cd2d2f80cf7ac1e6ebe1de8b3631c99a4d32c0f02992fcc940e2938832751182f0996ba3a95017794572 WHIRLPOOL 0b9d317bcf9ceff38526707933e41dc47c6a2a4c974629785cc5f1a15bf43c0986b208a1e0c0742f185b793eab6dd7cf07fe705cf8d5023643cd3b557c8a7f75
diff --git a/x11-apps/xprop/metadata.xml b/x11-apps/xprop/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xprop/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-apps/xprop/xprop-1.2.2.ebuild b/x11-apps/xprop/xprop-1.2.2.ebuild
new file mode 100644
index 00000000000..83d0864c4bd
--- /dev/null
+++ b/x11-apps/xprop/xprop-1.2.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="property displayer for X"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+ >=x11-proto/xproto-7.0.17
+"
diff --git a/x11-apps/xrandr/Manifest b/x11-apps/xrandr/Manifest
new file mode 100644
index 00000000000..01f176b177c
--- /dev/null
+++ b/x11-apps/xrandr/Manifest
@@ -0,0 +1,2 @@
+DIST xrandr-1.4.1.tar.bz2 171963 SHA256 67b554ab975652778bef587f86dab7fec8cb95dfd21c11d98a203dac5c241e50 SHA512 da36a3e332c13f4c793be83528b4b9d77bfa2457a9159958ecfe92a460f2c645d353ec0bdd9d8c34ee77241931b030757cf3dead8b0049e1341ff79add0c247c WHIRLPOOL 459d1b405e64a50cbb4abeeee1dd8b7b9834bde89f4422075af55d018bf0bbd645abd911f96a044773e93fc19558d5e5d755dfa8e5d609900f3698334d0f9cdd
+DIST xrandr-1.4.3.tar.bz2 169850 SHA256 7154ac3486b86923692f2d6cdb2991a2ee72bc32af2c4379a6f1c068f204be1b SHA512 eea2637484e744af305366606ec8fba77f54bb66bf45bd131367abb0f5ff90b858d85fbe4c17ee48f7b2f32f277d5f08b18e9cd61f147757828d415a3db9b9bc WHIRLPOOL 0088c7729bb002ab427249fa7cee0855ea38ff4b0927411e92f5544837b0c3f7d2f48573a7020d3d2263796a535b1d6312439450feafb15264379de314fd0f04
diff --git a/x11-apps/xrandr/metadata.xml b/x11-apps/xrandr/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xrandr/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-apps/xrandr/xrandr-1.4.1.ebuild b/x11-apps/xrandr/xrandr-1.4.1.ebuild
new file mode 100644
index 00000000000..3961c9f350b
--- /dev/null
+++ b/x11-apps/xrandr/xrandr-1.4.1.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="primitive command line interface to RandR extension"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrandr-1.4
+ x11-libs/libXrender
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ xorg-2_src_install
+ rm -f "${ED}"/usr/bin/xkeystone || die
+}
diff --git a/x11-apps/xrandr/xrandr-1.4.3.ebuild b/x11-apps/xrandr/xrandr-1.4.3.ebuild
new file mode 100644
index 00000000000..39f497bfe70
--- /dev/null
+++ b/x11-apps/xrandr/xrandr-1.4.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="primitive command line interface to RandR extension"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrandr-1.4
+ x11-libs/libXrender
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ xorg-2_src_install
+ rm -f "${ED}"/usr/bin/xkeystone || die
+}
diff --git a/x11-apps/xrdb/Manifest b/x11-apps/xrdb/Manifest
new file mode 100644
index 00000000000..fbd16a196bc
--- /dev/null
+++ b/x11-apps/xrdb/Manifest
@@ -0,0 +1 @@
+DIST xrdb-1.1.0.tar.bz2 138035 SHA256 73827b6bbfc9d27ca287d95a1224c306d7053cd7b8156641698d7dc541ca565b SHA512 8e2a177653d5aa895c71ed3640e0f1dd9fe8bf5cd6f0c6ff7e372394a2a41c3aa2286905fd9c69e3d140024d235b81a1f32b5d4012b1ac5ac1ed945599dee407 WHIRLPOOL 8d595bd3ddffd8153c2dc6c0af2072eea9fa5ecb76782ea5dafc589395809c2e88b527e54ad551de2728691631cc7307c17290e46874254764ed6adc09ef9239
diff --git a/x11-apps/xrdb/metadata.xml b/x11-apps/xrdb/metadata.xml
new file mode 100644
index 00000000000..35172171ffb
--- /dev/null
+++ b/x11-apps/xrdb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<upstream>
+ <remote-id type="cpe">cpe:/a:matthias_hopf:xrdb</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-apps/xrdb/xrdb-1.1.0.ebuild b/x11-apps/xrdb/xrdb-1.1.0.ebuild
new file mode 100644
index 00000000000..7e354d2af2d
--- /dev/null
+++ b/x11-apps/xrdb/xrdb-1.1.0.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X server resource database utility"
+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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXmu
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xrefresh/Manifest b/x11-apps/xrefresh/Manifest
new file mode 100644
index 00000000000..10d2d386bc4
--- /dev/null
+++ b/x11-apps/xrefresh/Manifest
@@ -0,0 +1 @@
+DIST xrefresh-1.0.5.tar.bz2 120757 SHA256 3213671b0a8a9d1e8d1d5d9e3fd86842c894dd9acc1be2560eda50bc1fb791d6 SHA512 287d167cd167aa35cfc89364bf4e74313137ce47978419446c60cb915188c34051f95d4900d0d5dcf692173f31e00e2699d70e54b79f0b21a59b4694be744014 WHIRLPOOL 74c3f7938eb9da294545960d0160b6ce099c9ca666f837a7406a8202b07a1aa1bb68fa19db80c209f018f7585cf4202b15e455bac85e540a058375c7c0cd6404
diff --git a/x11-apps/xrefresh/metadata.xml b/x11-apps/xrefresh/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xrefresh/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-apps/xrefresh/xrefresh-1.0.5.ebuild b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
new file mode 100644
index 00000000000..252edb7c808
--- /dev/null
+++ b/x11-apps/xrefresh/xrefresh-1.0.5.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="refresh all or part of an X screen"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xset/Manifest b/x11-apps/xset/Manifest
new file mode 100644
index 00000000000..4f5450b6917
--- /dev/null
+++ b/x11-apps/xset/Manifest
@@ -0,0 +1 @@
+DIST xset-1.2.3.tar.bz2 142286 SHA256 4382f4fb29b88647e13f3b4bc29263134270747fc159cfc5f7e3af23588c8063 SHA512 7b2cf4b06b93aec9f6f868be3f0932a5d6e62968485f7eb742a9b775059aa2a49c9170404e0597fd41a5730c0bf321e371ee6b23bbcde3be054f768ab8d3d92a WHIRLPOOL 54d52ba753a397120e9358d1de8d14629bac997d1a75728b17c949f1b90e0122e830c0721b4d2605f4c1f07c5cc6731064e2fb9cb154ce5beef9743aa58595de
diff --git a/x11-apps/xset/metadata.xml b/x11-apps/xset/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xset/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-apps/xset/xset-1.2.3.ebuild b/x11-apps/xset/xset-1.2.3.ebuild
new file mode 100644
index 00000000000..88aa0173a81
--- /dev/null
+++ b/x11-apps/xset/xset-1.2.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xset application"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+ x11-libs/libX11
+ x11-libs/libXmu
+ x11-libs/libXext"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+ --without-xf86misc
+ --without-fontcache
+)
diff --git a/x11-apps/xsetroot/Manifest b/x11-apps/xsetroot/Manifest
new file mode 100644
index 00000000000..e4a740cd4a4
--- /dev/null
+++ b/x11-apps/xsetroot/Manifest
@@ -0,0 +1 @@
+DIST xsetroot-1.1.1.tar.bz2 119977 SHA256 ba215daaa78c415fce11b9e58c365d03bb602eaa5ea916578d76861a468cc3d9 SHA512 04834a8ca658a4aabe03e62588353102e8019d424e25fab450d48e6fc4ac358df5bb98a850c82c61e2495faabfe54f3d92d9563e77c83ace7fd69c278edbbd64 WHIRLPOOL 89cec2aabe15f5eb3ce94ff4a78865a119ae2ef914760118399ad997c575b9e87e349891ba2a4c40743116e714ec80278c671484a47dd1816eab8961e096db48
diff --git a/x11-apps/xsetroot/metadata.xml b/x11-apps/xsetroot/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xsetroot/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-apps/xsetroot/xsetroot-1.1.1.ebuild b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
new file mode 100644
index 00000000000..91ae4a1c7b2
--- /dev/null
+++ b/x11-apps/xsetroot/xsetroot-1.1.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X.Org xsetroot application"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE=""
+RDEPEND="x11-libs/libXmu
+ x11-libs/libX11
+ x11-misc/xbitmaps
+ x11-libs/libXcursor"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xsm/Manifest b/x11-apps/xsm/Manifest
new file mode 100644
index 00000000000..7ede35aea05
--- /dev/null
+++ b/x11-apps/xsm/Manifest
@@ -0,0 +1 @@
+DIST xsm-1.0.3.tar.bz2 161012 SHA256 ad9dee2847a683841f73518a83014b0accae60e9eff7e96752a0dbc412867b4a SHA512 930a12272011ddd7c60e62b32b485c383292163f8aed6086c756f71cece62d0c316d89a6056751818b3b0ee26f68cca6e0fc914cd58d9b20da0a3b7ccf2145f0 WHIRLPOOL bb8a30a849c3570c91a69b5490509919fe19e9f986a018e8ea7b71b36aa986c2770eba4206b8d17918f3a3f199dc34c105e57aaa23716d897f81bb5f8682c2b6
diff --git a/x11-apps/xsm/metadata.xml b/x11-apps/xsm/metadata.xml
new file mode 100644
index 00000000000..26492798851
--- /dev/null
+++ b/x11-apps/xsm/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<use>
+ <flag name="rsh">This allows the use of rsh (remote shell) and rcp (remote copy).</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-apps/xsm/xsm-1.0.3.ebuild b/x11-apps/xsm/xsm-1.0.3.ebuild
new file mode 100644
index 00000000000..fdd292a8c4a
--- /dev/null
+++ b/x11-apps/xsm/xsm-1.0.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X Session Manager"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="rsh"
+RDEPEND="x11-libs/libXaw
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libICE
+ x11-libs/libSM
+ rsh? ( net-misc/netkit-rsh )"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ # (#158056) /usr/$(get_libdir)/X11/xsm could be a symlink
+ local XSMPATH="${EROOT}usr/$(get_libdir)/X11/xsm"
+ if [[ -L ${XSMPATH} ]]; then
+ einfo "Removing symlink ${XSMPATH}"
+ rm -f ${XSMPATH} || die "failed to remove symlink ${XSMPATH}"
+ fi
+ xorg-2_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS="$(use_with rsh rsh /usr/bin/rsh)"
+ xorg-2_src_configure
+}
diff --git a/x11-apps/xstdcmap/Manifest b/x11-apps/xstdcmap/Manifest
new file mode 100644
index 00000000000..01fa03c17b9
--- /dev/null
+++ b/x11-apps/xstdcmap/Manifest
@@ -0,0 +1 @@
+DIST xstdcmap-1.0.3.tar.bz2 117491 SHA256 f648e2b0cf16aa29856de998e2c7204be39dc1f8daeda9464d32288e0b580fc1 SHA512 8037ddb9c6b8f3a65d35637a1fca2b1b6c7e76afce5c13b1947cf72c3ca87679aa2ed05caf308d90549432b7fe029a522a99f32701bd0087c140bf4fafdb4d49 WHIRLPOOL 507a82f9692767318ba3cc0c484e7cf71fa2fa5005945f8e8146c160dc215a273a640505dd3476579fb5807e7bcbab8480377ab035f53f51d265a2f3245a3cf7
diff --git a/x11-apps/xstdcmap/metadata.xml b/x11-apps/xstdcmap/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xstdcmap/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-apps/xstdcmap/xstdcmap-1.0.3.ebuild b/x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild
new file mode 100644
index 00000000000..96746f69351
--- /dev/null
+++ b/x11-apps/xstdcmap/xstdcmap-1.0.3.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="X standard colormap utility"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh ~sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libXmu
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xtitle/Manifest b/x11-apps/xtitle/Manifest
new file mode 100644
index 00000000000..4e143e891c2
--- /dev/null
+++ b/x11-apps/xtitle/Manifest
@@ -0,0 +1,2 @@
+DIST xtitle-1.0.2.tgz 10284 SHA256 afbd2b913dcd786f7b8856a549bd4808045d9225c4942aff2f3eba7d2f9a04d8 SHA512 5e83d48091fc6483b451aa265b2e2e08da0b5ee0f715c539ff2165ed460526dd46eb1dba883a407f4a20822e949a8a26cd960396174df9b05dd98d2dd523ddf9 WHIRLPOOL 0bdd47b862e406167d272a502607fe5b77d26da68514997f08b7eeb9edca790f971da81f4a33184830c655063385568d358b3dd4ef50069b7d3c80981b003afd
+DIST xtitle-1.0.3.tgz 10616 SHA256 ab88bb2a1c230d2aa4bbbb439e9ca470cc9e50d57c7f63b1e4cc7a71f1ea72bf SHA512 77cf47cd77ceb57b2a12630b4430ed342597f7fdc8ecaaac6bc284cb1eeba09949340f24698a0e893c74bb82c4bd54255b4c3750d387169c163e4aafe8e1a831 WHIRLPOOL ee0270cfbe2327656a9c629f09b9ea1dd38a2e2817e6b5427f2ba828a36d5d8adc77a4bce2673c4b42889be32562e46161a27a405f30bde4456ae89cceace176
diff --git a/x11-apps/xtitle/metadata.xml b/x11-apps/xtitle/metadata.xml
new file mode 100644
index 00000000000..1b9fb5b7d4b
--- /dev/null
+++ b/x11-apps/xtitle/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>zlogene@gentoo.org</email>
+ <name>Mikle Kolyada</name>
+ </maintainer>
+ <maintainer>
+ <email>pinkbyte@gentoo.org</email>
+ <name>Sergey Popov</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xtitle/xtitle-1.0.2.ebuild b/x11-apps/xtitle/xtitle-1.0.2.ebuild
new file mode 100644
index 00000000000..e1586b1617a
--- /dev/null
+++ b/x11-apps/xtitle/xtitle-1.0.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Set window title and icon name for an X11 terminal window"
+HOMEPAGE="http://www.cs.indiana.edu/~kinzler/xtitle/"
+SRC_URI="http://www.cs.indiana.edu/~kinzler/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="x11-misc/imake"
+RDEPEND=""
+
+DOCS=( README )
+
+src_compile() {
+ xmkmf || die
+ emake
+}
+
+src_install() {
+ default
+ newman "${PN}.man" "${PN}.1"
+ dohtml "${PN}.html"
+}
diff --git a/x11-apps/xtitle/xtitle-1.0.3.ebuild b/x11-apps/xtitle/xtitle-1.0.3.ebuild
new file mode 100644
index 00000000000..ebfd7a2a14a
--- /dev/null
+++ b/x11-apps/xtitle/xtitle-1.0.3.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Set window title and icon name for an X11 terminal window"
+HOMEPAGE="http://www.cs.indiana.edu/~kinzler/xtitle/"
+SRC_URI="http://www.cs.indiana.edu/~kinzler/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="x11-misc/imake"
+RDEPEND=""
+
+DOCS=( README )
+
+src_compile() {
+ xmkmf || die
+ emake
+}
+
+src_install() {
+ default
+ newman "${PN}.man" "${PN}.1"
+ dohtml "${PN}.html"
+}
diff --git a/x11-apps/xtrap/Manifest b/x11-apps/xtrap/Manifest
new file mode 100644
index 00000000000..88e3bff4af3
--- /dev/null
+++ b/x11-apps/xtrap/Manifest
@@ -0,0 +1 @@
+DIST xtrap-1.0.2.tar.bz2 95471 SHA256 8f513da45b0c65dff4a3d477e5600a98d677571d7ed283f52c905987dcae0fbc
diff --git a/x11-apps/xtrap/metadata.xml b/x11-apps/xtrap/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xtrap/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-apps/xtrap/xtrap-1.0.2-r1.ebuild b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
new file mode 100644
index 00000000000..9a65927a8f3
--- /dev/null
+++ b/x11-apps/xtrap/xtrap-1.0.2-r1.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org xtrap application"
+KEYWORDS="amd64 arm hppa ~mips ppc ppc64 s390 sh ~sparc x86"
+IUSE=""
+RDEPEND="x11-libs/libX11
+ x11-libs/libXTrap"
+DEPEND="${RDEPEND}
+ x11-proto/trapproto"
diff --git a/x11-apps/xvidtune/Manifest b/x11-apps/xvidtune/Manifest
new file mode 100644
index 00000000000..9f938e5c36e
--- /dev/null
+++ b/x11-apps/xvidtune/Manifest
@@ -0,0 +1,2 @@
+DIST xvidtune-1.0.2.tar.bz2 113117 SHA256 73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53 SHA512 4afbd4739e9fd1f94f7c5694a0bf4f7c90deba8e0b34ae446b49058293ccc90f27d0b3da2a134e1724f87183b8bbef73035eaf8c82fc11094e85b6e84c773276 WHIRLPOOL 691eeae2f738cb848252dc5f73de9d5517bcbedea8bce7df4f5e9fee743d90e75120af6dc045e0f7a6cead903b9b457ee44ef4301e338d686e3850b5c05f73f7
+DIST xvidtune-1.0.3.tar.bz2 128492 SHA256 24e5e103933a04bfb2e1d18562619ed74031ab515e7343eb546bacdbcbeecf01 SHA512 0f8a4fca1b544ef8f9623246fb0ece75739a0889f2e729c040cd768c595f0bbbfa3a665576369032535c34c7d55784a29b62f0d51432bf2b75d2cec619db7352 WHIRLPOOL b3474f83932765db29239750847efccc03ab5b4f72671544b215f6660ece16999844681666453c886c96b5f743881bb47904a417815ce85d9eef855f88f6eaa9
diff --git a/x11-apps/xvidtune/metadata.xml b/x11-apps/xvidtune/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xvidtune/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-apps/xvidtune/xvidtune-1.0.2-r1.ebuild b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
new file mode 100644
index 00000000000..e16750a6199
--- /dev/null
+++ b/x11-apps/xvidtune/xvidtune-1.0.2-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="video mode tuner for Xorg"
+
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 s390 sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto"
diff --git a/x11-apps/xvidtune/xvidtune-1.0.3.ebuild b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
new file mode 100644
index 00000000000..e8237690aa3
--- /dev/null
+++ b/x11-apps/xvidtune/xvidtune-1.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+DESCRIPTION="video mode tuner for Xorg"
+
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+
+RDEPEND="x11-libs/libXaw
+ x11-libs/libXmu
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+ x11-proto/xf86vidmodeproto"
diff --git a/x11-apps/xvinfo/Manifest b/x11-apps/xvinfo/Manifest
new file mode 100644
index 00000000000..d02f531e599
--- /dev/null
+++ b/x11-apps/xvinfo/Manifest
@@ -0,0 +1,2 @@
+DIST xvinfo-1.1.2.tar.bz2 116906 SHA256 eed3d90ffd788ef728c4a5e7aa4bd86dc6bbcebac929caf7a0479cf8b53b50e3 SHA512 0cf431afb52807f88654aaa3acbd286630461c934516ee5bbe280ec468ebfd3970b5b10f69d3a25aa36b6e0c0ac46d1c20c9606ac1de76261df80f1821362732 WHIRLPOOL 3ad7cb1a3dd278551ca5a8e33f6e8bf55543ca3628e160835b0237eaa1c69e350ecebdc3ec936f6809f4fc87506207452fc96bd0262ad8d0834520cbf20a4153
+DIST xvinfo-1.1.3.tar.bz2 123750 SHA256 9fba8b68daf53863e66d5004fa9c703fcecf69db4d151ea2d3d885d621e6e5eb SHA512 df8356898390d2aec4fbd15cee1627bb86b57ff8af41a527d4f6f6703a81f399a3098da342b94af6d4cf4a817d9fda1946a206bfbe3995e87ceb9910bb8b51bc WHIRLPOOL 94b1db5a3d7cb183f56699f81a2577128dbc53e88b03a3ab0213c87bd0d664d817475d522d2366878f0bbd012141209dec6ec6ff9f5ee26d5416114a67a6987c
diff --git a/x11-apps/xvinfo/metadata.xml b/x11-apps/xvinfo/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xvinfo/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-apps/xvinfo/xvinfo-1.1.2.ebuild b/x11-apps/xvinfo/xvinfo-1.1.2.ebuild
new file mode 100644
index 00000000000..7f5ffb1156e
--- /dev/null
+++ b/x11-apps/xvinfo/xvinfo-1.1.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Print out X-Video extension adaptor information"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXv
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xvinfo/xvinfo-1.1.3.ebuild b/x11-apps/xvinfo/xvinfo-1.1.3.ebuild
new file mode 100644
index 00000000000..6113ad4510c
--- /dev/null
+++ b/x11-apps/xvinfo/xvinfo-1.1.3.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="Print out X-Video extension adaptor information"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libXv
+ x11-libs/libX11"
+DEPEND="${RDEPEND}"
diff --git a/x11-apps/xwarppointer/Manifest b/x11-apps/xwarppointer/Manifest
new file mode 100644
index 00000000000..cde155a1673
--- /dev/null
+++ b/x11-apps/xwarppointer/Manifest
@@ -0,0 +1 @@
+DIST xwarppointer.tar.gz 2338 SHA256 3569bf9e67ef080b8f8b2b13f51f6648866c1ff19f63c1385c8a72a6b064930e SHA512 630b64076b6ebab26eeb278c5f222777a8ca150d4fdcdb78c6749800d4d02fc3c43305fe3e3cf9f640e5e5535f7e10899aa2ed31e8c23245bc6f215d0d25a38c WHIRLPOOL 15a6080762442efd0f4a2e40fd68b7a34c4849c937a4e719cf468e401d418aeee29db9a841eaae6b1ca4baeaf59ea65f591aca4f294afa7d678856e4a57dd971
diff --git a/x11-apps/xwarppointer/metadata.xml b/x11-apps/xwarppointer/metadata.xml
new file mode 100644
index 00000000000..a40624fba8f
--- /dev/null
+++ b/x11-apps/xwarppointer/metadata.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild b/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild
new file mode 100644
index 00000000000..ff2d2cd4f6b
--- /dev/null
+++ b/x11-apps/xwarppointer/xwarppointer-1-r2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="Program to move the mouse cursor"
+HOMEPAGE="http://www.ishiboo.com/~nirva/Projects/xwarppointer/"
+SRC_URI="http://www.ishiboo.com/~nirva/Projects/xwarppointer/${PN}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+ sed -i Makefile \
+ -e 's|^X11HOME=.*|X11HOME=/usr/X11R6|' \
+ -e 's|^CFLAGS=|CFLAGS+=|' \
+ -e 's| -o | $(LDFLAGS)&|' \
+ || die 'setting X11HOME failed'
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin xwarppointer
+ dodoc README
+}
diff --git a/x11-apps/xwd/Manifest b/x11-apps/xwd/Manifest
new file mode 100644
index 00000000000..4d26a5df608
--- /dev/null
+++ b/x11-apps/xwd/Manifest
@@ -0,0 +1 @@
+DIST xwd-1.0.6.tar.bz2 144548 SHA256 3bb396a2268d78de4b1c3e5237a85f7849d3434e87b3cd1f4d57eef614227d79 SHA512 8fb86cbe163631fdb3f49ad6bb648ea599d7c5f9b11aba7e88afb86daed34cab88dcba057e0c5ca3e4e5904598b279f5a68ad43a64dd1053d647aa78523a806f WHIRLPOOL bfabf94e0fe6fe46c25c22b1d062e6548e9c0632d24a17c52dfe8891c43f0029ebcda827c1e85aeb4a2fb54a156ebe36290c97dc5429e5d78aa4efcff63a6e9e
diff --git a/x11-apps/xwd/metadata.xml b/x11-apps/xwd/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xwd/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-apps/xwd/xwd-1.0.6.ebuild b/x11-apps/xwd/xwd-1.0.6.ebuild
new file mode 100644
index 00000000000..ba19d7ff002
--- /dev/null
+++ b/x11-apps/xwd/xwd-1.0.6.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2
+
+DESCRIPTION="dump an image of an X window"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+# libXt dependency is not in configure.ac, bug #408629, upstream #47462."
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}
+ x11-libs/libXt
+ x11-libs/libxkbfile
+ x11-proto/xproto"
diff --git a/x11-apps/xwininfo/Manifest b/x11-apps/xwininfo/Manifest
new file mode 100644
index 00000000000..e6e447eea44
--- /dev/null
+++ b/x11-apps/xwininfo/Manifest
@@ -0,0 +1,2 @@
+DIST xwininfo-1.1.2.tar.bz2 135415 SHA256 8fa66c9ce02da257613fa428137ab9efc89c8f9939c074513dbc0f407dc9ac3a SHA512 48db52db9f0e6eeffb635906e3b703d8b87bc98b32e41a3164409bad6b5b428ce0835a72be0f7d7008c8a00ca0bc4013ba5ad81f7402bfb20652a163832afc2d WHIRLPOOL 55ef58870e92b4ee9f78b369a875176af2d75ea3976c10842b4db8efaf2c8272a33fffffaf91e8641b35bbd726d9023ef845086c5f98e01d984a6321d3d84214
+DIST xwininfo-1.1.3.tar.bz2 157512 SHA256 218eb0ea95bd8de7903dfaa26423820c523ad1598be0751d2d8b6a2c23b23ff8 SHA512 b4c3c72de157d33e309694be96dcafabb3240c1883fb3caf44843cba8b90fe09496eb4ab061eba9107115d76ca59a8ec660e11ff968e422ab35cd5e1749ca466 WHIRLPOOL 902c45b6c94a6b659c3f1bec04d4324c40ec88c8a75daff742e2c801ca388fe3c6bacb31efb14d62237de4e39c1ea776ccbb5788b705c66e86260fc17ec281e7
diff --git a/x11-apps/xwininfo/metadata.xml b/x11-apps/xwininfo/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xwininfo/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-apps/xwininfo/xwininfo-1.1.2.ebuild b/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
new file mode 100644
index 00000000000..df25621c711
--- /dev/null
+++ b/x11-apps/xwininfo/xwininfo-1.1.2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+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 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libxcb-1.6"
+DEPEND="${RDEPEND}
+ x11-libs/libX11
+ >=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* || ${CHOST} == *-solaris* ]] &&
+ append-libs -liconv
+}
diff --git a/x11-apps/xwininfo/xwininfo-1.1.3.ebuild b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
new file mode 100644
index 00000000000..02756cd9f32
--- /dev/null
+++ b/x11-apps/xwininfo/xwininfo-1.1.3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="window information utility for X"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libxcb-1.6"
+DEPEND="${RDEPEND}
+ x11-libs/libX11
+ >=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* || ${CHOST} == *-solaris* ]] &&
+ append-libs -liconv
+}
diff --git a/x11-apps/xwud/Manifest b/x11-apps/xwud/Manifest
new file mode 100644
index 00000000000..17e5b28df51
--- /dev/null
+++ b/x11-apps/xwud/Manifest
@@ -0,0 +1 @@
+DIST xwud-1.0.4.tar.bz2 124604 SHA256 d6b3a09ccfe750868e26bd2384900ab5ff0d434f7f40cd272a50eda8aaa1f8bd
diff --git a/x11-apps/xwud/metadata.xml b/x11-apps/xwud/metadata.xml
new file mode 100644
index 00000000000..01c4c004e73
--- /dev/null
+++ b/x11-apps/xwud/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-apps/xwud/xwud-1.0.4.ebuild b/x11-apps/xwud/xwud-1.0.4.ebuild
new file mode 100644
index 00000000000..3600fc1de2a
--- /dev/null
+++ b/x11-apps/xwud/xwud-1.0.4.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit xorg-2
+
+DESCRIPTION="image displayer for X"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11"
+DEPEND="${RDEPEND}"