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-libs
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-libs')
-rw-r--r--x11-libs/agg/Manifest1
-rw-r--r--x11-libs/agg/agg-2.5-r2.ebuild60
-rw-r--r--x11-libs/agg/files/2.5/02_maintainer_mode.patch21
-rw-r--r--x11-libs/agg/files/2.5/04_no_rpath.patch10
-rw-r--r--x11-libs/agg/metadata.xml11
-rw-r--r--x11-libs/amd-adl-sdk/Manifest3
-rw-r--r--x11-libs/amd-adl-sdk/amd-adl-sdk-6.0-r1.ebuild38
-rw-r--r--x11-libs/amd-adl-sdk/amd-adl-sdk-7.0.ebuild47
-rw-r--r--x11-libs/amd-adl-sdk/amd-adl-sdk-8.0.ebuild48
-rw-r--r--x11-libs/amd-adl-sdk/metadata.xml12
-rw-r--r--x11-libs/c++-gtk-utils/Manifest4
-rw-r--r--x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild42
-rw-r--r--x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.28.ebuild42
-rw-r--r--x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild42
-rw-r--r--x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.11.ebuild42
-rw-r--r--x11-libs/c++-gtk-utils/metadata.xml8
-rw-r--r--x11-libs/cairo/Manifest2
-rw-r--r--x11-libs/cairo/cairo-1.12.18-r1.ebuild174
-rw-r--r--x11-libs/cairo/cairo-1.14.2.ebuild159
-rw-r--r--x11-libs/cairo/cairo-9999.ebuild159
-rw-r--r--x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch15
-rw-r--r--x11-libs/cairo/files/cairo-respect-fontconfig.patch13
-rw-r--r--x11-libs/cairo/metadata.xml28
-rw-r--r--x11-libs/colord-gtk/Manifest2
-rw-r--r--x11-libs/colord-gtk/colord-gtk-0.1.25.ebuild62
-rw-r--r--x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild69
-rw-r--r--x11-libs/colord-gtk/metadata.xml5
-rw-r--r--x11-libs/compiz-bcop/Manifest1
-rw-r--r--x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild20
-rw-r--r--x11-libs/compiz-bcop/metadata.xml10
-rw-r--r--x11-libs/compizconfig-backend-gconf/Manifest1
-rw-r--r--x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild36
-rw-r--r--x11-libs/compizconfig-backend-gconf/metadata.xml6
-rw-r--r--x11-libs/compizconfig-backend-kconfig4/Manifest1
-rw-r--r--x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild20
-rw-r--r--x11-libs/compizconfig-backend-kconfig4/metadata.xml6
-rw-r--r--x11-libs/dnd/Manifest1
-rw-r--r--x11-libs/dnd/dnd-1.1-r1.ebuild40
-rw-r--r--x11-libs/dnd/files/Makefile-fix.patch44
-rw-r--r--x11-libs/dnd/files/dnd-1.1-gentoo.diff35
-rw-r--r--x11-libs/dnd/metadata.xml8
-rw-r--r--x11-libs/flowcanvas/Manifest1
-rw-r--r--x11-libs/flowcanvas/files/gv234.patch48
-rw-r--r--x11-libs/flowcanvas/files/ldconfig2.patch10
-rw-r--r--x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild42
-rw-r--r--x11-libs/flowcanvas/metadata.xml10
-rw-r--r--x11-libs/fltk/Manifest2
-rw-r--r--x11-libs/fltk/files/FLTKConfig.cmake37
-rw-r--r--x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch79
-rw-r--r--x11-libs/fltk/files/fltk-1.3.0-share.patch44
-rw-r--r--x11-libs/fltk/files/fltk-1.3.1-as-needed.patch154
-rw-r--r--x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch55
-rw-r--r--x11-libs/fltk/files/fltk-1.3.2-desktop.patch19
-rw-r--r--x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch22
-rw-r--r--x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch10
-rw-r--r--x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch14
-rw-r--r--x11-libs/fltk/files/fltk-1.3.3-visibility.patch22
-rw-r--r--x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch165
-rw-r--r--x11-libs/fltk/fltk-1.3.2.ebuild153
-rw-r--r--x11-libs/fltk/fltk-1.3.3-r3.ebuild170
-rw-r--r--x11-libs/fltk/fltk-1.3.9999.ebuild173
-rw-r--r--x11-libs/fltk/metadata.xml15
-rw-r--r--x11-libs/fox-wrapper/files/fox-wrapper-1.sh76
-rw-r--r--x11-libs/fox-wrapper/files/fox-wrapper-2.sh76
-rw-r--r--x11-libs/fox-wrapper/files/fox-wrapper-3.sh76
-rw-r--r--x11-libs/fox-wrapper/fox-wrapper-2.ebuild25
-rw-r--r--x11-libs/fox-wrapper/fox-wrapper-3.ebuild25
-rw-r--r--x11-libs/fox-wrapper/metadata.xml9
-rw-r--r--x11-libs/fox/Manifest5
-rw-r--r--x11-libs/fox/files/fox-1.6.40-libpng15.patch32
-rw-r--r--x11-libs/fox/files/jpeg-9.patch40
-rw-r--r--x11-libs/fox/fox-1.6.45.ebuild42
-rw-r--r--x11-libs/fox/fox-1.6.49.ebuild42
-rw-r--r--x11-libs/fox/fox-1.7.45.ebuild55
-rw-r--r--x11-libs/fox/fox-1.7.47.ebuild55
-rw-r--r--x11-libs/fox/fox-1.7.49.ebuild60
-rw-r--r--x11-libs/fox/metadata.xml8
-rw-r--r--x11-libs/fxscintilla/Manifest1
-rw-r--r--x11-libs/fxscintilla/files/1.71-fox-SLOT.patch143
-rw-r--r--x11-libs/fxscintilla/files/1.71-shared-libs.patch19
-rw-r--r--x11-libs/fxscintilla/fxscintilla-3.3.5.ebuild43
-rw-r--r--x11-libs/fxscintilla/metadata.xml11
-rw-r--r--x11-libs/gdk-pixbuf/Manifest1
-rw-r--r--x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-divide-by-zero.patch28
-rw-r--r--x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-pixops-overflow.patch85
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild126
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild117
-rw-r--r--x11-libs/gdk-pixbuf/metadata.xml5
-rw-r--r--x11-libs/gksu/Manifest1
-rw-r--r--x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch29
-rw-r--r--x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch58
-rw-r--r--x11-libs/gksu/gksu-2.0.2-r1.ebuild81
-rw-r--r--x11-libs/gksu/metadata.xml5
-rw-r--r--x11-libs/gl2ps/Manifest3
-rw-r--r--x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch61
-rw-r--r--x11-libs/gl2ps/files/gl2ps-1.3.7-cmake.patch74
-rw-r--r--x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch74
-rw-r--r--x11-libs/gl2ps/gl2ps-1.3.6.ebuild48
-rw-r--r--x11-libs/gl2ps/gl2ps-1.3.7.ebuild49
-rw-r--r--x11-libs/gl2ps/gl2ps-1.3.8.ebuild49
-rw-r--r--x11-libs/gl2ps/metadata.xml14
-rw-r--r--x11-libs/glamor/Manifest1
-rw-r--r--x11-libs/glamor/files/glamor-0.6.0-glamor_egl_create_argb8888.patch31
-rw-r--r--x11-libs/glamor/files/glamor-0.6.0-xv-add-missing-include.patch30
-rw-r--r--x11-libs/glamor/glamor-0.6.0-r1.ebuild54
-rw-r--r--x11-libs/glamor/glamor-0.6.0.ebuild53
-rw-r--r--x11-libs/glamor/metadata.xml8
-rw-r--r--x11-libs/gnome-pty-helper/Manifest3
-rw-r--r--x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild33
-rw-r--r--x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild33
-rw-r--r--x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild33
-rw-r--r--x11-libs/gnome-pty-helper/metadata.xml5
-rw-r--r--x11-libs/goffice/Manifest3
-rw-r--r--x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch219
-rw-r--r--x11-libs/goffice/goffice-0.10.21.ebuild56
-rw-r--r--x11-libs/goffice/goffice-0.10.22.ebuild56
-rw-r--r--x11-libs/goffice/goffice-0.8.17-r1.ebuild62
-rw-r--r--x11-libs/goffice/metadata.xml10
-rw-r--r--x11-libs/goocanvas/Manifest2
-rw-r--r--x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch26
-rw-r--r--x11-libs/goocanvas/files/goocanvas-2.0.1-gold.patch30
-rw-r--r--x11-libs/goocanvas/goocanvas-1.0.0.ebuild58
-rw-r--r--x11-libs/goocanvas/goocanvas-2.0.2.ebuild69
-rw-r--r--x11-libs/goocanvas/metadata.xml5
-rw-r--r--x11-libs/gtk+/Manifest10
-rw-r--r--x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch19
-rw-r--r--x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch696
-rw-r--r--x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch16
-rw-r--r--x11-libs/gtk+/files/gtk+-1.2.10-automake.patch126
-rw-r--r--x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch13
-rw-r--r--x11-libs/gtk+/files/gtk+-1.2.10-m4.patch9
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch15
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch33
-rw-r--r--x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch64
-rw-r--r--x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch39
-rw-r--r--x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch24
-rw-r--r--x11-libs/gtk+/files/gtk+-non-bash-support.patch56
-rw-r--r--x11-libs/gtk+/files/gtkrc39
-rw-r--r--x11-libs/gtk+/files/settings.ini4
-rw-r--r--x11-libs/gtk+/gtk+-1.2.10-r12.ebuild89
-rw-r--r--x11-libs/gtk+/gtk+-1.2.10-r13.ebuild101
-rw-r--r--x11-libs/gtk+/gtk+-2.24.25.ebuild272
-rw-r--r--x11-libs/gtk+/gtk+-2.24.27.ebuild300
-rw-r--r--x11-libs/gtk+/gtk+-2.24.28-r1.ebuild311
-rw-r--r--x11-libs/gtk+/gtk+-3.12.2.ebuild224
-rw-r--r--x11-libs/gtk+/gtk+-3.14.13.ebuild245
-rw-r--r--x11-libs/gtk+/gtk+-3.14.9.ebuild244
-rw-r--r--x11-libs/gtk+/gtk+-3.16.4.ebuild249
-rw-r--r--x11-libs/gtk+/gtk+-3.16.5.ebuild249
-rw-r--r--x11-libs/gtk+/metadata.xml20
-rw-r--r--x11-libs/gtk+extra/Manifest1
-rw-r--r--x11-libs/gtk+extra/files/gtk+extra-3.0.1-fix-configure.patch173
-rw-r--r--x11-libs/gtk+extra/files/gtk+extra-3.0.1-gunicode.h.patch14
-rw-r--r--x11-libs/gtk+extra/gtk+extra-3.0.5.ebuild39
-rw-r--r--x11-libs/gtk+extra/metadata.xml12
-rw-r--r--x11-libs/gtk-mac-integration/Manifest1
-rw-r--r--x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild24
-rw-r--r--x11-libs/gtk-mac-integration/metadata.xml5
-rw-r--r--x11-libs/gtkdatabox/Manifest1
-rw-r--r--x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild58
-rw-r--r--x11-libs/gtkdatabox/metadata.xml16
-rw-r--r--x11-libs/gtkglarea/Manifest3
-rw-r--r--x11-libs/gtkglarea/files/gtkglarea-1.2.3-m4.patch11
-rw-r--r--x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild44
-rw-r--r--x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild47
-rw-r--r--x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild47
-rw-r--r--x11-libs/gtkglarea/metadata.xml5
-rw-r--r--x11-libs/gtkglext/Manifest1
-rw-r--r--x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch358
-rw-r--r--x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild59
-rw-r--r--x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild66
-rw-r--r--x11-libs/gtkglext/metadata.xml8
-rw-r--r--x11-libs/gtkhotkey/Manifest1
-rw-r--r--x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch22
-rw-r--r--x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild43
-rw-r--r--x11-libs/gtkhotkey/metadata.xml10
-rw-r--r--x11-libs/gtkmathview/Manifest1
-rw-r--r--x11-libs/gtkmathview/files/binreloc.m477
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch22
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch49
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch61
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch10
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch101
-rw-r--r--x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch61
-rw-r--r--x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild78
-rw-r--r--x11-libs/gtkmathview/metadata.xml10
-rw-r--r--x11-libs/gtksourceview/Manifest5
-rw-r--r--x11-libs/gtksourceview/files/2.0/gentoo.lang111
-rw-r--r--x11-libs/gtksourceview/files/gentoo.lang59
-rw-r--r--x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch139
-rw-r--r--x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild62
-rw-r--r--x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild61
-rw-r--r--x11-libs/gtksourceview/gtksourceview-3.12.3.ebuild51
-rw-r--r--x11-libs/gtksourceview/gtksourceview-3.14.3.ebuild61
-rw-r--r--x11-libs/gtksourceview/gtksourceview-3.14.4.ebuild61
-rw-r--r--x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild61
-rw-r--r--x11-libs/gtksourceview/metadata.xml8
-rw-r--r--x11-libs/guile-gtk/Manifest1
-rw-r--r--x11-libs/guile-gtk/files/2.1-brokentest.patch33
-rw-r--r--x11-libs/guile-gtk/files/2.1-prll-install.patch13
-rw-r--r--x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff45
-rw-r--r--x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild42
-rw-r--r--x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild47
-rw-r--r--x11-libs/guile-gtk/metadata.xml12
-rw-r--r--x11-libs/hippo-canvas/Manifest1
-rw-r--r--x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch10
-rw-r--r--x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild53
-rw-r--r--x11-libs/hippo-canvas/metadata.xml12
-rw-r--r--x11-libs/ige-mac-integration/Manifest1
-rw-r--r--x11-libs/ige-mac-integration/ige-mac-integration-0.8.2.ebuild31
-rw-r--r--x11-libs/ige-mac-integration/ige-mac-integration-9999.ebuild35
-rw-r--r--x11-libs/ige-mac-integration/metadata.xml5
-rw-r--r--x11-libs/libFS/Manifest2
-rw-r--r--x11-libs/libFS/libFS-1.0.6.ebuild23
-rw-r--r--x11-libs/libFS/libFS-1.0.7.ebuild23
-rw-r--r--x11-libs/libFS/metadata.xml5
-rw-r--r--x11-libs/libGLw/Manifest1
-rw-r--r--x11-libs/libGLw/libGLw-8.0.0.ebuild36
-rw-r--r--x11-libs/libGLw/metadata.xml8
-rw-r--r--x11-libs/libICE/Manifest2
-rw-r--r--x11-libs/libICE/libICE-1.0.8-r1.ebuild30
-rw-r--r--x11-libs/libICE/libICE-1.0.9.ebuild30
-rw-r--r--x11-libs/libICE/metadata.xml5
-rw-r--r--x11-libs/libQGLViewer/Manifest3
-rw-r--r--x11-libs/libQGLViewer/libQGLViewer-2.6.1.ebuild52
-rw-r--r--x11-libs/libQGLViewer/libQGLViewer-2.6.2.ebuild52
-rw-r--r--x11-libs/libQGLViewer/libQGLViewer-2.6.3.ebuild52
-rw-r--r--x11-libs/libQGLViewer/metadata.xml11
-rw-r--r--x11-libs/libSM/Manifest1
-rw-r--r--x11-libs/libSM/libSM-1.2.2-r1.ebuild58
-rw-r--r--x11-libs/libSM/metadata.xml10
-rw-r--r--x11-libs/libX11/Manifest2
-rw-r--r--x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch11
-rw-r--r--x11-libs/libX11/files/libX11-1.1.5-solaris.patch13
-rw-r--r--x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch13
-rw-r--r--x11-libs/libX11/libX11-1.6.2.ebuild58
-rw-r--r--x11-libs/libX11/libX11-1.6.3.ebuild58
-rw-r--r--x11-libs/libX11/metadata.xml8
-rw-r--r--x11-libs/libXCalibrate/Manifest1
-rw-r--r--x11-libs/libXCalibrate/libXCalibrate-0.1_pre20081207-r1.ebuild28
-rw-r--r--x11-libs/libXCalibrate/metadata.xml6
-rw-r--r--x11-libs/libXScrnSaver/Manifest2
-rw-r--r--x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild15
-rw-r--r--x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild17
-rw-r--r--x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild15
-rw-r--r--x11-libs/libXScrnSaver/metadata.xml5
-rw-r--r--x11-libs/libXTrap/Manifest2
-rw-r--r--x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild18
-rw-r--r--x11-libs/libXTrap/libXTrap-1.0.0.ebuild19
-rw-r--r--x11-libs/libXTrap/libXTrap-1.0.1.ebuild18
-rw-r--r--x11-libs/libXTrap/metadata.xml5
-rw-r--r--x11-libs/libXau/Manifest1
-rw-r--r--x11-libs/libXau/libXau-1.0.8.ebuild16
-rw-r--r--x11-libs/libXau/metadata.xml5
-rw-r--r--x11-libs/libXaw/Manifest2
-rw-r--r--x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch26
-rw-r--r--x11-libs/libXaw/libXaw-1.0.12.ebuild38
-rw-r--r--x11-libs/libXaw/libXaw-1.0.13.ebuild33
-rw-r--r--x11-libs/libXaw/metadata.xml8
-rw-r--r--x11-libs/libXaw3d/Manifest1
-rw-r--r--x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild31
-rw-r--r--x11-libs/libXaw3d/metadata.xml5
-rw-r--r--x11-libs/libXaw3dXft/Manifest2
-rw-r--r--x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild37
-rw-r--r--x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild37
-rw-r--r--x11-libs/libXaw3dXft/metadata.xml10
-rw-r--r--x11-libs/libXcomposite/Manifest2
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild26
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.4.3.ebuild24
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild27
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.4.4.ebuild26
-rw-r--r--x11-libs/libXcomposite/metadata.xml5
-rw-r--r--x11-libs/libXcursor/Manifest1
-rw-r--r--x11-libs/libXcursor/libXcursor-1.1.14.ebuild23
-rw-r--r--x11-libs/libXcursor/metadata.xml5
-rw-r--r--x11-libs/libXdamage/Manifest1
-rw-r--r--x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild19
-rw-r--r--x11-libs/libXdamage/metadata.xml5
-rw-r--r--x11-libs/libXdmcp/Manifest2
-rw-r--r--x11-libs/libXdmcp/libXdmcp-1.1.1-r1.ebuild27
-rw-r--r--x11-libs/libXdmcp/libXdmcp-1.1.2.ebuild27
-rw-r--r--x11-libs/libXdmcp/metadata.xml5
-rw-r--r--x11-libs/libXevie/Manifest1
-rw-r--r--x11-libs/libXevie/libXevie-1.0.3.ebuild18
-rw-r--r--x11-libs/libXevie/metadata.xml5
-rw-r--r--x11-libs/libXext/Manifest2
-rw-r--r--x11-libs/libXext/libXext-1.3.2.ebuild27
-rw-r--r--x11-libs/libXext/libXext-1.3.3.ebuild27
-rw-r--r--x11-libs/libXext/metadata.xml5
-rw-r--r--x11-libs/libXfixes/Manifest1
-rw-r--r--x11-libs/libXfixes/libXfixes-5.0.1.ebuild19
-rw-r--r--x11-libs/libXfixes/metadata.xml5
-rw-r--r--x11-libs/libXfont/Manifest2
-rw-r--r--x11-libs/libXfont/libXfont-1.4.9.ebuild33
-rw-r--r--x11-libs/libXfont/libXfont-1.5.1.ebuild34
-rw-r--r--x11-libs/libXfont/metadata.xml12
-rw-r--r--x11-libs/libXfontcache/Manifest1
-rw-r--r--x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild16
-rw-r--r--x11-libs/libXfontcache/metadata.xml5
-rw-r--r--x11-libs/libXft/Manifest2
-rw-r--r--x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch17
-rw-r--r--x11-libs/libXft/libXft-2.3.1-r1.ebuild24
-rw-r--r--x11-libs/libXft/libXft-2.3.2.ebuild22
-rw-r--r--x11-libs/libXft/metadata.xml5
-rw-r--r--x11-libs/libXi/Manifest2
-rw-r--r--x11-libs/libXi/libXi-1.7.2.ebuild38
-rw-r--r--x11-libs/libXi/libXi-1.7.4.ebuild38
-rw-r--r--x11-libs/libXi/metadata.xml5
-rw-r--r--x11-libs/libXinerama/Manifest1
-rw-r--r--x11-libs/libXinerama/libXinerama-1.1.3.ebuild19
-rw-r--r--x11-libs/libXinerama/metadata.xml5
-rw-r--r--x11-libs/libXmu/Manifest2
-rw-r--r--x11-libs/libXmu/libXmu-1.1.1-r1.ebuild31
-rw-r--r--x11-libs/libXmu/libXmu-1.1.1.ebuild30
-rw-r--r--x11-libs/libXmu/libXmu-1.1.2.ebuild30
-rw-r--r--x11-libs/libXmu/metadata.xml5
-rw-r--r--x11-libs/libXp/Manifest2
-rw-r--r--x11-libs/libXp/libXp-1.0.2.ebuild19
-rw-r--r--x11-libs/libXp/libXp-1.0.3.ebuild19
-rw-r--r--x11-libs/libXp/metadata.xml5
-rw-r--r--x11-libs/libXpm/Manifest2
-rw-r--r--x11-libs/libXpm/libXpm-3.5.10-r1.ebuild29
-rw-r--r--x11-libs/libXpm/libXpm-3.5.10.ebuild27
-rw-r--r--x11-libs/libXpm/libXpm-3.5.11.ebuild29
-rw-r--r--x11-libs/libXpm/metadata.xml5
-rw-r--r--x11-libs/libXrandr/Manifest2
-rw-r--r--x11-libs/libXrandr/libXrandr-1.4.2.ebuild21
-rw-r--r--x11-libs/libXrandr/libXrandr-1.5.0.ebuild21
-rw-r--r--x11-libs/libXrandr/metadata.xml5
-rw-r--r--x11-libs/libXrender/Manifest2
-rw-r--r--x11-libs/libXrender/libXrender-0.9.8.ebuild18
-rw-r--r--x11-libs/libXrender/libXrender-0.9.9.ebuild18
-rw-r--r--x11-libs/libXrender/metadata.xml5
-rw-r--r--x11-libs/libXres/Manifest1
-rw-r--r--x11-libs/libXres/libXres-1.0.7.ebuild18
-rw-r--r--x11-libs/libXres/metadata.xml5
-rw-r--r--x11-libs/libXt/Manifest2
-rw-r--r--x11-libs/libXt/libXt-1.1.4.ebuild25
-rw-r--r--x11-libs/libXt/libXt-1.1.5.ebuild25
-rw-r--r--x11-libs/libXt/metadata.xml5
-rw-r--r--x11-libs/libXtst/Manifest1
-rw-r--r--x11-libs/libXtst/libXtst-1.2.2.ebuild22
-rw-r--r--x11-libs/libXtst/metadata.xml5
-rw-r--r--x11-libs/libXv/Manifest1
-rw-r--r--x11-libs/libXv/libXv-1.0.10.ebuild19
-rw-r--r--x11-libs/libXv/metadata.xml5
-rw-r--r--x11-libs/libXvMC/Manifest2
-rw-r--r--x11-libs/libXvMC/libXvMC-1.0.8.ebuild21
-rw-r--r--x11-libs/libXvMC/libXvMC-1.0.9.ebuild21
-rw-r--r--x11-libs/libXvMC/metadata.xml5
-rw-r--r--x11-libs/libXxf86dga/Manifest1
-rw-r--r--x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild20
-rw-r--r--x11-libs/libXxf86dga/metadata.xml5
-rw-r--r--x11-libs/libXxf86misc/Manifest1
-rw-r--r--x11-libs/libXxf86misc/libXxf86misc-1.0.3.ebuild18
-rw-r--r--x11-libs/libXxf86misc/metadata.xml5
-rw-r--r--x11-libs/libXxf86vm/Manifest2
-rw-r--r--x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild20
-rw-r--r--x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild20
-rw-r--r--x11-libs/libXxf86vm/metadata.xml5
-rw-r--r--x11-libs/libaosd/Manifest1
-rw-r--r--x11-libs/libaosd/libaosd-0.2.7.ebuild42
-rw-r--r--x11-libs/libaosd/metadata.xml14
-rw-r--r--x11-libs/libast/Manifest1
-rw-r--r--x11-libs/libast/libast-0.7.ebuild39
-rw-r--r--x11-libs/libast/libast-9999.ebuild52
-rw-r--r--x11-libs/libast/metadata.xml17
-rw-r--r--x11-libs/libcompizconfig/Manifest1
-rw-r--r--x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch239
-rw-r--r--x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild38
-rw-r--r--x11-libs/libcompizconfig/metadata.xml6
-rw-r--r--x11-libs/libcryptui/Manifest1
-rw-r--r--x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch11
-rw-r--r--x11-libs/libcryptui/libcryptui-3.12.2.ebuild64
-rw-r--r--x11-libs/libcryptui/metadata.xml5
-rw-r--r--x11-libs/libdesktop-agnostic/Manifest1
-rw-r--r--x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild52
-rw-r--r--x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92.ebuild52
-rw-r--r--x11-libs/libdesktop-agnostic/metadata.xml16
-rw-r--r--x11-libs/libdmx/Manifest1
-rw-r--r--x11-libs/libdmx/libdmx-1.1.3.ebuild16
-rw-r--r--x11-libs/libdmx/metadata.xml5
-rw-r--r--x11-libs/libdockapp/Manifest2
-rw-r--r--x11-libs/libdockapp/files/install-paths.patch-0.6.115
-rw-r--r--x11-libs/libdockapp/files/legacy.patch-0.6.110
-rw-r--r--x11-libs/libdockapp/libdockapp-0.6.1.ebuild80
-rw-r--r--x11-libs/libdockapp/libdockapp-0.6.4.ebuild48
-rw-r--r--x11-libs/libdockapp/metadata.xml5
-rw-r--r--x11-libs/libdrm/Manifest10
-rw-r--r--x11-libs/libdrm/files/2.4.18-0001-datatypes.patch21
-rw-r--r--x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch111
-rw-r--r--x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch104
-rw-r--r--x11-libs/libdrm/libdrm-2.4.20-r1.ebuild48
-rw-r--r--x11-libs/libdrm/libdrm-2.4.33.ebuild55
-rw-r--r--x11-libs/libdrm/libdrm-2.4.46.ebuild57
-rw-r--r--x11-libs/libdrm/libdrm-2.4.52.ebuild60
-rw-r--r--x11-libs/libdrm/libdrm-2.4.53.ebuild60
-rw-r--r--x11-libs/libdrm/libdrm-2.4.54.ebuild60
-rw-r--r--x11-libs/libdrm/libdrm-2.4.56.ebuild57
-rw-r--r--x11-libs/libdrm/libdrm-2.4.58.ebuild57
-rw-r--r--x11-libs/libdrm/libdrm-2.4.59-r1.ebuild66
-rw-r--r--x11-libs/libdrm/libdrm-2.4.59.ebuild58
-rw-r--r--x11-libs/libdrm/libdrm-2.4.62.ebuild60
-rw-r--r--x11-libs/libdrm/metadata.xml9
-rw-r--r--x11-libs/libfakekey/Manifest1
-rw-r--r--x11-libs/libfakekey/files/libfakekey-0.1-ac.patch24
-rw-r--r--x11-libs/libfakekey/libfakekey-0.1-r1.ebuild47
-rw-r--r--x11-libs/libfakekey/libfakekey-0.1-r2.ebuild46
-rw-r--r--x11-libs/libfakekey/metadata.xml6
-rw-r--r--x11-libs/libfm-extra/Manifest1
-rw-r--r--x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild92
-rw-r--r--x11-libs/libfm-extra/metadata.xml6
-rw-r--r--x11-libs/libfm/Manifest4
-rw-r--r--x11-libs/libfm/files/libfm-0.1.17-ssp-fix.patch27
-rw-r--r--x11-libs/libfm/libfm-0.1.17-r1.ebuild67
-rw-r--r--x11-libs/libfm/libfm-1.1.4.ebuild119
-rw-r--r--x11-libs/libfm/libfm-1.2.2.1.ebuild122
-rw-r--r--x11-libs/libfm/libfm-1.2.3-r1.ebuild125
-rw-r--r--x11-libs/libfm/libfm-1.2.3.ebuild120
-rw-r--r--x11-libs/libfm/libfm-9999.ebuild125
-rw-r--r--x11-libs/libfm/metadata.xml15
-rw-r--r--x11-libs/libfontenc/Manifest2
-rw-r--r--x11-libs/libfontenc/libfontenc-1.1.2.ebuild19
-rw-r--r--x11-libs/libfontenc/libfontenc-1.1.3.ebuild19
-rw-r--r--x11-libs/libfontenc/metadata.xml5
-rw-r--r--x11-libs/libgksu/Manifest1
-rw-r--r--x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch60
-rw-r--r--x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch25
-rw-r--r--x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch19
-rw-r--r--x11-libs/libgksu/files/libgksu-2.0.12-notests.patch26
-rw-r--r--x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch359
-rw-r--r--x11-libs/libgksu/files/libgksu-2.0.7-libs.patch76
-rw-r--r--x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch40
-rw-r--r--x11-libs/libgksu/libgksu-2.0.12-r2.ebuild69
-rw-r--r--x11-libs/libgksu/metadata.xml5
-rw-r--r--x11-libs/libgxim/Manifest1
-rw-r--r--x11-libs/libgxim/libgxim-0.5.0.ebuild34
-rw-r--r--x11-libs/libgxim/metadata.xml8
-rw-r--r--x11-libs/libiterm-mbt/Manifest1
-rw-r--r--x11-libs/libiterm-mbt/libiterm-mbt-0.5.ebuild25
-rw-r--r--x11-libs/libiterm-mbt/metadata.xml8
-rw-r--r--x11-libs/libkscreen/Manifest1
-rw-r--r--x11-libs/libkscreen/libkscreen-1.0.5.ebuild28
-rw-r--r--x11-libs/libkscreen/metadata.xml5
-rw-r--r--x11-libs/libmatchbox/Manifest2
-rw-r--r--x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch13
-rw-r--r--x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch22
-rw-r--r--x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch12
-rw-r--r--x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild71
-rw-r--r--x11-libs/libmatchbox/metadata.xml13
-rw-r--r--x11-libs/libnotify/Manifest1
-rw-r--r--x11-libs/libnotify/libnotify-0.7.6-r1.ebuild68
-rw-r--r--x11-libs/libnotify/metadata.xml5
-rw-r--r--x11-libs/liboglappth/Manifest2
-rw-r--r--x11-libs/liboglappth/files/gcc-4.3.patch10
-rw-r--r--x11-libs/liboglappth/liboglappth-0.98.ebuild27
-rw-r--r--x11-libs/liboglappth/liboglappth-1.0.0.ebuild27
-rw-r--r--x11-libs/liboglappth/metadata.xml12
-rw-r--r--x11-libs/libpciaccess/Manifest2
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild35
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild35
-rw-r--r--x11-libs/libpciaccess/metadata.xml5
-rw-r--r--x11-libs/libproplist/Manifest1
-rw-r--r--x11-libs/libproplist/files/libproplist-0.10.1-include.patch10
-rw-r--r--x11-libs/libproplist/libproplist-0.10.1-r4.ebuild36
-rw-r--r--x11-libs/libproplist/metadata.xml7
-rw-r--r--x11-libs/libqxt/Manifest1
-rw-r--r--x11-libs/libqxt/files/libqxt-invoke-prev-filter.patch14
-rw-r--r--x11-libs/libqxt/files/libqxt-media-keys.patch407
-rw-r--r--x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch24
-rw-r--r--x11-libs/libqxt/files/libqxt-xrandr-missing-lib.patch9
-rw-r--r--x11-libs/libqxt/libqxt-0.6.2-r2.ebuild90
-rw-r--r--x11-libs/libqxt/metadata.xml11
-rw-r--r--x11-libs/libsexy/Manifest1
-rw-r--r--x11-libs/libsexy/files/libsexy-0.1.11-fix-null-list.patch34
-rw-r--r--x11-libs/libsexy/files/libsexy-0.1.11-pkgconfig-pollution.patch12
-rw-r--r--x11-libs/libsexy/libsexy-0.1.11-r3.ebuild54
-rw-r--r--x11-libs/libsexy/libsexy-0.1.11-r4.ebuild58
-rw-r--r--x11-libs/libsexy/metadata.xml5
-rw-r--r--x11-libs/libsvg-cairo/Manifest1
-rw-r--r--x11-libs/libsvg-cairo/libsvg-cairo-0.1.6.ebuild22
-rw-r--r--x11-libs/libsvg-cairo/metadata.xml7
-rw-r--r--x11-libs/libtinynotify-cli/Manifest1
-rw-r--r--x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild37
-rw-r--r--x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild48
-rw-r--r--x11-libs/libtinynotify-cli/metadata.xml16
-rw-r--r--x11-libs/libtinynotify-systemwide/Manifest2
-rw-r--r--x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.0.2.ebuild32
-rw-r--r--x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild30
-rw-r--r--x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild44
-rw-r--r--x11-libs/libtinynotify-systemwide/metadata.xml16
-rw-r--r--x11-libs/libtinynotify/Manifest1
-rw-r--r--x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild32
-rw-r--r--x11-libs/libtinynotify/libtinynotify-9999.ebuild44
-rw-r--r--x11-libs/libtinynotify/metadata.xml16
-rw-r--r--x11-libs/libva-intel-driver/Manifest5
-rw-r--r--x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch20
-rw-r--r--x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch37
-rw-r--r--x11-libs/libva-intel-driver/files/nox.patch27
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild52
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.4.1.ebuild57
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild58
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild63
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild63
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild57
-rw-r--r--x11-libs/libva-intel-driver/metadata.xml16
-rw-r--r--x11-libs/libva-vdpau-driver/Manifest1
-rw-r--r--x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch29
-rw-r--r--x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch16
-rw-r--r--x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch13
-rw-r--r--x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-nouveau.patch8
-rw-r--r--x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild44
-rw-r--r--x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r3.ebuild45
-rw-r--r--x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild50
-rw-r--r--x11-libs/libva-vdpau-driver/metadata.xml9
-rw-r--r--x11-libs/libva/Manifest6
-rw-r--r--x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch11
-rw-r--r--x11-libs/libva/files/libva-1.5.1-wayland-automagic.patch19
-rw-r--r--x11-libs/libva/libva-1.3.1.ebuild86
-rw-r--r--x11-libs/libva/libva-1.4.0.ebuild86
-rw-r--r--x11-libs/libva/libva-1.4.1.ebuild86
-rw-r--r--x11-libs/libva/libva-1.5.0.ebuild85
-rw-r--r--x11-libs/libva/libva-1.5.1.ebuild92
-rw-r--r--x11-libs/libva/libva-1.6.0.ebuild92
-rw-r--r--x11-libs/libva/libva-9999.ebuild86
-rw-r--r--x11-libs/libva/metadata.xml12
-rw-r--r--x11-libs/libvdpau/Manifest3
-rw-r--r--x11-libs/libvdpau/libvdpau-0.7.ebuild45
-rw-r--r--x11-libs/libvdpau/libvdpau-0.8.ebuild50
-rw-r--r--x11-libs/libvdpau/libvdpau-0.9.ebuild50
-rw-r--r--x11-libs/libvdpau/metadata.xml8
-rw-r--r--x11-libs/libview/Manifest1
-rw-r--r--x11-libs/libview/files/libview-0.5.6-pcfix.patch17
-rw-r--r--x11-libs/libview/libview-0.6.6-r2.ebuild38
-rw-r--r--x11-libs/libview/metadata.xml10
-rw-r--r--x11-libs/libwnck/Manifest3
-rw-r--r--x11-libs/libwnck/libwnck-2.31.0.ebuild59
-rw-r--r--x11-libs/libwnck/libwnck-3.14.0.ebuild56
-rw-r--r--x11-libs/libwnck/libwnck-3.4.9.ebuild55
-rw-r--r--x11-libs/libwnck/metadata.xml9
-rw-r--r--x11-libs/libxcb/Manifest4
-rw-r--r--x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch257
-rw-r--r--x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch30
-rw-r--r--x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch18
-rw-r--r--x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch29
-rwxr-xr-xx11-libs/libxcb/files/xcb-rebuilder.sh71
-rw-r--r--x11-libs/libxcb/libxcb-1.10.ebuild49
-rw-r--r--x11-libs/libxcb/libxcb-1.11-r1.ebuild58
-rw-r--r--x11-libs/libxcb/libxcb-1.11.ebuild53
-rw-r--r--x11-libs/libxcb/libxcb-1.9.1-r1.ebuild61
-rw-r--r--x11-libs/libxcb/libxcb-1.9.1.ebuild46
-rw-r--r--x11-libs/libxcb/libxcb-1.9.3-r1.ebuild49
-rw-r--r--x11-libs/libxcb/libxcb-1.9.3.ebuild47
-rw-r--r--x11-libs/libxcb/metadata.xml8
-rw-r--r--x11-libs/libxdl_view/Manifest1
-rw-r--r--x11-libs/libxdl_view/files/4.2-as-needed.patch16
-rw-r--r--x11-libs/libxdl_view/files/4.2-impl-dec.patch13
-rw-r--r--x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild32
-rw-r--r--x11-libs/libxdl_view/metadata.xml8
-rw-r--r--x11-libs/libxkbcommon/Manifest4
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-0.2.0.ebuild35
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild34
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-0.4.1.ebuild39
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild39
-rw-r--r--x11-libs/libxkbcommon/metadata.xml5
-rw-r--r--x11-libs/libxkbfile/Manifest2
-rw-r--r--x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild15
-rw-r--r--x11-libs/libxkbfile/libxkbfile-1.0.9.ebuild15
-rw-r--r--x11-libs/libxkbfile/metadata.xml5
-rw-r--r--x11-libs/libxkbui/Manifest1
-rw-r--r--x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild16
-rw-r--r--x11-libs/libxkbui/metadata.xml5
-rw-r--r--x11-libs/libxklavier/Manifest2
-rw-r--r--x11-libs/libxklavier/libxklavier-5.2.1.ebuild49
-rw-r--r--x11-libs/libxklavier/libxklavier-5.3.ebuild52
-rw-r--r--x11-libs/libxklavier/metadata.xml11
-rw-r--r--x11-libs/libxsettings-client/Manifest1
-rw-r--r--x11-libs/libxsettings-client/libxsettings-client-0.17-r1.ebuild41
-rw-r--r--x11-libs/libxsettings-client/libxsettings-client-0.17.ebuild33
-rw-r--r--x11-libs/libxsettings-client/metadata.xml6
-rw-r--r--x11-libs/libxshmfence/Manifest2
-rw-r--r--x11-libs/libxshmfence/libxshmfence-1.1.ebuild16
-rw-r--r--x11-libs/libxshmfence/libxshmfence-1.2.ebuild16
-rw-r--r--x11-libs/libxshmfence/metadata.xml5
-rw-r--r--x11-libs/libyui-gtk/Manifest1
-rw-r--r--x11-libs/libyui-gtk/libyui-gtk-2.44.5.ebuild48
-rw-r--r--x11-libs/libyui-gtk/metadata.xml14
-rw-r--r--x11-libs/libyui-ncurses/Manifest1
-rw-r--r--x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch21
-rw-r--r--x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild49
-rw-r--r--x11-libs/libyui-ncurses/metadata.xml14
-rw-r--r--x11-libs/libyui-qt/Manifest1
-rw-r--r--x11-libs/libyui-qt/libyui-qt-2.44.0.ebuild52
-rw-r--r--x11-libs/libyui-qt/metadata.xml14
-rw-r--r--x11-libs/libyui/Manifest1
-rw-r--r--x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch34
-rw-r--r--x11-libs/libyui/libyui-3.0.13.ebuild51
-rw-r--r--x11-libs/libyui/metadata.xml14
-rw-r--r--x11-libs/metadata.xml34
-rw-r--r--x11-libs/motif/Manifest4
-rw-r--r--x11-libs/motif/files/Mwm.defaults14
-rw-r--r--x11-libs/motif/metadata.xml13
-rw-r--r--x11-libs/motif/motif-2.2.3-r12.ebuild75
-rw-r--r--x11-libs/motif/motif-2.3.4-r3.ebuild115
-rw-r--r--x11-libs/mx/Manifest1
-rw-r--r--x11-libs/mx/files/mx-1.4.2-gold.patch30
-rw-r--r--x11-libs/mx/files/mx-1.4.7-gl-types.patch53
-rw-r--r--x11-libs/mx/metadata.xml14
-rw-r--r--x11-libs/mx/mx-1.4.7-r1.ebuild60
-rw-r--r--x11-libs/mx/mx-1.4.7-r2.ebuild57
-rw-r--r--x11-libs/neXtaw/Manifest1
-rw-r--r--x11-libs/neXtaw/metadata.xml7
-rw-r--r--x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild30
-rw-r--r--x11-libs/pango/Manifest4
-rw-r--r--x11-libs/pango/files/pango-1.32.1-lib64.patch44
-rw-r--r--x11-libs/pango/metadata.xml8
-rw-r--r--x11-libs/pango/pango-1.36.3.ebuild89
-rw-r--r--x11-libs/pango/pango-1.36.5.ebuild102
-rw-r--r--x11-libs/pango/pango-1.36.7.ebuild80
-rw-r--r--x11-libs/pango/pango-1.36.8.ebuild80
-rw-r--r--x11-libs/pangox-compat/Manifest1
-rw-r--r--x11-libs/pangox-compat/metadata.xml5
-rw-r--r--x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild36
-rw-r--r--x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild28
-rw-r--r--x11-libs/pixman/Manifest2
-rw-r--r--x11-libs/pixman/metadata.xml11
-rw-r--r--x11-libs/pixman/pixman-0.32.6.ebuild32
-rw-r--r--x11-libs/pixman/pixman-0.33.2.ebuild32
-rw-r--r--x11-libs/qscintilla/Manifest2
-rw-r--r--x11-libs/qscintilla/metadata.xml17
-rw-r--r--x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild91
-rw-r--r--x11-libs/qscintilla/qscintilla-2.9.ebuild91
-rw-r--r--x11-libs/qtermwidget/Manifest3
-rw-r--r--x11-libs/qtermwidget/metadata.xml13
-rw-r--r--x11-libs/qtermwidget/qtermwidget-0.4.0.37.ebuild23
-rw-r--r--x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild23
-rw-r--r--x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild33
-rw-r--r--x11-libs/qtscriptgenerator/Manifest1
-rw-r--r--x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch41
-rw-r--r--x11-libs/qtscriptgenerator/metadata.xml9
-rw-r--r--x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild69
-rw-r--r--x11-libs/qwt/Manifest5
-rw-r--r--x11-libs/qwt/files/qwt-5.2.3-install_qt.patch28
-rw-r--r--x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch250
-rw-r--r--x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch15
-rw-r--r--x11-libs/qwt/metadata.xml18
-rw-r--r--x11-libs/qwt/qwt-5.2.3-r2.ebuild102
-rw-r--r--x11-libs/qwt/qwt-6.0.0.ebuild90
-rw-r--r--x11-libs/qwt/qwt-6.1.0.ebuild117
-rw-r--r--x11-libs/qwt/qwt-6.1.1.ebuild120
-rw-r--r--x11-libs/qwt/qwt-6.1.2-r1.ebuild200
-rw-r--r--x11-libs/qwt/qwt-6.1.2.ebuild132
-rw-r--r--x11-libs/qwtplot3d/Manifest1
-rw-r--r--x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch28
-rw-r--r--x11-libs/qwtplot3d/files/qwtplot3d-examples.patch125
-rw-r--r--x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch12
-rw-r--r--x11-libs/qwtplot3d/files/qwtplot3d-profile.patch27
-rw-r--r--x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch19
-rw-r--r--x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch31
-rw-r--r--x11-libs/qwtplot3d/metadata.xml12
-rw-r--r--x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild60
-rw-r--r--x11-libs/qwtpolar/Manifest4
-rw-r--r--x11-libs/qwtpolar/metadata.xml8
-rw-r--r--x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild43
-rw-r--r--x11-libs/qwtpolar/qwtpolar-1.0.0.ebuild40
-rw-r--r--x11-libs/qwtpolar/qwtpolar-1.1.0.ebuild41
-rw-r--r--x11-libs/qwtpolar/qwtpolar-1.1.1.ebuild41
-rw-r--r--x11-libs/rep-gtk/Manifest1
-rw-r--r--x11-libs/rep-gtk/metadata.xml5
-rw-r--r--x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild43
-rw-r--r--x11-libs/scw/Manifest1
-rw-r--r--x11-libs/scw/metadata.xml12
-rw-r--r--x11-libs/scw/scw-0.4.7.ebuild29
-rw-r--r--x11-libs/startup-notification/Manifest1
-rw-r--r--x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch30
-rw-r--r--x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch66
-rw-r--r--x11-libs/startup-notification/metadata.xml8
-rw-r--r--x11-libs/startup-notification/startup-notification-0.12-r1.ebuild30
-rw-r--r--x11-libs/startup-notification/startup-notification-0.12.ebuild23
-rw-r--r--x11-libs/tslib/Manifest2
-rw-r--r--x11-libs/tslib/metadata.xml8
-rw-r--r--x11-libs/tslib/tslib-1.0-r3.ebuild40
-rw-r--r--x11-libs/vte/Manifest5
-rw-r--r--x11-libs/vte/files/vte-0.28.2-interix.patch51
-rw-r--r--x11-libs/vte/files/vte-0.28.2-limit-arguments.patch40
-rw-r--r--x11-libs/vte/files/vte-0.30.1-alt-meta.patch74
-rw-r--r--x11-libs/vte/metadata.xml8
-rw-r--r--x11-libs/vte/vte-0.28.2-r206.ebuild119
-rw-r--r--x11-libs/vte/vte-0.28.2-r207.ebuild122
-rw-r--r--x11-libs/vte/vte-0.36.3.ebuild70
-rw-r--r--x11-libs/vte/vte-0.36.4.ebuild70
-rw-r--r--x11-libs/vte/vte-0.38.3.ebuild76
-rw-r--r--x11-libs/vte/vte-0.40.2.ebuild80
-rw-r--r--x11-libs/wxGTK/Manifest10
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch39
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch74
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch13
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch27
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch25
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch304
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch11
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch77
-rw-r--r--x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch75
-rw-r--r--x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch75
-rw-r--r--x11-libs/wxGTK/metadata.xml25
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild187
-rw-r--r--x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild188
-rw-r--r--x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild178
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild169
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild169
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild174
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild159
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild169
-rw-r--r--x11-libs/xbae/Manifest1
-rw-r--r--x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch27
-rw-r--r--x11-libs/xbae/files/xbae-4.60.4-lxmp.patch11
-rw-r--r--x11-libs/xbae/files/xbae-4.60.4-tmpl.patch11
-rw-r--r--x11-libs/xbae/metadata.xml21
-rw-r--r--x11-libs/xbae/xbae-4.60.4.ebuild65
-rw-r--r--x11-libs/xcb-util-cursor/Manifest2
-rw-r--r--x11-libs/xcb-util-cursor/metadata.xml5
-rw-r--r--x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild37
-rw-r--r--x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild37
-rw-r--r--x11-libs/xcb-util-image/Manifest2
-rw-r--r--x11-libs/xcb-util-image/files/xcb-util-image-0.3.9-return-type.patch46
-rw-r--r--x11-libs/xcb-util-image/metadata.xml5
-rw-r--r--x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild38
-rw-r--r--x11-libs/xcb-util-image/xcb-util-image-0.3.9.ebuild37
-rw-r--r--x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild33
-rw-r--r--x11-libs/xcb-util-keysyms/Manifest2
-rw-r--r--x11-libs/xcb-util-keysyms/metadata.xml5
-rw-r--r--x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild34
-rw-r--r--x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9.ebuild33
-rw-r--r--x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild32
-rw-r--r--x11-libs/xcb-util-renderutil/Manifest2
-rw-r--r--x11-libs/xcb-util-renderutil/metadata.xml5
-rw-r--r--x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild33
-rw-r--r--x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild34
-rw-r--r--x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9.ebuild33
-rw-r--r--x11-libs/xcb-util-wm/Manifest3
-rw-r--r--x11-libs/xcb-util-wm/metadata.xml5
-rw-r--r--x11-libs/xcb-util-wm/xcb-util-wm-0.3.9.ebuild34
-rw-r--r--x11-libs/xcb-util-wm/xcb-util-wm-0.4.0.ebuild32
-rw-r--r--x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild33
-rw-r--r--x11-libs/xcb-util-wm/xcb-util-wm-0.4.1.ebuild32
-rw-r--r--x11-libs/xcb-util/Manifest2
-rw-r--r--x11-libs/xcb-util/metadata.xml5
-rw-r--r--x11-libs/xcb-util/xcb-util-0.3.9-r1.ebuild41
-rw-r--r--x11-libs/xcb-util/xcb-util-0.3.9.ebuild40
-rw-r--r--x11-libs/xcb-util/xcb-util-0.4.0.ebuild40
-rw-r--r--x11-libs/xforms/Manifest1
-rw-r--r--x11-libs/xforms/metadata.xml7
-rw-r--r--x11-libs/xforms/xforms-1.0.93_p1-r1.ebuild47
-rw-r--r--x11-libs/xosd/Manifest3
-rw-r--r--x11-libs/xosd/files/xosd-2.2.14-m4.patch9
-rw-r--r--x11-libs/xosd/files/xosd-2.2.14-makefile.patch11
-rw-r--r--x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch15
-rw-r--r--x11-libs/xosd/metadata.xml8
-rw-r--r--x11-libs/xosd/xosd-2.2.14-r1.ebuild47
-rw-r--r--x11-libs/xosd/xosd-2.2.14-r2.ebuild49
-rw-r--r--x11-libs/xpa/Manifest1
-rw-r--r--x11-libs/xpa/files/xpa-2.1.8-makefile.patch84
-rw-r--r--x11-libs/xpa/metadata.xml17
-rw-r--r--x11-libs/xpa/xpa-2.1.15.ebuild55
-rw-r--r--x11-libs/xpyb/Manifest1
-rw-r--r--x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch11
-rw-r--r--x11-libs/xpyb/files/xpyb-python.patch12
-rw-r--r--x11-libs/xpyb/metadata.xml5
-rw-r--r--x11-libs/xpyb/xpyb-1.3.1-r2.ebuild47
-rw-r--r--x11-libs/xpyb/xpyb-1.3.1-r3.ebuild50
-rw-r--r--x11-libs/xtrans/Manifest3
-rw-r--r--x11-libs/xtrans/metadata.xml5
-rw-r--r--x11-libs/xtrans/xtrans-1.3.3.ebuild26
-rw-r--r--x11-libs/xtrans/xtrans-1.3.4.ebuild27
-rw-r--r--x11-libs/xtrans/xtrans-1.3.5.ebuild27
-rw-r--r--x11-libs/xvba-video/Manifest1
-rw-r--r--x11-libs/xvba-video/files/xvba-video-0.8.0-VAEncH264VUIBufferType.patch12
-rw-r--r--x11-libs/xvba-video/files/xvba-video-0.8.0-assert-hw_image_hooks_glx.patch12
-rw-r--r--x11-libs/xvba-video/files/xvba-video-fix-mesa-gl.h.patch17
-rw-r--r--x11-libs/xvba-video/files/xvba-video-fix-out-of-source-builds.patch11
-rw-r--r--x11-libs/xvba-video/metadata.xml5
-rw-r--r--x11-libs/xvba-video/xvba-video-0.8.0-r3.ebuild59
-rw-r--r--x11-libs/xvba-video/xvba-video-9999.ebuild56
783 files changed, 29595 insertions, 0 deletions
diff --git a/x11-libs/agg/Manifest b/x11-libs/agg/Manifest
new file mode 100644
index 000000000000..6aa79eaa2012
--- /dev/null
+++ b/x11-libs/agg/Manifest
@@ -0,0 +1 @@
+DIST agg-2.5.tar.gz 564313 SHA256 ab1edc54cc32ba51a62ff120d501eecd55fceeedf869b9354e7e13812289911f SHA512 e2c79f0bf6da80e16e5b50e69638647224fbe778a42a83d72e9de444b3ea711735177de92bf16134da313b9f75e63eb76bd7b0aaf390059f4d0785454e8a6fcf WHIRLPOOL aeadbd18d6f5a1af6d10fabe48eaaeabe20c4215c8da4236cb4084a10af59f223814963b43fa01ae280efad2db3789837c0e14a4e43f068a05d1e59739cf996d
diff --git a/x11-libs/agg/agg-2.5-r2.ebuild b/x11-libs/agg/agg-2.5-r2.ebuild
new file mode 100644
index 000000000000..657ccbf158e9
--- /dev/null
+++ b/x11-libs/agg/agg-2.5-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit eutils autotools base
+
+DESCRIPTION="Anti-Grain Geometry - A High Quality Rendering Engine for C++"
+HOMEPAGE="http://antigrain.com/"
+SRC_URI="http://antigrain.com/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ppc ~ppc64 sparc x86 ~x86-fbsd"
+IUSE="+gpc +truetype +X"
+
+# preffer X with enabled xcb, really
+RDEPEND="
+ media-libs/libsdl[X?]
+ X? ( || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) )
+ truetype? ( media-libs/freetype:2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+# taken from debian
+PATCHES=(
+ "${FILESDIR}/${PV}/02_maintainer_mode.patch"
+ "${FILESDIR}/${PV}/04_no_rpath.patch"
+)
+
+src_prepare() {
+ base_src_prepare
+ sed -r -i \
+ -e 's:^(.*) -L@.*:\1:' \
+ src/platform/X11/Makefile.am || die "Failed to sed"
+ # fix building against automake-1.12, bug 420701
+ sed -i '/^AM_C_PROTOTYPES/d' configure.in || die
+ eautoreconf
+}
+
+src_configure() {
+ # examples are not (yet) installed, so do not compile them
+ # sdl is harddep only sdl-tests are optional so we enable them anyway
+ econf \
+ --enable-ctrl \
+ --enable-sdltest \
+ --disable-examples \
+ --disable-dependency-tracking \
+ $(use_enable gpc gpc) \
+ $(use_enable truetype freetype) \
+ $(use_with X x)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc readme authors ChangeLog news
+}
diff --git a/x11-libs/agg/files/2.5/02_maintainer_mode.patch b/x11-libs/agg/files/2.5/02_maintainer_mode.patch
new file mode 100644
index 000000000000..4c65c9723e34
--- /dev/null
+++ b/x11-libs/agg/files/2.5/02_maintainer_mode.patch
@@ -0,0 +1,21 @@
+
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 02_maintainer_mode.dpatch by <rodrigo@nul-unu.com>
+##
+## DP: Use AM_MAINTAINER_MODE, to avoid re-running autotools
+## DP: except when explicitely called in debian/rules
+
+@DPATCH@
+diff -urNad agg-2.5+dfsg~/configure.in agg-2.5+dfsg/configure.in
+--- agg-2.5+dfsg~/configure.in 2007-07-21 19:58:06.966030999 -0500
++++ agg-2.5+dfsg/configure.in 2007-07-21 19:58:33.595695250 -0500
+@@ -2,7 +2,7 @@
+ AC_CANONICAL_TARGET
+ AC_CONFIG_HEADERS(include/config.h)
+ AM_INIT_AUTOMAKE(agg, 2.5.0)
+-
++AM_MAINTAINER_MODE
+
+ dnl Checks for programs.
+ AC_PROG_CC
+
diff --git a/x11-libs/agg/files/2.5/04_no_rpath.patch b/x11-libs/agg/files/2.5/04_no_rpath.patch
new file mode 100644
index 000000000000..76582e332738
--- /dev/null
+++ b/x11-libs/agg/files/2.5/04_no_rpath.patch
@@ -0,0 +1,10 @@
+--- agg-2.5.orig/libagg.pc.in 2006-07-10 11:27:16.000000000 +0200
++++ agg-2.5/libagg.pc.in 2006-07-10 11:28:51.000000000 +0200
+@@ -6,5 +6,5 @@
+ Name: libagg
+ Description: Anti Grain Geometry - A High Quality Rendering Engine for C++
+ Version: @VERSION@
+-Libs: -L${libdir} -Wl,-rpath,${exec_prefix}/lib -lagg
++Libs: -L${libdir} -lagg
+ Cflags: -I${includedir}
+
diff --git a/x11-libs/agg/metadata.xml b/x11-libs/agg/metadata.xml
new file mode 100644
index 000000000000..e4e70c77a621
--- /dev/null
+++ b/x11-libs/agg/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>chithanh@gentoo.org</email>
+ <name>Chí-Thanh Christopher Nguyễn</name>
+</maintainer>
+<use>
+ <flag name="gpc">Enable gpc polygon clipper library</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/amd-adl-sdk/Manifest b/x11-libs/amd-adl-sdk/Manifest
new file mode 100644
index 000000000000..c34566bdcc12
--- /dev/null
+++ b/x11-libs/amd-adl-sdk/Manifest
@@ -0,0 +1,3 @@
+DIST ADL_SDK8.zip 2466339 SHA256 a3db98b44099d0747e45b64a250b818eb6a46ee7ddf0addc9335b2826809db83 SHA512 f3d2ca4d1825a67e2ccc296fcc79bb85012e532eec392f9bce07c73250c79e0a09debdc1a0278719a37285e26c99b622eb02c51c5735e335fb89aae82404544d WHIRLPOOL f6762d8be4c2899a34f766af4f09444ade84414d4c278a7f1ddfe250c0b3f73609099ba366304320964da93d2d49c6f09a0cf0bb9a2314eea186fc11f9602bf1
+DIST ADL_SDK_6.0.zip 2324420 SHA256 429f4fd1edebb030d6366f4e0a877cf105e4383f7dd2ccf54e5aef8f2e4242c9 SHA512 4af430f0a0eac347b0e3df39999abbf7a4281a1b01398845fd8e826b69c28b67fc062092eac0ef207ace943006ed4ccd8c6017049c2dfd3945914ea6153026f3 WHIRLPOOL acbdee1acba6520d467b4e7b0525c18dc9c1866611ac5fc52bec86c1ad1bf5b16570b032386bc8c2e83cb3926ff8bad25663f4c718d00af9fd55e9648de05c53
+DIST ADL_SDK_7.0.zip 1863572 SHA256 15ef583240167cfb01e5f8188d3fbc2885043ae28a9dd25231bcd879dc989275 SHA512 b3d42a95e034e0d94895cd0470780c38b42f268c14fdea3c4ff4c9ddbdef04db11ebe005f519ec16fb6997c98d7bcdbc2de9baedee726777af80067aed0f304b WHIRLPOOL 361735c0d6f91d869b7eb1b0a56f09754d054a95dd41e2f738f8e38cc676d42918da9110bb4684329ba42d9bf94161e6e6e93c8d52675a0f54364734b992858c
diff --git a/x11-libs/amd-adl-sdk/amd-adl-sdk-6.0-r1.ebuild b/x11-libs/amd-adl-sdk/amd-adl-sdk-6.0-r1.ebuild
new file mode 100644
index 000000000000..b2f9ad9b66d3
--- /dev/null
+++ b/x11-libs/amd-adl-sdk/amd-adl-sdk-6.0-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="API to access display driver functionality for ATI graphics cards"
+HOMEPAGE="http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/"
+SRC_URI="ADL_SDK_${PV}.zip"
+
+LICENSE="AMD-ADL"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples"
+
+RDEPEND="x11-drivers/ati-drivers"
+DEPEND="app-arch/unzip"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+ einfo "Please visit the download page [1] and save ${A} in ${DISTDIR}"
+ einfo "[1] http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/"
+}
+
+src_prepare() {
+ sed -i -e '/include/a \#include <wchar.h>' include/adl_structures.h || die
+}
+
+src_install() {
+ use doc && dodoc -r "Public-Documents"/* "adlutil/ADLUTIL User Guide.doc"
+ use examples && dodoc -r "Sample" "Sample-Managed"
+
+ insinto "/usr/include/ADL"
+ doins include/*
+}
diff --git a/x11-libs/amd-adl-sdk/amd-adl-sdk-7.0.ebuild b/x11-libs/amd-adl-sdk/amd-adl-sdk-7.0.ebuild
new file mode 100644
index 000000000000..ac0ecd6f1ff7
--- /dev/null
+++ b/x11-libs/amd-adl-sdk/amd-adl-sdk-7.0.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 toolchain-funcs
+
+DESCRIPTION="API to access display driver functionality for ATI graphics cards"
+HOMEPAGE="http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/"
+SRC_URI="ADL_SDK_${PV}.zip"
+
+LICENSE="AMD-ADL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="x11-drivers/ati-drivers"
+DEPEND="app-arch/unzip"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+ einfo "Please visit the download page [1], rename ADL_SDK.zip to ${A} and save it in ${DISTDIR}"
+ einfo "[1] http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/"
+}
+
+src_prepare() {
+ sed -i -e '/include/a \#include <wchar.h>' include/adl_structures.h || die
+}
+
+src_compile() {
+ pushd adlutil
+ $(tc-getCC) main.c ${CFLAGS} -I ../include/ -DLINUX ${LDFLAGS} -o adlutil -ldl || die
+ popd
+}
+
+src_install() {
+ use doc && dodoc -r "Public-Documents"/* "adlutil/ADLUTIL User Guide.doc"
+ use examples && dodoc -r "Sample" "Sample-Managed"
+
+ dobin adlutil/adlutil
+ insinto "/usr/include/ADL"
+ doins include/*
+}
diff --git a/x11-libs/amd-adl-sdk/amd-adl-sdk-8.0.ebuild b/x11-libs/amd-adl-sdk/amd-adl-sdk-8.0.ebuild
new file mode 100644
index 000000000000..b8016311609b
--- /dev/null
+++ b/x11-libs/amd-adl-sdk/amd-adl-sdk-8.0.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit toolchain-funcs
+
+DESCRIPTION="API to access display driver functionality for ATI graphics cards"
+HOMEPAGE="http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/"
+SRC_URI="ADL_SDK${PV/.*/}.zip"
+
+LICENSE="AMD-ADL"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+RDEPEND="x11-drivers/ati-drivers"
+DEPEND="app-arch/unzip"
+
+RESTRICT="fetch"
+
+S="${WORKDIR}"
+
+pkg_nofetch() {
+ einfo "Please visit the download page [1], download ${A} and save it in ${DISTDIR}"
+ einfo "[1] http://developer.amd.com/tools-and-sdks/graphics-development/display-library-adl-sdk/"
+}
+
+src_prepare() {
+ sed -i -e '/include/a \#include <wchar.h> \
+#include <stdbool.h>' include/adl_structures.h || die
+}
+
+src_compile() {
+ pushd adlutil
+ $(tc-getCC) main.c ${CFLAGS} -I ../include/ -DLINUX ${LDFLAGS} -o adlutil -ldl || die
+ popd
+}
+
+src_install() {
+ use doc && dodoc -r "Public-Documents"/* "adlutil/ADLUTIL User Guide.doc"
+ use examples && dodoc -r "Sample" "Sample-Managed"
+
+ dobin adlutil/adlutil
+ insinto "/usr/include/ADL"
+ doins include/*
+}
diff --git a/x11-libs/amd-adl-sdk/metadata.xml b/x11-libs/amd-adl-sdk/metadata.xml
new file mode 100644
index 000000000000..efb5880dce39
--- /dev/null
+++ b/x11-libs/amd-adl-sdk/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>mrueg@gentoo.org</email>
+ <name>Manuel Rüger</name>
+ </maintainer>
+ <maintainer>
+ <email>blueness@gentoo.org</email>
+ <name>Anthony G. Basile</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/c++-gtk-utils/Manifest b/x11-libs/c++-gtk-utils/Manifest
new file mode 100644
index 000000000000..5be8e2c1ee6f
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/Manifest
@@ -0,0 +1,4 @@
+DIST c++-gtk-utils-2.0.27.tar.gz 2608722 SHA256 218b518d0945212d1dc40cf3ee420e4c51993bc0f8e9f8acbe03c099c9f940f7 SHA512 8d6c12797d54d9b379302bfd572ded8b9e6e64ea5911ba4b13a0dd6d588711ec6d10bc3a83af8cab23165feeaae8873de5c3945cec94954590806f60490038bc WHIRLPOOL c8a19fdef5c6a7cf15615aad5083d666b487d1ebb2443977853822c97a991f5da8b461d8cb1c6bfc986325954b78a2129bdf328a4fdc0e4d8f2739ceffd79aeb
+DIST c++-gtk-utils-2.0.28.tar.gz 2646356 SHA256 2ebb88c7c151367553363ac9c9cf0c8289495e0172c8df7fe8dd6e2af7b80867 SHA512 33247fb617e0bb3c6aa425f60bd748625a993846bd8acd9a5f4f6d1d8c9baebdd5a2bb445e3669ae11539d7f5db22991a5f4b3d3efd4ebd0caf62f6c86f74c25 WHIRLPOOL 4a79f80144170005062edc3b622fb557db89cb0651f2a7df91e802f406368f90aae8541e24b4c85f58a6c5639f807f259d5bbe426293ecef5d6283bcf69d60e7
+DIST c++-gtk-utils-2.2.10.tar.gz 2643918 SHA256 e898bf19455706ebe593e6d795584e9a8ed26046c0928597a94c89fa33321191 SHA512 a0ea673988c95404846da6af6ff7ea51978653df3781be6a8323db5fe96826e94b0de9bbda5d3b821bbba2286dda6e66f4c099de4cd8da7bdefa4caa684d7a31 WHIRLPOOL c4901315da82e7633b8e860628c69aad5451e6ff9a2da8eeb5adc245b0b6f5ca6bc703666f4cb3ae169823605c94d445742b2f9790c9b6cec0040cebb2ca7081
+DIST c++-gtk-utils-2.2.11.tar.gz 2679730 SHA256 134cdfbf9b4eb75ad705b6eeea7911ea53997fcbf7b2c421b6306075f0c50cdf SHA512 941a95a1b1e1b052d45d4e1b65cca11a4de368e64ca903de17e9e7ea38f6637ef82e7b8c45eafd1fc0ef741ee10e3517cc2f46345ec0f5fcff5b8168ef60ef49 WHIRLPOOL 8516b81228a33574695eab1a34728010da7b05cf31b79796e9b110fc1347b6ef891c3ea6b5bf6f1715029065bcd83ae19485e646054c120a292117ecaafba21d
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild
new file mode 100644
index 000000000000..9e22a586eba5
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.27.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A library containing a number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="+gtk nls static-libs"
+SLOT="3"
+
+RDEPEND="
+ >=dev-libs/glib-2.26
+ gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_with gtk) \
+ $(use_enable static-libs static) \
+ --docdir=/usr/share/doc/${PF} \
+ --htmldir=/usr/share/doc/${PF}/html \
+ --without-guile
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.28.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.28.ebuild
new file mode 100644
index 000000000000..17ec71a2966c
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.0.28.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A library containing a number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk nls static-libs"
+SLOT="3"
+
+RDEPEND="
+ >=dev-libs/glib-2.26
+ gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_with gtk) \
+ $(use_enable static-libs static) \
+ --docdir=/usr/share/doc/${PF} \
+ --htmldir=/usr/share/doc/${PF}/html \
+ --without-guile
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild
new file mode 100644
index 000000000000..ace1b0ae9afe
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.10.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A library containing a number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+IUSE="+gtk nls static-libs"
+SLOT="0"
+
+RDEPEND="
+ >=dev-libs/glib-2.26
+ gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_with gtk) \
+ $(use_enable static-libs static) \
+ --docdir=/usr/share/doc/${PF} \
+ --htmldir=/usr/share/doc/${PF}/html \
+ --without-guile
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.11.ebuild b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.11.ebuild
new file mode 100644
index 000000000000..990d5f93b19c
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/c++-gtk-utils-2.2.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="A library containing a number of classes and functions for programming GTK+ programs using C++"
+HOMEPAGE="http://cxx-gtk-utils.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN/++/xx}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE="+gtk nls static-libs"
+SLOT="0"
+
+RDEPEND="
+ >=dev-libs/glib-2.26
+ gtk? ( x11-libs/gtk+:3 )
+"
+DEPEND="
+ ${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig
+"
+
+DOCS=( ChangeLog )
+
+src_configure() {
+ econf \
+ $(use_enable nls) \
+ $(use_with gtk) \
+ $(use_enable static-libs static) \
+ --docdir=/usr/share/doc/${PF} \
+ --htmldir=/usr/share/doc/${PF}/html \
+ --without-guile
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/c++-gtk-utils/metadata.xml b/x11-libs/c++-gtk-utils/metadata.xml
new file mode 100644
index 000000000000..4ac61867094f
--- /dev/null
+++ b/x11-libs/c++-gtk-utils/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>desktop-misc</herd>
+ <upstream>
+ <remote-id type="sourceforge">cxx-gtk-utils</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/cairo/Manifest b/x11-libs/cairo/Manifest
new file mode 100644
index 000000000000..b1abad907f85
--- /dev/null
+++ b/x11-libs/cairo/Manifest
@@ -0,0 +1,2 @@
+DIST cairo-1.12.18.tar.xz 38276736 SHA256 dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6 SHA512 238b426ee010a0b0a8d55e61043f95a87438f73f900b3b293dea61b8e7ff3cc84e0aa0b779b2a1d43d2d153490bd053cbbc9ec69ceb9b3f482797638260fbef2 WHIRLPOOL e4408a3f6185f1d7e0f1c95f4beb266c48722ba075329621c1a6a6f2ad3114c334ceb6b242d661d7d3e7e7a3b3fcd013c5806c17b637bfa7a59895cc70fc66cf
+DIST cairo-1.14.2.tar.xz 35376404 SHA256 c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb SHA512 74d30f3f879f097b2c3408ef9698da8f337301f971c3eba7f336d02d6b2812d2ca0bd8bbc0cc7ee11127d3574910b1b77fde3b065cfd504436b62e17c2acb200 WHIRLPOOL fd57e1f474280a1df7a641bdcbe4dc5e5a71bd53b9e46e54302c7858e3bc0081fd1145f19133152819d259611096e4cca034c9caa73a748a507de9094f81a519
diff --git a/x11-libs/cairo/cairo-1.12.18-r1.ebuild b/x11-libs/cairo/cairo-1.12.18-r1.ebuild
new file mode 100644
index 000000000000..02e577566eb5
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.12.18-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-2
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+ SRC_URI=""
+else
+ SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb drm gallium gles2 +glib opengl openvg qt4 static-libs +svg valgrind xcb xlib-xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ directfb? ( dev-libs/DirectFB )
+ gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+ openvg? ( >=media-libs/mesa-9.1.6[openvg,${MULTILIB_USEDEP}] )
+ qt4? ( >=dev-qt/qtgui-4.8:4[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ drm? (
+ >=virtual/libudev-208:=[${MULTILIB_USEDEP}]
+ gallium? ( >=media-libs/mesa-9.1.6[gallium,${MULTILIB_USEDEP}] )
+ )
+ )
+ xcb? (
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-2
+ X? (
+ >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+ drm? (
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ )
+ )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+# drm module requires X
+# for gallium we need to enable drm
+REQUIRED_USE="
+ drm? ( X )
+ gallium? ( drm )
+ gles2? ( !opengl )
+ openvg? ( || ( gles2 opengl ) )
+ xlib-xcb? ( xcb )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/cairo/cairo-directfb.h
+)
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+ epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+ # tests and perf tools require X, bug #483574
+ if ! use X; then
+ sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+ fi
+
+ epatch_user
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == *9999* ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myopts
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # TODO: remove this (and add USE-dep) when DirectFB is converted,
+ # bug #484248 -- but beware of the circular dep.
+ if ! multilib_is_native_abi; then
+ myopts+=" --disable-directfb"
+ fi
+
+ # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+ if ! multilib_is_native_abi; then
+ myopts+=" --disable-qt"
+ fi
+
+ # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
+ $(use_enable X tee) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
+ $(use_enable debug test-surfaces) \
+ $(use_enable drm) \
+ $(use_enable directfb) \
+ $(use_enable gallium) \
+ $(use_enable gles2 glesv2) \
+ $(use_enable glib gobject) \
+ $(use_enable openvg vg) \
+ $(use_enable opengl gl) \
+ $(use_enable qt4 qt) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable valgrind) \
+ $(use_enable xcb) \
+ $(use_enable xcb xcb-shm) \
+ $(use_enable xlib-xcb) \
+ --enable-ft \
+ --enable-pdf \
+ --enable-png \
+ --enable-ps \
+ ${myopts}
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all
+ einstalldocs
+}
+
+pkg_postinst() {
+ if use !xlib-xcb; then
+ if has_version net-misc/nxserver-freenx \
+ || has_version net-misc/x2goserver; then
+ ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
+ ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
+ ewarn "applications that are running inside NX sessions. For details, see"
+ ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
+ fi
+ fi
+}
diff --git a/x11-libs/cairo/cairo-1.14.2.ebuild b/x11-libs/cairo/cairo-1.14.2.ebuild
new file mode 100644
index 000000000000..5ea3408b616d
--- /dev/null
+++ b/x11-libs/cairo/cairo-1.14.2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+ SRC_URI=""
+else
+ SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+ KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ directfb? ( dev-libs/DirectFB )
+ gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ )
+ xcb? (
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-2
+ X? (
+ >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+ )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+REQUIRED_USE="
+ gles2? ( !opengl )
+ xlib-xcb? ( xcb )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/cairo/cairo-directfb.h
+)
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+ epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+ # tests and perf tools require X, bug #483574
+ if ! use X; then
+ sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+ fi
+
+ epatch_user
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == *9999* ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myopts
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # TODO: remove this (and add USE-dep) when DirectFB is converted,
+ # bug #484248 -- but beware of the circular dep.
+ if ! multilib_is_native_abi; then
+ myopts+=" --disable-directfb"
+ fi
+
+ # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+ if ! multilib_is_native_abi; then
+ myopts+=" --disable-qt"
+ fi
+
+ # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
+ $(use_enable X tee) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
+ $(use_enable debug test-surfaces) \
+ $(use_enable directfb) \
+ $(use_enable gles2 glesv2) \
+ $(use_enable glib gobject) \
+ $(use_enable opengl gl) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable valgrind) \
+ $(use_enable xcb) \
+ $(use_enable xcb xcb-shm) \
+ $(use_enable xlib-xcb) \
+ --enable-ft \
+ --enable-pdf \
+ --enable-png \
+ --enable-ps \
+ --disable-drm \
+ --disable-gallium \
+ --disable-qt \
+ --disable-vg \
+ ${myopts}
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all
+ einstalldocs
+}
+
+pkg_postinst() {
+ if use !xlib-xcb; then
+ if has_version net-misc/nxserver-freenx \
+ || has_version net-misc/x2goserver; then
+ ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
+ ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
+ ewarn "applications that are running inside NX sessions. For details, see"
+ ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
+ fi
+ fi
+}
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
new file mode 100644
index 000000000000..4301ec8c2211
--- /dev/null
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic autotools multilib-minimal
+
+if [[ ${PV} == *9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/cairo"
+ SRC_URI=""
+else
+ SRC_URI="http://cairographics.org/releases/${P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+DESCRIPTION="A vector graphics library with cross-device output support"
+HOMEPAGE="http://cairographics.org/"
+LICENSE="|| ( LGPL-2.1 MPL-1.1 )"
+SLOT="0"
+IUSE="X aqua debug directfb gles2 +glib opengl static-libs +svg valgrind xcb xlib-xcb"
+# gtk-doc regeneration doesn't seem to work with out-of-source builds
+#[[ ${PV} == *9999* ]] && IUSE="${IUSE} doc" # API docs are provided in tarball, no need to regenerate
+
+# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it
+RESTRICT="test"
+
+RDEPEND=">=dev-libs/lzo-2.06-r1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
+ directfb? ( dev-libs/DirectFB )
+ gles2? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
+ opengl? ( || ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] media-libs/opengl-apple ) )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ )
+ xcb? (
+ >=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r1
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=sys-devel/libtool-2
+ X? (
+ >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+ )"
+#[[ ${PV} == *9999* ]] && DEPEND="${DEPEND}
+# doc? (
+# >=dev-util/gtk-doc-1.6
+# ~app-text/docbook-xml-dtd-4.2
+# )"
+
+REQUIRED_USE="
+ gles2? ( !opengl )
+ xlib-xcb? ( xcb )
+"
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/cairo/cairo-directfb.h
+)
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-1.12.18-disable-test-suite.patch
+ epatch "${FILESDIR}"/${PN}-respect-fontconfig.patch
+
+ # tests and perf tools require X, bug #483574
+ if ! use X; then
+ sed -e '/^SUBDIRS/ s#boilerplate test perf# #' -i Makefile.am || die
+ fi
+
+ epatch_user
+
+ # Slightly messed build system YAY
+ if [[ ${PV} == *9999* ]]; then
+ touch boilerplate/Makefile.am.features
+ touch src/Makefile.am.features
+ touch ChangeLog
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myopts
+
+ [[ ${CHOST} == *-interix* ]] && append-flags -D_REENTRANT
+
+ use elibc_FreeBSD && myopts+=" --disable-symbol-lookup"
+
+ # TODO: remove this (and add USE-dep) when DirectFB is converted,
+ # bug #484248 -- but beware of the circular dep.
+ if ! multilib_is_native_abi; then
+ myopts+=" --disable-directfb"
+ fi
+
+ # TODO: remove this (and add USE-dep) when qtgui is converted, bug #498010
+ if ! multilib_is_native_abi; then
+ myopts+=" --disable-qt"
+ fi
+
+ # [[ ${PV} == *9999* ]] && myopts+=" $(use_enable doc gtk-doc)"
+
+ ECONF_SOURCE="${S}" \
+ econf \
+ --disable-dependency-tracking \
+ $(use_with X x) \
+ $(use_enable X tee) \
+ $(use_enable X xlib) \
+ $(use_enable X xlib-xrender) \
+ $(use_enable aqua quartz) \
+ $(use_enable aqua quartz-image) \
+ $(use_enable debug test-surfaces) \
+ $(use_enable directfb) \
+ $(use_enable gles2 glesv2) \
+ $(use_enable glib gobject) \
+ $(use_enable opengl gl) \
+ $(use_enable static-libs static) \
+ $(use_enable svg) \
+ $(use_enable valgrind) \
+ $(use_enable xcb) \
+ $(use_enable xcb xcb-shm) \
+ $(use_enable xlib-xcb) \
+ --enable-ft \
+ --enable-pdf \
+ --enable-png \
+ --enable-ps \
+ --disable-drm \
+ --disable-gallium \
+ --disable-qt \
+ --disable-vg \
+ ${myopts}
+}
+
+multilib_src_install_all() {
+ prune_libtool_files --all
+ einstalldocs
+}
+
+pkg_postinst() {
+ if use !xlib-xcb; then
+ if has_version net-misc/nxserver-freenx \
+ || has_version net-misc/x2goserver; then
+ ewarn "cairo-1.12 is known to cause GTK+ errors with NX servers."
+ ewarn "Enable USE=\"xlib-xcb\" if you notice incorrect behavior in GTK+"
+ ewarn "applications that are running inside NX sessions. For details, see"
+ ewarn "https://bugs.gentoo.org/441878 or https://bugs.freedesktop.org/59173"
+ fi
+ fi
+}
diff --git a/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
new file mode 100644
index 000000000000..6822121ce495
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-1.12.18-disable-test-suite.patch
@@ -0,0 +1,15 @@
+diff --git a/Makefile.am b/Makefile.am
+index 03fa352..7e11d24 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -18,10 +18,6 @@ ACLOCAL_AMFLAGS = -I build ${ACLOCAL_FLAGS}
+
+ DIST_SUBDIRS = src doc util boilerplate test perf
+ SUBDIRS = src doc util
+-# libpng is required for our test programs
+-if CAIRO_HAS_PNG_FUNCTIONS
+-SUBDIRS += boilerplate test perf
+-endif
+
+ configure: cairo-version.h
+
diff --git a/x11-libs/cairo/files/cairo-respect-fontconfig.patch b/x11-libs/cairo/files/cairo-respect-fontconfig.patch
new file mode 100644
index 000000000000..b0a1b2963502
--- /dev/null
+++ b/x11-libs/cairo/files/cairo-respect-fontconfig.patch
@@ -0,0 +1,13 @@
+--- cairo-1.7.6-orig/src/cairo-ft-font.c 2008-09-29 21:43:13.000000000 +0100
++++ cairo-1.7.6/src/cairo-ft-font.c 2008-09-29 21:52:19.000000000 +0100
+@@ -1705,7 +1705,9 @@
+ options->base.subpixel_order = other->base.subpixel_order;
+ }
+
+- if (options->base.hint_style == CAIRO_HINT_STYLE_DEFAULT)
++ options->base.hint_style = CAIRO_HINT_STYLE_DEFAULT;
++
++ if (other->base.hint_style != CAIRO_HINT_STYLE_DEFAULT)
+ options->base.hint_style = other->base.hint_style;
+
+ if (other->base.hint_style == CAIRO_HINT_STYLE_NONE)
diff --git a/x11-libs/cairo/metadata.xml b/x11-libs/cairo/metadata.xml
new file mode 100644
index 000000000000..ed05e511ddd3
--- /dev/null
+++ b/x11-libs/cairo/metadata.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>x11</herd>
+ <maintainer>
+ <email>tetromino@gentoo.org</email>
+ <name>Alexandre Rostovtsev</name>
+ </maintainer>
+ <maintainer>
+ <email>yngwin@gentoo.org</email>
+ <name>Ben de Groot</name>
+ <description>Secondary maintainer (x11 team is primary)</description>
+ </maintainer>
+ <use>
+ <flag name="opengl" restrict="&gt;=x11-libs/cairo-1.10.0">
+ Use Mesa backend for acceleration</flag>
+ <flag name="drm">Use Linux DRM for backend acceleration</flag>
+ <flag name="gallium">Use Mesa's Gallium backend for acceleration</flag>
+ <flag name="gles2">Use OpenGL ES 2 backend for acceleration.</flag>
+ <flag name="glib">Compile with GLib Object System support</flag>
+ <flag name="openvg">Use OpenVG for backend acceleration</flag>
+ <flag name="valgrind">Built-in support to mark memory regions</flag>
+ <flag name="xlib-xcb">Use XCB renderer backend for acceleration over xlib</flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:cairographics:cairo</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest
new file mode 100644
index 000000000000..9e5b9c132e4b
--- /dev/null
+++ b/x11-libs/colord-gtk/Manifest
@@ -0,0 +1,2 @@
+DIST colord-gtk-0.1.25.tar.xz 271192 SHA256 bd0f91c4348acba41018222915cd62917882dd35883bcc81848d089e13a70b0a SHA512 858a95630109ebbcc1e75f6ccdd73af28f9f0739a797d23ea6eadc1447518652925383e61940f0181c7361956a7250b209c63be2107b7f696bb471a122989611 WHIRLPOOL 95fc0aa6e56cadcfb98b13561826d856fb1a5e2a8d0804a7f00c461bf590662c566e9d1213afd91012db0231f9ab65e78286422f8af84f4d9b953f3ed011f6cc
+DIST colord-gtk-0.1.26.tar.xz 280380 SHA256 28d00b7f157ea3e2ea5315387b2660fde82faba16674861c50465e55d61a3e45 SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d WHIRLPOOL 47eb1f5988a7404381bd8ca426ae7be595f4bb104785d97d16c3afa2d20b60c61b757eba6c2df94e1004e667a17848b17ac21095ae1bcfe482eeeeb2f01f007c
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.25.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.25.ebuild
new file mode 100644
index 000000000000..0d09a49a89d3
--- /dev/null
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.25.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+VALA_MIN_API_VERSION="0.14"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils vala
+
+DESCRIPTION="GTK support library for colord"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
+SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0/1" # subslot = libcolord-gtk soname version
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.28:2
+ >=media-libs/lcms-2.2:2=
+ x11-libs/gdk-pixbuf:2[introspection?]
+ x11-libs/gtk+:3[X(+),introspection?]
+ x11-misc/colord:=[introspection?,vala?]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8 )"
+# ${PN} was part of x11-misc/colord until 0.1.22
+RDEPEND="${COMMON_DEPEND}
+ !<x11-misc/colord-0.1.27
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/xz-utils
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/gtk-doc-1.9
+ )
+ vala? ( $(vala_depend) )
+"
+
+RESTRICT="test" # Tests need a display device with a default color profile set
+
+src_prepare() {
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_enable doc gtk-doc) \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_install() {
+ default
+ prune_libtool_files --modules
+}
diff --git a/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
new file mode 100644
index 000000000000..24064528158c
--- /dev/null
+++ b/x11-libs/colord-gtk/colord-gtk-0.1.26.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala
+
+DESCRIPTION="GTK support library for colord"
+HOMEPAGE="http://www.freedesktop.org/software/colord/"
+SRC_URI="http://www.freedesktop.org/software/colord/releases/${P}.tar.xz"
+
+LICENSE="LGPL-3+"
+SLOT="0/1" # subslot = libcolord-gtk soname version
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+
+# We still need to build gtk-doc, https://bugs.freedesktop.org/show_bug.cgi?id=69107
+IUSE="doc +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.28:2
+ >=media-libs/lcms-2.2:2=
+ x11-libs/gdk-pixbuf:2[introspection?]
+ x11-libs/gtk+:3[X(+),introspection?]
+ x11-misc/colord:=[introspection?,vala?]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
+"
+# ${PN} was part of x11-misc/colord until 0.1.22
+RDEPEND="${COMMON_DEPEND}
+ !<x11-misc/colord-0.1.27
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/libxslt
+ >=dev-util/intltool-0.35
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ doc? (
+ app-text/docbook-xml-dtd:4.1.2
+ >=dev-util/gtk-doc-1.9
+ )
+ vala? ( $(vala_depend) )
+"
+
+RESTRICT="test" # Tests need a display device with a default color profile set
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-gtk2 \
+ --disable-static \
+ $(use_enable doc gtk-doc) \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_compile() {
+ if use doc; then
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_compile #482542
+ else
+ gnome2_src_compile
+ fi
+}
diff --git a/x11-libs/colord-gtk/metadata.xml b/x11-libs/colord-gtk/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/x11-libs/colord-gtk/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>gnome</herd>
+</pkgmetadata>
diff --git a/x11-libs/compiz-bcop/Manifest b/x11-libs/compiz-bcop/Manifest
new file mode 100644
index 000000000000..0b09787f6d73
--- /dev/null
+++ b/x11-libs/compiz-bcop/Manifest
@@ -0,0 +1 @@
+DIST compiz-bcop-0.8.8.tar.bz2 75886 SHA256 0c6eb97f47012c2d621953962df8bf9338d535c546bf2e8088860ba574efb436 SHA512 6b24400d6a347adbdf2f8d2a3c63f1371101d8dc6d4119547079b8a554d4ac9d5ff46cdeecd486886b4c5afe56a881111d877c73f4dde85978442ac45b539b7c WHIRLPOOL 8c1a83e1f7e1c40cbaec6fec99647d152aa14a6172feff08a25802ab7ec32f80b82e6f1a18278315f16cc50f237fe383ef9fadffdc9f8c9667c094783783f5a6
diff --git a/x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild b/x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild
new file mode 100644
index 000000000000..08f564d2ef06
--- /dev/null
+++ b/x11-libs/compiz-bcop/compiz-bcop-0.8.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+DESCRIPTION="Compiz Option code Generator"
+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"
+IUSE=""
+
+RDEPEND="dev-libs/libxslt"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog INSTALL NEWS README"
diff --git a/x11-libs/compiz-bcop/metadata.xml b/x11-libs/compiz-bcop/metadata.xml
new file mode 100644
index 000000000000..94ed9f8e7f37
--- /dev/null
+++ b/x11-libs/compiz-bcop/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>desktop-effects</herd>
+<longdescription lang="en">
+BCOP is a code generator that provides an easy way to handle plugin options by
+generating parts of the plugin code directly from the xml metadata file.
+</longdescription>
+</pkgmetadata>
+
diff --git a/x11-libs/compizconfig-backend-gconf/Manifest b/x11-libs/compizconfig-backend-gconf/Manifest
new file mode 100644
index 000000000000..31f3076d0a7c
--- /dev/null
+++ b/x11-libs/compizconfig-backend-gconf/Manifest
@@ -0,0 +1 @@
+DIST compizconfig-backend-gconf-0.8.8.tar.bz2 248650 SHA256 19a8df7f417535db80945cabb9a09c532241e6308406352d12cb5cbc6a1322cc SHA512 b8405660dfc93d7615b491523e7dd07c585e14f51f5de8237a88dbdefbf5fc8a338ceecc5ab10daef262add8a98fb4db5f3b9658d42b833b76fc0f486be51b92 WHIRLPOOL 77a99df02899f0dbcb90a6c41842dcf62031923a479544eda009050b331f57dcb36073a03e7f42c8057d6c35d6b72e8a61224d67c334ca0459a42dad6d761a9f
diff --git a/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild b/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild
new file mode 100644
index 000000000000..1c77879d0f80
--- /dev/null
+++ b/x11-libs/compizconfig-backend-gconf/compizconfig-backend-gconf-0.8.8.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Compizconfig Gconf Backend"
+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"
+IUSE=""
+
+DEPEND="
+ >=gnome-base/gconf-2.0:2
+ >=x11-libs/libcompizconfig-${PV}
+ >=x11-wm/compiz-${PV}
+"
+RDEPEND="${DEPEND}"
+
+DOCS="AUTHORS ChangeLog INSTALL NEWS README"
+
+src_configure() {
+ econf \
+ --enable-fast-install \
+ --disable-static
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/compizconfig-backend-gconf/metadata.xml b/x11-libs/compizconfig-backend-gconf/metadata.xml
new file mode 100644
index 000000000000..aad6dbb7276c
--- /dev/null
+++ b/x11-libs/compizconfig-backend-gconf/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">The gconf backend for CompizConfig.</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/compizconfig-backend-kconfig4/Manifest b/x11-libs/compizconfig-backend-kconfig4/Manifest
new file mode 100644
index 000000000000..a0d92ba00c72
--- /dev/null
+++ b/x11-libs/compizconfig-backend-kconfig4/Manifest
@@ -0,0 +1 @@
+DIST compizconfig-backend-kconfig4-0.8.8.tar.bz2 21632 SHA256 90c3a4a0fdcbee21479dd56685bb101f9a5f70a57c953dfb4fa372e99fceb767 SHA512 241612da39f88ff3c129be96f8f81f9dafc82943d5ce303cd7ef8f5e6aa4418a680e6f5f18c6ee2259d501c73791276a7ab1405c800070c60d8b9f71c18ccefd WHIRLPOOL 9687c02a73ae3d9f2d79e5331a68b23673c2804cc1f3038298978ab38cd5ad290d16d77816a0267c6a2778fb5f0656f2d267496c2dc69c1ff707152bc7ef1946
diff --git a/x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild b/x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild
new file mode 100644
index 000000000000..252c3661f137
--- /dev/null
+++ b/x11-libs/compizconfig-backend-kconfig4/compizconfig-backend-kconfig4-0.8.8.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Compizconfig Kconfig Backend"
+HOMEPAGE="http://www.compiz.org/"
+SRC_URI="http://releases.compiz.org/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND="dev-qt/qtdbus:4
+ >=x11-libs/libcompizconfig-${PV}
+ >=x11-wm/compiz-${PV}"
diff --git a/x11-libs/compizconfig-backend-kconfig4/metadata.xml b/x11-libs/compizconfig-backend-kconfig4/metadata.xml
new file mode 100644
index 000000000000..6b904364e152
--- /dev/null
+++ b/x11-libs/compizconfig-backend-kconfig4/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">The kconfig backend for CompizConfig.</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/dnd/Manifest b/x11-libs/dnd/Manifest
new file mode 100644
index 000000000000..681384705cd6
--- /dev/null
+++ b/x11-libs/dnd/Manifest
@@ -0,0 +1 @@
+DIST dnd.1.1.tgz 227598 RMD160 eac0744baa344024db2e40c0582c11d722baba48 SHA1 0376e8afe4fe5ed4b2f4fc2a447a332496ab7174 SHA256 ffd9b74f1bf8e5c18a4745ef89e9c6618f9507ec09a010c4bf15481a3f130804
diff --git a/x11-libs/dnd/dnd-1.1-r1.ebuild b/x11-libs/dnd/dnd-1.1-r1.ebuild
new file mode 100644
index 000000000000..a9f057027546
--- /dev/null
+++ b/x11-libs/dnd/dnd-1.1-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit toolchain-funcs eutils
+
+S=${WORKDIR}/DND/DNDlib
+DESCRIPTION="OffiX' Drag'n'drop library"
+HOMEPAGE="http://leb.net/offix"
+SRC_URI="http://leb.net/offix/${PN}.${PV}.tgz"
+IUSE=""
+SLOT="0"
+LICENSE="GPL-2 LGPL-2"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+
+RDEPEND=">=x11-libs/libX11-1.0.0
+ >=x11-libs/libXmu-1.0.0
+ >=x11-libs/libXt-1.0.0
+ >=x11-libs/libICE-1.0.0
+ >=x11-libs/libSM-1.0.0
+ >=x11-libs/libXaw-1.0.1
+ >=x11-proto/xproto-7.0.4"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-gentoo.diff || die
+ epatch "${FILESDIR}"/Makefile-fix.patch || die
+}
+
+src_compile() {
+ tc-export CC CXX RANLIB AR
+ econf --with-x || die
+ emake || die
+}
+
+src_install () {
+ make DESTDIR="${D}" install || die
+}
diff --git a/x11-libs/dnd/files/Makefile-fix.patch b/x11-libs/dnd/files/Makefile-fix.patch
new file mode 100644
index 000000000000..a22a1b888ce7
--- /dev/null
+++ b/x11-libs/dnd/files/Makefile-fix.patch
@@ -0,0 +1,44 @@
+--- Makefile.in.orig 1997-05-22 22:18:22.000000000 -0400
++++ Makefile.in 2004-06-16 14:41:19.673035936 -0400
+@@ -16,7 +16,7 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+-LIB_DIR = @libdir@
++LIB_DIR = $(DESTDIR)@libdir@
+-INC_DIR = @includedir@/OffiX
++INC_DIR = $(DESTDIR)@includedir@/OffiX
+
+ COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -c
+@@ -42,19 +42,22 @@
+ $(COMPILE) dndtest.c
+ $(LINK) dndtest.o -L. -lDnd $(LIBS)
+
+-libDnd.a: DragAndDrop.c
+- rm -f DragAndDrop.o
+- $(COMPILE) DragAndDrop.c
++libDnd.a: DragAndDropC.o
+ rm -f libDnd.a
+- $(AR) cru libDnd.a DragAndDrop.o
++ $(AR) cru libDnd.a DragAndDropC.o
+ $(RANLIB) libDnd.a
+
+-libDnd++.a: DragAndDrop.c
+- rm -f DragAndDrop.o DragAndDrop.cxx
+- ln -s DragAndDrop.c DragAndDrop.cxx
+- $(CXXCOMPILE) DragAndDrop.cxx
++DragAndDropC.o: DragAndDrop.c
++ rm -f DragAndDropC.o
++ $(COMPILE) DragAndDrop.c -o DragAndDropC.o
++
++DragAndDropCpp.o: DragAndDrop.c
++ rm -f DragAndDropCpp.o
++ $(CXXCOMPILE) DragAndDrop.c -o DragAndDropCpp.o
++
++libDnd++.a: DragAndDropCpp.o
+ rm -f libDnd++.a
+- $(AR) cru libDnd++.a DragAndDrop.o
++ $(AR) cru libDnd++.a DragAndDropCpp.o
+ $(RANLIB) libDnd++.a
+
+ clean:
diff --git a/x11-libs/dnd/files/dnd-1.1-gentoo.diff b/x11-libs/dnd/files/dnd-1.1-gentoo.diff
new file mode 100644
index 000000000000..970c5e473650
--- /dev/null
+++ b/x11-libs/dnd/files/dnd-1.1-gentoo.diff
@@ -0,0 +1,35 @@
+--- DragAndDrop.c.orig Tue Sep 25 21:14:11 2001
++++ DragAndDrop.c Tue Sep 25 21:14:16 2001
+@@ -81,23 +81,23 @@
+
+ static CursorData DndCursor[DndEND]={
+ { 0,0,NULL,NULL,0,0,0 },
+- { grey_width, grey_height,grey_bits,grey_mask_bits,
++ { grey_width, grey_height,(char*)grey_bits,(char*)grey_mask_bits,
+ grey_x_hot,grey_y_hot},
+- { file_width,file_height,file_bits,file_mask_bits,
++ { file_width,file_height,(char*)file_bits,(char*)file_mask_bits,
+ file_x_hot,file_y_hot},
+- { files_width,files_height,files_bits,files_mask_bits,
++ { files_width,files_height,(char*)files_bits,(char*)files_mask_bits,
+ files_x_hot,files_y_hot},
+- { text_width,text_height,text_bits,text_mask_bits,
++ { text_width,text_height,(char*)text_bits,(char*)text_mask_bits,
+ text_x_hot,text_y_hot },
+- { dir_width,dir_height,dir_bits,dir_mask_bits,
++ { dir_width,dir_height,(char*)dir_bits,(char*)dir_mask_bits,
+ dir_x_hot,dir_y_hot },
+- { link_width,link_height,link_bits,link_mask_bits,
++ { link_width,link_height,(char*)link_bits,(char*)link_mask_bits,
+ link_x_hot,link_y_hot},
+- { app_width,app_height,app_bits,app_mask_bits,
++ { app_width,app_height,(char*)app_bits,(char*)app_mask_bits,
+ app_x_hot,app_y_hot },
+- { url_width,url_height,url_bits,url_mask_bits,
++ { url_width,url_height,(char*)url_bits,(char*)url_mask_bits,
+ url_x_hot,url_y_hot },
+- { mime_width,mime_height,mime_bits,mime_mask_bits,
++ { mime_width,mime_height,(char*)mime_bits,(char*)mime_mask_bits,
+ mime_x_hot,mime_y_hot }
+ };
+
diff --git a/x11-libs/dnd/metadata.xml b/x11-libs/dnd/metadata.xml
new file mode 100644
index 000000000000..59e2b8f78cb5
--- /dev/null
+++ b/x11-libs/dnd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>maintainer-needed@gentoo.org</email>
+ <name>Default assignee for orphaned packages</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/flowcanvas/Manifest b/x11-libs/flowcanvas/Manifest
new file mode 100644
index 000000000000..f26ba4ccf853
--- /dev/null
+++ b/x11-libs/flowcanvas/Manifest
@@ -0,0 +1 @@
+DIST flowcanvas-0.7.1.tar.bz2 139471 SHA256 047928d858fd1e9296a9984de7468c86bbe23fc42e286691b8f273541402c596 SHA512 e9c7ee9693c6b78e44a0611a8d73c1b7ffa1ae0f3e36c9b0bbc88d5a293c3e5183c17e14b2079d611c988f30cb292caee52ab37f8a13da96b5c8c8261e408410 WHIRLPOOL 97ecfcd3131c5f931d57ff2c5a396971839513cd4ec0ef0d2e83c8e27be79bbde7385f07cd231199656128c4c319e9e52788486b2f539ca74b5033c1233b6476
diff --git a/x11-libs/flowcanvas/files/gv234.patch b/x11-libs/flowcanvas/files/gv234.patch
new file mode 100644
index 000000000000..ec03696135c0
--- /dev/null
+++ b/x11-libs/flowcanvas/files/gv234.patch
@@ -0,0 +1,48 @@
+Index: flowcanvas-0.7.1/src/Canvas.cpp
+===================================================================
+--- flowcanvas-0.7.1.orig/src/Canvas.cpp
++++ flowcanvas-0.7.1/src/Canvas.cpp
+@@ -1253,21 +1253,21 @@ Canvas::layout_dot(bool use_length_hints
+ */
+
+ GVC_t* gvc = gvContext();
+- Agraph_t* G = agopen((char*)"g", AGDIGRAPH);
++ Agraph_t* G = agopen((char*)"g", Agdirected, 0);
+
+ nodes.gvc = gvc;
+ nodes.G = G;
+
+ if (_direction == HORIZONTAL)
+- agraphattr(G, (char*)"rankdir", (char*)"LR");
++ agattr(G, AGRAPH, (char*)"rankdir", (char*)"LR");
+ else
+- agraphattr(G, (char*)"rankdir", (char*)"TD");
++ agattr(G, AGRAPH, (char*)"rankdir", (char*)"TD");
+
+ unsigned id = 0;
+ for (ItemList::const_iterator i = _items.begin(); i != _items.end(); ++i) {
+ std::ostringstream ss;
+ ss << "n" << id++;
+- Agnode_t* node = agnode(G, strdup(ss.str().c_str()));
++ Agnode_t* node = agnode(G, strdup(ss.str().c_str()), 1);
+ if (boost::dynamic_pointer_cast<Module>(*i)) {
+ ss.str("");
+ ss << (*i)->width() / 96.0;
+@@ -1310,7 +1310,7 @@ Canvas::layout_dot(bool use_length_hints
+
+ assert(src_node && dst_node);
+
+- Agedge_t* edge = agedge(G, src_node, dst_node);
++ Agedge_t* edge = agedge(G, src_node, dst_node, NULL, 1);
+
+ if (use_length_hints && c->length_hint() != 0) {
+ std::ostringstream len_ss;
+@@ -1325,7 +1325,7 @@ Canvas::layout_dot(bool use_length_hints
+ if (partner) {
+ GVNodes::iterator p = nodes.find(partner);
+ if (p != nodes.end())
+- agedge(G, i->second, p->second);
++ agedge(G, i->second, p->second, NULL, 1);
+ }
+ }
+
diff --git a/x11-libs/flowcanvas/files/ldconfig2.patch b/x11-libs/flowcanvas/files/ldconfig2.patch
new file mode 100644
index 000000000000..d86e65eaf179
--- /dev/null
+++ b/x11-libs/flowcanvas/files/ldconfig2.patch
@@ -0,0 +1,10 @@
+Index: flowcanvas-0.7.1/wscript
+===================================================================
+--- flowcanvas-0.7.1.orig/wscript
++++ flowcanvas-0.7.1/wscript
+@@ -85,5 +85,3 @@ def build(bld):
+
+ # Documentation
+ autowaf.build_dox(bld, 'FLOWCANVAS', FLOWCANVAS_VERSION, top, out)
+-
+- bld.add_post_fun(autowaf.run_ldconfig)
diff --git a/x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild b/x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild
new file mode 100644
index 000000000000..df8bbe8aca76
--- /dev/null
+++ b/x11-libs/flowcanvas/flowcanvas-0.7.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+)'
+
+inherit waf-utils python-any-r1 eutils
+
+DESCRIPTION="Gtkmm/Gnomecanvasmm widget for boxes and lines environments"
+HOMEPAGE="http://wiki.drobilla.net/FlowCanvas"
+SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug doc"
+
+RDEPEND="dev-libs/boost
+ >=dev-cpp/gtkmm-2.4:2.4
+ >=dev-cpp/libgnomecanvasmm-2.6:2.6
+ media-gfx/graphviz"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ doc? ( app-doc/doxygen )"
+
+DOCS=( AUTHORS README ChangeLog )
+
+src_prepare() {
+ epatch "${FILESDIR}/ldconfig2.patch"
+ has_version '>=media-gfx/graphviz-2.34' && epatch "${FILESDIR}/gv234.patch"
+}
+
+src_configure() {
+ waf-utils_src_configure \
+ --htmldir=/usr/share/doc/${PF}/html \
+ $(use debug && echo "--debug") \
+ $(use doc && echo "--doc")
+}
diff --git a/x11-libs/flowcanvas/metadata.xml b/x11-libs/flowcanvas/metadata.xml
new file mode 100644
index 000000000000..6292b8c1f28d
--- /dev/null
+++ b/x11-libs/flowcanvas/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>proaudio</herd>
+<longdescription lang="en">
+ FlowCanvas is an interactive Gtkmm/Gnomecanvasmm widget for "boxes and
+ lines" environments (ie modular synths or interactive finite state automata
+ diagrams).
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/fltk/Manifest b/x11-libs/fltk/Manifest
new file mode 100644
index 000000000000..66b6807a9543
--- /dev/null
+++ b/x11-libs/fltk/Manifest
@@ -0,0 +1,2 @@
+DIST fltk-1.3.2-source.tar.gz 4260874 SHA256 176044df94f31bd53a5806cf5054ca78b180bf9ae27ce47649608833695ee4a4 SHA512 9372a34d8dfc4b4ece7632683c1c92f9ea9e538ba6eec08bec69615e2b2c885957d229a5ec495830f673b6a059f55a94b61727e8eb1fb7b3bd37005dc0b8312e WHIRLPOOL 10c85d1ae50ccd3d9f66285483d39bc0e61b9f3306f87412841ceed9a45fd45f0476b28f7e7652658f6fcc48533d1ec4974a9eb98ca0f535b662a70209c1f781
+DIST fltk-1.3.3-source.tar.gz 4986376 SHA256 f8398d98d7221d40e77bc7b19e761adaf2f1ef8bb0c30eceb7beb4f2273d0d97 SHA512 277ba27e35c20e2d4fc5296bf418c5ab78c821870476e21d49f723765b99b3a559eed4ecd5215ac26d53a1091ada003e17f1553194cebaa97dd854809dd2885d WHIRLPOOL 876a92e44dac20e6a2d86e4339a87185e708718d4cc59983bd81d5c3f0100d52230ef34d9c92800a2a07f6e7ed26e2ba9212c01ce898e7a184a7a35c40837761
diff --git a/x11-libs/fltk/files/FLTKConfig.cmake b/x11-libs/fltk/files/FLTKConfig.cmake
new file mode 100644
index 000000000000..09427aac2aa5
--- /dev/null
+++ b/x11-libs/fltk/files/FLTKConfig.cmake
@@ -0,0 +1,37 @@
+#-----------------------------------------------------------------------------
+#
+# FLTKConfig.cmake - FLTK CMake configuration file for external projects.
+#
+# This file is configured by FLTK and used by the UseFLTK.cmake module
+# to load FLTK's settings for an external project.
+
+# The FLTK source tree.
+# SET(FLTK_SOURCE_DIR "@FLTK_SOURCE_DIR@")
+
+# The FLTK include file directories.
+SET(FLUID_COMMAND "/usr/bin/fluid")
+SET(FLTK_EXECUTABLE_DIRS "/usr/bin")
+SET(FLTK_LIBRARY_DIRS "/usr/lib")
+SET(FLTK_LIBRARIES "fltk_images;fltk_gl;fltk_forms;fltk")
+SET(FLTK_INCLUDE_DIRS "/usr/include")
+
+# The C and C++ flags added by FLTK to the cmake-configured flags.
+SET(FLTK_REQUIRED_C_FLAGS "")
+SET(FLTK_REQUIRED_CXX_FLAGS "")
+
+# The FLTK version number
+SET(FLTK_VERSION_MAJOR "1")
+SET(FLTK_VERSION_MINOR "1")
+SET(FLTK_VERSION_PATCH "7")
+
+# Is FLTK using shared libraries?
+SET(FLTK_BUILD_SHARED_LIBS "ON")
+# SET(FLTK_BUILD_SETTINGS_FILE "@FLTK_BUILD_SETTINGS_FILE@")
+
+# The location of the UseFLTK.cmake file.
+SET(FLTK11_USE_FILE "/usr/share/cmake/Modules/FLTKUse.cmake")
+
+# # The ExodusII library dependencies.
+# IF(NOT FLTK_NO_LIBRARY_DEPENDS)
+# INCLUDE("@FLTK_LIBRARY_DEPENDS_FILE@")
+# ENDIF(NOT FLTK_NO_LIBRARY_DEPENDS)
diff --git a/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch
new file mode 100644
index 000000000000..f5e2a1fdbfe2
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.0-conf-tests.patch
@@ -0,0 +1,79 @@
+diff --git a/Makefile b/Makefile
+index ccec15c..747625e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -27,7 +27,7 @@
+
+ include makeinclude
+
+-DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid test documentation
++DIRS = $(IMAGEDIRS) src $(CAIRODIR) fluid
+
+ all: makeinclude fltk-config
+ for dir in $(DIRS); do\
+@@ -35,6 +35,10 @@ all: makeinclude fltk-config
+ (cd $$dir; $(MAKE) $(MFLAGS)) || exit 1;\
+ done
+
++check: all
++ $(MAKE) $(MFLAGS) -C test || exit 1
++
++
+ install: makeinclude
+ -mkdir -p $(DESTDIR)$(bindir)
+ $(RM) $(DESTDIR)$(bindir)/fltk-config
+@@ -109,9 +113,6 @@ makeinclude: configure configh.in makeinclude.in
+ touch config.h
+ chmod +x fltk-config
+
+-configure: configure.in
+- autoconf
+-
+ portable-dist:
+ epm -v -s fltk.xpm fltk
+
+diff --git a/documentation/Makefile b/documentation/Makefile
+index 1742cfa..8102c43 100644
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -92,11 +92,6 @@ install: $(MANPAGES)
+ $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
+ fi
+ echo "Installing man pages in $(DESTDIR)$(mandir) ..."
+- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
+@@ -104,10 +99,6 @@ install: $(MANPAGES)
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
+
+ install-linux install-osx:
+- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
+- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+ -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
+ $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
+ $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
+@@ -116,17 +107,11 @@ install-linux install-osx:
+
+ uninstall:
+ $(RMDIR) $(DESTDIR)$(docdir)
+- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
+ $(RM) $(DESTDIR)$(mandir)/man1/fluid.1
+- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
+ $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
+- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
+ $(RM) $(DESTDIR)$(mandir)/man3/fltk.3
+
+ uninstall-linux uninstall-osx:
+- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
+- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
+- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
+ $(RM) $(DESTDIR)$(mandir)/man6/blocks.6
+ $(RM) $(DESTDIR)$(mandir)/man6/checkers.6
+ $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
diff --git a/x11-libs/fltk/files/fltk-1.3.0-share.patch b/x11-libs/fltk/files/fltk-1.3.0-share.patch
new file mode 100644
index 000000000000..4b4267a4986c
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.0-share.patch
@@ -0,0 +1,44 @@
+ fluid/Makefile | 20 ++++++++++----------
+ 1 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/fluid/Makefile b/fluid/Makefile
+index 1cb3210..9d438a5 100644
+--- a/fluid/Makefile
++++ b/fluid/Makefile
+@@ -82,16 +82,16 @@ install: all
+ $(INSTALL_BIN) $(FLUID) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+
+ install-linux:
+- -$(INSTALL_DIR) $(DESTDIR)/usr/share/applications
+- $(INSTALL_DATA) fluid.desktop $(DESTDIR)/usr/share/applications
++ -$(INSTALL_DIR) $(DESTDIR)$(datadir)/applications
++ $(INSTALL_DATA) fluid.desktop $(DESTDIR)$(datadir)/applications
+ for size in 16 32 48 64 128; do \
+- if test ! -d $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; then \
+- $(INSTALL_DIR) $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps; \
++ if test ! -d $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; then \
++ $(INSTALL_DIR) $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps; \
+ fi; \
+- $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)/usr/share/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
++ $(INSTALL_DATA) icons/fluid-$$size.png $(DESTDIR)$(datadir)/icons/hicolor/$${size}x$${size}/apps/fluid.png; \
+ done
+- -$(INSTALL_DIR) $(DESTDIR)/usr/share/mimelnk/application
+- $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)/usr/share/mimelnk/application
++ -$(INSTALL_DIR) $(DESTDIR)$(datadir)/mimelnk/application
++ $(INSTALL_DATA) x-fluid.desktop $(DESTDIR)$(datadir)/mimelnk/application
+
+ install-osx:
+ echo Installing Fluid in $(DESTDIR)/Applications...
+@@ -109,9 +109,9 @@ uninstall:
+ $(RM) $(DESTDIR)$(bindir)/fluid$(EXEEXT)
+
+ uninstall-linux:
+- $(RM) $(DESTDIR)/usr/share/applications/fluid.desktop
+- $(RM) $(DESTDIR)/usr/share/icons/hicolor/*/fluid.png
+- $(RM) $(DESTDIR)/usr/share/mimelnk/application/x-fluid.desktop
++ $(RM) $(DESTDIR)$(datadir)/applications/fluid.desktop
++ $(RM) $(DESTDIR)$(datadir)/icons/hicolor/*/fluid.png
++ $(RM) $(DESTDIR)$(datadir)/mimelnk/application/x-fluid.desktop
+
+ uninstall-osx:
+ $(RM) -r $(DESTDIR)/Applications/fluid.app
diff --git a/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch b/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch
new file mode 100644
index 000000000000..c6539fc7ec21
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.1-as-needed.patch
@@ -0,0 +1,154 @@
+ cairo/Makefile | 4 ++--
+ configure.in | 9 +++------
+ src/Makefile | 24 ++++++++++++------------
+ 3 files changed, 17 insertions(+), 20 deletions(-)
+
+diff --git a/cairo/Makefile b/cairo/Makefile
+index 3cefc9f..445cd9c 100644
+--- a/cairo/Makefile
++++ b/cairo/Makefile
+@@ -48,13 +48,13 @@ $(CAIROLIBNAME): $(CAIROOBJECTS)
+
+ libfltk_cairo.so.1.3: $(CAIROOBJECTS) ../src/libfltk.so.1.3
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
++ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
+ $(RM) libfltk_cairo.so
+ $(LN) $(CAIRODSONAME) libfltk_cairo.so
+
+ libfltk_cairo.sl.1.3: $(CAIROOBJECTS) ../src/libfltk.sl.1.3
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk
++ $(DSOCOMMAND) $@ $(CAIROOBJECTS) -L../src -lfltk $(CAIROLIBS)
+ $(RM) libfltk_cairo.sl
+ $(LN) libfltk_cairo.sl.1.3 libfltk_cairo.sl
+
+diff --git a/configure.in b/configure.in
+index 762d3f9..56a5d97 100644
+--- a/configure.in
++++ b/configure.in
+@@ -166,7 +166,7 @@ else
+ dnl we do not rely on pkg-config .
+ CAIRODIR="cairo"
+ CAIROFLAGS="`pkg-config --cflags cairo`"
+- CAIROLIBS="-lcairo -lpixman-1"
++ CAIROLIBS="`pkg-config --libs cairo pixman-1`"
+ CXXFLAGS="$CAIROFLAGS $CXXFLAGS"
+ LINKFLTKCAIRO="../lib/libfltk_cairo.a"
+ FLTKCAIROOPTION="-L ../cairo -lfltk_cairo$SHAREDSUFFIX"
+@@ -280,10 +280,7 @@ if test x$enable_shared = xyes; then
+ GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
+ IMGDSONAME="libfltk_images.so.$FL_API_VERSION"
+ CAIRODSONAME="libfltk_cairo.so.$FL_API_VERSION"
+- DSOCOMMAND="\$(CXX) \$(DSOFLAGS) -Wl,-soname,\$@ \$(LDLIBS) -shared -fPIC $DEBUGFLAG -o"
+- if test "x$libdir" != "x/usr/lib" -a "x$libdir" != "x/usr/lib64"; then
+- DSOLINK="-Wl,-rpath,$libdir"
+- fi
++ DSOCOMMAND="\$(CXX) \$(DSOFLAGS) \$(LDFLAGS) -Wl,-soname,\$@ -shared -fPIC $DEBUGFLAG -o"
+ ;;
+ AIX*)
+ DSONAME="libfltk_s.a"
+diff --git a/src/Makefile b/src/Makefile
+index 7806854..a43106e 100644
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -240,13 +240,13 @@ $(LIBNAME): $(OBJECTS)
+
+ libfltk.so.1.3: $(OBJECTS)
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(OBJECTS)
++ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
+ $(RM) libfltk.so
+ $(LN) libfltk.so.1.3 libfltk.so
+
+ libfltk.sl.1.3: $(OBJECTS)
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(OBJECTS)
++ $(DSOCOMMAND) $@ $(OBJECTS) $(LDLIBS)
+ $(RM) libfltk.sl
+ $(LN) libfltk.sl.1.3 libfltk.sl
+
+@@ -262,7 +262,7 @@ libfltk.1.3.dylib: $(OBJECTS)
+
+ libfltk_s.a: $(OBJECTS)
+ echo $(DSOCOMMAND) libfltk_s.o ...
+- $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS)
++ $(DSOCOMMAND) libfltk_s.o $(OBJECTS) $(IMAGELIBS) $(LDLIBS)
+ echo $(LIBCOMMAND) libfltk_s.a libfltk_s.o
+ $(RM) $@
+ $(LIBCOMMAND) libfltk_s.a libfltk_s.o
+@@ -276,13 +276,13 @@ $(FLLIBNAME): $(FLOBJECTS)
+
+ libfltk_forms.so.1.3: $(FLOBJECTS) libfltk.so.1.3
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
++ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
+ $(RM) libfltk_forms.so
+ $(LN) libfltk_forms.so.1.3 libfltk_forms.so
+
+ libfltk_forms.sl.1.3: $(FLOBJECTS) libfltk.sl.1.3
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(FLOBJECTS) -L. -lfltk
++ $(DSOCOMMAND) $@ $(FLOBJECTS) $(LDLIBS) -L. -lfltk
+ $(RM) libfltk_forms.sl
+ $(LN) libfltk_forms.sl.1.3 libfltk_forms.sl
+
+@@ -298,7 +298,7 @@ libfltk_forms.1.3.dylib: $(FLOBJECTS) libfltk.1.3.dylib
+
+ libfltk_forms_s.a: $(FLOBJECTS)
+ echo $(DSOCOMMAND) libfltk_forms_s.o ...
+- $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS)
++ $(DSOCOMMAND) libfltk_forms_s.o $(FLOBJECTS) $(LDLIBS)
+ echo $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
+ $(RM) $@
+ $(LIBCOMMAND) libfltk_forms_s.a libfltk_forms_s.o
+@@ -312,13 +312,13 @@ $(GLLIBNAME): $(GLOBJECTS)
+
+ libfltk_gl.so.1.3: $(GLOBJECTS) libfltk.so.1.3
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
++ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk $(GLDLIBS) $(GLLIB)
+ $(RM) libfltk_gl.so
+ $(LN) libfltk_gl.so.1.3 libfltk_gl.so
+
+ libfltk_gl.sl.1.3: $(GLOBJECTS) libfltk.sl.1.3
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(GLOBJECTS) -L. -lfltk
++ $(DSOCOMMAND) $@ $(GLOBJECTS) $(LDLIBS) -L. -lfltk
+ $(RM) libfltk_gl.sl
+ $(LN) libfltk_gl.sl.1.3 libfltk_gl.sl
+
+@@ -334,7 +334,7 @@ libfltk_gl.1.3.dylib: $(GLOBJECTS) libfltk.1.3.dylib
+
+ libfltk_gl_s.a: $(GLOBJECTS)
+ echo $(DSOCOMMAND) libfltk_gl_s.o ...
+- $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS)
++ $(DSOCOMMAND) libfltk_gl_s.o $(GLOBJECTS) $(LDLIBS) $(GLLIB)
+ echo $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
+ $(RM) $@
+ $(LIBCOMMAND) libfltk_gl_s.a libfltk_gl_s.o
+@@ -348,13 +348,13 @@ $(IMGLIBNAME): $(IMGOBJECTS)
+
+ libfltk_images.so.1.3: $(IMGOBJECTS) libfltk.so.1.3
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
++ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
+ $(RM) libfltk_images.so
+ $(LN) libfltk_images.so.1.3 libfltk_images.so
+
+ libfltk_images.sl.1.3: $(IMGOBJECTS) libfltk.sl.1.3
+ echo $(DSOCOMMAND) $@ ...
+- $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) -lfltk
++ $(DSOCOMMAND) $@ $(IMGOBJECTS) -L. $(IMAGELIBS) $(LDLIBS) -lfltk
+ $(RM) libfltk_images.sl
+ $(LN) libfltk_images.sl.1.3 libfltk_images.sl
+
+@@ -370,7 +370,7 @@ libfltk_images.1.3.dylib: $(IMGOBJECTS) libfltk.1.3.dylib
+
+ libfltk_images_s.a: $(IMGOBJECTS)
+ echo $(DSOCOMMAND) libfltk_images_s.o ...
+- $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS)
++ $(DSOCOMMAND) libfltk_images_s.o $(IMGOBJECTS) $(LDLIBS)
+ echo $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
+ $(RM) $@
+ $(LIBCOMMAND) libfltk_images_s.a libfltk_images_s.o
diff --git a/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
new file mode 100644
index 000000000000..74022a72ffb9
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.2-conf-tests.patch
@@ -0,0 +1,55 @@
+--- a/Makefile
++++ b/Makefile
+@@ -100,9 +103,6 @@
+ touch config.h
+ chmod +x fltk-config
+
+-configure: configure.in
+- autoconf
+-
+ config.guess config.sub:
+ -automake --add-missing 2> /dev/null
+ if [ ! -e config.sub ]; then echo NOTE: Using frozen copy of config.sub; cp misc/config.sub . ; fi
+--- a/documentation/Makefile
++++ b/documentation/Makefile
+@@ -84,11 +84,6 @@
+ $(INSTALL_DATA) fltk.pdf $(DESTDIR)$(docdir); \
+ fi
+ echo "Installing man pages in $(DESTDIR)$(mandir) ..."
+- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat1
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.$(CAT1EXT) $(DESTDIR)$(mandir)/cat1
+- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat3
+- $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.$(CAT3EXT) $(DESTDIR)$(mandir)/cat3
+ -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man1
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fluid.man $(DESTDIR)$(mandir)/man1/fluid.1
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fltk-config.man $(DESTDIR)$(mandir)/man1/fltk-config.1
+@@ -96,10 +91,6 @@
+ $(INSTALL_MAN) $(SRC_DOCDIR)/fltk.man $(DESTDIR)$(mandir)/man3/fltk.3
+
+ install-linux install-osx:
+- -$(INSTALL_DIR) $(DESTDIR)$(mandir)/cat6
+- $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+- $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+- $(INSTALL_MAN) $(SRC_DOCDIR)/sudoku.$(CAT6EXT) $(DESTDIR)$(mandir)/cat6
+ -$(INSTALL_DIR) $(DESTDIR)$(mandir)/man6
+ $(INSTALL_MAN) $(SRC_DOCDIR)/blocks.man $(DESTDIR)$(mandir)/man6/blocks.6
+ $(INSTALL_MAN) $(SRC_DOCDIR)/checkers.man $(DESTDIR)$(mandir)/man6/checkers.6
+@@ -108,17 +99,11 @@
+
+ uninstall:
+ $(RMDIR) $(DESTDIR)$(docdir)
+- $(RM) $(DESTDIR)$(mandir)/cat1/fluid.$(CAT1EXT)
+ $(RM) $(DESTDIR)$(mandir)/man1/fluid.1
+- $(RM) $(DESTDIR)$(mandir)/cat1/fltk-config.$(CAT1EXT)
+ $(RM) $(DESTDIR)$(mandir)/man1/fltk-config.1
+- $(RM) $(DESTDIR)$(mandir)/cat3/fltk.$(CAT3EXT)
+ $(RM) $(DESTDIR)$(mandir)/man3/fltk.3
+
+ uninstall-linux uninstall-osx:
+- $(RM) $(DESTDIR)$(mandir)/cat6/blocks.$(CAT6EXT)
+- $(RM) $(DESTDIR)$(mandir)/cat6/checkers.$(CAT6EXT)
+- $(RM) $(DESTDIR)$(mandir)/cat6/sudoku.$(CAT6EXT)
+ $(RM) $(DESTDIR)$(mandir)/man6/blocks.6
+ $(RM) $(DESTDIR)$(mandir)/man6/checkers.6
+ $(RM) $(DESTDIR)$(mandir)/man6/sudoku.6
diff --git a/x11-libs/fltk/files/fltk-1.3.2-desktop.patch b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
new file mode 100644
index 000000000000..abec41a4b057
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.2-desktop.patch
@@ -0,0 +1,19 @@
+--- fltk-1.3.2/fluid/fluid.desktop
++++ fltk-1.3.2/fluid/fluid.desktop
+@@ -6,5 +6,5 @@
+ Icon=fluid
+ Terminal=false
+ Type=Application
+-MimeType=application/x-fluid
++MimeType=application/x-fluid;
+ Categories=Development;GUIDesigner;
+--- fltk-1.3.2/fluid/x-fluid.desktop
++++ fltk-1.3.2/fluid/x-fluid.desktop
+@@ -1,6 +1,6 @@
+ [Desktop Entry]
+ Type=MimeType
+-MimeType=application/x-fluid
++MimeType=application/x-fluid;
+ Icon=fluid.png
+ Patterns=*.fl
+ Name=FLUID
diff --git a/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
new file mode 100644
index 000000000000..701f04ca6168
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.2-jpeg-9a.patch
@@ -0,0 +1,22 @@
+http://bugs.gentoo.org/479774
+
+--- src/Fl_JPEG_Image.cxx
++++ src/Fl_JPEG_Image.cxx
+@@ -155,7 +155,7 @@
+
+ jpeg_create_decompress(&dinfo);
+ jpeg_stdio_src(&dinfo, fp);
+- jpeg_read_header(&dinfo, 1);
++ jpeg_read_header(&dinfo, TRUE);
+
+ dinfo.quantize_colors = (boolean)FALSE;
+ dinfo.out_color_space = JCS_RGB;
+@@ -337,7 +337,7 @@
+
+ jpeg_create_decompress(&dinfo);
+ jpeg_mem_src(&dinfo, data);
+- jpeg_read_header(&dinfo, 1);
++ jpeg_read_header(&dinfo, TRUE);
+
+ dinfo.quantize_colors = (boolean)FALSE;
+ dinfo.out_color_space = JCS_RGB;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
new file mode 100644
index 000000000000..562f1157038f
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-fl_open_display.patch
@@ -0,0 +1,10 @@
+--- a/src/Fl_x.cxx
++++ b/src/Fl_x.cxx
+@@ -2211,6 +2211,7 @@
+ static int result = -1;
+
+ if (result == -1) {
++ fl_open_display();
+ result = 0;
+ unsigned long nitems;
+ unsigned long *words = 0;
diff --git a/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch b/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch
new file mode 100644
index 000000000000..ca7607afa4fc
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-fltk-config.patch
@@ -0,0 +1,14 @@
+--- a/fltk-config.in
++++ b/fltk-config.in
+@@ -42,9 +42,8 @@
+
+ # flags for C++ compiler:
+ ARCHFLAGS="@ARCHFLAGS@"
+-CFLAGS="@CFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
+-CXXFLAGS="@CXXFLAGS@ @LARGEFILE@ @PTHREAD_FLAGS@"
+-LDFLAGS="@LDFLAGS@"
++CFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@"
++CXXFLAGS=" @LARGEFILE@ @PTHREAD_FLAGS@"
+ LDLIBS="@LIBS@"
+ OPTIM="@OPTIM@"
+ CAIROFLAGS="@CAIROFLAGS@"
diff --git a/x11-libs/fltk/files/fltk-1.3.3-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-visibility.patch
new file mode 100644
index 000000000000..491e0a18876d
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-visibility.patch
@@ -0,0 +1,22 @@
+--- a/src/Fl.cxx
++++ b/src/Fl.cxx
+@@ -928,7 +928,7 @@
+
+ ////////////////////////////////////////////////////////////////
+
+-Fl_Widget* fl_oldfocus; // kludge for Fl_Group...
++FL_EXPORT Fl_Widget* fl_oldfocus; // kludge for Fl_Group...
+
+ /**
+ Sets the widget that will receive FL_KEYBOARD events.
+--- a/FL/x.H
++++ b/FL/x.H
+@@ -114,7 +114,7 @@ FL_EXPORT Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.
+ // With Xlib / X11 fonts, fl_xfont will return the current selected font.
+ // With XFT / X11 fonts, fl_xfont will attempt to return the bitmap "core" font most
+ // similar to (usually the same as) the current XFT font.
+-class Fl_XFont_On_Demand
++class FL_EXPORT Fl_XFont_On_Demand
+ {
+ public:
+ Fl_XFont_On_Demand(XFontStruct* p = NULL) : ptr(p) { }
diff --git a/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
new file mode 100644
index 000000000000..f30105e18c06
--- /dev/null
+++ b/x11-libs/fltk/files/fltk-1.3.3-xutf8-visibility.patch
@@ -0,0 +1,165 @@
+--- a/src/xutf8/utf8Input.c
++++ b/src/xutf8/utf8Input.c
+@@ -18,6 +18,7 @@
+
+ #include <config.h>
+ #include "../Xutf8.h"
++#include "../../FL/Fl_Export.H"
+ #include <X11/X.h>
+ #include <X11/Xlib.h>
+ #include <X11/Xutil.h>
+@@ -53,7 +54,7 @@ typedef struct {
+ #include "lcUniConv/jisx0212.h"
+ #include "lcUniConv/ksc5601.h"
+
+-static int
++FL_EXPORT static int
+ XConvertEucTwToUtf8(char* buffer_return, int len) {
+ /* FIXME */
+ #if HAVE_LIBC_ICONV
+@@ -120,7 +121,7 @@ XConvertEucTwToUtf8(char* buffer_return,
+ return l;
+ }
+
+-static int
++FL_EXPORT static int
+ XConvertEucKrToUtf8(char* buffer_return, int len) {
+ int i = 0, l = 0;
+ char *buf;
+@@ -160,7 +161,7 @@ XConvertEucKrToUtf8(char* buffer_return,
+ return l;
+ }
+
+-static int
++FL_EXPORT static int
+ XConvertBig5ToUtf8(char* buffer_return, int len) {
+ int i = 0, l = 0;
+ char *buf;
+@@ -189,7 +190,7 @@ XConvertBig5ToUtf8(char* buffer_return,
+ return l;
+ }
+
+-static int
++FL_EXPORT static int
+ XConvertCp936extToUtf8(char* buffer_return, int len)
+ {
+ int i = 0, l = 0;
+@@ -226,7 +227,7 @@ XConvertCp936extToUtf8(char* buffer_retu
+ return l;
+ }
+
+-static int
++FL_EXPORT static int
+ XConvertGb2312ToUtf8(char* buffer_return, int len) {
+ int i = 0, l = 0;
+ char *buf;
+@@ -261,7 +262,7 @@ XConvertGb2312ToUtf8(char* buffer_return
+ return l;
+ }
+
+-static int
++FL_EXPORT static int
+ XConvertEucCnToUtf8(char* buffer_return, int len) {
+ int i = 0, l = 0;
+ char *buf;
+@@ -300,7 +301,7 @@ XConvertEucCnToUtf8(char* buffer_return,
+ return l;
+ }
+
+-static int
++FL_EXPORT static int
+ XConvertEucJpToUtf8(char* buffer_return, int len) {
+ int i = 0, l = 0;
+ char *buf;
+@@ -373,7 +374,7 @@ XConvertEucJpToUtf8(char* buffer_return,
+ return l;
+ }
+
+-static int
++FL_EXPORT static int
+ XConvertEucToUtf8(const char* locale,
+ char* buffer_return,
+ int len,
+@@ -408,7 +409,7 @@ XConvertEucToUtf8(const char* locale,
+ return len;
+ }
+
+-int
++FL_EXPORT int
+ XUtf8LookupString(XIC ic,
+ XKeyPressedEvent* event,
+ char* buffer_return,
+--- a/src/xutf8/utf8Utils.c
++++ b/src/xutf8/utf8Utils.c
+@@ -21,6 +21,7 @@
+ #if !defined(WIN32) && !defined(__APPLE__)
+
+ #include "../Xutf8.h"
++#include "../../FL/Fl_Export.H"
+
+ /*** NOTE : all functions are LIMITED to 24 bits Unicode values !!! ***/
+
+@@ -29,7 +30,7 @@
+ * Returns the byte length of the converted UTF-8 char
+ * Returns -1 if the UTF-8 string is not valid
+ */
+-int
++FL_EXPORT int
+ XConvertUtf8ToUcs(const unsigned char *buf,
+ int len,
+ unsigned int *ucs) {
+@@ -137,7 +138,7 @@ XConvertUcsToUtf8(unsigned int ucs,
+ * returns the byte length of the first UTF-8 char
+ * (returns -1 if not valid)
+ */
+-int
++FL_EXPORT int
+ XUtf8CharByteLen(const unsigned char *buf,
+ int len) {
+ unsigned int ucs;
+@@ -165,7 +166,7 @@ XCountUtf8Char(const unsigned char *buf
+ /*
+ * Same as XConvertUtf8ToUcs but no sanity check is done.
+ */
+-int
++FL_EXPORT int
+ XFastConvertUtf8ToUcs(const unsigned char *buf,
+ int len,
+ unsigned int *ucs) {
+--- a/src/xutf8/utf8Wrap.c
++++ b/src/xutf8/utf8Wrap.c
+@@ -20,6 +20,7 @@
+ #if !defined(WIN32) && !defined(__APPLE__)
+
+ #include "../Xutf8.h"
++#include "../../FL/Fl_Export.H"
+ #include <X11/Xlib.h>
+ #include <ctype.h>
+ #include <stdlib.h>
+@@ -705,7 +706,7 @@ XUtf8_measure_extents(
+ /*****************************************************************************/
+ /** returns the pixel width of a UTF-8 string **/
+ /*****************************************************************************/
+-int
++FL_EXPORT int
+ XUtf8TextWidth(XUtf8FontStruct *font_set,
+ const char *string,
+ int num_bytes) {
+@@ -815,7 +816,7 @@ XUtf8TextWidth(XUtf8FontStruct *font_se
+ /*****************************************************************************/
+ /** get the X font and glyph ID of a UCS char **/
+ /*****************************************************************************/
+-int
++FL_EXPORT int
+ XGetUtf8FontAndGlyph(XUtf8FontStruct *font_set,
+ unsigned int ucs,
+ XFontStruct **fnt,
+@@ -886,7 +887,7 @@ XGetUtf8FontAndGlyph(XUtf8FontStruct *f
+ /*****************************************************************************/
+ /** returns the pixel width of a UCS char **/
+ /*****************************************************************************/
+-int
++FL_EXPORT int
+ XUtf8UcsWidth(XUtf8FontStruct *font_set,
+ unsigned int ucs) {
+
diff --git a/x11-libs/fltk/fltk-1.3.2.ebuild b/x11-libs/fltk/fltk-1.3.2.ebuild
new file mode 100644
index 000000000000..19d8ac5db179
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.2.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils fdo-mime flag-o-matic versionator
+
+MY_P=${P/_}
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+SRC_URI="http://fltk.org/pub/${PN}/${PV/_}/${P/_}-source.tar.gz"
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft +xinerama"
+
+RDEPEND="
+ >=media-libs/libpng-1.2:0
+ virtual/jpeg:0
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ cairo? ( x11-libs/cairo )
+ opengl? ( virtual/opengl )
+ xinerama? ( x11-libs/libXinerama )
+ xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ doc? (
+ app-doc/doxygen
+ pdf? ( dev-texlive/texlive-latex )
+ )
+ xinerama? ( x11-proto/xineramaproto )"
+
+INCDIR=${EPREFIX}/usr/include/fltk-${SLOT}
+LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk-${SLOT}
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm -rf zlib jpeg png || die
+ epatch \
+ "${FILESDIR}"/${PN}-1.3.1-as-needed.patch \
+ "${FILESDIR}"/${PN}-1.3.2-desktop.patch \
+ "${FILESDIR}"/${PN}-1.3.0-share.patch \
+ "${FILESDIR}"/${PN}-1.3.0-conf-tests.patch
+ sed \
+ -e 's:@HLINKS@::g' -i FL/Makefile.in || die
+ sed -i \
+ -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
+ -e '/^LDFLAGS=/d' \
+ "${S}/fltk-config.in" || die
+ # some fixes introduced because slotting
+ sed -i \
+ -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
+ src/Makefile || die
+ # docs in proper docdir
+ sed -i \
+ -e "/^docdir/s:fltk:${PF}/html:" \
+ -e "/SILENT:/d" \
+ makeinclude.in || die
+ sed -e "s/7/$(get_version_component_range 3)/" \
+ "${FILESDIR}"/FLTKConfig.cmake > CMake/FLTKConfig.cmake
+ sed -e 's:-Os::g' -i configure.in || die
+ use prefix && append-ldflags -Wl,-rpath -Wl,"${LIBDIR}"
+ eautoconf
+}
+
+src_configure() {
+ econf \
+ --includedir=${INCDIR}\
+ --libdir=${LIBDIR} \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --enable-largefile \
+ --enable-shared \
+ --enable-xdbe \
+ --disable-localjpeg \
+ --disable-localpng \
+ --disable-localzlib \
+ $(use_enable debug) \
+ $(use_enable cairo) \
+ $(use_enable opengl gl) \
+ $(use_enable threads) \
+ $(use_enable xft) \
+ $(use_enable xinerama)
+}
+
+src_compile() {
+ default
+ if use doc; then
+ cd "${S}"/documentation
+ emake html
+ if use pdf; then
+ emake pdf
+ fi
+ fi
+ if use games; then
+ cd "${S}"/test
+ emake blocks checkers sudoku
+ fi
+}
+
+src_install() {
+ default
+ emake -C fluid \
+ DESTDIR="${D}" install-linux
+ if use doc; then
+ emake -C documentation \
+ DESTDIR="${D}" install
+ fi
+ local apps="fluid"
+ if use games; then
+ emake -C test \
+ DESTDIR="${D}" install-linux
+ emake -C documentation \
+ DESTDIR="${D}" install-linux
+ apps="${apps} sudoku blocks checkers"
+ fi
+ for app in ${apps}; do
+ dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ /usr/share/pixmaps/${app}.png
+ done
+ dodoc CHANGES README CREDITS ANNOUNCEMENT
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins test/*.{h,cxx,fl} test/demo.menu
+ fi
+
+ insinto /usr/share/cmake/Modules
+ doins CMake/FLTK*.cmake
+
+ echo "LDPATH=${LIBDIR}" > 99fltk-${SLOT}
+ echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk-${SLOT}
+ doenvd 99fltk-${SLOT}
+
+ if ! use static-libs; then
+ rm "${ED}"/usr/lib*/fltk-1/*.a || die
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/fltk-1.3.3-r3.ebuild b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
new file mode 100644
index 000000000000..a046f82668ad
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.3-r3.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils fdo-mime flag-o-matic
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+SRC_URI="http://fltk.org/pub/${PN}/${PV}/${P}-source.tar.gz"
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft +xinerama"
+
+RDEPEND="
+ >=media-libs/libpng-1.2:0
+ virtual/jpeg:0
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ cairo? ( x11-libs/cairo )
+ opengl? ( virtual/opengl )
+ xinerama? ( x11-libs/libXinerama )
+ xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ doc? (
+ app-doc/doxygen
+ pdf? (
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+ )
+ xinerama? ( x11-proto/xineramaproto )"
+
+FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+
+src_prepare() {
+ rm -rf zlib jpeg png || die
+ epatch \
+ "${FILESDIR}"/${PN}-1.3.2-desktop.patch \
+ "${FILESDIR}"/${PN}-1.3.0-share.patch \
+ "${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
+ "${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
+ "${FILESDIR}"/${PN}-1.3.3-visibility.patch \
+ "${FILESDIR}"/${PN}-1.3.3-fl_open_display.patch \
+ "${FILESDIR}"/${PN}-1.3.3-fltk-config.patch \
+ "${FILESDIR}"/${PN}-1.3.3-xutf8-visibility.patch
+
+ sed -i \
+ -e 's:@HLINKS@::g' FL/Makefile.in || die
+ # some fixes introduced because slotting
+ sed -i \
+ -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
+ src/Makefile || die
+ # docs in proper docdir
+ sed -i \
+ -e "/^docdir/s:fltk:${PF}/html:" \
+ -e "/SILENT:/d" \
+ makeinclude.in || die
+ sed -e "s/7/${PV}/" \
+ < "${FILESDIR}"/FLTKConfig.cmake \
+ > CMake/FLTKConfig.cmake || die
+ sed -e 's:-Os::g' -i configure.in || die
+
+ use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+ # also in Makefile:config.guess config.sub:
+ cp misc/config.{guess,sub} . || die
+
+ eautoconf
+}
+
+src_configure() {
+ econf \
+ --includedir=${FLTK_INCDIR}\
+ --libdir=${FLTK_LIBDIR} \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --enable-largefile \
+ --enable-shared \
+ --enable-xdbe \
+ --disable-localjpeg \
+ --disable-localpng \
+ --disable-localzlib \
+ $(use_enable debug) \
+ $(use_enable cairo) \
+ $(use_enable opengl gl) \
+ $(use_enable threads) \
+ $(use_enable xft) \
+ $(use_enable xinerama)
+}
+
+src_compile() {
+ default
+ if use doc; then
+ emake -C documentation html
+ if use pdf; then
+ emake -C documentation pdf
+ fi
+ fi
+ if use games; then
+ emake -C test blocks checkers sudoku
+ fi
+}
+
+src_test() {
+ emake -C test
+}
+
+src_install() {
+ default
+
+ emake -C fluid \
+ DESTDIR="${D}" install-linux
+ if use doc; then
+ emake -C documentation \
+ DESTDIR="${D}" install
+ fi
+
+ local apps="fluid"
+ if use games; then
+ emake -C test \
+ DESTDIR="${D}" install-linux
+ emake -C documentation \
+ DESTDIR="${D}" install-linux
+ apps+=" sudoku blocks checkers"
+ fi
+
+ for app in ${apps}; do
+ dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ /usr/share/pixmaps/${app}.png
+ done
+
+ dodoc CHANGES README CREDITS ANNOUNCEMENT
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins test/*.{h,cxx,fl} test/demo.menu
+ fi
+
+ insinto /usr/share/cmake/Modules
+ doins CMake/FLTK*.cmake
+
+ echo "LDPATH=${FLTK_LIBDIR}" > 99fltk
+ echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk
+ doenvd 99fltk
+
+ # FIXME: This is bad, but building only shared libraries is hardly supported
+ # FIXME: The executables in test/ are linking statically against libfltk
+ if ! use static-libs; then
+ rm "${ED}"/usr/lib*/fltk/*.a || die
+ fi
+
+ prune_libtool_files
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/fltk-1.3.9999.ebuild b/x11-libs/fltk/fltk-1.3.9999.ebuild
new file mode 100644
index 000000000000..ba25ae8969a7
--- /dev/null
+++ b/x11-libs/fltk/fltk-1.3.9999.ebuild
@@ -0,0 +1,173 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils fdo-mime flag-o-matic subversion
+
+DESCRIPTION="C++ user interface toolkit for X and OpenGL"
+HOMEPAGE="http://www.fltk.org/"
+ESVN_REPO_URI="http://seriss.com/public/fltk/fltk/branches/branch-1.3/"
+ESVN_USER=""
+ESVN_PASSWORD=""
+
+SLOT="1"
+LICENSE="FLTK LGPL-2"
+KEYWORDS=""
+IUSE="cairo debug doc examples games +opengl pdf static-libs +threads +xft +xinerama"
+
+RDEPEND="
+ >=media-libs/libpng-1.2:0
+ virtual/jpeg:0
+ sys-libs/zlib
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libXext
+ x11-libs/libXt
+ cairo? ( x11-libs/cairo )
+ opengl? ( virtual/opengl )
+ xinerama? ( x11-libs/libXinerama )
+ xft? ( x11-libs/libXft )"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ doc? (
+ app-doc/doxygen
+ pdf? (
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+ )
+ xinerama? ( x11-proto/xineramaproto )"
+
+FLTK_INCDIR=${EPREFIX}/usr/include/fltk
+FLTK_LIBDIR=${EPREFIX}/usr/$(get_libdir)/fltk
+
+src_prepare() {
+ rm -rf zlib jpeg png || die
+ epatch \
+ "${FILESDIR}"/${PN}-1.3.2-desktop.patch \
+ "${FILESDIR}"/${PN}-1.3.0-share.patch \
+ "${FILESDIR}"/${PN}-1.3.2-conf-tests.patch \
+ "${FILESDIR}"/${PN}-1.3.2-jpeg-9a.patch \
+ "${FILESDIR}"/${PN}-1.3.3-visibility.patch
+
+ sed -i \
+ -e 's:@HLINKS@::g' FL/Makefile.in || die
+ sed -i \
+ -e '/C\(XX\)\?FLAGS=/s:@C\(XX\)\?FLAGS@::' \
+ -e '/^LDFLAGS=/d' \
+ "${S}/fltk-config.in" || die
+ # some fixes introduced because slotting
+ sed -i \
+ -e '/RANLIB/s:$(libdir)/\(.*LIBNAME)\):$(libdir)/`basename \1`:g' \
+ src/Makefile || die
+ # docs in proper docdir
+ sed -i \
+ -e "/^docdir/s:fltk:${PF}/html:" \
+ -e "/SILENT:/d" \
+ makeinclude.in || die
+ sed -e "s/7/${PV}/" \
+ < "${FILESDIR}"/FLTKConfig.cmake \
+ > CMake/FLTKConfig.cmake || die
+ sed -e 's:-Os::g' -i configure.in || die
+
+ use prefix && append-ldflags -Wl,-rpath -Wl,"${FLTK_LIBDIR}"
+
+ # also in Makefile:config.guess config.sub:
+ cp misc/config.{guess,sub} . || die
+
+ eautoconf
+}
+
+src_configure() {
+ econf \
+ --includedir=${FLTK_INCDIR}\
+ --libdir=${FLTK_LIBDIR} \
+ --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
+ --enable-largefile \
+ --enable-shared \
+ --enable-xdbe \
+ --disable-localjpeg \
+ --disable-localpng \
+ --disable-localzlib \
+ $(use_enable debug) \
+ $(use_enable cairo) \
+ $(use_enable opengl gl) \
+ $(use_enable threads) \
+ $(use_enable xft) \
+ $(use_enable xinerama)
+}
+
+src_compile() {
+ default
+ if use doc; then
+ emake -C documentation html
+ if use pdf; then
+ emake -C documentation pdf
+ fi
+ fi
+ if use games; then
+ emake -C test blocks checkers sudoku
+ fi
+}
+
+src_test() {
+ emake -C test
+}
+
+src_install() {
+ default
+
+ emake -C fluid \
+ DESTDIR="${D}" install-linux
+ if use doc; then
+ emake -C documentation \
+ DESTDIR="${D}" install
+ fi
+
+ local apps="fluid"
+ if use games; then
+ emake -C test \
+ DESTDIR="${D}" install-linux
+ emake -C documentation \
+ DESTDIR="${D}" install-linux
+ apps+=" sudoku blocks checkers"
+ fi
+
+ for app in ${apps}; do
+ dosym /usr/share/icons/hicolor/32x32/apps/${app}.png \
+ /usr/share/pixmaps/${app}.png
+ done
+
+ dodoc CHANGES README CREDITS ANNOUNCEMENT
+
+ if use examples; then
+ insinto /usr/share/doc/${PF}/examples
+ doins test/*.{h,cxx,fl} test/demo.menu
+ fi
+
+ insinto /usr/share/cmake/Modules
+ doins CMake/FLTK*.cmake
+
+ echo "LDPATH=${FLTK_LIBDIR}" > 99fltk
+ echo "FLTK_DOCDIR=${EPREFIX}/usr/share/doc/${PF}/html" >> 99fltk
+ doenvd 99fltk
+
+ # FIXME: This is bad, but building only shared libraries is hardly supported
+ # FIXME: The executables in test/ are linking statically against libfltk
+ if ! use static-libs; then
+ rm "${ED}"/usr/lib*/fltk/*.a || die
+ fi
+
+ prune_libtool_files
+}
+
+pkg_postinst() {
+ fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_desktop_database_update
+}
diff --git a/x11-libs/fltk/metadata.xml b/x11-libs/fltk/metadata.xml
new file mode 100644
index 000000000000..754b3e44ad58
--- /dev/null
+++ b/x11-libs/fltk/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>desktop-misc</herd>
+<longdescription>
+ The Fast Light ToolKit is a cross-platform C++ user interface
+ toolkit for X and OpenGL. FLTK (pronounced "fulltick") provides GUI
+ functionality and supports 3D graphics via OpenGL and its built-in
+ GLUT emulation. FLTK also includes a UI builder called FLUID that
+ can be used to create applications.
+</longdescription>
+<use>
+ <flag name='games'>Builds and installs some extra games</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-1.sh b/x11-libs/fox-wrapper/files/fox-wrapper-1.sh
new file mode 100644
index 000000000000..685f108e9a49
--- /dev/null
+++ b/x11-libs/fox-wrapper/files/fox-wrapper-1.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1)
+#
+# Executes the correct fox-config version, based on the value of WANT_FOX.
+# All versions of fox after 1.0.x ship with a fox-config script
+#
+#
+# Stable branches first, in descending order, then unstable branches.
+# After a new stable branch, prepend the new version and bump (or remove)
+# the last unstable branch
+#
+vers="1.4 1.2 1.5"
+bindir=/usr/bin
+
+if [ "${0##*/}" = "fox-wrapper.sh" ] ; then
+ echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2
+ exit 1
+fi
+
+if [ -z "${WANT_FOX}" ] ; then
+ echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2
+ echo " WANT_FOX=\"1.2\" fox-config $@"
+ exit 1
+fi
+
+for v in ${vers} ; do
+ eval binary_${v/./_}="fox-${v}-config"
+done
+
+#
+# Check the WANT_FOX setting
+#
+for v in ${vers} x ; do
+ if [ "${v}" = "x" ] ; then
+ echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2
+ echo " Valid values of WANT_FOX are: ${vers// /, }"
+ exit 1
+ fi
+
+ if [ "${WANT_FOX}" = "${v}" ] ; then
+ binary="binary_${v/./_}"
+ binary="${!binary}"
+ break
+ fi
+done
+
+if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then
+ echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2
+ echo "fox-wrapper: DEBUG: will execute <$binary>" >&2
+fi
+
+#
+# for further consistency
+#
+for v in ${vers} ; do
+ mybin="binary_${v/./_}"
+ if [ "${binary}" = "${!mybin}" ] ; then
+ export WANT_FOX="${v}"
+ fi
+done
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${bindir}/${binary}" ] ; then
+ echo "fox-wrapper: $binary is missing or not executable." >&2
+ echo " Please try emerging the correct version of fox, i.e.:" >&2
+ echo " emerge '=x11-libs/${binary/-config/}*'" >&2
+ exit 1
+fi
+
+"$binary" "$@"
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-2.sh b/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
new file mode 100644
index 000000000000..91d3b7b95265
--- /dev/null
+++ b/x11-libs/fox-wrapper/files/fox-wrapper-2.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1)
+#
+# Executes the correct fox-config version, based on the value of WANT_FOX.
+# All versions of fox after 1.0.x ship with a fox-config script
+#
+#
+# Stable branches first, in descending order, then unstable branches.
+# After a new stable branch, prepend the new version and bump (or remove)
+# the last unstable branch
+#
+vers="1.6 1.4 1.2 1.5"
+bindir=/usr/bin
+
+if [ "${0##*/}" = "fox-wrapper.sh" ] ; then
+ echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2
+ exit 1
+fi
+
+if [ -z "${WANT_FOX}" ] ; then
+ echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2
+ echo " WANT_FOX=\"1.2\" fox-config $@"
+ exit 1
+fi
+
+for v in ${vers} ; do
+ eval binary_${v/./_}="fox-${v}-config"
+done
+
+#
+# Check the WANT_FOX setting
+#
+for v in ${vers} x ; do
+ if [ "${v}" = "x" ] ; then
+ echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2
+ echo " Valid values of WANT_FOX are: ${vers// /, }"
+ exit 1
+ fi
+
+ if [ "${WANT_FOX}" = "${v}" ] ; then
+ binary="binary_${v/./_}"
+ binary="${!binary}"
+ break
+ fi
+done
+
+if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then
+ echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2
+ echo "fox-wrapper: DEBUG: will execute <$binary>" >&2
+fi
+
+#
+# for further consistency
+#
+for v in ${vers} ; do
+ mybin="binary_${v/./_}"
+ if [ "${binary}" = "${!mybin}" ] ; then
+ export WANT_FOX="${v}"
+ fi
+done
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${bindir}/${binary}" ] ; then
+ echo "fox-wrapper: $binary is missing or not executable." >&2
+ echo " Please try emerging the correct version of fox, i.e.:" >&2
+ echo " emerge '=x11-libs/${binary/-config/}*'" >&2
+ exit 1
+fi
+
+"$binary" "$@"
diff --git a/x11-libs/fox-wrapper/files/fox-wrapper-3.sh b/x11-libs/fox-wrapper/files/fox-wrapper-3.sh
new file mode 100644
index 000000000000..8c55634e41b9
--- /dev/null
+++ b/x11-libs/fox-wrapper/files/fox-wrapper-3.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Based on the am-wrapper.sh script (sys-devel/automake-wrapper-1-r1)
+#
+# Executes the correct fox-config version, based on the value of WANT_FOX.
+# All versions of fox after 1.0.x ship with a fox-config script
+#
+#
+# Stable branches first, in descending order, then unstable branches.
+# After a new stable branch, prepend the new version and bump (or remove)
+# the last unstable branch
+#
+vers="1.6 1.4 1.7"
+bindir=/usr/bin
+
+if [ "${0##*/}" = "fox-wrapper.sh" ] ; then
+ echo "fox-wrapper: Don't call this script directly, use fox-config instead" >&2
+ exit 1
+fi
+
+if [ -z "${WANT_FOX}" ] ; then
+ echo "fox-wrapper: Set the WANT_FOX variable to the desired version of fox, e.g.:" >&2
+ echo " WANT_FOX=\"1.6\" fox-config $@"
+ exit 1
+fi
+
+for v in ${vers} ; do
+ eval binary_${v/./_}="fox-${v}-config"
+done
+
+#
+# Check the WANT_FOX setting
+#
+for v in ${vers} x ; do
+ if [ "${v}" = "x" ] ; then
+ echo "fox-wrapper: WANT_FOX was set to an invalid version ${WANT_FOX}" >&2
+ echo " Valid values of WANT_FOX are: ${vers// /, }"
+ exit 1
+ fi
+
+ if [ "${WANT_FOX}" = "${v}" ] ; then
+ binary="binary_${v/./_}"
+ binary="${!binary}"
+ break
+ fi
+done
+
+if [ "${WANT_FOXWRAPPER_DEBUG}" ] ; then
+ echo "fox-wrapper: DEBUG: WANT_FOX is set to ${WANT_FOX}" >&2
+ echo "fox-wrapper: DEBUG: will execute <$binary>" >&2
+fi
+
+#
+# for further consistency
+#
+for v in ${vers} ; do
+ mybin="binary_${v/./_}"
+ if [ "${binary}" = "${!mybin}" ] ; then
+ export WANT_FOX="${v}"
+ fi
+done
+
+#
+# Now try to run the binary
+#
+if [ ! -x "${bindir}/${binary}" ] ; then
+ echo "fox-wrapper: $binary is missing or not executable." >&2
+ echo " Please try emerging the correct version of fox, i.e.:" >&2
+ echo " emerge '=x11-libs/${binary/-config/}*'" >&2
+ exit 1
+fi
+
+"$binary" "$@"
diff --git a/x11-libs/fox-wrapper/fox-wrapper-2.ebuild b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
new file mode 100644
index 000000000000..c3e2a10f3e46
--- /dev/null
+++ b/x11-libs/fox-wrapper/fox-wrapper-2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="wrapper for fox-config to manage multiple versions"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}
+
+src_install() {
+ exeinto /usr/lib/misc
+ newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh || die
+
+ dodir /usr/bin
+ dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
+}
diff --git a/x11-libs/fox-wrapper/fox-wrapper-3.ebuild b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
new file mode 100644
index 000000000000..504c93d6dfeb
--- /dev/null
+++ b/x11-libs/fox-wrapper/fox-wrapper-3.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="wrapper for fox-config to manage multiple versions"
+HOMEPAGE="http://www.gentoo.org/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=""
+DEPEND=""
+
+S=${WORKDIR}
+
+src_install() {
+ exeinto /usr/lib/misc
+ newexe "${FILESDIR}"/fox-wrapper-${PV}.sh fox-wrapper.sh || die
+
+ dodir /usr/bin
+ dosym ../lib/misc/fox-wrapper.sh /usr/bin/fox-config
+}
diff --git a/x11-libs/fox-wrapper/metadata.xml b/x11-libs/fox-wrapper/metadata.xml
new file mode 100644
index 000000000000..550647655b44
--- /dev/null
+++ b/x11-libs/fox-wrapper/metadata.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mabi@gentoo.org</email>
+ <name>Matti Bickel</name>
+ </maintainer>
+</pkgmetadata>
+
diff --git a/x11-libs/fox/Manifest b/x11-libs/fox/Manifest
new file mode 100644
index 000000000000..23bec2f5beeb
--- /dev/null
+++ b/x11-libs/fox/Manifest
@@ -0,0 +1,5 @@
+DIST fox-1.6.45.tar.gz 4372554 SHA256 ec2ec7042c3198f78adea25b8958027955af4e3f8371733d1ff43fe5289bc4d6 SHA512 a5fbe6b27ac8bf2b0419e670f80dec2ae39c25988193d3910b62612776e932f8a3289694a2032124394cc367415aa2e6a8820b83a61a78f6bc78b4749f0b2e72 WHIRLPOOL f447cbb19efd3d3bc2b54d4c43f5d4f03884c2b272f27a71304c0360b4a30b4f393947e8c826c1bb5e88a8b039294fbf9e5d54b33dbb184dc9815a3944e3b48a
+DIST fox-1.6.49.tar.gz 4383152 SHA256 3679ecd23064958259fbef5898aabb048d63b2dcb796de1d8801fe0b51e5a90e SHA512 cd7dd5fd26bcdde6ed69d547e2b08582f0e88b66b6f1bac9b5cd2279b543edbf5b9a63cc2ed05f1a1fd7e7309ede96404cf7a5d2d8eb8763dc0fb41d613b0ee8 WHIRLPOOL 1592d2560a7967c491dcfeda40e66a45d2811424e222c5f1e768b28c8ce147d7815f46d22006ac9809b967d0c825b7828aad206ab55bcb80cae064f646fd3608
+DIST fox-1.7.45.tar.gz 5254563 SHA256 78f2b5f609a52d21da08e693d45b8eeb9d4ceed52ad86e451ef4485f2375c829 SHA512 ec8acf0eb0b1882254f7df2abdcb87445992fc9fb8165afcc08b8dd52a718cb31953849efc7a530bd682e6265687bdf4dc9fb5c930557b9405235182894684b0 WHIRLPOOL 08808e67e0e31c7389b1d4ac097d7d707fb48a925df233021913bc80363002c0c4ce19c8630f4bd5c87ebb5bc5c010dc7f3260f415dfa5b60390c5aae316de78
+DIST fox-1.7.47.tar.gz 5271135 SHA256 7f1de8566b88b0010137ea1172168d53494d2d14bfa03fe32f7796146a31a2a3 SHA512 8802c7a21ba35b48a638fb87354da3de54c82ebdd3f931a601f55473fe1f7c16bfa2df253e8531af2058665d9b6f31adf52f6973c2d94f435cc90ac112af22ed WHIRLPOOL fbcf4540b268e95fa4d70ed335d8f499ec46e18390cdc090c98c21b4be5ff3ec576439265cfcf8b90c037fed7937c3a5f19f8544db1906cf86a3f255b8092d62
+DIST fox-1.7.49.tar.gz 5336321 SHA256 2435c56cde3ba6617c638af4f3bac39e8f4d5dd5a5c6d0805d274c7ba05c520c SHA512 da6c3478370f1e72091675e49f8458a6722eca4735bf89052b2b7ef02f4e74ee41f10c9fcc39a24a1571dd0bb1cdf779e9dea5bf15be20722ca783c9d59eb6e9 WHIRLPOOL 53ad3d34e57507702fc2ac9bd7b446021a99e3dff5b337cda090a670b06d4733abce2bbca88a7586e8af2d00f16ee84b0bd3c42f66fd6e430cc6d342bb76b1ff
diff --git a/x11-libs/fox/files/fox-1.6.40-libpng15.patch b/x11-libs/fox/files/fox-1.6.40-libpng15.patch
new file mode 100644
index 000000000000..2411226694de
--- /dev/null
+++ b/x11-libs/fox/files/fox-1.6.40-libpng15.patch
@@ -0,0 +1,32 @@
+--- src/fxpngio.cpp
++++ src/fxpngio.cpp
+@@ -75,7 +75,11 @@
+ static void user_error_fn(png_structp png_ptr,png_const_charp){
+ FXStream* store=(FXStream*)png_get_error_ptr(png_ptr);
+ store->setError(FXStreamFormat); // Flag this as a format error in FXStream
++#if (PNG_LIBPNG_VER < 10500)
+ longjmp(png_ptr->jmpbuf,1); // Bail out
++#else
++ png_longjmp(png_ptr,1); // Bail out
++#endif
+ }
+
+
+@@ -118,7 +122,7 @@
+ }
+
+ // Set error handling
+- if(setjmp(png_ptr->jmpbuf)){
++ if(setjmp(png_jmpbuf(png_ptr))){
+
+ // Free all of the memory associated with the png_ptr and info_ptr
+ png_destroy_read_struct(&png_ptr,&info_ptr,(png_infopp)NULL);
+@@ -231,7 +235,7 @@
+ }
+
+ // Set error handling.
+- if(setjmp(png_ptr->jmpbuf)){
++ if(setjmp(png_jmpbuf(png_ptr))){
+ png_destroy_write_struct(&png_ptr,&info_ptr);
+ return false;
+ }
diff --git a/x11-libs/fox/files/jpeg-9.patch b/x11-libs/fox/files/jpeg-9.patch
new file mode 100644
index 000000000000..8075f03251c1
--- /dev/null
+++ b/x11-libs/fox/files/jpeg-9.patch
@@ -0,0 +1,40 @@
+--- a/lib/fxjpegio.cpp
++++ b/lib/fxjpegio.cpp
+@@ -138,7 +138,7 @@
+ src->pub.next_input_byte=src->buffer;
+ src->pub.bytes_in_buffer=1;
+ }
+- return true;
++ return TRUE;
+ }
+
+
+@@ -216,7 +216,7 @@
+ srcinfo.src=&src.pub;
+
+ // read the header from the jpg;
+- jpeg_read_header(&srcinfo,true);
++ jpeg_read_header(&srcinfo,TRUE);
+
+ // make sure the output is RGB
+ srcinfo.out_color_space=JCS_RGB;
+@@ -279,7 +279,7 @@
+ dest->stream->save(dest->buffer,JPEG_BUFFER_SIZE);
+ dest->pub.free_in_buffer=JPEG_BUFFER_SIZE;
+ dest->pub.next_output_byte=dest->buffer;
+- return true;
++ return TRUE;
+ }
+
+
+@@ -336,8 +336,8 @@
+ dstinfo.dest=&dst.pub;
+
+ jpeg_set_defaults(&dstinfo);
+- jpeg_set_quality(&dstinfo,quality,true);
+- jpeg_start_compress(&dstinfo,true);
++ jpeg_set_quality(&dstinfo,quality,TRUE);
++ jpeg_start_compress(&dstinfo,TRUE);
+
+ // Write the jpeg data
+ pp=data;
diff --git a/x11-libs/fox/fox-1.6.45.ebuild b/x11-libs/fox/fox-1.6.45.ebuild
new file mode 100644
index 000000000000..f587f59412f6
--- /dev/null
+++ b/x11-libs/fox/fox-1.6.45.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.6"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+RDEPEND="x11-libs/libXrandr
+ x11-libs/libXcursor
+ x11-libs/fox-wrapper
+ bzip2? ( >=app-arch/bzip2-1.0.2 )
+ jpeg? ( virtual/jpeg )
+ opengl? ( virtual/glu virtual/opengl )
+ png? ( >=media-libs/libpng-1.2.5 )
+ tiff? ( >=media-libs/tiff-3.5.7 )
+ truetype? ( =media-libs/freetype-2*
+ x11-libs/libXft )
+ zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ x11-libs/libXt"
+
+src_prepare() {
+ sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
+ fox_src_prepare
+}
+
+src_configure() {
+ FOXCONF="$(use_enable bzip2 bz2lib) \
+ $(use_enable jpeg) \
+ $(use_with opengl) \
+ $(use_enable png) \
+ $(use_enable tiff) \
+ $(use_with truetype xft) \
+ $(use_enable zlib)" fox_src_configure
+}
diff --git a/x11-libs/fox/fox-1.6.49.ebuild b/x11-libs/fox/fox-1.6.49.ebuild
new file mode 100644
index 000000000000..a55818f29015
--- /dev/null
+++ b/x11-libs/fox/fox-1.6.49.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.6"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+RDEPEND="x11-libs/libXrandr
+ x11-libs/libXcursor
+ x11-libs/fox-wrapper
+ bzip2? ( >=app-arch/bzip2-1.0.2 )
+ jpeg? ( virtual/jpeg )
+ opengl? ( virtual/glu virtual/opengl )
+ png? ( >=media-libs/libpng-1.2.5 )
+ tiff? ( >=media-libs/tiff-3.5.7 )
+ truetype? ( =media-libs/freetype-2*
+ x11-libs/libXft )
+ zlib? ( >=sys-libs/zlib-1.1.4 )"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ x11-libs/libXt"
+
+src_prepare() {
+ sed -i -e 's/-lXft/-lXft -lfontconfig/' "${S}/configure.ac"
+ fox_src_prepare
+}
+
+src_configure() {
+ FOXCONF="$(use_enable bzip2 bz2lib) \
+ $(use_enable jpeg) \
+ $(use_with opengl) \
+ $(use_enable png) \
+ $(use_enable tiff) \
+ $(use_with truetype xft) \
+ $(use_enable zlib)" fox_src_configure
+}
diff --git a/x11-libs/fox/fox-1.7.45.ebuild b/x11-libs/fox/fox-1.7.45.ebuild
new file mode 100644
index 000000000000..af94a5fda255
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.45.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+# newish autoconf needed for working mmap check
+RDEPEND="x11-libs/libXrandr
+ x11-libs/libXcursor
+ x11-libs/fox-wrapper
+ >=sys-devel/autoconf-2.67
+ bzip2? ( app-arch/bzip2 )
+ jpeg? ( virtual/jpeg )
+ opengl? ( virtual/glu virtual/opengl )
+ png? ( media-libs/libpng )
+ tiff? ( media-libs/tiff )
+ truetype? ( media-libs/freetype:2
+ x11-libs/libXft )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ x11-libs/libXt"
+
+src_configure() {
+ FOXCONF="$(use_enable bzip2 bz2lib) \
+ $(use_enable jpeg) \
+ $(use_with opengl) \
+ $(use_enable png) \
+ $(use_enable tiff) \
+ $(use_with truetype xft) \
+ $(use_enable zlib)" fox_src_configure
+}
+
+src_install() {
+ fox_src_install
+ CP="${ED}/usr/bin/ControlPanel"
+ if [[ -f ${CP} ]] ; then
+ mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
+ die "Failed to install ControlPanel"
+ fi
+}
+
+pkg_postinst() {
+ fox_pkg_postinst
+
+ einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
+ einfo "with other packages."
+}
diff --git a/x11-libs/fox/fox-1.7.47.ebuild b/x11-libs/fox/fox-1.7.47.ebuild
new file mode 100644
index 000000000000..af94a5fda255
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.47.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+# newish autoconf needed for working mmap check
+RDEPEND="x11-libs/libXrandr
+ x11-libs/libXcursor
+ x11-libs/fox-wrapper
+ >=sys-devel/autoconf-2.67
+ bzip2? ( app-arch/bzip2 )
+ jpeg? ( virtual/jpeg )
+ opengl? ( virtual/glu virtual/opengl )
+ png? ( media-libs/libpng )
+ tiff? ( media-libs/tiff )
+ truetype? ( media-libs/freetype:2
+ x11-libs/libXft )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ x11-libs/libXt"
+
+src_configure() {
+ FOXCONF="$(use_enable bzip2 bz2lib) \
+ $(use_enable jpeg) \
+ $(use_with opengl) \
+ $(use_enable png) \
+ $(use_enable tiff) \
+ $(use_with truetype xft) \
+ $(use_enable zlib)" fox_src_configure
+}
+
+src_install() {
+ fox_src_install
+ CP="${ED}/usr/bin/ControlPanel"
+ if [[ -f ${CP} ]] ; then
+ mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
+ die "Failed to install ControlPanel"
+ fi
+}
+
+pkg_postinst() {
+ fox_pkg_postinst
+
+ einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
+ einfo "with other packages."
+}
diff --git a/x11-libs/fox/fox-1.7.49.ebuild b/x11-libs/fox/fox-1.7.49.ebuild
new file mode 100644
index 000000000000..ca5d2ae536b8
--- /dev/null
+++ b/x11-libs/fox/fox-1.7.49.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit fox
+
+LICENSE="LGPL-2.1"
+SLOT="1.7"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86"
+IUSE="+bzip2 +jpeg +opengl +png tiff +truetype +zlib"
+
+# newish autoconf needed for working mmap check
+RDEPEND="x11-libs/libXrandr
+ x11-libs/libXcursor
+ x11-libs/fox-wrapper
+ >=sys-devel/autoconf-2.67
+ bzip2? ( app-arch/bzip2 )
+ jpeg? ( virtual/jpeg )
+ opengl? ( virtual/glu virtual/opengl )
+ png? ( media-libs/libpng )
+ tiff? ( media-libs/tiff )
+ truetype? ( media-libs/freetype:2
+ x11-libs/libXft )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ x11-libs/libXt"
+
+src_prepare() {
+ fox_src_prepare
+ epatch "${FILESDIR}/jpeg-9.patch"
+}
+
+src_configure() {
+ FOXCONF="$(use_enable bzip2 bz2lib) \
+ $(use_enable jpeg) \
+ $(use_with opengl) \
+ $(use_enable png) \
+ $(use_enable tiff) \
+ $(use_with truetype xft) \
+ $(use_enable zlib)" fox_src_configure
+}
+
+src_install() {
+ fox_src_install
+ CP="${ED}/usr/bin/ControlPanel"
+ if [[ -f ${CP} ]] ; then
+ mv "${CP}" "${ED}/usr/bin/fox-ControlPanel-${SLOT}" || \
+ die "Failed to install ControlPanel"
+ fi
+}
+
+pkg_postinst() {
+ fox_pkg_postinst
+
+ einfo "ControlPanel has been installed to 'fox-ControlPanel-${SLOT}' to avoid conflicts"
+ einfo "with other packages."
+}
diff --git a/x11-libs/fox/metadata.xml b/x11-libs/fox/metadata.xml
new file mode 100644
index 000000000000..2d6f81e625c6
--- /dev/null
+++ b/x11-libs/fox/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>mabi@gentoo.org</email>
+ <name>Matti Bickel</name>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/fxscintilla/Manifest b/x11-libs/fxscintilla/Manifest
new file mode 100644
index 000000000000..1ab26543ac28
--- /dev/null
+++ b/x11-libs/fxscintilla/Manifest
@@ -0,0 +1 @@
+DIST FXSCINTILLA-3_3_5.tar.gz 663346 SHA256 0c18565340cab72fc551c32cb284ab025903d924267e7df2060c15508e1806a8 SHA512 e7f8d0491e8fabcaaee2e39f76e7e99e83b36c1cf5201daf354c182462827f2319a69cb1bcf8a7e8c4941c0371a41c936a9a645ee91bc6b5a0a2aa64cd095c06 WHIRLPOOL 791529acd5eb931e73aa74388447f8f791edba3fbeeb682091b2ea4a1721e11a0fe154cd87625ae722713b2bcebef4927c775caa09d444cf15e341f17b3d6daf
diff --git a/x11-libs/fxscintilla/files/1.71-fox-SLOT.patch b/x11-libs/fxscintilla/files/1.71-fox-SLOT.patch
new file mode 100644
index 000000000000..615abcee6e87
--- /dev/null
+++ b/x11-libs/fxscintilla/files/1.71-fox-SLOT.patch
@@ -0,0 +1,143 @@
+--- fxscintilla-1.71-orig/src/Makefile.am 2006-09-25 21:00:18.000000000 +0000
++++ fxscintilla-1.71/src/Makefile.am 2006-10-24 22:13:30.000000000 +0000
+@@ -17,16 +17,20 @@
+ AM_LDFLAGS = -mwindows
+ endif # MinGW32
+
+-lib_LTLIBRARIES = libfxscintilla.la
++lib_LTLIBRARIES =
+
+-libfxscintilla_la_SOURCES = \
++if HAVE_FOX_1_2
++lib_LTLIBRARIES += libfxscintilla-1.2.la
++
++libfxscintilla_1_2_la_SOURCES = \
+ PlatFOX.cxx \
+ ScintillaFOX.cxx
+
+-libfxscintilla_la_LIBADD = \
+- $(top_builddir)/scintilla/src/libscintilla.la
++libfxscintilla_1_2_la_LIBADD = \
++ $(top_builddir)/scintilla/src/libscintilla.la \
++ -L$(FOX_LIB_DIR) -lFOX-1.2
+
+-libfxscintilla_la_LDFLAGS = \
++libfxscintilla_1_2_la_LDFLAGS = \
+ -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
+
+ libfxscintilla_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
+@@ -34,16 +38,88 @@
+ ## NoLexer enabled
+ if NOLEXER
+
+-lib_LTLIBRARIES += libfxscintillanolexer.la
++lib_LTLIBRARIES += libfxscintillanolexer-1.2.la
++
++libfxscintillanolexer_1_2_la_SOURCES = \
++ PlatFOX.cxx \
++ ScintillaFOX.cxx
++
++libfxscintillanolexer_1_2_la_LIBADD = \
++ $(top_builddir)/scintilla/src/libscintillanolexer.la \
++ -L$(FOX_LIB_DIR) -lFOX-1.2
++
++libfxscintillanolexer_1_2_la_LDFLAGS = \
++ -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
++
++endif # NOLEXER
++endif # HAVE_FOX_1_2
++
++if HAVE_FOX_1_4
++lib_LTLIBRARIES += libfxscintilla-1.4.la
++
++libfxscintilla_1_4_la_SOURCES = \
++ PlatFOX.cxx \
++ ScintillaFOX.cxx
++
++libfxscintilla_1_4_la_LIBADD = \
++ $(top_builddir)/scintilla/src/libscintilla.la \
++ -L$(FOX_LIB_DIR) -lFOX-1.4
++
++libfxscintilla_1_4_la_LDFLAGS = \
++ -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
++
++libfxscintilla_1_4_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
++
++## NoLexer enabled
++if NOLEXER
++
++lib_LTLIBRARIES += libfxscintillanolexer-1.4.la
+
+-libfxscintillanolexer_la_SOURCES = \
++libfxscintillanolexer_1_4_la_SOURCES = \
+ PlatFOX.cxx \
+ ScintillaFOX.cxx
+
+-libfxscintillanolexer_la_LIBADD = $(top_builddir)/scintilla/src/libscintillanolexer.la
++libfxscintillanolexer_1_4_la_LIBADD = \
++ $(top_builddir)/scintilla/src/libscintillanolexer.la \
++ -L$(FOX_LIB_DIR) -lFOX-1.4
+
+-libfxscintillanolexer_la_LDFLAGS = \
++libfxscintillanolexer_1_4_la_LDFLAGS = \
+ -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
+
+ endif # NOLEXER
++endif # HAVE_FOX_1_4
++
++if HAVE_FOX_1_6
++lib_LTLIBRARIES += libfxscintilla-1.6.la
++
++libfxscintilla_1_6_la_SOURCES = \
++ PlatFOX.cxx \
++ ScintillaFOX.cxx
++
++libfxscintilla_1_6_la_LIBADD = \
++ $(top_builddir)/scintilla/src/libscintilla.la \
++ -L$(FOX_LIB_DIR) -lFOX-1.6
++
++libfxscintilla_1_6_la_LDFLAGS = \
++ -version-info $(LT_FXSCINTILLA_CURRENT):$(LT_FXSCINTILLA_REVISION):$(LT_FXSCINTILLA_AGE)
++
++libfxscintilla_1_6_la_CXXFLAGS = $(AM_CXXFLAGS) -DSCI_LEXER
++
++## NoLexer enabled
++if NOLEXER
++
++lib_LTLIBRARIES += libfxscintillanolexer-1.6.la
++
++libfxscintillanolexer_1_6_la_SOURCES = \
++ PlatFOX.cxx \
++ ScintillaFOX.cxx
++
++libfxscintillanolexer_1_6_la_LIBADD = \
++ $(top_builddir)/scintilla/src/libscintillanolexer.la \
++ -L$(FOX_LIB_DIR) -lFOX-1.6
+
++libfxscintillanolexer_1_6_la_LDFLAGS = \
++ -version-info $(LT_FXSCINTILLANOLEXER_CURRENT):$(LT_FXSCINTILLANOLEXER_REVISION):$(LT_FXSCINTILLANOLEXER_AGE)
++
++endif # NOLEXER
++endif # HAVE_FOX_1_6
+--- fxscintilla-1.71-orig/tests/Makefile.am 2006-09-25 21:00:18.000000000 +0000
++++ fxscintilla-1.71/tests/Makefile.am 2006-10-24 22:11:04.000000000 +0000
+@@ -1,16 +1,15 @@
+ INCLUDES = -I$(top_srcdir)/include -I$(FOX_INCLUDE_DIR)
+-LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla.la
+
+ if HAVE_FOX_1_2
+-LDADD += -lFOX-1.2
++LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.2.la -lFOX-1.2
+ endif
+
+ if HAVE_FOX_1_4
+-LDADD += -lFOX-1.4
++LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.4.la -lFOX-1.4
+ endif
+
+ if HAVE_FOX_1_6
+-LDADD += -lFOX-1.6
++LDADD = -L$(FOX_LIB_DIR) $(top_builddir)/src/libfxscintilla-1.6.la -lFOX-1.6
+ endif
+
+ AM_CXXFLAGS = $(PTHREAD_CFLAGS) -W -Wall -DFOX -DSCI_LEXER
diff --git a/x11-libs/fxscintilla/files/1.71-shared-libs.patch b/x11-libs/fxscintilla/files/1.71-shared-libs.patch
new file mode 100644
index 000000000000..a52c2a00ec39
--- /dev/null
+++ b/x11-libs/fxscintilla/files/1.71-shared-libs.patch
@@ -0,0 +1,19 @@
+--- fxscintilla-1.62-orig/configure.in 2005-01-16 11:26:34.000000000 -0500
++++ fxscintilla-1.62/configure.in 2005-01-16 11:27:40.000000000 -0500
+@@ -13,9 +13,6 @@
+ AM_CONDITIONAL(HAVE_MINGW32, test x"$HAVE_MINGW32" = xyes)
+
+ dnl Using libtool
+-if test x"$HAVE_CYGWIN" = xyes -o x"$HAVE_MINGW32" = xyes; then
+- AC_DISABLE_SHARED
+-fi
+ AM_PROG_LIBTOOL
+
+ dnl Must have a C++ compiler
+--- fxscintilla-1.62-orig/Makefile.am 2005-01-16 11:41:12.000000000 -0500
++++ fxscintilla-1.62/Makefile.am 2005-01-16 11:40:50.000000000 -0500
+@@ -1 +1,4 @@
+ SUBDIRS = scintilla include ltdl src tests .
++
++ACLOCAL_AMFLAGS = -I config
++
diff --git a/x11-libs/fxscintilla/fxscintilla-3.3.5.ebuild b/x11-libs/fxscintilla/fxscintilla-3.3.5.ebuild
new file mode 100644
index 000000000000..60a4444c2cb3
--- /dev/null
+++ b/x11-libs/fxscintilla/fxscintilla-3.3.5.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils multilib
+
+MY_PV=${PV//\./_}
+
+DESCRIPTION="A free source code editing component for the FOX-Toolkit"
+HOMEPAGE="http://www.nongnu.org/fxscintilla/"
+SRC_URI="https://github.com/yetanothergeek/fxscintilla/archive/FXSCINTILLA-${MY_PV}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="|| ( x11-libs/fox:1.6 x11-libs/fox:1.7 )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${PN}-FXSCINTILLA-${MY_PV}"
+
+src_prepare() {
+ eautoreconf
+}
+
+src_configure() {
+ econf --libdir=/usr/$(get_libdir) --enable-shared
+}
+
+src_install () {
+ emake DESTDIR="${D}" install
+
+ dodoc README ChangeLog
+ use doc && dohtml doc/*
+}
+
+pkg_postinst() {
+ elog "FXScintilla is now built only against the highest available"
+ elog "FOX-version you have installed."
+}
diff --git a/x11-libs/fxscintilla/metadata.xml b/x11-libs/fxscintilla/metadata.xml
new file mode 100644
index 000000000000..faf4bc6b9266
--- /dev/null
+++ b/x11-libs/fxscintilla/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>mabi@gentoo.org</email>
+ <name>Matti Bickel</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">yetanothergeek/fxscintilla</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
new file mode 100644
index 000000000000..3bbc8ef7816b
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -0,0 +1 @@
+DIST gdk-pixbuf-2.30.8.tar.xz 1336788 SHA256 4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be SHA512 2888cf035b70330e8d3ac87af54b69b2c990440fd59922464088d2a685e90022ad39c83d1ce1ccccfac3872b55ce9445ec4a3e9c7ab6371e20b19e20df7f261d WHIRLPOOL e7f69807ed629c5703750a91cc7a95ee2b3aa178a74c9197c20f863648436a023d140cf1274ba38369e8da3d77216bb1fcc66bae5b612ee8ee33ee4b42e11d65
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-divide-by-zero.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-divide-by-zero.patch
new file mode 100644
index 000000000000..7881e6580aca
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-divide-by-zero.patch
@@ -0,0 +1,28 @@
+From 74c418ba2e41ab9e2287420378a6192788b1fab6 Mon Sep 17 00:00:00 2001
+From: Sarita Rawat <sarita.rawat@samsung.com>
+Date: Fri, 5 Jun 2015 06:56:00 +0000
+Subject: [PATCH] Avoid a possible divide-by-zero
+
+Pointed out in
+
+https://bugzilla.gnome.org/show_bug.cgi?id=750440
+---
+ gdk-pixbuf/gdk-pixbuf-loader.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
+index 65845ed..668b703 100644
+--- a/gdk-pixbuf/gdk-pixbuf-loader.c
++++ b/gdk-pixbuf/gdk-pixbuf-loader.c
+@@ -330,7 +330,7 @@ gdk_pixbuf_loader_prepare (GdkPixbuf *pixbuf,
+ else
+ anim = gdk_pixbuf_non_anim_new (pixbuf);
+
+- if (priv->needs_scale) {
++ if (priv->needs_scale && width != 0 && height != 0) {
+ priv->animation = GDK_PIXBUF_ANIMATION (_gdk_pixbuf_scaled_anim_new (anim,
+ (double) priv->width / width,
+ (double) priv->height / height,
+--
+2.5.0
+
diff --git a/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-pixops-overflow.patch b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-pixops-overflow.patch
new file mode 100644
index 000000000000..22a3c25508ce
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/files/gdk-pixbuf-2.30.8-pixops-overflow.patch
@@ -0,0 +1,85 @@
+From ffec86ed5010c5a2be14f47b33bcf4ed3169a199 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen@redhat.com>
+Date: Mon, 13 Jul 2015 00:33:40 -0400
+Subject: [PATCH] pixops: Be more careful about integer overflow
+
+Our loader code is supposed to handle out-of-memory and overflow
+situations gracefully, reporting errors instead of aborting. But
+if you load an image at a specific size, we also execute our
+scaling code, which was not careful enough about overflow in some
+places.
+
+This commit makes the scaling code silently return if it fails to
+allocate filter tables. This is the best we can do, since
+gdk_pixbuf_scale() is not taking a GError.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=752297
+---
+ gdk-pixbuf/pixops/pixops.c | 22 +++++++++++++++++-----
+ 1 file changed, 17 insertions(+), 5 deletions(-)
+
+diff --git a/gdk-pixbuf/pixops/pixops.c b/gdk-pixbuf/pixops/pixops.c
+index 29a1c14..ce51745 100644
+--- a/gdk-pixbuf/pixops/pixops.c
++++ b/gdk-pixbuf/pixops/pixops.c
+@@ -1272,7 +1272,16 @@ make_filter_table (PixopsFilter *filter)
+ int i_offset, j_offset;
+ int n_x = filter->x.n;
+ int n_y = filter->y.n;
+- int *weights = g_new (int, SUBSAMPLE * SUBSAMPLE * n_x * n_y);
++ gsize n_weights;
++ int *weights;
++
++ n_weights = SUBSAMPLE * SUBSAMPLE * n_x * n_y;
++ if (n_weights / (SUBSAMPLE * SUBSAMPLE * n_x) != n_y)
++ return NULL; /* overflow, bail */
++
++ weights = g_try_new (int, n_weights);
++ if (!weights)
++ return NULL; /* overflow, bail */
+
+ for (i_offset=0; i_offset < SUBSAMPLE; i_offset++)
+ for (j_offset=0; j_offset < SUBSAMPLE; j_offset++)
+@@ -1347,8 +1356,11 @@ pixops_process (guchar *dest_buf,
+ if (x_step == 0 || y_step == 0)
+ return; /* overflow, bail out */
+
+- line_bufs = g_new (guchar *, filter->y.n);
+ filter_weights = make_filter_table (filter);
++ if (!filter_weights)
++ return; /* overflow, bail out */
++
++ line_bufs = g_new (guchar *, filter->y.n);
+
+ check_shift = check_size ? get_check_shift (check_size) : 0;
+
+@@ -1468,7 +1480,7 @@ tile_make_weights (PixopsFilterDimension *dim,
+ double scale)
+ {
+ int n = ceil (1 / scale + 1);
+- double *pixel_weights = g_new (double, SUBSAMPLE * n);
++ double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
+ int offset;
+ int i;
+
+@@ -1526,7 +1538,7 @@ bilinear_magnify_make_weights (PixopsFilterDimension *dim,
+ }
+
+ dim->n = n;
+- dim->weights = g_new (double, SUBSAMPLE * n);
++ dim->weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
+
+ pixel_weights = dim->weights;
+
+@@ -1617,7 +1629,7 @@ bilinear_box_make_weights (PixopsFilterDimension *dim,
+ double scale)
+ {
+ int n = ceil (1/scale + 3.0);
+- double *pixel_weights = g_new (double, SUBSAMPLE * n);
++ double *pixel_weights = g_malloc_n (sizeof (double) * SUBSAMPLE, n);
+ double w;
+ int offset, i;
+
+--
+2.5.0
+
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild
new file mode 100644
index 000000000000..1faf84bc6775
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8-r1.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gail-1000
+ !<gnome-base/librsvg-2.31.0
+ !<x11-libs/gtk+-2.21.3:2
+ !<x11-libs/gtk+-2.90.4:3
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gdk-pixbuf-query-loaders
+)
+
+src_prepare() {
+ # Upstream patches from 2.31.x
+ epatch "${FILESDIR}"/${PN}-2.30.8-divide-by-zero.patch \
+ "${FILESDIR}"/${PN}-2.30.8-pixops-overflow.patch #556314
+
+ # This will avoid polluting the pkg-config file with versioned libpng,
+ # which is causing problems with libpng14 -> libpng15 upgrade
+ # See upstream bug #667068
+ # First check that the pattern is present, to catch upstream changes on bumps,
+ # because sed doesn't return failure code if it doesn't do any replacements
+ grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
+ sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+ [[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # png always on to display icons
+ ECONF_SOURCE="${S}" \
+ gnome2_src_configure \
+ $(usex debug --enable-debug=yes "") \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k libjasper) \
+ $(use_with tiff libtiff) \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X x11) \
+ --with-libpng
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/reference/${PN}/html docs/reference/${PN}/html || die
+ fi
+}
+
+multilib_src_install() {
+ # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make sure loaders.cache belongs to gdk-pixbuf alone
+ local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+
+ multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+
+ multilib_foreach_abi gnome2_pkg_postinst
+
+ # Migration snippet for when this was handled by gtk+
+ if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+ elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+ elog "to do that you can use qfile from portage-utils:"
+ elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+ fi
+}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild
new file mode 100644
index 000000000000..4ef0c9efaf9f
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.30.8.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 multilib libtool multilib-minimal
+
+DESCRIPTION="Image loading library for GTK+"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+X debug +introspection jpeg jpeg2k tiff test"
+
+COMMON_DEPEND="
+ >=dev-libs/glib-2.37.6:2[${MULTILIB_USEDEP}]
+ >=media-libs/libpng-1.4:0=[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
+ tiff? ( >=media-libs/tiff-3.9.2:0=[${MULTILIB_USEDEP}] )
+ X? ( x11-libs/libX11[${MULTILIB_USEDEP}] )
+"
+DEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+# librsvg blocker is for the new pixbuf loader API, you lose icons otherwise
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gail-1000
+ !<gnome-base/librsvg-2.31.0
+ !<x11-libs/gtk+-2.21.3:2
+ !<x11-libs/gtk+-2.90.4:3
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r2
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gdk-pixbuf-query-loaders
+)
+
+src_prepare() {
+ # This will avoid polluting the pkg-config file with versioned libpng,
+ # which is causing problems with libpng14 -> libpng15 upgrade
+ # See upstream bug #667068
+ # First check that the pattern is present, to catch upstream changes on bumps,
+ # because sed doesn't return failure code if it doesn't do any replacements
+ grep -q 'l in libpng16' configure || die "libpng check order has changed upstream"
+ sed -e 's:l in libpng16:l in libpng libpng16:' -i configure || die
+ [[ ${CHOST} == *-solaris* ]] && append-libs intl
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # png always on to display icons
+ ECONF_SOURCE="${S}" \
+ gnome2_src_configure \
+ $(usex debug --enable-debug=yes "") \
+ $(use_with jpeg libjpeg) \
+ $(use_with jpeg2k libjasper) \
+ $(use_with tiff libtiff) \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X x11) \
+ --with-libpng
+}
+
+multilib_src_install() {
+ # Parallel install fails when no gdk-pixbuf is already installed, bug #481372
+ MAKEOPTS="${MAKEOPTS} -j1" gnome2_src_install
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make sure loaders.cache belongs to gdk-pixbuf alone
+ local cache="usr/$(get_libdir)/${PN}-2.0/2.10.0/loaders.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+
+ multilib_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ # causes segfault if set, see bug 375615
+ unset __GL_NO_DSO_FINALIZER
+
+ multilib_foreach_abi gnome2_pkg_postinst
+
+ # Migration snippet for when this was handled by gtk+
+ if [ -e "${EROOT}"usr/lib/gtk-2.0/2.*/loaders ]; then
+ elog "You need to rebuild ebuilds that installed into" "${EROOT}"usr/lib/gtk-2.0/2.*/loaders
+ elog "to do that you can use qfile from portage-utils:"
+ elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.*/loaders)"
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ rm -f "${EROOT}"usr/lib*/${PN}-2.0/2.10.0/loaders.cache
+ fi
+}
diff --git a/x11-libs/gdk-pixbuf/metadata.xml b/x11-libs/gdk-pixbuf/metadata.xml
new file mode 100644
index 000000000000..6e0e2ecb48ca
--- /dev/null
+++ b/x11-libs/gdk-pixbuf/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>gnome</herd>
+</pkgmetadata>
diff --git a/x11-libs/gksu/Manifest b/x11-libs/gksu/Manifest
new file mode 100644
index 000000000000..9bd051b352e2
--- /dev/null
+++ b/x11-libs/gksu/Manifest
@@ -0,0 +1 @@
+DIST gksu-2.0.2.tar.gz 468121 SHA256 a1de3dca039d88c195fcdc9516379439a1d699750417f1e655aa2101a955ee5a SHA512 8afde61e10c8a22bef3c8a5c2d90bd599d00ad9b71b30b2edc9c114be91ca8456e1af5c9db03fe02416424e50aa20c23eaefb2a8fd1db77aac37da7e85604f75 WHIRLPOOL 46cd5a966669b365c4c586a559dfeecac38536f4bf82964b28a01c65dda2ecb0d32842fd697ce74e80d6cad8fcc2c7ba217303be3cb16186d5e5a7509991e74c
diff --git a/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch b/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch
new file mode 100644
index 000000000000..fd711a321acf
--- /dev/null
+++ b/x11-libs/gksu/files/gksu-2.0.2-glib-2.31.patch
@@ -0,0 +1,29 @@
+From 10c7e67e11a56e2fe1acf9b085772bc995d35bc0 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 7 Apr 2012 17:57:36 -0400
+Subject: [PATCH] Fix glib includes for building with >=glib-2.31
+
+glib-2.31 and newer no longer allow most glib subheaders to be included
+directly.
+
+https://savannah.nongnu.org/bugs/index.php?36127
+---
+ nautilus-gksu/libnautilus-gksu.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/nautilus-gksu/libnautilus-gksu.c b/nautilus-gksu/libnautilus-gksu.c
+index 8e44d29..4acf3f8 100644
+--- a/nautilus-gksu/libnautilus-gksu.c
++++ b/nautilus-gksu/libnautilus-gksu.c
+@@ -5,7 +5,7 @@
+ #include <string.h>
+ #include <pthread.h>
+
+-#include <glib/gkeyfile.h>
++#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gio/gio.h>
+ #include <libnautilus-extension/nautilus-extension-types.h>
+--
+1.7.8.5
+
diff --git a/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch b/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch
new file mode 100644
index 000000000000..bc21b56c663f
--- /dev/null
+++ b/x11-libs/gksu/files/gksu-2.0.2-nautilus-dir.patch
@@ -0,0 +1,58 @@
+From d7ee2b46dad2070982b035a3136ccbb5787e9ed4 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sat, 7 Apr 2012 19:39:03 -0400
+Subject: [PATCH] Fix nautilus extensions directory for nautilus-3
+
+The gksu nautilus extension works with both nautilus-2 and nautilus-3,
+so we should not assume that the extension is always installed in
+/usr/lib/nautilus/extensions-2.0
+
+https://savannah.nongnu.org/bugs/index.php?36129
+---
+ configure.ac | 14 +++++++++++++-
+ nautilus-gksu/Makefile.am | 2 +-
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 21d33bb..d65c586 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -64,9 +64,21 @@ AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test x$use_libtool = xyes)
+
+ AC_ARG_ENABLE(nautilus-extension, [ --enable-nautilus-extension Build the nautilus extensions module [default=yes]], enable_nautilus_extension="$enableval", enable_nautilus_extension=yes)
+ AM_CONDITIONAL(ENABLE_NAUTILUS_EXTENSION, test x$enable_nautilus_extension = xyes)
++AC_ARG_WITH(nautilus-extensions-dir,
++ AS_HELP_STRING([--with-nautilus-extension-dir=DIR],
++ [Directory where nautilus extensions have to be installed (usually /usr/lib/nautilus/extensions-2.0 or -3.0)]))
+
+ if test x$enable_nautilus_extension = xyes; then
+- PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension])
++ PKG_CHECK_MODULES(NAUTILUS, [libgksu2 >= 2.0.0, libnautilus-extension])
++ if test "x$with_nautilus_extension_dir" = x; then
++ AC_MSG_CHECKING([for Nautilus extensions directory])
++ with_nautilus_extension_dir=`pkg-config --variable=extensiondir libnautilus-extension`
++ if test "x$with_nautilus_extension_dir" = x; then
++ AC_MSG_ERROR([not found. You can specify the extensions directory manually using --with-nautilus-extension-dir=DIR])
++ fi
++ AC_MSG_RESULT($with_nautilus_extension_dir)
++ fi
++ AC_SUBST(NAUTILUS_EXTENSION_DIR, [$with_nautilus_extensios_dir])
+ fi
+
+ AC_CONFIG_FILES([
+diff --git a/nautilus-gksu/Makefile.am b/nautilus-gksu/Makefile.am
+index 3a70c78..cbe4d00 100644
+--- a/nautilus-gksu/Makefile.am
++++ b/nautilus-gksu/Makefile.am
+@@ -2,7 +2,7 @@ AM_CFLAGS = -g -O2 -Wall
+ INCLUDES = ${NAUTILUS_CFLAGS}
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+
+-nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0
++nautilus_extensiondir=$(NAUTILUS_EXTENSION_DIR)
+ nautilus_extension_LTLIBRARIES = libnautilus-gksu.la
+ libnautilus_gksu_la_SOURCES = libnautilus-gksu.c
+ libnautilus_gksu_la_LDFLAGS = LDFLAGS = -module -avoid-version -no-undefined
+--
+1.7.8.5
+
diff --git a/x11-libs/gksu/gksu-2.0.2-r1.ebuild b/x11-libs/gksu/gksu-2.0.2-r1.ebuild
new file mode 100644
index 000000000000..127fe6a078e6
--- /dev/null
+++ b/x11-libs/gksu/gksu-2.0.2-r1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 fixheadtails
+
+DESCRIPTION="A gtk+ frontend for libgksu"
+HOMEPAGE="http://www.nongnu.org/gksu/"
+SRC_URI="http://people.debian.org/~kov/gksu/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="doc gnome"
+
+RDEPEND=">=x11-libs/libgksu-2.0.8
+ >=x11-libs/gtk+-2.4:2
+ >=gnome-base/gconf-2
+ gnome? (
+ >=gnome-base/nautilus-2
+ x11-terms/gnome-terminal )"
+DEPEND="${RDEPEND}
+ dev-util/intltool
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog NEWS README"
+ G2CONF="${G2CONF}
+ --disable-static
+ $(use_enable gnome nautilus-extension)"
+}
+
+src_prepare() {
+ ht_fix_file "${S}/gksu-migrate-conf.sh"
+
+ # https://savannah.nongnu.org/bugs/index.php?36127
+ epatch "${FILESDIR}/${PN}-2.0.2-glib-2.31.patch"
+
+ if use gnome ; then
+ sed 's/x-terminal-emulator/gnome-terminal/' \
+ -i gksu.desktop || die "sed 1 failed"
+
+ # Conditional patch to avoid eautoreconf
+ # https://savannah.nongnu.org/bugs/index.php?36129
+ epatch "${FILESDIR}/${PN}-2.0.2-nautilus-dir.patch"
+
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467024
+ eautoreconf
+ else
+ sed 's/dist_desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)/dist_desktop_DATA =/' \
+ -i Makefile.am Makefile.in || die "sed 2 failed"
+ fi
+
+ gnome2_src_prepare
+}
+
+src_install() {
+ gnome2_src_install
+ chmod +x "${D}/usr/share/gksu/gksu-migrate-conf.sh"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ einfo 'updating configuration'
+ "${ROOT}"/usr/share/gksu/gksu-migrate-conf.sh
+ einfo ""
+ einfo "A note on gksudo: It actually runs sudo to get it's work done"
+ einfo "However, by default, Gentoo's sudo wipes your environment."
+ einfo "This means that gksudo will fail to run any X-based programs."
+ einfo "You need to either add yourself to wheel and uncomment this line"
+ einfo "in your /etc/sudoers:"
+ einfo "Defaults:%wheel !env_reset"
+ einfo "Or remove the env_reset line entirely. This can cause security"
+ einfo "problems; if you don't trust your users, don't do this, use gksu"
+ einfo "instead."
+}
diff --git a/x11-libs/gksu/metadata.xml b/x11-libs/gksu/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/x11-libs/gksu/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>gnome</herd>
+</pkgmetadata>
diff --git a/x11-libs/gl2ps/Manifest b/x11-libs/gl2ps/Manifest
new file mode 100644
index 000000000000..4b3aa543bbb8
--- /dev/null
+++ b/x11-libs/gl2ps/Manifest
@@ -0,0 +1,3 @@
+DIST gl2ps-1.3.6.tgz 294517 SHA256 fd78ded7c4a323a23c3e75f160ca2800401b1771fd4183ca52d233cce892d589 SHA512 e86ed6df6a81506baed1afee6ecababa1f5a81187f675f39a91b7e1f34335dc741bd95af8714fb074c8b9a9a615b7e98bfaa1c3b8831518384566593fdd35270 WHIRLPOOL 87cd785e161a46b126b9a61bb56b2fc6cf3b1e47790a0e00d3a59203c4c3bda46917a57f4a9adcdb3c1a157f7388c77acac395a8d98474040a982b7667dea442
+DIST gl2ps-1.3.7.tgz 294704 SHA256 e916a35a8d35a928aa3404377b579054a5775ef1c88f0fcab4e275d6fe774ff5 SHA512 0824e4214c25f97b96f634b3e16b78bdbade42919e5a7aad09c92eae17a24b61416a25606ceaf5224c53e0d7b1190636e4f925e85eff6272381692f9ba9dcc91 WHIRLPOOL e48561330e609679ef11e1ec655c3333f7abe1a408fb8efe32a3c01b14847edfa9078ac63387e47a70381f241a629a9a84433889aaa7a8d8057dd92cf9edbbb6
+DIST gl2ps-1.3.8.tgz 296245 SHA256 2fe58dd95df06688a8c188e70b1803093ebf0797954901f4a36a403dbc301ee5 SHA512 76e90d675764196d249d87c6041088736a8b41d9b93620c6171a40362a259d50e34d5efc06e4ea17e6c147bc26b6a3a7356d95ea5e204193ef631fb48e0c0a4e WHIRLPOOL 85d93e744824f1681f562f791e07411cb5d815575847466a235e9952f2061c970cbf546e0dc6c5ed36f0261943814ce1a978f497f58b29b2a527245ad856b90b
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch b/x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch
new file mode 100644
index 000000000000..53e0fba7e493
--- /dev/null
+++ b/x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch
@@ -0,0 +1,61 @@
+--- CMakeLists.txt.orig 2011-08-14 18:15:31.000000000 +0100
++++ CMakeLists.txt 2011-11-27 05:25:50.000000000 +0000
+@@ -46,6 +46,7 @@
+
+ option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
+ option(ENABLE_PNG "Enable PNG support" ON)
++option(ENABLE_DOC "Enable documentation" OFF)
+
+ set(GL2PS_MAJOR_VERSION 1)
+ set(GL2PS_MINOR_VERSION 3)
+@@ -103,8 +104,6 @@
+ include_directories(${EXTERNAL_INCLUDES})
+
+ if(OPENGL_FOUND)
+- add_library(lib STATIC gl2ps.c gl2ps.h)
+- set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
+
+ add_library(shared SHARED gl2ps.c gl2ps.h)
+ target_link_libraries(shared ${EXTERNAL_LIBRARIES})
+@@ -116,29 +115,22 @@
+ set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
+ endif(MSVC)
+
+- install(TARGETS lib shared DESTINATION lib)
++ install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
+ endif(OPENGL_FOUND)
+
+ if(WIN32)
+ set(GL2PS_DOC .)
+ else(WIN32)
+- set(GL2PS_DOC share/doc/gl2ps)
++ set(GL2PS_DOC share/doc/gl2ps-${GL2PS_VERSION})
+ endif(WIN32)
+
+ install(FILES gl2ps.h DESTINATION include)
+ install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
++install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
+
+-if(GLUT_FOUND)
+- add_executable(gl2psTest WIN32 gl2psTest.c)
+- target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
+- add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
+- target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
+-endif(GLUT_FOUND)
+-
++if(ENABLE_DOC)
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+ add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex
+@@ -157,6 +149,7 @@
+ add_custom_target(html DEPENDS gl2ps.html)
+ endif(TTH)
+ endif(PDFLATEX_COMPILER)
++endif(ENABLE_DOC)
+
+ set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.7-cmake.patch b/x11-libs/gl2ps/files/gl2ps-1.3.7-cmake.patch
new file mode 100644
index 000000000000..5382b5b3ae73
--- /dev/null
+++ b/x11-libs/gl2ps/files/gl2ps-1.3.7-cmake.patch
@@ -0,0 +1,74 @@
+From: Sebastien Fabbro <bicatali@gentoo.org>
+
+Patch to add various enhancements to cmake:
+* use GNU standard CMAKE_INSTALL_DOCDIR
+* optional documenation building
+* optional examples building
+* do not install static libraries
+
+--- CMakeLists.txt 2012-09-02 02:07:33.000000000 -0700
++++ CMakeLists.txt 2012-09-17 13:51:58.337832078 -0700
+@@ -46,6 +46,8 @@
+
+ option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
+ option(ENABLE_PNG "Enable PNG support" ON)
++option(ENABLE_DOC "Enable documentation" OFF)
++option(ENABLE_EXAMPLES "Build and install examples" OFF)
+
+ set(GL2PS_MAJOR_VERSION 1)
+ set(GL2PS_MINOR_VERSION 3)
+@@ -103,8 +105,6 @@
+ include_directories(${EXTERNAL_INCLUDES})
+
+ if(OPENGL_FOUND)
+- add_library(lib STATIC gl2ps.c gl2ps.h)
+- set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
+
+ add_library(shared SHARED gl2ps.c gl2ps.h)
+ target_link_libraries(shared ${EXTERNAL_LIBRARIES})
+@@ -116,29 +116,32 @@
+ set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
+ endif(MSVC)
+
+- install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
++ install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
+ endif(OPENGL_FOUND)
+
+ if(WIN32)
+ set(GL2PS_DOC .)
+ else(WIN32)
+- set(GL2PS_DOC share/doc/gl2ps)
++ set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
+ endif(WIN32)
+
+ install(FILES gl2ps.h DESTINATION include)
+ install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
++install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
++
++
++if(ENABLE_EXAMPLES)
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
+-
+ if(GLUT_FOUND)
+ add_executable(gl2psTest WIN32 gl2psTest.c)
+ target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
+ add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
+ target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
+ endif(GLUT_FOUND)
++endif(ENABLE_EXAMPLES)
+
++if(ENABLE_DOC)
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+ add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex
+@@ -157,6 +160,7 @@
+ add_custom_target(html DEPENDS gl2ps.html)
+ endif(TTH)
+ endif(PDFLATEX_COMPILER)
++endif(ENABLE_DOC)
+
+ set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})
diff --git a/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch b/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch
new file mode 100644
index 000000000000..5382b5b3ae73
--- /dev/null
+++ b/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch
@@ -0,0 +1,74 @@
+From: Sebastien Fabbro <bicatali@gentoo.org>
+
+Patch to add various enhancements to cmake:
+* use GNU standard CMAKE_INSTALL_DOCDIR
+* optional documenation building
+* optional examples building
+* do not install static libraries
+
+--- CMakeLists.txt 2012-09-02 02:07:33.000000000 -0700
++++ CMakeLists.txt 2012-09-17 13:51:58.337832078 -0700
+@@ -46,6 +46,8 @@
+
+ option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
+ option(ENABLE_PNG "Enable PNG support" ON)
++option(ENABLE_DOC "Enable documentation" OFF)
++option(ENABLE_EXAMPLES "Build and install examples" OFF)
+
+ set(GL2PS_MAJOR_VERSION 1)
+ set(GL2PS_MINOR_VERSION 3)
+@@ -103,8 +105,6 @@
+ include_directories(${EXTERNAL_INCLUDES})
+
+ if(OPENGL_FOUND)
+- add_library(lib STATIC gl2ps.c gl2ps.h)
+- set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
+
+ add_library(shared SHARED gl2ps.c gl2ps.h)
+ target_link_libraries(shared ${EXTERNAL_LIBRARIES})
+@@ -116,29 +116,32 @@
+ set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
+ endif(MSVC)
+
+- install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
++ install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
+ endif(OPENGL_FOUND)
+
+ if(WIN32)
+ set(GL2PS_DOC .)
+ else(WIN32)
+- set(GL2PS_DOC share/doc/gl2ps)
++ set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
+ endif(WIN32)
+
+ install(FILES gl2ps.h DESTINATION include)
+ install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
+-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
++install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
++
++
++if(ENABLE_EXAMPLES)
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
+ install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
+-
+ if(GLUT_FOUND)
+ add_executable(gl2psTest WIN32 gl2psTest.c)
+ target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
+ add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
+ target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
+ endif(GLUT_FOUND)
++endif(ENABLE_EXAMPLES)
+
++if(ENABLE_DOC)
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+ add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex
+@@ -157,6 +160,7 @@
+ add_custom_target(html DEPENDS gl2ps.html)
+ endif(TTH)
+ endif(PDFLATEX_COMPILER)
++endif(ENABLE_DOC)
+
+ set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
+ set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})
diff --git a/x11-libs/gl2ps/gl2ps-1.3.6.ebuild b/x11-libs/gl2ps/gl2ps-1.3.6.ebuild
new file mode 100644
index 000000000000..db2d4d1846a7
--- /dev/null
+++ b/x11-libs/gl2ps/gl2ps-1.3.6.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils multilib
+
+DESCRIPTION="OpenGL to PostScript printing library"
+HOMEPAGE="http://www.geuz.org/gl2ps/"
+SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc png zlib"
+
+DEPEND="
+ media-libs/freeglut
+ x11-libs/libXmu
+ png? ( media-libs/libpng )
+ doc? (
+ dev-tex/tth
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexrecommended )
+ zlib? ( sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=( "${FILESDIR}"/${P}-CMakeLists.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_enable png PNG)
+ $(cmake-utils_use_enable zlib ZLIB)
+ $(cmake-utils_use_enable doc DOC)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
+ "${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
+ fi
+}
diff --git a/x11-libs/gl2ps/gl2ps-1.3.7.ebuild b/x11-libs/gl2ps/gl2ps-1.3.7.ebuild
new file mode 100644
index 000000000000..d5a22fbb457a
--- /dev/null
+++ b/x11-libs/gl2ps/gl2ps-1.3.7.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils multilib
+
+DESCRIPTION="OpenGL to PostScript printing library"
+HOMEPAGE="http://www.geuz.org/gl2ps/"
+SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc png zlib"
+
+RDEPEND="
+ media-libs/freeglut
+ x11-libs/libXmu
+ png? ( media-libs/libpng )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ doc? (
+ dev-tex/tth
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexrecommended )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ $(cmake-utils_use_enable png PNG)
+ $(cmake-utils_use_enable zlib ZLIB)
+ $(cmake-utils_use_enable doc DOC)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
+ "${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
+ fi
+}
diff --git a/x11-libs/gl2ps/gl2ps-1.3.8.ebuild b/x11-libs/gl2ps/gl2ps-1.3.8.ebuild
new file mode 100644
index 000000000000..0018ecdb1066
--- /dev/null
+++ b/x11-libs/gl2ps/gl2ps-1.3.8.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit cmake-utils multilib
+
+DESCRIPTION="OpenGL to PostScript printing library"
+HOMEPAGE="http://www.geuz.org/gl2ps/"
+SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="doc png zlib"
+
+RDEPEND="
+ media-libs/freeglut
+ x11-libs/libXmu
+ png? ( media-libs/libpng )
+ zlib? ( sys-libs/zlib )"
+DEPEND="${RDEPEND}
+ doc? (
+ dev-tex/tth
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexrecommended )"
+
+S=${WORKDIR}/${P}-source
+
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ $(cmake-utils_use_enable png PNG)
+ $(cmake-utils_use_enable zlib ZLIB)
+ $(cmake-utils_use_enable doc DOC)
+ )
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+ if [[ ${CHOST} == *-darwin* ]] ; then
+ install_name_tool \
+ -id "${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib \
+ "${D%/}${EPREFIX}"/usr/$(get_libdir)/libgl2ps.dylib || die
+ fi
+}
diff --git a/x11-libs/gl2ps/metadata.xml b/x11-libs/gl2ps/metadata.xml
new file mode 100644
index 000000000000..678526ea433f
--- /dev/null
+++ b/x11-libs/gl2ps/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>sci</herd>
+ <longdescription lang="en">
+ GL2PS is a C library providing high quality vector output for any
+ OpenGL application. The main difference between GL2PS and other
+ similar libraries is the use of sorting algorithms
+ capable of handling intersecting and stretched polygons, as well as
+ non manifold objects. GL2PS provides advanced smooth shading and
+ text rendering, culling of invisible primitives, mixed vector/bitmap
+ output, and much more.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/glamor/Manifest b/x11-libs/glamor/Manifest
new file mode 100644
index 000000000000..df5f4e06c41c
--- /dev/null
+++ b/x11-libs/glamor/Manifest
@@ -0,0 +1 @@
+DIST glamor-egl-0.6.0.tar.bz2 428912 SHA256 66531b56e6054eb53daa7bd57eb6358a7ead1b84f63419606e69d1092365e5c9 SHA512 aa3a88e85ae069e487c88a1839c21b0404c5a2a343a63f2c1d71ffb8d86288eb42dfcb30c8cce4c417b361417e9fae7c1cdabadc07ad40bb97c995c410dc0c1b WHIRLPOOL 54965c21eb65a73ecc7227de511b2d2e37760fefe90a9145385f4202d03286004af4a89edc5e251538e500e5d17efca0b82419d23112a4df441504747b1d8f24
diff --git a/x11-libs/glamor/files/glamor-0.6.0-glamor_egl_create_argb8888.patch b/x11-libs/glamor/files/glamor-0.6.0-glamor_egl_create_argb8888.patch
new file mode 100644
index 000000000000..b9de24177bb8
--- /dev/null
+++ b/x11-libs/glamor/files/glamor-0.6.0-glamor_egl_create_argb8888.patch
@@ -0,0 +1,31 @@
+From cccfea4454949e3e376be42bb230603848997195 Mon Sep 17 00:00:00 2001
+From: Axel Davy <axel.davy@ens.fr>
+Date: Tue, 04 Mar 2014 09:38:55 +0000
+Subject: Fix a missing MakeCurrent in glamor_egl_create_argb8888_based_texture
+
+There is a missing MakeCurrent before creating the texture
+and link it to the EGLImage.
+
+This fixes an X server crash with the piglit test
+glx-make-current-multi-process on radeonsi from current Mesa Git.
+
+Signed-off-by: Axel Davy <axel.davy@ens.fr>
+Tested-by: Michel Dänzer <michel.daenzer@amd.com>
+Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
+---
+diff --git a/src/glamor_egl.c b/src/glamor_egl.c
+index ff4c0bd..ffa95a7 100644
+--- a/src/glamor_egl.c
++++ b/src/glamor_egl.c
+@@ -252,7 +252,9 @@ glamor_egl_create_argb8888_based_texture(ScreenPtr screen,
+ gbm_bo_destroy(bo);
+ if (image == EGL_NO_IMAGE_KHR)
+ return 0;
++ glamor_egl_make_current(screen);
+ glamor_create_texture_from_image(glamor_egl, image, &texture);
++ glamor_egl_restore_context(screen);
+ glamor_egl->egl_destroy_image_khr(glamor_egl->display, image);
+
+ return texture;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/glamor/files/glamor-0.6.0-xv-add-missing-include.patch b/x11-libs/glamor/files/glamor-0.6.0-xv-add-missing-include.patch
new file mode 100644
index 000000000000..ebd5433bdbe9
--- /dev/null
+++ b/x11-libs/glamor/files/glamor-0.6.0-xv-add-missing-include.patch
@@ -0,0 +1,30 @@
+From 55257ac3ee92143d0d8339faa0272f95a792febb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?=
+ <chithanh@gentoo.org>
+Date: Tue, 11 Feb 2014 12:08:07 +0100
+Subject: [PATCH] glamor_xv: add missing include
+
+glamor_xv.c uses DamageDamageRegion but does not include xorg/damage.h. This
+causes the build to fail if 9b8217f9ef6279fff6628631d18497bed0343ef9 is not
+present in the X server.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=499442
+---
+ src/glamor_xv.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/glamor_xv.c b/src/glamor_xv.c
+index a89b4cd..b40b6e8 100644
+--- a/src/glamor_xv.c
++++ b/src/glamor_xv.c
+@@ -37,6 +37,7 @@
+ #ifdef GLAMOR_XV
+ #include "xf86xv.h"
+ #include <X11/extensions/Xv.h>
++#include <xorg/damage.h>
+ #include "fourcc.h"
+ /* Reference color space transform data */
+ typedef struct tagREF_TRANSFORM
+--
+1.8.3.2
+
diff --git a/x11-libs/glamor/glamor-0.6.0-r1.ebuild b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..453e142ff70c
--- /dev/null
+++ b/x11-libs/glamor/glamor-0.6.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DRI=always
+XORG_EAUTORECONF=yes
+XORG_MODULE=driver/
+XORG_MODULE_REBUILD=yes
+S=${WORKDIR}/${PN}-egl-${PV}
+
+inherit xorg-2 autotools-utils toolchain-funcs
+
+DESCRIPTION="OpenGL based 2D rendering acceleration library"
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="gles xv"
+
+RDEPEND=">=x11-base/xorg-server-1.10
+ >=media-libs/mesa-10[egl,gbm]
+ gles? (
+ || ( media-libs/mesa[gles2] media-libs/mesa[gles] )
+ )
+ >=x11-libs/pixman-0.21.8"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-xv-add-missing-include.patch
+ "${FILESDIR}"/${P}-glamor_egl_create_argb8888.patch
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable gles glamor-gles2)
+ $(use_enable xv)
+ )
+ xorg-2_src_configure
+}
+
+src_prepare() {
+ sed -i 's/inst_LTLIBRARIES/lib_LTLIBRARIES/' src/Makefile.am || die
+ xorg-2_src_prepare
+ # fail to load grafic driver with hardened compiler #488906
+ if gcc-specs-now ; then
+ append-ldflags -Wl,-z,lazy
+ fi
+}
+
+src_install() {
+ # workaround parallel install failure, bug #488124.
+ autotools-utils_src_install -j1
+}
diff --git a/x11-libs/glamor/glamor-0.6.0.ebuild b/x11-libs/glamor/glamor-0.6.0.ebuild
new file mode 100644
index 000000000000..f7447da96e00
--- /dev/null
+++ b/x11-libs/glamor/glamor-0.6.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DRI=always
+XORG_EAUTORECONF=yes
+XORG_MODULE=driver/
+XORG_MODULE_REBUILD=yes
+S=${WORKDIR}/${PN}-egl-${PV}
+
+inherit xorg-2 autotools-utils toolchain-funcs
+
+DESCRIPTION="OpenGL based 2D rendering acceleration library"
+SRC_URI="${XORG_BASE_INDIVIDUAL_URI}/${XORG_MODULE}${PN}-egl-${PV}.tar.bz2"
+
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
+IUSE="gles xv"
+
+RDEPEND=">=x11-base/xorg-server-1.10
+ >=media-libs/mesa-10[egl,gbm]
+ gles? (
+ || ( media-libs/mesa[gles2] media-libs/mesa[gles] )
+ )
+ >=x11-libs/pixman-0.21.8"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-xv-add-missing-include.patch
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable gles glamor-gles2)
+ $(use_enable xv)
+ )
+ xorg-2_src_configure
+}
+
+src_prepare() {
+ sed -i 's/inst_LTLIBRARIES/lib_LTLIBRARIES/' src/Makefile.am || die
+ xorg-2_src_prepare
+ # fail to load grafic driver with hardened compiler #488906
+ if gcc-specs-now ; then
+ append-ldflags -Wl,-z,lazy
+ fi
+}
+
+src_install() {
+ # workaround parallel install failure, bug #488124.
+ autotools-utils_src_install -j1
+}
diff --git a/x11-libs/glamor/metadata.xml b/x11-libs/glamor/metadata.xml
new file mode 100644
index 000000000000..a83e1d54614a
--- /dev/null
+++ b/x11-libs/glamor/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='gles'>Build glamor based on gles2</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/gnome-pty-helper/Manifest b/x11-libs/gnome-pty-helper/Manifest
new file mode 100644
index 000000000000..f27472b7ed8b
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/Manifest
@@ -0,0 +1,3 @@
+DIST vte-0.36.3.tar.xz 1013412 SHA256 54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c SHA512 9e0c4e60c5a271720d7b480c9618069752faec6c310cc2477e67cdb1c3e961f6981d39c9116716739390dc8e4bab9bf06cf6c5d7d2546062e48523f85d731c77 WHIRLPOOL 0c582f50a07b9a55e8e7b16ae371b913348e8f93fc50ff734ea04a481a5e1ca30ebf3c3781dcd20fd340f50b34cd8f516de76ca59093f3952f23b99a5b30ddca
+DIST vte-0.38.3.tar.xz 1005548 SHA256 3f3ae063207ceea9ca2abd1cf9c9f8bd2b66ca82156609f31f3554288c0c2bf4 SHA512 f8a28be524dcd4a6a5dbdd83655eaea0e41ce20e642130c1db8a1bbb29b71ff2421972cb630322a6e443a4aae21e2cc9350d7b06264bf3a1b7b7f793d3818164 WHIRLPOOL 4f67b4f6060b4178d8dde717577ae534fe68f436ce6d3f10e914c40bad44ce01c48f135c600b3d85c4f78a6577af0652bffa0b7e877ff2dc22b9996c9da00d76
+DIST vte-0.40.2.tar.xz 923852 SHA256 9b68fbc16b27f2d79e6271f2b0708808594ac5acf979d0fccea118608199fd2d SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2 WHIRLPOOL 2499e01c2b0d38645b61d4c0a1814d7a3196df6d300577380f1e622c06a974a4cd0d9799fff35f1b0680603aa3a0be38730991ace83df90bfb265009873c5858
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
new file mode 100644
index 000000000000..e3d2c44652c0
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.36.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="vte"
+
+inherit gnome2
+
+DESCRIPTION="GNOME Setuid helper for opening ptys"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+# gnome-pty-helper is inside vte
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+hardened"
+
+# gnome-pty-helper was spit out with 0.27.90
+RDEPEND="!<x11-libs/vte-0.27.90"
+DEPEND=""
+
+S="${WORKDIR}/vte-${PV}/gnome-pty-helper"
+
+src_prepare() {
+ # As recommended by upstream (/usr/libexec/$PN is a setgid binary)
+ if use hardened; then
+ export SUID_CFLAGS="-fPIE ${SUID_CFLAGS}"
+ export SUID_LDFLAGS="-pie ${SUID_LDFLAGS}"
+ fi
+ gnome2_src_prepare
+}
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
new file mode 100644
index 000000000000..49ecda521c6b
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.38.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="vte"
+
+inherit gnome2
+
+DESCRIPTION="GNOME Setuid helper for opening ptys"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+# gnome-pty-helper is inside vte
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+hardened"
+
+# gnome-pty-helper was spit out with 0.27.90
+RDEPEND="!<x11-libs/vte-0.27.90"
+DEPEND=""
+
+S="${WORKDIR}/vte-${PV}/gnome-pty-helper"
+
+src_prepare() {
+ # As recommended by upstream (/usr/libexec/$PN is a setgid binary)
+ if use hardened; then
+ export SUID_CFLAGS="-fPIE ${SUID_CFLAGS}"
+ export SUID_LDFLAGS="-pie ${SUID_LDFLAGS}"
+ fi
+ gnome2_src_prepare
+}
diff --git a/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
new file mode 100644
index 000000000000..890ad6f4c9eb
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/gnome-pty-helper-0.40.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME_ORG_MODULE="vte"
+
+inherit gnome2
+
+DESCRIPTION="GNOME Setuid helper for opening ptys"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+# gnome-pty-helper is inside vte
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+hardened"
+
+# gnome-pty-helper was spit out with 0.27.90
+RDEPEND="!<x11-libs/vte-0.27.90"
+DEPEND=""
+
+S="${WORKDIR}/vte-${PV}/gnome-pty-helper"
+
+src_prepare() {
+ # As recommended by upstream (/usr/libexec/$PN is a setgid binary)
+ if use hardened; then
+ export SUID_CFLAGS="-fPIE ${SUID_CFLAGS}"
+ export SUID_LDFLAGS="-pie ${SUID_LDFLAGS}"
+ fi
+ gnome2_src_prepare
+}
diff --git a/x11-libs/gnome-pty-helper/metadata.xml b/x11-libs/gnome-pty-helper/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/x11-libs/gnome-pty-helper/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>gnome</herd>
+</pkgmetadata>
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
new file mode 100644
index 000000000000..8140979b7781
--- /dev/null
+++ b/x11-libs/goffice/Manifest
@@ -0,0 +1,3 @@
+DIST goffice-0.10.21.tar.xz 2336136 SHA256 be3cd0f31bb304369283fd13b441aa67705e62231db2001da191c49f724749c2 SHA512 e2363b84c9fac4a46860401e3bba3a92bc527bd0f40d593309788bd4a02bfe7cc55f49bb0587639435563b02e9729ee592069a4120482f2194eeb2c59512912f WHIRLPOOL f45ce739effe3df1f19f54f1673f0faba676b566c6677372c33a9df643422318e45463e9b85a5f9a944c7baeda4c228ba0aa8f40ff6d1a8d4c6d6ff064af0987
+DIST goffice-0.10.22.tar.xz 2347728 SHA256 0206a87a323b52a874dc54491374245f9e1c5f62e93a2ce4a02fb444a26b0e28 SHA512 e9a8a6177d3f8ac866c7e9b508ca6a92bb9ab7eec00d4472b9ad31c4c54c1e337a8b21e23dd668f1adc8d5dd0c3df8f1f115fc7c10ffda31993c262b7eccb514 WHIRLPOOL c2c9e45391e1ae5d68c48462fc361be39a6def78bbd60f111fb1d96358794332e6d9490ea220a13d7b6df213d9ca00b9335b4fa8ed79ee496f9bbafc85fcc983
+DIST goffice-0.8.17.tar.xz 1814488 SHA256 165070beb67b84580afe80a8a100b674a81d553ab791acd72ac0c655f4fadb15 SHA512 61a3063d37e2ded4d4065d261f728c862daea04090ac38abe2524089ed1ee253e0d77e501f5b3451b1e011491a8225f90fd4914f28ce2a347ecf561098e6400c WHIRLPOOL 12ac2587af25c41686797b9bd5ff93429687217cb3d14e130067685701fd0685ed1c4f9900eb34a15cfb30dcdfe9ebe9f9856a1b4eb6684555d0a9cb1ef86ff1
diff --git a/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch b/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch
new file mode 100644
index 000000000000..4691acdcd8ff
--- /dev/null
+++ b/x11-libs/goffice/files/goffice-0.8.17-no-pcre.patch
@@ -0,0 +1,219 @@
+From 00b816027e11f5fd890df07ae94d720cce106f34 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Fri, 20 Apr 2012 14:57:59 -0400
+Subject: [PATCH] Drop pcre workaround for <glib-2.15.1
+
+For unknown reason, it sometimes gets enabled even on modern systems,
+causing problems.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=670316
+---
+ configure.in | 24 +----------
+ goffice/utils/regutf8.c | 106 -----------------------------------------------
+ 2 files changed, 1 insertions(+), 129 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index fd40d53..62e299d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -93,7 +93,7 @@ PKG_PROG_PKG_CONFIG
+
+ dnl *****************************
+ goffice_reqs="
+- glib-2.0 >= 2.8.0
++ glib-2.0 >= 2.16.0
+ gobject-2.0 >= 2.16.0
+ gmodule-2.0 >= 2.16.0
+ gio-2.0 >= 2.16.0
+@@ -492,13 +492,6 @@ SAVE_CFLAGS=$CFLAGS
+ SAVE_LIBS=$LIBS
+ CFLAGS="$CFLAGS $GOFFICE_CFLAGS"
+ LIBS="$GOFFICE_LIBS $LIBS"
+-AC_MSG_CHECKING([for G_REGEX_ERROR_STRAY_BACKSLASH])
+-AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <glib/gregex.h>]], [[GRegexError error=G_REGEX_ERROR_STRAY_BACKSLASH;]])],
+- [AC_DEFINE(HAVE_G_REGEX_ERROR_STRAY_BACKSLASH, 1, [Define if G_REGEX_ERROR_STRAY_BACKSLASH is defined])
+- glib_has_G_REGEX_ERROR_STRAY_BACKSLASH=yes
+- AC_MSG_RESULT(yes)],
+- [AC_MSG_RESULT(no)
+- glib_has_G_REGEX_ERROR_STRAY_BACKSLASH=no])
+ if test "x$goffice_with_gtk" = "xtrue" ; then
+ AC_CHECK_FUNCS(gtk_dialog_get_response_for_widget)
+ AC_CHECK_FUNCS(gtk_widget_set_tooltip_text gtk_tool_item_set_tooltip_text,
+@@ -511,21 +504,6 @@ if test $gtk_disable_deprecated = yes; then
+ CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED"
+ fi
+
+-if test "x$glib_has_G_REGEX_ERROR_STRAY_BACKSLASH" = "xno"; then
+- dnl Check for working pcre
+- AC_CHECK_HEADER(pcre.h,[], AC_MSG_ERROR([Header files for PCRE were not found]))
+- AC_CHECK_LIB(pcre,pcre_compile2,[], AC_MSG_ERROR([The PCRE library is missing or too old]))
+- AC_MSG_CHECKING([for UTF-8 support in pcre])
+- if (pcretest -C 2>&1) | grep -i "^ *UTF-8 support" >/dev/null; then
+- AC_MSG_RESULT(yes)
+- LIBS="$LIBS -lpcre"
+- EXTRA_LIBS="$EXTRA_LIBS -lpcre"
+- else
+- AC_MSG_ERROR([The installed PCRE library is not configured for UTF-8 support.])
+- fi
+-fi
+-
+-
+ AC_DEFUN([GOFFICE_CHECK_FUNC],
+ [AC_CHECK_FUNC([$1],
+ [],
+diff --git a/goffice/utils/regutf8.c b/goffice/utils/regutf8.c
+index bc4aae4..3f32dd6 100644
+--- a/goffice/utils/regutf8.c
++++ b/goffice/utils/regutf8.c
+@@ -7,9 +7,6 @@
+
+ #include <goffice/goffice-config.h>
+ #include "regutf8.h"
+-#ifndef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+-#include <pcre.h>
+-#endif
+ #include "go-glib-extras.h"
+ #include <gsf/gsf-impl-utils.h>
+ #include <glib/gi18n-lib.h>
+@@ -21,11 +18,7 @@ void
+ go_regfree (GORegexp *gor)
+ {
+ if (gor->ppcre) {
+-#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+ g_regex_unref (gor->ppcre);
+-#else
+- pcre_free (gor->ppcre);
+-#endif
+ gor->ppcre = NULL;
+ }
+ }
+@@ -70,7 +63,6 @@ go_regerror (int errcode, const GORegexp *gor, char *dst, size_t dstsize)
+ int
+ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ {
+-#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+ GError *error = NULL;
+ GRegex *r;
+ int coptions =
+@@ -119,47 +111,6 @@ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+ return 0;
+ }
+-#else
+- const char *errorptr;
+- int errorofs, errorcode;
+- pcre *r;
+- int coptions =
+- PCRE_UTF8 |
+- PCRE_NO_UTF8_CHECK |
+- ((cflags & GO_REG_ICASE) ? PCRE_CASELESS : 0) |
+- ((cflags & GO_REG_NEWLINE) ? PCRE_MULTILINE : 0);
+-
+- if (&pcre_compile2 == NULL) {
+- g_error ("libgoffice has been dynamically linked against a libpcre\n"
+- "that lacks the pcre_compile2 function. This indicates a\n"
+- "distribution dependency problem. Please report this at\n"
+- "bugzilla.gnome.org and for you distribution.");
+- }
+-
+- gor->ppcre = r = pcre_compile2 (pat, coptions,
+- &errorcode, &errorptr, &errorofs,
+- NULL);
+-
+- if (r == NULL) {
+- switch (errorcode) {
+- case 1: case 2: case 3: case 37: return GO_REG_EESCAPE;
+- case 4: case 5: return GO_REG_EBRACE;
+- case 6: return GO_REG_EBRACK;
+- case 7: case 30: return GO_REG_ECTYPE;
+- case 8: return GO_REG_ERANGE;
+- case 9: case 10: return GO_REG_BADRPT;
+- case 14: case 18: case 22: return GO_REG_EPAREN;
+- case 15: return GO_REG_ESUBREG;
+- case 19: case 20: return GO_REG_ESIZE;
+- case 21: return GO_REG_ESPACE;
+- default: return GO_REG_BADPAT;
+- }
+- } else {
+- gor->re_nsub = pcre_info (r, NULL, NULL);
+- gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+- return 0;
+- }
+-#endif
+ return 0;
+ }
+
+@@ -167,7 +118,6 @@ int
+ go_regexec (const GORegexp *gor, const char *txt,
+ size_t nmatch, GORegmatch *pmatch, int eflags)
+ {
+-#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+ int eoptions =
+ ((eflags & GO_REG_NOTBOL) ? G_REGEX_MATCH_NOTBOL : 0) |
+ ((eflags & GO_REG_NOTEOL) ? G_REGEX_MATCH_NOTEOL : 0);
+@@ -196,62 +146,6 @@ go_regexec (const GORegexp *gor, const char *txt,
+ g_match_info_free (match_info);
+
+ return matched ? GO_REG_NOERROR : GO_REG_NOMATCH;
+-#else
+- size_t txtlen = strlen (txt);
+- int eoptions =
+- ((eflags & GO_REG_NOTBOL) ? PCRE_NOTBOL : 0) |
+- ((eflags & GO_REG_NOTEOL) ? PCRE_NOTEOL : 0);
+- int res;
+- int *offsets, *allocated;
+- int offsetcount;
+- if (gor->nosub)
+- nmatch = 0;
+-
+- if (nmatch > 0) {
+- /* Paranoia. */
+- if (nmatch >= G_MAXINT / sizeof (int) / 3)
+- return GO_REG_ESPACE;
+-
+- offsetcount = nmatch * 3;
+- offsets = allocated = g_try_new (int, offsetcount);
+- if (!offsets)
+- return GO_REG_ESPACE;
+- } else {
+- offsets = allocated = NULL;
+- offsetcount = 0;
+- }
+-
+- res = pcre_exec (gor->ppcre, NULL, txt, txtlen, 0, eoptions,
+- offsets, offsetcount);
+- if (res >= 0) {
+- int i;
+-
+- if (res == 0) res = nmatch;
+-
+- for (i = 0; i < res; i++) {
+- pmatch[i].rm_so = offsets[i * 2];
+- pmatch[i].rm_eo = offsets[i * 2 + 1];
+- }
+- for (; i < (int)nmatch; i++) {
+- pmatch[i].rm_so = -1;
+- pmatch[i].rm_eo = -1;
+- }
+- g_free (allocated);
+- return GO_REG_NOERROR;
+- }
+-
+- g_free (allocated);
+- switch (res) {
+- case PCRE_ERROR_NOMATCH:
+- return GO_REG_NOMATCH;
+- case PCRE_ERROR_BADUTF8:
+- case PCRE_ERROR_BADUTF8_OFFSET:
+- /* POSIX doesn't seem to foresee this kind of error. */
+- return GO_REG_BADPAT;
+- default:
+- return GO_REG_ESPACE;
+- }
+-#endif
+ }
+
+ /* ------------------------------------------------------------------------- */
+--
+1.7.8.5
+
diff --git a/x11-libs/goffice/goffice-0.10.21.ebuild b/x11-libs/goffice/goffice-0.10.21.ebuild
new file mode 100644
index 000000000000..66d2214f0fff
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.21.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="http://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND="
+ >=app-text/libspectre-0.2.6:=
+ >=dev-libs/glib-2.38.0:2
+ dev-libs/libxslt
+ >=gnome-base/librsvg-2.22:2
+ >=gnome-extra/libgsf-1.14.24:=[introspection?]
+ >=dev-libs/libxml2-2.4.12:2
+ >=x11-libs/pango-1.24:=
+ >=x11-libs/cairo-1.10:=[svg]
+ x11-libs/libXext:=
+ x11-libs/libXrender:=
+ >=x11-libs/gdk-pixbuf-2.22:2
+ >=x11-libs/gtk+-3.8.7:3
+ introspection? (
+ >=dev-libs/gobject-introspection-1:=
+ >=gnome-extra/libgsf-1.14.23:= )
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ virtual/perl-Getopt-Long
+ virtual/perl-IO-Compress
+ virtual/perl-Compress-Raw-Zlib
+ >=dev-util/gtk-doc-am-1.12
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+"
+# eautoreconf requires:
+# gnome-base/gnome-common
+
+src_configure() {
+ gnome2_src_configure \
+ --without-lasem \
+ --with-gtk \
+ --with-config-backend=gsettings \
+ $(use_enable introspection)
+}
diff --git a/x11-libs/goffice/goffice-0.10.22.ebuild b/x11-libs/goffice/goffice-0.10.22.ebuild
new file mode 100644
index 000000000000..66d2214f0fff
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.22.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="http://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND="
+ >=app-text/libspectre-0.2.6:=
+ >=dev-libs/glib-2.38.0:2
+ dev-libs/libxslt
+ >=gnome-base/librsvg-2.22:2
+ >=gnome-extra/libgsf-1.14.24:=[introspection?]
+ >=dev-libs/libxml2-2.4.12:2
+ >=x11-libs/pango-1.24:=
+ >=x11-libs/cairo-1.10:=[svg]
+ x11-libs/libXext:=
+ x11-libs/libXrender:=
+ >=x11-libs/gdk-pixbuf-2.22:2
+ >=x11-libs/gtk+-3.8.7:3
+ introspection? (
+ >=dev-libs/gobject-introspection-1:=
+ >=gnome-extra/libgsf-1.14.23:= )
+"
+DEPEND="${RDEPEND}
+ dev-lang/perl
+ virtual/perl-Getopt-Long
+ virtual/perl-IO-Compress
+ virtual/perl-Compress-Raw-Zlib
+ >=dev-util/gtk-doc-am-1.12
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+"
+# eautoreconf requires:
+# gnome-base/gnome-common
+
+src_configure() {
+ gnome2_src_configure \
+ --without-lasem \
+ --with-gtk \
+ --with-config-backend=gsettings \
+ $(use_enable introspection)
+}
diff --git a/x11-libs/goffice/goffice-0.8.17-r1.ebuild b/x11-libs/goffice/goffice-0.8.17-r1.ebuild
new file mode 100644
index 000000000000..310d040e9bf8
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.8.17-r1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 flag-o-matic
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="http://git.gnome.org/browse/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.8"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="doc gnome"
+
+# Build fails with -gtk
+# FIXME: add lasem to tree
+RDEPEND=">=dev-libs/glib-2.16:2
+ >=gnome-extra/libgsf-1.14.9
+ >=dev-libs/libxml2-2.4.12:2
+ >=x11-libs/pango-1.8.1
+ >=x11-libs/cairo-1.2[svg]
+ x11-libs/libXext
+ x11-libs/libXrender
+ >=x11-libs/gtk+-2.16:2
+ gnome? ( >=gnome-base/gconf-2:2 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ >=dev-util/intltool-0.35
+ doc? ( >=dev-util/gtk-doc-1.11 )
+
+ dev-util/gtk-doc-am
+ gnome-base/gnome-common"
+# eautoreconf requires: gtk-doc-am, gnome-common
+
+pkg_setup() {
+ DOCS="AUTHORS BUGS ChangeLog MAINTAINERS NEWS README"
+
+ # Gsettings is still experimental
+ if use gnome; then
+ G2CONF="${G2CONF} --with-config-backend=gconf"
+ else
+ G2CONF="${G2CONF} --with-config-backend=keyfile"
+ fi
+
+ G2CONF="${G2CONF}
+ --without-lasem
+ --with-gtk"
+
+ filter-flags -ffast-math
+}
+
+src_prepare() {
+ # bug #404271, https://bugzilla.gnome.org/show_bug.cgi?id=670316
+ epatch "${FILESDIR}/${P}-no-pcre.patch"
+ eautoreconf
+ gnome2_src_prepare
+}
diff --git a/x11-libs/goffice/metadata.xml b/x11-libs/goffice/metadata.xml
new file mode 100644
index 000000000000..cbc0c75add28
--- /dev/null
+++ b/x11-libs/goffice/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>gnome-office</herd>
+ <longdescription lang="en">
+ GOffice is a library of document-centric objects and utilities building
+ on top of GLib and Gtk+ and used by software such as Gnumeric.
+ </longdescription>
+</pkgmetadata>
+
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
new file mode 100644
index 000000000000..218d6f1b2fbe
--- /dev/null
+++ b/x11-libs/goocanvas/Manifest
@@ -0,0 +1,2 @@
+DIST goocanvas-1.0.0.tar.bz2 570552 SHA256 1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644 WHIRLPOOL fb8592136bacf10d73e3aeeac9366c0614f8cd60e74a30d31e475b1ae9a1ac76c97b64837490f916733d31191a90c121ac0d60e077acef7cc61a861f5b57fde7
+DIST goocanvas-2.0.2.tar.xz 502732 SHA256 f20e5fbef8d1a2633033edbd886dd13146a1b948d1813a9c353a80a29295d1d0 SHA512 2b3014b832a5426884aa472fbfabcca171ef90305afccd312583d259517725a1839509e39b13b30c5097bf54ed9b3dfd2bf9eeca4e813a82d14cf1d5a54578ac WHIRLPOOL 714682b70d747e5db94140e5067e4df3c396332cab9f8b112141f39135758cea0a7e07405d796a70d81b95b76ce68ec17c58b317d0508dc413f2e6139dc39c87
diff --git a/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch b/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch
new file mode 100644
index 000000000000..c395c6ffd797
--- /dev/null
+++ b/x11-libs/goocanvas/files/goocanvas-1.0.0-gold.patch
@@ -0,0 +1,26 @@
+diff --git a/src/Makefile.am b/src/Makefile.am
+index b49c009..9c3316b 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ INCLUDES = \
+
+ lib_LTLIBRARIES = libgoocanvas.la
+
+-libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
++libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
+
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+diff --git a/src/Makefile.in b/src/Makefile.in
+index c4d43b2..8d555fe 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -254,7 +254,7 @@ INCLUDES = \
+ # -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ # -DGTK_DISABLE_DEPRECATED
+ lib_LTLIBRARIES = libgoocanvas.la
+-libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
++libgoocanvas_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
+ @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
+ libtool_opts = \
+ -version-info $(LT_VERSION_INFO) \
diff --git a/x11-libs/goocanvas/files/goocanvas-2.0.1-gold.patch b/x11-libs/goocanvas/files/goocanvas-2.0.1-gold.patch
new file mode 100644
index 000000000000..c37dc4efef89
--- /dev/null
+++ b/x11-libs/goocanvas/files/goocanvas-2.0.1-gold.patch
@@ -0,0 +1,30 @@
+ src/Makefile.am | 2 +-
+ src/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2052baa..e5d9693 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -12,7 +12,7 @@ INCLUDES = \
+
+ lib_LTLIBRARIES = libgoocanvas-2.0.la
+
+-libgoocanvas_2_0_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
++libgoocanvas_2_0_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
+
+ if PLATFORM_WIN32
+ no_undefined = -no-undefined
+diff --git a/src/Makefile.in b/src/Makefile.in
+index 1d927b9..15b9316 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -297,7 +297,7 @@ INCLUDES = \
+ # -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \
+ # -DGTK_DISABLE_DEPRECATED
+ lib_LTLIBRARIES = libgoocanvas-2.0.la
+-libgoocanvas_2_0_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS)
++libgoocanvas_2_0_la_LIBADD = @PACKAGE_LIBS@ $(INTLLIBS) -lm
+ @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined
+ libtool_opts = \
+ -version-info $(LT_VERSION_INFO) \
diff --git a/x11-libs/goocanvas/goocanvas-1.0.0.ebuild b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
new file mode 100644
index 000000000000..a78abe91b2ce
--- /dev/null
+++ b/x11-libs/goocanvas/goocanvas-1.0.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG=no
+GNOME2_LA_PUNT=yes
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 libtool
+
+DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
+HOMEPAGE="https://wiki.gnome.org/Projects/GooCanvas"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+ >=x11-libs/gtk+-2.12:2
+ >=dev-libs/glib-2.10:2
+ >=x11-libs/cairo-1.4
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=671766
+ epatch "${FILESDIR}"/${P}-gold.patch
+
+ # Fails to build with recent GTK+
+ sed -e "s/-D.*_DISABLE_DEPRECATED//g" \
+ -i src/Makefile.am src/Makefile.in demo/Makefile.am demo/Makefile.in \
+ || die "sed 1 failed"
+
+ sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
+ -i Makefile.am Makefile.in || die "sed 2 failed"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-rebuilds \
+ --disable-static
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use examples; then
+ insinto /usr/share/doc/${P}/examples/
+ doins demo/*.c demo/flower.png demo/toroid.png
+ fi
+}
diff --git a/x11-libs/goocanvas/goocanvas-2.0.2.ebuild b/x11-libs/goocanvas/goocanvas-2.0.2.ebuild
new file mode 100644
index 000000000000..b75bb5980ccf
--- /dev/null
+++ b/x11-libs/goocanvas/goocanvas-2.0.2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-r1
+
+DESCRIPTION="Canvas widget for GTK+ using the cairo 2D library for drawing"
+HOMEPAGE="https://wiki.gnome.org/GooCanvas"
+
+LICENSE="LGPL-2"
+SLOT="2.0"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+IUSE="examples +introspection python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# python only enables python specific binding override
+RDEPEND="
+ >=x11-libs/gtk+-3.0.0:3
+ >=dev-libs/glib-2.28.0:2
+ >=x11-libs/cairo-1.10.0
+ introspection? ( >=dev-libs/gobject-introspection-0.6.7 )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygobject-2.90.4:3[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Do not build demos
+ sed -e 's/^\(SUBDIRS =.*\)demo\(.*\)$/\1\2/' \
+ -i Makefile.am Makefile.in || die "sed failed"
+
+ # Python bindings are built/installed manually.
+ sed -e "/SUBDIRS = python/d" -i bindings/Makefile.am bindings/Makefile.in
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-rebuilds \
+ --disable-static \
+ $(use_enable introspection) \
+ --disable-python
+}
+
+src_install() {
+ gnome2_src_install
+
+ if use python; then
+ sub_install() {
+ python_moduleinto $(python -c "import gi;print gi._overridesdir")
+ python_domodule bindings/python/GooCanvas.py
+ }
+ python_foreach_impl sub_install
+ fi
+
+ if use examples; then
+ insinto "/usr/share/doc/${P}/examples/"
+ doins demo/*.[ch] demo/*.png
+ fi
+}
diff --git a/x11-libs/goocanvas/metadata.xml b/x11-libs/goocanvas/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/x11-libs/goocanvas/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>gnome</herd>
+</pkgmetadata>
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
new file mode 100644
index 000000000000..c59b726b84ed
--- /dev/null
+++ b/x11-libs/gtk+/Manifest
@@ -0,0 +1,10 @@
+DIST gtk+-1.2.10-r8-gentoo.diff.bz2 81223 SHA256 517bdadbaa0e13285b2d72a667b311219342306d4f68d838c3c1dbc5bfbf1684 SHA512 aaef9275ff6330a9fe1cbe1e40def181329d79cd33eb2b2ff5ae9cba5fa57e706716233ac7515f621d913f81343eb8244c6669e6411f7d50ca69187bf8d4fd86 WHIRLPOOL 2aacaa61e3291ff3c96a724e02a1fd250fa1574a69c730fa8635c28926c4134b780e9695e3aec3a6fd27b6e25848fcaee4075e17cd47bed2851bdcf311f19020
+DIST gtk+-1.2.10.tar.gz 2868322 SHA256 3fb843ea671c89b909fd145fa09fd2276af3312e58cbab29ed1c93b462108c34 SHA512 6a05062520954287b0e24a95169d18c216145ee79d1fa7f54222db32c8e39e011e3dc49886d3bc4de1cc1ebd71f5744e41891cde8d5c2759f637e71c390a235f WHIRLPOOL 906a78c2e2664b1cbd70fb9e64ce6ca1155b2a59c169eab986f5b4b90e937f380a5d35e2e28eb56913b0fbdfb53abeca5ef6823f92a3ab3906cd4e9f7c595b15
+DIST gtk+-2.24.25.tar.xz 13327832 SHA256 38af1020cb8ff3d10dda2c8807f11e92af9d2fa4045de61c62eedb7fbc7ea5b3 SHA512 e102eabbd86e9e697402b4d915172dd3838374b7b8a16b95369ed602228857a013fdba7b6b8d742f925ff8d340b63a90b56c1ddbd4405d8dc454144c705ac08d WHIRLPOOL b4bcf058bcc582627be35bb8ba45a933c3814f007599df59172e537fc99003f51edac7011cf36783caad4e191c622f6fa044a6ff6e0ae3f4de7635c3815807a3
+DIST gtk+-2.24.27.tar.xz 13349252 SHA256 20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4 SHA512 ffe981a41137302713a411039238604e92d41146e25ea0643857ec40388ddfe69cbb15bdc1aa8300b87ddbb4d6fbcf0054cdb7ba39634fbe4bfd1802f5bc8ac6 WHIRLPOOL 02259afb7a410fe941b9cc20e8031d61d5dd90f2ac532e3b8525b203997cfa57999286cd59e76ef152a68de35f08e8712dc4b9cd107633f2ba2433eba633197c
+DIST gtk+-2.24.28.tar.xz 13354884 SHA256 b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 SHA512 86d563645ca70c1e14afd4b38d925f496e596cbf6181f2e95310f58c2f4152aaecc559e3c513e6d405fcf48d8d413d59a9d72782216529c1280bd8e1947d7760 WHIRLPOOL b4943bb7792f962e0fc50a118f0dbce58a79678e1a98632717a2f3bda4ddd99b62ce9aed3b14f1c0912a4b53eb975991527843985f625c5a9e052db4889acfb0
+DIST gtk+-3.12.2.tar.xz 15015024 SHA256 61d74eea74231b1ea4b53084a9d6fc9917ab0e1d71b69d92cbf60a4b4fb385d0 SHA512 4a8d2f52328587d73e30f363bdbbd91322dae0198f5581a2da3ebbe96ef0a0635193d2537e8fc127dc0950a24df42862233edd3a873dcbd166dc675bae849c9e WHIRLPOOL 26328632d78f986d25e40d8773ff3cc90a0b3a5bafb4f21224504bd1c8c78995df556e8337d7b374f047bfff2bd0b9e0082ec163591f7a0a035260b8a2db2932
+DIST gtk+-3.14.13.tar.xz 15784112 SHA256 b1efcb1ef299f9b205e6f4512428315fd03484e5790f65bd3ac164e84ade90b0 SHA512 e4fcca57fe58821832ee0b542d86033a1028c19e2248929e25a8c16ef05603a93815556591bcc025995bfab1238ad4060fcdf4920ec2df22ab3175b404f3a207 WHIRLPOOL 36a77983701da6041f0762013638303d323a42487a6f6508e92dfa0571f8f13b8598a8187e9665e6eeb62e41b7c2533a1fe9d2b68f097e85599d373969d52da0
+DIST gtk+-3.14.9.tar.xz 15716588 SHA256 3be9560e6e99388d7706a168e3353ecd63fc30ec4f7f8bea23889e71ab7b6c64 SHA512 3b64142d65ec4b4e0ed709c2fac629d80b95dac03481a3d6f8e3cc6c351ac779fe172a1edee552df7b3c40287f10c97fa0e99212e5f0e6b4751e3d8efd0896e5 WHIRLPOOL bc45b3722913ebb90bff944ec724909d01e3e976d49f8bd273500de2af9de7dcedc85e24fca36226816993a10cb87f4477f4498cc67946449855b37a0790a2fa
+DIST gtk+-3.16.4.tar.xz 18235768 SHA256 1ee5dbd7a4cb81a91eaa1b7ae64ba5a3eab6a3c0a764155583ab96524590fc8e SHA512 02a021e9911054ad03adef943b0faae478903a9e1d10a584009ee84364ecdb541a27533ba11ed980bc2a6f39833490c180514efc2ca3669f7c5dc4a388f3f53d WHIRLPOOL 954c19f5478cac7b72aa3153a5fa7a876b0248d3f0cb0df02dfdc4c96d16975893e03c32988fbb2b46731a1661c4fa54fb1fc9e8a125621287eb739a3c47468b
+DIST gtk+-3.16.5.tar.xz 18263356 SHA256 b87c99d127eb962fc857c246b77a65322cdffd7dcbcf46a83bce2040e0f4bc31 SHA512 f8dd318d5d72e8c59534bf49e505de3575f7519d57398030f4c47a576c3b37e4f00fec1b5a3ba2a3769e94373504dfb6ca24b1015f1e8f8f7dca6f46114b95f8 WHIRLPOOL 9c7ca6a76bde91912043ccfb26375327628fb2206b0e613116c9b6b1f1d078cccf075690b7749d76e8ddea3e3118ecae79e49be98490db29a7a2042f843d0b97
diff --git a/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch b/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
new file mode 100644
index 000000000000..a3fd198b6904
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2-locale_fix.patch
@@ -0,0 +1,19 @@
+--- gtk/gtkrc.c.~1.40.2.17.~ 2001-07-10 20:06:35.000000000 +0200
++++ gtk/gtkrc.c 2003-03-05 16:56:10.000000000 +0100
+@@ -453,7 +453,7 @@
+
+ if (!initted)
+ {
+- char *locale = setlocale (LC_CTYPE, NULL);
++ char *locale = g_strdup (setlocale (LC_CTYPE, NULL));
+ char *p;
+
+ initted = TRUE;
+@@ -558,6 +558,7 @@
+
+ if (tmp) g_free (tmp);
+ }
++ g_free (locale);
+ }
+
+ i = 0;
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch b/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch
new file mode 100644
index 000000000000..aa295f257851
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-as-needed.patch
@@ -0,0 +1,696 @@
+--- gtk+-1.2.10/acinclude.m4.orig 2006-05-24 23:23:51.000000000 -0700
++++ gtk+-1.2.10/acinclude.m4 2006-05-24 23:23:19.000000000 -0700
+@@ -672,7 +672,7 @@
+ AC_DEFINE(HAVE_STPCPY)
+ fi
+
+- AM_LC_MESSAGES
++ gt_LC_MESSAGES
+ AM_GTK_WITH_NLS
+
+ if test "x$CATOBJEXT" != "x"; then
+--- gtk+-1.2.10/gtk.m4.orig 2006-05-24 23:32:00.000000000 -0700
++++ gtk+-1.2.10/gtk.m4 2006-05-24 23:36:16.000000000 -0700
+@@ -1,6 +1,11 @@
+ # Configure paths for GTK+
+ # Owen Taylor 97-11-3
+-
++AC_DEFUN([GTK_AC_DIVERT_BEFORE_HELP],
++[ifdef([m4_divert_text], [m4_divert_text([NOTICE],[$1])],
++ [ifdef([AC_DIVERT], [AC_DIVERT([NOTICE],[$1])],
++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++$1
++AC_DIVERT_POP()])])])
+ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
+ dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
+ dnl
+--- gtk+-1.2.10/configure.in.orig 2006-05-25 05:45:06.000000000 -0700
++++ gtk+-1.2.10/configure.in 2006-05-25 05:44:08.000000000 -0700
+@@ -1,6 +1,8 @@
++builtin(include,gtk.m4)
++
++
+ # Process this file with autoconf to produce a configure script.
+ AC_INIT(gdk/gdktypes.h)
+-
+ # In the following, there are a the following variants
+ # of GLib cflags and libs variables
+ #
+@@ -12,12 +14,11 @@
+ # glib_thread_cflags: cflags to store in gtk-config for gtk-config gthread
+ # glib_thread_libs: libs to store in gtk-config for gtk-config gthread
+
++AC_CANONICAL_TARGET
+ # Save this value here, since automake will set cflags later
+ cflags_set=${CFLAGS+set}
+
+-dnl we need to AC_DIVERT_PUSH/AC_DIVERT_POP these variable definitions so they
+-dnl are available for $ac_help expansion (don't we all *love* autoconf?)
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++GTK_AC_DIVERT_BEFORE_HELP([
+ #
+ # Making releases:
+ # GTK_MICRO_VERSION += 1;
+@@ -32,9 +33,8 @@
+ GTK_MICRO_VERSION=10
+ GTK_INTERFACE_AGE=1
+ GTK_BINARY_AGE=10
+-GTK_VERSION=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION
+-dnl
+-AC_DIVERT_POP()dnl
++GTK_VERSION="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION.$GTK_MICRO_VERSION"
++])
+
+ AC_SUBST(GTK_MAJOR_VERSION)
+ AC_SUBST(GTK_MINOR_VERSION)
+@@ -44,9 +44,9 @@
+ AC_SUBST(GTK_VERSION)
+
+ # libtool versioning
+-LT_RELEASE=$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION
++LT_RELEASE="$GTK_MAJOR_VERSION.$GTK_MINOR_VERSION"
+ LT_CURRENT=`expr $GTK_MICRO_VERSION - $GTK_INTERFACE_AGE`
+-LT_REVISION=$GTK_INTERFACE_AGE
++LT_REVISION="$GTK_INTERFACE_AGE"
+ LT_AGE=`expr $GTK_BINARY_AGE - $GTK_INTERFACE_AGE`
+ AC_SUBST(LT_RELEASE)
+ AC_SUBST(LT_CURRENT)
+@@ -54,11 +54,8 @@
+ AC_SUBST(LT_AGE)
+
+ # For automake.
+-VERSION=$GTK_VERSION
+-PACKAGE=gtk+
+-
+-# Save this value here, since automake will set cflags later
+-cflags_set=${CFLAGS+set}
++VERSION="$GTK_VERSION"
++PACKAGE="gtk+"
+
+ dnl Initialize automake stuff
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+@@ -67,42 +64,40 @@
+ AM_CONFIG_HEADER(config.h)
+
+ dnl Initialize libtool
+-AM_PROG_LIBTOOL
++AC_PROG_LIBTOOL
+
+ dnl Initialize maintainer mode
+ AM_MAINTAINER_MODE
+
+-AC_CANONICAL_HOST
+-
+ dnl figure debugging default, prior to $ac_help setup
+-dnl
+-AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)dnl
++
++GTK_AC_DIVERT_BEFORE_HELP([
+ if test `expr $GTK_MINOR_VERSION \% 2` = 1 ; then
+- debug_default=yes
++ debug_default="yes"
+ else
+- debug_default=minimum
++ debug_default="minimum"
+ fi
+-AC_DIVERT_POP()dnl
+-
++])
+ dnl declare --enable-* args and collect ac_help strings
+-AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,enable_debug=$debug_default)
++AC_ARG_ENABLE(debug, [ --enable-debug=[no/minimum/yes] turn on debugging [default=$debug_default]],,
++ [enable_debug="$debug_default"])
+ AC_ARG_ENABLE(shm, [ --enable-shm support shared memory if available [default=yes]],
+- echo $enable_shm, enable_shm="yes")
+-AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],
+- , enable_ansi=no)
++ [echo "$enable_shm"],[enable_shm="yes"])
++AC_ARG_ENABLE(ansi, [ --enable-ansi turn on strict ansi [default=no]],,[enable_ansi="no"])
+ AC_ARG_WITH(glib, [ --with-glib=DIR Use uninstalled copy of glib])
+-AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],
+- , enable_xim="yes")
+-AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback],
+- , enable_xim_inst="maybe")
+-AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,enable_rebuilds=yes)
++AC_ARG_ENABLE(xim, [ --enable-xim support XIM [default=yes]],,[enable_xim="yes"])
++AC_ARG_ENABLE(xim_inst, [ --disable-xim-inst does not use xim instantiate callback],,
++ [enable_xim_inst="maybe"])
++AC_ARG_ENABLE(rebuilds, [ --disable-rebuilds disable all source autogeneration rules],,
++ [enable_rebuilds="yes"])
+ AC_ARG_WITH(locale, [ --with-locale=LOCALE locale name you want to use ])
+-
+ AC_ARG_WITH(xinput, [ --with-xinput=[no/gxi/xfree] support XInput ])
+-AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale support [default=no]],,with_native_locale=no)
++AC_ARG_WITH(native_locale, [ --with-native-locale=[yes/no] Use native locale support [default=no]],,
++ [with_native_locale="no"])
++
+
+ if test "x$enable_debug" = "xyes"; then
+- test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
++ test "$cflags_set" = "set" || CFLAGS="$CFLAGS -g"
+ GTK_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
+ else
+ if test "x$enable_debug" = "xno"; then
+@@ -113,16 +108,14 @@
+ fi
+
+ AC_DEFINE_UNQUOTED(GTK_COMPILED_WITH_DEBUGGING, "${enable_debug}")
+-
+ # Build time sanity check...
+ AM_SANITY_CHECK
+
+ # Checks for programs.
+ AC_PROG_CC
+ AC_ISC_POSIX
+-AM_PROG_CC_STDC
++AC_PROG_CC_STDC
+ AC_PROG_INSTALL
+-AC_PROG_MAKE_SET
+
+ changequote(,)dnl
+ if test "x$GCC" = "xyes"; then
+@@ -144,7 +137,6 @@
+ fi
+ fi
+ changequote([,])dnl
+-
+ # Honor aclocal flags
+ ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+
+@@ -158,8 +150,7 @@
+ AC_CHECK_PROG(INDENT, indent, indent)
+
+ REBUILD=\#
+-if test "x$enable_rebuilds" = "xyes" && \
+- test -n "$PERL" && \
++if test "x$enable_rebuilds" = "xyes" && test -n "$PERL" && \
+ $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
+ test -n "$AWK" ; then
+ REBUILD=
+@@ -194,55 +185,58 @@
+
+ dnl Check for nl_langinfo and CODESET
+ AC_MSG_CHECKING([for nl_langinfo (CODESET)])
+-AC_TRY_COMPILE([#include <langinfo.h>],
++AC_TRY_COMPILE([#include <langinfo.h>
++ ],
+ [char *codeset = nl_langinfo (CODESET);],
+ AC_DEFINE(HAVE_CODESET,1,[Have nl_langinfo (CODESET)])
+- have_codeset=yes,
+- have_codeset=no)
++ have_codeset="yes",
++ have_codeset="no"
++)
+ AC_MSG_RESULT($have_codeset)
+
+ dnl The DU4 header files don't provide library prototypes unless
+ dnl -std1 is given to the native cc.
+ AC_MSG_CHECKING([for extra flags to get ANSI library prototypes])
+
+-gtk_save_LIBS=$LIBS
++gtk_save_LIBS="$LIBS"
+ LIBS="$LIBS -lm"
+ AC_TRY_RUN([#include <math.h>
+ int main (void) { return (log(1) != log(1.)); }],
+ AC_MSG_RESULT(none needed),
+- gtk_save_CFLAGS=$CFLAGS
++ [gtk_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -std1"
+ AC_TRY_RUN([#include <math.h>
+ int main (void) { return (log(1) != log(1.)); }],
+ AC_MSG_RESULT(-std1),
+ AC_MSG_RESULT()
+- CFLAGS=$gtk_save_CFLAGS
+- AC_MSG_WARN(
+- [No ANSI prototypes found in library. (-std1 didn't work.)]),
+- true
+- ),
++ CFLAGS="$gtk_save_CFLAGS"
++ AC_MSG_WARN([No ANSI prototypes found in library. (-std1 didn't work.)]),
++ true)],
+ AC_MSG_RESULT(none needed)
+ )
+-LIBS=$gtk_save_LIBS
++LIBS="$gtk_save_LIBS"
+
+ dnl NeXTStep cc seems to need this
+ AC_MSG_CHECKING([for extra flags for POSIX compliance])
+-AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
++AC_TRY_COMPILE([#include <dirent.h>
++ ],[DIR *dir;],
+ AC_MSG_RESULT(none needed),
+- gtk_save_CFLAGS=$CFLAGS
++ [gtk_save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS -posix"
+- AC_TRY_COMPILE([#include <dirent.h>], [DIR *dir;],
++ AC_TRY_COMPILE([#include <dirent.h>
++ ],[DIR *dir;],
+ AC_MSG_RESULT(-posix),
+ AC_MSG_RESULT()
+- CFLAGS=$gtk_save_CFLAGS
+- AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])))
++ CFLAGS="$gtk_save_CFLAGS"
++ AC_MSG_WARN([Could not determine POSIX flag. (-posix didn't work.)])]))
+
+-if test x$with_glib = xyes ; then
+- AC_MSG_ERROR([
+-*** Directory must be specified for --with-glib])
++
++
++if test "x$with_glib" = "xyes" ; then
++ AC_MSG_ERROR([*** Directory must be specified for --with-glib])
+ fi
+
+-if test x$with_glib = x ; then
++if test "x$with_glib" = "x" ; then
+ # Look for separately installed glib
+
+ AM_PATH_GLIB(1.2.8,,
+@@ -261,7 +255,7 @@
+ else
+ # Use uninstalled glib (assume they got the version right)
+
+- GLIB_CONFIG=$with_glib/glib-config
++ GLIB_CONFIG="$with_glib/glib-config"
+ if test -x $GLIB_CONFIG ; then
+ :
+ else
+@@ -277,9 +271,9 @@
+ glib_release=`$GLIB_CONFIG --version | sed 's%\\.[[0-9]]*$%%'`
+
+ # canonicalize relative paths
+- case $with_glib in
++ case "$with_glib" in
+ /*)
+- glib_dir=$with_glib
++ glib_dir="$with_glib"
+ ;;
+ *)
+ glib_dir="\$(top_builddir)/$with_glib"
+@@ -312,61 +306,56 @@
+ saved_ldflags="$LDFLAGS"
+
+ CFLAGS="$CFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LDFLAGS $X_LIBS"
++LDFLAGS="$LDFLAGS $X_LDFLAGS"
+
+ if test "x$no_x" = "xyes"; then
+ AC_MSG_ERROR([
+ *** X libraries or include files not found. Check 'config.log' for
+ *** more details.])
+ fi
+-
+ # Checks for libraries.
+ # Check for the X11 library
+-AC_CHECK_LIB(X11, XOpenDisplay, x_libs="-lX11 $X_EXTRA_LIBS",
++AC_CHECK_LIB(X11,XOpenDisplay,
++ x_libs="-lX11 $X_EXTRA_LIBS",
+ AC_MSG_ERROR([*** libX11 not found. Check 'config.log' for more details.]),
+- $X_EXTRA_LIBS)
+-
++ $X_EXTRA_LIBS
++)
+ if test "x$enable_shm" = "xyes"; then
+ # Check for the Xext library (needed for XShm extention)
+ AC_CHECK_LIB(Xext, XShmAttach,
+ x_libs="-lXext $x_libs",
+ # On AIX, it is in XextSam instead, but we still need -lXext
+- AC_CHECK_LIB(XextSam, XShmAttach,
++ [AC_CHECK_LIB(XextSam, XShmAttach,
+ x_libs="-lXextSam -lXext $x_libs",
+- no_xext_lib=yes, $x_libs),
+- $x_libs)
++ no_xext_lib="yes",
++ $x_libs
++ )],
++ $x_libs
++ )
+ fi
+-
+ # Check for shaped window extension
+-
+ AC_CHECK_LIB(Xext, XShapeCombineMask,
+- if test -z "`echo $x_libs | grep "\-lXext" 2> /dev/null`"; then
++ if test -z "`echo $x_libs | grep \-lXext 2> /dev/null`"; then
+ x_libs="-lXext $x_libs"
+ fi
+- AC_DEFINE(HAVE_SHAPE_EXT),
+- ,
+- $x_libs)
+-
++ AC_DEFINE(HAVE_SHAPE_EXT),,
++ $x_libs
++)
+ # Check for XConvertCase (X11R6 specific)
+-
+ AC_CHECK_LIB(X11, XConvertCase,
+- AC_DEFINE(HAVE_XCONVERTCASE),
+- ,
+- $x_libs)
+-
++ AC_DEFINE(HAVE_XCONVERTCASE),,
++ $x_libs
++)
+ # Check for XIM support.
+-
+-AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,
+- : ,
++AC_CHECK_LIB(X11, XUnregisterIMInstantiateCallback,,
+ enable_xim_inst="no",
+- $x_libs)
+-
++ $x_libs
++)
+ # On Solaris, calling XRegisterIMInstantiateCallback seems to
+ # cause an immediate segfault, so we disable it, unless
+ # the user specifically forces it to be on.
+-
+-if test x$enable_xim_inst = xmaybe ; then
+- case host in
++if test "x$enable_xim_inst" = "xmaybe" ; then
++ case "$host" in
+ *-*-solaris*)
+ enable_xim_inst="no"
+ ;;
+@@ -384,16 +373,15 @@
+ fi
+
+ x_cflags="$X_CFLAGS"
+-x_ldflags="$X_LDFLAGS $X_LIBS"
++x_ldflags="$X_LDFLAGS"
+
+ # set up things for XInput
+-
+ if test "x$with_xinput" = "xgxi"; then
+ AC_MSG_WARN([
+ *** The generic XInput support has not been tested for several years
+ *** and is not known to work with any currently available X servers])
+ AC_DEFINE(XINPUT_GXI)
+- xinput_progs=gxid
++ xinput_progs="gxid"
+ x_libs="-lXi $x_libs"
+ elif test "x$with_xinput" = "xxfree" || test "x$with_xinput" = "xyes"; then
+ AC_DEFINE(XINPUT_XFREE)
+@@ -413,77 +401,72 @@
+
+ if test "x$enable_shm" = "xyes"; then
+ # Check for shared memory
+- AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc=yes)
+- AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm=yes)
++ AC_CHECK_HEADER(sys/ipc.h, AC_DEFINE(HAVE_IPC_H), no_sys_ipc="yes")
++ AC_CHECK_HEADER(sys/shm.h, AC_DEFINE(HAVE_SHM_H), no_sys_shm="yes")
+
+ # Check for the X shared memory extension header file
+ AC_MSG_CHECKING(X11/extensions/XShm.h)
+ if test "x$no_xext_lib" = "xyes"; then
+ AC_MSG_RESULT(no)
+- no_xshm=yes
++ no_xshm="yes"
+ else
+ if test -f "$x_includes/X11/extensions/XShm.h"; then
+ AC_MSG_RESULT(yes)
+ AC_DEFINE(HAVE_XSHM_H)
+ else
+ AC_MSG_RESULT(no)
+- no_xshm=yes
++ no_xshm="yes"
+ fi
+ fi
+ fi
+-
+ # Check if X_LOCALE definition is necessary
+-
+ AC_MSG_CHECKING(need -DX_LOCALE)
+
+ AC_TRY_RUN([
+ #include <stdio.h>
+ #include <locale.h>
+-
+-int
+-main ()
++ int main ()
+ {
+ return setlocale (LC_ALL, "${with_locale}") == NULL;
+ }],
+-need_x_locale=no,
+-need_x_locale=yes,
+-need_x_locale=no)
++ need_x_locale="no",
++ need_x_locale="yes",
++ need_x_locale="no"
++)
+ AC_MSG_RESULT($need_x_locale)
+
+-use_native_locale=no
+-if test $need_x_locale = yes; then
++use_native_locale="no"
++if test "$need_x_locale" = "yes"; then
+ GTK_LOCALE_FLAGS="-DX_LOCALE"
+ else
+- if test x$with_native_locale = xyes ; then
++ if test "x$with_native_locale" = "xyes" ; then
+ AC_MSG_CHECKING(functioning locale support)
+
+- AC_TRY_COMPILE([#include <stdlib.h>],[
+- char c;
++ AC_TRY_COMPILE([#include <stdlib.h>],
++ [char c;
+ if (MB_CUR_MAX == 1) {
+ wctomb(&c, 42);
+- }
+- ],use_native_locale=yes,)
+-
++ }],
++ use_native_locale="yes"
++ )
+ AC_MSG_RESULT($use_native_locale)
+ fi
+ fi
+
+-if test x$use_native_locale = xyes ; then
++if test "x$use_native_locale" = "xyes" ; then
+ AC_MSG_CHECKING(if sizeof(wchar_t) == 4)
+
+- AC_TRY_RUN([
+- #include <stdlib.h>
+-
+- int
+- main ()
++ AC_TRY_RUN([#include <stdlib.h>
++ int main ()
+ {
+ return (sizeof(wchar_t) == 4) ? 0 : 1;
+- }],
+- ,use_native_locale=no,:)
++ }],,
++ use_native_locale="no"
++ )
+ AC_MSG_RESULT($use_native_locale)
+ fi
+
+-if test $use_native_locale = yes ; then
++if test "$use_native_locale" = "yes" ; then
+ AC_DEFINE(USE_NATIVE_LOCALE)
+ fi
+
+@@ -502,13 +485,17 @@
+
+ # Check if <sys/select.h> needs to be included for fd_set
+ AC_MSG_CHECKING([for fd_set])
+-AC_TRY_COMPILE([#include <sys/types.h>],
+- [fd_set readMask, writeMask;], gtk_ok=yes, gtk_ok=no)
+-if test $gtk_ok = yes; then
++AC_TRY_COMPILE([#include <sys/types.h>
++ ],
++ [fd_set readMask, writeMask;],
++ gtk_ok="yes",
++ gtk_ok="no"
++)
++if test "$gtk_ok" = "yes"; then
+ AC_MSG_RESULT([yes, found in sys/types.h])
+ else
+- AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok=yes)
+- if test $gtk_ok = yes; then
++ AC_HEADER_EGREP(fd_mask, sys/select.h, gtk_ok="yes")
++ if test "$gtk_ok" = "yes"; then
+ AC_DEFINE(HAVE_SYS_SELECT_H)
+ AC_MSG_RESULT([yes, found in sys/select.h])
+ else
+@@ -520,30 +507,35 @@
+ # Duplicate `widechar' tests from `glib'.
+ # Check for wchar.h
+ AC_MSG_CHECKING(for wchar.h)
+-AC_TRY_CPP([#include <wchar.h>], gtk_ok=yes, gtk_ok=no)
+-if test $gtk_ok = yes; then
++AC_TRY_CPP([#include <wchar.h>
++ ],
++ gtk_ok="yes",
++ gtk_ok="no"
++)
++if test "$gtk_ok" = "yes"; then
+ AC_DEFINE(HAVE_WCHAR_H,1,[Define if wchar.h exists])
+ fi
+ AC_MSG_RESULT($gtk_ok)
+
+ # Check for wctype.h (for iswalnum)
+ AC_MSG_CHECKING(for wctype.h)
+-AC_TRY_CPP([#include <wctype.h>], gtk_ok=yes, gtk_ok=no)
+-if test $gtk_ok = yes; then
++AC_TRY_CPP([#include <wctype.h>], gtk_ok="yes", gtk_ok="no")
++if test "$gtk_ok" = "yes"; then
+ AC_DEFINE(HAVE_WCTYPE_H,1,[Define if wctype.h exists])
+ fi
+ AC_MSG_RESULT($gtk_ok)
+
+ # in Solaris 2.5, `iswalnum' is in -lw
+ GDK_WLIBS=
+-AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS=-lw)])
++AC_CHECK_FUNC(iswalnum,,[AC_CHECK_LIB(w,iswalnum,GDK_WLIBS="-lw")])
+
+ # The following is necessary for Linux libc-5.4.38
+ oLIBS="$LIBS"
+ LIBS="$LIBS $GDK_WLIBS"
+ AC_MSG_CHECKING(if iswalnum() and friends are properly defined)
+-AC_TRY_LINK([#include <stdlib.h>],[
+-#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
++AC_TRY_LINK([#include <stdlib.h>
++ ],
++ [#if (defined(HAVE_WCTYPE_H) || defined(HAVE_WCHAR_H))
+ # ifdef HAVE_WCTYPE_H
+ # include <wctype.h>
+ # else
+@@ -554,11 +546,13 @@
+ #else
+ # define iswalnum(c) ((wchar_t)(c) <= 0xFF && isalnum(c))
+ #endif
+-iswalnum((wchar_t) 0);
+-], gtk_ok=yes, gtk_ok=no)
++ iswalnum((wchar_t) 0);],
++ gtk_ok="yes",
++ gtk_ok="no"
++)
+ LIBS="$oLIBS"
+
+-if test $gtk_ok = no; then
++if test "$gtk_ok" = "no"; then
+ AC_DEFINE(HAVE_BROKEN_WCTYPE,1,[Define if the wctype function is broken])
+ GDK_WLIBS=
+ fi
+@@ -580,5 +574,5 @@
+ gtk/Makefile
+ gtk/gtkfeatures.h
+ gdk.pc
+-gtk+.pc
+-], [chmod +x gtk-config])
++gtk+.pc],
++[chmod +x gtk-config])
+--- gtk+-1.2.10/gdk/Makefile.am.orig 2006-05-19 02:41:18.000000000 -0700
++++ gtk+-1.2.10/gdk/Makefile.am 2006-05-19 02:11:54.000000000 -0700
+@@ -21,12 +21,11 @@
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -release $(LT_RELEASE) \
+ -export-dynamic \
+- @GLIB_DEPLIBS@ \
+ @x_ldflags@ \
+- @x_libs@ \
+- -lm \
+ @STRIP_END@
+
++libgdk_la_LIBADD = @GLIB_DEPLIBS@ @x_libs@ -lm
++
+ #
+ # setup source file variables
+ #
+@@ -104,14 +103,13 @@
+ EXTRA_PROGRAMS = gxid
+ bin_PROGRAMS = @xinput_progs@
+ LDADDS = @STRIP_BEGIN@ \
+- @x_ldflags@ \
+ @x_libs@ \
+ @GLIB_LIBS@ \
+ -lm \
+ @STRIP_END@
+ gxid_SOURCES = gxid.c
+ gxid_LDADD = $(LDADDS)
+-
++gxid_LDFLAGS = @x_ldflags@
+
+ .PHONY: files
+
+--- gtk+-1.2.10/gtk/Makefile.am.orig 2006-05-25 07:40:45.000000000 -0700
++++ gtk+-1.2.10/gtk/Makefile.am 2006-05-25 07:43:20.000000000 -0700
+@@ -27,13 +27,15 @@
+ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
+ -release $(LT_RELEASE) \
+ -export-dynamic \
+- @GLIB_DEPLIBS@ \
+ @x_ldflags@ \
+- @x_libs@ \
+- -lm \
+ @STRIP_END@
+-# $(top_builddir)/gdk/libgdk.la
+-
++libgtk_la_LIBADD = @STRIP_BEGIN@ \
++ $(top_builddir)/gdk/libgdk.la \
++ @x_libs@ \
++ @GDK_WLIBS@ \
++ @GLIB_LIBS@ \
++ -lm \
++ @STRIP_END@
+
+ #
+ # setup source file variables
+@@ -374,14 +376,17 @@
+
+
+ gtkconfdir = $(sysconfdir)/gtk
+-gtkconf_DATA = gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
++# removed references to non-existent gtkrc files - tsh
++gtkconf_DATA = \
++ gtkrc.az gtkrc.he gtkrc.hy gtkrc.ja \
+ gtkrc.ko gtkrc.ru gtkrc.th gtkrc.uk \
+- gtkrc.utf-8 gtkrc.iso-8859-2 \
+- gtkrc.iso-8859-3 gtkrc.iso-8859-5 gtkrc.iso-8859-7 \
+- gtkrc.iso-8859-9 gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
+- gtkrc.iso-8859-15 gtkrc.zh_CN gtkrc.zh_TW.big5 \
+- gtkrc.ka_GE.georgianacademy gtkrc.ka_GE.georgianps \
+- gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii gtkrc.cp1251 gtkrc.cp1255
++ gtkrc.iso-8859-2 gtkrc.iso-8859-5 \
++ gtkrc.iso-8859-13 gtkrc.iso-8859-14 \
++ gtkrc.iso-8859-15 gtkrc.zh_TW.big5 \
++ gtkrc.zh_CN gtkrc.cp1251 gtkrc.cp1255 \
++ gtkrc.ka_GE.georgianacademy \
++ gtkrc.ka_GE.georgianps \
++ gtkrc.vi_VN.tcvn gtkrc.vi_VN.viscii
+
+ # We create a dummy theme for the default GTK+ theme
+ install-data-local:
+@@ -428,7 +433,6 @@
+ LDADDS = @STRIP_BEGIN@ \
+ libgtk.la \
+ $(top_builddir)/gdk/libgdk.la \
+- @x_ldflags@ \
+ @x_libs@ \
+ @GDK_WLIBS@ \
+ @GLIB_LIBS@ \
+@@ -441,12 +445,20 @@
+ testdnd_DEPENDENCIES = $(DEPS)
+ simple_DEPENDENCIES = $(DEPS)
+ #testthreads_DEPENDENCIES = $(DEPS)
++
+ testgtk_LDADD = $(LDADDS)
++testgtk_LDFLAGS=@x_ldflags@
+ testinput_LDADD = $(LDADDS)
++testinput_LDFLAGS = @x_ldflags@
+ testselection_LDADD = $(LDADDS)
++testselection_LDFLAGS = @x_ldflags@
+ testrgb_LDADD = $(LDADDS)
++testrgb_LDFLAGS = @x_ldflags@
+ testdnd_LDADD = $(LDADDS)
++testdnd_LDFLAGS = @x_ldflags@
+ simple_LDADD = $(LDADDS)
++simple_LDFLAGS = @x_ldflags@
++
+ #testthreads_LDADD = $(LDADDS)
+
+ .PHONY: files test test-debug
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch b/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch
new file mode 100644
index 000000000000..6df2032c1b7a
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-automake-1.13.patch
@@ -0,0 +1,16 @@
+Fix build failure with automake-1.13; fixed upstream in >=2.24.15 and >=3.0
+https://bugs.gentoo.org/467520
+
+diff --git a/configure.in b/configure.in
+index 27294c8..798a259 100644
+--- a/configure.in
++++ b/configure.in
+@@ -61,7 +61,7 @@ dnl Initialize automake stuff
+ AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
+
+ # Specify a configuration file
+-AM_CONFIG_HEADER(config.h)
++AC_CONFIG_HEADERS([config.h])
+
+ dnl Initialize libtool
+ AC_PROG_LIBTOOL
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch b/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch
new file mode 100644
index 000000000000..e7b4474618bd
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-automake.patch
@@ -0,0 +1,126 @@
+--- docs/Makefile.am
++++ docs/Makefile.am
+@@ -166,7 +166,7 @@
+ echo $$p; \
+ done
+
+-EXTRA_DIST += \
++EXTRA_DIST = \
+ Changes-1.2.txt \
+ debugging.txt \
+ developers.txt \
+--- gdk/Makefile.am
++++ gdk/Makefile.am
+@@ -30,7 +30,7 @@
+ # setup source file variables
+ #
+ # GDK header files for public installation (non-generated)
+-gdk_public_h_sources = @STRIP_BEGIN@ \
++gdk_public_h_sources = \
+ gdk.h \
+ gdkcursors.h \
+ gdkrgb.h \
+@@ -38,9 +38,8 @@
+ gdkkeysyms.h \
+ gdkprivate.h \
+ gdktypes.h \
+- gdkx.h \
+-@STRIP_END@
+-gdk_c_sources = @STRIP_BEGIN@ \
++ gdkx.h
++gdk_c_sources = \
+ gdk.c \
+ gdkcc.c \
+ gdkcolor.c \
+@@ -71,8 +70,7 @@
+ MwmUtil.h \
+ gxid_lib.h \
+ gxid_proto.h \
+- gxid_lib.c \
+-@STRIP_END@
++ gxid_lib.c
+
+ #
+ # setup GDK sources and their dependancies
+@@ -79,10 +79,6 @@
+ #
+ libgdkinclude_HEADERS = $(gdk_public_h_sources)
+ libgdk_la_SOURCES = $(gdk_c_sources)
+-MAINTAINERCLEANFILES +=
+-EXTRA_HEADERS +=
+-EXTRA_DIST +=
+-EXTRA_DIST +=
+
+ #
+ # rules to generate built sources
+--- gtk/Makefile.am
++++ gtk/Makefile.am
+@@ -41,7 +41,7 @@
+ # setup source file variables
+ #
+ # GTK+ header files for public installation (non-generated)
+-gtk_public_h_sources = @STRIP_BEGIN@ \
++gtk_public_h_sources = \
+ gtk.h \
+ gtkaccelgroup.h \
+ gtkaccellabel.h \
+@@ -150,13 +150,12 @@
+ gtkvscrollbar.h \
+ gtkvseparator.h \
+ gtkwidget.h \
+- gtkwindow.h \
+-@STRIP_END@
++ gtkwindow.h
+ # GTK+ header files that don't get installed
+ gtk_private_h_sources = @STRIP_BEGIN@ \
+ @STRIP_END@
+ # GTK+ C sources to build the library from
+-gtk_c_sources = @STRIP_BEGIN@ \
++gtk_c_sources = \
+ gtkaccelgroup.c \
+ gtkaccellabel.c \
+ gtkadjustment.c \
+@@ -264,8 +263,7 @@
+ gtkwidget.c \
+ gtkwindow.c \
+ fnmatch.c \
+- fnmatch.h \
+-@STRIP_END@
++ fnmatch.h
+ # we use our own built_sources variable rules to avoid automake's
+ # BUILT_SOURCES oddities
+ # we generate frequently rebuild files piggyback on a stamp file, so sources
+@@ -284,10 +282,9 @@
+ gtk.defs \
+ @STRIP_END@
+ # built sources that get installed with the header files
+-gtk_built_public_sources = @STRIP_BEGIN@ \
++gtk_built_public_sources = \
+ gtkmarshal.h \
+- gtktypebuiltins.h \
+-@STRIP_END@
++ gtktypebuiltins.h
+ # non-header sources (headers should be specified in the above variables)
+ # that don't serve as direct make target sources, i.e. they don't have
+ # their own .lo rules and don't get publically installed
+@@ -313,9 +313,8 @@
+ #
+ libgtkinclude_HEADERS = $(gtk_public_h_sources) $(gtk_built_public_sources) gtkfeatures.h
+ libgtk_la_SOURCES = $(gtk_c_sources)
+-MAINTAINERCLEANFILES += $(gtk_built_public_sources) $(gtk_built_sources)
+-EXTRA_HEADERS +=
+-EXTRA_DIST += $(gtk_private_h_sources)
++MAINTAINERCLEANFILES = $(gtk_built_public_sources) $(gtk_built_sources)
++EXTRA_DIST = $(gtk_private_h_sources)
+ EXTRA_DIST += $(gtk_built_sources) $(gtk_built_public_sources) $(gtk_extra_sources)
+
+ #
+@@ -323,7 +322,7 @@
+ #
+ # setup autogeneration dependancies
+ gen_sources = xgen-gdef xgen-gtbh xgen-gtbvc xgen-gtbic xgen-gtbec xgen-gmh xgen-gmc
+-CLEANFILES += $(gen_sources)
++CLEANFILES = $(gen_sources)
+ COPYING: $(gtk_built_public_sources) $(gtk_built_sources)
+ $(OBJECTS): COPYING # this is our oldest-source-stamp
+ # initial creation of the real stamp-* files
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch b/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch
new file mode 100644
index 000000000000..7846c17aad0c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-cleanup.patch
@@ -0,0 +1,13 @@
+pull in string prototypes
+
+--- gdk/gdkinputcommon.h
++++ gdk/gdkinputcommon.h
+@@ -24,6 +24,8 @@
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ */
+
++#include <string.h>
++
+ #if defined(XINPUT_GXI) || defined(XINPUT_XFREE)
+
+ /* Forward declarations */
diff --git a/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch b/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
new file mode 100644
index 000000000000..37fb7c263096
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-1.2.10-m4.patch
@@ -0,0 +1,9 @@
+Fix aclocal warnings:
+/usr/share/aclocal/gtk.m4:7: warning: underquoted definition of AM_PATH_GTK
+--- gtk+-1.2.10/gtk.m4
++++ gtk+-1.2.10/gtk.m4
+@@ -6,3 +6,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_GTK,
++AC_DEFUN([AM_PATH_GTK],
+ [dnl
diff --git a/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch b/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch
new file mode 100644
index 000000000000..a07e6537d22e
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.20-darwin-quartz-pasteboard.patch
@@ -0,0 +1,15 @@
+gdk_quartz_target_to_pasteboard_type_libgtk_only was moved in
+a269c2f8d26a588c4b61ad605ef496e89759cc03
+https://mail.gnome.org/archives/commits-list/2013-March/msg20203.html
+https://bugzilla.gnome.org/show_bug.cgi?id=704766
+
+--- gtk/gtkclipboard-quartz.c
++++ gtk/gtkclipboard-quartz.c
+@@ -33,6 +33,7 @@
+ #include "gtktextbuffer.h"
+ #include "gtkquartz.h"
+ #include "gtkalias.h"
++#include "quartz/gdkquartz.h"
+
+ enum {
+ OWNER_CHANGE,
diff --git a/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
new file mode 100644
index 000000000000..451233ca812f
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.24-out-of-source.patch
@@ -0,0 +1,33 @@
+From 9e0f33144aff8d792ab105927cf686eda0afd25e Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Sun, 18 May 2014 10:50:05 +0200
+Subject: [PATCH] aliasfilecheck: check for sources both in builddir & srcdir.
+
+The $gtk_all_c_sources variable contains both supplied and generated
+sources. The former reside in $srcdir, the latter in the build directory
+(cwd).
+
+In order to handle both kinds properly, first try to find each source
+file in cwd, and then fallback to $srcdir. This makes it possible to use
+out-of-source builds, and guarantees that fresh-built source files will
+be used rather than pre-generated copies included in the distribution
+tarball.
+---
+ gtk/aliasfilescheck.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gtk/aliasfilescheck.sh b/gtk/aliasfilescheck.sh
+index 31b49d4..3636a82 100755
+--- a/gtk/aliasfilescheck.sh
++++ b/gtk/aliasfilescheck.sh
+@@ -6,6 +6,6 @@ if test "x$gtk_all_c_sources" = x; then
+ fi
+
+ grep 'IN_FILE' ${srcdir-.}/gtk.symbols | sed 's/.*(//;s/).*//' | grep __ | sort -u > expected-files
+-{ cd ${srcdir-.}; grep '^ *# *define __' $gtk_all_c_sources; } | sed 's/.*define //;s/ *$//' | sort > actual-files
++{ for f in $gtk_all_c_sources; do if test -f ${f}; then grep '^ *# *define __' ${f}; else grep '^ *# *define __' "${srcdir-.}"/${f}; fi; done } | sed 's/.*define //;s/ *$//' | sort > actual-files
+
+ diff expected-files actual-files && rm -f expected-files actual-files
+--
+1.9.3
+
diff --git a/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
new file mode 100644
index 000000000000..f88e02e53500
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-2.24.27-update-icon-cache.patch
@@ -0,0 +1,64 @@
+From 2537d97e4685767ce22834c0dd24d37ba715fb52 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sat, 9 May 2015 23:30:58 +0200
+Subject: [PATCH] Always use external gtk-update-icon-cache
+
+---
+ configure.ac | 8 +++-----
+ gtk/Makefile.am | 13 ++-----------
+ 2 files changed, 5 insertions(+), 16 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 2671a3d..fa46004 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -913,11 +913,9 @@ dnl Look for a host system's gdk-pixbuf-csource if we are cross-compiling
+
+ AM_CONDITIONAL(CROSS_COMPILING, test $cross_compiling = yes)
+
+-if test $cross_compiling = yes; then
+- AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
+- if test x$GTK_UPDATE_ICON_CACHE = xno; then
+- REBUILD_PNGS=#
+- fi
++AC_PATH_PROG(GTK_UPDATE_ICON_CACHE, gtk-update-icon-cache, no)
++if test x$GTK_UPDATE_ICON_CACHE = xno; then
++ REBUILD_PNGS=#
+ fi
+
+ AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no)
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 248220d..42e4c23 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1039,8 +1039,7 @@ endif
+ # Installed tools
+ #
+ bin_PROGRAMS = \
+- gtk-query-immodules-2.0 \
+- gtk-update-icon-cache
++ gtk-query-immodules-2.0
+
+ bin_SCRIPTS = gtk-builder-convert
+
+@@ -1390,16 +1389,8 @@ stamp-icons: $(STOCK_ICONS)
+ ) done \
+ && touch stamp-icons
+
+-if CROSS_COMPILING
+-gtk_update_icon_cache_program = $(GTK_UPDATE_ICON_CACHE)
+-else
+-gtk_update_icon_cache_program = \
+- ./gtk-update-icon-cache
+-endif
+-
+ gtkbuiltincache.h: @REBUILD@ stamp-icons
+- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT)
+- $(gtk_update_icon_cache_program) --force --ignore-theme-index \
++ $(GTK_UPDATE_ICON_CACHE) --force --ignore-theme-index \
+ --include-image-data \
+ --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \
+ mv gtkbuiltincache.h.tmp gtkbuiltincache.h
+--
+2.3.6
+
diff --git a/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch b/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch
new file mode 100644
index 000000000000..3955677f4c35
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.12.2-darwin10.6.patch
@@ -0,0 +1,39 @@
+Fix for Mac Os 10.7
+
+src_compile:
+gtkapplication-quartz-menu.c:265: error: incompatible type for argument 1 of 'roundf'
+make[4]: *** [libgtk_3_la-gtkapplication-quartz-menu.lo] Error 1
+
+More info:
+https://trac.macports.org/ticket/43283
+https://bugzilla.gnome.org/show_bug.cgi?id=727366
+https://bugs.gentoo.org/show_bug.cgi?id=519058
+
+--- gtk/gtkapplication-quartz-menu.c.orig 2014-05-08 01:40:39.000000000 +0200
++++ gtk/gtkapplication-quartz-menu.c 2014-05-15 11:16:09.000000000 +0200
+@@ -30,6 +30,16 @@
+
+ #import <Cocoa/Cocoa.h>
+
++#if !defined(MAC_OS_X_VERSION_10_7) || \
++MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
++
++@interface NSScreen (LionAPI)
++- (CGFloat)backingScaleFactor;
++- (NSRect)convertRectToBacking:(NSRect)aRect;
++@end
++
++#endif // 10.7
++
+ #define ICON_SIZE 16
+
+ #define BLACK "#000000"
+@@ -262,7 +272,7 @@
+ }
+
+ theme = gtk_icon_theme_get_default ();
+- scale = roundf ([[NSScreen mainScreen] backingScaleFactor]);
++ scale = [[NSScreen mainScreen] respondsToSelector:@selector(backingScaleFactor)] ? roundf ([[NSScreen mainScreen] backingScaleFactor]) : 1.;
+ info = gtk_icon_theme_lookup_by_gicon_for_scale (theme, icon, ICON_SIZE, scale, GTK_ICON_LOOKUP_USE_BUILTIN);
+
+ if (info != NULL)
diff --git a/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
new file mode 100644
index 000000000000..b121dd57281f
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.16.2-remove_update-icon-cache.patch
@@ -0,0 +1,24 @@
+From d83443d10381a53637226b937094454951de44c1 Mon Sep 17 00:00:00 2001
+From: Ole Reifschneider <tranquility@gentoo.org>
+Date: Thu, 16 Apr 2015 23:51:51 +0200
+Subject: [PATCH] Remove update-icon-cache from bin_PROGRAMS
+
+---
+ gtk/Makefile.am | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 83dfe31..a5afc03 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -1380,7 +1380,6 @@ endif
+ #
+ bin_PROGRAMS = \
+ gtk-query-immodules-3.0 \
+- gtk-update-icon-cache \
+ gtk-encode-symbolic-svg \
+ gtk-launch
+
+--
+2.0.5
+
diff --git a/x11-libs/gtk+/files/gtk+-non-bash-support.patch b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
new file mode 100644
index 000000000000..a1aac42c9f91
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-non-bash-support.patch
@@ -0,0 +1,56 @@
+From 43a4a28cdc60ac7347bb89f84cf049cb3401621d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Sun, 26 Oct 2014 01:59:33 +0400
+Subject: [PATCH] gtk/Makefile.am: Remove bashisms
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+- improve portability of ECHO
+- remove use of shopt
+
+https://bugzilla.gnome.org/show_bug.cgi?id=738835
+
+From: Alexander Tsoy <alexander@tsoy.me>
+Signed-off-by: Rémi Cardona <remi@gentoo.org>
+---
+ gtk/Makefile.am | 13 +++++--------
+ 1 file changed, 5 insertions(+), 8 deletions(-)
+
+diff --git a/gtk/Makefile.am b/gtk/Makefile.am
+index 96c651a..b1478ce 100644
+--- a/gtk/Makefile.am
++++ b/gtk/Makefile.am
+@@ -19,11 +19,7 @@ GTK_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %
+ endif
+
+ SUBDIRS = inspector native .
+-if OS_DARWIN
+- ECHO="echo"
+-else
+- ECHO=echo -e
+-endif
++ECHO=printf '%b\n'
+
+ if HAVE_CLOUDPRINT
+ if HAVE_PAPI_CUPS
+@@ -1405,12 +1401,13 @@ gtk.gresource.xml: Makefile.am
+ n=`basename $$f`; \
+ $(ECHO) " <file compressed=\"true\">ui/$$n</file>" >> $@; \
+ done; \
+- shopt -s nullglob; \
+ for s in 16x16 22x22 24x24 32x32 48x48; do \
+ for c in actions status; do \
+ for f in $(srcdir)/resources/icons/$$s/$$c/*.png; do \
+- n=`basename $$f`; \
+- $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \
++ if [ -e "$$f" ] ; then \
++ n=`basename $$f`; \
++ $(ECHO) " <file>icons/$$s/$$c/$$n</file>" >> $@; \
++ fi; \
+ done; \
+ done; \
+ done; \
+--
+2.3.0
+
diff --git a/x11-libs/gtk+/files/gtkrc b/x11-libs/gtk+/files/gtkrc
new file mode 100644
index 000000000000..8d1783431d9c
--- /dev/null
+++ b/x11-libs/gtk+/files/gtkrc
@@ -0,0 +1,39 @@
+style "default"
+
+{
+ font = "-*-lucida-medium-r-normal-*-*-100-*-*-*-*-*-*"
+}
+
+style "button" = "default"
+
+{
+ bg[PRELIGHT] = { 0.7, 0.7, 0.9 }
+}
+
+style "treeitem"
+{
+bg[ACTIVE] = { 0.7, 0.7, 0.9 }
+}
+
+style "scrollbar" = "button"
+{
+ bg[ACTIVE] = {0.6, 0.6, 0.6 }
+}
+
+style "status" {
+ bg[PRELIGHT] = { 0.3, 1.0, 0.3 }
+}
+
+style "gtk-tooltips" {
+ bg[NORMAL] = "#ffff60"
+}
+
+class "GtkWidget" style "default"
+class "GtkButton" style "button"
+class "GtkItem" style "button"
+class "GtkProgressBar" style "status"
+class "GtkScrollbar" style "scrollbar"
+class "GtkTreeItem" style "treeitem"
+widget "gtk-tooltips" style "gtk-tooltips"
+
+
diff --git a/x11-libs/gtk+/files/settings.ini b/x11-libs/gtk+/files/settings.ini
new file mode 100644
index 000000000000..a65c0a818dbc
--- /dev/null
+++ b/x11-libs/gtk+/files/settings.ini
@@ -0,0 +1,4 @@
+[Settings]
+gtk-theme-name = Adwaita
+gtk-icon-theme-name = gnome
+gtk-cursor-theme-name = Adwaita
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
new file mode 100644
index 000000000000..3a5c423f155e
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-1.2.10-r12.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+GNOME_TARBALL_SUFFIX="gz"
+inherit gnome.org eutils toolchain-funcs autotools
+
+DESCRIPTION="The GIMP Toolkit"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI} http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
+IUSE="nls debug"
+
+# Supported languages and translated documentation
+# Be sure all languages are prefixed with a single space!
+MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi"
+IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
+
+RDEPEND=">=dev-libs/glib-1.2:1
+ x11-libs/libXi
+ x11-libs/libXt"
+DEPEND="${RDEPEND}
+ x11-proto/inputproto
+ x11-proto/xextproto
+ nls? ( sys-devel/gettext dev-util/intltool )"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-m4.patch
+ epatch "${FILESDIR}"/${P}-automake.patch
+ epatch "${FILESDIR}"/${P}-cleanup.patch
+ epatch "${DISTDIR}"/gtk+-1.2.10-r8-gentoo.diff.bz2
+ epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch
+ epatch "${FILESDIR}"/${P}-as-needed.patch
+ sed -i '/libtool.m4/,/AM_PROG_NM/d' acinclude.m4 #168198
+ epatch "${FILESDIR}"/${P}-automake-1.13.patch #467520
+ eautoreconf
+}
+
+src_configure() {
+ local myconf=
+ use nls || myconf="${myconf} --disable-nls"
+ strip-linguas ${MY_AVAILABLE_LINGUAS}
+
+ if use debug ; then
+ myconf="${myconf} --enable-debug=yes"
+ else
+ myconf="${myconf} --enable-debug=minimum"
+ fi
+
+ econf \
+ --sysconfdir=/etc \
+ --with-xinput=xfree \
+ --with-x \
+ ${myconf}
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ default
+
+ dodoc AUTHORS ChangeLog* HACKING
+ dodoc NEWS* README* TODO
+ docinto docs
+ cd docs
+ dodoc *.txt *.gif text/*
+ dohtml -r html
+
+ #install nice, clean-looking gtk+ style
+ insinto /usr/share/themes/Gentoo/gtk
+ doins "${FILESDIR}"/gtkrc
+}
+
+pkg_postinst() {
+ if [[ -e /etc/X11/gtk/gtkrc ]] ; then
+ ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for"
+ ewarn "all themes it seems. Please remove it manually as it will not due"
+ ewarn "to /env protection."
+ fi
+
+ echo ""
+ einfo "The old gtkrc is available through the new Gentoo gtk theme."
+}
diff --git a/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild b/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild
new file mode 100644
index 000000000000..e4ad4b9517e1
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-1.2.10-r13.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+GNOME_TARBALL_SUFFIX="gz"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 toolchain-funcs multilib-minimal
+
+DESCRIPTION="The GIMP Toolkit"
+HOMEPAGE="http://www.gtk.org/"
+SRC_URI="${SRC_URI} http://www.ibiblio.org/gentoo/distfiles/gtk+-1.2.10-r8-gentoo.diff.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="nls debug"
+
+# Supported languages and translated documentation
+# Be sure all languages are prefixed with a single space!
+MY_AVAILABLE_LINGUAS=" az ca cs da de el es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt_BR pt ro ru sk sl sr sv tr uk vi"
+IUSE="${IUSE} ${MY_AVAILABLE_LINGUAS// / linguas_}"
+
+RDEPEND=">=dev-libs/glib-1.2.10-r6:1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.5.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=x11-proto/inputproto-2.2-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ nls? ( sys-devel/gettext dev-util/intltool )"
+
+MULTILIB_CHOST_TOOLS=(/usr/bin/gtk-config)
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-m4.patch
+ epatch "${FILESDIR}"/${P}-automake.patch
+ epatch "${FILESDIR}"/${P}-cleanup.patch
+ epatch "${DISTDIR}"/gtk+-1.2.10-r8-gentoo.diff.bz2
+ epatch "${FILESDIR}"/${PN}-1.2-locale_fix.patch
+ epatch "${FILESDIR}"/${P}-as-needed.patch
+ sed -i '/libtool.m4/,/AM_PROG_NM/d' acinclude.m4 #168198
+ epatch "${FILESDIR}"/${P}-automake-1.13.patch #467520
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ local myconf=
+ use nls || myconf="${myconf} --disable-nls"
+ strip-linguas ${MY_AVAILABLE_LINGUAS}
+
+ if use debug ; then
+ myconf="${myconf} --enable-debug=yes"
+ else
+ myconf="${myconf} --enable-debug=minimum"
+ fi
+
+ ECONF_SOURCE="${S}" \
+ gnome2_src_configure \
+ --disable-static \
+ --sysconfdir="${EPREFIX}"/etc \
+ --with-xinput=xfree \
+ --with-x \
+ ${myconf} \
+ GLIB_CONFIG="/usr/bin/${CHOST}-glib-config"
+}
+
+multilib_src_compile() {
+ emake CC="$(tc-getCC)"
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ docinto docs
+ cd docs
+ dodoc *.txt *.gif text/*
+ dohtml -r html
+
+ #install nice, clean-looking gtk+ style
+ insinto /usr/share/themes/Gentoo/gtk
+ doins "${FILESDIR}"/gtkrc
+}
+
+pkg_postinst() {
+ if [[ -e /etc/X11/gtk/gtkrc ]] ; then
+ ewarn "Older versions added /etc/X11/gtk/gtkrc which changed settings for"
+ ewarn "all themes it seems. Please remove it manually as it will not due"
+ ewarn "to /env protection."
+ fi
+
+ echo ""
+ einfo "The old gtkrc is available through the new Gentoo gtk theme."
+}
diff --git a/x11-libs/gtk+/gtk+-2.24.25.ebuild b/x11-libs/gtk+/gtk+-2.24.25.ebuild
new file mode 100644
index 000000000000..9c97d5687925
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.25.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils flag-o-matic gnome2 multilib virtualx autotools readme.gentoo multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="aqua cups debug examples +introspection test vim-syntax xinerama"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+ !aqua? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4:=[X,svg,${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30.7:2[X,introspection?,${MULTILIB_USEDEP}]
+ )
+ aqua? (
+ >=x11-libs/cairo-1.6:=[aqua,svg]
+ x11-libs/gdk-pixbuf:2[introspection?]
+ )
+ xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ x11-misc/shared-mime-info
+ cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ !<gnome-base/gail-1000
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/gobject-introspection-common
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ !aqua? (
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+ >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+ )
+ xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
+ >=dev-util/gtk-doc-am-1.20
+ test? (
+ x11-themes/hicolor-icon-theme
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )
+"
+
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Add blocker against old gtk-builder-convert to be sure we maintain both
+# in sync.
+RDEPEND="${COMMON_DEPEND}
+ !<dev-util/gtk-builder-convert-${PV}
+ !<x11-libs/vte-0.28.2-r201:0
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
+edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
+[Filechooser Settings]
+StartupMode=cwd"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gtk-query-immodules-2.0
+)
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+set_gtk2_confdir() {
+ # An arch specific config directory is used on multilib systems
+ GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+src_prepare() {
+ # Fix building due to moved definition, upstream bug #704766
+ epatch "${FILESDIR}"/${PN}-2.24.20-darwin-quartz-pasteboard.patch
+
+ # Fix tests running when building out of sources, bug #510596
+ epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
+
+ # marshalers code was pre-generated with glib-2.31, upstream bug #671763
+ rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
+ perf/marshalers.c || die
+
+ # Stop trying to build unmaintained docs, bug #349754
+ strip_builddir SUBDIRS tutorial docs/Makefile.am docs/Makefile.in
+ strip_builddir SUBDIRS faq docs/Makefile.am docs/Makefile.in
+
+ # -O3 and company cause random crashes in applications. Bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ if ! use test; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+ strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+ else
+ # Non-working test in gentoo's env
+ sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+ -i gtk/tests/testing.c || die "sed 1 failed"
+
+ # Cannot work because glib is too clever to find real user's home
+ # gentoo bug #285687, upstream bug #639832
+ # XXX: /!\ Pay extra attention to second sed when bumping /!\
+ sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+ || die "failed to disable recentmanager test (1)"
+ sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+ || die "failed to disable recentmanager test (2)"
+ sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+ || die "failed to disable recentmanager test (3)"
+
+ # Skip tests known to fail
+ # https://bugzilla.gnome.org/show_bug.cgi?id=646609
+ sed -e '/g_test_add_func.*test_text_access/s:^://:' \
+ -i "${S}/gtk/tests/testing.c" || die
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=617473
+ sed -i -e 's:pltcheck.sh:$(NULL):g' \
+ gtk/Makefile.am || die
+
+ # UI tests require immodules already installed; bug #413185
+ if ! has_version 'x11-libs/gtk+:2'; then
+ ewarn "Disabling UI tests because this is the first install of"
+ ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+ ewarn "has been installed."
+ sed '/g_test_add_func.*ui-tests/ d' \
+ -i gtk/tests/testing.c || die "sed 2 failed"
+ fi
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.am Makefile.in
+ fi
+
+ epatch_user
+
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
+
+ # Passing --disable-debug is not recommended for production use
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+ $(usex aqua "" --with-xinput) \
+ $(usex debug --enable-debug=yes "") \
+ $(use_enable cups cups auto) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable xinerama) \
+ --disable-papi \
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in gdk gtk libgail-util; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+
+ # add -framework Carbon to the .pc files
+ use aqua && for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
+ sed -i -e "s:Libs\: :Libs\: -framework Carbon :" "${ED%/}"/usr/lib/pkgconfig/$i || die "sed failed"
+ done
+}
+
+multilib_src_install_all() {
+ # see bug #133241
+ echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+ insinto /usr/share/gtk-2.0
+ doins "${T}"/gtkrc
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+ # dev-util/gtk-builder-convert split off into a separate package, #402905
+ rm "${ED}"usr/bin/gtk-builder-convert || die
+
+ readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+ set_gtk2_confdir
+
+ multilib_pkg_postinst() {
+ "${CHOST}"-gtk-query-immodules-2.0 --update-cache \
+ || die "Update immodules cache failed (for ${ABI})"
+ }
+ multilib_parallel_foreach_abi multilib_pkg_postinst
+
+ if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+ elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+ elog "aware location. Removing deprecated file."
+ rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+ fi
+
+ if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
+ elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
+ elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
+ fi
+
+ # pixbufs are now handled by x11-libs/gdk-pixbuf
+ if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+ elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+ fi
+
+ # two checks needed since we dropped multilib conditional
+ if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+ elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+ fi
+
+ if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+ elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+ elog "to do that you can use qfile from portage-utils:"
+ elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+ fi
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your gtkrc."
+ fi
+
+ readme.gentoo_print_elog
+}
diff --git a/x11-libs/gtk+/gtk+-2.24.27.ebuild b/x11-libs/gtk+/gtk+-2.24.27.ebuild
new file mode 100644
index 000000000000..44d199680b72
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.27.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="aqua cups examples +introspection test vim-syntax xinerama"
+REQUIRED_USE="
+ xinerama? ( !aqua )
+"
+
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+ >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
+ x11-misc/shared-mime-info
+
+ cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
+ !aqua? (
+ >=x11-libs/cairo-1.12.14-r4:=[X]
+ >=x11-libs/gdk-pixbuf-2.30.7:2[X]
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+ xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/gobject-introspection-common
+ >=dev-util/gtk-doc-am-1.20
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ !aqua? (
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+ >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+ xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
+ )
+ test? (
+ x11-themes/hicolor-icon-theme
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )
+"
+
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Add blocker against old gtk-builder-convert to be sure we maintain both
+# in sync.
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gail-1000
+ !<dev-util/gtk-builder-convert-${PV}
+ !<x11-libs/vte-0.28.2-r201:0
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+ vim-syntax? ( app-vim/gtk-syntax )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
+edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
+[Filechooser Settings]
+StartupMode=cwd"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gtk-query-immodules-2.0
+)
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+set_gtk2_confdir() {
+ # An arch specific config directory is used on multilib systems
+ GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+src_prepare() {
+ # Fix tests running when building out of sources, bug #510596, upstream bug #730319
+ epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
+
+ # marshalers code was pre-generated with glib-2.31, upstream bug #662109
+ rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
+ perf/marshalers.c || die
+
+ # Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
+ strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
+ strip_builddir SUBDIRS faq docs/Makefile.{am,in}
+
+ # -O3 and company cause random crashes in applications, bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ if ! use test ; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+ strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+ else
+ # Non-working test in gentoo's env
+ sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+ -i gtk/tests/testing.c || die "sed 1 failed"
+
+ # Cannot work because glib is too clever to find real user's home
+ # gentoo bug #285687, upstream bug #639832
+ # XXX: /!\ Pay extra attention to second sed when bumping /!\
+ sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+ || die "failed to disable recentmanager test (1)"
+ sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+ || die "failed to disable recentmanager test (2)"
+ sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+ || die "failed to disable recentmanager test (3)"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=617473
+ sed -i -e 's:pltcheck.sh:$(NULL):g' \
+ gtk/Makefile.am || die
+
+ # UI tests require immodules already installed; bug #413185
+ if ! has_version 'x11-libs/gtk+:2'; then
+ ewarn "Disabling UI tests because this is the first install of"
+ ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+ ewarn "has been installed."
+ sed '/g_test_add_func.*ui-tests/ d' \
+ -i gtk/tests/testing.c || die "sed 2 failed"
+ fi
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+ fi
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+ $(usex aqua "" --with-xinput) \
+ $(use_enable cups cups auto) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable xinerama) \
+ --disable-papi \
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in gdk gtk libgail-util; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+
+ # add -framework Carbon to the .pc files
+ if use aqua ; then
+ for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
+ sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+ -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ # see bug #133241
+ echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+ insinto /usr/share/gtk-2.0
+ doins "${T}"/gtkrc
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+ # dev-util/gtk-builder-convert split off into a separate package, #402905
+ rm "${ED}"usr/bin/gtk-builder-convert || die
+
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make immodules.cache belongs to gtk+ alone
+ local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+ multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ gnome2_query_immodules_gtk2 \
+ || die "Update immodules cache failed (for ${ABI})"
+ }
+ multilib_parallel_foreach_abi multilib_pkg_postinst
+
+ set_gtk2_confdir
+
+ if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+ elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+ elog "aware location. Removing deprecated file."
+ rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+ fi
+
+ if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
+ elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
+ elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
+ fi
+
+ # pixbufs are now handled by x11-libs/gdk-pixbuf
+ if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+ elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+ fi
+
+ # two checks needed since we dropped multilib conditional
+ if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+ elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+ fi
+
+ if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+ elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+ elog "to do that you can use qfile from portage-utils:"
+ elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+ fi
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your gtkrc."
+ fi
+
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ multilib_pkg_postrm() {
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
+ }
+ multilib_foreach_abi multilib_pkg_postrm
+ fi
+}
diff --git a/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild b/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild
new file mode 100644
index 000000000000..62ead306ef36
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-2.24.28-r1.ebuild
@@ -0,0 +1,311 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx readme.gentoo multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="2"
+IUSE="aqua cups examples +introspection test vim-syntax xinerama"
+REQUIRED_USE="
+ xinerama? ( !aqua )
+"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+ >=dev-libs/atk-2.10.0[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4:=[aqua?,svg,${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30.7:2[introspection?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.3[introspection?,${MULTILIB_USEDEP}]
+ x11-misc/shared-mime-info
+
+ cups? ( >=net-print/cups-1.7.1-r2:=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+ !aqua? (
+ >=x11-libs/cairo-1.12.14-r4:=[X]
+ >=x11-libs/gdk-pixbuf-2.30.7:2[X]
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcursor-1.1.14[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXcomposite-0.4.4-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdamage-1.1.4-r1[${MULTILIB_USEDEP}]
+ xinerama? ( >=x11-libs/libXinerama-1.1.3[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-libs/gobject-introspection-common
+ >=dev-util/gtk-doc-am-1.20
+ sys-devel/gettext
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ !aqua? (
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+ >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+ xinerama? ( >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}] )
+ )
+ test? (
+ x11-themes/hicolor-icon-theme
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )
+"
+
+# gtk+-2.24.8 breaks Alt key handling in <=x11-libs/vte-0.28.2:0
+# Add blocker against old gtk-builder-convert to be sure we maintain both
+# in sync.
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-update-icon-cache-2
+ !<gnome-base/gail-1000
+ !<dev-util/gtk-builder-convert-${PV}
+ !<x11-libs/vte-0.28.2-r201:0
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+ gnome-base/librsvg[${MULTILIB_USEDEP}]
+ vim-syntax? ( app-vim/gtk-syntax )
+"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="To make the gtk2 file chooser use 'current directory' mode by default,
+edit ~/.config/gtk-2.0/gtkfilechooser.ini to contain the following:
+[Filechooser Settings]
+StartupMode=cwd"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gtk-query-immodules-2.0
+)
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+set_gtk2_confdir() {
+ # An arch specific config directory is used on multilib systems
+ GTK2_CONFDIR="/etc/gtk-2.0/${CHOST}"
+}
+
+src_prepare() {
+ # Fix tests running when building out of sources, bug #510596, upstream bug #730319
+ epatch "${FILESDIR}"/${PN}-2.24.24-out-of-source.patch
+
+ # Rely on split gtk-update-icon-cache package, bug #528810
+ epatch "${FILESDIR}"/${PN}-2.24.27-update-icon-cache.patch
+
+ # marshalers code was pre-generated with glib-2.31, upstream bug #662109
+ rm -v gdk/gdkmarshalers.c gtk/gtkmarshal.c gtk/gtkmarshalers.c \
+ perf/marshalers.c || die
+
+ # Stop trying to build unmaintained docs, bug #349754, upstream bug #623150
+ strip_builddir SUBDIRS tutorial docs/Makefile.{am,in}
+ strip_builddir SUBDIRS faq docs/Makefile.{am,in}
+
+ # -O3 and company cause random crashes in applications, bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ if ! use test ; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+ strip_builddir SUBDIRS tests gdk/Makefile.{am,in} gtk/Makefile.{am,in}
+ else
+ # Non-working test in gentoo's env
+ sed 's:\(g_test_add_func ("/ui-tests/keys-events.*\):/*\1*/:g' \
+ -i gtk/tests/testing.c || die "sed 1 failed"
+
+ # Cannot work because glib is too clever to find real user's home
+ # gentoo bug #285687, upstream bug #639832
+ # XXX: /!\ Pay extra attention to second sed when bumping /!\
+ sed '/TEST_PROGS.*recentmanager/d' -i gtk/tests/Makefile.am \
+ || die "failed to disable recentmanager test (1)"
+ sed '/^TEST_PROGS =/,+3 s/recentmanager//' -i gtk/tests/Makefile.in \
+ || die "failed to disable recentmanager test (2)"
+ sed 's:\({ "GtkFileChooserButton".*},\):/*\1*/:g' -i gtk/tests/object.c \
+ || die "failed to disable recentmanager test (3)"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=617473
+ sed -i -e 's:pltcheck.sh:$(NULL):g' \
+ gtk/Makefile.am || die
+
+ # UI tests require immodules already installed; bug #413185
+ if ! has_version 'x11-libs/gtk+:2'; then
+ ewarn "Disabling UI tests because this is the first install of"
+ ewarn "gtk+:2 on this machine. Please re-run the tests after $P"
+ ewarn "has been installed."
+ sed '/g_test_add_func.*ui-tests/ d' \
+ -i gtk/tests/testing.c || die "sed 2 failed"
+ fi
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+ fi
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ [[ ${ABI} == ppc64 ]] && append-flags -mminimal-toc
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
+ $(usex aqua "" --with-xinput) \
+ $(use_enable cups cups auto) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable xinerama) \
+ --disable-papi \
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in gdk gtk libgail-util; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ unset DBUS_SESSION_BUS_ADDRESS
+ Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+
+ # add -framework Carbon to the .pc files, bug #????
+ # FIXME: Is this still needed? Any reference to try to upstream it?
+# if use aqua ; then
+# for i in gtk+-2.0.pc gtk+-quartz-2.0.pc gtk+-unix-print-2.0.pc; do
+# sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+# -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+# done
+# fi
+}
+
+multilib_src_install_all() {
+ # see bug #133241
+ # Also set more default variables in sync with gtk3 and other distributions
+ echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
+ echo 'gtk-theme-name = "Adwaita"' >> "${T}/gtkrc"
+ echo 'gtk-icon-theme-name = "gnome"' >> "${T}/gtkrc"
+ echo 'gtk-cursor-theme-name = "Adwaita"' >> "${T}/gtkrc"
+
+ insinto /usr/share/gtk-2.0
+ doins "${T}"/gtkrc
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+ # dev-util/gtk-builder-convert split off into a separate package, #402905
+ rm "${ED}"usr/bin/gtk-builder-convert || die
+
+ readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make immodules.cache belongs to gtk+ alone
+ local cache="usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+ multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ gnome2_query_immodules_gtk2 \
+ || die "Update immodules cache failed (for ${ABI})"
+ }
+ multilib_parallel_foreach_abi multilib_pkg_postinst
+
+ set_gtk2_confdir
+
+ if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
+ elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
+ elog "aware location. Removing deprecated file."
+ rm -f ${EROOT%/}/etc/gtk-2.0/gtk.immodules
+ fi
+
+ if [ -e "${EROOT%/}${GTK2_CONFDIR}/gtk.immodules" ]; then
+ elog "File /etc/gtk-2.0/gtk.immodules has been moved to"
+ elog "${EROOT%/}/usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}${GTK2_CONFDIR}/gtk.immodules
+ fi
+
+ # pixbufs are now handled by x11-libs/gdk-pixbuf
+ if [ -e "${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders" ]; then
+ elog "File ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}${GTK2_CONFDIR}/gdk-pixbuf.loaders
+ fi
+
+ # two checks needed since we dropped multilib conditional
+ if [ -e "${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders" ]; then
+ elog "File ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders is now handled by x11-libs/gdk-pixbuf"
+ elog "Removing deprecated file."
+ rm -f ${EROOT%/}/etc/gtk-2.0/gdk-pixbuf.loaders
+ fi
+
+ if [ -e "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]* ]; then
+ elog "You need to rebuild ebuilds that installed into" "${EROOT%/}"/usr/lib/gtk-2.0/2.[^1]*
+ elog "to do that you can use qfile from portage-utils:"
+ elog "emerge -va1 \$(qfile -qC ${EPREFIX}/usr/lib/gtk-2.0/2.[^1]*)"
+ fi
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your gtkrc."
+ fi
+
+ readme.gentoo_print_elog
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ multilib_pkg_postrm() {
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-2.0/2.10.0/immodules.cache
+ }
+ multilib_foreach_abi multilib_pkg_postrm
+ fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.12.2.ebuild b/x11-libs/gtk+/gtk+-3.12.2.ebuild
new file mode 100644
index 000000000000..cb639a59b038
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.12.2.ebuild
@@ -0,0 +1,224 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit eutils flag-o-matic gnome2 multilib virtualx
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+# NOTE: This gtk+ has multi-gdk-backend support, see:
+# * http://blogs.gnome.org/kris/2010/12/29/gdk-3-0-on-mac-os-x/
+# * http://mail.gnome.org/archives/gtk-devel-list/2010-November/msg00099.html
+# I tried this and got it all compiling, but the end result is unusable as it
+# horribly mixes up the backends -- grobian
+IUSE="aqua cloudprint colord cups debug examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ xinerama? ( X )
+"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+# Use gtk+:2 for gtk-update-icon-cache
+COMMON_DEPEND="
+ >=dev-libs/atk-2.7.5[introspection?]
+ >=dev-libs/glib-2.39.5:2
+ media-libs/fontconfig
+ >=x11-libs/cairo-1.12[aqua?,glib,svg,X?]
+ >=x11-libs/gdk-pixbuf-2.27.1:2[introspection?,X?]
+ >=x11-libs/gtk+-2.24:2
+ >=x11-libs/pango-1.32.4[introspection?]
+ x11-misc/shared-mime-info
+
+ cloudprint? (
+ >=net-libs/rest-0.7
+ >=dev-libs/json-glib-1.0 )
+ colord? ( >=x11-misc/colord-0.1.9:0= )
+ cups? ( >=net-print/cups-1.2 )
+ introspection? ( >=dev-libs/gobject-introspection-1.39 )
+ wayland? (
+ >=dev-libs/wayland-1.3.90
+ media-libs/mesa[wayland]
+ >=x11-libs/libxkbcommon-0.2
+ )
+ X? (
+ >=app-accessibility/at-spi2-atk-2.5.3
+ x11-libs/libXrender
+ x11-libs/libX11
+ >=x11-libs/libXi-1.3
+ x11-libs/libXext
+ >=x11-libs/libXrandr-1.3
+ x11-libs/libXcursor
+ x11-libs/libXfixes
+ x11-libs/libXcomposite
+ x11-libs/libXdamage
+ xinerama? ( x11-libs/libXinerama )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.1.2
+ dev-libs/libxslt
+ dev-util/gdbus-codegen
+ >=dev-util/gtk-doc-am-1.20
+ sys-devel/gettext
+ virtual/pkgconfig
+ X? (
+ x11-proto/xextproto
+ x11-proto/xproto
+ x11-proto/inputproto
+ x11-proto/damageproto
+ xinerama? ( x11-proto/xineramaproto )
+ )
+ test? (
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gail-1000
+ !<x11-libs/vte-0.31.0:2.90
+ X? ( !<x11-base/xorg-server-1.11.4 )
+"
+PDEPEND="vim-syntax? ( app-vim/gtk-syntax )"
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+ # -O3 and company cause random crashes in applications. Bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ # Build fix on Darwin 10.6; bug #519058
+ epatch "${FILESDIR}/${P}-darwin10.6.patch"
+
+ if ! use test ; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS testsuite Makefile.am
+ strip_builddir SRC_SUBDIRS testsuite Makefile.in
+ strip_builddir SRC_SUBDIRS tests Makefile.am
+ strip_builddir SRC_SUBDIRS tests Makefile.in
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.am
+ strip_builddir SRC_SUBDIRS demos Makefile.in
+ strip_builddir SRC_SUBDIRS examples Makefile.am
+ strip_builddir SRC_SUBDIRS examples Makefile.in
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ # Passing --disable-debug is not recommended for production use
+ # need libdir here to avoid a double slash in a path that libtool doesn't
+ # grok so well during install (// between $EPREFIX and usr ...)
+ gnome2_src_configure \
+ $(use_enable aqua quartz-backend) \
+ $(use_enable cloudprint) \
+ $(use_enable colord) \
+ $(use_enable cups cups auto) \
+ $(usex debug --enable-debug=yes "") \
+ $(use_enable introspection) \
+ $(use_enable wayland wayland-backend) \
+ $(use_enable X x11-backend) \
+ $(use_enable X xcomposite) \
+ $(use_enable X xdamage) \
+ $(use_enable X xfixes) \
+ $(use_enable X xkb) \
+ $(use_enable X xrandr) \
+ $(use_enable xinerama) \
+ --disable-papi \
+ --enable-man \
+ --enable-gtk2-dependency \
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+ --libdir="${EPREFIX}"/usr/$(get_libdir)
+}
+
+src_test() {
+ # Tests require a new gnome-themes-standard, but adding it to DEPEND
+ # would result in circular dependencies.
+ # https://bugzilla.gnome.org/show_bug.cgi?id=669562
+ if ! has_version '>=x11-themes/gnome-themes-standard-3.6[gtk]'; then
+ ewarn "Tests will be skipped because >=gnome-themes-standard-3.6[gtk]"
+ ewarn "is not installed. Please re-run tests after installing the"
+ ewarn "required version of gnome-themes-standard."
+ return 0
+ fi
+
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+ unset DBUS_SESSION_BUS_ADDRESS
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ insinto /etc/gtk-3.0
+ doins "${FILESDIR}"/settings.ini
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+
+ # add -framework Carbon to the .pc files
+ if use aqua ; then
+ for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+ sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+ -i "${ED}"usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+ done
+ fi
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ # Make sure loaders.cache belongs to gdk-pixbuf alone
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+ gnome2_query_immodules_gtk3
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your settings.ini file."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+ fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.14.13.ebuild b/x11-libs/gtk+/gtk+-3.14.13.ebuild
new file mode 100644
index 000000000000..ad321c084eb2
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.14.13.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ xinerama? ( X )
+"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+ >=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+ x11-misc/shared-mime-info
+
+ cloudprint? (
+ >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+ >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+ colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+ cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+ wayland? (
+ >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.1.2
+ dev-libs/libxslt
+ dev-libs/gobject-introspection-common
+ >=dev-util/gdbus-codegen-2.38.2
+ >=dev-util/gtk-doc-am-1.20
+ sys-devel/gettext
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ X? (
+ x11-proto/xextproto[${MULTILIB_USEDEP}]
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/inputproto[${MULTILIB_USEDEP}]
+ x11-proto/damageproto[${MULTILIB_USEDEP}]
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+ )
+ test? (
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-update-icon-cache-3
+ !<gnome-base/gail-1000
+ !<x11-libs/vte-0.31.0:2.90
+ >=x11-themes/adwaita-icon-theme-3.14
+ X? ( !<x11-base/xorg-server-1.11.4 )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+ gnome-base/librsvg[${MULTILIB_USEDEP}]
+ vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gtk-query-immodules-3.0
+)
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=738835
+ epatch "${FILESDIR}"/${PN}-non-bash-support.patch
+
+ # -O3 and company cause random crashes in applications. Bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ if ! use test ; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+ strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+ fi
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # need libdir here to avoid a double slash in a path that libtool doesn't
+ # grok so well during install (// between $EPREFIX and usr ...)
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(use_enable aqua quartz-backend) \
+ $(use_enable broadway broadway-backend) \
+ $(use_enable cloudprint) \
+ $(use_enable colord) \
+ $(use_enable cups cups auto) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable wayland wayland-backend) \
+ $(use_enable X x11-backend) \
+ $(use_enable X xcomposite) \
+ $(use_enable X xdamage) \
+ $(use_enable X xfixes) \
+ $(use_enable X xkb) \
+ $(use_enable X xrandr) \
+ $(use_enable xinerama) \
+ --disable-papi \
+ --enable-man \
+ --enable-gtk2-dependency \
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in gdk gtk libgail-util; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DISPLAY #527682
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+
+ # add -framework Carbon to the .pc files, bug #????
+ # FIXME: Is this still needed?
+# if use aqua ; then
+# for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+# sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+# -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+# done
+# fi
+}
+
+multilib_src_install_all() {
+ insinto /etc/gtk-3.0
+ doins "${FILESDIR}"/settings.ini
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make immodules.cache belongs to gtk+ alone
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+ multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ gnome2_query_immodules_gtk3 \
+ || die "Update immodules cache failed (for ${ABI})"
+ }
+ multilib_parallel_foreach_abi multilib_pkg_postinst
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your settings.ini file."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ multilib_pkg_postrm() {
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+ }
+ multilib_foreach_abi multilib_pkg_postrm
+ fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.14.9.ebuild b/x11-libs/gtk+/gtk+-3.14.9.ebuild
new file mode 100644
index 000000000000..45b486bc020e
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.14.9.ebuild
@@ -0,0 +1,244 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ xinerama? ( X )
+"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+# Use gtk+:2 for gtk-update-icon-cache
+COMMON_DEPEND="
+ >=dev-libs/atk-2.12[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.41.2:2[${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-2.24:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+ x11-misc/shared-mime-info
+
+ cloudprint? (
+ >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+ >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+ colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+ cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.39 )
+ wayland? (
+ >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.1.2
+ dev-libs/libxslt
+ dev-libs/gobject-introspection-common
+ >=dev-util/gdbus-codegen-2.38.2
+ >=dev-util/gtk-doc-am-1.20
+ sys-devel/gettext
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ X? (
+ x11-proto/xextproto[${MULTILIB_USEDEP}]
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/inputproto[${MULTILIB_USEDEP}]
+ x11-proto/damageproto[${MULTILIB_USEDEP}]
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+ )
+ test? (
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+ !<gnome-base/gail-1000
+ !<x11-libs/vte-0.31.0:2.90
+ >=x11-themes/adwaita-icon-theme-3.14
+ X? ( !<x11-base/xorg-server-1.11.4 )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="gnome-base/librsvg[${MULTILIB_USEDEP}]
+ vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gtk-query-immodules-3.0
+)
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=738835
+ epatch "${FILESDIR}"/${PN}-non-bash-support.patch
+
+ # -O3 and company cause random crashes in applications. Bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ if ! use test ; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+ strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+ fi
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # need libdir here to avoid a double slash in a path that libtool doesn't
+ # grok so well during install (// between $EPREFIX and usr ...)
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(use_enable aqua quartz-backend) \
+ $(use_enable broadway broadway-backend) \
+ $(use_enable cloudprint) \
+ $(use_enable colord) \
+ $(use_enable cups cups auto) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable wayland wayland-backend) \
+ $(use_enable X x11-backend) \
+ $(use_enable X xcomposite) \
+ $(use_enable X xdamage) \
+ $(use_enable X xfixes) \
+ $(use_enable X xkb) \
+ $(use_enable X xrandr) \
+ $(use_enable xinerama) \
+ --disable-papi \
+ --enable-man \
+ --enable-gtk2-dependency \
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in gdk gtk libgail-util; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DISPLAY #527682
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+
+ # add -framework Carbon to the .pc files, bug #????
+ if use aqua ; then
+ for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+ sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+ -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ insinto /etc/gtk-3.0
+ doins "${FILESDIR}"/settings.ini
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make immodules.cache belongs to gtk+ alone
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+ multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ gnome2_query_immodules_gtk3 \
+ || die "Update immodules cache failed (for ${ABI})"
+ }
+ multilib_parallel_foreach_abi multilib_pkg_postinst
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your settings.ini file."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ multilib_pkg_postrm() {
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+ }
+ multilib_foreach_abi multilib_pkg_postrm
+ fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.16.4.ebuild b/x11-libs/gtk+/gtk+-3.16.4.ebuild
new file mode 100644
index 000000000000..17d230e1f60d
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.16.4.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ xinerama? ( X )
+"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+ >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+ x11-misc/shared-mime-info
+
+ cloudprint? (
+ >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+ >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+ colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+ cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.39 )
+ wayland? (
+ >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.1.2
+ dev-libs/libxslt
+ dev-libs/gobject-introspection-common
+ >=dev-util/gdbus-codegen-2.38.2
+ >=dev-util/gtk-doc-am-1.20
+ >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ X? (
+ x11-proto/xextproto[${MULTILIB_USEDEP}]
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/inputproto[${MULTILIB_USEDEP}]
+ x11-proto/damageproto[${MULTILIB_USEDEP}]
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+ )
+ test? (
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )
+ examples? ( media-libs/libcanberra[gtk3] )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-update-icon-cache-3
+ !<gnome-base/gail-1000
+ !<x11-libs/vte-0.31.0:2.90
+ >=x11-themes/adwaita-icon-theme-3.14
+ X? ( !<x11-base/xorg-server-1.11.4 )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+ gnome-base/librsvg[${MULTILIB_USEDEP}]
+ vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gtk-query-immodules-3.0
+)
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+ # -O3 and company cause random crashes in applications. Bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ if ! use test ; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+ # the tests dir needs to be build now because since commit
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+ fi
+
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+ epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # need libdir here to avoid a double slash in a path that libtool doesn't
+ # grok so well during install (// between $EPREFIX and usr ...)
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(use_enable aqua quartz-backend) \
+ $(use_enable broadway broadway-backend) \
+ $(use_enable cloudprint) \
+ $(use_enable colord) \
+ $(use_enable cups cups auto) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable wayland wayland-backend) \
+ $(use_enable X x11-backend) \
+ $(use_enable X xcomposite) \
+ $(use_enable X xdamage) \
+ $(use_enable X xfixes) \
+ $(use_enable X xkb) \
+ $(use_enable X xrandr) \
+ $(use_enable xinerama) \
+ --disable-papi \
+ --disable-mir-backend \
+ --enable-man \
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in gdk gtk libgail-util; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DISPLAY #527682
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+
+ # add -framework Carbon to the .pc files, bug #???
+ if use aqua ; then
+ for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+ sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+ -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ insinto /etc/gtk-3.0
+ doins "${FILESDIR}"/settings.ini
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make immodules.cache belongs to gtk+ alone
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+ multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ gnome2_query_immodules_gtk3 \
+ || die "Update immodules cache failed (for ${ABI})"
+ }
+ multilib_parallel_foreach_abi multilib_pkg_postinst
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your settings.ini file."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ multilib_pkg_postrm() {
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+ }
+ multilib_foreach_abi multilib_pkg_postrm
+ fi
+}
diff --git a/x11-libs/gtk+/gtk+-3.16.5.ebuild b/x11-libs/gtk+/gtk+-3.16.5.ebuild
new file mode 100644
index 000000000000..58c561228cd4
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.16.5.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils flag-o-matic gnome2 multilib virtualx multilib-minimal
+
+DESCRIPTION="Gimp ToolKit +"
+HOMEPAGE="http://www.gtk.org/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+IUSE="aqua broadway cloudprint colord cups examples +introspection test vim-syntax wayland X xinerama"
+REQUIRED_USE="
+ || ( aqua wayland X )
+ xinerama? ( X )
+"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+
+# FIXME: introspection data is built against system installation of gtk+:3
+# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
+COMMON_DEPEND="
+ >=dev-libs/atk-2.15[introspection?,${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.43.4:2[${MULTILIB_USEDEP}]
+ media-libs/fontconfig[${MULTILIB_USEDEP}]
+ >=media-libs/libepoxy-1.0[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.14[aqua?,glib,svg,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/gdk-pixbuf-2.30:2[introspection?,X?,${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.7[introspection?,${MULTILIB_USEDEP}]
+ x11-misc/shared-mime-info
+
+ cloudprint? (
+ >=net-libs/rest-0.7[${MULTILIB_USEDEP}]
+ >=dev-libs/json-glib-1.0[${MULTILIB_USEDEP}] )
+ colord? ( >=x11-misc/colord-0.1.9:0=[${MULTILIB_USEDEP}] )
+ cups? ( >=net-print/cups-1.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.39:= )
+ wayland? (
+ >=dev-libs/wayland-1.5.91[${MULTILIB_USEDEP}]
+ media-libs/mesa[wayland,${MULTILIB_USEDEP}]
+ >=x11-libs/libxkbcommon-0.2[${MULTILIB_USEDEP}]
+ )
+ X? (
+ >=app-accessibility/at-spi2-atk-2.5.3[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
+ x11-libs/libXext[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
+ x11-libs/libXcursor[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes[${MULTILIB_USEDEP}]
+ x11-libs/libXcomposite[${MULTILIB_USEDEP}]
+ x11-libs/libXdamage[${MULTILIB_USEDEP}]
+ xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ app-text/docbook-xsl-stylesheets
+ app-text/docbook-xml-dtd:4.1.2
+ dev-libs/libxslt
+ dev-libs/gobject-introspection-common
+ >=dev-util/gdbus-codegen-2.38.2
+ >=dev-util/gtk-doc-am-1.20
+ >=sys-devel/gettext-0.18.3[${MULTILIB_USEDEP}]
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ X? (
+ x11-proto/xextproto[${MULTILIB_USEDEP}]
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/inputproto[${MULTILIB_USEDEP}]
+ x11-proto/damageproto[${MULTILIB_USEDEP}]
+ xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+ )
+ test? (
+ media-fonts/font-misc-misc
+ media-fonts/font-cursor-misc )
+ examples? ( media-libs/libcanberra[gtk3] )
+"
+# gtk+-3.2.2 breaks Alt key handling in <=x11-libs/vte-0.30.1:2.90
+# gtk+-3.3.18 breaks scrolling in <=x11-libs/vte-0.31.0:2.90
+# >=xorg-server-1.11.4 needed for
+# http://mail.gnome.org/archives/desktop-devel-list/2012-March/msg00024.html
+RDEPEND="${COMMON_DEPEND}
+ >=dev-util/gtk-update-icon-cache-3
+ !<gnome-base/gail-1000
+ !<x11-libs/vte-0.31.0:2.90
+ >=x11-themes/adwaita-icon-theme-3.14
+ X? ( !<x11-base/xorg-server-1.11.4 )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+# librsvg for svg icons (PDEPEND to avoid circular dep), bug #547710
+PDEPEND="
+ gnome-base/librsvg[${MULTILIB_USEDEP}]
+ vim-syntax? ( app-vim/gtk-syntax )
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/gtk-query-immodules-3.0
+)
+
+strip_builddir() {
+ local rule=$1
+ shift
+ local directory=$1
+ shift
+ sed -e "s/^\(${rule} =.*\)${directory}\(.*\)$/\1\2/" -i $@ \
+ || die "Could not strip director ${directory} from build."
+}
+
+src_prepare() {
+ # -O3 and company cause random crashes in applications. Bug #133469
+ replace-flags -O3 -O2
+ strip-flags
+
+ if ! use test ; then
+ # don't waste time building tests
+ strip_builddir SRC_SUBDIRS testsuite Makefile.{am,in}
+
+ # the tests dir needs to be build now because since commit
+ # 7ff3c6df80185e165e3bf6aa31bd014d1f8bf224 tests/gtkgears.o needs to be there
+ # strip_builddir SRC_SUBDIRS tests Makefile.{am,in}
+ fi
+
+ if ! use examples; then
+ # don't waste time building demos
+ strip_builddir SRC_SUBDIRS demos Makefile.{am,in}
+ strip_builddir SRC_SUBDIRS examples Makefile.{am,in}
+ fi
+
+ # gtk-update-icon-cache is installed by dev-util/gtk-update-icon-cache
+ epatch "${FILESDIR}"/${PN}-3.16.2-remove_update-icon-cache.patch
+
+ epatch_user
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ # need libdir here to avoid a double slash in a path that libtool doesn't
+ # grok so well during install (// between $EPREFIX and usr ...)
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ $(use_enable aqua quartz-backend) \
+ $(use_enable broadway broadway-backend) \
+ $(use_enable cloudprint) \
+ $(use_enable colord) \
+ $(use_enable cups cups auto) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable wayland wayland-backend) \
+ $(use_enable X x11-backend) \
+ $(use_enable X xcomposite) \
+ $(use_enable X xdamage) \
+ $(use_enable X xfixes) \
+ $(use_enable X xkb) \
+ $(use_enable X xrandr) \
+ $(use_enable xinerama) \
+ --disable-papi \
+ --disable-mir-backend \
+ --enable-man \
+ --with-xml-catalog="${EPREFIX}"/etc/xml/catalog \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ CUPS_CONFIG="${EPREFIX}/usr/bin/${CHOST}-cups-config"
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ local d
+ for d in gdk gtk libgail-util; do
+ ln -s "${S}"/docs/reference/${d}/html docs/reference/${d}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ # FIXME: this should be handled at eclass level
+ "${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/gtk" || die
+
+ unset DBUS_SESSION_BUS_ADDRESS
+ unset DISPLAY #527682
+ GSETTINGS_SCHEMA_DIR="${S}/gtk" Xemake check
+}
+
+multilib_src_install() {
+ gnome2_src_install
+
+ # add -framework Carbon to the .pc files, bug #???
+ if use aqua ; then
+ for i in gtk+-3.0.pc gtk+-quartz-3.0.pc gtk+-unix-print-3.0.pc; do
+ sed -e "s:Libs\: :Libs\: -framework Carbon :" \
+ -i "${ED%/}"/usr/$(get_libdir)/pkgconfig/$i || die "sed failed"
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ insinto /etc/gtk-3.0
+ doins "${FILESDIR}"/settings.ini
+
+ dodoc AUTHORS ChangeLog* HACKING NEWS* README*
+}
+
+pkg_preinst() {
+ gnome2_pkg_preinst
+
+ multilib_pkg_preinst() {
+ # Make immodules.cache belongs to gtk+ alone
+ local cache="usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache"
+
+ if [[ -e ${EROOT}${cache} ]]; then
+ cp "${EROOT}"${cache} "${ED}"/${cache} || die
+ else
+ touch "${ED}"/${cache} || die
+ fi
+ }
+ multilib_parallel_foreach_abi multilib_pkg_preinst
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ gnome2_query_immodules_gtk3 \
+ || die "Update immodules cache failed (for ${ABI})"
+ }
+ multilib_parallel_foreach_abi multilib_pkg_postinst
+
+ if ! has_version "app-text/evince"; then
+ elog "Please install app-text/evince for print preview functionality."
+ elog "Alternatively, check \"gtk-print-preview-command\" documentation and"
+ elog "add it to your settings.ini file."
+ fi
+}
+
+pkg_postrm() {
+ gnome2_pkg_postrm
+
+ if [[ -z ${REPLACED_BY_VERSIONS} ]]; then
+ multilib_pkg_postrm() {
+ rm -f "${EROOT}"usr/$(get_libdir)/gtk-3.0/3.0.0/immodules.cache
+ }
+ multilib_foreach_abi multilib_pkg_postrm
+ fi
+}
diff --git a/x11-libs/gtk+/metadata.xml b/x11-libs/gtk+/metadata.xml
new file mode 100644
index 000000000000..f5d67e73f0e5
--- /dev/null
+++ b/x11-libs/gtk+/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <longdescription>
+ GTK+ is a multi-platform toolkit for creating graphical user
+ interfaces. Offering a complete set of widgets, GTK+ is suitable
+ for projects ranging from small one-off projects to complete
+ application suites.
+ </longdescription>
+ <use>
+ <flag name="broadway">Enable the GDK Broadway backend.</flag>
+ <flag name="cloudprint">Enable printing via Google Cloud Print.</flag>
+ <flag name="colord">Use <pkg>x11-misc/colord</pkg> for color management
+ in printing</flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:gtk:gtk%2B</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtk+extra/Manifest b/x11-libs/gtk+extra/Manifest
new file mode 100644
index 000000000000..a8fff925acf7
--- /dev/null
+++ b/x11-libs/gtk+extra/Manifest
@@ -0,0 +1 @@
+DIST gtkextra-3.0.5.tar.gz 1465561 SHA256 9cab6c5d6b792eb828d17cec2b9c1baba2ef57f789a290464afab80b53969e65 SHA512 6bd6732dc06648ee3267ec1f5d64b01e0be4bfdc3fff914adaca73a563d28639b825e2881b6c6ed1ae08e605878d3aa92c308dc596a24ae8d803d0be93a56db9 WHIRLPOOL 430e43c7d5c257a229efe6e5d282576cacf476653cbf62ccbd0a2525fb271acaaf197db793666573b76f39a42bf82c6bcd2f7cf49ce1264ea15e0f94e7eaeb61
diff --git a/x11-libs/gtk+extra/files/gtk+extra-3.0.1-fix-configure.patch b/x11-libs/gtk+extra/files/gtk+extra-3.0.1-fix-configure.patch
new file mode 100644
index 000000000000..1aa60d27aa75
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-3.0.1-fix-configure.patch
@@ -0,0 +1,173 @@
+--- configure.in 2011/05/01 09:17:38 1.14
++++ configure.in 2011/11/26 10:39:19 1.15
+@@ -1,4 +1,13 @@
+ # Process this file with autoconf to produce a configure script.
++#
++# Help for autoconf:
++# - http://www.linuxselfhelp.com/gnu/autoconf/html_chapter/autoconf_toc.html
++# Option Syntax:
++# - http://www.linuxselfhelp.com/gnu/autoconf/html_chapter/autoconf_12.html
++# Printing Messages:
++# - http://www.linuxselfhelp.com/gnu/autoconf/html_chapter/autoconf_7.html
++#
++
+ AC_INIT(gtkextra,3.0.1)
+ AC_LANG([C])
+
+@@ -109,12 +118,15 @@
+ AM_CONDITIONAL(MS_LIB_AVAILABLE, test x$ms_librarian = xyes)
+
+ # --enable-debug option
+-dnl Check if we have enable debug support.
+-AC_MSG_CHECKING(whether to enable debugging)
+-debug_default="no"
++
++AC_MSG_CHECKING([whether to enable debugging])
++
+ AC_ARG_ENABLE(debug,
+- [ --enable-debug=[no/yes] turn on debugging [default=no]],,
+- enable_debug=$debug_default)
++ AC_HELP_STRING(
++ [--enable-debug=[no/yes]],
++ [turn on debugging [default=no]]),
++ ,
++ enable_debug=no)
+
+ if test "x$enable_debug" = "xyes"; then
+ test "$cflags_set" = set || CFLAGS="$CFLAGS -g -DDEBUG"
+@@ -237,31 +249,57 @@
+
+ # --enable-man option
+
++AC_MSG_CHECKING([whether to enable man pages])
++
+ AC_ARG_ENABLE(man,
+- [AC_HELP_STRING([--enable-man],
+- [regenerate man pages from Docbook [default=no]])],enable_man=yes,
+- enable_man=no)
++ AC_HELP_STRING(
++ [--enable-man],
++ [regenerate man pages from Docbook [default=no]])],
++ ,
++ enable_man=no)
+
+ if test "${enable_man}" != no; then
+- dnl
+- dnl Check for xsltproc
+- dnl
+- AC_PATH_PROG([XSLTPROC], [xsltproc])
+- if test -z "$XSLTPROC"; then
+- enable_man=no
+- fi
++ AC_MSG_RESULT(yes)
+
+- dnl check for DocBook DTD and stylesheets in the local catalog.
+- JH_CHECK_XML_CATALOG([-//OASIS//DTD DocBook XML V4.1.2//EN],
+- [DocBook XML DTD V4.1.2],,enable_man=no)
+- JH_CHECK_XML_CATALOG([http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
+- [DocBook XSL Stylesheets],,enable_man=no)
++ AC_PATH_PROG([XSLTPROC], [xsltproc])
++ if test -z "$XSLTPROC"; then
++ enable_man=no
++ fi
++
++ if test "$enable_man" = "no" ; then
++ AC_MSG_WARN([xsltproc is missing - disabling man pages])
++ fi
++
++ #check for DocBook DTD and stylesheets in the local catalog
++
++ JH_CHECK_XML_CATALOG(
++ [-//OASIS//DTD DocBook XML V4.1.2//EN],
++ [DocBook XML DTD V4.1.2],
++ ,
++ enable_man=no)
++
++ if test "$enable_man" = "no" ; then
++ AC_MSG_WARN([missing DocBook DTD - disabling man pages])
++ fi
++
++ JH_CHECK_XML_CATALOG(
++ [http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl],
++ [DocBook XSL Stylesheets],
++ ,
++ enable_man=no)
++
++ if test "$enable_man" = "no" ; then
++ AC_MSG_WARN([missing DocBook XML stylesheets - disabling man pages])
++ fi
++else
++ AC_MSG_RESULT(no)
+ fi
+ AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
+
+-dnl
+-dnl Start of pkg-config checks
+-dnl
++
++##################################################
++# Start of pkg-config checks
++##################################################
+
+ PKG_PROG_PKG_CONFIG
+
+@@ -275,13 +313,18 @@
+
+ # --enable-glade option
+
++AC_MSG_CHECKING([whether to enable glade integration])
++
+ AC_ARG_ENABLE(glade,
+- [AC_HELP_STRING([--enable-glade],
+- [build glade integration files [default=no]])],
+- enable_glade=yes,
++ AC_HELP_STRING(
++ [--enable-glade],
++ [build glade integration files [default=no]]),
++ ,
+ enable_glade=no)
+
+ if test "x$enable_glade" != xno; then
++ AC_MSG_RESULT(yes)
++
+ PKG_CHECK_MODULES([GLADE], [gladeui-1.0 >= 3.6])
+
+ AC_SUBST(GLADE_CATALOG_DIR, `$PKG_CONFIG --variable=catalogdir gladeui-1.0`)
+@@ -290,24 +333,32 @@
+
+ #You must define GETTEXT_PACKAGE before including gi18n-lib.h
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
+- AC_SUBST(GETTEXT_PACKAGE)
+- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext package.])
++ AC_SUBST(GETTEXT_PACKAGE)
++ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
++ [Name of the gettext package.])
+ AM_GLIB_GNU_GETTEXT
++else
++ AC_MSG_RESULT(no)
+ fi
+ AM_CONDITIONAL(ENABLE_GLADE, test x$enable_glade != xno)
+
+
+ # --enable-introspection
+
++AC_MSG_CHECKING([whether to enable gobject-introspection])
++
+ AC_ARG_ENABLE(introspection,
+- [AC_HELP_STRING([--enable-introspection],
+- [build gobject-introspection [default=no]])],
+- enable_introspection=yes,
++ AC_HELP_STRING(
++ [--enable-introspection],
++ [build gobject-introspection [default=no]]),
++ ,
+ enable_introspection=no)
+
+ if test "x$enable_introspection" != xno; then
++ AC_MSG_RESULT(yes)
+ GOBJECT_INTROSPECTION_CHECK([0.6.14])
+ else
++ AC_MSG_RESULT(no)
+ AM_CONDITIONAL(HAVE_INTROSPECTION, test 1=0)
+ fi
+ AM_CONDITIONAL(ENABLE_INTROSPECTION, test x$enable_introspection != xno)
diff --git a/x11-libs/gtk+extra/files/gtk+extra-3.0.1-gunicode.h.patch b/x11-libs/gtk+extra/files/gtk+extra-3.0.1-gunicode.h.patch
new file mode 100644
index 000000000000..63017be44fec
--- /dev/null
+++ b/x11-libs/gtk+extra/files/gtk+extra-3.0.1-gunicode.h.patch
@@ -0,0 +1,14 @@
+2011-11-16 Fredy Paquet <mailbox AT opag.ch>
+ * fixed include problem with glib V2.31.0 (only glib.h can be included directly)
+
+--- gtkextra/gtkcharsel.c 2011/09/10 11:44:53 1.10
++++ gtkextra/gtkcharsel.c 2011/11/26 11:05:59 1.11
+@@ -34,7 +34,7 @@
+
+
+ #include <gtk/gtk.h>
+-#include <glib/gunicode.h>
++#include <glib.h>
+
+ #include <string.h>
+ #include "gtkextra-compat.h"
diff --git a/x11-libs/gtk+extra/gtk+extra-3.0.5.ebuild b/x11-libs/gtk+extra/gtk+extra-3.0.5.ebuild
new file mode 100644
index 000000000000..86f7fd2bb210
--- /dev/null
+++ b/x11-libs/gtk+extra/gtk+extra-3.0.5.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="Useful Additional GTK+ widgets"
+HOMEPAGE="http://gtkextra.sourceforge.net"
+SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz"
+
+LICENSE="FDL-1.1 LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="+introspection static-libs test"
+
+RDEPEND="
+ >=x11-libs/gtk+-2.12.0:2
+ dev-libs/glib:2
+ introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+# dev-libs/gobject-introspection-common needed for eautoreconf
+
+S="${WORKDIR}/gtkextra-${PV}"
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-glade=no \
+ --disable-man \
+ $(use_enable introspection) \
+ $(use_enable static-libs static) \
+ $(use_enable test tests) \
+ --with-html-dir=/usr/share/doc/${PF}/html
+}
diff --git a/x11-libs/gtk+extra/metadata.xml b/x11-libs/gtk+extra/metadata.xml
new file mode 100644
index 000000000000..8e67fd60f834
--- /dev/null
+++ b/x11-libs/gtk+extra/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gnome</herd>
+ <use>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg> for
+ introspection</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">gtkextra</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtk-mac-integration/Manifest b/x11-libs/gtk-mac-integration/Manifest
new file mode 100644
index 000000000000..dc694cffbcb8
--- /dev/null
+++ b/x11-libs/gtk-mac-integration/Manifest
@@ -0,0 +1 @@
+DIST gtk-mac-integration-2.0.5.tar.xz 305656 SHA256 6c4ff7501d7ff35e49068052d80fcf76ce494e5953c5f3967e4958b1b0c67b9f SHA512 c26c9ceadb4b8c4410636e38fcd57f76a5b04b6dd14be44e62217973fe9ad1b1107a9771ddcc66e8e8fa078fa3b521df834b9928ba9371ef08cc5a55953426cd WHIRLPOOL ea369122dc30dab1327946e9fb52b6b48612f097ae29119cc5e1fce11f71d89cf2a9734162b0efe4ffdc0dba0b0318fd3c30a9a81b9cd0098867bc4ed5d6564b
diff --git a/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild
new file mode 100644
index 000000000000..e400d85b2d8a
--- /dev/null
+++ b/x11-libs/gtk-mac-integration/gtk-mac-integration-2.0.5.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Menubar, doc and app bundle integration for GTK+"
+HOMEPAGE="https://wiki.gnome.org/Projects/GTK%2B/OSX/Integration"
+SRC_URI="https://download.gnome.org/sources/${PN}/2.0/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x64-macos"
+IUSE=""
+
+DEPEND="virtual/pkgconfig
+ >=dev-libs/glib-2.14.0
+ x11-libs/gtk+[aqua]"
+
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ econf --enable-python=no
+}
diff --git a/x11-libs/gtk-mac-integration/metadata.xml b/x11-libs/gtk-mac-integration/metadata.xml
new file mode 100644
index 000000000000..4561e552bd04
--- /dev/null
+++ b/x11-libs/gtk-mac-integration/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>prefix</herd>
+</pkgmetadata>
diff --git a/x11-libs/gtkdatabox/Manifest b/x11-libs/gtkdatabox/Manifest
new file mode 100644
index 000000000000..d5bc331703b7
--- /dev/null
+++ b/x11-libs/gtkdatabox/Manifest
@@ -0,0 +1 @@
+DIST gtkdatabox-0.9.2.0.tar.gz 2836730 SHA256 745a6843e8f790504a86ad1b8642e1a9e595d75586215e0d2cb2f0bf0a324040 SHA512 cb36c4ec7b1b4db747520e00c80c037d02c26f60c04bd9d8e4eac06e4e0ec6a605d39e8f11d518751d3137a0ab38631916e98f15cb55cf024b3e5ed37a716f91 WHIRLPOOL 4c03b14ab984b375b9d7543e9e50f1e1cf8cc750bc76e164b5675840143451b6450593912121786379f540f54185a3392dcbfdb15b29cd132a06a39dbf4793b3
diff --git a/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild b/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
new file mode 100644
index 000000000000..f75c0654b831
--- /dev/null
+++ b/x11-libs/gtkdatabox/gtkdatabox-0.9.2.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+inherit eutils
+
+DESCRIPTION="Gtk+ Widgets for live display of large amounts of fluctuating numerical data"
+HOMEPAGE="http://sourceforge.net/projects/gtkdatabox/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="doc examples +glade static-libs test"
+
+RDEPEND="
+ glade? (
+ gnome-base/libglade
+ )
+ x11-libs/cairo
+ x11-libs/gtk+:2
+ x11-libs/pango
+"
+DEPEND=${RDEPEND}
+
+src_prepare() {
+ # Remove -D.*DISABLE_DEPRECATED cflags
+ find . -iname 'Makefile.am' -exec \
+ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed"
+ # Do Makefile.in after Makefile.am to avoid automake maintainer-mode
+ find . -iname 'Makefile.in' -exec \
+ sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 2 failed"
+ sed -e '/SUBDIRS/{s: examples::;}' -i Makefile.am -i Makefile.in || die
+}
+
+src_configure() {
+ econf \
+ $(use_enable doc gtk-doc) \
+ $(use_enable glade libglade) \
+ $(use_enable glade) \
+ $(use_enable static-libs static) \
+ $(use_enable test gtktest) \
+ --disable-dependency-tracking \
+ --enable-libtool-lock
+}
+
+src_install() {
+ default
+
+ prune_libtool_files
+
+ dodoc AUTHORS ChangeLog README TODO
+ if use examples; then
+ docinto examples
+ dodoc "${S}"/examples/*
+ fi
+}
diff --git a/x11-libs/gtkdatabox/metadata.xml b/x11-libs/gtkdatabox/metadata.xml
new file mode 100644
index 000000000000..6e85d8cc60ad
--- /dev/null
+++ b/x11-libs/gtkdatabox/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci-electronics</herd>
+ <maintainer>
+ <email>xmw@gentoo.org</email>
+ <name>Michael Weber</name>
+ </maintainer>
+ <longdescription>Gtk+ Widgets for live display fluctuating numerical data</longdescription>
+ <use>
+ <flag name="glade">Build with libglade and glade-3 supports, which includes a glade's module for GtkDataBox widget</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">gtkdatabox</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtkglarea/Manifest b/x11-libs/gtkglarea/Manifest
new file mode 100644
index 000000000000..ad3271f08bf8
--- /dev/null
+++ b/x11-libs/gtkglarea/Manifest
@@ -0,0 +1,3 @@
+DIST gtkglarea-1.2.3.tar.gz 291348 SHA256 4f11129687f7723935ebd54cb0e33849c42603e985b7bf9f09a6a3c9048a5d68
+DIST gtkglarea-2.0.1.tar.bz2 298744 SHA256 2318a18806bc2ebac56d18701965bb1f93783293a1795e285b990fc579076d95 SHA512 54d3c23637e4347c9cdc25fa0159f720bc6bf76e167b025efd14361f1026af18f41686860444083100f939bec66309b1ffbb84c776c88e513d6ad4a06f66c79e WHIRLPOOL a5c78bfb86291a282f54276acccda38598d3af22065a82bc8b31683de9e804955075b7ad1e87d6a6369580b73582ba5ab61bcd2fe59970d2cd107aeb5fa0e624
+DIST gtkglarea-2.1.0.tar.xz 264100 SHA256 8e1e545877d2f5139300b54c2e3bcd70acf7d80a78421a894192186a64db82de SHA512 c790c1b542d85d86cd57f333c87ab2c930c8065d6f75320d588688b9a0adb8c4270522b6b88734720db1b71170f4f12c95e650e9a599a5d7e4b7baadf1f9f06b WHIRLPOOL deb909ad7b295f9712723b83be896b3c7ccba1d4e932de8ac4db9355fe568bc0228d7d87bec365ae64bf244f0ee8dec90061e934d9ec952d873cf803f2d8d331
diff --git a/x11-libs/gtkglarea/files/gtkglarea-1.2.3-m4.patch b/x11-libs/gtkglarea/files/gtkglarea-1.2.3-m4.patch
new file mode 100644
index 000000000000..498a28d63350
--- /dev/null
+++ b/x11-libs/gtkglarea/files/gtkglarea-1.2.3-m4.patch
@@ -0,0 +1,11 @@
+--- gtkgl.m4.orig 2005-08-19 02:04:40.000000000 -0400
++++ gtkgl.m4 2005-08-19 02:04:48.000000000 -0400
+@@ -1,7 +1,7 @@
+ dnl
+ dnl AM_PATH_GTKGL([ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]])
+ dnl
+-AC_DEFUN(AM_PATH_GTKGL,
++AC_DEFUN([AM_PATH_GTKGL],
+ [
+ AC_REQUIRE([AM_PATH_GTK])
+
diff --git a/x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..2e2105ac7a2f
--- /dev/null
+++ b/x11-libs/gtkglarea/gtkglarea-1.2.3-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils multilib autotools
+
+# GTKGLArea has been abandoned by the author. We'll continue to mirror the
+# source on Gentoo mirrors.
+DESCRIPTION="OpenGL canvas and context provider for GTK+"
+HOMEPAGE="http://www.mono-project.com/GtkGLArea"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
+
+LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
+SLOT="1"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc sh sparc x86"
+IUSE=""
+
+RDEPEND="=x11-libs/gtk+-1.2*
+ virtual/glu
+ virtual/opengl"
+DEPEND="${RDEPEND}"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-m4.patch
+ if [ $(get_libdir) != "lib" ] ; then
+ eautoreconf
+ fi
+}
+
+src_compile() {
+ ./configure --prefix=/usr \
+ --host=${CHOST} \
+ --libdir=/usr/$(get_libdir) || die
+ emake || die
+}
+
+src_install() {
+ make DESTDIR="${D}" libdir=/usr/$(get_libdir) install || die
+ dodoc AUTHORS ChangeLog NEWS README
+ docinto txt
+ dodoc docs/*.txt
+}
diff --git a/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..4d84ccb85b03
--- /dev/null
+++ b/x11-libs/gtkglarea/gtkglarea-2.0.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit gnome2
+
+DESCRIPTION="OpenGL canvas and context provider for GTK+"
+HOMEPAGE="http://www.mono-project.com/GtkGLArea"
+
+LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND=">=x11-libs/gtk+-2.0.3:2
+ virtual/opengl"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # Do not build examples
+ sed "s:\(SUBDIRS.*\)examples:\1:" -i Makefile.am Makefile.in || die "sed 1 failed"
+ # -lGLU is only needed for building examples. Avoid autoreconf.
+ sed -e 's: -lGLU::' -i configure || die "sed 2 failed"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --disable-static
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog NEWS README* docs/*.txt"
+ gnome2_src_install
+
+ if use examples; then
+ cd "${S}"/examples
+ insinto /usr/share/doc/${PF}/examples
+ doins *.c *.h *.lwo README || die "doins failed"
+ fi
+}
diff --git a/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
new file mode 100644
index 000000000000..3582ca3c11e5
--- /dev/null
+++ b/x11-libs/gtkglarea/gtkglarea-2.1.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2
+
+DESCRIPTION="OpenGL canvas and context provider for GTK+"
+HOMEPAGE="http://www.mono-project.com/GtkGLArea"
+
+LICENSE="LGPL-2+ GPL-2+" # examples are GPL-2+, library is LGPL-2+
+SLOT="2"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="examples"
+
+RDEPEND="
+ >=x11-libs/gtk+-2.22:2
+ virtual/opengl
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Do not build examples
+ sed -e "s:\(SUBDIRS.*\)examples:\1:" \
+ -i Makefile.am Makefile.in || die "sed 1 failed"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --disable-static
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog NEWS README* docs/*.txt"
+ gnome2_src_install
+
+ if use examples; then
+ cd "${S}"/examples
+ insinto /usr/share/doc/${PF}/examples
+ doins *.c *.h *.lwo README || die "doins failed"
+ fi
+}
diff --git a/x11-libs/gtkglarea/metadata.xml b/x11-libs/gtkglarea/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/x11-libs/gtkglarea/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>gnome</herd>
+</pkgmetadata>
diff --git a/x11-libs/gtkglext/Manifest b/x11-libs/gtkglext/Manifest
new file mode 100644
index 000000000000..235d366952a1
--- /dev/null
+++ b/x11-libs/gtkglext/Manifest
@@ -0,0 +1 @@
+DIST gtkglext-1.2.0.tar.bz2 703821 SHA256 16bd736074f6b14180f206b7e91263fc721b49912ea3258ab5f094cfa5497f51 SHA512 c5452b7594195da3c1428dc3021a041d70bb8079a514b7310fe7b66f638748ad2399adead36047b52b60b033757581e72f0532c0301e033019bf909f7365071d WHIRLPOOL 2be1308abd4a73a838942ab9fac4d733239b4fe5ba0b50f542510be24088d6697868d2d900b77f8c8e973efd46a5fbb4d2ffd53c7aea8a07d9326bf276908c4f
diff --git a/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
new file mode 100644
index 000000000000..78c2c05f95ca
--- /dev/null
+++ b/x11-libs/gtkglext/files/gtkglext-1.2.0-gl-configure.patch
@@ -0,0 +1,358 @@
+From 6eaa9b0dc18e6ddff093c2e99a3c7d5eeb9c8f5d Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Sun, 15 Mar 2015 14:42:25 -0400
+Subject: [PATCH] Backport some git master fixes for GL/GLU detection to 1.2.0
+
+---
+ configure.in | 313 +++++++++--------------------------------------------------
+ 1 file changed, 44 insertions(+), 269 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e5b678c..5aa1b7d 100644
+--- a/configure.in
++++ b/configure.in
+@@ -502,274 +502,58 @@ AC_SUBST([GDKGLEXT_WIN_EXTRA_DEFS])
+ # Checks for OpenGL
+ ##################################################
+
+-GL_CFLAGS=""
+-GL_LDFLAGS=""
+-GL_LIBS=""
+-
+-AC_ARG_WITH([gl-prefix],
+- [AC_HELP_STRING([--with-gl-prefix=DIR],
+- [OpenGL (Mesa) is installed in DIR [default=auto]])], ,
+- [with_gl_prefix=auto])
+-
+-AC_ARG_WITH([gl-includedir],
+- [AC_HELP_STRING([--with-gl-includedir=DIR],
+- [OpenGL (Mesa) headers are in DIR [default=auto]])], ,
+- [with_gl_includedir=auto])
+-
+-AC_ARG_WITH([gl-libdir],
+- [AC_HELP_STRING([--with-gl-libdir=DIR],
+- [OpenGL (Mesa) libraries are in DIR [default=auto]])], ,
+- [with_gl_libdir=auto])
+-
+-if test "x$with_gl_includedir" != "xauto"; then
+- GL_CFLAGS="-I$with_gl_includedir"
+-elif test "x$with_gl_prefix" != "xauto"; then
+- GL_CFLAGS="-I$with_gl_prefix/include"
++if test "x$gdktarget" = "xx11"; then
++ with_gl=x
+ fi
+
+-if test "x$with_gl_libdir" != "xauto"; then
+- GL_LDFLAGS="-L$with_gl_libdir"
+-elif test "x$with_gl_prefix" != "xauto"; then
+- GL_LDFLAGS="-L$with_gl_prefix/lib"
++AX_CHECK_GL
++AS_IF([test X$no_gl = Xyes],
++ [AC_MSG_FAILURE([OpenGL is required.])])
++AX_CHECK_GLU
++# FIXME: AX_CHECK_GLU's behavior diverges from common autoconf conventions
++AM_CONDITIONAL([GLU],[test "$no_glu" != yes])
++
++# Checks for some types in gdk/GL/glxext.h
++
++# GLXFBConfigSGIX
++GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
++ [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
++ GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
+ fi
+
+-save_CPPFLAGS="$CPPFLAGS"
+-CPPFLAGS="$CPPFLAGS $GL_CFLAGS $WINDOWING_CFLAGS"
+-save_LIBS="$LIBS"
+-LIBS="$LIBS $GL_LDFLAGS $WINDOWING_LIBS $MATH_LIB"
+-
+-if test "x$gdktarget" = "xx11"; then
+- AC_CHECK_HEADERS([GL/glx.h], ,
+- [AC_MSG_ERROR([Cannot find GLX header])])
++# GLXFBConfigIDSGIX
++GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
++ [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
++ GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
+ fi
+
+-AC_CHECK_HEADERS([GL/gl.h GL/glu.h], ,
+- [AC_MSG_ERROR([Cannot find OpenGL headers])])
+-
+-if test "x$gdktarget" = "xx11"; then
+-
+- # for X11
+-
+- THREAD_LIB="-lpthread"
+- STDCXX_LIB="-lstdc++"
+-
+- have_GL=no
+- GL_LIB_NAME=GL
+-
+- # GLcore and GL (SGI)
+- AC_CHECK_LIB([GLcore], [glVertex3d],
+- [GL_LIBS="-lGLcore"])
+- if test "x$ac_cv_lib_GLcore_glVertex3d" = "xyes" ; then
+- # if GLcore found, then also check for GL
+- AC_CHECK_LIB([GL], [glXCreateContext],
+- [GL_LIBS="-lGL $GL_LIBS"
+- have_GL=yes])
+- fi
+-
+- # GL
+- if test "x$have_GL" = "xno" ; then
+- # if no GLcore and GL, check for GL
+- AC_CHECK_LIB([GL], [glVertex3d],
+- [GL_LIBS="-lGL"
+- have_GL=yes])
+- if test "x$ac_cv_lib_GL_glVertex3d" = "xno" ; then
+- # GL may need to be linked with the thread library explicitly
+- AC_CHECK_LIB([GL], [glVertex3f],
+- [GL_LIBS="-lGL $THREAD_LIB"
+- have_GL=yes], ,
+- [$THREAD_LIB])
+- if test "x$ac_cv_lib_GL_glVertex3f" = "xno" ; then
+- # GL may need to be linked with std C++ library explicitly
+- AC_CHECK_LIB([GL], [glVertex3i],
+- [GL_LIBS="-lGL $STDCXX_LIB"
+- have_GL=yes], ,
+- [$STDCXX_LIB])
+- if test "x$ac_cv_lib_GL_glVertex3i" = "xno" ; then
+- # GL may need to be linked with std C++ and thread libraries explicitly
+- AC_CHECK_LIB([GL], [glVertex3s],
+- [GL_LIBS="-lGL $STDCXX_LIB $THREAD_LIB"
+- have_GL=yes], ,
+- [$STDCXX_LIB $THREAD_LIB])
+- fi
+- fi
+- fi
+- fi
+-
+- # MesaGL
+- if test "x$have_GL" = "xno" ; then
+- # if no GL, check for MesaGL
+- AC_CHECK_LIB([MesaGL], [glVertex3d],
+- [GL_LIBS="-lMesaGL"
+- have_GL=yes
+- GL_LIB_NAME=MesaGL])
+- fi
+-
+- if test "x$have_GL" = "xno" ; then
+- # no GL found
+- AC_MSG_ERROR([Cannot find GL library])
+- fi
+-
+- # GLU
+-
+- have_GLU=no
+- have_SGI_GLU=no
+-
+- AC_CHECK_LIB([GLU], [gluSphere],
+- [GL_LIBS="-lGLU $GL_LIBS"
+- have_GLU=yes], ,
+- [$GL_LIBS])
+- if test "x$ac_cv_lib_GLU_gluSphere" = "xno" ; then
+- # GLU may need to be linked with the thread library explicitly
+- AC_CHECK_LIB([GLU], [gluCylinder],
+- [GL_LIBS="-lGLU $GL_LIBS $THREAD_LIB"
+- have_GLU=yes], ,
+- [$GL_LIBS $THREAD_LIB])
+- if test "x$ac_cv_lib_GLU_gluCylinder" = "xno" ; then
+- # GLU may need to be linked with std C++ library explicitly
+- AC_CHECK_LIB([GLU], [gluDisk],
+- [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB"
+- have_GLU=yes
+- have_SGI_GLU=yes], ,
+- [$GL_LIBS $STDCXX_LIB])
+- if test "x$ac_cv_lib_GLU_gluDisk" = "xno" ; then
+- # GLU may need to be linked with std C++ and thread libraries explicitly
+- AC_CHECK_LIB([GLU], [gluPartialDisk],
+- [GL_LIBS="-lGLU $GL_LIBS $STDCXX_LIB $THREAD_LIB"
+- have_GLU=yes
+- have_SGI_GLU=yes], ,
+- [$GL_LIBS $STDCXX_LIB $THREAD_LIB])
+- fi
+- fi
+- fi
+-
+- if test "x$have_GLU" = "xno" ; then
+- # if no GLU, check for MesaGLU
+- AC_CHECK_LIB([MesaGLU], [gluSphere],
+- [GL_LIBS="-lMesaGLU $GL_LIBS"
+- have_GLU=yes], ,
+- [$GL_LIBS])
+- fi
+-
+- if test "x$have_GLU" = "xno" ; then
+- # no GLU found
+- AC_MSG_ERROR([Cannot find GLU library])
+- fi
+-
+- # Checks for SGI's GLU library
+- if test "x$have_SGI_GLU" = "xno" ; then
+- # Try static linking
+- save_LDFLAGS="$LDFLAGS"
+- LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
+-
+- AC_CHECK_LIB([GLU], [gluBeginCurve],
+- [have_SGI_GLU=no], ,
+- [$GL_LIBS])
+- if test "x$ac_cv_lib_GLU_gluBeginCurve" = "xno" ; then
+- AC_CHECK_LIB([GLU], [gluBeginPolygon],
+- [GL_LIBS="$GL_LIBS $STDCXX_LIB"
+- have_SGI_GLU=yes], ,
+- [$GL_LIBS $STDCXX_LIB])
+- fi
+-
+- LDFLAGS="$save_LDFLAGS"
+- fi
+-
+- AC_MSG_CHECKING([whether libGLU needs to be linked with the std C++ library])
+- AC_MSG_RESULT([$have_SGI_GLU])
+-
+- # Checks for some types in gdk/GL/glxext.h
+-
+- # GLXFBConfigSGIX
+- GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=no
+- AC_CHECK_TYPES([GLXFBConfigSGIX], , ,
+- [#include <GL/glx.h>])
+- if test "x$ac_cv_type_GLXFBConfigSGIX" = "xno" ; then
+- GDKGLEXT_NEED_GLXFBCONFIGSGIX_TYPEDEF=yes
+- fi
+-
+- # GLXFBConfigIDSGIX
+- GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=no
+- AC_CHECK_TYPES([GLXFBConfigIDSGIX], , ,
+- [#include <GL/glx.h>])
+- if test "x$ac_cv_type_GLXFBConfigIDSGIX" = "xno" ; then
+- GDKGLEXT_NEED_GLXFBCONFIGIDSGIX_TYPEDEF=yes
+- fi
+-
+- # GLXPbufferSGIX
+- GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
+- AC_CHECK_TYPES([GLXPbufferSGIX], , ,
+- [#include <GL/glx.h>])
+- if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
+- GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
+- fi
+-
+- # GLXVideoSourceSGIX
+- GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
+- AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
+- [#include <GL/glx.h>])
+- if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
+- GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
+- fi
+-
+- # __GLXextFuncPtr
+- GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
+- AC_CHECK_TYPES([__GLXextFuncPtr], , ,
+- [#include <GL/glx.h>])
+- if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
+- GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
+- fi
+-
+-else
+-
+- # for Win32
+-
+- AC_MSG_CHECKING([for glNewList in -lopengl32])
+- have_opengl32=no
+- LIBS="-lopengl32 $LIBS"
+- AC_TRY_LINK([#include <windows.h>
+- #include <GL/gl.h>],
+- [glVertex3d(0.0, 0.0, 0.0);],
+- [GL_LIBS="-lopengl32"
+- have_opengl32=yes])
+- AC_MSG_RESULT([$have_opengl32])
+- if test "x$have_opengl32" = "xno" ; then
+- AC_MSG_ERROR([Cannot find GL library])
+- fi
+-
+- AC_MSG_CHECKING([for gluNewQuadric in -lglu32])
+- have_glu32=no
+- LIBS="-lglu32 $LIBS"
+- AC_TRY_LINK([#include <windows.h>
+- #include <GL/gl.h>
+- #include <GL/glu.h>],
+- [gluNewQuadric();],
+- [GL_LIBS="-lglu32 $GL_LIBS"
+- have_glu32=yes])
+- AC_MSG_RESULT([$have_glu32])
+- if test "x$have_glu32" = "xno" ; then
+- AC_MSG_ERROR([Cannot find GLU library])
+- fi
+-
+-dnl AC_CHECK_LIB(opengl32, glNewList,
+-dnl GL_LIBS="-lopengl32",
+-dnl AC_MSG_ERROR(Cannot find GL library))
+-
+-dnl AC_CHECK_LIB(glu32, gluNewQuadric,
+-dnl GL_LIBS="-lglu32 $GL_LIBS",
+-dnl AC_MSG_ERROR(Cannot find GLU library),
+-dnl $GL_LIBS)
++# GLXPbufferSGIX
++GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXPbufferSGIX], , ,
++ [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXPbufferSGIX" = "xno" ; then
++ GDKGLEXT_NEED_GLXPBUFFERSGIX_TYPEDEF=yes
++fi
+
++# GLXVideoSourceSGIX
++GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=no
++AC_CHECK_TYPES([GLXVideoSourceSGIX], , ,
++ [#include <GL/glx.h>])
++if test "x$ac_cv_type_GLXVideoSourceSGIX" = "xno" ; then
++ GDKGLEXT_NEED_GLXVIDEOSOURCESGIX_TYPEDEF=yes
+ fi
+
+-dnl # if using mesa, check for xmesa.h
+-dnl if test "x$ac_cv_lib_MesaGL_glNewList" = "xyes" ; then
+-dnl AC_CHECK_HEADERS([GL/xmesa.h])
+-dnl AM_CONDITIONAL(ENABLE_XMESA_FX, \
+-dnl test "x$ac_cv_header_GL_xmesa_h" = "xyes")
+-dnl else
+-dnl # force a failed check
+-dnl AM_CONDITIONAL(ENABLE_XMESA_FX, test "no" = "yes")
+-dnl fi
++# __GLXextFuncPtr
++GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=no
++AC_CHECK_TYPES([__GLXextFuncPtr], , ,
++ [#include <GL/glx.h>])
++if test "x$ac_cv_type___GLXextFuncPtr" = "xno" ; then
++ GDKGLEXT_NEED_GLXEXTFUNCPTR_TYPEDEF=yes
++fi
+
+ # Checks for typedefs in gdk/GL/glext.h
+
+@@ -781,22 +565,13 @@ if test "x$ac_cv_type_GLhalfNV" = "xno" ; then
+ GDKGLEXT_NEED_GLHALFNV_TYPEDEF=yes
+ fi
+
+-GL_LIBS="$GL_LDFLAGS $GL_LIBS"
+-
+-AC_SUBST([GL_CFLAGS])
+-AC_SUBST([GL_LIBS])
+-
+-CPPFLAGS="$save_CPPFLAGS"
+-LIBS="$save_LIBS"
+-
+-
+ ##################################################
+ # CFLAGS and LIBS
+ ##################################################
+
+ GDKGLEXT_PACKAGES="gdk_pkg pango_pkg pangox_pkg gmodule_pkg"
+ GDKGLEXT_EXTRA_CFLAGS="$GL_CFLAGS $GDKGLEXT_WIN_CFLAGS"
+-GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GDKGLEXT_WIN_LIBS"
++GDKGLEXT_EXTRA_LIBS="$GL_LIBS $GLU_LIBS $GDKGLEXT_WIN_LIBS"
+ GDKGLEXT_DEP_CFLAGS="$GDKGLEXT_EXTRA_CFLAGS `$PKG_CONFIG --cflags $GDKGLEXT_PACKAGES`"
+ GDKGLEXT_DEP_LIBS="$GDKGLEXT_EXTRA_LIBS `$PKG_CONFIG --libs $GDKGLEXT_PACKAGES` $MATH_LIB"
+ AC_SUBST([GDKGLEXT_PACKAGES])
+--
+2.3.2
+
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild
new file mode 100644
index 000000000000..63f8a9431d75
--- /dev/null
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GNOME2_LA_PUNT="yes"
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="GL extensions for Gtk+ 2.0"
+HOMEPAGE="http://gtkglext.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.3[X,${MULTILIB_USEDEP}]
+ || (
+ >=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
+ <x11-libs/pango-1.31[X,${MULTILIB_USEDEP}]
+ )
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+ >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Remove development knobs, bug #308973
+ sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
+ examples/Makefile.am examples/Makefile.in \
+ gdk/Makefile.am gdk/Makefile.in \
+ gdk/win32/Makefile.am gdk/win32/Makefile.in \
+ gdk/x11/Makefile.am gdk/x11/Makefile.in \
+ gtk/Makefile.am gtk/Makefile.in \
+ || die "sed failed"
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ local DOCS="AUTHORS ChangeLog* NEWS README TODO"
+ einstalldocs
+}
diff --git a/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild b/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild
new file mode 100644
index 000000000000..fdade753ae3c
--- /dev/null
+++ b/x11-libs/gtkglext/gtkglext-1.2.0-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+GNOME2_LA_PUNT="yes"
+inherit autotools gnome2 multilib-minimal
+
+DESCRIPTION="GL extensions for Gtk+ 2.0"
+HOMEPAGE="http://gtkglext.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-2.24.23:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.3[X,${MULTILIB_USEDEP}]
+ || (
+ >=x11-libs/pangox-compat-0.0.2[${MULTILIB_USEDEP}]
+ <x11-libs/pango-1.31[X,${MULTILIB_USEDEP}]
+ )
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+ >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=sys-devel/autoconf-archive-2014.02.28
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
+
+src_prepare() {
+ # Ancient configure.in with broken multilib gl detection (bug #543050)
+ # Backport some configure updates from upstream git master to fix
+ epatch "${FILESDIR}/${P}-gl-configure.patch"
+ mv configure.{in,ac} || die "mv failed"
+ eautoreconf
+
+ gnome2_src_prepare
+
+ # Remove development knobs, bug #308973
+ sed -i 's:-D\(G.*DISABLE_DEPRECATED\):-D__\1__:g' \
+ examples/Makefile.am examples/Makefile.in \
+ gdk/Makefile.am gdk/Makefile.in \
+ gdk/win32/Makefile.am gdk/win32/Makefile.in \
+ gdk/x11/Makefile.am gdk/x11/Makefile.in \
+ gtk/Makefile.am gtk/Makefile.in \
+ || die "sed failed"
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --disable-static
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+multilib_src_install_all() {
+ local DOCS="AUTHORS ChangeLog* NEWS README TODO"
+ einstalldocs
+}
diff --git a/x11-libs/gtkglext/metadata.xml b/x11-libs/gtkglext/metadata.xml
new file mode 100644
index 000000000000..c77e80cdedf9
--- /dev/null
+++ b/x11-libs/gtkglext/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>gnome</herd>
+ <upstream>
+ <remote-id type="sourceforge">gtkglext</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtkhotkey/Manifest b/x11-libs/gtkhotkey/Manifest
new file mode 100644
index 000000000000..d3ec0f24516a
--- /dev/null
+++ b/x11-libs/gtkhotkey/Manifest
@@ -0,0 +1 @@
+DIST gtkhotkey-0.2.1.tar.gz 382043 SHA256 fe1cf0d93026d791e856170356f56fbdff9095fe637c4a74104144c1e5111d67 SHA512 7f7e1b9bd94ff806d98277f2dafbf5b6569efdc6f0367a83e885d38584a8f6e098f31d0f03b080f2ca76394eb73e43f9da07e0d944a2e6443a55d9f2e8fee324 WHIRLPOOL 4fb7e1a131ae64c4fa0901c6444fdeb9af97cd0b85f48e282e5cc08877222f32eca9b1f279b072c2d49a8414839384560abed1d8bbc5cad94e64c09d875cb8bc
diff --git a/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch
new file mode 100644
index 000000000000..389db601c43f
--- /dev/null
+++ b/x11-libs/gtkhotkey/files/gtkhotkey-0.2.1-glibheaders.patch
@@ -0,0 +1,22 @@
+diff -Nurp gtkhotkey-0.2.1/src/gtk-hotkey-error.h gtkhotkey-0.2.1_patched//src/gtk-hotkey-error.h
+--- gtkhotkey-0.2.1/src/gtk-hotkey-error.h 2009-09-03 22:52:49.000000000 +0200
++++ gtkhotkey-0.2.1_patched//src/gtk-hotkey-error.h 2012-02-19 12:04:19.483701649 +0100
+@@ -23,7 +23,7 @@
+ #ifndef __GTK_HOTKEY_ERROR_H__
+ #define __GTK_HOTKEY_ERROR_H__
+
+-#include <glib/gquark.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
+
+--- gtkhotkey-0.2.1/src/x11/tomboykeybinder.h 2009-09-03 22:52:49.000000000 +0200
++++ gtkhotkey-0.2.1-r1/src/x11/tomboykeybinder.h 2012-02-19 21:40:09.004325272 +0100
+@@ -2,7 +2,7 @@
+ #ifndef __TOMBOY_KEY_BINDER_H__
+ #define __TOMBOY_KEY_BINDER_H__
+
+-#include <glib/gtypes.h>
++#include <glib.h>
+
+ G_BEGIN_DECLS
diff --git a/x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild b/x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild
new file mode 100644
index 000000000000..f430a38d5686
--- /dev/null
+++ b/x11-libs/gtkhotkey/gtkhotkey-0.2.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="2"
+
+inherit versionator eutils
+
+MY_CRV=$(get_version_component_range 1-2)
+
+RESTRICT="test"
+# Tests try to access live filesystem
+# See http://bugs.gentoo.org/show_bug.cgi?id=259052#c3
+
+DESCRIPTION="Cross platform library for using desktop wide hotkeys"
+HOMEPAGE="http://launchpad.net/gtkhotkey"
+SRC_URI="http://launchpad.net/${PN}/${MY_CRV}/${PV}/+download/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+COMMON_DEPEND=">=dev-libs/glib-2.16
+ >=x11-libs/gtk+-2.12:2"
+
+RDEPEND="${COMMON_DEPEND}
+ virtual/libintl"
+
+DEPEND="${COMMON_DEPEND}
+ virtual/pkgconfig
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext"
+
+src_prepare() {
+ sed -i -e "s: install-gtkhotkeydocDATA ::" Makefile.in || die "Patching Makefile.in failed"
+ epatch "${FILESDIR}"/${P}-glibheaders.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+ dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
+}
diff --git a/x11-libs/gtkhotkey/metadata.xml b/x11-libs/gtkhotkey/metadata.xml
new file mode 100644
index 000000000000..3a0f048396db
--- /dev/null
+++ b/x11-libs/gtkhotkey/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>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="launchpad">gtkhotkey</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/gtkmathview/Manifest b/x11-libs/gtkmathview/Manifest
new file mode 100644
index 000000000000..b7f2882b31cc
--- /dev/null
+++ b/x11-libs/gtkmathview/Manifest
@@ -0,0 +1 @@
+DIST gtkmathview-0.8.0.tar.gz 987328 SHA256 1dc30175da6a3c560a7d62d1abe1c2f9829d988e6f1a7c5e766544575c558c43 SHA512 aa7eb4aa031f9b9727be3fd8635fdac0e912585de9b91c5e71400edc5fa0b3257724244f796fea0122e32318d00701e63ee7fb12b97b7abbb7940a5439d31adb WHIRLPOOL ade6b30a20e8f0e38b2a9935733425759eb69db3d28ad9ebc28f5441fc82571a52787381d4d3f48852f9bcf1550318048a316bd92c9151fdf3074bf3f4edd591
diff --git a/x11-libs/gtkmathview/files/binreloc.m4 b/x11-libs/gtkmathview/files/binreloc.m4
new file mode 100644
index 000000000000..46696bf64567
--- /dev/null
+++ b/x11-libs/gtkmathview/files/binreloc.m4
@@ -0,0 +1,77 @@
+# Check for binary relocation support
+# Hongli Lai
+# http://autopackage.org/
+
+AC_DEFUN([AM_BINRELOC],
+[
+ AC_ARG_ENABLE(binreloc,
+ [ --enable-binreloc compile with binary relocation support
+ (default=disable)],
+ enable_binreloc=$enableval,enable_binreloc=no)
+
+ AC_ARG_ENABLE(binreloc-threads,
+ [ --enable-binreloc-threads compile binary relocation with threads support
+ (default=yes)],
+ enable_binreloc_threads=$enableval,enable_binreloc_threads=yes)
+
+ BINRELOC_CFLAGS=
+ BINRELOC_LIBS=
+ if test "x$enable_binreloc" = "xauto"; then
+ AC_CHECK_FILE([/proc/self/maps])
+ AC_CACHE_CHECK([whether everything is installed to the same prefix],
+ [br_cv_valid_prefixes], [
+ if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
+ "$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
+ "$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
+ then
+ br_cv_valid_prefixes=yes
+ else
+ br_cv_valid_prefixes=no
+ fi
+ ])
+ fi
+ AC_CACHE_CHECK([whether binary relocation support should be enabled],
+ [br_cv_binreloc],
+ [if test "x$enable_binreloc" = "xyes"; then
+ br_cv_binreloc=yes
+ elif test "x$enable_binreloc" = "xauto"; then
+ if test "x$br_cv_valid_prefixes" = "xyes" -a \
+ "x$ac_cv_file__proc_self_maps" = "xyes"; then
+ br_cv_binreloc=yes
+ else
+ br_cv_binreloc=no
+ fi
+ else
+ br_cv_binreloc=no
+ fi])
+
+ if test "x$br_cv_binreloc" = "xyes"; then
+ BINRELOC_CFLAGS="-DENABLE_BINRELOC"
+ AC_DEFINE(ENABLE_BINRELOC,,[Use binary relocation?])
+ if test "x$enable_binreloc_threads" = "xyes"; then
+ AC_CHECK_LIB([pthread], [pthread_getspecific])
+ fi
+
+ AC_CACHE_CHECK([whether binary relocation should use threads],
+ [br_cv_binreloc_threads],
+ [if test "x$enable_binreloc_threads" = "xyes"; then
+ if test "x$ac_cv_lib_pthread_pthread_getspecific" = "xyes"; then
+ br_cv_binreloc_threads=yes
+ else
+ br_cv_binreloc_threads=no
+ fi
+ else
+ br_cv_binreloc_threads=no
+ fi])
+
+ if test "x$br_cv_binreloc_threads" = "xyes"; then
+ BINRELOC_LIBS="-lpthread"
+ AC_DEFINE(BR_PTHREAD,1,[Include pthread support for binary relocation?])
+ else
+ BINRELOC_CFLAGS="$BINRELOC_CFLAGS -DBR_PTHREADS=0"
+ AC_DEFINE(BR_PTHREAD,0,[Include pthread support for binary relocation?])
+ fi
+ fi
+ AC_SUBST(BINRELOC_CFLAGS)
+ AC_SUBST(BINRELOC_LIBS)
+])
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch
new file mode 100644
index 000000000000..9f134745da72
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-cond-t1.patch
@@ -0,0 +1,22 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc
+--- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.cc 2007-08-17 06:02:40.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.cc 2008-06-26 14:46:31.000000000 -0400
+@@ -24,7 +24,6 @@
+ #include "PS_StreamRenderingContext.hh"
+ #include "String.hh"
+ #include "FontDataBase.hh"
+-#include "T1_FontDataBase.hh"
+
+ PS_StreamRenderingContext::PS_StreamRenderingContext(const SmartPtr<AbstractLogger>& logger,
+ std::ostream& os,
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh
+--- gtkmathview-0.8.0.old/src/backend/ps/PS_StreamRenderingContext.hh 2007-08-17 06:02:40.000000000 -0400
++++ gtkmathview-0.8.0/src/backend/ps/PS_StreamRenderingContext.hh 2008-06-26 14:46:31.000000000 -0400
+@@ -25,7 +25,6 @@
+ #include "PS_RenderingContext.hh"
+ #include "String.hh"
+ #include "FontDataBase.hh"
+-#include "T1_FontDataBase.hh"
+
+ class GMV_BackEnd_EXPORT PS_StreamRenderingContext : public PS_RenderingContext
+ {
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch
new file mode 100644
index 000000000000..3f566f7bf5f7
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-fix-template.patch
@@ -0,0 +1,49 @@
+diff -urN gtkmathview-0.8.0_old/src/widget/gtkmathview_common.h gtkmathview-0.8.0/src/widget/gtkmathview_common.h
+--- gtkmathview-0.8.0_old/src/widget/gtkmathview_common.h 2011-03-01 12:17:35.000000000 +0300
++++ gtkmathview-0.8.0/src/widget/gtkmathview_common.h 2011-03-01 12:25:00.000000000 +0300
+@@ -22,6 +22,20 @@
+
+ #include <gtk/gtkwidget.h>
+
++#if GTKMATHVIEW_USES_CUSTOM_READER
++#include "c_customXmlReader.h"
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader
++#elif GTKMATHVIEW_USES_LIBXML2_READER
++#include <libxml/xmlreader.h>
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader
++#elif GTKMATHVIEW_USES_LIBXML2
++#include <libxml/tree.h>
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2
++#elif GTKMATHVIEW_USES_GMETADOM
++#include <gdome.h>
++#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom
++#endif
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif /* __cplusplus */
+@@ -45,24 +59,16 @@
+ typedef void* GtkMathViewReaderData;
+
+ #if GTKMATHVIEW_USES_CUSTOM_READER
+-#include "c_customXmlReader.h"
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##custom_reader
+ typedef void* GtkMathViewModelId;
+ typedef const char* GtkMathViewModelString;
+ #elif GTKMATHVIEW_USES_LIBXML2_READER
+-#include <libxml/xmlreader.h>
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2_reader
+ typedef void* GtkMathViewModelId;
+ typedef const xmlChar* GtkMathViewModelString;
+ #elif GTKMATHVIEW_USES_LIBXML2
+-#include <libxml/tree.h>
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##libxml2
+ typedef xmlElement* GtkMathViewModelId;
+ typedef xmlDoc* GtkMathViewModelDocument;
+ typedef const xmlChar* GtkMathViewModelString;
+ #elif GTKMATHVIEW_USES_GMETADOM
+-#include <gdome.h>
+-#define GTKMATHVIEW_METHOD_NAME(name) gtk_math_view_##name##__##gmetadom
+ typedef GdomeElement* GtkMathViewModelId;
+ typedef GdomeDocument* GtkMathViewModelDocument;
+ typedef GdomeDOMString* GtkMathViewModelString;
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch
new file mode 100644
index 000000000000..63b49180e4ac
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc43.patch
@@ -0,0 +1,61 @@
+diff --git a/mathmlps/main.cc b/mathmlps/main.cc
+index b1a10b7..6d1f58e 100644
+--- a/mathmlps/main.cc
++++ b/mathmlps/main.cc
+@@ -23,6 +23,7 @@
+ #include <config.h>
+
+ #include <cassert>
++#include <cstring>
+ #include <fstream>
+
+ #include <popt.h>
+diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc
+index d513e43..1f1f9d1 100644
+--- a/mathmlsvg/SMS.cc
++++ b/mathmlsvg/SMS.cc
+@@ -22,6 +22,7 @@
+
+ #include <config.h>
+
++#include <cstring>
+ #include <sstream>
+ #include "defs.h"
+ #include "AbstractLogger.hh"
+diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc
+index ee031a8..fcc9f5c 100644
+--- a/mathmlsvg/main.cc
++++ b/mathmlsvg/main.cc
+@@ -23,6 +23,7 @@
+ #include <config.h>
+
+ #include <cassert>
++#include <cstring>
+ #include <fstream>
+
+ #include <popt.h>
+diff --git a/src/backend/ps/T1_FontDataBase.cc b/src/backend/ps/T1_FontDataBase.cc
+index c4299ba..538f18d 100644
+--- a/src/backend/ps/T1_FontDataBase.cc
++++ b/src/backend/ps/T1_FontDataBase.cc
+@@ -23,7 +23,7 @@
+ #include <t1lib.h>
+ #include <config.h>
+ #include <map>
+-#include <string>
++#include <cstring>
+ #include <stdlib.h>
+ #include <iostream>
+ #include <list>
+diff --git a/src/engine/mathml/mathVariantAux.cc b/src/engine/mathml/mathVariantAux.cc
+index 7792ca5..92e4716 100644
+--- a/src/engine/mathml/mathVariantAux.cc
++++ b/src/engine/mathml/mathVariantAux.cc
+@@ -23,6 +23,7 @@
+ #include <config.h>
+
+ #include <cassert>
++#include <cstring>
+
+ #include "mathVariantAux.hh"
+
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch
new file mode 100644
index 000000000000..f85a828e1f23
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc44.patch
@@ -0,0 +1,10 @@
+--- src/common/AbstractLogger.cc.orig 2009-04-25 20:39:35.815053524 +0100
++++ src/common/AbstractLogger.cc 2009-04-25 20:40:01.240595176 +0100
+@@ -19,6 +19,7 @@
+ #include <config.h>
+
+ #include <stdarg.h>
++#include <stdio.h>
+
+ #include "AbstractLogger.hh"
+
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch
new file mode 100644
index 000000000000..48180ea12fe8
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-gcc47.patch
@@ -0,0 +1,101 @@
+From bf7e95285e8df1bc3b86085791de7cf94c2f544f Mon Sep 17 00:00:00 2001
+From: Luca <luca@ant.local>
+Date: Tue, 10 Apr 2012 16:39:57 +0200
+Subject: [PATCH] + patches from Vincent Untz
+
+Conflicts:
+
+ CONTRIBUTORS
+---
+ mathmlps/main.cc | 7 +++++++
+ mathmlsvg/SMS.cc | 1 +
+ mathmlsvg/main.cc | 7 +++++++
+ src/frontend/common/TemplateBuilder.hh | 7 ++++---
+ src/frontend/common/TemplateElementIterator.hh | 2 +-
+ 5 files changed, 20 insertions(+), 4 deletions(-)
+
+diff --git a/mathmlps/main.cc b/mathmlps/main.cc
+index 48339af..6de113c 100644
+--- a/mathmlps/main.cc
++++ b/mathmlps/main.cc
+@@ -21,6 +21,13 @@
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+
+ #include <popt.h>
+
+diff --git a/mathmlsvg/SMS.cc b/mathmlsvg/SMS.cc
+index be7add8..f4b0ddc 100644
+--- a/mathmlsvg/SMS.cc
++++ b/mathmlsvg/SMS.cc
+@@ -704,6 +704,7 @@ SMS::fun_depart(const HandlerArgs& args) const
+ if (asLocation(args[0], loc1) && asLocation(args[1], loc2))
+ // delete "return 0" and insert here the code
+ return 0;
++ return 0;
+ }
+
+ SmartPtr<Value>
+diff --git a/mathmlsvg/main.cc b/mathmlsvg/main.cc
+index c49e8ac..42e7895 100644
+--- a/mathmlsvg/main.cc
++++ b/mathmlsvg/main.cc
+@@ -21,6 +21,13 @@
+ #include <cassert>
+ #include <cstring>
+ #include <fstream>
++#ifdef __linux__
++/* to get getopt on Linux */
++#ifndef __USE_POSIX2
++#define __USE_POSIX2
++#endif
++#endif
++#include <unistd.h>
+
+ #include <popt.h>
+
+diff --git a/src/frontend/common/TemplateBuilder.hh b/src/frontend/common/TemplateBuilder.hh
+index f5c8341..2b9a1ac 100644
+--- a/src/frontend/common/TemplateBuilder.hh
++++ b/src/frontend/common/TemplateBuilder.hh
+@@ -47,12 +47,13 @@ protected:
+ SmartPtr<typename ElementBuilder::type>
+ getElement(const typename Model::Element& el) const
+ {
+- if (SmartPtr<typename ElementBuilder::type> elem = smart_cast<typename ElementBuilder::type>(linkerAssoc(el)))
++ SmartPtr<typename ElementBuilder::type> elem;
++ if (elem = smart_cast<typename ElementBuilder::type>(this->linkerAssoc(el)))
+ return elem;
+ else
+ {
+- SmartPtr<typename ElementBuilder::type> elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
+- linkerAdd(el, elem);
++ elem = ElementBuilder::type::create(ElementBuilder::getContext(*this));
++ this->linkerAdd(el, elem);
+ return elem;
+ }
+ }
+diff --git a/src/frontend/common/TemplateElementIterator.hh b/src/frontend/common/TemplateElementIterator.hh
+index 5366040..25b5fef 100644
+--- a/src/frontend/common/TemplateElementIterator.hh
++++ b/src/frontend/common/TemplateElementIterator.hh
+@@ -43,7 +43,7 @@ protected:
+ findValidNodeForward(const typename Model::Node& p0) const
+ {
+ for (typename Model::Node p = p0; p; p = Model::getNextSibling(p))
+- if (valid(p)) return Model::asElement(p);
++ if (this->valid(p)) return Model::asElement(p);
+ return typename Model::Element();
+ }
+
+--
+1.7.8.6
+
diff --git a/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch
new file mode 100644
index 000000000000..35cb9bec6a9d
--- /dev/null
+++ b/x11-libs/gtkmathview/files/gtkmathview-0.8.0-underlinking.patch
@@ -0,0 +1,61 @@
+From 319c39458e72be82ed1ce60f0a386a146964f507 Mon Sep 17 00:00:00 2001
+From: Sylvestre Ledru <sylvestre@debian.org>
+Date: Sun, 13 Mar 2011 19:00:15 +0100
+Subject: [PATCH] Fix underlinking (required to build with gold link editor)
+
+See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=554753
+---
+ mathmlps/Makefile.am | 1 +
+ mathmlsvg/Makefile.am | 2 ++
+ viewer/Makefile.am | 3 +++
+ 3 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/mathmlps/Makefile.am b/mathmlps/Makefile.am
+index 201f410..717cd20 100644
+--- a/mathmlps/Makefile.am
++++ b/mathmlps/Makefile.am
+@@ -17,6 +17,7 @@ mathmlps_LDADD = \
+ $(GLIB_LIBS) \
+ $(top_builddir)/src/backend/ps/libmathview_backend_ps.la \
+ $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++ $(top_builddir)/src/libmathview.la \
+ $(NULL)
+
+ INCLUDES = \
+diff --git a/mathmlsvg/Makefile.am b/mathmlsvg/Makefile.am
+index 2290230..8007350 100644
+--- a/mathmlsvg/Makefile.am
++++ b/mathmlsvg/Makefile.am
+@@ -30,6 +30,8 @@ mathmlsvg_LDADD = \
+ $(GLIB_LIBS) \
+ $(top_builddir)/src/backend/svg/libmathview_backend_svg.la \
+ $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
++ $(top_builddir)/src/libmathview.la \
++ -lxml2 \
+ $(NULL)
+
+ INCLUDES = \
+diff --git a/viewer/Makefile.am b/viewer/Makefile.am
+index 7b950a0..67220b4 100644
+--- a/viewer/Makefile.am
++++ b/viewer/Makefile.am
+@@ -31,6 +31,7 @@ mathmlviewer_static_LDADD = \
+ $(DOM_LIBS) \
+ $(GTK_LIBS) \
+ $(top_builddir)/src/widget/libgtkmathview_gmetadom.la \
++ $(top_builddir)/src/engine/boxml/libboxml.la \
+ $(T1_LIBS) \
+ $(T1_LIBS_X) \
+ $(NULL)
+@@ -88,6 +89,8 @@ test_rendering_LDADD = \
+ $(T1_LIBS_X) \
+ $(GLIB_LIBS) \
+ $(top_builddir)/src/backend/gtk/libmathview_backend_gtk.la \
++ $(top_builddir)/src/libmathview.la \
++ $(top_builddir)/src/engine/boxml/libboxml.la \
+ $(top_builddir)/src/view/libmathview_frontend_libxml2.la \
+ $(NULL)
+
+--
+1.7.8
+
diff --git a/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild b/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild
new file mode 100644
index 000000000000..11d07b2e0333
--- /dev/null
+++ b/x11-libs/gtkmathview/gtkmathview-0.8.0-r2.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Rendering engine for MathML documents"
+HOMEPAGE="http://helm.cs.unibo.it/mml-widget/"
+SRC_URI="http://helm.cs.unibo.it/mml-widget/sources/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="gtk mathml svg t1lib"
+
+RDEPEND=">=dev-libs/glib-2.2.1:2
+ >=dev-libs/popt-1.7
+ >=dev-libs/libxml2-2.6.7:2
+ gtk? ( >=x11-libs/gtk+-2.2.1:2
+ >=media-libs/t1lib-5:5
+ x11-libs/pango
+ || ( x11-libs/pangox-compat <x11-libs/pango-1.31[X] ) )
+ mathml? ( media-fonts/texcm-ttf )
+ t1lib? ( >=media-libs/t1lib-5:5 )"
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ virtual/pkgconfig"
+
+DOCS="ANNOUNCEMENT AUTHORS BUGS ChangeLog CONTRIBUTORS HISTORY NEWS README TODO"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gcc43.patch \
+ "${FILESDIR}"/${P}-gcc44.patch \
+ "${FILESDIR}"/${P}-cond-t1.patch
+
+ # Fix building against libxml2[icu], bug #356095
+ epatch "${FILESDIR}"/${P}-fix-template.patch
+
+ # Fix building with gold, bug #369117; requires eautoreconf
+ epatch "${FILESDIR}/${P}-underlinking.patch"
+
+ epatch "${FILESDIR}/${P}-gcc47.patch"
+
+ # m4 macros from upstream git, required for eautoreconf
+ if [[ ! -d ac-helpers ]]; then
+ mkdir ac-helpers || die "mkdir failed"
+ cp "${FILESDIR}/binreloc.m4" ac-helpers || die "cp failed"
+ fi
+
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+
+ AT_M4DIR=ac-helpers eautoreconf
+}
+
+src_configure() {
+ # --disable-popt will build only the library and not the frontend
+ # TFM is needed for SVG, default value is 2
+ econf $(use_enable gtk) \
+ $(use_enable svg) \
+ $(use_with t1lib) \
+ --with-popt \
+ --enable-libxml2 \
+ --enable-libxml2-reader \
+ --enable-ps \
+ --enable-tfm=2 \
+ --enable-builder-cache \
+ --enable-breaks \
+ --enable-boxml \
+ --disable-gmetadom \
+ --disable-static
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/gtkmathview/metadata.xml b/x11-libs/gtkmathview/metadata.xml
new file mode 100644
index 000000000000..f373264a7eee
--- /dev/null
+++ b/x11-libs/gtkmathview/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>gnome</herd>
+<use>
+ <flag name='mathml'>Install additional fonts for proper mathml
+ support.</flag>
+ <flag name='t1lib'>Enable <pkg>media-libs/t1lib</pkg> support</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
new file mode 100644
index 000000000000..6d8e4fa35cb9
--- /dev/null
+++ b/x11-libs/gtksourceview/Manifest
@@ -0,0 +1,5 @@
+DIST gtksourceview-2.10.5.tar.bz2 1253321 SHA256 c585773743b1df8a04b1be7f7d90eecdf22681490d6810be54c81a7ae152191e SHA512 6f64acef6196bfc5953e0b148d7e460d366073b5e21367c01b01fc4d1c86ffe8aca71ecd77cf0814e47d8fc3085495f25bbbdc69e746987b02fd02fcda64886d WHIRLPOOL 4bd2589d4e06bb5e5c4dc8c55af25c52fd2c2c318a1240d7a430c8cb442cc785b7048f0116d9df714f93c6c1cb87628459239a80ae317d8eb73d27e4c021281a
+DIST gtksourceview-3.12.3.tar.xz 1195836 SHA256 f31959a21a93a929ff15192287096e65479e082cfac48ea8566aae9f6ce2f5f7 SHA512 399fd3d0fc0903d78d3516dd88c00d45484abb75346b0e060655f4b54d2e30563234afc8d6c7951425494e463d934d5da8f964032fe36f5598505caa726d37e6 WHIRLPOOL 2b24115a2b74e50a0090cbfa8811517d58b2e47563370ed98e32e6478a928f2d31c58e0248ae05a851b9254a2a3dfbd799c02241eda9630649f5098669dfbc4c
+DIST gtksourceview-3.14.3.tar.xz 1257420 SHA256 7bbe8b603ed7346669911fa074fe69388a4c89c1b15317befc3aa212b3d01a7b SHA512 d9f36d312adff7560beb8fe443dabe0f8dae6f02abfbdabcc4b2c97388601cd4fec0100825ad0460dbff30e6a01bcc8376ab80772013fb56ef0c192006d90eab WHIRLPOOL 5846452197ab238a3e49c5d09435dd4d49afe1a4781c08b4481dc3dcdac25ba9cf7b8c2ee9e69641b6d8f1bd0e88ab1847b357b536a6381b2bb1d36a41d41b20
+DIST gtksourceview-3.14.4.tar.xz 1262660 SHA256 1c9d6155705d50ae5cd1cd61167cc4824e413896f10d30ee158a83e8961a4d8b SHA512 37fac60ccbeab60633044abdcfff5a37a161d4352c895c9a577a7cfb95328afff65841b759ced04953da849b0dfc60c3765e6ea186fbc89447973c92adda0b88 WHIRLPOOL 3d8d2e38dcaf07f4988a1cf0712ddbdf43b36861f41622358c9ae58f9cd8fbe541f42d2bba8772f8b2427b356ed558cd32520e81dc38dbbd86fe73b344cd265e
+DIST gtksourceview-3.16.1.tar.xz 1272152 SHA256 669e9846ca744ec4d04ce61377e85df7ca909ad476329922a6abf4da423f1b0c SHA512 8bae196d923d08e58c8f02d7612b32aa7caec8457c2ff35c2bb2322a3013a8f1fe52cbc62540f9d83054811ee517088d4e880b82733b2a73e7724a206b2ad911 WHIRLPOOL c51a0dd6ccad2262b289509f8dfa85675ba90cf4f0242358ca2d1ad857cf06e33ad0495560b726430738d827f9204c2eb63a90209171194a7c8eb163e46a1471
diff --git a/x11-libs/gtksourceview/files/2.0/gentoo.lang b/x11-libs/gtksourceview/files/2.0/gentoo.lang
new file mode 100644
index 000000000000..f1e0660c74fc
--- /dev/null
+++ b/x11-libs/gtksourceview/files/2.0/gentoo.lang
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ GtkSourceView syntax highlight for Gentoo-specific files
+
+ Originally written for gtksourceview-1.x by:
+ Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
+ Rewritten for gtksourceview-2 by:
+ Rene 'Necoro' Neumann <necoro@necoro.net>, 2007
+
+ Distributed under the same license(s) as gtksourceview.
+
+ TODO:
+ - do not highlight "enable" in the configure options
+ - perhaps highlight portage variables and portage functions different
+
+-->
+
+<language name="gentoo" id="gentoo" version="2.0" _section="Scripts">
+ <metadata>
+ <property name="globs">*.ebuild;*.eclass</property>
+ <property name="line-comment-start">#</property>
+ </metadata>
+
+ <styles>
+ <style id="variable" _name="Portage variables" map-to="def:builtin" />
+ <style id="command" _name="Portage command" map-to="def:type" />
+ <style id="function" _name="Portage function" map-to="def:function" />
+ <style id="string" _name="String" map-to="def:string" />
+ </styles>
+
+ <definitions>
+
+ <!-- rewrite shell string to show highlighted variables -->
+ <context id="string" style-ref="def:string">
+ <start>"</start>
+ <end>"</end>
+ <include>
+ <context ref="def:escape"/>
+ <context ref="def:line-continue"/>
+ <context ref="sh:variable"/>
+ </include>
+ </context>
+
+ <context id="string-2" style-ref="def:string">
+ <start>'</start>
+ <end>'</end>
+ <include>
+ <context ref="def:escape"/>
+ <context ref="def:line-continue"/>
+ <context ref="sh:variable"/>
+ </include>
+ </context>
+
+ <!-- subprograms:
+ - $(..) is not supported currently in the normal sh.lang
+ - `...` is interpreted as string - I think the subshell behavior is more acurate -->
+ <context id="subprogram">
+ <start>\$\(</start>
+ <end>\)</end>
+ <include>
+ <context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+ <context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+ <context ref="gentoo"/>
+ </include>
+ </context>
+
+ <context id="subprogram-2">
+ <start>`</start>
+ <end>`</end>
+ <include>
+ <context sub-pattern="0" where="start" style-ref="sh:keyword"/>
+ <context sub-pattern="0" where="end" style-ref="sh:keyword"/>
+ <context ref="gentoo"/>
+ </include>
+ </context>
+
+ <!-- portage variables - currently unused -->
+ <context id="portvars" style-ref="variable">
+ <match>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</match>
+ </context>
+
+ <!-- portage functions - currently unused -->
+ <context id="portfuncs" style-ref="function">
+ <match>^(src_(unpack|compile|install|test)|pkg_(config|nofetch|setup|(pre|post)(inst|rm)))</match>
+ </context>
+
+ <!-- extra portage commands -->
+ <context id="portcmds" style-ref="command">
+ <match>\b(e(begin|end|conf|install|make|warn|infon?|error|patch)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</match>
+ </context>
+
+ <context id="built-in-command">
+ <include> <!-- do not include "sh:built-in-command" as it is replaced down there - which would lead to an endless loop -->
+ <context ref="sh:built-in-command-1" />
+ <context ref="sh:built-in-command-2" />
+ <context ref="portcmds" />
+ </include>
+ </context>
+
+ <!-- gentoo is just a shell with the replacements -->
+ <replace id="sh:built-in-command" ref="built-in-command" />
+ <replace id="sh:backtick-subshell" ref="subprogram-2" />
+ <context id="gentoo">
+ <include>
+ <context ref="subprogram"/>
+ <context ref="sh:sh"/>
+ </include>
+ </context>
+ </definitions>
+</language>
diff --git a/x11-libs/gtksourceview/files/gentoo.lang b/x11-libs/gtksourceview/files/gentoo.lang
new file mode 100644
index 000000000000..bfca7b2632b4
--- /dev/null
+++ b/x11-libs/gtksourceview/files/gentoo.lang
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE language SYSTEM "language.dtd">
+
+<!--
+ GtkSourceView syntax highlight for Gentoo-specific files
+ Leonardo Ferreira Fontenelle <leo.fontenelle@gmail.com>, 2006.
+ Distributed under the same license(s) as gtksourceview.
+
+ This .lang file should provide almost the same behaviour of
+ gentoo.nanorc. The exceptions are the line-comment and string elements.
+ If you get little
+
+ TODO:
+ - some styles don't get automatic colors, why?
+ - add syntax for /etc/portage/*
+-->
+
+<language _name="Gentoo" version="1.0" _section="Scripts" mimetypes="text/plain">
+
+ <escape-char>\</escape-char>
+
+ <line-comment _name="Line Comment" style="Comment">
+ <start-regex>#</start-regex>
+ </line-comment>
+
+ <string _name="String" style="String" end-at-line-end="false">
+ <start-regex>&quot;</start-regex>
+ <end-regex>&quot;</end-regex>
+ </string>
+
+ <pattern-item _name="Bash syntax" style="Operator">
+ <regex>(\b(case|do|done|elif|else|esac|exit|fi|for|function|if|in|local|read|return|select|shift|then|time|until|while)\b|(\{|\}|\(|\)|\;|\]|\[|`|\\|\$|&gt;|%lt;|!|=|&amp;|\|)|-(e|d|f|r|g|u|w|x|L)\b|-(eq|ne|gt|lt|ge|le|s|n|z)\b)</regex>
+ </pattern-item>
+
+ <pattern-item _name="Bash variables" style="Others">
+ <regex>\$\{?[a-zA-Z_0-9]+\}?</regex>
+ </pattern-item>
+
+ <pattern-item _name="Bash commands" style="Others 2">
+ <regex>(\bmake\b|\b(cat|cd|chmod|chown|cp|echo|env|export|grep|let|ln|mkdir|mv|rm|sed|set|tar|touch|unset)\b)</regex>
+ </pattern-item>
+
+ <pattern-item _name="Portage variables" style="Keyword">
+ <regex>\b((ARCH|HOMEPAGE|DESCRIPTION|IUSE|SRC_URI|LICENSE|SLOT|KEYWORDS|FILESDIR|WORKDIR|(P|R)?DEPEND|PROVIDE|DISTDIR|RESTRICT|USERLAND)|(S|D|T|PV|PF|P|PN|A)|C(XX)?FLAGS|LDFLAGS|C(HOST|TARGET|BUILD))\b</regex>
+ </pattern-item>
+
+ <pattern-item _name="Portage commands" style="Data Type">
+ <regex>\b(e(begin|end|conf|install|make|warn|infon?|error|patch|log|javac|ant)|die|use(_(with|enable))?|inherit|has|(has|best)_version|unpack|(do|new)(ins|s?bin|doc|lib(|\.so|\.a)|man|info|exe|initd|confd|envd|pam|menu|icon)|do(python|sed|dir|hard|sym|html|jar|mo)|keepdir|prepall(|docs|info|man|strip)|prep(info|lib|lib\.(so|a)|man|strip)|(|doc|ins|exe)into|f(owners|perms)|(exe|ins|dir)opts)\b</regex>
+ </pattern-item>
+
+ <pattern-item _name="Portage functions" style="Function">
+ <regex>^(src_(unpack|compile|install|test)|pkg_(config|nofetch|setup|(pre|post)(inst|rm)))</regex>
+ </pattern-item>
+
+ <pattern-item _name="Inherits and USE flags" style="Specials">
+ <regex>(\buse(_(with|enable))?\b [\!a-zA-Z0-9_+ -]*|inherit*$)</regex>
+ </pattern-item>
+
+</language>
diff --git a/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch b/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch
new file mode 100644
index 000000000000..d42feacd3e3f
--- /dev/null
+++ b/x11-libs/gtksourceview/files/gtksourceview-2.10.5-G_CONST_RETURN.patch
@@ -0,0 +1,139 @@
+From d27fec22c3f50bcd3c384256b8ad75d662033c7f Mon Sep 17 00:00:00 2001
+From: Ignacio Casal Quinteiro <icq@gnome.org>
+Date: Sun, 13 Mar 2011 11:01:37 +0100
+Subject: [PATCH] Do not use G_CONST_RETURN anymore. This macro is going to be
+ deprecated.
+
+---
+ gtksourceview/gtksourcelanguagemanager.c | 4 ++--
+ gtksourceview/gtksourcelanguagemanager.h | 6 ++----
+ gtksourceview/gtksourcestylescheme.c | 4 ++--
+ gtksourceview/gtksourcestylescheme.h | 3 +--
+ gtksourceview/gtksourcestyleschememanager.c | 4 ++--
+ gtksourceview/gtksourcestyleschememanager.h | 6 ++----
+ 6 files changed, 11 insertions(+), 16 deletions(-)
+
+diff --git a/gtksourceview/gtksourcelanguagemanager.c b/gtksourceview/gtksourcelanguagemanager.c
+index b431e1f..31deba7 100644
+--- a/gtksourceview/gtksourcelanguagemanager.c
++++ b/gtksourceview/gtksourcelanguagemanager.c
+@@ -275,7 +275,7 @@ gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm,
+ * containg a list of language files directories.
+ * The array is owned by @lm and must not be modified.
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+@@ -394,7 +394,7 @@ ensure_languages (GtkSourceLanguageManager *lm)
+ * no language is available.
+ * The array is owned by @lm and must not be modified.
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_LANGUAGE_MANAGER (lm), NULL);
+diff --git a/gtksourceview/gtksourcelanguagemanager.h b/gtksourceview/gtksourcelanguagemanager.h
+index ce234f5..de7a3aa 100644
+--- a/gtksourceview/gtksourcelanguagemanager.h
++++ b/gtksourceview/gtksourcelanguagemanager.h
+@@ -63,14 +63,12 @@ GtkSourceLanguageManager *gtk_source_language_manager_new (void);
+
+ GtkSourceLanguageManager *gtk_source_language_manager_get_default (void);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm);
++const gchar * const * gtk_source_language_manager_get_search_path (GtkSourceLanguageManager *lm);
+
+ void gtk_source_language_manager_set_search_path (GtkSourceLanguageManager *lm,
+ gchar **dirs);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm);
++const gchar * const * gtk_source_language_manager_get_language_ids (GtkSourceLanguageManager *lm);
+
+ GtkSourceLanguage *gtk_source_language_manager_get_language (GtkSourceLanguageManager *lm,
+ const gchar *id);
+diff --git a/gtksourceview/gtksourcestylescheme.c b/gtksourceview/gtksourcestylescheme.c
+index 6b470e8..d9d41a3 100644
+--- a/gtksourceview/gtksourcestylescheme.c
++++ b/gtksourceview/gtksourcestylescheme.c
+@@ -318,7 +318,7 @@ gtk_source_style_scheme_get_description (GtkSourceStyleScheme *scheme)
+ *
+ * Since: 2.0
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME (scheme), NULL);
+@@ -326,7 +326,7 @@ gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme)
+ if (scheme->priv->authors == NULL)
+ return NULL;
+
+- return (G_CONST_RETURN gchar* G_CONST_RETURN *)scheme->priv->authors->pdata;
++ return (const gchar * const *)scheme->priv->authors->pdata;
+ }
+
+ /**
+diff --git a/gtksourceview/gtksourcestylescheme.h b/gtksourceview/gtksourcestylescheme.h
+index 501163c..fe74bd2 100644
+--- a/gtksourceview/gtksourcestylescheme.h
++++ b/gtksourceview/gtksourcestylescheme.h
+@@ -62,8 +62,7 @@ const gchar *gtk_source_style_scheme_get_id (GtkSourceStyleS
+ const gchar *gtk_source_style_scheme_get_name (GtkSourceStyleScheme *scheme);
+ const gchar *gtk_source_style_scheme_get_description(GtkSourceStyleScheme *scheme);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme);
++const gchar * const * gtk_source_style_scheme_get_authors (GtkSourceStyleScheme *scheme);
+
+ const gchar *gtk_source_style_scheme_get_filename (GtkSourceStyleScheme *scheme);
+
+diff --git a/gtksourceview/gtksourcestyleschememanager.c b/gtksourceview/gtksourcestyleschememanager.c
+index cba042f..eec5d45 100644
+--- a/gtksourceview/gtksourcestyleschememanager.c
++++ b/gtksourceview/gtksourcestyleschememanager.c
+@@ -516,7 +516,7 @@ gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager
+ * of string containing the search path.
+ * The array is owned by the @manager and must not be modified.
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+@@ -555,7 +555,7 @@ gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manag
+ * of string containing the ids of the available style schemes or %NULL if no
+ * style scheme is available. The array is owned by the @manager and must not be modified.
+ */
+-G_CONST_RETURN gchar* G_CONST_RETURN *
++const gchar * const *
+ gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager)
+ {
+ g_return_val_if_fail (GTK_IS_SOURCE_STYLE_SCHEME_MANAGER (manager), NULL);
+diff --git a/gtksourceview/gtksourcestyleschememanager.h b/gtksourceview/gtksourcestyleschememanager.h
+index 6effc1c..456e8bf 100644
+--- a/gtksourceview/gtksourcestyleschememanager.h
++++ b/gtksourceview/gtksourcestyleschememanager.h
+@@ -74,13 +74,11 @@ void gtk_source_style_scheme_manager_append_search_path (GtkSourceStyleSc
+ void gtk_source_style_scheme_manager_prepend_search_path (GtkSourceStyleSchemeManager *manager,
+ const gchar *path);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager);
++const gchar * const * gtk_source_style_scheme_manager_get_search_path (GtkSourceStyleSchemeManager *manager);
+
+ void gtk_source_style_scheme_manager_force_rescan (GtkSourceStyleSchemeManager *manager);
+
+-G_CONST_RETURN gchar* G_CONST_RETURN *
+- gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager);
++const gchar * const * gtk_source_style_scheme_manager_get_scheme_ids (GtkSourceStyleSchemeManager *manager);
+
+ GtkSourceStyleScheme *gtk_source_style_scheme_manager_get_scheme (GtkSourceStyleSchemeManager *manager,
+ const gchar *scheme_id);
+--
+1.7.8
+
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
new file mode 100644
index 000000000000..8f5b59bc8cc0
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="2.0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE="glade"
+
+# FIXME: We could avoid the glade conditional and dep completely if upstream
+# would have a --with-glade-catalogdir that would allow to pass the system
+# glade catalog dir, instead of needing gladeui-1.0.pc installed from dev-util/glade
+RDEPEND=">=x11-libs/gtk+-2.12:2
+ >=dev-libs/libxml2-2.5:2
+ >=dev-libs/glib-2.14:2
+ glade? ( >=dev-util/glade-3.2:3 )
+ kernel_Darwin? ( x11-libs/ige-mac-integration )"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig"
+
+pkg_setup() {
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
+ G2CONF="${G2CONF}
+ $(use_enable glade glade-catalog)"
+}
+
+src_prepare() {
+ gnome2_src_prepare
+
+ # Skip broken test until upstream bug #621383 is solved
+ sed -i -e "/guess-language/d" tests/test-languagemanager.c || die
+
+ # The same for another broken test, upstream bug #631214
+ sed -i -e "/get-language/d" tests/test-languagemanager.c || die
+
+ # Patch from 3.x for bug #394925
+ epatch "${FILESDIR}/${P}-G_CONST_RETURN.patch"
+}
+
+src_test() {
+ Xemake check || die "Test phase failed"
+}
+
+src_install() {
+ gnome2_src_install
+
+ insinto /usr/share/${PN}-2.0/language-specs
+ doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
new file mode 100644
index 000000000000..aeb762158e8d
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-2.10.5-r3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+GNOME_TARBALL_SUFFIX="bz2"
+
+inherit eutils gnome2 virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="2.0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND="
+ >=x11-libs/gtk+-2.12:2
+ >=dev-libs/libxml2-2.5:2
+ >=dev-libs/glib-2.14:2
+ kernel_Darwin? ( x11-libs/ige-mac-integration )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README"
+
+ # Skip broken test until upstream bug #621383 is solved
+ sed -i -e "/guess-language/d" tests/test-languagemanager.c || die
+
+ # The same for another broken test, upstream bug #631214
+ sed -i -e "/get-language/d" tests/test-languagemanager.c || die
+
+ # Patch from 3.x for bug #394925
+ epatch "${FILESDIR}/${P}-G_CONST_RETURN.patch"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure --disable-glade-catalog
+}
+
+src_test() {
+ Xemake check
+}
+
+src_install() {
+ gnome2_src_install
+
+ insinto /usr/share/${PN}-2.0/language-specs
+ doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.12.3.ebuild b/x11-libs/gtksourceview/gtksourceview-3.12.3.ebuild
new file mode 100644
index 000000000000..e244a9f2603d
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.12.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit gnome2 virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/2"
+IUSE="glade +introspection"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+# Note: has native OSX support, prefix teams, attack!
+RDEPEND="
+ >=dev-libs/glib-2.37.3:2
+ >=dev-libs/libxml2-2.6:2
+ >=x11-libs/gtk+-3.11:3[introspection?]
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.50
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+"
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-deprecations \
+ --enable-providers \
+ $(use_enable glade glade-catalog) \
+ $(use_enable introspection)
+}
+
+src_test() {
+ Xemake check
+}
+
+src_install() {
+ DOCS="AUTHORS HACKING MAINTAINERS NEWS README"
+ gnome2_src_install
+
+ insinto /usr/share/${PN}-3.0/language-specs
+ doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.14.3.ebuild b/x11-libs/gtksourceview/gtksourceview-3.14.3.ebuild
new file mode 100644
index 000000000000..3030b7404896
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.14.3.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+# Note: has native OSX support, prefix teams, attack!
+RDEPEND="
+ >=dev-libs/glib-2.38:2
+ >=dev-libs/libxml2-2.6:2
+ >=x11-libs/gtk+-3.13.7:3[introspection?]
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-1.42.0 )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.50
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-deprecations \
+ --enable-providers \
+ $(use_enable glade glade-catalog) \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_test() {
+ Xemake check
+}
+
+src_install() {
+ DOCS="AUTHORS HACKING MAINTAINERS NEWS README"
+ gnome2_src_install
+
+ insinto /usr/share/${PN}-3.0/language-specs
+ doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.14.4.ebuild b/x11-libs/gtksourceview/gtksourceview-3.14.4.ebuild
new file mode 100644
index 000000000000..17327b497ea9
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.14.4.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+# Note: has native OSX support, prefix teams, attack!
+RDEPEND="
+ >=dev-libs/glib-2.38:2
+ >=dev-libs/libxml2-2.6:2
+ >=x11-libs/gtk+-3.13.7:3[introspection?]
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-1.42.0 )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.50
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-deprecations \
+ --enable-providers \
+ $(use_enable glade glade-catalog) \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_test() {
+ Xemake check
+}
+
+src_install() {
+ DOCS="AUTHORS HACKING MAINTAINERS NEWS README"
+ gnome2_src_install
+
+ insinto /usr/share/${PN}-3.0/language-specs
+ doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
new file mode 100644
index 000000000000..6aaa8c3e8da1
--- /dev/null
+++ b/x11-libs/gtksourceview/gtksourceview-3.16.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_MIN_API_VERSION="0.24"
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome2 vala virtualx
+
+DESCRIPTION="A text widget implementing syntax highlighting and other features"
+HOMEPAGE="https://wiki.gnome.org/Projects/GtkSourceView"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="3.0/3"
+IUSE="glade +introspection vala"
+REQUIRED_USE="vala? ( introspection )"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+
+# Note: has native OSX support, prefix teams, attack!
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ >=dev-libs/libxml2-2.6:2
+ >=x11-libs/gtk+-3.16:3[introspection?]
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-1.42 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.18
+ >=dev-util/intltool-0.50
+ >=sys-devel/gettext-0.17
+ virtual/pkgconfig
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ use vala && vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-deprecations \
+ --enable-providers \
+ $(use_enable glade glade-catalog) \
+ $(use_enable introspection) \
+ $(use_enable vala)
+}
+
+src_test() {
+ Xemake check
+}
+
+src_install() {
+ DOCS="AUTHORS HACKING MAINTAINERS NEWS README"
+ gnome2_src_install
+
+ insinto /usr/share/${PN}-3.0/language-specs
+ doins "${FILESDIR}"/2.0/gentoo.lang
+}
diff --git a/x11-libs/gtksourceview/metadata.xml b/x11-libs/gtksourceview/metadata.xml
new file mode 100644
index 000000000000..11d9db8be33d
--- /dev/null
+++ b/x11-libs/gtksourceview/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>gnome</herd>
+<use>
+ <flag name="glade">Install a glade catalog file</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/guile-gtk/Manifest b/x11-libs/guile-gtk/Manifest
new file mode 100644
index 000000000000..41f5549d1b59
--- /dev/null
+++ b/x11-libs/guile-gtk/Manifest
@@ -0,0 +1 @@
+DIST guile-gtk-2.1.tar.gz 781985 SHA256 9ad30cdfcae688837785774b2149f0ec82f464412017aeeb045b4336ef2416cc SHA512 ab9bc66c97099d6958c401e16db57ceedaf23f1944cb7cf1e6899547c77cafff67455f228edd156a5a7ee0b62264e6af0ff82fa3ec31bcb499710bc5cb2070a7 WHIRLPOOL 6e14158951fa307fedc20f8956ecb1eefc7e1b2c3f5d0b3505060ceb709efd51a40e5931c4e05877b7ce35498ebe1fa06526859efc00b09e9c46bb7b8661a4c5
diff --git a/x11-libs/guile-gtk/files/2.1-brokentest.patch b/x11-libs/guile-gtk/files/2.1-brokentest.patch
new file mode 100644
index 000000000000..ecba95174e0c
--- /dev/null
+++ b/x11-libs/guile-gtk/files/2.1-brokentest.patch
@@ -0,0 +1,33 @@
+diff --git a/tests/gdk.scm b/tests/gdk.scm
+index 6e08f9f..6b01e83 100644
+--- a/tests/gdk.scm
++++ b/tests/gdk.scm
+@@ -1102,28 +1102,6 @@
+ (got (exact-positive-integer? (gdk-screen-height-mm))))
+ (test "gdk-screen-height-mm" #f want got))))
+
+-;;
+-;; gdk-selection-property-get
+-;;
+-
+-(malloced-steady ;; with nothing ever requested
+- (lambda ()
+- (let* ((win sample-win)
+- (want '(#f NONE 0))
+- (got (gdk-selection-property-get win)))
+- (test "gdk-selection-property-get" sample-win want got))))
+-
+-(malloced-steady ;; on a destroyed window
+- (lambda ()
+- (let* ((win (gdk-window-new #f 100 100 '() 'input-output 'toplevel))
+- (want '(#f NONE 0))
+- (got (begin
+- (gdk-window-destroy win)
+- (gdk-selection-property-get win))))
+- ;; final free()s only take place under the main loop, so need this to
+- ;; satisfy `malloced-steady
+- (gtk-main-iteration-do #f)
+- (test "gdk-selection-property-get" (list "destroyed win" win) want got))))
+
+ ;;
+ ;; gdk-text-extents
diff --git a/x11-libs/guile-gtk/files/2.1-prll-install.patch b/x11-libs/guile-gtk/files/2.1-prll-install.patch
new file mode 100644
index 000000000000..b00fc29ca34a
--- /dev/null
+++ b/x11-libs/guile-gtk/files/2.1-prll-install.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 822a170..37f43b5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -72,7 +72,7 @@ gdkdefs = gdk-2.0.defs
+ defsdir = $(datadir)/guile-gtk/
+ defs_DATA = $(gtkdefs) $(gdkdefs)
+
+-install-exec-local:
++install-exec-hook:
+ rm -f $(DESTDIR)$(bindir)/build-guile-gtk
+ rm -f $(DESTDIR)$(bindir)/guile-gtk
+ ln $(DESTDIR)$(bindir)/build-guile-gtk-2.0 $(DESTDIR)$(bindir)/build-guile-gtk
diff --git a/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
new file mode 100644
index 000000000000..bd582117f621
--- /dev/null
+++ b/x11-libs/guile-gtk/files/guile-gtk-2.0-g-object-ref.diff
@@ -0,0 +1,45 @@
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl.defs
++++ guile-gtk-2.0/gtk-gl/gdk-gl.defs
+@@ -22,14 +22,14 @@
+ ;--- Types ... --------------------------------------------------------
+
+ (define-struct GdkGLContext
+- (copy gdk_gl_context_ref)
+- (free gdk_gl_context_unref)
++ (copy g_object_ref)
++ (free g_object_unref)
+ (size "0")
+ (canonical-name "Gdk" "GL" "Context"))
+
+ (define-struct GdkGLPixmap
+- (copy gdk_gl_pixmap_ref)
+- (free gdk_gl_pixmap_unref)
++ (copy g_object_ref)
++ (free g_object_unref)
+ (size "0")
+ (canonical-name "Gdk" "GL" "Pixmap"))
+
+--- guile-gtk-2.0.orig/gtk-gl/gdk-gl-glue.c
++++ guile-gtk-2.0/gtk-gl/gdk-gl-glue.c
+@@ -83,8 +83,8 @@
+
+ sgtk_boxed_info sgtk_gdk_gl_context_info = {
+ { "GdkGLContext", GTK_TYPE_BOXED, NULL },
+- (void *(*)(void*))gdk_gl_context_ref,
+- (void (*)(void*))gdk_gl_context_unref,
++ (void *(*)(void*))g_object_ref,
++ (void (*)(void*))g_object_unref,
+ (void (*)(SCM)) NULL,
+ 0
+ };
+@@ -100,8 +100,8 @@
+
+ sgtk_boxed_info sgtk_gdk_gl_pixmap_info = {
+ { "GdkGLPixmap", GTK_TYPE_BOXED, NULL },
+- (void *(*)(void*))gdk_gl_pixmap_ref,
+- (void (*)(void*))gdk_gl_pixmap_unref,
++ (void *(*)(void*))g_object_ref,
++ (void (*)(void*))g_object_unref,
+ (void (*)(SCM)) NULL,
+ 0
+ };
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild
new file mode 100644
index 000000000000..f2ccded7725b
--- /dev/null
+++ b/x11-libs/guile-gtk/guile-gtk-2.1-r1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools eutils virtualx
+
+DESCRIPTION="GTK+ bindings for guile"
+HOMEPAGE="http://www.gnu.org/software/guile-gtk/"
+SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-scheme/guile[deprecated(+)]
+ x11-libs/gtk+:2
+ gnome-base/libglade:2.0
+ >=x11-libs/gtkglarea-1.90:2"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.0-g-object-ref.diff"
+ epatch "${FILESDIR}"/${PV}-prll-install.patch
+ epatch "${FILESDIR}"/${PV}-brokentest.patch
+ eautoreconf
+}
+
+src_test() {
+ Xemake check
+}
+
+src_install() {
+ # bug #298803
+ emake DESTDIR="${D}" install
+ dodoc README AUTHORS ChangeLog NEWS TODO
+ insinto /usr/share/doc/${PF}/
+ doins -r examples
+}
diff --git a/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
new file mode 100644
index 000000000000..8894979410f5
--- /dev/null
+++ b/x11-libs/guile-gtk/guile-gtk-2.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils virtualx
+
+DESCRIPTION="GTK+ bindings for guile"
+HOMEPAGE="http://www.gnu.org/software/guile-gtk/"
+SRC_URI="mirror://gnu/guile-gtk/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE=""
+
+RDEPEND="
+ dev-scheme/guile[deprecated(+)]
+ x11-libs/gtk+:2
+ gnome-base/libglade:2.0
+ >=x11-libs/gtkglarea-1.90:2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.0-g-object-ref.diff
+ "${FILESDIR}"/${PV}-prll-install.patch
+ "${FILESDIR}"/${PV}-brokentest.patch
+)
+
+src_prepare() {
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+ autotools-utils_src_prepare
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ Xemake check
+}
+
+src_install() {
+ autotools-utils_src_install
+ insinto /usr/share/doc/${PF}/
+ doins -r examples
+}
diff --git a/x11-libs/guile-gtk/metadata.xml b/x11-libs/guile-gtk/metadata.xml
new file mode 100644
index 000000000000..344196c171d9
--- /dev/null
+++ b/x11-libs/guile-gtk/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>scheme</herd>
+ <maintainer>
+ <email>hkBst@gentoo.org</email>
+ <name>Marijn Schouten</name>
+ </maintainer>
+ <longdescription lang="en">
+The guile-gtk project brings the power of Scheme to your graphical application.
+ </longdescription>
+</pkgmetadata>
diff --git a/x11-libs/hippo-canvas/Manifest b/x11-libs/hippo-canvas/Manifest
new file mode 100644
index 000000000000..a867825fa4b2
--- /dev/null
+++ b/x11-libs/hippo-canvas/Manifest
@@ -0,0 +1 @@
+DIST hippo-canvas-0.3.0.tar.bz2 376859 SHA256 21d0f3f7eb1c448fd6eaec1979b1474011b541249edaaab6e1dfb772ac8eb514 SHA512 8290f6ab1875eed606ea152f12741ec4ebd8839091a9c258b8c4fa39f395adf94217576c6c689c5ab22b62c65e37d82991c7b8942815cb2030bd45616528f4f3 WHIRLPOOL 2b78ce076c1e6f8bfa40fad38e036cc583739b99801c5a550ad835484da255a8ee7c21d086f748c81707a5b262d65b7c95bbfe1a5fd01812d93409f42e7ba76b
diff --git a/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch b/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch
new file mode 100644
index 000000000000..bcbae474160b
--- /dev/null
+++ b/x11-libs/hippo-canvas/files/hippo-canvas-python-override.patch
@@ -0,0 +1,10 @@
+--- hippo.override 2008-05-21 16:22:02.000000000 -0700
++++ hippo.override-new 2010-04-13 13:11:20.826177339 -0700
+@@ -19,6 +19,7 @@
+ #include "hippo/hippo-canvas-widget.h"
+ #include "hippo/hippo-canvas-window.h"
+ #include "hippo/hippo-canvas-widgets.h"
++#include "common/hippo/hippo-canvas-test.h"
+
+ #include "hippo/hippo-canvas-type-builtins.h"
+
diff --git a/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
new file mode 100644
index 000000000000..956e9fd4156a
--- /dev/null
+++ b/x11-libs/hippo-canvas/hippo-canvas-0.3.0-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+GNOME_TARBALL_SUFFIX="bz2"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 multilib python-single-r1
+
+DESCRIPTION="A canvas library based on GTK+ 2, Cairo, and Pango"
+HOMEPAGE="https://wiki.gnome.org/Projects/HippoCanvas"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+IUSE="python"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ >=dev-libs/glib-2.6:2
+ dev-libs/libcroco
+ >=x11-libs/gtk+-2.6:2
+ x11-libs/pango
+ gnome-base/librsvg:2
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pycairo[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cd "${S}/python"
+ epatch "${FILESDIR}/${PN}-python-override.patch"
+ cd "${S}"
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable python)
+}
diff --git a/x11-libs/hippo-canvas/metadata.xml b/x11-libs/hippo-canvas/metadata.xml
new file mode 100644
index 000000000000..b0b69c25dfcc
--- /dev/null
+++ b/x11-libs/hippo-canvas/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>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <longdescription lang="en">
+ HippoCanvas is a generic user interface element that can draw Cairo graphics, respond to key and mouse events,
+ and lay out other widgets. It is currently used to implement a number of Sugar's custom widgets (toolbars,
+ rounded buttons, etc.) and to lay out the screen.
+ </longdescription>
+</pkgmetadata>
diff --git a/x11-libs/ige-mac-integration/Manifest b/x11-libs/ige-mac-integration/Manifest
new file mode 100644
index 000000000000..2483f8eea5dd
--- /dev/null
+++ b/x11-libs/ige-mac-integration/Manifest
@@ -0,0 +1 @@
+DIST ige-mac-integration-0.8.2.tar.gz 374304 RMD160 857dce9f7377484901e08ce68fd8a72f5261abd5 SHA1 4d5f2a88c3d354133105b3c84e4a12abcb017eeb SHA256 3e42ebbc5ce54b547eea92c36e61293f961b6d3cbe42b5e83dc8867b1829240f
diff --git a/x11-libs/ige-mac-integration/ige-mac-integration-0.8.2.ebuild b/x11-libs/ige-mac-integration/ige-mac-integration-0.8.2.ebuild
new file mode 100644
index 000000000000..d0156746ad23
--- /dev/null
+++ b/x11-libs/ige-mac-integration/ige-mac-integration-0.8.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit base python libtool
+
+DESCRIPTION="GTK+ bindings for Mac OS X specific tasks"
+LICENSE="LGPL-2"
+HOMEPAGE="http://live.gnome.org/GTK+/OSX/Integration"
+SRC_URI="http://ftp.imendio.com/pub/imendio/ige-mac-integration/${P}.tar.gz"
+SLOT="0"
+KEYWORDS="~ppc-macos ~x86-macos"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-python/pygtk:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # fix the lookup of the codegen tools
+ sed -e "s|\$(datadir)/pygtk/2.0|${EPREFIX}/$(python_get_sitedir)/gtk-2.0|g" \
+ -i bindings/python/Makefile.am || die
+ elibtoolize
+}
+
+src_configure() {
+ econf --with-compile-warnings=no
+}
diff --git a/x11-libs/ige-mac-integration/ige-mac-integration-9999.ebuild b/x11-libs/ige-mac-integration/ige-mac-integration-9999.ebuild
new file mode 100644
index 000000000000..2fa32f8dc541
--- /dev/null
+++ b/x11-libs/ige-mac-integration/ige-mac-integration-9999.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="3"
+
+inherit autotools base git-2 python
+
+EGIT_REPO_URI="git://github.com/rhult/${PN}.git
+ https://github.com/rhult/${PN}.git"
+SRC_URI=""
+
+DESCRIPTION="GTK+ bindings for Mac OS X specific tasks"
+LICENSE="LGPL-2"
+HOMEPAGE="http://live.gnome.org/GTK+/OSX/Integration"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2
+ dev-python/pygtk:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_prepare() {
+ # fix the lookup of the codegen tools
+ sed -e "s|\$(datadir)/pygtk/2.0|${EPREFIX}/$(python_get_sitedir)/gtk-2.0|g" \
+ -i bindings/python/Makefile.am
+
+ eautoreconf
+}
+
+src_configure() {
+ econf --with-compile-warnings=no
+}
diff --git a/x11-libs/ige-mac-integration/metadata.xml b/x11-libs/ige-mac-integration/metadata.xml
new file mode 100644
index 000000000000..46dee96f4e7a
--- /dev/null
+++ b/x11-libs/ige-mac-integration/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>prefix</herd>
+</pkgmetadata>
diff --git a/x11-libs/libFS/Manifest b/x11-libs/libFS/Manifest
new file mode 100644
index 000000000000..83c3c56cba45
--- /dev/null
+++ b/x11-libs/libFS/Manifest
@@ -0,0 +1,2 @@
+DIST libFS-1.0.6.tar.bz2 323246 SHA256 9007fcfbd37bfa6ede4000ec4b5c2dc6dc0f52789358361b43f68e9ae4d6aed7 SHA512 6eb20abb963e4f1c897dcc69321351c7672f2d15463d5d1e3391ff534848eb1a95a80833f698c98d9d5b6c8d7462eb3207eb5c0f74d86ef84a461ae6b11c8447 WHIRLPOOL 700b6c0489f8b3d81791dbb441deb2b90bc2d36748a81bf65f6cae2ea825805345e142292634d1f04800a07e3c4441e77f8fd99b00d3bfdfe15c99e1b0122c13
+DIST libFS-1.0.7.tar.bz2 315569 SHA256 2e9d4c07026a7401d4fa4ffae86e6ac7fec83f50f3268fa85f52718e479dc4f3 SHA512 3596e87710c14706ab345377799e9b2dbab79500fd75b4213f9615bf7db7df3265b4dbc65fdeca9d32343b848013780cfa1a43e76229665ce80246332bb8b96f WHIRLPOOL 093e93bc5a8d6f68c9f236b266bb220e888718d211ff9fad91b0762561917b61bc169858d315cc357fcb2632d385d418cdc809d92e471451f7bd44455748e490
diff --git a/x11-libs/libFS/libFS-1.0.6.ebuild b/x11-libs/libFS/libFS-1.0.6.ebuild
new file mode 100644
index 000000000000..e17e962659a9
--- /dev/null
+++ b/x11-libs/libFS/libFS-1.0.6.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 FS library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/xtrans
+ x11-proto/xproto
+ x11-proto/fontsproto"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libFS/libFS-1.0.7.ebuild b/x11-libs/libFS/libFS-1.0.7.ebuild
new file mode 100644
index 000000000000..293b93d47e8e
--- /dev/null
+++ b/x11-libs/libFS/libFS-1.0.7.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 FS library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/xtrans
+ x11-proto/xproto
+ x11-proto/fontsproto"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libFS/metadata.xml b/x11-libs/libFS/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libFS/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-libs/libGLw/Manifest b/x11-libs/libGLw/Manifest
new file mode 100644
index 000000000000..60a922e01920
--- /dev/null
+++ b/x11-libs/libGLw/Manifest
@@ -0,0 +1 @@
+DIST glw-8.0.0.tar.bz2 221136 SHA256 2da1d06e825f073dcbad264aec7b45c649100e5bcde688ac3035b34c8dbc8597 SHA512 09e1352edb16a9a34b9031996c2a1545d69dc690d7eda10a1aad6a7ad9ef0576d0af8a1b7740dba47f9647b7c957c1d7a078b38747d2d2c28ea39314a0e53587 WHIRLPOOL 53c783e10c6db8f1dd5682ad4a0898fa0c4a1889ea8bc3eb89dd48c082d28644fb821c9ee5b11ffd8818f98cc3bcc8f280ce1e90bf90fb02bc0facc922df1b22
diff --git a/x11-libs/libGLw/libGLw-8.0.0.ebuild b/x11-libs/libGLw/libGLw-8.0.0.ebuild
new file mode 100644
index 000000000000..9858389500c4
--- /dev/null
+++ b/x11-libs/libGLw/libGLw-8.0.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P=glw-"${PV}"
+
+inherit autotools-utils
+
+DESCRIPTION="Mesa GLw library"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/glw/${MY_P}.tar.bz2"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="amd64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
+IUSE="+motif static-libs"
+
+RDEPEND="
+ !media-libs/mesa[motif]
+ x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/motif
+ virtual/opengl"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}"/${MY_P}
+
+src_configure() {
+ local myeconfargs=(
+ --enable-motif
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libGLw/metadata.xml b/x11-libs/libGLw/metadata.xml
new file mode 100644
index 000000000000..3bfcbea22f7e
--- /dev/null
+++ b/x11-libs/libGLw/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>
+ <maintainer>
+ <email>jlec@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libICE/Manifest b/x11-libs/libICE/Manifest
new file mode 100644
index 000000000000..e347b98d0b7b
--- /dev/null
+++ b/x11-libs/libICE/Manifest
@@ -0,0 +1,2 @@
+DIST libICE-1.0.8.tar.bz2 365762 SHA256 24a991284d02ff0c789bc8d11ad2e4dffe144cb70f24e28f9ce3e8b1ee08b71e SHA512 eac189813df84c0d1b5a4f59855a147c945cb6960bb91dd3d94b2fbe909609a3da1d250bea4a0c8090b4dc64b4f64eb548b67a39de719ebddce19c6c1394532e WHIRLPOOL 3dba49fac7bd5852ef448d6d51408831d24802e5fed0fbb9a3877814c53d971c89db9aa53d388825660f42acf19a0d2b3ad625d58dfb0fa623e5ae5df49c4ac5
+DIST libICE-1.0.9.tar.bz2 384921 SHA256 8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202 SHA512 daa8126ee5279c08f801274a2754132762dea2a40f4733c4b0bf8e8bdad61cba826939a2e067beb3524e256a98a2b83f23c8d4643f3e75a284ab02cc73da41b7 WHIRLPOOL efdd7bc60416d883b15af7cfd0c152a2b7f7ee539d0717704b89c0621f9cefa718b14af63fb1d10709e7b0cc84d660f30d069ff0b273d304be8f0c5a74fe1090
diff --git a/x11-libs/libICE/libICE-1.0.8-r1.ebuild b/x11-libs/libICE/libICE-1.0.8-r1.ebuild
new file mode 100644
index 000000000000..19bba1959ea8
--- /dev/null
+++ b/x11-libs/libICE/libICE-1.0.8-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Inter-Client Exchange library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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/xtrans
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable doc docs)
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-libs/libICE/libICE-1.0.9.ebuild b/x11-libs/libICE/libICE-1.0.9.ebuild
new file mode 100644
index 000000000000..b2f278be47b0
--- /dev/null
+++ b/x11-libs/libICE/libICE-1.0.9.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Inter-Client Exchange library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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/xtrans
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable doc docs)
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-libs/libICE/metadata.xml b/x11-libs/libICE/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libICE/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-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest
new file mode 100644
index 000000000000..43a19a7b281e
--- /dev/null
+++ b/x11-libs/libQGLViewer/Manifest
@@ -0,0 +1,3 @@
+DIST libQGLViewer-2.6.1.tar.gz 3083024 SHA256 e6a783061d31b77e9f8b3bfb10e20bc8166b400c24679312b7e7662a0f12d822 SHA512 525006e5e79625c9d98a037eb19cded6c83c9a1f38b6abce9b513dd8bdd8fe8bcbf9bd6228b55181227dd1124a5734331b5a078737b3cf233c8496a83678f576 WHIRLPOOL 2889ee5a135a526fa4eb490de3975f5e4964d30f338d50bdda963f879321049e429a4c0f4b46f6a20c8341c640105ac48fcf8426f845b8e5c401c4f37295f189
+DIST libQGLViewer-2.6.2.tar.gz 3075407 SHA256 aacf3f26805e6f625e4d1e1927aff535a732b5666055676c4df07e2e3bfaf7ef SHA512 97907153975730c0cfa38df9ee051f9d4dc6f9d815784c946fb333c7477259d0af9b697173a58115beb3f1a46b119c0dfd1329bc7f2b18f192226800b03839e5 WHIRLPOOL c7f8a0bd98171fc12e8ac52a70c49632b7e4f895c0c63c4d652c45604803eb63ef898cf53b78eb37cecdf748fd3816063bd27c38ce7743c2b15c3797a48971c6
+DIST libQGLViewer-2.6.3.tar.gz 3044822 SHA256 dc1c471817168d3c4a760abaf06f19cfd674a88c994db8b210d6f2b1264e681a SHA512 33cbee85d003379798561c9eceff95490053090184e892190e29a7e242469c4c688e6e2b969be25c66f47b2f4bfe2ff6d7a016a7d6fef2ac0f7159a1bdf9368c WHIRLPOOL 2f4e594e185bac324f7f581b71db9e75430ee02214f28c2ef682df87940d84e23dd81e37c323f140c0835de6b3c87ef71c9b5d9603620ddfe7fe7a1b307186f2
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.6.1.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.6.1.ebuild
new file mode 100644
index 000000000000..078db1d5333d
--- /dev/null
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.6.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit qt4-r2 multilib flag-o-matic
+
+DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
+HOMEPAGE="http://www.libqglviewer.com"
+SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="designer examples"
+
+DEPEND="virtual/opengl
+ virtual/glu
+ dev-qt/qtopengl:4
+ dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+ designer? ( dev-qt/designer:4 )"
+
+src_configure() {
+ append-ldflags "-L${S}/QGLViewer"
+ sed -e 's#designerPlugin##' -i ${P}.pro || die
+ use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
+ eqmake4 ${P}.pro \
+ PREFIX="${EPREFIX}/usr" \
+ LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+ DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+ if use designer ; then
+ cd "${S}/designerPlugin"
+ eqmake4 designerPlugin.pro
+ fi
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ dodoc README
+
+ if use designer ; then
+ cd "${S}/designerPlugin"
+ emake INSTALL_ROOT="${D}" install
+ fi
+
+ if use examples ; then
+ exeinto /usr/bin/${PN}-examples
+ doexe $(find "${S}/examples" -type f -executable ! -name '*.vcproj')
+ fi
+}
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.6.2.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.6.2.ebuild
new file mode 100644
index 000000000000..078db1d5333d
--- /dev/null
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.6.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit qt4-r2 multilib flag-o-matic
+
+DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
+HOMEPAGE="http://www.libqglviewer.com"
+SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="designer examples"
+
+DEPEND="virtual/opengl
+ virtual/glu
+ dev-qt/qtopengl:4
+ dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+ designer? ( dev-qt/designer:4 )"
+
+src_configure() {
+ append-ldflags "-L${S}/QGLViewer"
+ sed -e 's#designerPlugin##' -i ${P}.pro || die
+ use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
+ eqmake4 ${P}.pro \
+ PREFIX="${EPREFIX}/usr" \
+ LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+ DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+ if use designer ; then
+ cd "${S}/designerPlugin"
+ eqmake4 designerPlugin.pro
+ fi
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ dodoc README
+
+ if use designer ; then
+ cd "${S}/designerPlugin"
+ emake INSTALL_ROOT="${D}" install
+ fi
+
+ if use examples ; then
+ exeinto /usr/bin/${PN}-examples
+ doexe $(find "${S}/examples" -type f -executable ! -name '*.vcproj')
+ fi
+}
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.6.3.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.6.3.ebuild
new file mode 100644
index 000000000000..078db1d5333d
--- /dev/null
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.6.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit qt4-r2 multilib flag-o-matic
+
+DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
+HOMEPAGE="http://www.libqglviewer.com"
+SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm"
+IUSE="designer examples"
+
+DEPEND="virtual/opengl
+ virtual/glu
+ dev-qt/qtopengl:4
+ dev-qt/qtgui:4"
+RDEPEND="${DEPEND}
+ designer? ( dev-qt/designer:4 )"
+
+src_configure() {
+ append-ldflags "-L${S}/QGLViewer"
+ sed -e 's#designerPlugin##' -i ${P}.pro || die
+ use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
+ eqmake4 ${P}.pro \
+ PREFIX="${EPREFIX}/usr" \
+ LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+ DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+ if use designer ; then
+ cd "${S}/designerPlugin"
+ eqmake4 designerPlugin.pro
+ fi
+}
+
+src_install() {
+ emake INSTALL_ROOT="${D}" install
+ dodoc README
+
+ if use designer ; then
+ cd "${S}/designerPlugin"
+ emake INSTALL_ROOT="${D}" install
+ fi
+
+ if use examples ; then
+ exeinto /usr/bin/${PN}-examples
+ doexe $(find "${S}/examples" -type f -executable ! -name '*.vcproj')
+ fi
+}
diff --git a/x11-libs/libQGLViewer/metadata.xml b/x11-libs/libQGLViewer/metadata.xml
new file mode 100644
index 000000000000..fca4f9d4a11e
--- /dev/null
+++ b/x11-libs/libQGLViewer/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>aballier@gentoo.org</email>
+<name>Alexis Ballier</name>
+</maintainer>
+ <use>
+ <flag name="designer">Installs <pkg>dev-qt/designer</pkg> plugin.</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-libs/libSM/Manifest b/x11-libs/libSM/Manifest
new file mode 100644
index 000000000000..9167550bad8d
--- /dev/null
+++ b/x11-libs/libSM/Manifest
@@ -0,0 +1 @@
+DIST libSM-1.2.2.tar.bz2 348908 SHA256 0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd SHA512 dfb91dcc7200fce8d0a62953ae4b81fcb00d525674bbcc6dfcaa23ecb35e1213ceb07cc51f590072dce2107909903160d9f3636a0434fe2a605b1e9a9bd0a6ca WHIRLPOOL d9b45a64ccc85b6ed2eb181bc01e8b9c8b839dfb2b41067665688ee27c7d35cb6f3661f96966bb7c8256b1d9391f613cd11b1ccfc9d3a4c362167fa7b77b135b
diff --git a/x11-libs/libSM/libSM-1.2.2-r1.ebuild b/x11-libs/libSM/libSM-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..a4547e8a2ab2
--- /dev/null
+++ b/x11-libs/libSM/libSM-1.2.2-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Session Management library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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="doc ipv6 +uuid"
+
+RDEPEND=">=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+ x11-libs/xtrans
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ !elibc_FreeBSD? ( !elibc_SunOS? ( !elibc_Darwin? (
+ uuid? ( >=sys-apps/util-linux-2.24.1-r3[${MULTILIB_USEDEP}] )
+ ) ) )"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ local withuuid=$(use_with uuid libuuid)
+
+ # do not use uuid even if available in libc (like on FreeBSD)
+ use uuid || export ac_cv_func_uuid_create=no
+
+ if use uuid ; then
+ case ${CHOST} in
+ *-solaris*|*-darwin*)
+ if [[ ! -d ${EROOT}usr/include/uuid ]] &&
+ [[ -d ${ROOT}usr/include/uuid ]]
+ then
+ # Solaris and Darwin have uuid provided by the host
+ # system. Since util-linux's version is based on this
+ # version, and on Darwin actually breaks host headers when
+ # installed, we can "pretend" for libSM we have libuuid
+ # installed, while in fact we don't
+ withuuid="--without-libuuid"
+ export HAVE_LIBUUID=yes
+ export LIBUUID_CFLAGS="-I${ROOT}usr/include/uuid"
+ # Darwin has uuid in libSystem
+ [[ ${CHOST} == *-solaris* ]] && export LIBUUID_LIBS="-luuid"
+ fi
+ ;;
+ esac
+ fi
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ ${withuuid}
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libSM/metadata.xml b/x11-libs/libSM/metadata.xml
new file mode 100644
index 000000000000..8b3fa73a30b0
--- /dev/null
+++ b/x11-libs/libSM/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="uuid">Use UUID for session identification instead of IP address
+ and system time.
+ </flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
new file mode 100644
index 000000000000..74a1e8cda718
--- /dev/null
+++ b/x11-libs/libX11/Manifest
@@ -0,0 +1,2 @@
+DIST libX11-1.6.2.tar.bz2 2339981 SHA256 2aa027e837231d2eeea90f3a4afe19948a6eb4c8b2bec0241eba7dbc8106bd16 SHA512 c8609ff34d1fe71f35b35e0273a872ccded4d824c8afdcca37e1779d37bf667cb814e0ead0805668b4222f196148476f283e417ba371b722f1fe716a5bbba20b WHIRLPOOL 1e6e5010725586557912ab51aa07c41a6297e26f3818e31cf62d455735f4a4f29c0bd13140964ffb1290588ccb8e1643217bca685aa2e7ec40d99b907541656c
+DIST libX11-1.6.3.tar.bz2 2363858 SHA256 cf31a7c39f2f52e8ebd0db95640384e63451f9b014eed2bb7f5de03e8adc8111 SHA512 01bbac8075b3fdae19cacfde1c799469f06fb864235025ce444fc10a3ba079bce30f4f3527db47c5edbf91d08299c61116cdf296efa38b2034c0099fac99cc69 WHIRLPOOL 1aa82b4d00af27e05bd9157cfafe16f2cdeecd3711e983224fda0cf6f323c7165b18f5a4572067b29ff3ca244e91def8523d56fb7be55e977bed507bd5a846f1
diff --git a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch b/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
new file mode 100644
index 000000000000..c854e0b4080d
--- /dev/null
+++ b/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
@@ -0,0 +1,11 @@
+--- configure.ac.orig 2008-07-21 15:48:33 +0200
++++ configure.ac 2008-07-21 15:49:23 +0200
+@@ -198,6 +198,8 @@
+ XTHREADLIB="-pthread" ;;
+ solaris*)
+ XTHREAD_CFLAGS="-D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS" ;;
++ aix*)
++ XTHREAD_CFLAGS="-pthread" ;;
+ esac
+ fi
+ AC_SUBST(XTHREADLIB)
diff --git a/x11-libs/libX11/files/libX11-1.1.5-solaris.patch b/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
new file mode 100644
index 000000000000..a7926a53d78b
--- /dev/null
+++ b/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
@@ -0,0 +1,13 @@
+wchar_t is defined in /usr/include/stddef.h on Solaris
+
+--- include/X11/Xlib.h
++++ include/X11/Xlib.h
+@@ -71,7 +71,7 @@
+ #endif
+ #endif
+
+-#ifndef X_WCHAR
++#if !defined(X_WCHAR) || defined(__sun__)
+ #include <stddef.h>
+ #else
+ #ifdef __UNIXOS2__
diff --git a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch b/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
new file mode 100644
index 000000000000..4539f111faf1
--- /dev/null
+++ b/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
@@ -0,0 +1,13 @@
+diff -ru -x '*.Po' -x '*.Plo' -x '*.o' -x '*.lo' libX11-1.1.5/src/xlibi18n/Ximint.h libX11-1.1.5.orig/src/xlibi18n/Ximint.h
+--- libX11-1.1.5/src/xlibi18n/Ximint.h 2009-01-16 10:14:37 +0100
++++ libX11-1.1.5.orig/src/xlibi18n/Ximint.h 2009-01-16 09:39:48 +0100
+@@ -37,6 +37,9 @@
+
+ #include <stdio.h>
+ #include <X11/Xutil.h>
++#ifdef WIN32
++# include <X11/Xwindows.h>
++#endif
+
+ #define Public /**/
+ #define Private static
diff --git a/x11-libs/libX11/libX11-1.6.2.ebuild b/x11-libs/libX11/libX11-1.6.2.ebuild
new file mode 100644
index 000000000000..9ee48229d960
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+# needs automake-1.14 without eautoreconf
+XORG_EAUTORECONF=yes
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.3[${MULTILIB_USEDEP}]
+ x11-libs/xtrans
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86bigfontproto-1.2.0-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+ >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-lang/perl )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
+ "${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
+ "${FILESDIR}"/${PN}-1.1.5-solaris.patch
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ $(use_enable doc specs)
+ $(use_enable ipv6)
+ --without-fop
+ )
+
+ [[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
+ xorg-2_src_configure
+}
+
+multilib_src_compile() {
+ if tc-is-cross-compiler; then
+ # Make sure the build-time tool "makekeys" uses build settings.
+ tc-export_build_env BUILD_CC
+ emake -C src/util \
+ CC="${BUILD_CC}" \
+ CFLAGS="${BUILD_CFLAGS}" \
+ LDFLAGS="${BUILD_LDFLAGS}" \
+ clean all
+ fi
+
+ default
+}
diff --git a/x11-libs/libX11/libX11-1.6.3.ebuild b/x11-libs/libX11/libX11-1.6.3.ebuild
new file mode 100644
index 000000000000..71daac1156c7
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.3.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+# needs automake-1.14 without eautoreconf
+XORG_EAUTORECONF=yes
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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 test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.3[${MULTILIB_USEDEP}]
+ x11-libs/xtrans
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86bigfontproto-1.2.0-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+ >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( dev-lang/perl )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.1.4-aix-pthread.patch
+ "${FILESDIR}"/${PN}-1.1.5-winnt-private.patch
+ "${FILESDIR}"/${PN}-1.1.5-solaris.patch
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ $(use_enable doc specs)
+ $(use_enable ipv6)
+ --without-fop
+ )
+
+ [[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
+ xorg-2_src_configure
+}
+
+multilib_src_compile() {
+ if tc-is-cross-compiler; then
+ # Make sure the build-time tool "makekeys" uses build settings.
+ tc-export_build_env BUILD_CC
+ emake -C src/util \
+ CC="${BUILD_CC}" \
+ CFLAGS="${BUILD_CFLAGS}" \
+ LDFLAGS="${BUILD_LDFLAGS}" \
+ clean all
+ fi
+
+ default
+}
diff --git a/x11-libs/libX11/metadata.xml b/x11-libs/libX11/metadata.xml
new file mode 100644
index 000000000000..ef95d0c2c840
--- /dev/null
+++ b/x11-libs/libX11/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:libx11</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-libs/libXCalibrate/Manifest b/x11-libs/libXCalibrate/Manifest
new file mode 100644
index 000000000000..ea2dd91099c5
--- /dev/null
+++ b/x11-libs/libXCalibrate/Manifest
@@ -0,0 +1 @@
+DIST libXCalibrate-20081207.tar.bz2 16962 RMD160 ce89aa581f1f1b0231be703b6d2e0d95b25572d8 SHA1 0be6bc0ce10339290f52a724b3806da621c9078d SHA256 dc77ff47b693165fef00f4b665b4d23989fad61aac7d25b35f2ef60eb9095dba
diff --git a/x11-libs/libXCalibrate/libXCalibrate-0.1_pre20081207-r1.ebuild b/x11-libs/libXCalibrate/libXCalibrate-0.1_pre20081207-r1.ebuild
new file mode 100644
index 000000000000..12ce45738593
--- /dev/null
+++ b/x11-libs/libXCalibrate/libXCalibrate-0.1_pre20081207-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_EAUTORECONF=yes
+
+inherit xorg-2
+
+MY_PV=${PV#*_pre}
+
+DESCRIPTION="X.Org Calibrate client-side protocol library"
+SRC_URI="mirror://gentoo/${PN}-${MY_PV}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ x11-proto/xcalibrateproto
+ x11-proto/xextproto"
+
+S=${WORKDIR}/${PN}
diff --git a/x11-libs/libXCalibrate/metadata.xml b/x11-libs/libXCalibrate/metadata.xml
new file mode 100644
index 000000000000..d7e55682affc
--- /dev/null
+++ b/x11-libs/libXCalibrate/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>x11</herd>
+<herd>embedded</herd>
+</pkgmetadata>
diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest
new file mode 100644
index 000000000000..d845b76932de
--- /dev/null
+++ b/x11-libs/libXScrnSaver/Manifest
@@ -0,0 +1,2 @@
+DIST libXScrnSaver-1.2.1.tar.bz2 268322 SHA256 ce3a66e2f6fa85b22280ab9cc1b2a113a2cb0ade9470914c7c3d6ac1d44b259a SHA512 6c109bbc5cff47aa3839c540bf30204d371a01fb1849b5ad52f0d89f47b05eecbebf9a229f3834f1927d767fe0c2f9848e3b58fed048aad1001a18ad4b1affb8 WHIRLPOOL c3e32731c9f08c85122d52716001c696386b17b4409e0583cbe98696e9e773b0d398cdedfdb55e6bbdaa70118f11a54cdbe9a8c1541e88eb8c5277d6d9d9c389
+DIST libXScrnSaver-1.2.2.tar.bz2 290437 SHA256 8ff1efa7341c7f34bcf9b17c89648d6325ddaae22e3904e091794e0b4426ce1d SHA512 973aed3ad296c7160b66fccd4fff7375afc4332239acbe0ae1644fed9c453de69040f8174882ba264c731448edba9b499d398d013d556aea72434339399ed29f WHIRLPOOL 527e65bf555a0c1e87df07906cf2d0f737a46c6a181d42c7c6e3431e1a1f8b858312d2419486b99cfea92eb50cb17d3453289c0cc5303550fbdab24eb82ca338
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild
new file mode 100644
index 000000000000..b524816d45af
--- /dev/null
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org XScrnSaver library"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ >=x11-proto/scrnsaverproto-1.2"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild
new file mode 100644
index 000000000000..31d0d4439be8
--- /dev/null
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2-r1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XScrnSaver library"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-proto/scrnsaverproto-1.2.2-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.ebuild
new file mode 100644
index 000000000000..43040861309b
--- /dev/null
+++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.2.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="X.Org XScrnSaver library"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ >=x11-proto/scrnsaverproto-1.2"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXScrnSaver/metadata.xml b/x11-libs/libXScrnSaver/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXScrnSaver/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-libs/libXTrap/Manifest b/x11-libs/libXTrap/Manifest
new file mode 100644
index 000000000000..7a4954f41ee5
--- /dev/null
+++ b/x11-libs/libXTrap/Manifest
@@ -0,0 +1,2 @@
+DIST libXTrap-1.0.0.tar.bz2 220148 SHA256 cfd12ce675bd5cdeac3720582741fe81a99343bef475d440cb34a7f2cdfe34ba SHA512 294ea55af9bba46d8dba137c12b2dce4befb4d0596e68b0d0a9d8a0182a7d6b758f6b39985723dcc9e1b44699befab4b9ab4480cfe515494edb4aae901be1101 WHIRLPOOL 4f578acc83cfc6f6625940dcec036f0c122d1e291dd35322e804dc6c1942f83796535cf1375467913a47922fd08da9a59fb7fc99eeab1555d4fa980b52953061
+DIST libXTrap-1.0.1.tar.bz2 269484 SHA256 8f373d55985676b893d61bd5a255ec9f214be4682ec1167d30356e6564e7252e SHA512 638f79aeb7a68aaff51839266c74b5e4f875e5bb2b473f01a637ea0dd75e4fbc7350612ff27dc12716142397c824fe16b178003015878f34f439d90d748391f1 WHIRLPOOL f38821942fc75ab9b4dbc49da9dd9d685e8bbcff3d79151eb345281d135ef75cfcbc645780dcedb139e6fc769d5db0d57f6e5993992876ba79c1ccf1c5bf0d65
diff --git a/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild b/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..aaefd36362b2
--- /dev/null
+++ b/x11-libs/libXTrap/libXTrap-1.0.0-r1.ebuild
@@ -0,0 +1,18 @@
+# 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 library"
+
+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/libXext
+ x11-proto/trapproto
+ x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXTrap/libXTrap-1.0.0.ebuild b/x11-libs/libXTrap/libXTrap-1.0.0.ebuild
new file mode 100644
index 000000000000..45aea76dbd39
--- /dev/null
+++ b/x11-libs/libXTrap/libXTrap-1.0.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+# Must be before x-modular eclass is inherited
+#SNAPSHOT="yes"
+
+inherit x-modular
+
+DESCRIPTION="X.Org XTrap library"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXext"
+DEPEND="${RDEPEND}
+ x11-proto/trapproto
+ x11-proto/xextproto"
diff --git a/x11-libs/libXTrap/libXTrap-1.0.1.ebuild b/x11-libs/libXTrap/libXTrap-1.0.1.ebuild
new file mode 100644
index 000000000000..c0a5d1511bbc
--- /dev/null
+++ b/x11-libs/libXTrap/libXTrap-1.0.1.ebuild
@@ -0,0 +1,18 @@
+# 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 library"
+
+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/libXext
+ x11-proto/trapproto
+ x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXTrap/metadata.xml b/x11-libs/libXTrap/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXTrap/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-libs/libXau/Manifest b/x11-libs/libXau/Manifest
new file mode 100644
index 000000000000..f68c91752d20
--- /dev/null
+++ b/x11-libs/libXau/Manifest
@@ -0,0 +1 @@
+DIST libXau-1.0.8.tar.bz2 295297 SHA256 fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2 SHA512 9f933d22f8f2411ae770094589cbe170c631a1437d572664e0fa6b9608e6ec39deef752f2dd6408ab45acdf01bf1827ef3ced640a33da787d9cfb546f12397b5 WHIRLPOOL 2315bec66062227051833e6248582c77ecb776947f6dc52369e51ef1fc810a2c5480d0f56e9457d02a54d1fc403871ee80a209fedc92040bfe2c72ca4880bb80
diff --git a/x11-libs/libXau/libXau-1.0.8.ebuild b/x11-libs/libXau/libXau-1.0.8.ebuild
new file mode 100644
index 000000000000..a05cd5827bdc
--- /dev/null
+++ b/x11-libs/libXau/libXau-1.0.8.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org X authorization library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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=""
+
+RDEPEND=">=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXau/metadata.xml b/x11-libs/libXau/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXau/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-libs/libXaw/Manifest b/x11-libs/libXaw/Manifest
new file mode 100644
index 000000000000..54ccb30905c9
--- /dev/null
+++ b/x11-libs/libXaw/Manifest
@@ -0,0 +1,2 @@
+DIST libXaw-1.0.12.tar.bz2 677147 SHA256 96fc314874fce9979556321d1d6ee00b5baf32fb333b7278853b4983bc3cdbf6 SHA512 baf11625a20b89f08747e25dff6755ab796c8a5a91341d3cb21f85780733c4a3c25bbf134ac6259982207067d0a617f83f516c48aef6f57cbab14c8a9862944d WHIRLPOOL f23798a3c221d6f23de9b8d708f5c054d39d6681df23a53ab7a3c221215dfafc23463475e2d8290d609fd591443e35c1d0e9bc939a528eca3c6e757d7dd2d6e0
+DIST libXaw-1.0.13.tar.bz2 674140 SHA256 8ef8067312571292ccc2bbe94c41109dcf022ea5a4ec71656a83d8cce9edb0cd SHA512 d768a39f7111802493fa1df1b80d858e4139ceeb883d45ff13ce3b7a0e775a7d2834b7ad157c8330117f04c32f38979795332dd7a119adb2344fcb1aa9cf1e2f WHIRLPOOL c2af8386b8803b0429bc27875761214a5dbabf4b3feda69af18ddcd00ae6809a3de6fa0912ac1299cbb381d4d8180d1a57f2330639bfede79ef9bcbdd6e6fd34
diff --git a/x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch b/x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch
new file mode 100644
index 000000000000..dfc2e23672f9
--- /dev/null
+++ b/x11-libs/libXaw/files/libXaw-1.0.12-format-security.patch
@@ -0,0 +1,26 @@
+From ec7d7c303385a6bdb0833a5aaae96be697cca7ab Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 21 Nov 2013 11:43:55 -0500
+Subject: Fix build with gcc -Werror=format-security
+
+DisplayList.c:290:4: error: format not a string literal and no format
+arguments [-Werror=format-security]
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+diff --git a/src/DisplayList.c b/src/DisplayList.c
+index 3e99df4..0581bf7 100644
+--- a/src/DisplayList.c
++++ b/src/DisplayList.c
+@@ -287,7 +287,7 @@ _XawDisplayList *XawCreateDisplayList(String string, Screen *screen,
+ }
+ if (fp)
+ {
+- snprintf(cname, fp - fname + 1, fname);
++ snprintf(cname, fp - fname + 1, "%s", fname);
+ memmove(fname, fp + 1, strlen(fp));
+ lc = cname[0] ? XawGetDisplayListClass(cname) : xlibc;
+ if (!lc)
+--
+cgit v0.10.2
+
diff --git a/x11-libs/libXaw/libXaw-1.0.12.ebuild b/x11-libs/libXaw/libXaw-1.0.12.ebuild
new file mode 100644
index 000000000000..2207503b2b86
--- /dev/null
+++ b/x11-libs/libXaw/libXaw-1.0.12.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xaw library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="deprecated"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ # Fix build with gcc -Werror=format-security (from 'master')
+ "${FILESDIR}"/${P}-format-security.patch
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable deprecated xaw6)
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXaw/libXaw-1.0.13.ebuild b/x11-libs/libXaw/libXaw-1.0.13.ebuild
new file mode 100644
index 000000000000..2ef33695333f
--- /dev/null
+++ b/x11-libs/libXaw/libXaw-1.0.13.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xaw library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="deprecated"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable deprecated xaw6)
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXaw/metadata.xml b/x11-libs/libXaw/metadata.xml
new file mode 100644
index 000000000000..f58d351da9d8
--- /dev/null
+++ b/x11-libs/libXaw/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="deprecated">Install deprecated Xaw6 library.</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/libXaw3d/Manifest b/x11-libs/libXaw3d/Manifest
new file mode 100644
index 000000000000..3b054395a56b
--- /dev/null
+++ b/x11-libs/libXaw3d/Manifest
@@ -0,0 +1 @@
+DIST libXaw3d-1.6.2.tar.bz2 551851 SHA256 b74f11681061c1492c03cbbe6e318f9635b3877af0761fc0e67e1467c3a6972b SHA512 11b15884e47efc139aa019f0a76086913535767fb2e20fcd837d810d3b6b4a7bda3408be5fa0cbe90ae16eeaebe5db9b0ec77a0e2b5767590662ef3a7c9c96ea WHIRLPOOL 6d56384ed8a4f25d789521203186b6b40330569bb9d3376486b84927906eff0f487139b7cdf664372061a8b0da54db5aa0a7ccbaf7e7b6c51fb4c4166cc48f14
diff --git a/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
new file mode 100644
index 000000000000..3ca446625162
--- /dev/null
+++ b/x11-libs/libXaw3d/libXaw3d-1.6.2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org Xaw3d library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="unicode"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXt"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/yacc
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable unicode internationalization)
+ --enable-arrow-scrollbars
+ --enable-gray-stipples
+ )
+
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/libXaw3d/metadata.xml b/x11-libs/libXaw3d/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXaw3d/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-libs/libXaw3dXft/Manifest b/x11-libs/libXaw3dXft/Manifest
new file mode 100644
index 000000000000..e7d88794e018
--- /dev/null
+++ b/x11-libs/libXaw3dXft/Manifest
@@ -0,0 +1,2 @@
+DIST libXaw3dXft-1.6.2c.tar.bz2 574326 SHA256 12fed1c4f71b12a7fe51ff2859ecf0c9dfb4c828f8bedfbde186fa6498285a9d SHA512 4bc2b8257cc44cbdf1640c9946acd5958694beef4af9f5910cf07b1d32133708561e59532a3ae8f1540b930f97649978910b2eed349e81486ab86f340363faad WHIRLPOOL 9a9df5a5ae37c22a1507d6dfbe062e8b135a9380773c07d337520f00c5423473e856e80113138d182ccc918c5faf21abc1a3555ffdbed9979169f85327fedba6
+DIST libXaw3dXft-1.6.2d.tar.bz2 584670 SHA256 c0ef54c2f40484507c3b7b4df3102b5284d258fde9557de0c417e89ba7f176fe SHA512 ac434b7f055d20ceb0bd17851d8ba69976ec562a60cb8012a259045e52c038278f0a8b25b52a61befab3aa169b74fd919278c671f1b6e282efb404e089772740 WHIRLPOOL bfeb4c0a169ce0ddbf9aeaec55b3dec964e5a273128a7831e9afee7b2763ca44f18d31432a61a57053abae63c87537f0f7ba530bc51fa2b8a40ef1a1df597b55
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.ebuild
new file mode 100644
index 000000000000..a2006c56eb27
--- /dev/null
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2c.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 xorg-2
+
+DESCRIPTION="Xaw3dXft library"
+HOMEPAGE="http://sourceforge.net/projects/sf-xpaint"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+KEYWORDS="amd64 x86"
+IUSE="unicode xpm"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXmu
+ x11-libs/libXt
+ xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/yacc
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable unicode internationalization)
+ $(usex xpm "--enable-multiplane-bitmaps" "")
+ --enable-arrow-scrollbars
+ --enable-gray-stipples
+ )
+
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.ebuild
new file mode 100644
index 000000000000..6dc774446722
--- /dev/null
+++ b/x11-libs/libXaw3dXft/libXaw3dXft-1.6.2d.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 xorg-2
+
+DESCRIPTION="Xaw3dXft library"
+HOMEPAGE="http://sourceforge.net/projects/sf-xpaint"
+SRC_URI="mirror://sourceforge/sf-xpaint/${P}.tar.bz2"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="unicode xpm"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXft
+ x11-libs/libXmu
+ x11-libs/libXt
+ xpm? ( x11-libs/libXpm )"
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ virtual/yacc
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable unicode internationalization)
+ $(usex xpm "--enable-multiplane-bitmaps" "")
+ --enable-arrow-scrollbars
+ --enable-gray-stipples
+ )
+
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/libXaw3dXft/metadata.xml b/x11-libs/libXaw3dXft/metadata.xml
new file mode 100644
index 000000000000..402a82e8c6df
--- /dev/null
+++ b/x11-libs/libXaw3dXft/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>maintainer-needed@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">sf-xpaint</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libXcomposite/Manifest b/x11-libs/libXcomposite/Manifest
new file mode 100644
index 000000000000..83475fd36139
--- /dev/null
+++ b/x11-libs/libXcomposite/Manifest
@@ -0,0 +1,2 @@
+DIST libXcomposite-0.4.3.tar.bz2 246715 SHA256 32294d28f4ee46db310c344546d98484728b7d52158c6d7c25bba02563b41aad SHA512 b30cc24d93da6a9a275e6fb807ed68d646b15dcf919bde7ee30c26ba9ad19ba97de3d6fafd67dfad2c4a62a9b1b59ec0b24b0078aad32fbadcdf7c6eaac210d9 WHIRLPOOL 3d957e1432bde434692065d8415b89bdfc5eccbb96d5e764cf51e84d81f92d90e3252ef33cd770b9e2406427b80a44d20be417cd6630881834d5a10134e6d9ce
+DIST libXcomposite-0.4.4.tar.bz2 283746 SHA256 ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178 SHA512 b15f8fdbe4cb7488bdad161d73ef8e59ef603c5af92d7b573110ba136d7d4ce3749aac45972bce87662b0310b67e831cffad72c45c15bfff988b5b555d4c884b WHIRLPOOL 5b7c5886920bf49f539f0d2460055aa8c226e26387cd21c7d551057f7b0ed51b1e545dacfcb5ffc08817d9bec1d64697ed81d10852c679a0efe2c4af60dd08ea
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild
new file mode 100644
index 000000000000..9b9d3f075841
--- /dev/null
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.3-r1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xcomposite library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXfixes
+ >=x11-proto/compositeproto-0.4
+ x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ )
+}
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.3.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.3.ebuild
new file mode 100644
index 000000000000..4a53ee4f01ca
--- /dev/null
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.3.ebuild
@@ -0,0 +1,24 @@
+# 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 Xcomposite library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXfixes
+ x11-libs/libXext
+ >=x11-proto/compositeproto-0.4
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ doc? ( app-text/xmlto )"
+
+src_configure() {
+ CONFIGURE_OPTIONS="$(use_with doc xmlto)"
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild
new file mode 100644
index 000000000000..bea2bd26c6ed
--- /dev/null
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.4-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xcomposite library"
+
+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 ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ >=x11-proto/compositeproto-0.4.2-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.4.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.4.ebuild
new file mode 100644
index 000000000000..b2df166722dd
--- /dev/null
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.4.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xcomposite library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXfixes
+ >=x11-proto/compositeproto-0.4
+ x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXcomposite/metadata.xml b/x11-libs/libXcomposite/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXcomposite/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-libs/libXcursor/Manifest b/x11-libs/libXcursor/Manifest
new file mode 100644
index 000000000000..f0316289e1d6
--- /dev/null
+++ b/x11-libs/libXcursor/Manifest
@@ -0,0 +1 @@
+DIST libXcursor-1.1.14.tar.bz2 311896 SHA256 9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df SHA512 687963b54da66be25371f64a88f91812b38de4ffc3b806070f3aeb1da379df16ede819201a352b3fb66efc6b40a36a22770add3ae464f2008aff3e23cb60a8e6 WHIRLPOOL 3cb8adedd3b4f68f37814a880949a7d05d429b3f7f80a94456af823e921844dd338c5f5fa0da4a157b1b853ca8116e8366b004c6f4561150121397440aa651ec
diff --git a/x11-libs/libXcursor/libXcursor-1.1.14.ebuild b/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
new file mode 100644
index 000000000000..fab5519d1fa9
--- /dev/null
+++ b/x11-libs/libXcursor/libXcursor-1.1.14.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xcursor library"
+
+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/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-icondir=/usr/share/cursors/xorg-x11
+ --with-cursorpath='~/.cursors:~/.icons:/usr/local/share/cursors/xorg-x11:/usr/local/share/cursors:/usr/local/share/icons:/usr/local/share/pixmaps:/usr/share/cursors/xorg-x11:/usr/share/cursors:/usr/share/pixmaps/xorg-x11:/usr/share/icons:/usr/share/pixmaps'
+)
diff --git a/x11-libs/libXcursor/metadata.xml b/x11-libs/libXcursor/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXcursor/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-libs/libXdamage/Manifest b/x11-libs/libXdamage/Manifest
new file mode 100644
index 000000000000..a68a20d67b83
--- /dev/null
+++ b/x11-libs/libXdamage/Manifest
@@ -0,0 +1 @@
+DIST libXdamage-1.1.4.tar.bz2 278937 SHA256 7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad SHA512 1058cef11a8f0edfcae7265837369e492b007c34d56ae04145b558e5f02a163827aba1d0b80656f4c8e5d1e9a40f5077d93b7ff4f5e704f7409060dceba03904 WHIRLPOOL b375cecaf924396e186e2836ce6bdb8f78a29260898a0d8cf4dd537dd1240d5b0a0a425792727ecc42a95b4d93dd050e265c661f32bea992377c6e5533c8ab39
diff --git a/x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild b/x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild
new file mode 100644
index 000000000000..e1e429ebbedc
--- /dev/null
+++ b/x11-libs/libXdamage/libXdamage-1.1.4-r1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xdamage library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ >=x11-proto/damageproto-1.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXdamage/metadata.xml b/x11-libs/libXdamage/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXdamage/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-libs/libXdmcp/Manifest b/x11-libs/libXdmcp/Manifest
new file mode 100644
index 000000000000..4826cadaa1cb
--- /dev/null
+++ b/x11-libs/libXdmcp/Manifest
@@ -0,0 +1,2 @@
+DIST libXdmcp-1.1.1.tar.bz2 310878 SHA256 9ace6d4230f9dce4ed090692f82f613253ada8f887b23b3d8ff3dd4e3a7c118e SHA512 b17ad4bf01443cb78b440a33a89f2b98babf02402d7bdf68161a08429fd1964ac8112b0bb1519dd2138db0a5ff295c7b7581f56ff602ccca1a9baac26bc62e08 WHIRLPOOL 54bc7ebdbdced210a0e2c82eb63fdb884a3e9869127b5489f11e0e6f8f1c0b55d825f0b5e10b30f52db4d35bec2b1bf91d32eb326c7e6ce5a3cba8fff9abb606
+DIST libXdmcp-1.1.2.tar.bz2 331518 SHA256 81fe09867918fff258296e1e1e159f0dc639cb30d201c53519f25ab73af4e4e2 SHA512 f96005934b8bc752059106f8caf7df0574f5ef3c7a83bd797497b56ca556a7ff4dc1d28195e421259e82ea027b5c738094add3ec107a22544c9070725d8d46bb WHIRLPOOL ad5a3c86463d4ae582f1ffaf2ae85f5d118f7789b18f9cafd08dcc43b6fe03d9797430e0a686a7d422e09342f4a2c01f0e83a9eb9563dd6a66bf94722b81f2e0
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.1-r1.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..f70f8a883425
--- /dev/null
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.1-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org X Display Manager Control Protocol library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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=""
+
+RDEPEND="x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.2.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.2.ebuild
new file mode 100644
index 000000000000..b4b98a26383d
--- /dev/null
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org X Display Manager Control Protocol library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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=""
+
+RDEPEND="x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-libs/libXdmcp/metadata.xml b/x11-libs/libXdmcp/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXdmcp/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-libs/libXevie/Manifest b/x11-libs/libXevie/Manifest
new file mode 100644
index 000000000000..15389f5f981b
--- /dev/null
+++ b/x11-libs/libXevie/Manifest
@@ -0,0 +1 @@
+DIST libXevie-1.0.3.tar.bz2 253286 RMD160 31d896cce4123d2c188c805f89fa33f6e0d2c2f9 SHA1 84e2dc6e35c4a82f1a4d1fe4723fba58364c3bec SHA256 c00b382123e58f595b3cecaa50471ebec534660e5f92ae46d94266345844fd73
diff --git a/x11-libs/libXevie/libXevie-1.0.3.ebuild b/x11-libs/libXevie/libXevie-1.0.3.ebuild
new file mode 100644
index 000000000000..e059fe511c15
--- /dev/null
+++ b/x11-libs/libXevie/libXevie-1.0.3.ebuild
@@ -0,0 +1,18 @@
+# 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 Xevie library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-proto/xextproto
+ x11-proto/xproto
+ x11-proto/evieext"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXevie/metadata.xml b/x11-libs/libXevie/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXevie/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-libs/libXext/Manifest b/x11-libs/libXext/Manifest
new file mode 100644
index 000000000000..a3b0f2e7d3d9
--- /dev/null
+++ b/x11-libs/libXext/Manifest
@@ -0,0 +1,2 @@
+DIST libXext-1.3.2.tar.bz2 378901 SHA256 f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0 SHA512 5ed612f2c5e902648eb0438bfb8d9d6440a5baa19d95eb1253b51fe9ad8dcf903a7ee68a9455044d17ce0d486e421df0f98a069ab5ad1a49364f157bdf64efe7 WHIRLPOOL dff91d80c9bcddebd0b1eb0356395749bec3511d40bb69ea681ba55c5353827242bf60dae550081fd482678f6ab551c053ece7728a9dded62aab97a2bdf2137c
+DIST libXext-1.3.3.tar.bz2 389523 SHA256 b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35 SHA512 669d61545d10b999872addbf5628127840a221cbeaafb5ffa4328e0e0e1823583ece973bcafd5f13852ed58d4b0fe313a35f304ac80c6ed2b382cbbca977761a WHIRLPOOL 4f70b913c6cdcdb6f2e050931ac00c92e5bd4b07254a3864cbc54451adc1c240b52f0a4ae5502ceef1ecde02fbe270c6b59d291f397c8734a3b65ff82c674cca
diff --git a/x11-libs/libXext/libXext-1.3.2.ebuild b/x11-libs/libXext/libXext-1.3.2.ebuild
new file mode 100644
index 000000000000..b59d13ade003
--- /dev/null
+++ b/x11-libs/libXext/libXext-1.3.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xext library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXext/libXext-1.3.3.ebuild b/x11-libs/libXext/libXext-1.3.3.ebuild
new file mode 100644
index 000000000000..f30ff8db8f84
--- /dev/null
+++ b/x11-libs/libXext/libXext-1.3.3.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xext library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXext/metadata.xml b/x11-libs/libXext/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXext/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-libs/libXfixes/Manifest b/x11-libs/libXfixes/Manifest
new file mode 100644
index 000000000000..43aaeee13bec
--- /dev/null
+++ b/x11-libs/libXfixes/Manifest
@@ -0,0 +1 @@
+DIST libXfixes-5.0.1.tar.bz2 291978 SHA256 63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767 SHA512 b47c841db169d1b329eec9deb555799cd087a466326840f1f5349303ba79cff5850b1bb69c1ff38b3f522f24d61db58a0c01021e1ffea2896527167262fc7150 WHIRLPOOL d4ea1f3d83173f811f93adcec0791b850354e249ca384e65c53ea404ced0e47131c7bd531d7cde5007804b3509d962c395028c7ae03c48f31ae35b0c178679a3
diff --git a/x11-libs/libXfixes/libXfixes-5.0.1.ebuild b/x11-libs/libXfixes/libXfixes-5.0.1.ebuild
new file mode 100644
index 000000000000..b264d10f2414
--- /dev/null
+++ b/x11-libs/libXfixes/libXfixes-5.0.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfixes library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-proto/fixesproto-5.0-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfixes/metadata.xml b/x11-libs/libXfixes/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXfixes/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-libs/libXfont/Manifest b/x11-libs/libXfont/Manifest
new file mode 100644
index 000000000000..5a708203e212
--- /dev/null
+++ b/x11-libs/libXfont/Manifest
@@ -0,0 +1,2 @@
+DIST libXfont-1.4.9.tar.bz2 495464 SHA256 6c6b061a3aa44f0ac95785f9579f6427080c60ae6948b49bcc8d44f63942ad89 SHA512 d541dac1c8639578a122eaa61c3df1cd180f820609a02897baf1f1e45f49109b3a755a7f3b5f284716f5e6f494a829aa86be1c730156eb82db11b1551a320654 WHIRLPOOL 4c3e71025da5688ab594569557abcff714f423406409800e419a3d1b7898135ce36f6f9aa31f17613f82fe5cee9fe8e36da5b5a46529ff7203eeb5dfc07a25df
+DIST libXfont-1.5.1.tar.bz2 502903 SHA256 b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098 SHA512 3ca8f7c1c642072c9bf9a755b45857f77753111ce6f1f99bd804e0f1b90cf61259fbde609a5342cce9c1ac5431b093bf75febb68baff2f2688e0a5fe5864a666 WHIRLPOOL dda0749a147591a70d6aacb4f8b5412a63cd40cb10ae2a6e2445b4763978f0d88f4fd805b18ddfd1ed36a6ef56ec2f5e657326ce969070c2b6461367f849a7d6
diff --git a/x11-libs/libXfont/libXfont-1.4.9.ebuild b/x11-libs/libXfont/libXfont-1.4.9.ebuild
new file mode 100644
index 000000000000..3a62e28af9c5
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.4.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 ipv6 truetype"
+
+RDEPEND="x11-libs/xtrans
+ x11-libs/libfontenc
+ truetype? ( >=media-libs/freetype-2 )
+ bzip2? ( app-arch/bzip2 )
+ x11-proto/xproto
+ <x11-proto/fontsproto-2.1.3"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable doc devel-docs)
+ $(use_with doc xmlto)
+ $(use_with bzip2)
+ $(use_enable truetype freetype)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXfont/libXfont-1.5.1.ebuild b/x11-libs/libXfont/libXfont-1.5.1.ebuild
new file mode 100644
index 000000000000..fea7256b88ff
--- /dev/null
+++ b/x11-libs/libXfont/libXfont-1.5.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xfont library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="bzip2 ipv6 truetype"
+
+RDEPEND="x11-libs/xtrans
+ x11-libs/libfontenc
+ truetype? ( >=media-libs/freetype-2 )
+ bzip2? ( app-arch/bzip2 )
+ x11-proto/xproto
+ >=x11-proto/fontsproto-2.1.3
+ !<x11-base/xorg-server-1.5.99.901"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable doc devel-docs)
+ $(use_with doc xmlto)
+ $(use_with bzip2)
+ $(use_enable truetype freetype)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXfont/metadata.xml b/x11-libs/libXfont/metadata.xml
new file mode 100644
index 000000000000..ce1f6e1a2b55
--- /dev/null
+++ b/x11-libs/libXfont/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>x11</herd>
+ <use>
+ <flag name="bzip2">Support bzip2 compressed PCF fonts.</flag>
+ <flag name="truetype">Use media-libs/freetype for font rasterization.</flag>
+ </use>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:x.org:libxfont</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libXfontcache/Manifest b/x11-libs/libXfontcache/Manifest
new file mode 100644
index 000000000000..79bc750e8ff7
--- /dev/null
+++ b/x11-libs/libXfontcache/Manifest
@@ -0,0 +1 @@
+DIST libXfontcache-1.0.5.tar.bz2 240293 SHA256 0d639219549f51fa0e6b4414383f5d13e6c1638e66b3434f4626eb989ffacbce SHA512 cd11231b95d3d3be9deb82e61506e58281150d743b07d05716aa627ab31005cf0f963ef2b96eafc65c4a0438f7ff93cdfab25022a05961ea1ff184d47c131310 WHIRLPOOL 81e0622146d1d8c4f7e6e318be1974d7d45f8021195e57ab849df00904b2b2a54c28c68c6c49ae0c3a65253effc27a0b8027bb805384d07825d46a0d661417a5
diff --git a/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild b/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.ebuild
new file mode 100644
index 000000000000..a1186be5c878
--- /dev/null
+++ b/x11-libs/libXfontcache/libXfontcache-1.0.5-r1.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="X.Org Xfontcache library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-proto/fontcacheproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXfontcache/metadata.xml b/x11-libs/libXfontcache/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXfontcache/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-libs/libXft/Manifest b/x11-libs/libXft/Manifest
new file mode 100644
index 000000000000..f1b2a0da1071
--- /dev/null
+++ b/x11-libs/libXft/Manifest
@@ -0,0 +1,2 @@
+DIST libXft-2.3.1.tar.bz2 311556 SHA256 7fce32b92dcb7b2869bed567af2abc7bbad0d5d6fcf471b8a3e137964a31bbbd SHA512 737d6ab892daf829da8b2fed954b31b2657d29033f35e806599cd67c6e044ab94b0f035804a1c4c9e3e0cbdc74a117cd274128a57f4b2cf81383561d62eb9f1f WHIRLPOOL ecd372614afc4fba05598e51c051f0a011c5ccaabc41e9e585b67180099cd9f7c6d68904adbe5ccf44f79133e21495daa6cd46675ca7556e7d7ab0dac1ee432a
+DIST libXft-2.3.2.tar.bz2 335495 SHA256 f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4bfcdc4c SHA512 eb2e0c46b4434198690a3ca2b613df14ad599c860b47d10a1e8efe3b4e812a78460f9f414eaf89db21d605613a4e18324dcb8a22928609c6bc15178330a05398 WHIRLPOOL d6d5e5741f223824ffaffc11f0bd51b992516f87a688a9f4f7d344caeef52d60094aee0d5e1f6313b714f68865828f3ddbb5531e073c04e4f6a9311c652218dc
diff --git a/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch b/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch
new file mode 100644
index 000000000000..4fc944aa2195
--- /dev/null
+++ b/x11-libs/libXft/files/libXft-2.3.1-compile_fix.patch
@@ -0,0 +1,17 @@
+--- src/xftglyphs.c.orig 2012-06-02 11:36:35.000000000 -0500
++++ src/xftglyphs.c 2013-11-28 01:39:49.000000000 -0600
+@@ -21,10 +21,10 @@
+ */
+
+ #include "xftint.h"
+-#include <freetype/ftoutln.h>
+-#include <freetype/ftlcdfil.h>
+-
+-#include <freetype/ftsynth.h>
++#include <ft2build.h>
++#include FT_OUTLINE_H
++#include FT_LCD_FILTER_H
++#include FT_SYNTHESIS_H
+
+ /*
+ * Validate the memory info for a font
diff --git a/x11-libs/libXft/libXft-2.3.1-r1.ebuild b/x11-libs/libXft/libXft-2.3.1-r1.ebuild
new file mode 100644
index 000000000000..613a2e94f353
--- /dev/null
+++ b/x11-libs/libXft/libXft-2.3.1-r1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="X.Org Xft library"
+
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ virtual/ttf-fonts"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}/${PN}-2.3.1-compile_fix.patch" )
diff --git a/x11-libs/libXft/libXft-2.3.2.ebuild b/x11-libs/libXft/libXft-2.3.2.ebuild
new file mode 100644
index 000000000000..ac7c6ee8f376
--- /dev/null
+++ b/x11-libs/libXft/libXft-2.3.2.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_MULTILIB=yes
+inherit xorg-2 flag-o-matic
+
+DESCRIPTION="X.Org Xft library"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ virtual/ttf-fonts"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXft/metadata.xml b/x11-libs/libXft/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXft/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-libs/libXi/Manifest b/x11-libs/libXi/Manifest
new file mode 100644
index 000000000000..1db0753a00b3
--- /dev/null
+++ b/x11-libs/libXi/Manifest
@@ -0,0 +1,2 @@
+DIST libXi-1.7.2.tar.bz2 440969 SHA256 df24781dc63645e2b561cd0b20bd8a0e7aff02e426a8d2a7641159004d4cb20e SHA512 f419a30711220f51bc77ba4cd2759e565d4f8ba9960c3bcce3ec80ab84389fe220e4276887b125ec105810bd219698fb3a22ec4b9d91eab7235ed9a3ca6925c3 WHIRLPOOL 788160df688e73f9bace2c200bb1ea02b11d68c25ee232a0ccaccd46daec56f9fcb24b746a4861c1d5330bff1b932c533301eafaf1984b3f3226a3524f0f38ac
+DIST libXi-1.7.4.tar.bz2 458378 SHA256 2cffc2686618dc1803725636cd92b36342c512dc60a7a35cba34bf7192a42244 SHA512 17182e580bdf6d65c743ceef4f652f7c7975761f288dfd6f2961c2fed23931569f7cf7cac745bb252fe0a6c3be2739ba6f6533b895519800e382a48f2e5297f0 WHIRLPOOL 5a076f84c68558290cd2a80790bd3c14330bede57b65afb1c5f04cd57322c6eec21e405b0cdaeff6ab17768e64ebafa533341455dda897541c34e924de91adca
diff --git a/x11-libs/libXi/libXi-1.7.2.ebuild b/x11-libs/libXi/libXi-1.7.2.ebuild
new file mode 100644
index 000000000000..febe38a46165
--- /dev/null
+++ b/x11-libs/libXi/libXi-1.7.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xi library"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ $(use_with doc asciidoc)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+
+ ewarn "Some special keys and keyboard layouts may stop working."
+ ewarn "To fix them, recompile xorg-server."
+}
diff --git a/x11-libs/libXi/libXi-1.7.4.ebuild b/x11-libs/libXi/libXi-1.7.4.ebuild
new file mode 100644
index 000000000000..2db0b8c5fbf6
--- /dev/null
+++ b/x11-libs/libXi/libXi-1.7.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xi library"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc specs)
+ $(use_with doc xmlto)
+ $(use_with doc asciidoc)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
+
+pkg_postinst() {
+ xorg-2_pkg_postinst
+
+ ewarn "Some special keys and keyboard layouts may stop working."
+ ewarn "To fix them, recompile xorg-server."
+}
diff --git a/x11-libs/libXi/metadata.xml b/x11-libs/libXi/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXi/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-libs/libXinerama/Manifest b/x11-libs/libXinerama/Manifest
new file mode 100644
index 000000000000..05f01356ab30
--- /dev/null
+++ b/x11-libs/libXinerama/Manifest
@@ -0,0 +1 @@
+DIST libXinerama-1.1.3.tar.bz2 278026 SHA256 7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2 SHA512 c9f059697c04fdc600d9e63873e924032d6cff456674ee28a885270c54722d96df0ef7a78432c2bdc0844241f115e00ad730c29d84681efc1c45a2e1acb3288c WHIRLPOOL a97c76b2ad26b5f322cb5990c5b7643f9d283783cbe7e22b9735473f226fa92ddd78085f70f17a6231da087410bf351d533ec53cdfe1663aeacf97421f4dbc7d
diff --git a/x11-libs/libXinerama/libXinerama-1.1.3.ebuild b/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
new file mode 100644
index 000000000000..3f5ecd3a9b5f
--- /dev/null
+++ b/x11-libs/libXinerama/libXinerama-1.1.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xinerama library"
+
+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 ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xineramaproto-1.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXinerama/metadata.xml b/x11-libs/libXinerama/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXinerama/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-libs/libXmu/Manifest b/x11-libs/libXmu/Manifest
new file mode 100644
index 000000000000..0da08fb44c23
--- /dev/null
+++ b/x11-libs/libXmu/Manifest
@@ -0,0 +1,2 @@
+DIST libXmu-1.1.1.tar.bz2 383473 SHA256 709081c550cc3a866d7c760a3f97384a1fe16e27fc38fe8169b8db9f33aa7edd SHA512 fb3baf697bb93fd5c2a26af318b9f7632b83bb2efe9cb4570b799ecca54e7de93248930fb8fd14d973c67612ad31502733417b1a6eb6d0c91ebafa204371c953 WHIRLPOOL f5c897ed6ebbb57e0367be8f7b790f7ce557930deabf66243c71802125072887fcf73fcd7ffa29323e4030f70fad402d754248bd15e8e87ab535b77e6d5c2002
+DIST libXmu-1.1.2.tar.bz2 396230 SHA256 756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b SHA512 eba4e3d10f7d75ba8464881fb69f295a89774a4b37793197d75f3312e3a342b2df8b7e13e3f5c887962704329b5347ff2f3395e229af9dadf46a93b1e8613cfc WHIRLPOOL 5b6326b127e14e13542dc81f891c584063abc2f3e22e60c7df0a1cac69da7bcad088e75aa9120f47244e11502acc60b2f5559ffa2e269e5e02f9cf879d91ff96
diff --git a/x11-libs/libXmu/libXmu-1.1.1-r1.ebuild b/x11-libs/libXmu/libXmu-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..8a86f8c9c645
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6"
+
+RDEPEND=">=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-libs/libXmu/libXmu-1.1.1.ebuild b/x11-libs/libXmu/libXmu-1.1.1.ebuild
new file mode 100644
index 000000000000..f5746ba56cb5
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6"
+
+RDEPEND="x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libX11
+ x11-proto/xextproto"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-libs/libXmu/libXmu-1.1.2.ebuild b/x11-libs/libXmu/libXmu-1.1.2.ebuild
new file mode 100644
index 000000000000..62700feb1cea
--- /dev/null
+++ b/x11-libs/libXmu/libXmu-1.1.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xmu library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="ipv6"
+
+RDEPEND=">=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable ipv6)
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXmu/metadata.xml b/x11-libs/libXmu/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXmu/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-libs/libXp/Manifest b/x11-libs/libXp/Manifest
new file mode 100644
index 000000000000..4b1494bd3fd7
--- /dev/null
+++ b/x11-libs/libXp/Manifest
@@ -0,0 +1,2 @@
+DIST libXp-1.0.2.tar.bz2 298632 SHA256 952fe5b5e90abd2cf04739aef3a9b63a253cd9309ed066a82bab7ca9112fd0b5 SHA512 39670864e29db469060bdd66c7f4a64aadfd07506367617b8c2c91b91553b4e632ff70ebe59fc0198cdb7f12874e380a8bffcae7c192b0028bc5c52faf2bdc52 WHIRLPOOL e0945b866502595b11a2b95036521dcf028fd57f22ef4c95c91bc7f07a10f1a7e7c14d9cca683e71e6a3bf810d53550341bd8af54d6c3bdfea2ba84b133601b0
+DIST libXp-1.0.3.tar.bz2 316717 SHA256 7f360c9905849c3587d48efc0f0ecbc852c19f61a52b18530d6b005cb9148c57 SHA512 502a2500ec0f519dae69ac035bf93c65c47e3bc301604aacb350e90043455f3485626194db45208e5521300b282843825e08b7f7c412a7497ffa02f5f1560c8d WHIRLPOOL 07fea09cff082c5cbcf9d6faa1633a788eee0be16ce725e984202636b8f9634545da48607dc7f6bef2348f782043eabaf1eb931b9f9e0e04cf0d6a601686faf4
diff --git a/x11-libs/libXp/libXp-1.0.2.ebuild b/x11-libs/libXp/libXp-1.0.2.ebuild
new file mode 100644
index 000000000000..ca45757160f3
--- /dev/null
+++ b/x11-libs/libXp/libXp-1.0.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xp library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/printproto-1.0.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXp/libXp-1.0.3.ebuild b/x11-libs/libXp/libXp-1.0.3.ebuild
new file mode 100644
index 000000000000..f4db63bc7ed4
--- /dev/null
+++ b/x11-libs/libXp/libXp-1.0.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xp library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~ia64-hpux ~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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/printproto-1.0.5-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXp/metadata.xml b/x11-libs/libXp/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXp/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-libs/libXpm/Manifest b/x11-libs/libXpm/Manifest
new file mode 100644
index 000000000000..17ba87f367a8
--- /dev/null
+++ b/x11-libs/libXpm/Manifest
@@ -0,0 +1,2 @@
+DIST libXpm-3.5.10.tar.bz2 431310 SHA256 a6db7e234750e7d60330017972e31d8e1f29f0a8c1391e4ac82f6102d919a735 SHA512 27ddf49ec13e77ee89cc3dfcf95631576a941e9fab18bfa1bbe2d45e8979548793f8723ffa4d97db7fdb4909883f9efa2c7d6e2996696f82940fdd7518e2c49d WHIRLPOOL ac4871d7b3e5fe90cdd0b6f31fb00fa26dd35985027947dd116a20b5738ed290804b84d70ebcc52577235045cb1272dbe0b04512630c47b8b26b679008a78fa4
+DIST libXpm-3.5.11.tar.bz2 443496 SHA256 c5bdafa51d1ae30086fac01ab83be8d47fe117b238d3437f8e965434090e041c SHA512 c089056108d4598f6c4603d6440d9ef6216e87c5cf1e30d143b0e7abc9c5d6f40050c747a57a27d751bc80786ded0390d97cbe221be628241c881d21a3ce6024 WHIRLPOOL d2b60fcfe2b591a452074e2bb9ba7f22ce705f86716a547bf9a8b75454c6e5f06848086880f14459440ca4106f1b3247f84de2fb705686082c34a5194e38d484
diff --git a/x11-libs/libXpm/libXpm-3.5.10-r1.ebuild b/x11-libs/libXpm/libXpm-3.5.10-r1.ebuild
new file mode 100644
index 000000000000..0da1ddad56b0
--- /dev/null
+++ b/x11-libs/libXpm/libXpm-3.5.10-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xpm library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+src_configure() {
+ # the gettext configure check and code in sxpm are incorrect; they assume
+ # gettext being in libintl, whereas Solaris has gettext by default
+ # resulting in libintl not being added to LIBS
+ [[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXpm/libXpm-3.5.10.ebuild b/x11-libs/libXpm/libXpm-3.5.10.ebuild
new file mode 100644
index 000000000000..da0cd6b9d816
--- /dev/null
+++ b/x11-libs/libXpm/libXpm-3.5.10.ebuild
@@ -0,0 +1,27 @@
+# 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 Xpm library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/libX11
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-proto/xextproto
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+src_configure() {
+ # the gettext configure check and code in sxpm are incorrect; they assume
+ # gettext being in libintl, whereas Solaris has gettext by default
+ # resulting in libintl not being added to LIBS
+ [[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXpm/libXpm-3.5.11.ebuild b/x11-libs/libXpm/libXpm-3.5.11.ebuild
new file mode 100644
index 000000000000..1c4c1b4a648d
--- /dev/null
+++ b/x11-libs/libXpm/libXpm-3.5.11.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xpm library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ sys-devel/gettext"
+
+src_configure() {
+ # the gettext configure check and code in sxpm are incorrect; they assume
+ # gettext being in libintl, whereas Solaris has gettext by default
+ # resulting in libintl not being added to LIBS
+ [[ ${CHOST} == *-solaris* ]] && export ac_cv_search_gettext=-lintl
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXpm/metadata.xml b/x11-libs/libXpm/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXpm/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-libs/libXrandr/Manifest b/x11-libs/libXrandr/Manifest
new file mode 100644
index 000000000000..9148f449a601
--- /dev/null
+++ b/x11-libs/libXrandr/Manifest
@@ -0,0 +1,2 @@
+DIST libXrandr-1.4.2.tar.bz2 315165 SHA256 caa7b31ac769be51a532343c65376f1d4df3f307afaed58e34fb5e82e8b825ad SHA512 59e728a4cf726e3bbf248cc76a45d78cf873ca8eee23b19a4b373accae634f4d12ebd79100d3e84416c3ef515396bbe3a0a204bc49c1748d265046ffa6bfffef WHIRLPOOL 2c29c43a9e2dc115feb9d64e57d3f548162640db8a931f1326324d96b9b6f4472201e3a6851c4fd002ad9f58ac933619f544cf3ca7c8805405df6090ba95193c
+DIST libXrandr-1.5.0.tar.bz2 314603 SHA256 6f864959b7fc35db11754b270d71106ef5b5cf363426aa58589cb8ac8266de58 SHA512 f488b55ffa47977fdf6c662348f4ca9f56e44032a0bb83fedc2ff9c26c003f2694c5ad677ab5dcd9b1c3e3f72fcd33b25b68ededec9c8e86f5146b9fb5b2d3cc WHIRLPOOL c34d9ef717b10d83ae5e6638d4078e46112fd1656d59f95dc90c67d44ed935a8a4da52b9567064154747a6ca042044048b8e3c9a97625f49668d8dc3c460fefd
diff --git a/x11-libs/libXrandr/libXrandr-1.4.2.ebuild b/x11-libs/libXrandr/libXrandr-1.4.2.ebuild
new file mode 100644
index 000000000000..7b307c900376
--- /dev/null
+++ b/x11-libs/libXrandr/libXrandr-1.4.2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xrandr library"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-proto/randrproto-1.4.0-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrandr/libXrandr-1.5.0.ebuild b/x11-libs/libXrandr/libXrandr-1.5.0.ebuild
new file mode 100644
index 000000000000..13a4c79c5043
--- /dev/null
+++ b/x11-libs/libXrandr/libXrandr-1.5.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xrandr library"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-proto/randrproto-1.5.0[${MULTILIB_USEDEP}]
+ >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrandr/metadata.xml b/x11-libs/libXrandr/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXrandr/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-libs/libXrender/Manifest b/x11-libs/libXrender/Manifest
new file mode 100644
index 000000000000..d3abb5c9326f
--- /dev/null
+++ b/x11-libs/libXrender/Manifest
@@ -0,0 +1,2 @@
+DIST libXrender-0.9.8.tar.bz2 306121 SHA256 1d14b02f0060aec5d90dfdcf16a996f17002e515292906ed26e3dcbba0f4fc62 SHA512 111a0ec4e19932a50da4914d9112b0a16c1d9c800e2b8398ddaf9ed70dae1a4eb75860282ca62d023e78957bbc3f015cb80d91ba76a24595df9f8a2b7e055b58 WHIRLPOOL 1d2173b6c78fe6c19f9c23bc7813137d39913e3dbc410aa784d89324459a0055d3c4d9c62aaeecc508a7ffe5a158e2e0c9511b46aa31c8d59bfc84f426955833
+DIST libXrender-0.9.9.tar.bz2 306255 SHA256 fc2fe57980a14092426dffcd1f2d9de0987b9d40adea663bd70d6342c0e9be1a SHA512 6bb6d18d6a1b26631921b19b95a18556296208578f59fbdb7dd81f09bd9399021a2c72e7fc1504134cd004722153dc5b43fef49347aea54d4748fa22d3b6e9a7 WHIRLPOOL 712f533915fba2b274d6bbc3d3110697038216f1ac262509ce6f6d754b5d1de0c15ee566f03b095ebf31b43e24e3a47c3021fc669e4fdcec81a2f0a96c2a65c2
diff --git a/x11-libs/libXrender/libXrender-0.9.8.ebuild b/x11-libs/libXrender/libXrender-0.9.8.ebuild
new file mode 100644
index 000000000000..4be4d0fdd58b
--- /dev/null
+++ b/x11-libs/libXrender/libXrender-0.9.8.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xrender library"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/libXrender-0.9.9.ebuild b/x11-libs/libXrender/libXrender-0.9.9.ebuild
new file mode 100644
index 000000000000..09eb4f48f482
--- /dev/null
+++ b/x11-libs/libXrender/libXrender-0.9.9.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xrender library"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-proto/renderproto-0.11.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXrender/metadata.xml b/x11-libs/libXrender/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXrender/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-libs/libXres/Manifest b/x11-libs/libXres/Manifest
new file mode 100644
index 000000000000..6e3bce04cb03
--- /dev/null
+++ b/x11-libs/libXres/Manifest
@@ -0,0 +1 @@
+DIST libXres-1.0.7.tar.bz2 282925 SHA256 26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5 SHA512 796a79ab694317910442cb10a936711df9dde95764eef11efb8dedc85114977e56409de2f640553f1ad492325df178b8cfbeaeec3f03bf084638c555e44292e0 WHIRLPOOL af59fcabab4f593b54c6a1cc9b03b5a59580e678f721e86836150091e1a30c7a29eaa7f19458cf3ce387ece8519c953639fb3fa8f0a89b5e1c2c6df6fce56ff4
diff --git a/x11-libs/libXres/libXres-1.0.7.ebuild b/x11-libs/libXres/libXres-1.0.7.ebuild
new file mode 100644
index 000000000000..b5a0769166ff
--- /dev/null
+++ b/x11-libs/libXres/libXres-1.0.7.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
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xorg/lib/libXRes"
+DESCRIPTION="X.Org XRes library"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-proto/xextproto
+ x11-proto/resourceproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXres/metadata.xml b/x11-libs/libXres/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXres/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-libs/libXt/Manifest b/x11-libs/libXt/Manifest
new file mode 100644
index 000000000000..1979d4dddbc4
--- /dev/null
+++ b/x11-libs/libXt/Manifest
@@ -0,0 +1,2 @@
+DIST libXt-1.1.4.tar.bz2 762331 SHA256 843a97a988f5654872682a4120486d987d853a71651515472f55519ffae2dd57 SHA512 57721def16bf29e05deb746566400d71cf0cd5bf9b8b7ebed19abb7c6804e14073060b6cf94409903aa464d27acca2e91f55654b2d4770677b2b4b4dc78fd423 WHIRLPOOL ff97431f0afce438acceb30186b5458e0990fe27194a9457b2fb8865202c45dcdb2e9e24a9c3f3a9427ec136e74389c3b64a69b20d66e9bf04c44f61ffd930eb
+DIST libXt-1.1.5.tar.bz2 771567 SHA256 46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a SHA512 29828cfc021b60e0a0b5ff0321801db20f12bd635866cd000b35a23736b5477a3d1e5f936a1124ed3e3f4c0e7a27cb8744dbb5ab4fbcd45c817a13877081e05b WHIRLPOOL ed0bc3d5e11580b5d38a30d60985d1f1976e464e0b6f544ec07eaf6a69290304d150981fdde1047b73161d38ce1505221b8e4906f13cc0a5feb962269029763f
diff --git a/x11-libs/libXt/libXt-1.1.4.ebuild b/x11-libs/libXt/libXt-1.1.4.ebuild
new file mode 100644
index 000000000000..1eeabd5a4126
--- /dev/null
+++ b/x11-libs/libXt/libXt-1.1.4.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org X Toolkit Intrinsics library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ tc-export_build_env
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXt/libXt-1.1.5.ebuild b/x11-libs/libXt/libXt-1.1.5.ebuild
new file mode 100644
index 000000000000..05e3a3d5a7ad
--- /dev/null
+++ b/x11-libs/libXt/libXt-1.1.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs
+
+DESCRIPTION="X.Org X Toolkit Intrinsics library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~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=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ tc-export_build_env
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libXt/metadata.xml b/x11-libs/libXt/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXt/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-libs/libXtst/Manifest b/x11-libs/libXtst/Manifest
new file mode 100644
index 000000000000..3eb8ad3e0ed2
--- /dev/null
+++ b/x11-libs/libXtst/Manifest
@@ -0,0 +1 @@
+DIST libXtst-1.2.2.tar.bz2 321784 SHA256 ef0a7ffd577e5f1a25b1663b375679529663a1880151beaa73e9186c8309f6d9 SHA512 1cf040f16d426e6a6d1cf8c0f966c171418c082165ae6e9bed6285cd45f144e4ef58bf74c6d34fd81e6894534d21df55efe5d0bc0b2a28f9bb9d74e168dd7369 WHIRLPOOL d01bee2e8bfb0fabdf26469c76b25e0ea7e31ec5c3fa6477e188dba704294d0310eda3e52c726599e0c1d3318e057995c9c797d3fde945c18a28294d349353b6
diff --git a/x11-libs/libXtst/libXtst-1.2.2.ebuild b/x11-libs/libXtst/libXtst-1.2.2.ebuild
new file mode 100644
index 000000000000..f36ffd459876
--- /dev/null
+++ b/x11-libs/libXtst/libXtst-1.2.2.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_DOC="doc"
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xlib-based client API for the XTEST & RECORD extensions library"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+ >=x11-proto/recordproto-1.14.2-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/inputproto-2.3[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXtst/metadata.xml b/x11-libs/libXtst/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXtst/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-libs/libXv/Manifest b/x11-libs/libXv/Manifest
new file mode 100644
index 000000000000..f14c28644bc9
--- /dev/null
+++ b/x11-libs/libXv/Manifest
@@ -0,0 +1 @@
+DIST libXv-1.0.10.tar.bz2 300633 SHA256 55fe92f8686ce8612e2c1bfaf58c057715534419da700bda8d517b1d97914525 SHA512 3c9642006dbc7a74f91263aa3a94711a95ee436b03d97ef51fce2bc2f602c25589606e1fcb58287ea0efebb3b9dbe7ef5fcb94e11ad3ec6be7830947a4cefe03 WHIRLPOOL 7c7e3cede5b582417d2363971bbf2cf0de9d33cfd43a6001c29a3f0c23ab59f3593a92568af16569bc56eff27b0049ef784a334988aa81fa2b3bad1eec32576f
diff --git a/x11-libs/libXv/libXv-1.0.10.ebuild b/x11-libs/libXv/libXv-1.0.10.ebuild
new file mode 100644
index 000000000000..c278be2bd304
--- /dev/null
+++ b/x11-libs/libXv/libXv-1.0.10.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xv library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXv/metadata.xml b/x11-libs/libXv/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXv/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-libs/libXvMC/Manifest b/x11-libs/libXvMC/Manifest
new file mode 100644
index 000000000000..c3c51c9a9b02
--- /dev/null
+++ b/x11-libs/libXvMC/Manifest
@@ -0,0 +1,2 @@
+DIST libXvMC-1.0.8.tar.bz2 305234 SHA256 5e1a401efa433f959d41e17932b8c218c56b931348f494b8fa4656d7d798b204 SHA512 781a53ad1d60a06019ed24150b85a96f2608e6ca0d876de9f06511c0e086cdf837804994e33b51ee8b3714150dc1d6060449e89ab7458476c8535b5b336147bf WHIRLPOOL 67c7d2694310d386b7ad8f6db928fa02af2ba2a9aab3a1e2ff222eca490672474cc3abd767b4fdc2433f90e69f655334eb209747644943a980e6c1ad0f1c3521
+DIST libXvMC-1.0.9.tar.bz2 312777 SHA256 0703d7dff6ffc184f1735ca5d4eb9dbb402b522e08e008f2f96aee16c40a5756 SHA512 658db91ae37cbad468a85301d77b6237674f91fad82679348c26a297bb8c1da81f6b7b13c4ff47a3d6c7f4f8fefdf270d0fde316ec14666fa4e2d1e2c4b337ca WHIRLPOOL 2e5790b3079a0c5571cb824a19a0457e82fb283ffe94d14a1bde1327b6a6e9cb9dd856716f0bcfc2dd2c01f37a9fdc68d0374067b1a18ccc64ed90e41c7d5fe1
diff --git a/x11-libs/libXvMC/libXvMC-1.0.8.ebuild b/x11-libs/libXvMC/libXvMC-1.0.8.ebuild
new file mode 100644
index 000000000000..60a8ead3f2d2
--- /dev/null
+++ b/x11-libs/libXvMC/libXvMC-1.0.8.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XvMC library"
+
+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 ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+ >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libXvMC/libXvMC-1.0.9.ebuild b/x11-libs/libXvMC/libXvMC-1.0.9.ebuild
new file mode 100644
index 000000000000..d50abe3c24db
--- /dev/null
+++ b/x11-libs/libXvMC/libXvMC-1.0.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org XvMC library"
+
+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 ~ppc-macos ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+ >=x11-proto/videoproto-2.3.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
+PDEPEND="app-eselect/eselect-xvmc"
diff --git a/x11-libs/libXvMC/metadata.xml b/x11-libs/libXvMC/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXvMC/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-libs/libXxf86dga/Manifest b/x11-libs/libXxf86dga/Manifest
new file mode 100644
index 000000000000..05be71013fcb
--- /dev/null
+++ b/x11-libs/libXxf86dga/Manifest
@@ -0,0 +1 @@
+DIST libXxf86dga-1.1.4.tar.bz2 280216 SHA256 8eecd4b6c1df9a3704c04733c2f4fa93ef469b55028af5510b25818e2456c77e SHA512 58d81a7850275fc8382018bcc56dbc65b4200828b1f1379dcee3da1878f12a83ee681a9d474bcd564d99bf93bedfeb7b243370e0ebb89177652b37cee158a3f2 WHIRLPOOL 9349e19c04b7e166547bddade74d9e7ccb86796e8cc8232f9619d1c1e9cd0779d063a3afab845997a23dfbc447a367d33326d66ff41464d1c26ac2efbbe2088b
diff --git a/x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild b/x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild
new file mode 100644
index 000000000000..c8f475ed00f5
--- /dev/null
+++ b/x11-libs/libXxf86dga/libXxf86dga-1.1.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xxf86dga library"
+
+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 ~sparc-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86dgaproto-2.1-r2[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86dga/metadata.xml b/x11-libs/libXxf86dga/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXxf86dga/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-libs/libXxf86misc/Manifest b/x11-libs/libXxf86misc/Manifest
new file mode 100644
index 000000000000..2b8be0181c6f
--- /dev/null
+++ b/x11-libs/libXxf86misc/Manifest
@@ -0,0 +1 @@
+DIST libXxf86misc-1.0.3.tar.bz2 255831 SHA256 563f4200862efd3334c33a669e0a0aae5bab31f3998db75b87a99a697cc26b5b SHA512 4df80bdf6cae9f43a1ddf09b078f354d0cfcab1861d073f3d274bc3a5dd0efe1057abae792f6c512e8f45286a62db95f85bf8c02de23fe96a76d8972cc1fdb7f WHIRLPOOL 7402fbac6d49c1be571cc8baa0ca53c2185d669a9f7b94e906a13ddbb8895f8f10b1e4299a0041f1c266af094c02f45f131e9c7b7d77c428c1f9e1c2374ec5a2
diff --git a/x11-libs/libXxf86misc/libXxf86misc-1.0.3.ebuild b/x11-libs/libXxf86misc/libXxf86misc-1.0.3.ebuild
new file mode 100644
index 000000000000..9283d9d759b9
--- /dev/null
+++ b/x11-libs/libXxf86misc/libXxf86misc-1.0.3.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit xorg-2
+
+DESCRIPTION="X.Org Xxf86misc library"
+
+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 ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-proto/xproto
+ x11-proto/xextproto
+ x11-proto/xf86miscproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86misc/metadata.xml b/x11-libs/libXxf86misc/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXxf86misc/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-libs/libXxf86vm/Manifest b/x11-libs/libXxf86vm/Manifest
new file mode 100644
index 000000000000..40ca12c36a43
--- /dev/null
+++ b/x11-libs/libXxf86vm/Manifest
@@ -0,0 +1,2 @@
+DIST libXxf86vm-1.1.3.tar.bz2 284279 SHA256 da5e86c32ee2069b9e6d820e4c2e4242d4877cb155a2b2fbf2675a1480ec37b8 SHA512 7cd5491b79920f9c1d134f2815f14d45b0a29cf5f99d866c35418b6f84ce6b48e702db3472bd7c6158804e573f2384ad4ebee78e5ea8f07afec2e34489d99ed4 WHIRLPOOL 9dcec1f837d53f6541cb950cca7f47194e7a99dd7d1ea7187316472940ea04e1ff25a02f66a5c775063b639027684a227dd6a713f78b2f5170af28ee398b9dd6
+DIST libXxf86vm-1.1.4.tar.bz2 295346 SHA256 afee27f93c5f31c0ad582852c0fb36d50e4de7cd585fcf655e278a633d85cd57 SHA512 c5f92d86e143db02ebb36bcd25618acaa2cb2831f5a23800a06dd431cd73b6702d95de8fe7407ce626336bf614c288d5256f4d87ea7781fad2ab6c517cbf09e0 WHIRLPOOL 98aae6ede09ef4e204b71d30963d37b81a9f39c25e61ad2f5834b5e370d4a884a901e3a4ba19d534ec32111f316d24ffab7cfe9450e7ee63a9e6b9a281852d61
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
new file mode 100644
index 000000000000..0a1670fb662f
--- /dev/null
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xxf86vm library"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild
new file mode 100644
index 000000000000..991d519e7fa6
--- /dev/null
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org Xxf86vm library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-proto/xf86vidmodeproto-2.3.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libXxf86vm/metadata.xml b/x11-libs/libXxf86vm/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libXxf86vm/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-libs/libaosd/Manifest b/x11-libs/libaosd/Manifest
new file mode 100644
index 000000000000..4d4e80893c48
--- /dev/null
+++ b/x11-libs/libaosd/Manifest
@@ -0,0 +1 @@
+DIST libaosd-0.2.7.tar.gz 51560 SHA256 b1d02cc5f1761ab6b1c1f8994a92466f11d91d57af65dcb3204e8c54ea514059 SHA512 ebe60b992b0315026c024db83c788ed9c829f1400e0c6da51caeb17d58649825fafb14d7f73cc80a82866f53f108a1e18f921109f940cb59fce038a12f214329 WHIRLPOOL 6a38e0e11e65b74d0da4726d6c301007489765029b97f4189439d570334a480b68d59cd26028995d9194a6eb9a65e473f9e0eabee1cc78a7a9adbf4a3e7add38
diff --git a/x11-libs/libaosd/libaosd-0.2.7.ebuild b/x11-libs/libaosd/libaosd-0.2.7.ebuild
new file mode 100644
index 000000000000..85c380421de6
--- /dev/null
+++ b/x11-libs/libaosd/libaosd-0.2.7.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-utils
+
+DESCRIPTION="An advanced on screen display (OSD) library"
+HOMEPAGE="https://github.com/atheme/libaosd"
+SRC_URI="https://github.com/atheme/${PN}/archive/0.2.7.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+IUSE="pango +tools xcomposite"
+
+RDEPEND="
+ x11-libs/cairo[X]
+ x11-libs/libX11
+ x11-libs/libXrender
+ pango? ( x11-libs/pango )
+ tools? ( dev-libs/glib:2 )
+ xcomposite? ( x11-libs/libXcomposite )
+"
+DEPEND="${RDEPEND}"
+
+AUTOTOOLS_IN_SOURCE_BUILD=1
+DOCS=( Changelog )
+
+src_prepare() {
+ AT_M4DIR=m4 eautoreconf
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable tools glib)
+ $(use_enable pango pangocairo)
+ $(use_enable xcomposite)
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libaosd/metadata.xml b/x11-libs/libaosd/metadata.xml
new file mode 100644
index 000000000000..ea0d54e8b703
--- /dev/null
+++ b/x11-libs/libaosd/metadata.xml
@@ -0,0 +1,14 @@
+<?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>
+ <use>
+ <flag name="pango">Enable the textual helpers (requires pangocairo).</flag>
+ <flag name="tools">Install the aosd_cat tool (requires glib-2.0).</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">atheme/libaosd</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libast/Manifest b/x11-libs/libast/Manifest
new file mode 100644
index 000000000000..0c03b067e5d4
--- /dev/null
+++ b/x11-libs/libast/Manifest
@@ -0,0 +1 @@
+DIST libast-0.7.tar.gz 508654 SHA256 52055cc0df0af58adc8c43cce6c9a2fff71c627a6bb0395073d353920dd1ebf0
diff --git a/x11-libs/libast/libast-0.7.ebuild b/x11-libs/libast/libast-0.7.ebuild
new file mode 100644
index 000000000000..6c66e0310ce6
--- /dev/null
+++ b/x11-libs/libast/libast-0.7.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="LIBrary of Assorted Spiffy Things"
+HOMEPAGE="http://www.eterm.org/download/"
+SRC_URI="http://www.eterm.org/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="imlib cpu_flags_x86_mmx pcre"
+
+RDEPEND="!sci-astronomy/ast
+ x11-libs/libXt
+ x11-proto/xproto
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ =media-libs/freetype-2*
+ imlib? ( media-libs/imlib2 )
+ pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}"
+
+src_compile() {
+ local myregexp="posix"
+ use pcre && myregexp="pcre"
+ econf \
+ $(use_with imlib) \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ --with-regexp=${myregexp} \
+ || die
+ emake || die
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die
+ dodoc README DESIGN ChangeLog
+}
diff --git a/x11-libs/libast/libast-9999.ebuild b/x11-libs/libast/libast-9999.ebuild
new file mode 100644
index 000000000000..a0dfd80590dd
--- /dev/null
+++ b/x11-libs/libast/libast-9999.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+#ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
+ECVS_SERVER="anoncvs.enlightenment.org:/var/cvs/e"
+ECVS_MODULE="eterm/libast"
+inherit eutils cvs autotools
+
+DESCRIPTION="LIBrary of Assorted Spiffy Things"
+HOMEPAGE="http://www.eterm.org/download/"
+SRC_URI=""
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE="imlib cpu_flags_x86_mmx pcre"
+
+RDEPEND="!sci-astronomy/ast
+ x11-libs/libXt
+ x11-proto/xproto
+ x11-libs/libICE
+ x11-libs/libSM
+ x11-libs/libX11
+ =media-libs/freetype-2*
+ imlib? ( media-libs/imlib2 )
+ pcre? ( dev-libs/libpcre )"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${ECVS_MODULE}
+
+src_unpack() {
+ cvs_src_unpack
+ cd "${S}"
+ eautoreconf
+}
+
+src_compile() {
+ local myregexp="posix"
+ use pcre && myregexp="pcre"
+ econf \
+ $(use_with imlib) \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ --with-regexp=${myregexp} \
+ || die
+ emake || die
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die
+ dodoc README DESIGN ChangeLog
+}
diff --git a/x11-libs/libast/metadata.xml b/x11-libs/libast/metadata.xml
new file mode 100644
index 000000000000..952e09eebabc
--- /dev/null
+++ b/x11-libs/libast/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<maintainer>
+ <email>vapier@gentoo.org</email>
+</maintainer>
+<longdescription>
+LibAST is the Library of Assorted Spiffy Things. It contains many
+spiffy things, and it is a library. Thus, the ever-so-creative name.
+LibAST has been previously known as libmej, the Eterm helper library
+which nobody really understood and certainly never used. My current
+plan is to gradually remove some of the neat stuff from Eterm that
+could be made generic (things like the theme parsing engine, the
+command-line options parser, perhaps the event engine, ...) and place
+it here in the hopes that others will find them useful.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/libcompizconfig/Manifest b/x11-libs/libcompizconfig/Manifest
new file mode 100644
index 000000000000..a052df52ea36
--- /dev/null
+++ b/x11-libs/libcompizconfig/Manifest
@@ -0,0 +1 @@
+DIST libcompizconfig-0.8.8.tar.bz2 318176 SHA256 50a81aba31d9517587f7d046b7161eb4204ddceb422d09d036a412bb80381490 SHA512 1ba2f6143870d981e174c47fddb9fdd072a1c64a5a5f07779bd6261767a2c1a7612bdcb3f62a76c203f4ab630542c8ae750fff3ec30a0305f8851584c6a5d6bb WHIRLPOOL 14139c93bb67235c5a9e4581e11a6474a1ff0108c8e84d3401006d26c160eaf50c0b3c9a9c69c12d00919850ee6d20a9c81660a6bec180c69d459c3d2a89775b
diff --git a/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch
new file mode 100644
index 000000000000..3028faf967ad
--- /dev/null
+++ b/x11-libs/libcompizconfig/files/libcompizconfig-0.8.2-allow-system-libiniparser.patch
@@ -0,0 +1,239 @@
+diff -Naur libcompizconfig-0.8.2.orig/config.h.in libcompizconfig-0.8.2/config.h.in
+--- libcompizconfig-0.8.2.orig/config.h.in 2009-03-05 15:29:12.000000000 +0000
++++ libcompizconfig-0.8.2/config.h.in 2009-05-02 14:55:48.000000000 +0100
+@@ -30,6 +30,9 @@
+ /* Define if your <locale.h> file defines LC_MESSAGES. */
+ #undef HAVE_LC_MESSAGES
+
++/* Define to 1 if you have the `iniparser' library (-liniparser). */
++#undef HAVE_LIBINIPARSER
++
+ /* Define to 1 if you have the `protobuf' library (-lprotobuf). */
+ #undef HAVE_LIBPROTOBUF
+
+diff -Naur libcompizconfig-0.8.2.orig/configure.ac libcompizconfig-0.8.2/configure.ac
+--- libcompizconfig-0.8.2.orig/configure.ac 2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/configure.ac 2009-05-02 14:55:48.000000000 +0100
+@@ -116,6 +116,16 @@
+ fi
+ AM_CONDITIONAL([USE_PROTOBUF], [test "x$use_protobuf" = "xyes"])
+
++AC_ARG_WITH(internal-iniparser,
++ [AS_HELP_STRING([--without-internal-iniparser],[Don't use bundled iniparser lib])],
++ [], [with_internal_iniparser=yes])
++
++if test "x$with_internal_iniparser" = "xno"; then
++ AC_CHECK_LIB([iniparser], [iniparser_getnsec], [],
++ [AC_MSG_ERROR([Error! You need to have libiniparser])])
++fi
++AM_CONDITIONAL([WITH_INTERNAL_INIPARSER], [test "x$with_internal_iniparser" = "xyes"])
++
+ AC_CHECK_HEADERS([sys/inotify.h], [have_inotify=yes], [have_inotify=no])
+
+ AC_ARG_ENABLE(debug,
+diff -Naur libcompizconfig-0.8.2.orig/include/ccs.h libcompizconfig-0.8.2/include/ccs.h
+--- libcompizconfig-0.8.2.orig/include/ccs.h 2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/include/ccs.h 2009-05-02 14:55:48.000000000 +0100
+@@ -695,19 +695,9 @@
+
+ /* INI file stuff */
+
+-typedef struct _dictionary_
+-{
+- /** Number of entries in dictionary */
+- int n;
+- /** Storage size */
+- int size;
+- /** List of string values */
+- char **val;
+- /** List of string keys */
+- char **key ;
+- /** List of hash values for keys */
+- unsigned *hash;
+-} IniDictionary;
++#include <iniparser.h>
++
++typedef dictionary IniDictionary;
+
+ IniDictionary* ccsIniNew (void);
+ IniDictionary* ccsIniOpen (const char *fileName);
+diff -Naur libcompizconfig-0.8.2.orig/src/Makefile.am libcompizconfig-0.8.2/src/Makefile.am
+--- libcompizconfig-0.8.2.orig/src/Makefile.am 2009-03-05 15:28:59.000000000 +0000
++++ libcompizconfig-0.8.2/src/Makefile.am 2009-05-02 14:55:48.000000000 +0100
+@@ -39,14 +39,17 @@
+ lists.c \
+ compiz.cpp \
+ config.c \
+- iniparser.c \
+ ini.c \
+ bindings.c \
+ filewatch.c \
+- ccs-private.h \
+- iniparser.h
++ ccs-private.h
+
+ libcompizconfig_la_LIBADD = @LIBXML2_LIBS@ @LIBX11_LIBS@ $(PROTOBUF_LIB)
+
+ lib_LTLIBRARIES=libcompizconfig.la
+
++if WITH_INTERNAL_INIPARSER
++
++ libcompizconfig_la_SOURCES += iniparser.h iniparser.c
++
++endif
+diff -Naur libcompizconfig-0.8.2.orig/src/ini.c libcompizconfig-0.8.2/src/ini.c
+--- libcompizconfig-0.8.2.orig/src/ini.c 2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/src/ini.c 2009-05-02 14:56:12.000000000 +0100
+@@ -23,9 +23,10 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #include <errno.h>
++#include <ctype.h>
+
+ #include <ccs.h>
+-#include "iniparser.h"
++#include <iniparser.h>
+
+ /**
+ * Creates the parent directory for @fileName, recursively creating a directory
+@@ -77,7 +78,7 @@
+ if (file)
+ fclose (file);
+
+- return iniparser_new ((char*) fileName);
++ return iniparser_load ((char*) fileName);
+ }
+
+ IniDictionary*
+@@ -89,17 +90,22 @@
+ void
+ ccsIniClose (IniDictionary *dictionary)
+ {
+- iniparser_free (dictionary);
++ iniparser_freedict (dictionary);
+ }
+
+ void
+ ccsIniSave (IniDictionary *dictionary,
+ const char *fileName)
+ {
++ FILE *f;
+ if (!ccsCreateDirFor (fileName))
+ return;
+
+- iniparser_dump_ini (dictionary, fileName);
++ f = fopen(fileName, "w");
++ if(!f)
++ return;
++ iniparser_dump_ini (dictionary, f);
++ fclose(f);
+ }
+
+ static char*
+@@ -127,11 +133,11 @@
+ char *sectionName;
+
+ asprintf (&sectionName, "%s:%s", section, entry);
+-
++/*
+ if (!iniparser_find_entry (dictionary, (char*) section))
+ iniparser_add_entry (dictionary, (char*) section, NULL, NULL);
+-
+- iniparser_setstr (dictionary, sectionName, (char*) value);
++*/
++ iniparser_set (dictionary, sectionName, (char*) value);
+
+ free (sectionName);
+ }
+diff -Naur libcompizconfig-0.8.2.orig/src/iniparser.h libcompizconfig-0.8.2/src/iniparser.h
+--- libcompizconfig-0.8.2.orig/src/iniparser.h 2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/src/iniparser.h 1970-01-01 01:00:00.000000000 +0100
+@@ -1,65 +0,0 @@
+-/*
+- Based upon libiniparser, by Nicolas Devillard
+- Hacked into 1 file (m-iniparser) by Freek/2005
+- Original terms following:
+-
+- -- -
+-
+- Copyright (c) 2000 by Nicolas Devillard (ndevilla AT free DOT fr).
+-
+- Written by Nicolas Devillard. Not derived from licensed software.
+-
+- Permission is granted to anyone to use this software for any
+- purpose on any computer system, and to redistribute it freely,
+- subject to the following restrictions:
+-
+- 1. The author is not responsible for the consequences of use of
+- this software, no matter how awful, even if they arise
+- from defects in it.
+-
+- 2. The origin of this software must not be misrepresented, either
+- by explicit claim or by omission.
+-
+- 3. Altered versions must be plainly marked as such, and must not
+- be misrepresented as being the original software.
+-
+- 4. This notice may not be removed or altered.
+-
+- */
+-
+-
+-#ifndef _INIPARSER_H_
+-#define _INIPARSER_H_
+-#include <stdio.h>
+-#include <stdlib.h>
+-#include <string.h>
+-#include <unistd.h>
+-#include <ctype.h>
+-
+-#include <ccs.h>
+-
+-typedef IniDictionary dictionary;
+-
+-typedef struct _FileLock
+-{
+- int fd;
+-} FileLock;
+-
+-/* generated by genproto */
+-
+-dictionary * iniparser_new(char *ininame);
+-dictionary * dictionary_new(int size);
+-void iniparser_free(dictionary * d);
+-
+-
+-int iniparser_getnsec(dictionary * d);
+-char * iniparser_getsecname(dictionary * d, int n);
+-void iniparser_dump_ini(dictionary * d, const char * file_name);
+-char * iniparser_getstring(dictionary * d, char * key, char * def);
+-void iniparser_add_entry(dictionary * d, char * sec, char * key, char * val);
+-int iniparser_find_entry(dictionary * ini, char * entry);
+-int iniparser_setstr(dictionary * ini, char * entry, char * val);
+-void iniparser_unset(dictionary * ini, char * entry);
+-
+-#endif
+-
+diff -Naur libcompizconfig-0.8.2.orig/src/main.c libcompizconfig-0.8.2/src/main.c
+--- libcompizconfig-0.8.2.orig/src/main.c 2009-03-05 03:22:22.000000000 +0000
++++ libcompizconfig-0.8.2/src/main.c 2009-05-02 14:56:26.000000000 +0100
+@@ -34,9 +34,9 @@
+ #include <math.h>
+
+ #include <ccs.h>
++#include <iniparser.h>
+
+ #include "ccs-private.h"
+-#include "iniparser.h"
+
+ Bool basicMetadata = FALSE;
+
+@@ -2577,7 +2577,7 @@
+ return FALSE;
+ fclose (fp);
+
+- importFile = iniparser_new ((char *) fileName);
++ importFile = iniparser_load ((char *) fileName);
+ if (!importFile)
+ return FALSE;
+
diff --git a/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild b/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild
new file mode 100644
index 000000000000..ce55678d2dd9
--- /dev/null
+++ b/x11-libs/libcompizconfig/libcompizconfig-0.8.8.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils
+
+DESCRIPTION="Compiz Configuration System"
+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"
+IUSE=""
+
+RDEPEND="dev-libs/libxml2
+ dev-libs/protobuf
+ >=x11-wm/compiz-${PV}
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ >=dev-util/intltool-0.41
+ virtual/pkgconfig
+ x11-proto/xproto"
+
+RESTRICT="test"
+
+src_configure() {
+ econf \
+ --enable-fast-install \
+ --disable-static
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ dodoc TODO
+ prune_libtool_files --all
+}
diff --git a/x11-libs/libcompizconfig/metadata.xml b/x11-libs/libcompizconfig/metadata.xml
new file mode 100644
index 000000000000..237116b437d9
--- /dev/null
+++ b/x11-libs/libcompizconfig/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">Libcompizconfig is an alternative configuration system for compiz.</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/libcryptui/Manifest b/x11-libs/libcryptui/Manifest
new file mode 100644
index 000000000000..dc95b5e1584a
--- /dev/null
+++ b/x11-libs/libcryptui/Manifest
@@ -0,0 +1 @@
+DIST libcryptui-3.12.2.tar.xz 1163784 SHA256 71ead1a7b496f07f6c5102ae79945dd2515b7b9342c6edefe58b47318be20866 SHA512 50ef407f0a9fe2ac8f4ab075e125fe8eabc55160b9b96a852d34e52c46be04e04b2a7c8288d2669e24865a89dc179af6bb0da8f6799e8b07fff7bc667c8eb1f0 WHIRLPOOL 0e376834c74df1492a7ffea29646a4912124b46b972dc9bdc64dd40b19e3b9c43c85eec87416f8ea0995e7d164e763bf7b5da7f66c2103df3be44f6516b8e632
diff --git a/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
new file mode 100644
index 000000000000..25ad7451d311
--- /dev/null
+++ b/x11-libs/libcryptui/files/libcryptui-3.12.2-gnupg-2.1.patch
@@ -0,0 +1,11 @@
+--- configure.ac~ 2014-05-13 20:53:02.000000000 +0200
++++ configure.ac 2015-06-27 11:29:32.574106982 +0200
+@@ -95,7 +95,7 @@
+ DO_CHECK=$enableval, DO_CHECK=yes)
+
+ if test "$DO_CHECK" = "yes"; then
+- accepted_versions="1.2 1.4 2.0"
++ accepted_versions="1.2 1.4 2.0 2.1"
+ AC_PATH_PROGS(GNUPG, [gpg gpg2], no)
+ AC_DEFINE_UNQUOTED(GNUPG, "$GNUPG", [Path to gpg executable.])
+ ok="no"
diff --git a/x11-libs/libcryptui/libcryptui-3.12.2.ebuild b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
new file mode 100644
index 000000000000..2fbf7c24b900
--- /dev/null
+++ b/x11-libs/libcryptui/libcryptui-3.12.2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="User interface components for OpenPGP"
+HOMEPAGE="https://wiki.gnome.org/Apps/Seahorse"
+
+LICENSE="GPL-2+ LGPL-2.1+ FDL-1.1"
+SLOT="0"
+IUSE="+introspection libnotify"
+KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
+
+# Pull in libnotify-0.7 because it's controlled via an automagic ifdef
+COMMON_DEPEND="
+ >=dev-libs/glib-2.32:2
+ >=x11-libs/gtk+-3:3[introspection?]
+ >=dev-libs/dbus-glib-0.72
+ gnome-base/libgnome-keyring
+ x11-libs/libICE
+ x11-libs/libSM
+
+ >=app-crypt/gpgme-1
+ >=app-crypt/gnupg-1.4
+
+ introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+ libnotify? ( >=x11-libs/libnotify-0.7:= )
+"
+DEPEND="${COMMON_DEPEND}
+ >=app-text/scrollkeeper-0.3
+ >=dev-util/gtk-doc-am-1.9
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+# Before 3.1.4, libcryptui was part of seahorse
+RDEPEND="${COMMON_DEPEND}
+ !<app-crypt/seahorse-3.1.4
+"
+
+src_prepare() {
+ # Support GnuPG 2.1, https://bugzilla.gnome.org/show_bug.cgi?id=745843
+ epatch "${FILESDIR}"/${PN}-3.12.2-gnupg-2.1.patch
+
+ # FIXME: Do not mess with CFLAGS with USE="debug"
+ sed -e '/CFLAGS="$CFLAGS -g -O0/d' \
+ -e 's/-Werror//' \
+ -i configure.ac configure || die "sed failed"
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --disable-static \
+ --disable-update-mime-database \
+ $(use_enable introspection) \
+ $(use_enable libnotify)
+}
diff --git a/x11-libs/libcryptui/metadata.xml b/x11-libs/libcryptui/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/x11-libs/libcryptui/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>gnome</herd>
+</pkgmetadata>
diff --git a/x11-libs/libdesktop-agnostic/Manifest b/x11-libs/libdesktop-agnostic/Manifest
new file mode 100644
index 000000000000..84eaf30f4a00
--- /dev/null
+++ b/x11-libs/libdesktop-agnostic/Manifest
@@ -0,0 +1 @@
+DIST libdesktop-agnostic-0.3.92.tar.gz 442653 SHA256 8a77ec9f299acecdf38a0f106675667a392d314ac33f4e9be84fb696488dd354 SHA512 c383a45edb6a1fed1b1a13ed583627eceda444519276a5d62a8442bcdc1be5e7d37a0449b678e2ccfcf7441648ca6bff6c40e5930dbec9221182657201671e90 WHIRLPOOL e5c8abfe11cd602a0f0a3116acd464348b1975a370435ed3bb7527f1c33af5f0d66d0f9c3824354ff3e2a2608bc98dc4a6504ab49769b225d72dc1c1d168e367
diff --git a/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild b/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild
new file mode 100644
index 000000000000..292599fa6b0c
--- /dev/null
+++ b/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+VALA_USE_DEPEND="vapigen"
+
+inherit python-single-r1 waf-utils vala
+
+DESCRIPTION="A desktop-agnostic library for GLib-based projects"
+HOMEPAGE="https://launchpad.net/libdesktop-agnostic"
+SRC_URI="http://launchpad.net/${PN}/0.4/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +gconf glade gnome +introspection"
+
+RDEPEND=">=dev-libs/glib-2
+ dev-python/pygobject:2[${PYTHON_USEDEP}]
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ x11-libs/gtk+:2
+ gconf? ( gnome-base/gconf:2 )
+ glade? ( gnome-base/libglade:2.0 )
+ gnome? ( gnome-base/gnome-desktop:2 )
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ dev-libs/gobject-introspection
+ introspection? ( x11-libs/gtk+:2[introspection] )"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+src_configure() {
+ local cfg="keyfile" fdo="glib" myconf=""
+
+ use gconf && cfg="gconf,${cfg}"
+ use gnome && fdo="${fdo},gnome"
+ use debug && myconf="${myconf} --enable-debug"
+ use glade && myconf="${myconf} --with-glade"
+ use introspection || myconf="${myconf} --disable-gi"
+
+ waf-utils_src_configure \
+ --sysconfdir="${EPREFIX}"/etc \
+ --config-backends=${cfg} \
+ --desktop-entry-backends=${fdo} \
+ --vfs-backends=gio \
+ ${myconf}
+}
diff --git a/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92.ebuild b/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92.ebuild
new file mode 100644
index 000000000000..8a74d818caff
--- /dev/null
+++ b/x11-libs/libdesktop-agnostic/libdesktop-agnostic-0.3.92.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+PYTHON_DEPEND="2:2.7"
+VALA_USE_DEPEND="vapigen"
+
+inherit python waf-utils vala
+
+DESCRIPTION="A desktop-agnostic library for GLib-based projects"
+HOMEPAGE="https://launchpad.net/libdesktop-agnostic"
+SRC_URI="http://launchpad.net/${PN}/0.4/${PV}/+download/${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug +gconf glade gnome +introspection"
+
+RDEPEND=">=dev-libs/glib-2
+ dev-python/pygobject:2
+ dev-python/pygtk:2
+ x11-libs/gtk+:2
+ gconf? ( gnome-base/gconf:2 )
+ glade? ( gnome-base/libglade:2.0 )
+ gnome? ( gnome-base/gnome-desktop:2 )"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ dev-libs/gobject-introspection
+ introspection? ( x11-libs/gtk+:2[introspection] )"
+
+pkg_setup() {
+ python_set_active_version 2
+ python_pkg_setup
+}
+
+src_configure() {
+ local cfg="keyfile" fdo="glib" myconf=""
+
+ use gconf && cfg="gconf,${cfg}"
+ use gnome && fdo="${fdo},gnome"
+ use debug && myconf="${myconf} --enable-debug"
+ use glade && myconf="${myconf} --with-glade"
+ use introspection || myconf="${myconf} --disable-gi"
+
+ waf-utils_src_configure \
+ --sysconfdir="${EPREFIX}"/etc \
+ --config-backends=${cfg} \
+ --desktop-entry-backends=${fdo} \
+ --vfs-backends=gio \
+ ${myconf}
+}
diff --git a/x11-libs/libdesktop-agnostic/metadata.xml b/x11-libs/libdesktop-agnostic/metadata.xml
new file mode 100644
index 000000000000..0e2a4c7f0637
--- /dev/null
+++ b/x11-libs/libdesktop-agnostic/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>angelos@gentoo.org</email>
+ <name>Christoph Mende</name>
+ </maintainer>
+ <use>
+ <flag name="gconf">Enable GConf as configuration backend</flag>
+ <flag name="glade">Install the Glade catalog for the desktop-agnotstic GTK widgets.</flag>
+ <flag name="introspection">Use dev-libs/gobject-introspection for introspection</flag>
+ </use>
+ <upstream>
+ <remote-id type="launchpad">libdesktop-agnostic</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libdmx/Manifest b/x11-libs/libdmx/Manifest
new file mode 100644
index 000000000000..64136dd958da
--- /dev/null
+++ b/x11-libs/libdmx/Manifest
@@ -0,0 +1 @@
+DIST libdmx-1.1.3.tar.bz2 290859 SHA256 c97da36d2e56a2d7b6e4f896241785acc95e97eb9557465fd66ba2a155a7b201 SHA512 551cbba06e87ddc6f9a1f4567de4b8c592a4b6f6b6c27970c67c644ffe5c7f396e3c64c6df564d83a73f1b3842ba0a29a2463580fc0a264c552d76fbcba5a021 WHIRLPOOL 0cd116b9a764f699d147958fa4673e6be513ce5832450e308d4686ad998a7edc6ff60a6d5165d72584f8601f2742092f82e2ce9f34a1ef16a1c94d9f66ee43cb
diff --git a/x11-libs/libdmx/libdmx-1.1.3.ebuild b/x11-libs/libdmx/libdmx-1.1.3.ebuild
new file mode 100644
index 000000000000..58a0bbf54ad3
--- /dev/null
+++ b/x11-libs/libdmx/libdmx-1.1.3.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="X.Org dmx library"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ >=x11-proto/dmxproto-2.3
+ x11-proto/xextproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libdmx/metadata.xml b/x11-libs/libdmx/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libdmx/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-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
new file mode 100644
index 000000000000..207e9864b4cb
--- /dev/null
+++ b/x11-libs/libdockapp/Manifest
@@ -0,0 +1,2 @@
+DIST libdockapp-0.6.1.tar.bz2 155920 SHA256 eacae024ce6f2bdaba50f18bd18a27a9b4a3e290300f92048fdb11ebd273bd9f
+DIST libdockapp-0.6.4.tar.gz 32200 SHA256 188e95f093a79746450294a6d9a7be74bfa658215a7f617eb1b63a2bb013fae7 SHA512 8246434de903f113888dd7ef21c27d4bd3991d901b453963c696e5474082f5295de80b00f09d690de8a4a7fbbfa174d1727e138714015ddfbd39b8348e064c6f WHIRLPOOL 2e13efca76d879e9f5d86043e5d9570dad7e212dae6020356644bfa57d26cdb7d421f7a6b671843d396ea26ea18025286c4c6aaf00f59869f93d7211a94cdd7e
diff --git a/x11-libs/libdockapp/files/install-paths.patch-0.6.1 b/x11-libs/libdockapp/files/install-paths.patch-0.6.1
new file mode 100644
index 000000000000..7206655bb7a3
--- /dev/null
+++ b/x11-libs/libdockapp/files/install-paths.patch-0.6.1
@@ -0,0 +1,15 @@
+--- fonts/Makefile.am 2005-06-08 14:36:38.389096256 +0200
++++ fonts/Makefile.am 2005-06-08 14:37:18.276032520 +0200
+@@ -5,10 +5,10 @@
+ # but I don't know how and they don't tell.
+ #
+
+-XFONTDIR = $(DESTDIR)/usr/X11R6/lib/X11/fonts
++XFONTDIR = $(DESTDIR)/usr/share/fonts/libdockapp-fonts
+
+ MYFONTDIR = /dockapp
+-MYDATA = luxel-ascii-06x09.pcf.gz seg7-ascii-05x07.pcf.gz fonts.dir fonts.alias
++MYDATA = luxel-ascii-06x09.pcf.gz seg7-ascii-05x07.pcf.gz
+
+ install-data-local:
+ $(INSTALL) -d $(XFONTDIR)$(MYFONTDIR)
diff --git a/x11-libs/libdockapp/files/legacy.patch-0.6.1 b/x11-libs/libdockapp/files/legacy.patch-0.6.1
new file mode 100644
index 000000000000..b608db02195e
--- /dev/null
+++ b/x11-libs/libdockapp/files/legacy.patch-0.6.1
@@ -0,0 +1,10 @@
+--- dockapp-0.6.0/src/damain-orig.c 2005-04-20 20:05:04.000000000 +0200
++++ dockapp-0.6.0/src/damain.c 2005-06-04 19:21:34.000000000 +0200
+@@ -237,6 +237,7 @@
+ DAInitialize(char *display, char *name, unsigned width, unsigned height,
+ int argc, char **argv)
+ {
++ _daContext= DAContextInit();
+ DAOpenDisplay(display, argc, argv);
+ DACreateIcon(name, width, height, argc, argv);
+ }
diff --git a/x11-libs/libdockapp/libdockapp-0.6.1.ebuild b/x11-libs/libdockapp/libdockapp-0.6.1.ebuild
new file mode 100644
index 000000000000..f0cb22a23972
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.6.1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools
+
+IUSE=""
+
+DESCRIPTION="Window Maker Dock Applet Library"
+SRC_URI="http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/${P}.tar.bz2"
+HOMEPAGE="http://solfertje.student.utwente.nl/~dalroi/libdockapp/"
+
+LICENSE="MIT public-domain"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 sparc x86"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libXpm"
+DEPEND="${RDEPEND}
+ x11-proto/xextproto
+ x11-proto/xproto"
+
+S=${WORKDIR}/${P/lib/}
+FONTDIR="/usr/share/fonts/${PN}-fonts"
+
+src_unpack()
+{
+ unpack ${A}
+ cd "${S}"
+
+ # sanitize fonts installation path
+ epatch "${FILESDIR}/install-paths.patch-${PV}"
+
+ # add legacy support for older dockapps
+ epatch "${FILESDIR}/legacy.patch-${PV}"
+
+ eautoreconf
+}
+
+src_install()
+{
+ make \
+ DESTDIR="${D}" \
+ SHAREDIR="${D}/usr/share/doc/${PF}/examples/" \
+ install || die "make install failed"
+
+ dodoc README ChangeLog NEWS AUTHORS
+}
+
+pkg_postinst()
+{
+ einfo
+ einfo "You need to add following line into 'Section \"Files\"' in"
+ einfo "/etc/X11/xorg.conf (or /etc/X11/XF86Config if you are still using XFree86)"
+ einfo "and reboot X Window System, to use these fonts."
+ einfo
+ einfo "\t FontPath \"${FONTDIR}\""
+ einfo
+ einfo "You also need to add the following line to /etc/fonts/local.conf"
+ einfo
+ einfo "\t <dir>${FONTDIR}</dir>"
+ einfo
+}
+
+pkg_postrm()
+{
+ einfo
+ einfo "You need to remove following line from 'Section \"Files\"' in"
+ einfo "/etc/X11/xorg.conf (or /etc/X11/XF86Config if you are still using XFree86)"
+ einfo "to unmerge this package completely."
+ einfo
+ einfo "\t FontPath \"${FONTDIR}\""
+ einfo
+ einfo "You also need to remove the following line from /etc/fonts/local.conf"
+ einfo
+ einfo "\t <dir>${FONTDIR}</dir>"
+ einfo
+}
diff --git a/x11-libs/libdockapp/libdockapp-0.6.4.ebuild b/x11-libs/libdockapp/libdockapp-0.6.4.ebuild
new file mode 100644
index 000000000000..3b76234a0157
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.6.4.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools font
+
+DESCRIPTION="Window Maker Dock Applet Library"
+HOMEPAGE="http://windowmaker.org/dockapps/?name=wmclock"
+# Grab from http://windowmaker.org/dockapps/?download=${P}.tar.gz
+SRC_URI="http://dev.gentoo.org/~voyageur/distfiles/${P}.tar.gz"
+
+LICENSE="MIT public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+# Required for font eclass
+IUSE="+X"
+REQUIRED_USE="X"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXt
+ x11-libs/libXext
+ x11-libs/libXpm"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
+
+S=${WORKDIR}/dockapps
+
+FONT_S=${S}/fonts
+FONT_SUFFIX="gz"
+DOCS="README ChangeLog NEWS AUTHORS"
+
+src_prepare()
+{
+ eautoreconf
+}
+
+src_configure()
+{
+ # Font installation handled by font eclass
+ econf --without-font --without-examples
+}
+
+src_install()
+{
+ emake DESTDIR="${D}" install
+ font_src_install
+}
diff --git a/x11-libs/libdockapp/metadata.xml b/x11-libs/libdockapp/metadata.xml
new file mode 100644
index 000000000000..b1a9efc4f2f0
--- /dev/null
+++ b/x11-libs/libdockapp/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-dock</herd>
+</pkgmetadata>
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
new file mode 100644
index 000000000000..b28243c3317b
--- /dev/null
+++ b/x11-libs/libdrm/Manifest
@@ -0,0 +1,10 @@
+DIST libdrm-2.4.20.tar.bz2 400812 SHA256 24b5316839c1d459066eaee160132d45931462e301740a660932907350415cb9 SHA512 fa7a042a80b71057b7d15a36c7902e1882abb23dea77cabfa2e78590d9477d8e0259364f0e2eb6005b316254be2c728e295c114b1fe365074438539bc3dd9392 WHIRLPOOL 92a9fba9f64d0c988e8e6bcbdd1798583a420bc1287b4e85c1ca9a84c5fd3c95e5079dc111eee89811038832a5a90139780292d43554257465c99726b7f27661
+DIST libdrm-2.4.33.tar.bz2 446817 SHA256 2d7b9d94ada0e3a6ede6243509883df2ded01c2983e24322759a366283898fea SHA512 ac355bab87c87b8540218401f89ad16ece0e6fdd28d937e41e8a4765d7f9792798f7e74d27f3b57c49d1d8dd3909d6668e10b0139b1c35bbab5ab9002ff64c1e WHIRLPOOL 5ebeb22ef22f8fceba628768725bbfe54316f7dcf41ea2b454ba5a504aae65bb3e918269fffadd8a13975e79eeecf50274f2ffa24d6ef42a13e7e3874a5b9bf4
+DIST libdrm-2.4.46.tar.bz2 554190 SHA256 33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1 SHA512 9e1699e28b034b5dd7acccd76b9f4e83ff10bb2b62107282f1e02046c1d6e8f0b5abbab318f23967dc23d4d5afdeb3e78793384801da5cfeaba7567f837242c6 WHIRLPOOL 7c9bd1074cf1cab9cd8d5814d9b55d26cb0d6e9b4f0a959324ad0d6d20c185155ae1480b3be82603b83ca94b446518dca7994d21e5ee56cca76bcbfd39183539
+DIST libdrm-2.4.52.tar.bz2 551473 SHA256 fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1 SHA512 1cbd8898504d2a093f010216070507f41134a3f3cc4b94998feec33da651ec493b92fbf0beb65fe1734528e75ac6e94bc982de6b5ee277435622f974b1badcc5 WHIRLPOOL 8f3c10180e1f524aa3a295ebc1fc977a5e13af834b78c19887ed5ddb8785302632ef8723bf4f1320cafebc5420e13610be64e8ff462451068e4032978f0ea9d6
+DIST libdrm-2.4.53.tar.bz2 579171 SHA256 1b0c28fd2f2b92d2df0a73d1aed88f43cb0dee1267aea6bc52ccb5fca5757a08 SHA512 5c4c16cbabf9b8f882503e645d1be11dbafa4d75b7e0536f824ca43f4a2a8f62a11c32b900c408862eade493f9eb56d92d323e1cc1945e2bacf05360ca2d4de3 WHIRLPOOL 6c3764c1347a6e3a455e847f6e3ecfa7b7b209e86039460071d40c2efb88f272ac62bfc64ebe98954bee6561fe9795bb6aaa2a3ca5d6efe01fb8a34fc56b58bb
+DIST libdrm-2.4.54.tar.bz2 644930 SHA256 d94001ebfbe80e1523d1228ee2df57294698d1c734fad9ccf53efde8932fe4e9 SHA512 61b38df8ed2a4522a28605eb63a6e5c4dca89c7b24c7863f1046da3d34dca823856210abe3ef7eb7e5804bbc34712dc6203e60134a9398da3ba01b8bd7fe9dc5 WHIRLPOOL 1394c24c030f034a4fea7afa5cc3c2eac2641c1bbaa3611ee56efaae7fdfff5c562c58ca076fb7963a79a95cc3aee446e862d1a358e4465229dc8a036793131d
+DIST libdrm-2.4.56.tar.bz2 590856 SHA256 e20fbbe092177a8422913d8884a1255477456ab5b10b07389fa891a4dce54030 SHA512 5ad28ddcfad666c207a7d7c6139140182bd96c0f2c6befafbb03a9f50aa40119366cc8750025626c7c2570416a6e9476ab5102b4075562b52cdca577ded5d64c WHIRLPOOL 5995bb10400bdfaba3db2aee929df63d5be773e30511c58c10bda7360598edba14a0cad45d9f3d783d8a37232d1ab7e07544eb982fc1bfb0172440a12136db19
+DIST libdrm-2.4.58.tar.bz2 573202 SHA256 b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd SHA512 26776b3f93fe173f4e0f94668813ec1a756d9f15385d1cad70c7af8d4d5d503aef00e14081c76f6fcac6e0c606e106e47ddf76038f8601b71fc380306536f937 WHIRLPOOL 36d8915b3189fd0722f96698ce5e7a94188859c7372631c4126b0e09e8fa6dbd4e34de5e9d62e053c36e9f431d84d68d327be307d69caf92e1016893e77cf190
+DIST libdrm-2.4.59.tar.bz2 592722 SHA256 68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b SHA512 b9f61cfd47cf4a02c10e7fe79b0e9c5701383c76425cf4985a9b91d909f905334ca1ace7334aa0a4ab400694ad84a1a3bc1c3f29842d808026702b35fa9f87c3 WHIRLPOOL 6b0e1be70164db86152503e4b72373736f0462ff97ffac2c79a6c1fce83d658e6030d5435be5a61c1f6ca50728db4c7e3a5d8f5e48073fc74169696ff1b7c5be
+DIST libdrm-2.4.62.tar.bz2 637472 SHA256 906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc SHA512 f7e2ef79c80dd0c3a837970052b7e66110e9b99d3e87b3cd278646bb4cb39832a9562144016a7e956a85212d9251b191279f5ba25d7e8bc0bfbfc1a311df3873 WHIRLPOOL e9ca493f01598bcb7e5664c531e48e74570a7ee0c754794ed2247314123821509448d62290b594073389ff545a019e24305d365ba7435f933665cc57d85385dc
diff --git a/x11-libs/libdrm/files/2.4.18-0001-datatypes.patch b/x11-libs/libdrm/files/2.4.18-0001-datatypes.patch
new file mode 100644
index 000000000000..6a1bfafcbb1b
--- /dev/null
+++ b/x11-libs/libdrm/files/2.4.18-0001-datatypes.patch
@@ -0,0 +1,21 @@
+diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
+index dfc390e..49b3b54 100644
+--- a/include/drm/drm_mode.h
++++ b/include/drm/drm_mode.h
+@@ -308,11 +308,11 @@ struct drm_mode_crtc_lut {
+ #define DRM_MODE_PAGE_FLIP_FLAGS DRM_MODE_PAGE_FLIP_EVENT
+
+ struct drm_mode_crtc_page_flip {
+- uint32_t crtc_id;
+- uint32_t fb_id;
+- uint32_t flags;
+- uint32_t reserved;
+- uint64_t user_data;
++ __u32 crtc_id;
++ __u32 fb_id;
++ __u32 flags;
++ __u32 reserved;
++ __u64 user_data;
+ };
+
+ #endif
diff --git a/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
new file mode 100644
index 000000000000..0311a001a0b6
--- /dev/null
+++ b/x11-libs/libdrm/files/libdrm-2.4.28-solaris.patch
@@ -0,0 +1,111 @@
+Index: libdrm-2.4.23/include/drm/drm.h
+===================================================================
+--- libdrm-2.4.23.orig/include/drm/drm.h
++++ libdrm-2.4.23/include/drm/drm.h
+@@ -54,7 +54,11 @@ typedef int32_t __s32;
+ typedef uint32_t __u32;
+ typedef int64_t __s64;
+ typedef uint64_t __u64;
++#if defined(__sun)
++typedef unsigned long long drm_handle_t;
++#else
+ typedef unsigned long drm_handle_t;
++#endif
+
+ #endif
+
+@@ -210,12 +214,22 @@ struct drm_ctx_priv_map {
+ * \sa drmAddMap().
+ */
+ struct drm_map {
++#ifdef __sun
++ unsigned long long offset;
++ /**< Requested physical address (0 for SAREA)*/
++ unsigned long long handle;
++ /**< User-space: "Handle" to pass to mmap() */
++ /**< Kernel-space: kernel-virtual address */
++#else
+ unsigned long offset; /**< Requested physical address (0 for SAREA)*/
++#endif
+ unsigned long size; /**< Requested physical size (bytes) */
+ enum drm_map_type type; /**< Type of memory to map */
+ enum drm_map_flags flags; /**< Flags */
++#ifndef __sun
+ void *handle; /**< User-space: "Handle" to pass to mmap() */
+ /**< Kernel-space: kernel-virtual address */
++#endif
+ int mtrr; /**< MTRR slot used */
+ /* Private data */
+ };
+@@ -379,6 +393,9 @@ struct drm_buf_map {
+ void *virtual; /**< Mmap'd area in user-virtual */
+ #endif
+ struct drm_buf_pub *list; /**< Buffer information */
++#ifdef __sun
++ int fd;
++#endif
+ };
+
+ /**
+Index: libdrm-2.4.23/radeon/radeon_bo_gem.c
+===================================================================
+--- libdrm-2.4.23.orig/radeon/radeon_bo_gem.c
++++ libdrm-2.4.23/radeon/radeon_bo_gem.c
+@@ -38,6 +38,13 @@
+ #include <string.h>
+ #include <sys/mman.h>
+ #include <errno.h>
++
++/* On solaris unistd.h and stropts.h are needed for ioctl */
++#ifdef __sun
++#include <unistd.h>
++#include <stropts.h>
++#endif
++
+ #include "xf86drm.h"
+ #include "xf86atomic.h"
+ #include "drm.h"
+Index: libdrm-2.4.23/xf86drm.c
+===================================================================
+--- libdrm-2.4.23.orig/xf86drm.c
++++ libdrm-2.4.23/xf86drm.c
+@@ -972,7 +972,11 @@ int drmRmMap(int fd, drm_handle_t handle
+ {
+ drm_map_t map;
+
++#ifdef __sun
++ map.handle = handle;
++#else
+ map.handle = (void *)(uintptr_t)handle;
++#endif
+
+ if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
+ return -errno;
+@@ -1210,6 +1214,9 @@ drmBufMapPtr drmMapBufs(int fd)
+ bufs.count = 0;
+ bufs.list = NULL;
+ bufs.virtual = NULL;
++#ifdef __sun
++ bufs.fd = fd;
++#endif
+ if (drmIoctl(fd, DRM_IOCTL_MAP_BUFS, &bufs))
+ return NULL;
+
+Index: libdrm-2.4.23/xf86drm.h
+===================================================================
+--- libdrm-2.4.23.orig/xf86drm.h
++++ libdrm-2.4.23/xf86drm.h
+@@ -64,6 +64,13 @@
+
+ #endif
+
++#if defined(__sun) && !defined(_IOC)
++#define _IOC(dir, group, nr, size) \
++ (dir == DRM_IOC_READWRITE ? _IOWRN(group, nr, size) : \
++ (dir == DRM_IOC_WRITE ? _IOWN(group, nr, size) : \
++ /* dir == DRM_IOC_READ */ _IORN(group, nr, size) ))
++#endif
++
+ /* Defaults, if nothing set in xf86config */
+ #define DRM_DEV_UID 0
+ #define DRM_DEV_GID 0
diff --git a/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch
new file mode 100644
index 000000000000..9e4110019815
--- /dev/null
+++ b/x11-libs/libdrm/files/libdrm-2.4.58-solaris.patch
@@ -0,0 +1,104 @@
+--- a/include/drm/drm.h
++++ b/include/drm/drm.h
+@@ -54,7 +54,11 @@ typedef int32_t __s32;
+ typedef uint32_t __u32;
+ typedef int64_t __s64;
+ typedef uint64_t __u64;
++#if defined(__sun)
++typedef unsigned long long drm_handle_t;
++#else
+ typedef unsigned long drm_handle_t;
++#endif
+
+ #endif
+
+@@ -210,12 +214,22 @@ struct drm_ctx_priv_map {
+ * \sa drmAddMap().
+ */
+ struct drm_map {
++#ifdef __sun
++ unsigned long long offset;
++ /**< Requested physical address (0 for SAREA)*/
++ unsigned long long handle;
++ /**< User-space: "Handle" to pass to mmap() */
++ /**< Kernel-space: kernel-virtual address */
++#else
+ unsigned long offset; /**< Requested physical address (0 for SAREA)*/
++#endif
+ unsigned long size; /**< Requested physical size (bytes) */
+ enum drm_map_type type; /**< Type of memory to map */
+ enum drm_map_flags flags; /**< Flags */
++#ifndef __sun
+ void *handle; /**< User-space: "Handle" to pass to mmap() */
+ /**< Kernel-space: kernel-virtual address */
++#endif
+ int mtrr; /**< MTRR slot used */
+ /* Private data */
+ };
+@@ -379,6 +393,9 @@ struct drm_buf_map {
+ void *virtual; /**< Mmap'd area in user-virtual */
+ #endif
+ struct drm_buf_pub *list; /**< Buffer information */
++#ifdef __sun
++ int fd;
++#endif
+ };
+
+ /**
+--- a/radeon/radeon_bo_gem.c
++++ b/radeon/radeon_bo_gem.c
+@@ -38,6 +38,13 @@
+ #include <string.h>
+ #include <sys/mman.h>
+ #include <errno.h>
++
++/* On solaris unistd.h and stropts.h are needed for ioctl */
++#ifdef __sun
++#include <unistd.h>
++#include <stropts.h>
++#endif
++
+ #include "libdrm.h"
+ #include "xf86drm.h"
+ #include "xf86atomic.h"
+ #include "drm.h"
+--- a/xf86drm.c
++++ b/xf86drm.c
+@@ -972,7 +972,11 @@ int drmRmMap(int fd, drm_handle_t handle
+ {
+ drm_map_t map;
+
++#ifdef __sun
++ map.handle = handle;
++#else
+ map.handle = (void *)(uintptr_t)handle;
++#endif
+
+ if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
+ return -errno;
+@@ -1210,6 +1214,9 @@ drmBufMapPtr drmMapBufs(int fd)
+ bufs.count = 0;
+ bufs.list = NULL;
+ bufs.virtual = NULL;
++#ifdef __sun
++ bufs.fd = fd;
++#endif
+ if (drmIoctl(fd, DRM_IOCTL_MAP_BUFS, &bufs))
+ return NULL;
+
+--- a/xf86drm.h
++++ b/xf86drm.h
+@@ -64,6 +64,13 @@
+
+ #endif
+
++#if defined(__sun) && !defined(_IOC)
++#define _IOC(dir, group, nr, size) \
++ (dir == DRM_IOC_READWRITE ? _IOWRN(group, nr, size) : \
++ (dir == DRM_IOC_WRITE ? _IOWN(group, nr, size) : \
++ /* dir == DRM_IOC_READ */ _IORN(group, nr, size) ))
++#endif
++
+ /* Defaults, if nothing set in xf86config */
+ #define DRM_DEV_UID 0
+ #define DRM_DEV_GID 0
diff --git a/x11-libs/libdrm/libdrm-2.4.20-r1.ebuild b/x11-libs/libdrm/libdrm-2.4.20-r1.ebuild
new file mode 100644
index 000000000000..21196c46eb20
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.20-r1.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~x86-fbsd"
+IUSE="kernel_linux"
+RESTRICT="test" # see bug #236845
+
+RDEPEND="dev-libs/libpthread-stubs"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ # Fixes buidling of x11-drivers/xf86-video-openchrome, Gentoo bug 298352,
+ # upstream bug 26994
+ "${FILESDIR}"/2.4.18-0001-datatypes.patch
+ )
+
+pkg_setup() {
+ # libdrm_intel fails to build on some arches if dev-libs/libatomic_ops is
+ # installed, bugs 297630, bug 316421 and bug 316541, and is presently only
+ # useful on amd64 and x86.
+ CONFIGURE_OPTIONS="--enable-udev
+ --enable-nouveau-experimental-api
+ --enable-vmwgfx-experimental-api
+ $(use_enable kernel_linux libkms)
+ $(! use amd64 && ! use x86 && ! use x86-fbsd && echo "--disable-intel")"
+}
+
+pkg_postinst() {
+ x-modular_pkg_postinst
+
+ ewarn "libdrm's ABI may have changed without change in library name"
+ ewarn "Please rebuild media-libs/mesa, x11-base/xorg-server and"
+ ewarn "your video drivers in x11-drivers/*."
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.33.ebuild b/x11-libs/libdrm/libdrm-2.4.33.ebuild
new file mode 100644
index 000000000000..f717bfc44098
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.33.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="intel nouveau omap radeon vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+RESTRICT="test" # see bug #236845
+
+RDEPEND="dev-libs/libpthread-stubs
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.28-solaris.patch
+)
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau-experimental-api)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_vmware vmwgfx-experimental-api)
+ $(use_enable libkms)
+ )
+
+ xorg-2_pkg_setup
+}
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.46.ebuild b/x11-libs/libdrm/libdrm-2.4.46.ebuild
new file mode 100644
index 000000000000..be340400a20a
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.46.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+REQUIRED_USE="video_cards_exynos? ( libkms )"
+RESTRICT="test" # see bug #236845
+
+RDEPEND="dev-libs/libpthread-stubs
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.28-solaris.patch
+)
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno-experimental-api)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.52.ebuild b/x11-libs/libdrm/libdrm-2.4.52.ebuild
new file mode 100644
index 000000000000..dfe86fa7d69f
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.52.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+REQUIRED_USE="video_cards_exynos? ( libkms )"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.28-solaris.patch
+)
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno-experimental-api)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.53.ebuild b/x11-libs/libdrm/libdrm-2.4.53.ebuild
new file mode 100644
index 000000000000..b7c0be8556f7
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.53.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+REQUIRED_USE="video_cards_exynos? ( libkms )"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.28-solaris.patch
+)
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno-experimental-api)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.54.ebuild b/x11-libs/libdrm/libdrm-2.4.54.ebuild
new file mode 100644
index 000000000000..b7c0be8556f7
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.54.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+REQUIRED_USE="video_cards_exynos? ( libkms )"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.28-solaris.patch
+)
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno-experimental-api)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.56.ebuild b/x11-libs/libdrm/libdrm-2.4.56.ebuild
new file mode 100644
index 000000000000..7b983ed960a7
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.56.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.28-solaris.patch
+)
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno-experimental-api)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.58.ebuild b/x11-libs/libdrm/libdrm-2.4.58.ebuild
new file mode 100644
index 000000000000..23ebd9512cc9
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.58.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.58-solaris.patch
+)
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno-experimental-api)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.59-r1.ebuild b/x11-libs/libdrm/libdrm-2.4.59-r1.ebuild
new file mode 100644
index 000000000000..30edd1231c6b
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.59-r1.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon tegra vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.58-solaris.patch
+)
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+
+ # There is no configure flag for this.
+ sed -i -r \
+ -e "/have_valgrind=/s:=(yes|no):=$(usex valgrind):" \
+ configure || die
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ # Udev is only used by tests now.
+ --disable-udev
+ --disable-cairo-tests
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_tegra tegra-experimental-api)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.59.ebuild b/x11-libs/libdrm/libdrm-2.4.59.ebuild
new file mode 100644
index 000000000000..cee532b33d8f
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.59.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon tegra vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.4.58-solaris.patch
+)
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ --enable-udev
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_tegra tegra-experimental-api)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.62.ebuild b/x11-libs/libdrm/libdrm-2.4.62.ebuild
new file mode 100644
index 000000000000..3e5cc0621b4e
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.62.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="X.Org libdrm library"
+HOMEPAGE="http://dri.freedesktop.org/"
+if [[ ${PV} = 9999* ]]; then
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
+else
+ SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
+fi
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+VIDEO_CARDS="exynos freedreno intel nouveau omap radeon tegra vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
+RESTRICT="test" # see bug #236845
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
+ video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )"
+
+src_prepare() {
+ if [[ ${PV} = 9999* ]]; then
+ # tests are restricted, no point in building them
+ sed -ie 's/tests //' "${S}"/Makefile.am
+ fi
+ xorg-2_src_prepare
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ # Udev is only used by tests now.
+ --disable-udev
+ --disable-cairo-tests
+ $(use_enable video_cards_exynos exynos-experimental-api)
+ $(use_enable video_cards_freedreno freedreno)
+ $(use_enable video_cards_intel intel)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable video_cards_omap omap-experimental-api)
+ $(use_enable video_cards_radeon radeon)
+ $(use_enable video_cards_tegra tegra-experimental-api)
+ $(use_enable video_cards_vmware vmwgfx)
+ $(use_enable libkms)
+ # valgrind installs its .pc file to the pkgconfig for the primary arch
+ --enable-valgrind=$(usex valgrind auto no)
+ )
+
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libdrm/metadata.xml b/x11-libs/libdrm/metadata.xml
new file mode 100644
index 000000000000..92b215648248
--- /dev/null
+++ b/x11-libs/libdrm/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='libkms'>Enable building of libkms, a library for applications to interface with KMS</flag>
+<flag name='valgrind'>Compile in valgrind memory hints</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/libfakekey/Manifest b/x11-libs/libfakekey/Manifest
new file mode 100644
index 000000000000..5c5ba02a83f7
--- /dev/null
+++ b/x11-libs/libfakekey/Manifest
@@ -0,0 +1 @@
+DIST libfakekey-0.1.tar.bz2 203504 SHA256 c41042a70524895b0edf8077ae3ae1206f1a313bea5811dcc23033ea16a00194 SHA512 1fda0548cf14657083a6602f8d6c08efae8cae2236de7ed17fc4058765156c6bb923956e3c7fd75f2db586399f1d8a3320ab5bbed71cc5a8b0d146590a14a808 WHIRLPOOL c33c01b745a1f3fd81333847a09ec1f5d11552976f2034e22bb323ae8cbd6f3d4ef819969d40f063d727f11004c77713fe906361433a7e467c2083ef0f0f3702
diff --git a/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
new file mode 100644
index 000000000000..65c0b083aa72
--- /dev/null
+++ b/x11-libs/libfakekey/files/libfakekey-0.1-ac.patch
@@ -0,0 +1,24 @@
+--- configure.ac.old 2011-05-22 14:59:45.801746472 +0100
++++ configure.ac 2011-05-22 15:02:59.437159981 +0100
+@@ -14,16 +14,14 @@ AC_HEADER_STDC
+
+ dnl ------ libtool versioning -----------------------------------------------
+
+-LT_CURRENT=0
+-LT_REVISION=1
+-AC_SUBST(LT_CURRENT)
+-AC_SUBST(LT_REVISION)
+-LT_AGE=0
++m4_define(LT_CURRENT, 0)
++m4_define(LT_REVISION, 1)
++m4_define(LT_AGE, 0)
+
+-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
++LT_VERSION_INFO="LT_CURRENT():LT_REVISION():LT_AGE()"
+ AC_SUBST(LT_VERSION_INFO)
+
+-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
++LT_CURRENT_MINUS_AGE="m4_eval(LT_CURRENT() - LT_AGE())"
+ AC_SUBST(LT_CURRENT_MINUS_AGE)
+
+ dnl ------ Check for X Stuff ------------------------------------------------
diff --git a/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild
new file mode 100644
index 000000000000..f45ed221ccee
--- /dev/null
+++ b/x11-libs/libfakekey/libfakekey-0.1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=2
+
+inherit eutils autotools
+
+DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="amd64 ~arm ~hppa ppc x86"
+IUSE="debug doc"
+
+RDEPEND="x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ # Allow configure to use libtool-2
+ epatch "${FILESDIR}/${P}-ac.patch"
+
+ # Fix underlinking bug #367595
+ sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
+ tests/Makefile.am || die 'Cannot sed Makefile.am'
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ # --with/without-x is ignored by configure script and X is used.
+ econf --with-x \
+ $(use_enable debug) \
+ $(use_enable doc doxygen-docs) \
+ || die "Configuration failed"
+}
+
+src_install() {
+ make DESTDIR="${D}" install || die "Installation failed"
+
+ dodoc AUTHORS ChangeLog INSTALL NEWS README
+ use doc && dohtml doc/html/*
+}
diff --git a/x11-libs/libfakekey/libfakekey-0.1-r2.ebuild b/x11-libs/libfakekey/libfakekey-0.1-r2.ebuild
new file mode 100644
index 000000000000..90a07a32c607
--- /dev/null
+++ b/x11-libs/libfakekey/libfakekey-0.1-r2.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 eutils autotools
+
+DESCRIPTION="Helper library for the x11-misc/matchbox-keyboard package"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2"
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86"
+IUSE="debug doc"
+
+RDEPEND="x11-libs/libXtst"
+
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+src_prepare() {
+ # Allow configure to use libtool-2
+ epatch "${FILESDIR}/${P}-ac.patch"
+
+ # Fix underlinking bug #367595
+ sed -i -e 's/^fakekey_test_LDADD=/fakekey_test_LDADD=-lX11 /' \
+ tests/Makefile.am || die 'Cannot sed Makefile.am'
+ sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ # --with/without-x is ignored by configure script and X is used.
+ econf --with-x \
+ $(use_enable debug) \
+ $(use_enable doc doxygen-docs)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ dodoc AUTHORS ChangeLog INSTALL NEWS README
+ use doc && dohtml doc/html/*
+}
diff --git a/x11-libs/libfakekey/metadata.xml b/x11-libs/libfakekey/metadata.xml
new file mode 100644
index 000000000000..13070094fdcc
--- /dev/null
+++ b/x11-libs/libfakekey/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>gpe</herd>
+ <herd>kde</herd>
+</pkgmetadata>
diff --git a/x11-libs/libfm-extra/Manifest b/x11-libs/libfm-extra/Manifest
new file mode 100644
index 000000000000..7361d3d75317
--- /dev/null
+++ b/x11-libs/libfm-extra/Manifest
@@ -0,0 +1 @@
+DIST libfm-1.2.3.tar.xz 898256 SHA256 c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9 SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443 WHIRLPOOL ae5354c5ef5154ebce8a9124b47e0a645171d50d4034fd1e6000ff084acc15261398029c58b067b9027d4ba68d36d8addf91a28678c91a3fbd9ce0806e9b6046
diff --git a/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
new file mode 100644
index 000000000000..5b2eb662aa70
--- /dev/null
+++ b/x11-libs/libfm-extra/libfm-extra-1.2.3.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools fdo-mime
+
+MY_PV=${PV/_/}
+MY_PN="libfm"
+MY_P="${MY_PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE=""
+
+RDEPEND=">=dev-libs/glib-2.18:2"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ sys-devel/gettext
+ !!<=x11-libs/libfm-1.2.3"
+
+S="${WORKDIR}"/${MY_P}
+
+src_prepare() {
+ sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+ sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+ sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+ configure.ac || die "sed failed"
+
+ #disable unused translations. Bug #356029
+ for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+ progress;do
+ echo "data/ui/"${trans}.ui >> po/POTFILES.in
+ done
+ #Remove -Werror for automake-1.12. Bug #421101
+ sed -i "s:-Werror::" configure.ac || die
+
+ # subslot sanity check
+ local sub_slot=${SLOT#*/}
+ local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+ if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+ eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+
+ eautoreconf
+ rm -r autom4te.cache || die
+}
+
+src_configure() {
+ econf --sysconfdir="${EPREFIX}/etc" --disable-dependency-tracking \
+ --disable-static --with-extra-only
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+ # Sometimes a directory is created instead of a symlink. No idea why...
+ # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+ # symlink to it.
+ if [[ -h ${D}/usr/include/${MY_PN} || -d ${D}/usr/include/${MY_PN} ]]; then
+ rm -r "${D}"/usr/include/${MY_PN}
+ fi
+}
+
+pkg_preinst() {
+ # Resolve the symlink mess. Bug #439570
+ [[ -d "${ROOT}"/usr/include/${MY_PN} ]] && \
+ rm -rf "${ROOT}"/usr/include/${MY_PN}
+ if [[ -d "${D}"/usr/include/${MY_PN}-1.0 ]]; then
+ cd "${D}"/usr/include
+ ln -s --force ${MY_PN}-1.0 ${MY_PN}
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm-extra/metadata.xml b/x11-libs/libfm-extra/metadata.xml
new file mode 100644
index 000000000000..0a5b7815d533
--- /dev/null
+++ b/x11-libs/libfm-extra/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>lxde</herd>
+ <herd>lxqt</herd>
+</pkgmetadata>
diff --git a/x11-libs/libfm/Manifest b/x11-libs/libfm/Manifest
new file mode 100644
index 000000000000..2b986b465cc7
--- /dev/null
+++ b/x11-libs/libfm/Manifest
@@ -0,0 +1,4 @@
+DIST libfm-0.1.17.tar.gz 874556 SHA256 1740681cff4cd4c5a2eaa9805d8898269cfb6a49a0bda0acb242def15bc7131b SHA512 83d62e78c68f5a212dc464774f4ac9a965f58741b9cc31bf6599c7304e0fde668edd99e33a2f9d19d2c342483d92ed36031c388c92c858c55217e47b5c8ba044 WHIRLPOOL c55471431e4130cf96412cf4943e993954139c319dd5434f1d718d9c0609a12bde3dbb8e43b889bb4cefd300e5073b59b4b8fe6eeb732d87d52d8a9d536733b4
+DIST libfm-1.1.4.tar.xz 699080 SHA256 8512c22b89d11e9c0f6044feeb72a96ac542116012c29cc8dbc287476223ee60 SHA512 66d586703a47e537a4f0b3c077facdc22df5226bc4f6462d4f01c1f95af00ccc6d39f49b08a92976b4f53cc42aef282bb16044c29049f0a415ac9f46426ec94c WHIRLPOOL ec9176418be358ba2f9706e41b8eab6496cb9ccea4c431b1f7aad0d64ff1c97249c4da5b6acacf58956cb54b22920bdc659d1ff462bfdb17ec438cdc4957b644
+DIST libfm-1.2.2.1.tar.xz 894092 SHA256 dbb0a3f7fd9615cccf4ad8ed1a07591535712d00eede03e5bd564090b33a4329 SHA512 fcbd89748c033a7d237462081cac5d1c2d7c11167f06674f766ef7f74590e7f35e5828c5a5056c31d30b4d50aedf5cb0dd1c2811d8d7b9a432af2e51a6d545d1 WHIRLPOOL 2bf2f7a717d11537bd0c5e477c73ed010cf4ae3e6dc8e4317db62a8a55f356026d87dda801512c4af6605258fb4b7509e5f2dbe3de7105af97fea33e18a7d20c
+DIST libfm-1.2.3.tar.xz 898256 SHA256 c692f1624a4cbc8d1dd55f3b3f3369fbf5d26f63a916e2c295230b2344e1fbf9 SHA512 f4c214daffc47f05ba31c65203ab0542a03f5a246ea4bb62b6b365ac3fa120a1a51e37b00f8a43afe56875eb69f9be327ac724dafb6fc2de13aa77deea23f443 WHIRLPOOL ae5354c5ef5154ebce8a9124b47e0a645171d50d4034fd1e6000ff084acc15261398029c58b067b9027d4ba68d36d8addf91a28678c91a3fbd9ce0806e9b6046
diff --git a/x11-libs/libfm/files/libfm-0.1.17-ssp-fix.patch b/x11-libs/libfm/files/libfm-0.1.17-ssp-fix.patch
new file mode 100644
index 000000000000..25e500d53a0a
--- /dev/null
+++ b/x11-libs/libfm/files/libfm-0.1.17-ssp-fix.patch
@@ -0,0 +1,27 @@
+From 8972eaaef0bb43491b7578dd3e8c9f14455d1d6a Mon Sep 17 00:00:00 2001
+From: Richard Grenville <richardgv@users.sourceforge.net>
+Date: Wed, 9 May 2012 07:47:24 +0800
+Subject: [PATCH] Fix #3512666 - fm-archiver.c: Stack buffer overflow.
+
+---
+ src/base/fm-archiver.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/base/fm-archiver.c b/src/base/fm-archiver.c
+index 2852058..edbc62b 100644
+--- a/src/base/fm-archiver.c
++++ b/src/base/fm-archiver.c
+@@ -203,8 +203,8 @@ void _fm_archiver_init()
+ GKeyFile *kf = g_key_file_new();
+ if(g_key_file_load_from_file(kf, PACKAGE_DATA_DIR "/archivers.list", 0, NULL))
+ {
+- int n_archivers;
+- char** programs = g_key_file_get_groups(kf, &n_archivers);
++ gsize n_archivers;
++ gchar** programs = g_key_file_get_groups(kf, &n_archivers);
+ if(programs)
+ {
+ int i;
+--
+1.7.4.1
+
diff --git a/x11-libs/libfm/libfm-0.1.17-r1.ebuild b/x11-libs/libfm/libfm-0.1.17-r1.ebuild
new file mode 100644
index 000000000000..9942a2dbe6f1
--- /dev/null
+++ b/x11-libs/libfm/libfm-0.1.17-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
+
+inherit autotools eutils fdo-mime
+
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+
+KEYWORDS="~alpha amd64 arm ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="debug examples udev"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+ >=x11-libs/gtk+-2.16:2
+ udev? ( dev-libs/dbus-glib )
+ >=lxde-base/menu-cache-0.3.2"
+RDEPEND="${COMMON_DEPEND}
+ x11-misc/shared-mime-info
+ udev? ( sys-fs/udisks:0 )"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+src_prepare() {
+ sed -ie '/SUBDIRS=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+ sed -i -e '/^[[:space:]]*docs/d' -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+ configure.ac || die "sed failed"
+ #Remove -Werror for automake-1.12. Bug #421101
+ sed -i "s:-Werror::" configure.ac || die
+ # Bug 409939
+ epatch "${FILESDIR}"/${P}-ssp-fix.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ --sysconfdir="${EPREFIX}/etc" \
+ --disable-dependency-tracking \
+ --disable-static \
+ $(use_enable udev udisks) \
+ $(use_enable examples demo) \
+ $(use_enable debug) \
+ # Documentation fails to build at the moment
+ # $(use_enable doc gtk-doc) \
+ # $(use_enable doc gtk-doc-html) \
+ --with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/libfm-1.1.4.ebuild b/x11-libs/libfm/libfm-1.1.4.ebuild
new file mode 100644
index 000000000000..bc9cf0e7e7e2
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.1.4.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools fdo-mime vala
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+
+KEYWORDS="~alpha amd64 arm ~mips ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.7.1" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples udisks vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+ >=x11-libs/gtk+-2.16:2
+ >=lxde-base/menu-cache-0.3.2:="
+RDEPEND="${COMMON_DEPEND}
+ x11-misc/shared-mime-info
+ automount? (
+ udisks? ( || (
+ gnome-base/gvfs[udev,udisks]
+ gnome-base/gvfs[udev,gdu]
+ ) )
+ !udisks? ( gnome-base/gvfs[udev] )
+ )"
+DEPEND="${COMMON_DEPEND}
+ vala? ( $(vala_depend) )
+ doc? (
+ dev-util/gtk-doc
+ )
+ app-arch/xz-utils
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+REQUIRED_USE="udisks? ( automount )"
+
+src_prepare() {
+ if ! use doc; then
+ sed -ie '/SUBDIRS=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+ sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+ fi
+ sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+ configure.ac || die "sed failed"
+
+ #disable unused translations. Bug #356029
+ for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+ progress;do
+ echo "data/ui/"${trans}.ui >> po/POTFILES.in
+ done
+ #Remove -Werror for automake-1.12. Bug #421101
+ sed -i "s:-Werror::" configure.ac || die
+
+ # subslot sanity check
+ local sub_slot=${SLOT#*/}
+ local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+ if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+ eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+
+ eautoreconf
+ rm -r autom4te.cache || die
+ use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+ econf \
+ --sysconfdir="${EPREFIX}/etc" \
+ --disable-dependency-tracking \
+ --disable-static \
+ $(use_enable examples demo) \
+ $(use_enable debug) \
+ $(use_enable udisks) \
+ $(use_enable vala actions) \
+ $(use_enable doc gtk-doc) \
+ --with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+ # Sometimes a directory is created instead of a symlink. No idea why...
+ # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+ # symlink to it.
+ if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+ rm -r "${D}"/usr/include/${PN}
+ fi
+}
+
+pkg_preinst() {
+ # Resolve the symlink mess. Bug #439570
+ [[ -d "${ROOT}"/usr/include/${PN} ]] && \
+ rm -rf "${ROOT}"/usr/include/${PN}
+ if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+ cd "${D}"/usr/include
+ ln -s --force ${PN}-1.0 ${PN}
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/libfm-1.2.2.1.ebuild b/x11-libs/libfm/libfm-1.2.2.1.ebuild
new file mode 100644
index 000000000000..b445214cdadf
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.2.2.1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools fdo-mime vala
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+
+KEYWORDS="~alpha ~amd64 ~arm ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.2.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif udisks vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+ >=x11-libs/gtk+-2.16:2
+ >=lxde-base/menu-cache-0.3.2:="
+RDEPEND="${COMMON_DEPEND}
+ !lxde-base/lxshortcut
+ x11-misc/shared-mime-info
+ automount? (
+ udisks? ( || (
+ gnome-base/gvfs[udev,udisks]
+ gnome-base/gvfs[udev,gdu]
+ ) )
+ !udisks? ( gnome-base/gvfs[udev] )
+ )
+ exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+ vala? ( $(vala_depend) )
+ doc? (
+ dev-util/gtk-doc
+ )
+ app-arch/xz-utils
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+REQUIRED_USE="udisks? ( automount )"
+
+src_prepare() {
+ if ! use doc; then
+ sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+ sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+ fi
+ sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+ configure.ac || die "sed failed"
+
+ #disable unused translations. Bug #356029
+ for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+ progress;do
+ echo "data/ui/"${trans}.ui >> po/POTFILES.in
+ done
+ #Remove -Werror for automake-1.12. Bug #421101
+ sed -i "s:-Werror::" configure.ac || die
+
+ # subslot sanity check
+ local sub_slot=${SLOT#*/}
+ local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+ if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+ eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+
+ eautoreconf
+ rm -r autom4te.cache || die
+ use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+ econf \
+ --sysconfdir="${EPREFIX}/etc" \
+ --disable-dependency-tracking \
+ --disable-static \
+ $(use_enable examples demo) \
+ $(use_enable exif) \
+ $(use_enable debug) \
+ $(use_enable udisks) \
+ $(use_enable vala actions) \
+ $(use_enable doc gtk-doc) \
+ --with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+ # Sometimes a directory is created instead of a symlink. No idea why...
+ # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+ # symlink to it.
+ if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+ rm -r "${D}"/usr/include/${PN}
+ fi
+}
+
+pkg_preinst() {
+ # Resolve the symlink mess. Bug #439570
+ [[ -d "${ROOT}"/usr/include/${PN} ]] && \
+ rm -rf "${ROOT}"/usr/include/${PN}
+ if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+ cd "${D}"/usr/include
+ ln -s --force ${PN}-1.0 ${PN}
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/libfm-1.2.3-r1.ebuild b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
new file mode 100644
index 000000000000..853c470c4f9c
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.2.3-r1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools fdo-mime multilib vala
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc ~x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+ gtk? ( >=x11-libs/gtk+-2.16:2 )
+ >=lxde-base/menu-cache-0.3.2:=
+ ~x11-libs/libfm-extra-${PV}"
+RDEPEND="${COMMON_DEPEND}
+ !lxde-base/lxshortcut
+ x11-misc/shared-mime-info
+ automount? (
+ udisks? ( gnome-base/gvfs[udev,udisks] )
+ !udisks? ( gnome-base/gvfs[udev] )
+ )
+ exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+ vala? ( $(vala_depend) )
+ doc? (
+ dev-util/gtk-doc
+ )
+ app-arch/xz-utils
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+src_prepare() {
+ if ! use doc; then
+ sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+ sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+ fi
+ sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+ configure.ac || die "sed failed"
+
+ #disable unused translations. Bug #356029
+ for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+ progress;do
+ echo "data/ui/"${trans}.ui >> po/POTFILES.in
+ done
+ #Remove -Werror for automake-1.12. Bug #421101
+ sed -i "s:-Werror::" configure.ac || die
+
+ # subslot sanity check
+ local sub_slot=${SLOT#*/}
+ local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+ if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+ eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+
+ eautoreconf
+ rm -r autom4te.cache || die
+ use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+ econf \
+ --sysconfdir="${EPREFIX}/etc" \
+ --disable-dependency-tracking \
+ --disable-static \
+ $(use_enable examples demo) \
+ $(use_enable exif) \
+ $(use_enable debug) \
+ $(use_enable udisks) \
+ $(use_enable vala actions) \
+ $(use_with gtk) \
+ $(use_enable doc gtk-doc) \
+ --with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+ # Sometimes a directory is created instead of a symlink. No idea why...
+ # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+ # symlink to it.
+ if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+ rm -r "${D}"/usr/include/${PN}
+ fi
+ # Remove files installed by split-off libfm-extra package
+ rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
+ rm "${D}"/usr/$(get_libdir)/libfm-extra*
+ rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
+}
+
+pkg_preinst() {
+ # Resolve the symlink mess. Bug #439570
+ [[ -d "${ROOT}"/usr/include/${PN} ]] && \
+ rm -rf "${ROOT}"/usr/include/${PN}
+ if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+ cd "${D}"/usr/include
+ ln -s --force ${PN}-1.0 ${PN}
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/libfm-1.2.3.ebuild b/x11-libs/libfm/libfm-1.2.3.ebuild
new file mode 100644
index 000000000000..9d8fa18838c2
--- /dev/null
+++ b/x11-libs/libfm/libfm-1.2.3.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools fdo-mime vala
+
+MY_PV=${PV/_/}
+MY_P="${PN}-${MY_PV}"
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.xz"
+
+KEYWORDS="~alpha amd64 arm ~arm64 ~mips ppc x86 ~amd64-linux ~x86-linux"
+LICENSE="GPL-2"
+SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+ gtk? ( >=x11-libs/gtk+-2.16:2 )
+ >=lxde-base/menu-cache-0.3.2:="
+RDEPEND="${COMMON_DEPEND}
+ !lxde-base/lxshortcut
+ x11-misc/shared-mime-info
+ automount? (
+ udisks? ( gnome-base/gvfs[udev,udisks] )
+ !udisks? ( gnome-base/gvfs[udev] )
+ )
+ exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+ vala? ( $(vala_depend) )
+ doc? (
+ dev-util/gtk-doc
+ )
+ app-arch/xz-utils
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+S="${WORKDIR}"/${MY_P}
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+src_prepare() {
+ if ! use doc; then
+ sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+ sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+ fi
+ sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+ configure.ac || die "sed failed"
+
+ #disable unused translations. Bug #356029
+ for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+ progress;do
+ echo "data/ui/"${trans}.ui >> po/POTFILES.in
+ done
+ #Remove -Werror for automake-1.12. Bug #421101
+ sed -i "s:-Werror::" configure.ac || die
+
+ # subslot sanity check
+ local sub_slot=${SLOT#*/}
+ local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+ if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+ eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+
+ eautoreconf
+ rm -r autom4te.cache || die
+ use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+ econf \
+ --sysconfdir="${EPREFIX}/etc" \
+ --disable-dependency-tracking \
+ --disable-static \
+ $(use_enable examples demo) \
+ $(use_enable exif) \
+ $(use_enable debug) \
+ $(use_enable udisks) \
+ $(use_enable vala actions) \
+ $(use_with gtk) \
+ $(use_enable doc gtk-doc) \
+ --with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+ # Sometimes a directory is created instead of a symlink. No idea why...
+ # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+ # symlink to it.
+ if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+ rm -r "${D}"/usr/include/${PN}
+ fi
+}
+
+pkg_preinst() {
+ # Resolve the symlink mess. Bug #439570
+ [[ -d "${ROOT}"/usr/include/${PN} ]] && \
+ rm -rf "${ROOT}"/usr/include/${PN}
+ if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+ cd "${D}"/usr/include
+ ln -s --force ${PN}-1.0 ${PN}
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/libfm-9999.ebuild b/x11-libs/libfm/libfm-9999.ebuild
new file mode 100644
index 000000000000..29039c4eb2e4
--- /dev/null
+++ b/x11-libs/libfm/libfm-9999.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="https://github.com/lxde/${PN}"
+inherit autotools git-r3 fdo-mime vala
+
+DESCRIPTION="A library for file management"
+HOMEPAGE="http://pcmanfm.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0/4.3.0" #copy ABI_VERSION because it seems upstream change it randomly
+IUSE="+automount debug doc examples exif gtk udisks vala"
+KEYWORDS=""
+
+COMMON_DEPEND=">=dev-libs/glib-2.18:2
+ gtk? ( >=x11-libs/gtk+-2.16:2 )
+ >=lxde-base/menu-cache-0.3.2:=
+ x11-libs/libfm-extra"
+RDEPEND="${COMMON_DEPEND}
+ !lxde-base/lxshortcut
+ x11-misc/shared-mime-info
+ automount? (
+ udisks? ( gnome-base/gvfs[udev,udisks] )
+ !udisks? ( gnome-base/gvfs[udev] )
+ )
+ exif? ( media-libs/libexif )"
+DEPEND="${COMMON_DEPEND}
+ vala? ( $(vala_depend) )
+ doc? (
+ dev-util/gtk-doc
+ )
+ >=dev-util/intltool-0.40
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+DOCS=( AUTHORS TODO )
+
+REQUIRED_USE="udisks? ( automount ) doc? ( gtk )"
+
+src_prepare() {
+ if ! use doc; then
+ sed -ie '/^SUBDIR.*=/s#docs##' "${S}"/Makefile.am || die "sed failed"
+ sed -ie '/^[[:space:]]*docs/d' configure.ac || die "sed failed"
+ else
+ gtkdocize --copy || die
+ fi
+ sed -i -e "s:-O0::" -e "/-DG_ENABLE_DEBUG/s: -g::" \
+ configure.ac || die "sed failed"
+
+ intltoolize --force --copy --automake || die
+ #disable unused translations. Bug #356029
+ for trans in app-chooser ask-rename exec-file file-prop preferred-apps \
+ progress;do
+ echo "data/ui/"${trans}.ui >> po/POTFILES.in
+ done
+ #Remove -Werror for automake-1.12. Bug #421101
+ sed -i "s:-Werror::" configure.ac || die
+
+ # subslot sanity check
+ local sub_slot=${SLOT#*/}
+ local libfm_major_abi=$(sed -rne '/ABI_VERSION/s:.*=::p' src/Makefile.am | tr ':' '.')
+
+ if [[ ${sub_slot} != ${libfm_major_abi} ]]; then
+ eerror "Ebuild sub-slot (${sub_slot}) does not match ABI_VERSION(${libfm_major_abi})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${libfm_major_abi}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+
+ eautoreconf
+ rm -r autom4te.cache || die
+ use vala && export VALAC="$(type -p valac-$(vala_best_api_version))"
+}
+
+src_configure() {
+ econf \
+ --sysconfdir="${EPREFIX}/etc" \
+ --disable-dependency-tracking \
+ --disable-static \
+ $(use_enable examples demo) \
+ $(use_enable exif) \
+ $(use_enable debug) \
+ $(use_enable udisks) \
+ $(use_enable vala actions) \
+ $(use_with gtk) \
+ $(use_enable doc gtk-doc) \
+ --with-html-dir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+ find "${D}" -name '*.la' -exec rm -f '{}' +
+ # Sometimes a directory is created instead of a symlink. No idea why...
+ # It is wrong anyway. We expect a libfm-1.0 directory and then a libfm
+ # symlink to it.
+ if [[ -h ${D}/usr/include/${PN} || -d ${D}/usr/include/${PN} ]]; then
+ rm -r "${D}"/usr/include/${PN}
+ fi
+ # Remove files installed by split-off libfm-extra package
+ rm "${D}"/usr/include/libfm-1.0/fm-{extra,version,xml-file}.h
+ rm "${D}"/usr/$(get_libdir)/libfm-extra*
+ rm "${D}"/usr/$(get_libdir)/pkgconfig/libfm-extra.pc
+}
+
+pkg_preinst() {
+ # Resolve the symlink mess. Bug #439570
+ [[ -d "${ROOT}"/usr/include/${PN} ]] && \
+ rm -rf "${ROOT}"/usr/include/${PN}
+ if [[ -d "${D}"/usr/include/${PN}-1.0 ]]; then
+ cd "${D}"/usr/include
+ ln -s --force ${PN}-1.0 ${PN}
+ fi
+}
+
+pkg_postinst() {
+ fdo-mime_mime_database_update
+}
+
+pkg_postrm() {
+ fdo-mime_mime_database_update
+}
diff --git a/x11-libs/libfm/metadata.xml b/x11-libs/libfm/metadata.xml
new file mode 100644
index 000000000000..462a8c8ac570
--- /dev/null
+++ b/x11-libs/libfm/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>lxde</herd>
+ <maintainer>
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+ <herd>lxqt</herd>
+ <use>
+ <flag name='vala'>Support custom actions in menus</flag>
+ <flag name='udisks'>Use libfm's udisks-based volume monitor implementation instead of using the one from gvfs</flag>
+ <flag name='automount'>Use <pkg>gnome-base/gvfs</pkg> for automounting</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-libs/libfontenc/Manifest b/x11-libs/libfontenc/Manifest
new file mode 100644
index 000000000000..964856cfccff
--- /dev/null
+++ b/x11-libs/libfontenc/Manifest
@@ -0,0 +1,2 @@
+DIST libfontenc-1.1.2.tar.bz2 294884 SHA256 a9a4efed3359b2e80161bb66b65038fac145137fa134e71335264cbc23b02f62 SHA512 e0905592b7ef65acb8298b9807f90e68d18eddf3112c6232c1c774603c95ca7ec7f6db161e133dadc00d8791c5f76d4c3d65aa95544a1500c0767b88fdb52f45 WHIRLPOOL d32fff4607144ce67527244b3db4b69a303c5f6814f6dc98fd57d1aa36e35ae732af293bd78356762769ce3f55dd65d0082d2cd19d4492cae37212613f2edf49
+DIST libfontenc-1.1.3.tar.bz2 301494 SHA256 70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21 SHA512 7346079a6980464f57f5da0e96025bbf4b13fbb7ed976b58d9c54b78525d9d0b4174b4783326a12048971cf5d05221bafe2f41c6b02931743913719cde21740c WHIRLPOOL 7ed419bac70ad80f0e67dcd985994379ef7698ecd5dd0e932b9a1ba184aaca8e2a65ef7bb9982cfc15dbd53bcc10670849b8b9122d7a85389fd1a0e0041f8831
diff --git a/x11-libs/libfontenc/libfontenc-1.1.2.ebuild b/x11-libs/libfontenc/libfontenc-1.1.2.ebuild
new file mode 100644
index 000000000000..8407c15ca56e
--- /dev/null
+++ b/x11-libs/libfontenc/libfontenc-1.1.2.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 fontenc library"
+
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+ x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
+)
diff --git a/x11-libs/libfontenc/libfontenc-1.1.3.ebuild b/x11-libs/libfontenc/libfontenc-1.1.3.ebuild
new file mode 100644
index 000000000000..1d4239abd42b
--- /dev/null
+++ b/x11-libs/libfontenc/libfontenc-1.1.3.ebuild
@@ -0,0 +1,19 @@
+# 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 fontenc library"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+
+RDEPEND="sys-libs/zlib
+ x11-proto/xproto"
+DEPEND="${RDEPEND}"
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-encodingsdir="${EPREFIX}/usr/share/fonts/encodings"
+)
diff --git a/x11-libs/libfontenc/metadata.xml b/x11-libs/libfontenc/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libfontenc/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-libs/libgksu/Manifest b/x11-libs/libgksu/Manifest
new file mode 100644
index 000000000000..c16ea441da13
--- /dev/null
+++ b/x11-libs/libgksu/Manifest
@@ -0,0 +1 @@
+DIST libgksu-2.0.12.tar.gz 477903 SHA256 22f9cfc3627dcb6774b9aff66c6ea6554f3b34b82bbfa2467b821e67874c3faf SHA512 06935583787c2d63db5ee345efeabd46ce1b2f36ec5c94ba0219d7c27d0935ddbf9987c0368158e57486d541b4a8e75140da53a806061d465985452fd1128573 WHIRLPOOL 429808802e740880c786c00f2abfaab564178c1da06be5023f1ee17aa766e10d61c3d3aad14affee834c928822a2b92cfac7e5fa2b326725497cdaa1334fb55d
diff --git a/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch b/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch
new file mode 100644
index 000000000000..5c007be5b4b4
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.0-fbsd.patch
@@ -0,0 +1,60 @@
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/libgksu.c libgksu-2.0.0/libgksu/libgksu.c
+--- libgksu-2.0.0.orig/libgksu/libgksu.c 2006-09-14 22:35:51.000000000 -0400
++++ libgksu-2.0.0/libgksu/libgksu.c 2006-12-12 11:28:01.000000000 -0500
+@@ -23,7 +23,12 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <fcntl.h>
++#ifdef __FreeBSD__
++#include <libutil.h>
++#include <termios.h>
++#else
+ #include <pty.h>
++#endif
+ #include <pwd.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.am libgksu-2.0.0/libgksu/Makefile.am
+--- libgksu-2.0.0.orig/libgksu/Makefile.am 2006-09-14 22:35:52.000000000 -0400
++++ libgksu-2.0.0/libgksu/Makefile.am 2006-12-12 11:28:01.000000000 -0500
+@@ -30,6 +30,6 @@ gksu_run_helper_SOURCES = gksu-run-helpe
+ noinst_PROGRAMS = test-gksu
+ test_gksu_SOURCES = test-gksu.c
+ test_gksu_LDADD = libgksu2.la
+-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
+
+ EXTRA_DIST = libgksu.ver
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksu/Makefile.in libgksu-2.0.0/libgksu/Makefile.in
+--- libgksu-2.0.0.orig/libgksu/Makefile.in 2006-09-23 15:37:44.000000000 -0400
++++ libgksu-2.0.0/libgksu/Makefile.in 2006-12-12 11:30:09.000000000 -0500
+@@ -283,7 +283,7 @@ gksu_run_helper_LDFLAGS = `pkg-config --
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+ test_gksu_SOURCES = test-gksu.c
+ test_gksu_LDADD = libgksu2.la
+-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
++test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
+ EXTRA_DIST = libgksu.ver
+ all: all-am
+
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.am libgksu-2.0.0/libgksuui/Makefile.am
+--- libgksu-2.0.0.orig/libgksuui/Makefile.am 2006-09-14 22:35:31.000000000 -0400
++++ libgksu-2.0.0/libgksuui/Makefile.am 2006-12-12 11:28:01.000000000 -0500
+@@ -12,4 +12,4 @@ includedir = ${prefix}/include/$(PACKAGE
+ noinst_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = libgksuui1.0.la
+-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
+diff --exclude-from=/home/dang/.diffrc -up -ruN libgksu-2.0.0.orig/libgksuui/Makefile.in libgksu-2.0.0/libgksuui/Makefile.in
+--- libgksu-2.0.0.orig/libgksuui/Makefile.in 2006-09-23 15:37:44.000000000 -0400
++++ libgksu-2.0.0/libgksuui/Makefile.in 2006-12-12 11:30:22.000000000 -0500
+@@ -250,7 +250,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
+ noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = libgksuui1.0.la
+-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
++test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
+ all: all-am
+
+ .SUFFIXES:
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch
new file mode 100644
index 000000000000..0f22166fb8b7
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-automake-1.11.2.patch
@@ -0,0 +1,25 @@
+Due to the following change, pkglib_PROGRAMS is invalid:
+ http://git.savannah.gnu.org/cgit/automake.git/commit/?id=9ca632642b006ac6b0fc4ce0ae5b34023faa8cbf
+
+https://savannah.nongnu.org/bugs/index.php?35241
+https://bugs.gentoo.org/show_bug.cgi?id=397411
+
+---
+ libgksu/Makefile.am | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libgksu/Makefile.am b/libgksu/Makefile.am
+index 49362f9..3cb1090 100644
+--- a/libgksu/Makefile.am
++++ b/libgksu/Makefile.am
+@@ -22,8 +22,8 @@ includedir = ${prefix}/include/${PACKAGE}
+ pkgconfigdir = ${libdir}/pkgconfig
+ pkgconfig_DATA = libgksu2.pc
+
+-pkglibdir = ${libdir}/${PACKAGE}
+-pkglib_PROGRAMS = gksu-run-helper
++gksulibdir = ${libdir}/${PACKAGE}
++gksulib_PROGRAMS = gksu-run-helper
+ gksu_run_helper_LDADD = ${GLIB_LIBS}
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch b/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch
new file mode 100644
index 000000000000..0a7c5f142893
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-fix-make-3.82.patch
@@ -0,0 +1,19 @@
+--- Makefile.am-orig 2010-08-22 16:11:19.872577459 -0500
++++ Makefile.am 2010-08-22 16:11:55.289599110 -0500
+@@ -17,11 +17,11 @@
+
+ if GCONF_SCHEMAS_INSTALL
+ install-data-local:
+- if test -z "$(DESTDIR)" ; then \
+- for p in $(schemas_DATA) ; do \
+- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
+- done \
+- fi
++ if test -z "$(DESTDIR)" ; then \
++ for p in $(schemas_DATA) ; do \
++ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p ; \
++ done \
++ fi
+ else
+ install-data-local:
+ endif
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch b/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch
new file mode 100644
index 000000000000..3787ef6bfc13
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-notests.patch
@@ -0,0 +1,26 @@
+Index: libgksu-2.0.12/libgksu/Makefile.am
+===================================================================
+--- libgksu-2.0.12.orig/libgksu/Makefile.am
++++ libgksu-2.0.12/libgksu/Makefile.am
+@@ -27,7 +27,7 @@ pkglib_PROGRAMS = gksu-run-helper
+ gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+
+-noinst_PROGRAMS = test-gksu
++EXTRA_PROGRAMS = test-gksu
+ test_gksu_SOURCES = test-gksu.c
+ test_gksu_LDADD = libgksu2.la
+ test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
+Index: libgksu-2.0.12/libgksuui/Makefile.am
+===================================================================
+--- libgksu-2.0.12.orig/libgksuui/Makefile.am
++++ libgksu-2.0.12/libgksuui/Makefile.am
+@@ -9,7 +9,7 @@ libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-c
+ noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ includedir = ${prefix}/include/$(PACKAGE)
+
+-noinst_PROGRAMS = test-gksuui
++EXTRA_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+ test_gksuui_LDADD = libgksuui1.0.la
+ test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
diff --git a/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch b/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch
new file mode 100644
index 000000000000..2c3a8cc786bb
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.12-revert-forkpty.patch
@@ -0,0 +1,359 @@
+diff --exclude-from=/home/dang/.scripts/diffrc -up -ruN libgksu-2.0.12.orig/libgksu/libgksu.c libgksu-2.0.12/libgksu/libgksu.c
+--- libgksu-2.0.12.orig/libgksu/libgksu.c 2009-06-29 13:48:24.000000000 -0400
++++ libgksu-2.0.12/libgksu/libgksu.c 2010-01-12 07:32:10.450657456 -0500
+@@ -1,7 +1,6 @@
+ /*
+ * Gksu -- a library providing access to su functionality
+ * Copyright (C) 2004-2009 Gustavo Noronha Silva
+- * Portions Copyright (C) 2009 VMware, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+@@ -56,9 +55,6 @@
+ static void
+ gksu_context_launch_complete (GksuContext *context);
+
+-static void
+-read_line (int fd, gchar *buffer, int n);
+-
+ GType
+ gksu_error_get_type (void)
+ {
+@@ -2009,8 +2005,6 @@ gksu_su_fuller (GksuContext *context,
+ for (i = 0 ; cmd[i] != NULL ; i++)
+ g_free (cmd[i]);
+ g_free(cmd);
+-
+- _exit(1);
+ }
+ else if (pid == -1)
+ {
+@@ -2125,10 +2119,10 @@ gksu_su_fuller (GksuContext *context,
+ /* drop the \n echoed on password entry if su did request
+ a password */
+ if (password_needed)
+- read_line (fdpty, buf, 255);
++ read (fdpty, buf, 255);
+ if (context->debug)
+ fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+- read_line (fdpty, buf, 255);
++ read (fdpty, buf, 255);
+ if (context->debug)
+ fprintf (stderr, "DEBUG (run:post-after-pass) buf: -%s-\n", buf);
+ }
+@@ -2142,9 +2136,7 @@ gksu_su_fuller (GksuContext *context,
+ {
+ int retval = 0;
+
+- /* Red Hat's su shows the full path to su in its error messages. */
+- if (!strncmp (buf, "su:", 3) ||
+- !strncmp (buf, "/bin/su:", 7))
++ if (!strncmp (buf, "su", 2))
+ {
+ gchar **strings;
+
+@@ -2155,11 +2147,7 @@ gksu_su_fuller (GksuContext *context,
+ }
+
+ strings = g_strsplit (buf, ":", 2);
+-
+- /* Red Hat and Fedora use 'incorrect password'. */
+- if (strings[1] &&
+- (g_str_has_prefix(strings[1], " Authentication failure") ||
+- g_str_has_prefix(strings[1], " incorrect password")))
++ if (strings[1] && !strncmp (strings[1], " Authentication failure", 23))
+ {
+ if (used_gnome_keyring)
+ g_set_error (error, gksu_quark,
+@@ -2473,12 +2461,6 @@ gksu_sudo_fuller (GksuContext *context,
+ {
+ char **cmd;
+ char buffer[256] = {0};
+- char *child_stderr = NULL;
+- /* This command is used to gain a token */
+- char *const verifycmd[] =
+- {
+- "/usr/bin/sudo", "-p", "GNOME_SUDO_PASS", "-v", NULL
+- };
+ int argcount = 8;
+ int i, j;
+
+@@ -2489,8 +2471,9 @@ gksu_sudo_fuller (GksuContext *context,
+
+ pid_t pid;
+ int status;
+- FILE *fdfile = NULL;
+- int fdpty = -1;
++ FILE *infile, *outfile;
++ int parent_pipe[2]; /* For talking to the parent */
++ int child_pipe[2]; /* For talking to the child */
+
+ context->sudo_mode = TRUE;
+
+@@ -2565,10 +2548,6 @@ gksu_sudo_fuller (GksuContext *context,
+ cmd[argcount] = g_strdup("-S");
+ argcount++;
+
+- /* Make sudo noninteractive (we should already have a token) */
+- cmd[argcount] = g_strdup("-n");
+- argcount++;
+-
+ /* Make sudo use next arg as prompt */
+ cmd[argcount] = g_strdup("-p");
+ argcount++;
+@@ -2647,21 +2626,26 @@ gksu_sudo_fuller (GksuContext *context,
+ fprintf (stderr, "cmd[%d]: %s\n", i, cmd[i]);
+ }
+
+- pid = forkpty(&fdpty, NULL, NULL, NULL);
+- if (pid == 0)
++ if ((pipe(parent_pipe)) == -1)
+ {
+- // Child
+- setsid(); // make us session leader
+-
+- execv(verifycmd[0], verifycmd);
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error creating pipe: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
+
+- g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
+- _("Failed to exec new process: %s"),
++ if ((pipe(child_pipe)) == -1)
++ {
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error creating pipe: %s"),
+ strerror(errno));
+ sudo_reset_xauth (context, xauth, xauth_env);
+ return FALSE;
+ }
+- else if (pid == -1)
++
++ pid = fork();
++ if (pid == -1)
+ {
+ g_set_error (error, gksu_quark, GKSU_ERROR_FORK,
+ _("Failed to fork new process: %s"),
+@@ -2669,26 +2653,56 @@ gksu_sudo_fuller (GksuContext *context,
+ sudo_reset_xauth (context, xauth, xauth_env);
+ return FALSE;
+ }
++ else if (pid == 0)
++ {
++ // Child
++ setsid(); // make us session leader
++ close(child_pipe[1]);
++ dup2(child_pipe[0], STDIN_FILENO);
++ dup2(parent_pipe[1], STDERR_FILENO);
+
++ execv(cmd[0], cmd);
++
++ g_set_error (error, gksu_quark, GKSU_ERROR_EXEC,
++ _("Failed to exec new process: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
+ else
+ {
+ gint counter = 0;
+ gchar *cmdline = NULL;
+- struct termios tio;
+
+ // Parent
+- fdfile = fdopen(fdpty, "w+");
++ close(parent_pipe[1]);
+
+- /* make sure we notice that ECHO is turned off, if it gets
+- turned off */
+- tcgetattr (fdpty, &tio);
+- for (counter = 0; (tio.c_lflag & ECHO) && counter < 15; counter++)
+- {
+- usleep (1000);
+- tcgetattr (fdpty, &tio);
+- }
++ infile = fdopen(parent_pipe[0], "r");
++ if (!infile)
++ {
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error opening pipe: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
+
+- fcntl (fdpty, F_SETFL, O_NONBLOCK);
++ outfile = fdopen(child_pipe[1], "w");
++ if (!outfile)
++ {
++ g_set_error (error, gksu_quark, GKSU_ERROR_PIPE,
++ _("Error opening pipe: %s"),
++ strerror(errno));
++ sudo_reset_xauth (context, xauth, xauth_env);
++ return FALSE;
++ }
++
++ /*
++ we are expecting to receive a GNOME_SUDO_PASS
++ if we don't there are two possibilities: an error
++ or a password is not needed
++ */
++ fcntl (parent_pipe[0], F_SETFL, O_NONBLOCK);
+
+ { /* no matter if we can read, since we're using
+ O_NONBLOCK; this is just to avoid the prompt
+@@ -2697,11 +2711,11 @@ gksu_sudo_fuller (GksuContext *context,
+ struct timeval tv;
+
+ FD_ZERO(&rfds);
+- FD_SET(fdpty, &rfds);
++ FD_SET(parent_pipe[0], &rfds);
+ tv.tv_sec = 1;
+ tv.tv_usec = 0;
+
+- select (fdpty + 1, &rfds, NULL, NULL, &tv);
++ select (parent_pipe[0] + 1, &rfds, NULL, NULL, &tv);
+ }
+
+ /* Try hard to find the prompt; it may happen that we're
+@@ -2713,7 +2727,7 @@ gksu_sudo_fuller (GksuContext *context,
+ if (strncmp (buffer, "GNOME_SUDO_PASS", 15) == 0)
+ break;
+
+- read_line (fdpty, buffer, 256);
++ read_line (parent_pipe[0], buffer, 256);
+
+ if (context->debug)
+ fprintf (stderr, "buffer: -%s-\n", buffer);
+@@ -2747,17 +2761,18 @@ gksu_sudo_fuller (GksuContext *context,
+
+ usleep (1000);
+
+- write (fdpty, password, strlen(password) + 1);
+- write (fdpty, "\n", 1);
++ fprintf (outfile, "%s\n", password);
++ fclose (outfile);
+
+ nullify_password (password);
+
+- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++ /* turn NONBLOCK off */
++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+ /* ignore the first newline that comes right after sudo receives
+ the password */
+- fgets (buffer, 255, fdfile);
+- /* this is the status we are interested in */
+- fgets (buffer, 255, fdfile);
++ fgets (buffer, 255, infile);
++ /* this is the status we are interessted in */
++ fgets (buffer, 255, infile);
+ }
+ else
+ {
+@@ -2766,7 +2781,7 @@ gksu_sudo_fuller (GksuContext *context,
+ fprintf (stderr, "No password prompt found; we'll assume we don't need a password.\n");
+
+ /* turn NONBLOCK off, also if have no prompt */
+- fcntl(fdpty, F_SETFL, fcntl(fdpty, F_GETFL) & ~O_NONBLOCK);
++ fcntl(parent_pipe[0], F_SETFL, fcntl(parent_pipe[0], F_GETFL) & ~O_NONBLOCK);
+
+ should_display = gconf_client_get_bool (context->gconf_client,
+ BASE_PATH "display-no-pass-info", NULL);
+@@ -2785,9 +2800,14 @@ gksu_sudo_fuller (GksuContext *context,
+ fprintf (stderr, "%s", buffer);
+ }
+
+- if (g_str_has_prefix (buffer, "Sorry, try again."))
++ if (!strcmp (buffer, "Sorry, try again.\n"))
+ g_set_error (error, gksu_quark, GKSU_ERROR_WRONGPASS,
+ _("Wrong password."));
++ else if (!strncmp (buffer, "Sorry, user ", 12))
++ g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
++ _("The underlying authorization mechanism (sudo) "
++ "does not allow you to run this program. Contact "
++ "the system administrator."));
+ else
+ {
+ gchar *haystack = buffer;
+@@ -2805,10 +2825,6 @@ gksu_sudo_fuller (GksuContext *context,
+ }
+ }
+
+- /* If we have an error, let's just stop sudo right there. */
+- if (error)
+- close(fdpty);
+-
+ cmdline = g_strdup("sudo");
+ /* wait for the child process to end or become something other
+ than sudo */
+@@ -2825,23 +2841,17 @@ gksu_sudo_fuller (GksuContext *context,
+ if (context->sn_context)
+ gksu_context_launch_complete (context);
+
++ while (read (parent_pipe[0], buffer, 255) > 0)
++ {
++ fprintf (stderr, "%s", buffer);
++ bzero(buffer, 256);
++ }
++
+ /* if the process is still active waitpid() on it */
+ if (pid_exited != pid)
+ waitpid(pid, &status, 0);
+ sudo_reset_xauth (context, xauth, xauth_env);
+
+- /*
+- * Did token acquisition succeed? If so, spawn sudo in
+- * non-interactive mode. It should either succeed or die
+- * immediately if you're not allowed to run the command.
+- */
+- if (WEXITSTATUS(status) == 0)
+- {
+- g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
+- NULL, &child_stderr, &status,
+- error);
+- }
+-
+ if (exit_status)
+ {
+ if (WIFEXITED(status)) {
+@@ -2853,13 +2863,6 @@ gksu_sudo_fuller (GksuContext *context,
+
+ if (WEXITSTATUS(status))
+ {
+- if (g_str_has_prefix(child_stderr, "Sorry, user "))
+- {
+- g_set_error (error, gksu_quark, GKSU_ERROR_NOT_ALLOWED,
+- _("The underlying authorization mechanism (sudo) "
+- "does not allow you to run this program. Contact "
+- "the system administrator."));
+- }
+ if(cmdline)
+ {
+ /* sudo already exec()ed something else, don't report
+@@ -2868,7 +2871,6 @@ gksu_sudo_fuller (GksuContext *context,
+ if (!g_str_has_suffix (cmdline, "sudo"))
+ {
+ g_free (cmdline);
+- g_free (child_stderr);
+ return FALSE;
+ }
+ g_free (cmdline);
+@@ -2881,11 +2883,11 @@ gksu_sudo_fuller (GksuContext *context,
+ }
+ }
+
+- fprintf(stderr, child_stderr);
+- g_free(child_stderr);
+-
+ /* if error is set we have found an error condition */
+- return (error == NULL);
++ if (error)
++ return FALSE;
++
++ return TRUE;
+ }
+
+ /**
diff --git a/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch b/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch
new file mode 100644
index 000000000000..b9fb77f27147
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.7-libs.patch
@@ -0,0 +1,76 @@
+# https://savannah.nongnu.org/bugs/?25362
+# https://bugs.gentoo.org/show_bug.cgi?id=226837
+diff -Nura a/configure.ac b/configure.ac
+--- a/configure.ac 2009-01-19 22:15:30.000000000 +0100
++++ b/configure.ac 2009-01-19 22:18:10.000000000 +0100
+@@ -43,6 +43,9 @@
+ PKG_CHECK_MODULES(LIBGKSU, [gtk+-2.0 >= 2.4.0, gconf-2.0, libstartup-notification-1.0, gnome-keyring-1, libgtop-2.0])
+ PKG_CHECK_MODULES(GKSU_PROPERTIES, [gtk+-2.0 >= 2.4.0, gconf-2.0, libglade-2.0])
+
++PKG_CHECK_MODULES(GLIB, [glib-2.0 gthread-2.0])
++PKG_CHECK_MODULES(GTK, [gtk+-2.0 gconf-2.0])
++
+ # Checks for library functions.
+ ALL_LINGUAS="ca cs da de es eu fr hu it ko lt pl pt_BR ro ru sk sv nb nl zh_CN"
+
+diff -Nura a/gksu-properties/Makefile.am b/gksu-properties/Makefile.am
+--- a/gksu-properties/Makefile.am 2009-01-19 22:15:59.000000000 +0100
++++ b/gksu-properties/Makefile.am 2009-01-19 22:19:13.000000000 +0100
+@@ -3,7 +3,7 @@
+ AM_CPPFLAGS = -DLOCALEDIR=\"$(datadir)/locale\" -DDATA_DIR=\"$(datadir)\" -DPREFIX=\"$(prefix)\"
+
+ bin_PROGRAMS = gksu-properties
+-gksu_properties_LDFLAGS = ${GKSU_PROPERTIES_LIBS}
++gksu_properties_LDADD = ${GKSU_PROPERTIES_LIBS}
+ gksu_properties_SOURCES = gksu-properties.c
+
+ gladedir = ${prefix}/share/${PACKAGE}
+diff -Nura a/libgksu/Makefile.am b/libgksu/Makefile.am
+--- a/libgksu/Makefile.am 2009-01-19 22:15:59.000000000 +0100
++++ b/libgksu/Makefile.am 2009-01-19 22:18:25.000000000 +0100
+@@ -8,8 +8,8 @@
+ # major -> breaks backward compatibility (changes to existing ABI)
+ # minor -> keeps compatibility (additions to the API)
+ # micro -> no change to the API/ABI
+-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
+-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
++libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
++libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1
+ if USE_VERSION_SCRIPT
+ libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
+ endif
+@@ -24,12 +24,11 @@
+
+ pkglibdir = ${libdir}/${PACKAGE}
+ pkglib_PROGRAMS = gksu-run-helper
+-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
++gksu_run_helper_LDADD = ${GLIB_LIBS}
+ gksu_run_helper_SOURCES = gksu-run-helper.c
+
+ noinst_PROGRAMS = test-gksu
+ test_gksu_SOURCES = test-gksu.c
+-test_gksu_LDADD = libgksu2.la
+-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
++test_gksu_LDADD = libgksu2.la ${GLIB_LIBS}
+
+ EXTRA_DIST = libgksu.ver
+diff -Nura a/libgksuui/Makefile.am b/libgksuui/Makefile.am
+--- a/libgksuui/Makefile.am 2009-01-19 22:15:59.000000000 +0100
++++ b/libgksuui/Makefile.am 2009-01-19 22:18:54.000000000 +0100
+@@ -4,12 +4,13 @@
+
+ noinst_LTLIBRARIES = libgksuui1.0.la
+ libgksuui1_0_la_SOURCES = gksuui-dialog.c
+-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
++libgksuui1_0_la_LDFLAGS = -Wl,-O1
++libgksuui1_0_la_LIBADD = ${GTK_LIBS}
+
+ noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
+ includedir = ${prefix}/include/$(PACKAGE)
+
+ noinst_PROGRAMS = test-gksuui
+ test_gksuui_SOURCES = test-gksuui.c
+-test_gksuui_LDADD = libgksuui1.0.la
+-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 gthread-2.0`
++test_gksuui_LDADD = libgksuui1.0.la ${GLIB_LIBS}
++
diff --git a/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch b/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch
new file mode 100644
index 000000000000..e423af16b44c
--- /dev/null
+++ b/x11-libs/libgksu/files/libgksu-2.0.7-polinguas.patch
@@ -0,0 +1,40 @@
+# https://savannah.nongnu.org/bugs/?25360
+diff -Nura a/configure.ac b/configure.ac
+--- a/configure.ac 2009-01-19 21:50:57.000000000 +0100
++++ b/configure.ac 2009-01-19 21:53:21.000000000 +0100
+@@ -50,7 +50,7 @@
+ GETTEXT_PACKAGE=AC_PACKAGE_NAME
+ AC_SUBST(GETTEXT_PACKAGE)
+
+-IT_PROG_INTLTOOL
++IT_PROG_INTLTOOL([0.35.5])
+ AM_GLIB_GNU_GETTEXT
+
+ ##################################################
+diff -Nura a/po/LINGUAS b/po/LINGUAS
+--- a/po/LINGUAS 1970-01-01 01:00:00.000000000 +0100
++++ b/po/LINGUAS 2009-01-19 21:54:24.000000000 +0100
+@@ -0,0 +1,23 @@
++# please keep this list sorted alphabetically
++# http://live.gnome.org/GnomeGoals/PoLinguas
++#
++ca
++cs
++da
++de
++es
++eu
++fr
++hu
++it
++ko
++lt
++pl
++pt_BR
++ro
++ru
++sk
++sv
++nb
++nl
++zh_CN
diff --git a/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild b/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild
new file mode 100644
index 000000000000..8e3571c68fed
--- /dev/null
+++ b/x11-libs/libgksu/libgksu-2.0.12-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="A library for integration of su into applications"
+HOMEPAGE="http://www.nongnu.org/gksu/"
+SRC_URI="http://people.debian.org/~kov/gksu/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="2"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
+IUSE="nls static-libs"
+
+COMMON_DEPEND="
+ >=x11-libs/gtk+-2.12:2
+ >=gnome-base/gconf-2
+ gnome-base/libgnome-keyring
+ x11-libs/startup-notification
+ >=gnome-base/libgtop-2:2=
+ nls? ( >=sys-devel/gettext-0.14.1 )
+"
+DEPEND="${COMMON_DEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.35.5
+ virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+ app-admin/sudo
+"
+
+src_prepare() {
+ # Fix compilation on bsd
+ epatch "${FILESDIR}"/${PN}-2.0.0-fbsd.patch
+
+ # Fix wrong usage of LDFLAGS, bug #226837
+ epatch "${FILESDIR}/${PN}-2.0.7-libs.patch"
+
+ # Use po/LINGUAS
+ epatch "${FILESDIR}/${PN}-2.0.7-polinguas.patch"
+
+ # Don't forkpty; bug #298289
+ epatch "${FILESDIR}/${P}-revert-forkpty.patch"
+
+ # Make this gmake-3.82 compliant, bug #333961
+ epatch "${FILESDIR}/${P}-fix-make-3.82.patch"
+
+ # Do not build test programs that are never executed; also fixes bug
+ # #367397 (underlinking issues).
+ epatch "${FILESDIR}/${P}-notests.patch"
+
+ # Fix automake-1.11.2 compatibility, bug #397411
+ epatch "${FILESDIR}/${P}-automake-1.11.2.patch"
+
+ sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die #467026
+
+ eautoreconf
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ $(use_enable nls) \
+ $(use_enable static-libs static)
+}
diff --git a/x11-libs/libgksu/metadata.xml b/x11-libs/libgksu/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/x11-libs/libgksu/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>gnome</herd>
+</pkgmetadata>
diff --git a/x11-libs/libgxim/Manifest b/x11-libs/libgxim/Manifest
new file mode 100644
index 000000000000..17c4694779ed
--- /dev/null
+++ b/x11-libs/libgxim/Manifest
@@ -0,0 +1 @@
+DIST libgxim-0.5.0.tar.bz2 469547 SHA256 75e20d1744139644f9951b78ea3910b162d3380302315cb4b3d0640f23694c79 SHA512 ca143e16e8ddd8e3cea01cc0857cb0e665f9cf397462e2fd9ed714b825eaa06056dae4115aacd117f8113e815f11184d9dd9f239259a1eee691d0b120db580f7 WHIRLPOOL 28ff037a1a671bc275ac3a81357dae6b8eba666831a05534b23d6f42678ba938166c336c0d0c0b58dbacb1d246c18ff62c617b9eb043a554ceece956b035c5a7
diff --git a/x11-libs/libgxim/libgxim-0.5.0.ebuild b/x11-libs/libgxim/libgxim-0.5.0.ebuild
new file mode 100644
index 000000000000..7c53f14e5cfd
--- /dev/null
+++ b/x11-libs/libgxim/libgxim-0.5.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+DESCRIPTION="GObject-based XIM protocol library"
+HOMEPAGE="http://tagoh.bitbucket.org/libgxim/"
+SRC_URI="https://bitbucket.org/tagoh/libgxim/downloads/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/check-0.9.4
+ >=dev-libs/dbus-glib-0.74
+ >=dev-libs/glib-2.32
+ >=sys-apps/dbus-0.23
+ >=x11-libs/gtk+-2.2:2"
+DEPEND="${RDEPEND}
+ dev-lang/ruby
+ virtual/pkgconfig
+ doc? ( >=dev-util/gtk-doc-1.8 )"
+
+src_configure() {
+ econf $(use_enable static-libs static) || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+
+ dodoc AUTHORS ChangeLog NEWS README || die
+}
diff --git a/x11-libs/libgxim/metadata.xml b/x11-libs/libgxim/metadata.xml
new file mode 100644
index 000000000000..e51c9824330f
--- /dev/null
+++ b/x11-libs/libgxim/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>cjk</herd>
+ <upstream>
+ <remote-id type="google-code">libgxim</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libiterm-mbt/Manifest b/x11-libs/libiterm-mbt/Manifest
new file mode 100644
index 000000000000..d95d1a74bafc
--- /dev/null
+++ b/x11-libs/libiterm-mbt/Manifest
@@ -0,0 +1 @@
+DIST iterm-0.5-mbt.tar.gz 624262 SHA256 5dd6ba029814d98fef9e6bfc74ce0f2b1224176c6b84576a193f4eb57294c36b SHA512 7209e851bbde1bdf80004a70b47c62b2bc6c078b650713677972d2109e56bb73e79dd612ee90dc09efc6380244d8131a0b7b01d657466826d103ffd4f364e5ae WHIRLPOOL 6389e12f2b9451245de26eddda7df1e028be5bafff9844637332577a5104ef97c5221d3b98cdf378aff259bedbaafbc4d5f989ead247c1de04f11fae09f5d24b
diff --git a/x11-libs/libiterm-mbt/libiterm-mbt-0.5.ebuild b/x11-libs/libiterm-mbt/libiterm-mbt-0.5.ebuild
new file mode 100644
index 000000000000..0a47f6823579
--- /dev/null
+++ b/x11-libs/libiterm-mbt/libiterm-mbt-0.5.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Hacked version of libiterm -- Internationalized Terminal Emulator Library"
+HOMEPAGE="http://www.doc.ic.ac.uk/~mbt99/Y/
+ http://www-124.ibm.com/linux/projects/iterm/"
+SRC_URI="http://www.doc.ic.ac.uk/~mbt99/Y/src/iterm-${PV}-mbt.tar.gz"
+LICENSE="CPL-1.0"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+IUSE=""
+
+S=${WORKDIR}/iterm-${PV}-mbt/lib/
+
+src_compile() {
+ econf || die
+ emake || die
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc README INSTALL
+}
diff --git a/x11-libs/libiterm-mbt/metadata.xml b/x11-libs/libiterm-mbt/metadata.xml
new file mode 100644
index 000000000000..75ea3d5af77b
--- /dev/null
+++ b/x11-libs/libiterm-mbt/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>cjk</herd>
+<longdescription>
+ Hacked version of the libiterm library.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/libkscreen/Manifest b/x11-libs/libkscreen/Manifest
new file mode 100644
index 000000000000..f940a394f826
--- /dev/null
+++ b/x11-libs/libkscreen/Manifest
@@ -0,0 +1 @@
+DIST libkscreen-1.0.5.tar.xz 36384 SHA256 ee6cfb92c41fe78c43ee6d509039d598d9f98582f9aa67aeac5b2760b3b2e904 SHA512 c48749d54fa2e63e63693de0bae94b884ae0465faa1084fe88372cd3f73905ce6efce3b5a64d2a9f301125e190752e88db899363a402ef4a031052080371a9c2 WHIRLPOOL b22fc19bbee367448882fe036b02400b7e0fc497668339b39cc86e8fd1e7650dcc32fa843f05ed4591e2bef3ca8e5b9e09d58e3ed02537353914591d661b6b35
diff --git a/x11-libs/libkscreen/libkscreen-1.0.5.ebuild b/x11-libs/libkscreen/libkscreen-1.0.5.ebuild
new file mode 100644
index 000000000000..23319bf62297
--- /dev/null
+++ b/x11-libs/libkscreen/libkscreen-1.0.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+VIRTUALX_REQUIRED="test"
+inherit kde4-base
+
+DESCRIPTION="KDE screen management library"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkscreen"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="4"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+IUSE="debug"
+
+RDEPEND="
+ >=dev-libs/qjson-0.8
+ x11-libs/libX11
+ x11-libs/libxcb
+ x11-libs/libXrandr
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-qt/qttest:4 )
+"
diff --git a/x11-libs/libkscreen/metadata.xml b/x11-libs/libkscreen/metadata.xml
new file mode 100644
index 000000000000..a23f444b67d6
--- /dev/null
+++ b/x11-libs/libkscreen/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>kde</herd>
+</pkgmetadata>
diff --git a/x11-libs/libmatchbox/Manifest b/x11-libs/libmatchbox/Manifest
new file mode 100644
index 000000000000..1257d031b3e1
--- /dev/null
+++ b/x11-libs/libmatchbox/Manifest
@@ -0,0 +1,2 @@
+DIST check-0.9.12.tar.gz 730404 SHA256 c7d47e55e133a0ca19a52e08a99333ac55cb22618b53719b7f4117a1875b1ea3 SHA512 698e6cfdf24b07340fb4fa77f49811053f8307d3baca8bdcdde5e3dfe1f910bbadb6a393f03020d8b18c22e7e164d40f6bbbeb9659908b0df8459e5c4850fa50 WHIRLPOOL 4994c444532e1337bcda5e632d532ffd6aae59de866009b5bce3d1f25988dd203d04136dd451b6d24c6e32775159772d1c98097ff618a5cc559fca9725ad18ed
+DIST libmatchbox-1.9.tar.bz2 316575 SHA256 db01e218e8d09540459c8f7c5698c159cd84c3d5b8caa9763bf0e5a35f6edf00 SHA512 1834a096f1627fd51ef17a0a49a32b6a1b9e4f5022d9409b7dcb531f409aa67c16c3c4d52ed2ca881193879f624d8efb15d1bd950b653ce1cf5823b9200c9964 WHIRLPOOL f2692f76573dbe0860d3ba89b6e792f4add758687d074db7f2c70ce8757a6483802b71831d02dee8aae9e8268977b3ea23e3fbc9aeec19148bdc4662d59aea62
diff --git a/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch
new file mode 100644
index 000000000000..6ba3c49243a0
--- /dev/null
+++ b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng14.patch
@@ -0,0 +1,13 @@
+http://projects.archlinux.org/svntogit/community.git/tree/libmatchbox/trunk/PKGBUILD?id=43f68b59fb790eb685d18a2f189c7e3055c77b30
+
+--- libmb/mbpixbuf.c
++++ libmb/mbpixbuf.c
+@@ -228,7 +228,7 @@
+ if ((fd = fopen( file, "rb" )) == NULL) return NULL;
+
+ fread( header, 1, 8, fd );
+- if ( ! png_check_sig( header, 8 ) )
++ if ( ! png_sig_cmp( header, 0, 8 ) == 0 )
+ {
+ fclose(fd);
+ return NULL;
diff --git a/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch
new file mode 100644
index 000000000000..25f68575032c
--- /dev/null
+++ b/x11-libs/libmatchbox/files/libmatchbox-1.9-libpng15.patch
@@ -0,0 +1,22 @@
+--- libmb/mbpixbuf.c
++++ libmb/mbpixbuf.c
+@@ -247,7 +247,7 @@
+ return NULL;
+ }
+
+- if ( setjmp( png_ptr->jmpbuf ) ) {
++ if ( setjmp( png_jmpbuf(png_ptr) ) ) {
+ png_destroy_read_struct( &png_ptr, &info_ptr, NULL);
+ fclose(fd);
+ return NULL;
+@@ -269,8 +269,8 @@
+ ( color_type == PNG_COLOR_TYPE_GRAY_ALPHA ))
+ png_set_gray_to_rgb(png_ptr);
+
+- if ( info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA
+- || info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA
++ if ( color_type == PNG_COLOR_TYPE_RGB_ALPHA
++ || color_type == PNG_COLOR_TYPE_GRAY_ALPHA
+ )
+ *has_alpha = 1;
+ else
diff --git a/x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch b/x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch
new file mode 100644
index 000000000000..f8b2feeea332
--- /dev/null
+++ b/x11-libs/libmatchbox/files/libmatchbox-1.9-underlinking.patch
@@ -0,0 +1,12 @@
+http://bugs.gentoo.org/367683
+
+--- tests/Makefile.am
++++ tests/Makefile.am
+@@ -19,6 +19,7 @@
+
+ noinst_PROGRAMS = dump-image
+ dump_image_SOURCES=dump-image.c
++dump_image_LDADD= @XLIBS_LIBS@
+
+ EXTRA_DIST = oh-overlayed.png oh.png oh-scaled.png overlay.png oh.jpg oh.xpm \
+ dot-desktop.c pixbuf.c oh.h
diff --git a/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild b/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
new file mode 100644
index 000000000000..b8b5e0dacb39
--- /dev/null
+++ b/x11-libs/libmatchbox/libmatchbox-1.9-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="The Matchbox Library"
+HOMEPAGE="http://matchbox-project.org/"
+SRC_URI="http://matchbox-project.org/sources/${PN}/${PV}/${P}.tar.bz2
+ mirror://sourceforge/check/check-0.9.12.tar.gz" # For check.m4
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~hppa ~mips ppc x86"
+IUSE="debug doc jpeg pango png static-libs test truetype X xsettings"
+
+RDEPEND="x11-libs/libXext:=
+ truetype? ( x11-libs/libXft:= )
+ pango? ( x11-libs/pango:= )
+ jpeg? ( virtual/jpeg:0 )
+ png? ( media-libs/libpng:0= )
+ xsettings? ( x11-libs/libxsettings-client )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )
+ test? ( dev-libs/check )"
+
+# Test suite broken, missing files and such.
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+pkg_setup() {
+ # Bug #138135
+ if use truetype && use pango; then
+ ewarn "You have both the truetype and pango USE flags set, pango"
+ ewarn "overrides and disables the XFT support truetype enables."
+ ewarn "If this isn't what you intended you should stop the build!"
+ fi
+}
+
+src_prepare() {
+ mv "${WORKDIR}"/check-*/check.m4 "${WORKDIR}"/ || die
+
+ epatch \
+ "${FILESDIR}"/${P}-libpng1{4,5}.patch \
+ "${FILESDIR}"/${P}-underlinking.patch
+
+ AT_M4DIR="${WORKDIR}" eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable debug) \
+ $(use_enable doc doxygen-docs) \
+ $(use_enable truetype xft) \
+ $(use_enable pango) \
+ $(use_enable jpeg) \
+ $(use_enable png) \
+ $(use_enable xsettings) \
+ $(use_with X x) \
+ $(use_enable test unit-tests)
+}
+
+src_install() {
+ default
+ use doc && dohtml doc/html/*
+
+ prune_libtool_files --all
+}
diff --git a/x11-libs/libmatchbox/metadata.xml b/x11-libs/libmatchbox/metadata.xml
new file mode 100644
index 000000000000..a7fef72f1e2f
--- /dev/null
+++ b/x11-libs/libmatchbox/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>gpe</herd>
+ <use>
+ <flag name="pango">Enable <pkg>x11-libs/pango</pkg> support</flag>
+ <flag name="xsettings">Enable the use of xsettings for settings
+ management</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">check</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libnotify/Manifest b/x11-libs/libnotify/Manifest
new file mode 100644
index 000000000000..2f6b157a9631
--- /dev/null
+++ b/x11-libs/libnotify/Manifest
@@ -0,0 +1 @@
+DIST libnotify-0.7.6.tar.xz 280388 SHA256 0ef61ca400d30e28217979bfa0e73a7406b19c32dd76150654ec5b2bdf47d837 SHA512 5d656ee7ee5caeb95aec4adb973795dc72fc620cd36b9fe3d4f910951945bd5df70ee1c422cd6aca9c38a9ba2760562e479fc8fb9269449924a5b24d762d03df WHIRLPOOL e619c8d10790f5b78730a2599c407bc951de68b189f460c72999776eaf92014aded0953ca06398cce7ad09fd8c87e1c7727cea4f4c81eccee0a8b2f2bafd195b
diff --git a/x11-libs/libnotify/libnotify-0.7.6-r1.ebuild b/x11-libs/libnotify/libnotify-0.7.6-r1.ebuild
new file mode 100644
index 000000000000..7e515e7235f9
--- /dev/null
+++ b/x11-libs/libnotify/libnotify-0.7.6-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools eutils gnome.org multilib-minimal
+
+DESCRIPTION="A library for sending desktop notifications"
+HOMEPAGE="http://git.gnome.org/browse/libnotify"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="+introspection test"
+
+COMMON_DEPEND="app-eselect/eselect-notify-send
+ >=dev-libs/glib-2.26:2[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.32 )"
+RDEPEND="${COMMON_DEPEND}
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20140508-r4
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )"
+DEPEND="${COMMON_DEPEND}
+ >=dev-libs/gobject-introspection-common-1.32
+ >=dev-util/gtk-doc-am-1.14
+ virtual/pkgconfig
+ test? ( x11-libs/gtk+:3[${MULTILIB_USEDEP}] )"
+PDEPEND="virtual/notification-daemon"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+src_prepare() {
+ sed -i -e 's:noinst_PROG:check_PROG:' tests/Makefile.am || die
+
+ if ! use test; then
+ sed -i -e '/PKG_CHECK_MODULES(TESTS/d' configure.ac || die
+ fi
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} econf \
+ --disable-static \
+ $(multilib_native_use_enable introspection)
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/reference/html docs/reference/html || die
+ fi
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+ prune_libtool_files
+
+ mv "${ED}"/usr/bin/{,libnotify-}notify-send #379941
+}
+
+pkg_postinst() {
+ eselect notify-send update ifunset
+}
+
+pkg_postrm() {
+ eselect notify-send update ifunset
+}
diff --git a/x11-libs/libnotify/metadata.xml b/x11-libs/libnotify/metadata.xml
new file mode 100644
index 000000000000..2953eb8e0471
--- /dev/null
+++ b/x11-libs/libnotify/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>freedesktop</herd>
+</pkgmetadata>
diff --git a/x11-libs/liboglappth/Manifest b/x11-libs/liboglappth/Manifest
new file mode 100644
index 000000000000..905550beac0e
--- /dev/null
+++ b/x11-libs/liboglappth/Manifest
@@ -0,0 +1,2 @@
+DIST liboglappth-0.98.tar.gz 326755 SHA256 1ec5964bb281215d5c6e58dee7e5a1a8bcaef2e07df4ac1336ec404b701a11c1
+DIST liboglappth-1.0.0.tar.gz 325178 SHA256 b461a31065d6912d190f78ad0041218009f44a5acdb5757545bd4a8bd6b509aa SHA512 b0d883379650f1062d503d2adaab48202614b3ab68eba2e0ab01513b51cdd88f75fa02af5dcb00077fb057cdf09987dfe123ea9e0541e2e56893e11e53ac8ef1 WHIRLPOOL e01b177d75584cc6fda99396d0353fa5444f426e1616492defe19f32eb2d53b62b5353967f2c76024daca16e3f7c02bec5e70507cd04a1a3197dfee57ce5b2ac
diff --git a/x11-libs/liboglappth/files/gcc-4.3.patch b/x11-libs/liboglappth/files/gcc-4.3.patch
new file mode 100644
index 000000000000..7a70ab2a2659
--- /dev/null
+++ b/x11-libs/liboglappth/files/gcc-4.3.patch
@@ -0,0 +1,10 @@
+--- liboglappth-0.96.orig/src/base_wcl.cpp 2008-07-07 23:49:10.000000000 -0700
++++ liboglappth-0.96/src/base_wcl.cpp 2008-07-07 23:49:26.000000000 -0700
+@@ -11,6 +11,7 @@
+
+ #include "base_app.h"
+ #include <stdlib.h> // the definition for NULL...
++#include <cstring>
+
+ #include <GL/glut.h>
+
diff --git a/x11-libs/liboglappth/liboglappth-0.98.ebuild b/x11-libs/liboglappth/liboglappth-0.98.ebuild
new file mode 100644
index 000000000000..ca703827b2f3
--- /dev/null
+++ b/x11-libs/liboglappth/liboglappth-0.98.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="A library for creating portable OpenGL applications with easy-to-code scene setup and selection"
+HOMEPAGE="http://www.bioinformatics.org/ghemical/"
+SRC_URI="http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE=""
+RDEPEND="virtual/opengl
+ media-libs/freeglut"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/gcc-4.3.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/x11-libs/liboglappth/liboglappth-1.0.0.ebuild b/x11-libs/liboglappth/liboglappth-1.0.0.ebuild
new file mode 100644
index 000000000000..141cab92ab19
--- /dev/null
+++ b/x11-libs/liboglappth/liboglappth-1.0.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils
+
+DESCRIPTION="A library for creating portable OpenGL applications with easy-to-code scene setup and selection"
+HOMEPAGE="http://www.bioinformatics.org/ghemical/"
+SRC_URI="http://www.bioinformatics.org/ghemical/download/current/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+RDEPEND="virtual/opengl
+ media-libs/freeglut"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/gcc-4.3.patch
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed"
+}
diff --git a/x11-libs/liboglappth/metadata.xml b/x11-libs/liboglappth/metadata.xml
new file mode 100644
index 000000000000..81439daa1259
--- /dev/null
+++ b/x11-libs/liboglappth/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci-chemistry</herd>
+<longdescription>
+Ghemical supports both quantum-mechanics (semi-empirical and ab initio) models
+and molecular mechanics models (there is an experimental Tripos 5.2-like force
+field for organic molecules). Also a tool for reduced protein models is
+included. Geometry optimization, molecular dynamics and a large set of
+visualization tools are currently available.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest
new file mode 100644
index 000000000000..17fb92cc04b6
--- /dev/null
+++ b/x11-libs/libpciaccess/Manifest
@@ -0,0 +1,2 @@
+DIST libpciaccess-0.13.3.tar.bz2 368755 SHA256 6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3 SHA512 11ad783c6278e340973a621339cece3776c098952d0eaf96bfe745d013347e928c0883ed8444c5ddea870f5e4b3c25da16a44facb9d7fc1c8fea1c7e77bd592b WHIRLPOOL 92ba320540535c2b2811c29272a2d94dd3c1f586a0e3073ed4678c03cb3e30656772ad6b0a3e9612a0972a28cfe0d9c4c93ea955610e609fb103a15bb8051e31
+DIST libpciaccess-0.13.4.tar.bz2 372004 SHA256 07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf SHA512 d5b32c525dd36dc85c9a09f45696808730eabbbd3cce892a6dbfb02a566598baad27be58567eb7ced15b3d99fb9afa1d1c24ec19754bcf7a1857a0c8cea34d92 WHIRLPOOL d48ecb99e7e31bc1c13e779261b7ae579ca28a054b20521cb7503c2bfe3182fa2f96c939eee0ebcca1783f3f38c07535173a3bb9a0713834cadd4b9709f25174
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
new file mode 100644
index 000000000000..b35235fb4414
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.3.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal zlib"
+
+DEPEND="!<x11-base/xorg-server-1.5
+ zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ sys-apps/hwids"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ "$(use_with zlib)"
+ "--with-pciids-path=${EPREFIX}/usr/share/misc"
+ )
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi; then
+ dodir /usr/bin
+ ${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
+ fi
+}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
new file mode 100644
index 000000000000..7e58b9b95ef7
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.13.4.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="Library providing generic access to the PCI bus and devices"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="minimal zlib"
+
+DEPEND="!<x11-base/xorg-server-1.5
+ zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ sys-apps/hwids"
+
+pkg_setup() {
+ xorg-2_pkg_setup
+
+ XORG_CONFIGURE_OPTIONS=(
+ "$(use_with zlib)"
+ "--with-pciids-path=${EPREFIX}/usr/share/misc"
+ )
+}
+
+multilib_src_install() {
+ default
+
+ if multilib_is_native_abi; then
+ dodir /usr/bin
+ ${BASH} libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die
+ fi
+}
diff --git a/x11-libs/libpciaccess/metadata.xml b/x11-libs/libpciaccess/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libpciaccess/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-libs/libproplist/Manifest b/x11-libs/libproplist/Manifest
new file mode 100644
index 000000000000..d20ef0d81bb2
--- /dev/null
+++ b/x11-libs/libproplist/Manifest
@@ -0,0 +1 @@
+DIST libPropList-0.10.1.tar.gz 152625 SHA256 7181fa6f3450c0a619732c6ee60bab204eb7901d08182020e8340c648cd04e85 SHA512 8ebad2ffedda9cf0f0a01320340c1b6b9f7d9d9af06d886da9c82d626b5ad799692daeab4c7569e85f756ce8aef3fedf6f662ee38fd4e13e2ec52c7dbe843c39 WHIRLPOOL da4b2763cfe23838698ad7c0f5620cc06c8d3a13f138a3e5b4e88eb1eb10cc8a38941dbc392e82d5d09962282a26e3621031c2569aa933a124b46ca57e7a047f
diff --git a/x11-libs/libproplist/files/libproplist-0.10.1-include.patch b/x11-libs/libproplist/files/libproplist-0.10.1-include.patch
new file mode 100644
index 000000000000..3fd8fa696324
--- /dev/null
+++ b/x11-libs/libproplist/files/libproplist-0.10.1-include.patch
@@ -0,0 +1,10 @@
+--- comparing.c
++++ comparing.c
+@@ -4,6 +4,7 @@
+
+ */
+
++#include <string.h> /* strcmp(), memcmp() */
+ #include "proplistP.h"
+
+ /* forward prototype */
diff --git a/x11-libs/libproplist/libproplist-0.10.1-r4.ebuild b/x11-libs/libproplist/libproplist-0.10.1-r4.ebuild
new file mode 100644
index 000000000000..88d9443ff2f8
--- /dev/null
+++ b/x11-libs/libproplist/libproplist-0.10.1-r4.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+MY_P=libPropList-${PV}
+
+inherit autotools eutils
+
+DESCRIPTION="An library to mimic property list functionality from the GNUstep environment"
+HOMEPAGE="http://windowmaker.org/"
+SRC_URI="mirror://gentoo/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+IUSE="static-libs"
+
+DOCS=( AUTHORS ChangeLog README TODO )
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-include.patch
+ eautoreconf
+}
+
+src_configure() {
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ rm -f "${ED}"/usr/lib*/libPropList.la
+}
diff --git a/x11-libs/libproplist/metadata.xml b/x11-libs/libproplist/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/x11-libs/libproplist/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-libs/libqxt/Manifest b/x11-libs/libqxt/Manifest
new file mode 100644
index 000000000000..aecd4a04d308
--- /dev/null
+++ b/x11-libs/libqxt/Manifest
@@ -0,0 +1 @@
+DIST libqxt-0.6.2.tar.bz2 2197939 SHA256 c59d01373e6bf1bf7072d5e80b95fb803a884ecd19997d3a25903f3fb7f0658a SHA512 45be88acaf7e77b8db2c60130fd6a7209a1d06140bf8aeb2cfa288652b36ecda0fb6917ad8060b03e7e8a0f6c4ca34f0c97bc2d73d9ec0d100beaa1a46df51ae WHIRLPOOL 6457b374dc8d85a4260296b3cdb3f3d12b59fa19475d17c020818fbb99a2380a9cd54eac71a7de58af0ec07d02b40fe224a2394a2e2c1d098ffdfd61d29223c4
diff --git a/x11-libs/libqxt/files/libqxt-invoke-prev-filter.patch b/x11-libs/libqxt/files/libqxt-invoke-prev-filter.patch
new file mode 100644
index 000000000000..4910fe403ae1
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-invoke-prev-filter.patch
@@ -0,0 +1,14 @@
+--- src/gui/qxtglobalshortcut_x11.cpp.orig 2013-12-17 15:03:25.388283632 +0400
++++ src/gui/qxtglobalshortcut_x11.cpp 2013-12-17 15:04:31.566286818 +0400
+@@ -59,7 +59,11 @@
+ // Mod1Mask == Alt, Mod4Mask == Meta
+ key->state & (ShiftMask | ControlMask | Mod1Mask | Mod4Mask));
+ }
++#if QT_VERSION < QT_VERSION_CHECK(5,0,0)
++ return prevEventFilter ? prevEventFilter(message) : false;
++#else
+ return false;
++#endif
+ }
+
+ quint32 QxtGlobalShortcutPrivate::nativeModifiers(Qt::KeyboardModifiers modifiers)
diff --git a/x11-libs/libqxt/files/libqxt-media-keys.patch b/x11-libs/libqxt/files/libqxt-media-keys.patch
new file mode 100644
index 000000000000..a2f39b173187
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-media-keys.patch
@@ -0,0 +1,407 @@
+diff -rupN libqxt.old/src/gui/keymapper_x11.h libqxt/src/gui/keymapper_x11.h
+--- libqxt.old/src/gui/keymapper_x11.h 1969-12-31 19:00:00.000000000 -0500
++++ libqxt/src/gui/keymapper_x11.h 2010-07-18 15:37:16.000000000 -0400
+@@ -0,0 +1,364 @@
++#ifndef KEYMAPPER_X11_H
++#define KEYMAPPER_X11_H
++
++// (davidsansome) Nicked from qkeymapper_x11.cpp
++
++#include <Qt>
++
++#define XK_MISCELLANY
++#define XK_LATIN1
++#define XK_KOREAN
++#define XK_XKB_KEYS
++#include <X11/keysymdef.h>
++
++//
++// Keyboard event translation
++//
++
++#ifndef XK_ISO_Left_Tab
++#define XK_ISO_Left_Tab 0xFE20
++#endif
++
++#ifndef XK_dead_hook
++#define XK_dead_hook 0xFE61
++#endif
++
++#ifndef XK_dead_horn
++#define XK_dead_horn 0xFE62
++#endif
++
++#ifndef XK_Codeinput
++#define XK_Codeinput 0xFF37
++#endif
++
++#ifndef XK_Kanji_Bangou
++#define XK_Kanji_Bangou 0xFF37 /* same as codeinput */
++#endif
++
++// Fix old X libraries
++#ifndef XK_KP_Home
++#define XK_KP_Home 0xFF95
++#endif
++#ifndef XK_KP_Left
++#define XK_KP_Left 0xFF96
++#endif
++#ifndef XK_KP_Up
++#define XK_KP_Up 0xFF97
++#endif
++#ifndef XK_KP_Right
++#define XK_KP_Right 0xFF98
++#endif
++#ifndef XK_KP_Down
++#define XK_KP_Down 0xFF99
++#endif
++#ifndef XK_KP_Prior
++#define XK_KP_Prior 0xFF9A
++#endif
++#ifndef XK_KP_Next
++#define XK_KP_Next 0xFF9B
++#endif
++#ifndef XK_KP_End
++#define XK_KP_End 0xFF9C
++#endif
++#ifndef XK_KP_Insert
++#define XK_KP_Insert 0xFF9E
++#endif
++#ifndef XK_KP_Delete
++#define XK_KP_Delete 0xFF9F
++#endif
++
++// the next lines are taken from XFree > 4.0 (X11/XF86keysyms.h), defining some special
++// multimedia keys. They are included here as not every system has them.
++#define XF86XK_Standby 0x1008FF10
++#define XF86XK_AudioLowerVolume 0x1008FF11
++#define XF86XK_AudioMute 0x1008FF12
++#define XF86XK_AudioRaiseVolume 0x1008FF13
++#define XF86XK_AudioPlay 0x1008FF14
++#define XF86XK_AudioStop 0x1008FF15
++#define XF86XK_AudioPrev 0x1008FF16
++#define XF86XK_AudioNext 0x1008FF17
++#define XF86XK_HomePage 0x1008FF18
++#define XF86XK_Calculator 0x1008FF1D
++#define XF86XK_Mail 0x1008FF19
++#define XF86XK_Start 0x1008FF1A
++#define XF86XK_Search 0x1008FF1B
++#define XF86XK_AudioRecord 0x1008FF1C
++#define XF86XK_Back 0x1008FF26
++#define XF86XK_Forward 0x1008FF27
++#define XF86XK_Stop 0x1008FF28
++#define XF86XK_Refresh 0x1008FF29
++#define XF86XK_Favorites 0x1008FF30
++#define XF86XK_AudioPause 0x1008FF31
++#define XF86XK_AudioMedia 0x1008FF32
++#define XF86XK_MyComputer 0x1008FF33
++#define XF86XK_OpenURL 0x1008FF38
++#define XF86XK_Launch0 0x1008FF40
++#define XF86XK_Launch1 0x1008FF41
++#define XF86XK_Launch2 0x1008FF42
++#define XF86XK_Launch3 0x1008FF43
++#define XF86XK_Launch4 0x1008FF44
++#define XF86XK_Launch5 0x1008FF45
++#define XF86XK_Launch6 0x1008FF46
++#define XF86XK_Launch7 0x1008FF47
++#define XF86XK_Launch8 0x1008FF48
++#define XF86XK_Launch9 0x1008FF49
++#define XF86XK_LaunchA 0x1008FF4A
++#define XF86XK_LaunchB 0x1008FF4B
++#define XF86XK_LaunchC 0x1008FF4C
++#define XF86XK_LaunchD 0x1008FF4D
++#define XF86XK_LaunchE 0x1008FF4E
++#define XF86XK_LaunchF 0x1008FF4F
++// end of XF86keysyms.h
++
++// Special keys used by Qtopia, mapped into the X11 private keypad range.
++#define QTOPIAXK_Select 0x11000601
++#define QTOPIAXK_Yes 0x11000602
++#define QTOPIAXK_No 0x11000603
++#define QTOPIAXK_Cancel 0x11000604
++#define QTOPIAXK_Printer 0x11000605
++#define QTOPIAXK_Execute 0x11000606
++#define QTOPIAXK_Sleep 0x11000607
++#define QTOPIAXK_Play 0x11000608
++#define QTOPIAXK_Zoom 0x11000609
++#define QTOPIAXK_Context1 0x1100060A
++#define QTOPIAXK_Context2 0x1100060B
++#define QTOPIAXK_Context3 0x1100060C
++#define QTOPIAXK_Context4 0x1100060D
++#define QTOPIAXK_Call 0x1100060E
++#define QTOPIAXK_Hangup 0x1100060F
++#define QTOPIAXK_Flip 0x11000610
++
++// keyboard mapping table
++static const unsigned int KeyTbl[] = {
++
++ // misc keys
++
++ XK_Escape, Qt::Key_Escape,
++ XK_Tab, Qt::Key_Tab,
++ XK_ISO_Left_Tab, Qt::Key_Backtab,
++ XK_BackSpace, Qt::Key_Backspace,
++ XK_Return, Qt::Key_Return,
++ XK_Insert, Qt::Key_Insert,
++ XK_Delete, Qt::Key_Delete,
++ XK_Clear, Qt::Key_Delete,
++ XK_Pause, Qt::Key_Pause,
++ XK_Print, Qt::Key_Print,
++ 0x1005FF60, Qt::Key_SysReq, // hardcoded Sun SysReq
++ 0x1007ff00, Qt::Key_SysReq, // hardcoded X386 SysReq
++
++ // cursor movement
++
++ XK_Home, Qt::Key_Home,
++ XK_End, Qt::Key_End,
++ XK_Left, Qt::Key_Left,
++ XK_Up, Qt::Key_Up,
++ XK_Right, Qt::Key_Right,
++ XK_Down, Qt::Key_Down,
++ XK_Prior, Qt::Key_PageUp,
++ XK_Next, Qt::Key_PageDown,
++
++ // modifiers
++
++ XK_Shift_L, Qt::Key_Shift,
++ XK_Shift_R, Qt::Key_Shift,
++ XK_Shift_Lock, Qt::Key_Shift,
++ XK_Control_L, Qt::Key_Control,
++ XK_Control_R, Qt::Key_Control,
++ XK_Meta_L, Qt::Key_Meta,
++ XK_Meta_R, Qt::Key_Meta,
++ XK_Alt_L, Qt::Key_Alt,
++ XK_Alt_R, Qt::Key_Alt,
++ XK_Caps_Lock, Qt::Key_CapsLock,
++ XK_Num_Lock, Qt::Key_NumLock,
++ XK_Scroll_Lock, Qt::Key_ScrollLock,
++ XK_Super_L, Qt::Key_Super_L,
++ XK_Super_R, Qt::Key_Super_R,
++ XK_Menu, Qt::Key_Menu,
++ XK_Hyper_L, Qt::Key_Hyper_L,
++ XK_Hyper_R, Qt::Key_Hyper_R,
++ XK_Help, Qt::Key_Help,
++ 0x1000FF74, Qt::Key_Backtab, // hardcoded HP backtab
++ 0x1005FF10, Qt::Key_F11, // hardcoded Sun F36 (labeled F11)
++ 0x1005FF11, Qt::Key_F12, // hardcoded Sun F37 (labeled F12)
++
++ // numeric and function keypad keys
++
++ XK_KP_Space, Qt::Key_Space,
++ XK_KP_Tab, Qt::Key_Tab,
++ XK_KP_Enter, Qt::Key_Enter,
++ //XK_KP_F1, Qt::Key_F1,
++ //XK_KP_F2, Qt::Key_F2,
++ //XK_KP_F3, Qt::Key_F3,
++ //XK_KP_F4, Qt::Key_F4,
++ XK_KP_Home, Qt::Key_Home,
++ XK_KP_Left, Qt::Key_Left,
++ XK_KP_Up, Qt::Key_Up,
++ XK_KP_Right, Qt::Key_Right,
++ XK_KP_Down, Qt::Key_Down,
++ XK_KP_Prior, Qt::Key_PageUp,
++ XK_KP_Next, Qt::Key_PageDown,
++ XK_KP_End, Qt::Key_End,
++ XK_KP_Begin, Qt::Key_Clear,
++ XK_KP_Insert, Qt::Key_Insert,
++ XK_KP_Delete, Qt::Key_Delete,
++ XK_KP_Equal, Qt::Key_Equal,
++ XK_KP_Multiply, Qt::Key_Asterisk,
++ XK_KP_Add, Qt::Key_Plus,
++ XK_KP_Separator, Qt::Key_Comma,
++ XK_KP_Subtract, Qt::Key_Minus,
++ XK_KP_Decimal, Qt::Key_Period,
++ XK_KP_Divide, Qt::Key_Slash,
++
++ // International input method support keys
++
++ // International & multi-key character composition
++ XK_ISO_Level3_Shift, Qt::Key_AltGr,
++ XK_Multi_key, Qt::Key_Multi_key,
++ XK_Codeinput, Qt::Key_Codeinput,
++ XK_SingleCandidate, Qt::Key_SingleCandidate,
++ XK_MultipleCandidate, Qt::Key_MultipleCandidate,
++ XK_PreviousCandidate, Qt::Key_PreviousCandidate,
++
++ // Misc Functions
++ XK_Mode_switch, Qt::Key_Mode_switch,
++ XK_script_switch, Qt::Key_Mode_switch,
++
++ // Japanese keyboard support
++ XK_Kanji, Qt::Key_Kanji,
++ XK_Muhenkan, Qt::Key_Muhenkan,
++ //XK_Henkan_Mode, Qt::Key_Henkan_Mode,
++ XK_Henkan_Mode, Qt::Key_Henkan,
++ XK_Henkan, Qt::Key_Henkan,
++ XK_Romaji, Qt::Key_Romaji,
++ XK_Hiragana, Qt::Key_Hiragana,
++ XK_Katakana, Qt::Key_Katakana,
++ XK_Hiragana_Katakana, Qt::Key_Hiragana_Katakana,
++ XK_Zenkaku, Qt::Key_Zenkaku,
++ XK_Hankaku, Qt::Key_Hankaku,
++ XK_Zenkaku_Hankaku, Qt::Key_Zenkaku_Hankaku,
++ XK_Touroku, Qt::Key_Touroku,
++ XK_Massyo, Qt::Key_Massyo,
++ XK_Kana_Lock, Qt::Key_Kana_Lock,
++ XK_Kana_Shift, Qt::Key_Kana_Shift,
++ XK_Eisu_Shift, Qt::Key_Eisu_Shift,
++ XK_Eisu_toggle, Qt::Key_Eisu_toggle,
++ //XK_Kanji_Bangou, Qt::Key_Kanji_Bangou,
++ //XK_Zen_Koho, Qt::Key_Zen_Koho,
++ //XK_Mae_Koho, Qt::Key_Mae_Koho,
++ XK_Kanji_Bangou, Qt::Key_Codeinput,
++ XK_Zen_Koho, Qt::Key_MultipleCandidate,
++ XK_Mae_Koho, Qt::Key_PreviousCandidate,
++
++#ifdef XK_KOREAN
++ // Korean keyboard support
++ XK_Hangul, Qt::Key_Hangul,
++ XK_Hangul_Start, Qt::Key_Hangul_Start,
++ XK_Hangul_End, Qt::Key_Hangul_End,
++ XK_Hangul_Hanja, Qt::Key_Hangul_Hanja,
++ XK_Hangul_Jamo, Qt::Key_Hangul_Jamo,
++ XK_Hangul_Romaja, Qt::Key_Hangul_Romaja,
++ //XK_Hangul_Codeinput, Qt::Key_Hangul_Codeinput,
++ XK_Hangul_Codeinput, Qt::Key_Codeinput,
++ XK_Hangul_Jeonja, Qt::Key_Hangul_Jeonja,
++ XK_Hangul_Banja, Qt::Key_Hangul_Banja,
++ XK_Hangul_PreHanja, Qt::Key_Hangul_PreHanja,
++ XK_Hangul_PostHanja, Qt::Key_Hangul_PostHanja,
++ //XK_Hangul_SingleCandidate,Qt::Key_Hangul_SingleCandidate,
++ //XK_Hangul_MultipleCandidate,Qt::Key_Hangul_MultipleCandidate,
++ //XK_Hangul_PreviousCandidate,Qt::Key_Hangul_PreviousCandidate,
++ XK_Hangul_SingleCandidate, Qt::Key_SingleCandidate,
++ XK_Hangul_MultipleCandidate,Qt::Key_MultipleCandidate,
++ XK_Hangul_PreviousCandidate,Qt::Key_PreviousCandidate,
++ XK_Hangul_Special, Qt::Key_Hangul_Special,
++ //XK_Hangul_switch, Qt::Key_Hangul_switch,
++ XK_Hangul_switch, Qt::Key_Mode_switch,
++#endif // XK_KOREAN
++
++ // dead keys
++ XK_dead_grave, Qt::Key_Dead_Grave,
++ XK_dead_acute, Qt::Key_Dead_Acute,
++ XK_dead_circumflex, Qt::Key_Dead_Circumflex,
++ XK_dead_tilde, Qt::Key_Dead_Tilde,
++ XK_dead_macron, Qt::Key_Dead_Macron,
++ XK_dead_breve, Qt::Key_Dead_Breve,
++ XK_dead_abovedot, Qt::Key_Dead_Abovedot,
++ XK_dead_diaeresis, Qt::Key_Dead_Diaeresis,
++ XK_dead_abovering, Qt::Key_Dead_Abovering,
++ XK_dead_doubleacute, Qt::Key_Dead_Doubleacute,
++ XK_dead_caron, Qt::Key_Dead_Caron,
++ XK_dead_cedilla, Qt::Key_Dead_Cedilla,
++ XK_dead_ogonek, Qt::Key_Dead_Ogonek,
++ XK_dead_iota, Qt::Key_Dead_Iota,
++ XK_dead_voiced_sound, Qt::Key_Dead_Voiced_Sound,
++ XK_dead_semivoiced_sound, Qt::Key_Dead_Semivoiced_Sound,
++ XK_dead_belowdot, Qt::Key_Dead_Belowdot,
++ XK_dead_hook, Qt::Key_Dead_Hook,
++ XK_dead_horn, Qt::Key_Dead_Horn,
++
++ // Special multimedia keys
++ // currently only tested with MS internet keyboard
++
++ // browsing keys
++ XF86XK_Back, Qt::Key_Back,
++ XF86XK_Forward, Qt::Key_Forward,
++ XF86XK_Stop, Qt::Key_Stop,
++ XF86XK_Refresh, Qt::Key_Refresh,
++ XF86XK_Favorites, Qt::Key_Favorites,
++ XF86XK_AudioMedia, Qt::Key_LaunchMedia,
++ XF86XK_OpenURL, Qt::Key_OpenUrl,
++ XF86XK_HomePage, Qt::Key_HomePage,
++ XF86XK_Search, Qt::Key_Search,
++
++ // media keys
++ XF86XK_AudioLowerVolume, Qt::Key_VolumeDown,
++ XF86XK_AudioMute, Qt::Key_VolumeMute,
++ XF86XK_AudioRaiseVolume, Qt::Key_VolumeUp,
++ XF86XK_AudioPlay, Qt::Key_MediaPlay,
++ XF86XK_AudioStop, Qt::Key_MediaStop,
++ XF86XK_AudioPrev, Qt::Key_MediaPrevious,
++ XF86XK_AudioNext, Qt::Key_MediaNext,
++ XF86XK_AudioRecord, Qt::Key_MediaRecord,
++
++ // launch keys
++ XF86XK_Mail, Qt::Key_LaunchMail,
++ XF86XK_MyComputer, Qt::Key_Launch0,
++ XF86XK_Calculator, Qt::Key_Launch1,
++ XF86XK_Standby, Qt::Key_Standby,
++
++ XF86XK_Launch0, Qt::Key_Launch2,
++ XF86XK_Launch1, Qt::Key_Launch3,
++ XF86XK_Launch2, Qt::Key_Launch4,
++ XF86XK_Launch3, Qt::Key_Launch5,
++ XF86XK_Launch4, Qt::Key_Launch6,
++ XF86XK_Launch5, Qt::Key_Launch7,
++ XF86XK_Launch6, Qt::Key_Launch8,
++ XF86XK_Launch7, Qt::Key_Launch9,
++ XF86XK_Launch8, Qt::Key_LaunchA,
++ XF86XK_Launch9, Qt::Key_LaunchB,
++ XF86XK_LaunchA, Qt::Key_LaunchC,
++ XF86XK_LaunchB, Qt::Key_LaunchD,
++ XF86XK_LaunchC, Qt::Key_LaunchE,
++ XF86XK_LaunchD, Qt::Key_LaunchF,
++
++ // Qtopia keys
++ QTOPIAXK_Select, Qt::Key_Select,
++ QTOPIAXK_Yes, Qt::Key_Yes,
++ QTOPIAXK_No, Qt::Key_No,
++ QTOPIAXK_Cancel, Qt::Key_Cancel,
++ QTOPIAXK_Printer, Qt::Key_Printer,
++ QTOPIAXK_Execute, Qt::Key_Execute,
++ QTOPIAXK_Sleep, Qt::Key_Sleep,
++ QTOPIAXK_Play, Qt::Key_Play,
++ QTOPIAXK_Zoom, Qt::Key_Zoom,
++ QTOPIAXK_Context1, Qt::Key_Context1,
++ QTOPIAXK_Context2, Qt::Key_Context2,
++ QTOPIAXK_Context3, Qt::Key_Context3,
++ QTOPIAXK_Context4, Qt::Key_Context4,
++ QTOPIAXK_Call, Qt::Key_Call,
++ QTOPIAXK_Hangup, Qt::Key_Hangup,
++ QTOPIAXK_Flip, Qt::Key_Flip,
++
++ 0, 0
++};
++
++#endif // KEYMAPPER_X11_H
+diff -rupN libqxt.old/src/gui/qxtglobalshortcut_x11.cpp libqxt/src/gui/qxtglobalshortcut_x11.cpp
+--- libqxt.old/src/gui/qxtglobalshortcut_x11.cpp 2010-07-18 15:32:53.000000000 -0400
++++ libqxt/src/gui/qxtglobalshortcut_x11.cpp 2010-07-18 15:41:25.000000000 -0400
+@@ -26,6 +26,8 @@
+ #include <QX11Info>
+ #include <X11/Xlib.h>
+
++#include "keymapper_x11.h"
++
+ static int (*original_x_errhandler)(Display* display, XErrorEvent* event);
+
+ static int qxt_x_errhandler(Display* display, XErrorEvent *event)
+@@ -83,8 +85,25 @@ quint32 QxtGlobalShortcutPrivate::native
+
+ quint32 QxtGlobalShortcutPrivate::nativeKeycode(Qt::Key key)
+ {
++ // (davidsansome) Try the table from QKeyMapper first - this seems to be
++ // the only way to get Keysyms for the media keys.
++ unsigned int keysym = 0;
++ int i = 0;
++ while (KeyTbl[i]) {
++ if (KeyTbl[i+1] == static_cast<uint>(key)) {
++ keysym = KeyTbl[i];
++ break;
++ }
++ i += 2;
++ }
++
++ // If that didn't work then fall back on XStringToKeysym
++ if (!keysym) {
++ keysym = XStringToKeysym(QKeySequence(key).toString().toLatin1().data());
++ }
++
+ Display* display = QX11Info::display();
+- return XKeysymToKeycode(display, XStringToKeysym(QKeySequence(key).toString().toLatin1().data()));
++ return XKeysymToKeycode(display, keysym);
+ }
+
+ bool QxtGlobalShortcutPrivate::registerShortcut(quint32 nativeKey, quint32 nativeMods)
diff --git a/x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch b/x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch
new file mode 100644
index 000000000000..99f7650913f3
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-use-system-qdoc3.patch
@@ -0,0 +1,24 @@
+--- libqxt~orig/doc/doc.pri 2010-08-19 17:06:12.000000000 +0200
++++ libqxt/doc/doc.pri 2010-08-19 17:08:16.000000000 +0200
+@@ -1,5 +1,3 @@
+-SUBDIRS += tools/3rdparty/qdoc3
+-
+ win32 {
+ QXT_WINCONFIG = release/
+ !CONFIG(release, debug|release) {
+@@ -16,14 +14,13 @@
+ }
+
+ $$unixstyle {
+- QDOC = QXT_SOURCE_TREE=$$QXT_SOURCE_TREE QXT_BUILD_TREE=$$QXT_BUILD_TREE $$QXT_BUILD_TREE/tools/3rdparty/qdoc3/$${QXT_WINCONFIG}qdoc3
++ QDOC = QXT_SOURCE_TREE=$$QXT_SOURCE_TREE QXT_BUILD_TREE=$$QXT_BUILD_TREE $$[QT_INSTALL_BINS]/qdoc3
+ } else {
+ QDOC = set QXT_SOURCE_TREE=$$QXT_SOURCE_TREE&& set QXT_BUILD_TREE=$$QXT_BUILD_TREE&& $$QXT_BUILD_TREE/tools/3rdparty/qdoc3/$${QXT_WINCONFIG}qdoc3.exe
+ QDOC = $$replace(QDOC, "/", "\\\\")
+ }
+
+ adp_docs.commands = ($$QDOC -DQXT_DOXYGEN_RUN $$QXT_SOURCE_TREE/doc/src/qxt.qdocconf)
+-adp_docs.depends += sub-tools-3rdparty-qdoc3
+ docs.depends = adp_docs
+ QMAKE_EXTRA_TARGETS += adp_docs docs
+
diff --git a/x11-libs/libqxt/files/libqxt-xrandr-missing-lib.patch b/x11-libs/libqxt/files/libqxt-xrandr-missing-lib.patch
new file mode 100644
index 000000000000..b53c7ff10c1f
--- /dev/null
+++ b/x11-libs/libqxt/files/libqxt-xrandr-missing-lib.patch
@@ -0,0 +1,9 @@
+diff -Naur libqxt-libqxt-v0.6.2-orig/config.tests/xrandr/xrandr.pro libqxt-libqxt-v0.6.2/config.tests/xrandr/xrandr.pro
+--- libqxt-libqxt-v0.6.2-orig/config.tests/xrandr/xrandr.pro 2013-12-26 01:57:00.691752845 +0100
++++ libqxt-libqxt-v0.6.2/config.tests/xrandr/xrandr.pro 2013-12-26 01:57:21.705969462 +0100
+@@ -4,4 +4,4 @@
+ DEPENDPATH += .
+ INCLUDEPATH += .
+ SOURCES += main.cpp
+-!win32:LIBS+=-lXrandr
++!win32:LIBS+=-lXrandr -lX11
diff --git a/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild b/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
new file mode 100644
index 000000000000..bdebee63532e
--- /dev/null
+++ b/x11-libs/libqxt/libqxt-0.6.2-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit multilib qt4-r2
+
+DESCRIPTION="The Qt eXTension library provides cross-platform utility classes for the Qt toolkit"
+HOMEPAGE="http://libqxt.org/"
+SRC_URI="http://dev.libqxt.org/libqxt/get/v${PV}.tar.bz2 -> ${P}.tar.bz2"
+
+LICENSE="|| ( CPL-1.0 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="amd64 ~arm x86"
+IUSE="berkdb debug doc sql web xscreensaver zeroconf"
+
+COMMON_DEPEND="
+ dev-qt/qtcore:4[ssl]
+ || (
+ ( >=dev-qt/qtgui-4.8.5:4 dev-qt/designer:4 )
+ <dev-qt/qtgui-4.8.5:4
+ )
+ x11-libs/libXrandr
+ berkdb? ( >=sys-libs/db-4.6 )
+ sql? ( dev-qt/qtsql:4 )
+ zeroconf? ( net-dns/avahi[mdnsresponder-compat] )
+"
+DEPEND="${COMMON_DEPEND}
+ doc? ( dev-qt/qthelp:4 )
+"
+RDEPEND="${COMMON_DEPEND}
+ xscreensaver? ( x11-libs/libXScrnSaver )
+"
+
+S=${WORKDIR}/${PN}-${PN}-v${PV}
+
+DOCS=( AUTHORS CHANGES README )
+PATCHES=(
+ "${FILESDIR}/${PN}-use-system-qdoc3.patch"
+ "${FILESDIR}/${PN}-invoke-prev-filter.patch" # bug 494448
+ "${FILESDIR}/${PN}-media-keys.patch" # bug 495984
+ "${FILESDIR}/${PN}-xrandr-missing-lib.patch"
+)
+
+src_prepare() {
+ qt4-r2_src_prepare
+
+ # remove insecure runpath
+ sed -i -e '/^QMAKE_RPATHDIR /d' src/qxtlibs.pri || die
+}
+
+src_configure() {
+ # custom configure script
+ local myconf=(
+ ./configure -verbose
+ -prefix "${EPREFIX}/usr"
+ -libdir "${EPREFIX}/usr/$(get_libdir)"
+ -docdir "${EPREFIX}/usr/share/doc/${PF}"
+ -qmake-bin "${EPREFIX}/usr/bin/qmake"
+ $(use debug && echo -debug || echo -release)
+ $(use berkdb || echo -no-db -nomake berkeley)
+ $(use doc || echo -nomake docs)
+ $(use sql || echo -nomake sql)
+ $(use web || echo -nomake web)
+ $(use zeroconf || echo -no-zeroconf -nomake zeroconf)
+ )
+ echo "${myconf[@]}"
+ "${myconf[@]}" || die "./configure failed"
+
+ eqmake4 -recursive
+}
+
+src_compile() {
+ qt4-r2_src_compile
+
+ use doc && emake docs
+}
+
+pkg_postinst() {
+ if use doc; then
+ einfo
+ einfo "In case you want to browse ${PN} documentation using"
+ einfo "Qt Assistant, perform the following steps:"
+ einfo " 1. Open the Assistant"
+ einfo " 2. Edit -> Preferences -> Documentation -> Add"
+ einfo " 3. Add this path: ${EPREFIX}/usr/share/doc/${PF}/qxt.qch"
+ einfo
+ fi
+}
diff --git a/x11-libs/libqxt/metadata.xml b/x11-libs/libqxt/metadata.xml
new file mode 100644
index 000000000000..32c24a498f1d
--- /dev/null
+++ b/x11-libs/libqxt/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>qt</herd>
+<use>
+ <flag name="berkdb">Build the QxtBerkeley module</flag>
+ <flag name="sql">Build the QxtSql module</flag>
+ <flag name="web">Build the QxtWeb module</flag>
+ <flag name="zeroconf">Build the QxtZeroconf module</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/libsexy/Manifest b/x11-libs/libsexy/Manifest
new file mode 100644
index 000000000000..48bfa7b71803
--- /dev/null
+++ b/x11-libs/libsexy/Manifest
@@ -0,0 +1 @@
+DIST libsexy-0.1.11.tar.bz2 267376 SHA256 ba113ff5148e9ac137381a1da7045caa750a3b0c0113d4b97549bdbb6c1c8bb6 SHA512 60c7f1e8891ae36ab1f7a5b3421b1819bd940470d226b9e6dd752c4ec63ca79b5f8589c0cdd818f1c72e2bff605572554a537750be5774c6752df6bae99d094a WHIRLPOOL 069ecdaf69bff37810ee80e49b45d49ea0ef4cc2610976516ac71e54550876dfdc737599f763fe4ecd17f2b10a0a51e5a7574a697fc857ba26ff9a047e75c494
diff --git a/x11-libs/libsexy/files/libsexy-0.1.11-fix-null-list.patch b/x11-libs/libsexy/files/libsexy-0.1.11-fix-null-list.patch
new file mode 100644
index 000000000000..5330e12e3a57
--- /dev/null
+++ b/x11-libs/libsexy/files/libsexy-0.1.11-fix-null-list.patch
@@ -0,0 +1,34 @@
+diff -Nur libsexy-0.1.11/libsexy/sexy-spell-entry.c libsexy-0.1.11_patched/libsexy/sexy-spell-entry.c
+--- libsexy-0.1.11/libsexy/sexy-spell-entry.c 2006-08-17 21:11:09.000000000 +0300
++++ libsexy-0.1.11_patched/libsexy/sexy-spell-entry.c 2009-05-17 15:15:25.000000000 +0300
+@@ -56,7 +56,7 @@
+ static void (*enchant_dict_add_to_session) (struct EnchantDict * dict, const char *const word, ssize_t len);
+ static int (*enchant_dict_check) (struct EnchantDict * dict, const char *const word, ssize_t len);
+ static void (*enchant_dict_describe) (struct EnchantDict * dict, EnchantDictDescribeFn fn, void * user_data);
+-static void (*enchant_dict_free_suggestions) (struct EnchantDict * dict, char **suggestions);
++static void (*enchant_dict_free_string_list) (struct EnchantDict * dict, char **suggestions);
+ static void (*enchant_dict_store_replacement) (struct EnchantDict * dict, const char *const mis, ssize_t mis_len, const char *const cor, ssize_t cor_len);
+ static char ** (*enchant_dict_suggest) (struct EnchantDict * dict, const char *const word, ssize_t len, size_t * out_n_suggs);
+ static gboolean have_enchant = FALSE;
+@@ -156,8 +156,8 @@
+ MODULE_SYMBOL("enchant_dict_add_to_session", enchant_dict_add_to_session)
+ MODULE_SYMBOL("enchant_dict_check", enchant_dict_check)
+ MODULE_SYMBOL("enchant_dict_describe", enchant_dict_describe)
+- MODULE_SYMBOL("enchant_dict_free_suggestions",
+- enchant_dict_free_suggestions)
++ MODULE_SYMBOL("enchant_dict_free_string_list",
++ enchant_dict_free_string_list)
+ MODULE_SYMBOL("enchant_dict_store_replacement",
+ enchant_dict_store_replacement)
+ MODULE_SYMBOL("enchant_dict_suggest", enchant_dict_suggest)
+@@ -435,9 +435,8 @@
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
+ }
++ enchant_dict_free_string_list(dict, suggestions);
+ }
+-
+- enchant_dict_free_suggestions(dict, suggestions);
+ }
+
+ static GtkWidget *
diff --git a/x11-libs/libsexy/files/libsexy-0.1.11-pkgconfig-pollution.patch b/x11-libs/libsexy/files/libsexy-0.1.11-pkgconfig-pollution.patch
new file mode 100644
index 000000000000..faf16dea71ca
--- /dev/null
+++ b/x11-libs/libsexy/files/libsexy-0.1.11-pkgconfig-pollution.patch
@@ -0,0 +1,12 @@
+--- libsexy.pc.in
++++ libsexy.pc.in
+@@ -6,7 +6,8 @@
+ Name: libsexy
+ Description: Doing naughty things to good widgets
+ Version: @VERSION@
+-Libs: -L${libdir} -lsexy @PACKAGE_LIBS@
++Libs: -L${libdir} -lsexy
++Libs.private: @PACKAGE_LIBS@
+ Cflags: -I${includedir} @PACKAGE_CFLAGS@
+
+
diff --git a/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild b/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild
new file mode 100644
index 000000000000..1b15dcc8394d
--- /dev/null
+++ b/x11-libs/libsexy/libsexy-0.1.11-r3.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit autotools eutils
+
+DESCRIPTION="Sexy GTK+ Widgets"
+HOMEPAGE="http://www.chipx86.com/wiki/Libsexy"
+SRC_URI="http://releases.chipx86.com/${PN}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/glib-2
+ >=x11-libs/gtk+-2.20:2
+ dev-libs/libxml2
+ >=x11-libs/pango-1.4
+ >=app-text/iso-codes-0.49"
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5
+ virtual/pkgconfig
+ dev-util/gtk-doc-am
+ doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="AUTHORS ChangeLog NEWS"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-fix-null-list.patch \
+ "${FILESDIR}"/${P}-pkgconfig-pollution.patch
+
+ sed -i \
+ -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+ tests/Makefile.am || die
+
+ rm -f acinclude.m4 #420913
+
+ eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable static-libs static) \
+ $(use_enable doc gtk-doc) \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/libsexy/libsexy-0.1.11-r4.ebuild b/x11-libs/libsexy/libsexy-0.1.11-r4.ebuild
new file mode 100644
index 000000000000..ad786dcccffb
--- /dev/null
+++ b/x11-libs/libsexy/libsexy-0.1.11-r4.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=true
+
+inherit autotools-utils
+
+DESCRIPTION="Sexy GTK+ Widgets"
+HOMEPAGE="http://www.chipx86.com/wiki/Libsexy"
+SRC_URI="http://releases.chipx86.com/${PN}/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
+IUSE="doc static-libs"
+
+RDEPEND=">=dev-libs/glib-2
+ >=x11-libs/gtk+-2.20:2
+ dev-libs/libxml2
+ >=x11-libs/pango-1.4
+ >=app-text/iso-codes-0.49"
+DEPEND="${RDEPEND}
+ >=dev-lang/perl-5
+ virtual/pkgconfig
+ dev-util/gtk-doc-am
+ doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS=( AUTHORS ChangeLog NEWS )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-null-list.patch
+ "${FILESDIR}"/${P}-pkgconfig-pollution.patch
+ )
+
+src_prepare() {
+ sed -i \
+ -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
+ tests/Makefile.am || die
+
+ rm -f acinclude.m4 #420913
+
+ sed \
+ -e "s:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g" \
+ -i configure.ac
+
+ autotools-utils_src_prepare
+}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable doc gtk-doc)
+ --with-html-dir="${EPREFIX}/usr/share/doc/${PF}/html"
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libsexy/metadata.xml b/x11-libs/libsexy/metadata.xml
new file mode 100644
index 000000000000..2953eb8e0471
--- /dev/null
+++ b/x11-libs/libsexy/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>freedesktop</herd>
+</pkgmetadata>
diff --git a/x11-libs/libsvg-cairo/Manifest b/x11-libs/libsvg-cairo/Manifest
new file mode 100644
index 000000000000..bc75eb789a88
--- /dev/null
+++ b/x11-libs/libsvg-cairo/Manifest
@@ -0,0 +1 @@
+DIST libsvg-cairo-0.1.6.tar.gz 325427 RMD160 387476cf23cbe62e11587435ee5e4679da3e5d78 SHA1 c7bf131b59e8c00a80ce07c6f2f90f25a7c61f81 SHA256 a380be6a78ec2938100ce904363815a94068fca372c666b8cc82aa8711a0215c
diff --git a/x11-libs/libsvg-cairo/libsvg-cairo-0.1.6.ebuild b/x11-libs/libsvg-cairo/libsvg-cairo-0.1.6.ebuild
new file mode 100644
index 000000000000..b3d3f88fcbc9
--- /dev/null
+++ b/x11-libs/libsvg-cairo/libsvg-cairo-0.1.6.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Render SVG content using cairo"
+HOMEPAGE="http://cairographics.org"
+SRC_URI="http://cairographics.org/snapshots/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+
+RDEPEND="x11-libs/cairo
+ media-libs/libsvg"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-libs/libsvg-cairo/metadata.xml b/x11-libs/libsvg-cairo/metadata.xml
new file mode 100644
index 000000000000..91f4e72fb544
--- /dev/null
+++ b/x11-libs/libsvg-cairo/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-libs/libtinynotify-cli/Manifest b/x11-libs/libtinynotify-cli/Manifest
new file mode 100644
index 000000000000..9eb82a78331e
--- /dev/null
+++ b/x11-libs/libtinynotify-cli/Manifest
@@ -0,0 +1 @@
+DIST tinynotify-send-1.2.1.tar.bz2 266078 SHA256 72c5f4451348b0a06dd57efb5de75273e47f7e35ae04df9a3dd1c64be1e71e65 SHA512 f416db09fa95f04d771610af7ae8953192027b8606c53f54efe514c4d33b59e8dc362676004a036c2dd7e7c7cf03b077ee9b753839efbcb181c5724f43efa58d WHIRLPOOL 2e82b67111db19aa52e293feea167e53ef73bf04a043049543082cf9eea64f75bbfe9788e323dd19d081b5cab43ff469e370810fd6bbc70707329cacfb560411
diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild
new file mode 100644
index 000000000000..47ae9c118c64
--- /dev/null
+++ b/x11-libs/libtinynotify-cli/libtinynotify-cli-1.2.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+MY_PN=tinynotify-send
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send"
+HOMEPAGE="https://github.com/mgorny/tinynotify-send/"
+SRC_URI="mirror://github/mgorny/${MY_PN}/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="x11-libs/libtinynotify"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+DOCS=( README )
+S=${WORKDIR}/${MY_P}
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable doc gtk-doc)
+ --disable-regular
+ --disable-system-wide
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild b/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
new file mode 100644
index 000000000000..e41b2f60b235
--- /dev/null
+++ b/x11-libs/libtinynotify-cli/libtinynotify-cli-9999.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="http://bitbucket.org/mgorny/tinynotify-send.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+MY_PN=tinynotify-send
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Common CLI routines for tinynotify-send & sw-notify-send"
+HOMEPAGE="https://bitbucket.org/mgorny/tinynotify-send/"
+SRC_URI="https://www.bitbucket.org/mgorny/${MY_PN}/downloads/${MY_P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="x11-libs/libtinynotify:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+DEPEND="${DEPEND}
+ >=dev-util/gtk-doc-1.18"
+#endif
+
+src_configure() {
+ local myeconfargs=(
+ $(use_enable doc gtk-doc)
+ --disable-regular
+ --disable-system-wide
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libtinynotify-cli/metadata.xml b/x11-libs/libtinynotify-cli/metadata.xml
new file mode 100644
index 000000000000..feaa57e4dc77
--- /dev/null
+++ b/x11-libs/libtinynotify-cli/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <maintainer status="active">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <bugs-to>https://bitbucket.org/mgorny/tinynotify-send/issues/</bugs-to>
+ <remote-id type="bitbucket">mgorny/tinynotify-send</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libtinynotify-systemwide/Manifest b/x11-libs/libtinynotify-systemwide/Manifest
new file mode 100644
index 000000000000..83447133c2a7
--- /dev/null
+++ b/x11-libs/libtinynotify-systemwide/Manifest
@@ -0,0 +1,2 @@
+DIST libtinynotify-systemwide-0.0.2.tar.bz2 256779 SHA256 7f4fac8333d7e3318977387ce8deb6f67c548f467a5e33dc5c082fc0206456a9 SHA512 54d8c0c409815d3aa29d6141d40ca734edb3e85e5b8541401fc4d180087d3b56b16e84ba8652bf6701f8f8755e7c85ee77d0ac082d2732325a8459fb71980bb0 WHIRLPOOL a000f32f5859ca4fb34f3ca07cb5665ebbb52236b94525b65a24afdce0634f882585f2f0cd35e70be383119dcc9485987dbff2fee8ff4a9144d5727f26b0c7e3
+DIST libtinynotify-systemwide-0.1.tar.bz2 270071 SHA256 ae2c3bb845eec3eae8921b7887f0cbbc9f468012020c2d6e2c18e30f8d858217 SHA512 95516208485ed46e4702806bca467af509b9756a738f5f345cec712d878f14f4d9c84b78c33f0e4a41e0bf7be3b6e8e50dcd230da753c2827ae75793ca1c74aa WHIRLPOOL 4d40e217ddd44e64e45bcd47f7d0c0f59e7d3c545cd3f921bcec1f2697dd26ce8f2a2633b1382509616cbbb8402f47632b7b205f6820eee86e13002461b51bf9
diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.0.2.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.0.2.ebuild
new file mode 100644
index 000000000000..8d332592b991
--- /dev/null
+++ b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.0.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="A system-wide notifications module for libtinynotify"
+HOMEPAGE="https://github.com/mgorny/libtinynotify-systemwide/"
+SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="sys-process/procps
+ x11-libs/libtinynotify"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+DOCS=( README )
+
+src_configure() {
+ myeconfargs=(
+ $(use_enable doc gtk-doc)
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild
new file mode 100644
index 000000000000..cc2b738428ff
--- /dev/null
+++ b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-0.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="A system-wide notifications module for libtinynotify"
+HOMEPAGE="https://bitbucket.org/mgorny/libtinynotify-systemwide/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="sys-process/procps
+ x11-libs/libtinynotify"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+src_configure() {
+ myeconfargs=(
+ $(use_enable doc gtk-doc)
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild
new file mode 100644
index 000000000000..5e70291e17ae
--- /dev/null
+++ b/x11-libs/libtinynotify-systemwide/libtinynotify-systemwide-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+DESCRIPTION="A system-wide notifications module for libtinynotify"
+HOMEPAGE="https://bitbucket.org/mgorny/libtinynotify-systemwide/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc static-libs"
+
+RDEPEND="sys-process/procps:0=
+ x11-libs/libtinynotify:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( dev-util/gtk-doc )"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+DEPEND="${DEPEND}
+ >=dev-util/gtk-doc-1.18"
+#endif
+
+src_configure() {
+ myeconfargs=(
+ $(use_enable doc gtk-doc)
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libtinynotify-systemwide/metadata.xml b/x11-libs/libtinynotify-systemwide/metadata.xml
new file mode 100644
index 000000000000..26adff3f76af
--- /dev/null
+++ b/x11-libs/libtinynotify-systemwide/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <maintainer status="active">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <bugs-to>https://bitbucket.org/mgorny/libtinynotify-systemwide/issues/</bugs-to>
+ <remote-id type="bitbucket">mgorny/libtinynotify-systemwide</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libtinynotify/Manifest b/x11-libs/libtinynotify/Manifest
new file mode 100644
index 000000000000..8f16ca2b5914
--- /dev/null
+++ b/x11-libs/libtinynotify/Manifest
@@ -0,0 +1 @@
+DIST libtinynotify-0.2.1.tar.bz2 286167 SHA256 2fee7d2f1bb17f1a5c499d32490ded06c1fd9e4300d0edf1b65615c5914dd07b SHA512 4d1d4eb56a654aef523aa5a81cafd51b64f7bf44130f3043d5d6b6ea88fbc7681d96cbde3c16cd00eb141145cb551018129f4bab03f542bf88425beda41cdca3 WHIRLPOOL 6a507e95b8dd9f7884f55f000ef2d76102f5b28b99bfc15f15466487229204b685099a7e6edeb3be1c07203d9f2dc3a3a666e92a22d16d1dc709727aa29d102b
diff --git a/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
new file mode 100644
index 000000000000..411ac059ba7a
--- /dev/null
+++ b/x11-libs/libtinynotify/libtinynotify-0.2.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="A lightweight implementation of Desktop Notification Spec"
+HOMEPAGE="https://github.com/mgorny/libtinynotify/"
+SRC_URI="mirror://github/mgorny/${PN}/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc static-libs"
+
+RDEPEND="sys-apps/dbus"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( >=dev-util/gtk-doc-1.18 )"
+
+DOCS=( README )
+
+src_configure() {
+ myeconfargs=(
+ $(use_enable debug)
+ $(use_enable doc gtk-doc)
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libtinynotify/libtinynotify-9999.ebuild b/x11-libs/libtinynotify/libtinynotify-9999.ebuild
new file mode 100644
index 000000000000..688da83d4204
--- /dev/null
+++ b/x11-libs/libtinynotify/libtinynotify-9999.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+#if LIVE
+AUTOTOOLS_AUTORECONF=yes
+EGIT_REPO_URI="http://bitbucket.org/mgorny/${PN}.git"
+
+inherit git-r3
+#endif
+
+inherit autotools-utils
+
+DESCRIPTION="A lightweight implementation of Desktop Notification Spec"
+HOMEPAGE="https://bitbucket.org/mgorny/libtinynotify/"
+SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc static-libs"
+
+RDEPEND="sys-apps/dbus:0="
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? ( >=dev-util/gtk-doc-1.18 )"
+
+#if LIVE
+KEYWORDS=
+SRC_URI=
+DEPEND="${DEPEND}
+ >=dev-util/gtk-doc-1.18"
+#endif
+
+src_configure() {
+ myeconfargs=(
+ $(use_enable debug)
+ $(use_enable doc gtk-doc)
+ )
+
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libtinynotify/metadata.xml b/x11-libs/libtinynotify/metadata.xml
new file mode 100644
index 000000000000..32808ea93fc4
--- /dev/null
+++ b/x11-libs/libtinynotify/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <upstream>
+ <maintainer status="active">
+ <email>mgorny@gentoo.org</email>
+ <name>Michał Górny</name>
+ </maintainer>
+ <bugs-to>https://bitbucket.org/mgorny/libtinynotify/issues/</bugs-to>
+ <remote-id type="bitbucket">mgorny/libtinynotify</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
new file mode 100644
index 000000000000..fd5074f856ee
--- /dev/null
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -0,0 +1,5 @@
+DIST libva-intel-driver-1.3.0.tar.bz2 965030 SHA256 734c15e78495f53fecb9862a22579d05ca5994fac4d04e3cc804ca9cbaa7fb6c SHA512 09566199409f76b8a533857c6bef26c35cd21b1555d29b395e72649fa0337b86b4a65eb5adf4144649ae26d5d8c93f1462d19011c95de9256728cadf56975e5d WHIRLPOOL 727b1bd14a55baa60092a5f2f9bc0bfb2ca39328103f812ccb3be8391246c0b0c4e99b596527e7189e2700d91d15aceed1e5284808644d46e26b2d470d67194f
+DIST libva-intel-driver-1.4.1.tar.bz2 980214 SHA256 fe6784c7ba6092204e3e7d4142e6023386b43f08127dae1243385078c5c21fec SHA512 1b0d868c50ae18dde025618618b984ffc71d3e7827edda125479a42cd4c197c8059f764c7ffe601d83c2838038a6dd18e6a80caf13176897ac271bec75644550 WHIRLPOOL 7b36831efc3619a315c5711210af06a8637411b59fd9941256248e783305b482df402c2bdc84d15175c01adc18abf8995b123e8952e6b525e69104833676f34e
+DIST libva-intel-driver-1.5.0.tar.bz2 1019243 SHA256 d0b448193ab34b622cd14e4db8ca29991a4038b4eb459a8fbbcbd7db843da3dc SHA512 aef41b40a9d926c2555e58258a65b82a406e24ab4e4e513390674dfabc05c8e6ebc31bf00adfd399800e81523f88209a4df286216fb8e7236c8f11f09061825e WHIRLPOOL 38879dcf16aa869478197463d619e13ae7fa4bcbe185a5ce724a4ba7e64dc914840add4c876697c52b8599adc401f42b24ee9307a7765e3f7caa541cdb5fd17c
+DIST libva-intel-driver-1.5.1.tar.bz2 1046744 SHA256 0bdb6c303d03ccb536ab726936448c3310deb3b914af51d7cae39b5539e0eadc SHA512 cb1298ffffbf43a42fca3a030ed2baecdb30468c8d2a8b1e5f2bb2849c3ce9956cb21a5da0a6482a2fba1b8a09358363237f8325e48d184e4ad49557546e7e25 WHIRLPOOL 5255e8653b9ac912b78bbd952c2de8ed00823892a54f9f9796811ff0638a13b5e3f1b73e6566f01fcb971aac0f9b25aba7a208adc5587e93c94dae5e829b83e3
+DIST libva-intel-driver-1.6.0.tar.bz2 1091478 SHA256 9876afe4610c01a8ee5ba9348266515fce4dd031139d580ad97984d06afa08d4 SHA512 8920d6a53bc13df519facdc3e8f2546ac2d27d7f512219f9f949c93563ff637af0abdb7487a26209b79d23db990ecbc4ba6b14f15d4fc0f65f264699509b9b74 WHIRLPOOL e1820defdc1d621e955f4511ad60529665d210b6d10e054b24781c441d5fcac75a077170dc86b4604f5bdeea5649f3e5a5a1b001916b286d5077cc4d427dbfa4
diff --git a/x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch
new file mode 100644
index 000000000000..9f0c0d4e8fef
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.5.1-wayland-automagic.patch
@@ -0,0 +1,20 @@
+--- configure.ac~ 2015-03-20 04:48:37.000000000 +0100
++++ configure.ac 2015-06-24 21:45:47.954846367 +0200
+@@ -164,12 +164,13 @@
+ PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland],
+ [AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is enabled])],
+ [USE_WAYLAND="no"])
++ m4_ifdef([WAYLAND_SCANNER_RULES],
++ [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
++ [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++
+ fi
+-AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+-m4_ifdef([WAYLAND_SCANNER_RULES],
+- [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
+- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+ AC_OUTPUT([
+ Makefile
diff --git a/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch
new file mode 100644
index 000000000000..f2707a00ad4f
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/libva-intel-driver-1.6.0-wayland-automagic.patch
@@ -0,0 +1,37 @@
+From 405437e31d3faf6adc32d887ae1945b8d93f7846 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Fri, 24 Jul 2015 17:01:23 +0200
+Subject: [PATCH] Do not require wayland-scanner if wayland is disabled
+
+Do not perform fatal wayland-scanner checks if wayland is disabled
+(either by --disable-wayland or wayland check failure) even if
+wayland-scanner macros are installed on the system.
+---
+ configure.ac | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6e73059..70eb275 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -168,9 +168,14 @@ if test "$enable_wayland" = "yes"; then
+ fi
+ AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+-m4_ifdef([WAYLAND_SCANNER_RULES],
+- [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
+- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
++if test "$USE_WAYLAND" = "yes"; then
++ m4_ifdef([WAYLAND_SCANNER_RULES],
++ [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
++ [wayland_scanner_rules=/dev/null; AC_SUBST_FILE(wayland_scanner_rules)])
++else
++ wayland_scanner_rules=/dev/null
++ AC_SUBST_FILE(wayland_scanner_rules)
++fi
+
+ AC_OUTPUT([
+ Makefile
+--
+2.4.6
+
diff --git a/x11-libs/libva-intel-driver/files/nox.patch b/x11-libs/libva-intel-driver/files/nox.patch
new file mode 100644
index 000000000000..ac41f4fa08e9
--- /dev/null
+++ b/x11-libs/libva-intel-driver/files/nox.patch
@@ -0,0 +1,27 @@
+commit bf324e3440246a487997a1624ac862e3e4027f9e
+Author: Michael Olbrich <m.olbrich@pengutronix.de>
+Date: Mon Aug 4 19:05:18 2014 +0200
+
+ add missing include
+
+ Without this building without HAVE_VA_X11 fails with:
+ [...]
+ In file included from i965_drv_video.c:37:0:
+ i965_output_wayland.h:31:26: error: unknown type name 'VADriverContextP'
+ i965_output_wayland.h:34:31: error: unknown type name 'VADriverContextP'
+ i965_drv_video.c:5243:9: error: 'i965_output_wayland_init' undeclared here (not in a function)
+ i965_drv_video.c:5244:9: error: 'i965_output_wayland_terminate' undeclared here (not in a function)
+ [....]
+
+diff --git a/src/i965_output_wayland.h b/src/i965_output_wayland.h
+index 61ca39f..acea8d9 100644
+--- a/src/i965_output_wayland.h
++++ b/src/i965_output_wayland.h
+@@ -26,6 +26,7 @@
+ #define I965_OUTPUT_WAYLAND_H
+
+ #include <stdbool.h>
++#include <va/va_backend.h>
+
+ bool
+ i965_output_wayland_init(VADriverContextP ctx);
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild
new file mode 100644
index 000000000000..395a921b8339
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.3.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.3.0[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.4.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.4.1.ebuild
new file mode 100644
index 000000000000..17e6f9579be7
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.4.1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild
new file mode 100644
index 000000000000..e57c247cd408
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+PATCHES=( "${FILESDIR}/nox.patch" )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild
new file mode 100644
index 000000000000..a085497801d0
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.5.1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.4[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ # Fix automagic depend, bug #529388
+ # https://bugs.freedesktop.org/show_bug.cgi?id=79478
+ "${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
+)
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild
new file mode 100644
index 000000000000..8c7d5093b967
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-1.6.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.6[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=(
+ # Fix automagic depend, bug #529388
+ # https://bugs.freedesktop.org/show_bug.cgi?id=79478
+ "${FILESDIR}"/${PN}-1.6.0-wayland-automagic.patch
+)
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
new file mode 100644
index 000000000000..fea13863510d
--- /dev/null
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/git/vaapi/intel-driver"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="HW video decode support for Intel integrated graphics"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-intel-driver/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm wayland X"
+
+RDEPEND=">=x11-libs/libva-1.6[X?,wayland?,drm?,${MULTILIB_USEDEP}]
+ !<x11-libs/libva-1.0.15[video_cards_intel]
+ >=x11-libs/libdrm-2.4.46[video_cards_intel,${MULTILIB_USEDEP}]
+ wayland? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ sed -e 's/intel-gen4asm/\0diSaBlEd/g' -i configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable drm)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-intel-driver/metadata.xml b/x11-libs/libva-intel-driver/metadata.xml
new file mode 100644
index 000000000000..59caf2126158
--- /dev/null
+++ b/x11-libs/libva-intel-driver/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>proxy-maintainers</herd>
+ <maintainer>
+ <email>aballier@gentoo.org</email>
+ <name>Alexis Ballier</name>
+ </maintainer>
+ <maintainer>
+ <email>jekarlson@gmail.com</email>
+ <name>Emil Karlson</name>
+ </maintainer>
+ <use>
+ <flag name='drm'>Enables VA/DRM API support.</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-libs/libva-vdpau-driver/Manifest b/x11-libs/libva-vdpau-driver/Manifest
new file mode 100644
index 000000000000..b79becd72945
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/Manifest
@@ -0,0 +1 @@
+DIST libva-vdpau-driver-0.7.4.tar.bz2 316729 SHA256 155c1982f0ac3f5435ba20b221bcaa11be212c37db548cd1f2a030ffa17e9bb9 SHA512 89f98dc1d7d590fb68f440dd1e37e025d64a621324e013e85dd1367681c07b09132fd2089539fc5b48934624648887a8a97539b4f07ddf9f56a8a456ad030094 WHIRLPOOL b6ba281a482dc944acff67d83d26d5a5ac7f15ea1de05c921383bdf0f6dae769d0389e6d15b607e01a8d4e18d3254f66391bbd497aa4e0eed2adbab54a13bce1
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
new file mode 100644
index 000000000000..74caee3483df
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-VAEncH264VUIBufferType.patch
@@ -0,0 +1,29 @@
+>From fda3706eb74ba5ad874853969f3df3e372739c8d Mon Sep 17 00:00:00 2001
+From: "Xiang, Haihao" <haihao.xiang@intel.com>
+Date: Fri, 21 Jun 2013 12:55:30 +0800
+Subject: [PATCH] VAEncH264VUIBufferType and VAEncH264SEIBufferType are
+ dropped from VA API
+
+The driver doesn't use them indeed
+
+Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
+---
+ src/vdpau_dump.c | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/src/vdpau_dump.c b/src/vdpau_dump.c
+index 899888b..610e7cd 100644
+--- a/src/vdpau_dump.c
++++ b/src/vdpau_dump.c
+@@ -59,8 +59,6 @@ const char *string_of_VABufferType(VABufferType type)
+ _(VAEncSequenceParameterBufferType);
+ _(VAEncPictureParameterBufferType);
+ _(VAEncSliceParameterBufferType);
+- _(VAEncH264VUIBufferType);
+- _(VAEncH264SEIBufferType);
+ #endif
+ #if VA_CHECK_VERSION(0,31,1)
+ _(VAQMatrixBufferType);
+--
+1.7.9.5
+
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
new file mode 100644
index 000000000000..221b9608fe44
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-glext-missing-definition.patch
@@ -0,0 +1,16 @@
+--- ./src/utils_glx.h~ 2012-10-05 16:02:58.000000000 +0100
++++ ./src/utils_glx.h 2012-10-19 08:44:12.469642440 +0100
+@@ -48,6 +48,13 @@
+ typedef void (*PFNGLXRELEASETEXIMAGEEXTPROC)(Display *, GLXDrawable, int);
+ #endif
+
++#if GL_GLEXT_VERSION >= 85
++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
++ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
++ Redefine the type here as an interim solution */
++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
++#endif
++
+ #ifndef GL_FRAMEBUFFER_BINDING
+ #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
+ #endif
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
new file mode 100644
index 000000000000..6d6d47ad0b06
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/517778
+
+--- src/vdpau_decode.c
++++ src/vdpau_decode.c
+@@ -1289,7 +1289,7 @@
+ driver_data,
+ obj_context->vdp_decoder,
+ obj_surface->vdp_surface,
+- (VdpPictureInfo)&obj_context->vdp_picture_info,
++ (VdpPictureInfo *)&obj_context->vdp_picture_info,
+ obj_context->vdp_bitstream_buffers_count,
+ obj_context->vdp_bitstream_buffers
+ );
diff --git a/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-nouveau.patch b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-nouveau.patch
new file mode 100644
index 000000000000..b69769849302
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-nouveau.patch
@@ -0,0 +1,8 @@
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -1,4 +1,5 @@
+ DRIVERS = nvidia
++DRIVERS += nouveau
+ DRIVERS += s3g # native VA-API driver is too old, so use VDPAU based one
+
+ INCLUDES = \
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild
new file mode 100644
index 000000000000..e1389290f264
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib eutils
+
+DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="debug opengl"
+
+RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ >=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]
+ !x11-libs/vdpau-video"
+
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
+
+DOCS=( NEWS README AUTHORS )
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-glext-missing-definition.patch \
+ "${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch \
+ "${FILESDIR}"/${P}-libvdpau-0.8.patch
+ sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable opengl glx)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r3.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r3.ebuild
new file mode 100644
index 000000000000..d06690f611e2
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-0.7.4-r3.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib eutils
+
+DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug opengl"
+
+RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ >=x11-libs/libvdpau-0.8[${MULTILIB_USEDEP}]
+ !x11-libs/vdpau-video"
+
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
+
+DOCS=( NEWS README AUTHORS )
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-glext-missing-definition.patch \
+ "${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch \
+ "${FILESDIR}"/${P}-libvdpau-0.8.patch \
+ "${FILESDIR}"/${P}-nouveau.patch
+ sed -i 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable opengl glx)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild
new file mode 100644
index 000000000000..758086f695a7
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/libva-vdpau-driver-9999.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/vdpau-driver"
+fi
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="VDPAU Backend for Video Acceleration (VA) API"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva-vdpau-driver/${P}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86"
+else
+ KEYWORDS=""
+fi
+IUSE="debug opengl"
+
+RDEPEND=">=x11-libs/libva-1.2.1-r1[X,opengl?,${MULTILIB_USEDEP}]
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}]
+ !x11-libs/vdpau-video"
+
+DEPEND="${DEPEND}
+ virtual/pkgconfig"
+
+DOCS=( NEWS README AUTHORS )
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable opengl glx)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva-vdpau-driver/metadata.xml b/x11-libs/libva-vdpau-driver/metadata.xml
new file mode 100644
index 000000000000..2861eaad42d0
--- /dev/null
+++ b/x11-libs/libva-vdpau-driver/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>
+ <maintainer>
+ <email>aballier@gentoo.org</email>
+ <name>Alexis Ballier</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
new file mode 100644
index 000000000000..0ca3c43e81c5
--- /dev/null
+++ b/x11-libs/libva/Manifest
@@ -0,0 +1,6 @@
+DIST libva-1.3.1.tar.bz2 760656 SHA256 8789b1f1ca9cbc2c1ae477323ec8f5fb269b9360410d4d5e9ec96d679b3cc297 SHA512 12afa39b965c50beb4a3f356b0fea18123d885a3c24b452a59906db38369362b290b35eaebcbc3e6079aa5d63f8d9c263d236bde9744d4b3725497bc700e5661 WHIRLPOOL 71feddc30e44fa1e461dad93a2342a65b9fa3319a044561037e96879ce166b09d82b6ea9898735cfe54812f9964a3310d80e822c9abb7a0d4b9e9acabd8a2488
+DIST libva-1.4.0.tar.bz2 769099 SHA256 70c36e6bd1159658043d655372cecf7a45d90c168df8868c112ed2189a6b7651 SHA512 f49a3c4bcd3d9b7813daa3793bec0ccbd54859c4b116e7009e9877d580a506f94f272600bba74cc5b2ef2caead15d24104d92f501a5fc5d02d62d7fac4f3da3c WHIRLPOOL bc936bb97682cfb93b5d050439330942908e1f45c8159d9cde9c6299b5eaaf7909a2aea3950308ff37d3c0945b59692b9b7013e25119e8d07d47c16ce41c5939
+DIST libva-1.4.1.tar.bz2 761421 SHA256 0662af0ecdf1cfd2bb47e86f5bf66009554fe12ce7bf5b9cec6a2cc43f3f4c11 SHA512 f5da66de96fcc1c7a86eae3a8b1cfd9d1e56d5f647be8fd831061e2a55b3ee98c4ecd392c518ae29d1c315b7358c6eda2c2727ee4386a0754b8b0be027a6e3fa WHIRLPOOL 8cf1e02f9ea9be36abfacc962013c7c41ad32dd03abffd104cc4273a8e5adbad64ae283cbe49cc4651c9f73818b8067bc7937bb747e7baf6f4396dbe389e0f8d
+DIST libva-1.5.0.tar.bz2 774266 SHA256 e946d4b3110e4e23ec6a588e0c828937e502c67196d1266214441fefc4b83486 SHA512 68f7605678b7c617edce8d81d88880806c92b431147614b4f802f0f93d844f14f6d3756040002d063ef4d049e2949958ea0f95a3bb2eafc8f47729c0ee97905a WHIRLPOOL 5cb34734061421d19d968e4f1bbc1629e31aeebadf1b61c9d9e5445c739ab5451fd4507cf44999c4c0067a0322a1649afd6289a7eb7aeea90deb9058f234cbfa
+DIST libva-1.5.1.tar.bz2 761390 SHA256 2511b25ead7a6ac1358bc4b81157647fef61e3904ccaca3cfefc3e976a0da005 SHA512 f3198c7b138974c75b0a929c26b15b4b72ec38fccd782a6d0b4df7ab0d496ceb14beac6837da13806c9dcfe6576d2cf585c01acd6e90ba0542d43c07efe530d8 WHIRLPOOL fc711102dbfab7ce3f81ef91d27e943d75217d668ec7605de75168b758f0465aeecd7f7b16407bf7fb48ea4367f1d589e9fabdd7e583803ae2aecf4a0ca4f74a
+DIST libva-1.6.0.tar.bz2 786561 SHA256 3ad9dc9c1a6a10e9cc4234c2a1cd5e568ec0cd25145e86875eba6e0d69153458 SHA512 59a451e42bdb70bca83e90800763e0a1a666044189d6399acf1d539b5ebb85d6e12317e8c7f7a97345549de9fd34ee4c7dc52d17ad5c3eb083f80aa15d1b8ed0 WHIRLPOOL a930d02a64c3caf33146aaf8340a4e1850d693595e3455406680d4611a092c779a3c4dbd97628b3a8e3340327262940f161b5fe925bf9a62022801b027a99a2b
diff --git a/x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch b/x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch
new file mode 100644
index 000000000000..6d36154ea027
--- /dev/null
+++ b/x11-libs/libva/files/libva-1.2.0-autotools-out-of-source-build.patch
@@ -0,0 +1,11 @@
+--- a/va/Makefile.am 2013-06-26 21:45:56.000000000 -0400
++++ b/va/Makefile.am 2014-01-29 14:41:48.878917222 -0500
+@@ -59,7 +59,7 @@
+
+ libva_ldflags = \
+ $(LDADD) -no-undefined \
+- -Wl,-version-script,libva.syms \
++ -Wl,-version-script,$(top_srcdir)/va/libva.syms \
+ $(NULL)
+
+ lib_LTLIBRARIES = libva.la
diff --git a/x11-libs/libva/files/libva-1.5.1-wayland-automagic.patch b/x11-libs/libva/files/libva-1.5.1-wayland-automagic.patch
new file mode 100644
index 000000000000..d55c3f5da840
--- /dev/null
+++ b/x11-libs/libva/files/libva-1.5.1-wayland-automagic.patch
@@ -0,0 +1,19 @@
+--- a/configure.ac 2015-06-14 18:17:48.776175722 +0200
++++ b/configure.ac 2015-06-14 18:26:45.710159385 +0200
+@@ -275,14 +275,13 @@
+ if test "$USE_WAYLAND" = "yes"; then
+ AC_DEFINE([HAVE_VA_WAYLAND], [1],
+ [Defined to 1 if VA/Wayland API is built])
++ m4_ifdef([WAYLAND_SCANNER_RULES],
++ [WAYLAND_SCANNER_RULES(['$(top_buildir)/va/wayland/protocol'])],
++ [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
+ fi
+ fi
+ AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
+
+-m4_ifdef([WAYLAND_SCANNER_RULES],
+- [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
+- [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
+-
+ pkgconfigdir=${libdir}/pkgconfig
+ AC_SUBST(pkgconfigdir)
diff --git a/x11-libs/libva/libva-1.3.1.ebuild b/x11-libs/libva/libva-1.3.1.ebuild
new file mode 100644
index 000000000000..d30c7383e923
--- /dev/null
+++ b/x11-libs/libva/libva-1.3.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+REQUIRED_USE="|| ( drm wayland X )"
+
+VIDEO_CARDS="dummy nvidia intel fglrx"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+ egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_fglrx? (
+ || ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+ >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+ )
+ video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ "
+
+REQUIRED_USE="opengl? ( X )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable video_cards_dummy dummy-driver)
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable egl)
+ $(use_enable drm)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.4.0.ebuild b/x11-libs/libva/libva-1.4.0.ebuild
new file mode 100644
index 000000000000..abf7e95bec2d
--- /dev/null
+++ b/x11-libs/libva/libva-1.4.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+REQUIRED_USE="|| ( drm wayland X )"
+
+VIDEO_CARDS="dummy nvidia intel fglrx"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+ egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_fglrx? (
+ || ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+ >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+ )
+ video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ "
+
+REQUIRED_USE="opengl? ( X )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable video_cards_dummy dummy-driver)
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable egl)
+ $(use_enable drm)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.4.1.ebuild b/x11-libs/libva/libva-1.4.1.ebuild
new file mode 100644
index 000000000000..abf7e95bec2d
--- /dev/null
+++ b/x11-libs/libva/libva-1.4.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+REQUIRED_USE="|| ( drm wayland X )"
+
+VIDEO_CARDS="dummy nvidia intel fglrx"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+ egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_fglrx? (
+ || ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+ >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+ )
+ video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ "
+
+REQUIRED_USE="opengl? ( X )"
+
+PATCHES=( "${FILESDIR}/${PN}-1.2.0-autotools-out-of-source-build.patch" )
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable video_cards_dummy dummy-driver)
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable egl)
+ $(use_enable drm)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.5.0.ebuild b/x11-libs/libva/libva-1.5.0.ebuild
new file mode 100644
index 000000000000..6a9ffcb47925
--- /dev/null
+++ b/x11-libs/libva/libva-1.5.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+REQUIRED_USE="|| ( drm wayland X )"
+
+VIDEO_CARDS="dummy nvidia intel fglrx"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+ egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_fglrx? (
+ || ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+ >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+ )
+ video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ "
+
+REQUIRED_USE="opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable video_cards_dummy dummy-driver)
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable egl)
+ $(use_enable drm)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.5.1.ebuild b/x11-libs/libva/libva-1.5.1.ebuild
new file mode 100644
index 000000000000..1fc18992d0e0
--- /dev/null
+++ b/x11-libs/libva/libva-1.5.1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+REQUIRED_USE="|| ( drm wayland X )"
+
+VIDEO_CARDS="dummy nvidia intel fglrx nouveau"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+ egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_fglrx? (
+ || ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+ >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+ )
+ video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ "
+
+REQUIRED_USE="opengl? ( X )"
+
+DOCS=( NEWS )
+
+PATCHES=(
+ # Fix automagic depend, bug #529388
+ # https://bugs.freedesktop.org/show_bug.cgi?id=79478
+ "${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable video_cards_dummy dummy-driver)
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable egl)
+ $(use_enable drm)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-1.6.0.ebuild b/x11-libs/libva/libva-1.6.0.ebuild
new file mode 100644
index 000000000000..cc740acf1908
--- /dev/null
+++ b/x11-libs/libva/libva-1.6.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+
+VIDEO_CARDS="dummy nvidia intel fglrx nouveau"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+ egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_fglrx? (
+ || ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+ >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+ )
+ video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ "
+
+REQUIRED_USE="|| ( drm wayland X )
+ opengl? ( X )"
+
+DOCS=( NEWS )
+
+PATCHES=(
+ # Fix automagic depend, bug #529388
+ # https://bugs.freedesktop.org/show_bug.cgi?id=79478
+ "${FILESDIR}"/${PN}-1.5.1-wayland-automagic.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable video_cards_dummy dummy-driver)
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable egl)
+ $(use_enable drm)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild
new file mode 100644
index 000000000000..a882b76a5066
--- /dev/null
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+SCM=""
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SCM=git-2
+ EGIT_BRANCH=master
+ EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/libva"
+fi
+
+AUTOTOOLS_AUTORECONF="yes"
+inherit autotools-multilib ${SCM} multilib
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+if [ "${PV%9999}" != "${PV}" ] ; then # Live ebuild
+ SRC_URI=""
+ S="${WORKDIR}/${PN}"
+else
+ SRC_URI="http://www.freedesktop.org/software/vaapi/releases/libva/${P}.tar.bz2"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+if [ "${PV%9999}" = "${PV}" ] ; then
+ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+else
+ KEYWORDS=""
+fi
+IUSE="+drm egl opengl vdpau wayland X"
+
+VIDEO_CARDS="dummy nvidia intel fglrx nouveau"
+for x in ${VIDEO_CARDS}; do
+ IUSE+=" video_cards_${x}"
+done
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
+ )
+ egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] )
+ vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] )
+ video_cards_fglrx? (
+ || ( >=x11-drivers/ati-drivers-14.12-r3[${MULTILIB_USEDEP}]
+ >=x11-libs/xvba-video-0.8.0-r1[${MULTILIB_USEDEP}] )
+ )
+ video_cards_intel? ( >=x11-libs/libva-intel-driver-1.2.2-r1[${MULTILIB_USEDEP}] )
+ "
+
+REQUIRED_USE="|| ( drm wayland X )
+ opengl? ( X )"
+
+DOCS=( NEWS )
+
+MULTILIB_WRAPPED_HEADERS=(
+/usr/include/va/va_backend_glx.h
+/usr/include/va/va_x11.h
+/usr/include/va/va_dri2.h
+/usr/include/va/va_dricommon.h
+/usr/include/va/va_glx.h
+)
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers"
+ $(use_enable video_cards_dummy dummy-driver)
+ $(use_enable opengl glx)
+ $(use_enable X x11)
+ $(use_enable wayland)
+ $(use_enable egl)
+ $(use_enable drm)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/libva/metadata.xml b/x11-libs/libva/metadata.xml
new file mode 100644
index 000000000000..8aef4bbadb48
--- /dev/null
+++ b/x11-libs/libva/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>aballier@gentoo.org</email>
+ <name>Alexis Ballier</name>
+ </maintainer>
+ <use>
+ <flag name='egl'>Enables EGL support.</flag>
+ <flag name='drm'>Enables VA/DRM API support.</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest
new file mode 100644
index 000000000000..dc449a0f2167
--- /dev/null
+++ b/x11-libs/libvdpau/Manifest
@@ -0,0 +1,3 @@
+DIST libvdpau-0.7.tar.gz 486636 SHA256 24dc08467ce8c59d6cfbf0d34d2dd1f86b4ff62e90777e0a8f513c5c9de9bce0 SHA512 c0ebb124956372a59eaa7e5c9330b6d4f32acd924aa620c4c037f3917623860887231b9b9f4c0a375a300c82a3e0b7284afbe9139d8562f6a74a85848d362286 WHIRLPOOL d88a439231267386b53b4e9be8820e225f40bf8e77895f2d28fbcbd1ced19e70d23d49a55618d0bcadd44086f5df880badff47d05871c6e6fee02a5cf075ef15
+DIST libvdpau-0.8.tar.gz 487359 SHA256 73a7d11cc1abed8bcaf1392bd361fc00fd43bd85bbeafb12a64bdd0bcb4101ed SHA512 c7e7c74f4849f83bed170f4428c381f868f34cbb59444c4e65af4ad1eac19ea9450aa422b35af6c031c2b168a73282fe7bf96d69d5581f24d3c689aa849d1c56 WHIRLPOOL f1ff7d08e326abc1750f0faca9359c366f98970f562dd56037d674d971183cf39289afe0b83192cc162fcfad92ebb3b24f1f652df59095d53b30da90e77a3347
+DIST libvdpau-0.9.tar.gz 526619 SHA256 e32957140835a545a01a3972db1143e01174db3d9c0017e51f6a3bf8b09c0e6e SHA512 8e69712a91e17c3388742f2a4c0a8887113fe06a81dbedf1faa7fc3985a289cd067a9134399f9747fd4b3b1499c46e7871a3b34f74f6e9c95b07ea877739e51f WHIRLPOOL b04824b5867636c25f029909fd9c82fe142bafcbe2544234c31cf34b4616417c362801b8ab817e59b741eb3b8232b0dedef1664dbd5a856cec6634328eb6defc
diff --git a/x11-libs/libvdpau/libvdpau-0.7.ebuild b/x11-libs/libvdpau/libvdpau-0.7.ebuild
new file mode 100644
index 000000000000..d3660d6f0238
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-0.7.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools-multilib
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc dri"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+ !=x11-drivers/nvidia-drivers-180*
+ !=x11-drivers/nvidia-drivers-185*
+ !=x11-drivers/nvidia-drivers-190*
+ abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ virtual/latex-base
+ )
+ dri? ( >=x11-proto/dri2proto-2.2 )"
+
+src_configure() {
+ local myeconfargs=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable doc documentation)
+ $(use dri || echo --disable-dri2)
+ )
+
+ autotools-multilib_src_configure
+}
+
+src_install() {
+ autotools-multilib_src_install
+ prune_libtool_files --modules
+}
diff --git a/x11-libs/libvdpau/libvdpau-0.8.ebuild b/x11-libs/libvdpau/libvdpau-0.8.ebuild
new file mode 100644
index 000000000000..f0efcf65c56c
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-0.8.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIRTUALX_REQUIRED="test"
+inherit autotools-multilib virtualx
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc dri"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+ !=x11-drivers/nvidia-drivers-180*
+ !=x11-drivers/nvidia-drivers-185*
+ !=x11-drivers/nvidia-drivers-190*
+ abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ virtual/latex-base
+ )
+ dri? ( >=x11-proto/dri2proto-2.2 )"
+
+src_configure() {
+ local myeconfargs=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable doc documentation)
+ $(use dri || echo --disable-dri2)
+ )
+
+ autotools-multilib_src_configure
+}
+
+multilib_src_test() {
+ Xemake check
+}
+
+src_install() {
+ autotools-multilib_src_install
+ prune_libtool_files --modules
+}
diff --git a/x11-libs/libvdpau/libvdpau-0.9.ebuild b/x11-libs/libvdpau/libvdpau-0.9.ebuild
new file mode 100644
index 000000000000..e3d3000cf1de
--- /dev/null
+++ b/x11-libs/libvdpau/libvdpau-0.9.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+VIRTUALX_REQUIRED="test"
+inherit autotools-multilib virtualx
+
+DESCRIPTION="VDPAU wrapper and trace libraries"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/VDPAU"
+SRC_URI="http://people.freedesktop.org/~aplattner/vdpau/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha amd64 x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc dri"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ dri? ( >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] )
+ !=x11-drivers/nvidia-drivers-180*
+ !=x11-drivers/nvidia-drivers-185*
+ !=x11-drivers/nvidia-drivers-190*
+ abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ media-gfx/graphviz
+ virtual/latex-base
+ )
+ dri? ( >=x11-proto/dri2proto-2.2 )"
+
+src_configure() {
+ local myeconfargs=(
+ --docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable doc documentation)
+ $(use dri || echo --disable-dri2)
+ )
+
+ autotools-multilib_src_configure
+}
+
+multilib_src_test() {
+ Xemake check
+}
+
+src_install() {
+ autotools-multilib_src_install
+ prune_libtool_files --modules
+}
diff --git a/x11-libs/libvdpau/metadata.xml b/x11-libs/libvdpau/metadata.xml
new file mode 100644
index 000000000000..a445a73fcbed
--- /dev/null
+++ b/x11-libs/libvdpau/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>cardoe@gentoo.org</email>
+ <name>Doug Goldstein</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libview/Manifest b/x11-libs/libview/Manifest
new file mode 100644
index 000000000000..4daf52084aa7
--- /dev/null
+++ b/x11-libs/libview/Manifest
@@ -0,0 +1 @@
+DIST libview-0.6.6.tar.bz2 304958 SHA256 2b991bf150c5488b43f807e89bdbd64b2eb3bd433abbdfb68c3eec52cbaa59ab SHA512 28f710130c70b45f7a4601ff65aee5092641d53ba74d2c44a4e33e2c9d2bcae82abd86e8458fa64ae8cf7c04c6dd1dc7e6af8084201398e373b7cd146ea6c880 WHIRLPOOL 158b421da29a98989e48413906e0b178f89ba015eb23f69d65586a04f819271fb89d5b1e8cc80371dcada033b5f2acba2b982a09972e61bc0279127ed699eb48
diff --git a/x11-libs/libview/files/libview-0.5.6-pcfix.patch b/x11-libs/libview/files/libview-0.5.6-pcfix.patch
new file mode 100644
index 000000000000..8df5d414da94
--- /dev/null
+++ b/x11-libs/libview/files/libview-0.5.6-pcfix.patch
@@ -0,0 +1,17 @@
+--- libview.pc.in
++++ libview.pc.in
+@@ -1,9 +1,11 @@
+-prefix=${prefix}
++prefix=@prefix@
++exec_prefix=${prefix}
+ libdir=${exec_prefix}/lib
+ includedir=${prefix}/include
+
+ Name: libview
+ Description: VMware's Incredibly Exciting Widgets for GTK+
+ Version: @VERSION@
+-Libs: -L${libdir} -lview @PACKAGE_LIBS@
+-Cflags: -I${includedir} @PACKAGE_CFLAGS@
++Libs: -L${libdir} -lview
++Libs.private: @VIEW_LIBS@
++Cflags: -I${includedir} @VIEW_CFLAGS@
diff --git a/x11-libs/libview/libview-0.6.6-r2.ebuild b/x11-libs/libview/libview-0.6.6-r2.ebuild
new file mode 100644
index 000000000000..5ae6e983563f
--- /dev/null
+++ b/x11-libs/libview/libview-0.6.6-r2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="no"
+
+inherit autotools eutils gnome2
+
+DESCRIPTION="VMware's Incredibly Exciting Widgets"
+HOMEPAGE="http://view.sourceforge.net"
+SRC_URI="mirror://sourceforge/view/${P}.tar.bz2"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="static-libs"
+
+RDEPEND="
+ >=x11-libs/gtk+-2.4.0:2
+ dev-cpp/gtkmm:2.4
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Fix the pkgconfig file
+ epatch "${FILESDIR}"/${PN}-0.5.6-pcfix.patch
+ eautoreconf -i
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-deprecated \
+ $(use_enable static-libs static)
+}
diff --git a/x11-libs/libview/metadata.xml b/x11-libs/libview/metadata.xml
new file mode 100644
index 000000000000..d34f18b75014
--- /dev/null
+++ b/x11-libs/libview/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>vmware</herd>
+ <longdescription lang="en">
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">view</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
new file mode 100644
index 000000000000..d7b0820ed65d
--- /dev/null
+++ b/x11-libs/libwnck/Manifest
@@ -0,0 +1,3 @@
+DIST libwnck-2.31.0.tar.xz 630792 SHA256 83f732d20781fc88b22cdc6aaf2d4f388db6d3d4ff28d1a8fd45be9fb7743a9e SHA512 54262a08882021f08f3ba7f2ddfa33fc1f02e391a0f61cf999a50a089e0d277dfe13ab133c1a46e9abf0599bd24c21dacff80b51013cbb1375d2cd71ac9abbe9 WHIRLPOOL 369c0ce1f412a0874d2f3a09e387405632726259427fff013adc4d619f4f9f80b57e376252746bdc7fe54f27749e51127ccc0870a80629cb98afb45dc420f941
+DIST libwnck-3.14.0.tar.xz 675916 SHA256 f5080076346609b4c36394b879f3a86b92ced3b90a37cb54c8e9a14f00e7921c SHA512 bf5953d06697b6f623f82fe3ab3158ad3a794712bf08822fe901023e740afe4b47cc026854707b77c0c63d38614133fbef589d62385a39b99ce7e8c66c8940be WHIRLPOOL 945127110134e3b23f986fb3024b6a77577f42f9067e5760663849351687969398da0e69dca29f2e0950c8f5f364eb9e822c25d719c2f976fbf36f2e13c89d5c
+DIST libwnck-3.4.9.tar.xz 674396 SHA256 96e6353f2701a1ea565ece54d791a7bebef1832d96126f7377c54bb3516682c4 SHA512 58397ab9c3ea8517503cbc51c5e72ffadfba882146936855a65756ada28339303408df17517cd6711f26bca6236e66a8755177849af28292fcc4820ce64d28b2 WHIRLPOOL 93366bbcbc45a17aff607c7db9d7d057013671f34762248388b343975c932ca174b0d471fab23b93f1d05e5064f9945a9734dceb88f0cf90cfdeab916e0e0e1f
diff --git a/x11-libs/libwnck/libwnck-2.31.0.ebuild b/x11-libs/libwnck/libwnck-2.31.0.ebuild
new file mode 100644
index 000000000000..d917a6f54cb7
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-2.31.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GNOME2_LA_PUNT="yes"
+GCONF_DEBUG="no"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="LGPL-2+"
+SLOT="1"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection startup-notification"
+
+RDEPEND="
+ >=x11-libs/gtk+-2.19.7:2[introspection?]
+ >=dev-libs/glib-2.16:2
+ x11-libs/libX11
+ x11-libs/libXres
+ x11-libs/libXext
+ introspection? ( >=dev-libs/gobject-introspection-0.6.14:= )
+ startup-notification? ( >=x11-libs/startup-notification-0.4 )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40
+ sys-devel/gettext
+ virtual/pkgconfig
+ x86-interix? ( sys-libs/itx-bind )
+"
+# eautoreconf needs
+# gnome-base/gnome-common
+
+src_prepare() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ # Regenerate pregenerated marshalers for <glib-2.31 compatibility
+ rm -v libwnck/wnck-marshal.{c,h} || die "rm failed"
+
+ gnome2_src_prepare
+
+ if use x86-interix; then
+ # activate the itx-bind package...
+ append-flags "-I${EPREFIX}/usr/include/bind"
+ append-ldflags "-L${EPREFIX}/usr/lib/bind"
+ fi
+}
+
+src_configure () {
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable startup-notification)
+}
diff --git a/x11-libs/libwnck/libwnck-3.14.0.ebuild b/x11-libs/libwnck/libwnck-3.14.0.ebuild
new file mode 100644
index 000000000000..78a69a0b2864
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-3.14.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection startup-notification tools"
+
+RDEPEND="
+ x11-libs/cairo[X]
+ >=x11-libs/gtk+-3.10:3[introspection?]
+ >=dev-libs/glib-2.32:2
+ x11-libs/libX11
+ x11-libs/libXres
+ x11-libs/libXext
+ introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
+ startup-notification? ( >=x11-libs/startup-notification-0.4 )
+ x86-interix? ( sys-libs/itx-bind )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+# eautoreconf needs
+# gnome-base/gnome-common
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ if use x86-interix; then
+ # activate the itx-bind package...
+ append-flags "-I${EPREFIX}/usr/include/bind"
+ append-ldflags "-L${EPREFIX}/usr/lib/bind"
+ fi
+
+ # Don't collide with SLOT=1
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable startup-notification) \
+ $(use_enable tools) \
+ --program-suffix=-${SLOT}
+}
diff --git a/x11-libs/libwnck/libwnck-3.4.9.ebuild b/x11-libs/libwnck/libwnck-3.4.9.ebuild
new file mode 100644
index 000000000000..06e8d95f60c0
--- /dev/null
+++ b/x11-libs/libwnck/libwnck-3.4.9.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit flag-o-matic gnome2
+
+DESCRIPTION="A window navigation construction kit"
+HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
+
+LICENSE="LGPL-2+"
+SLOT="3"
+KEYWORDS="alpha amd64 arm ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
+IUSE="+introspection startup-notification tools"
+
+RDEPEND="
+ >=x11-libs/gtk+-3.4:3[introspection?]
+ >=dev-libs/glib-2.32:2
+ x11-libs/libX11
+ x11-libs/libXres
+ x11-libs/libXext
+ introspection? ( >=dev-libs/gobject-introspection-0.6.14 )
+ startup-notification? ( >=x11-libs/startup-notification-0.4 )
+ x86-interix? ( sys-libs/itx-bind )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.40.6
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+# eautoreconf needs
+# gnome-base/gnome-common
+
+src_configure() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ if use x86-interix; then
+ # activate the itx-bind package...
+ append-flags "-I${EPREFIX}/usr/include/bind"
+ append-ldflags "-L${EPREFIX}/usr/lib/bind"
+ fi
+
+ # Don't collide with SLOT=1
+ gnome2_src_configure \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable startup-notification) \
+ $(use_enable tools) \
+ --program-suffix=-${SLOT}
+}
diff --git a/x11-libs/libwnck/metadata.xml b/x11-libs/libwnck/metadata.xml
new file mode 100644
index 000000000000..8e1b6e57a01a
--- /dev/null
+++ b/x11-libs/libwnck/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>gnome</herd>
+ <use>
+ <flag name="tools">Install wnckprop-3 and wnck-urgency-monitor-3
+ command-line tools</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-libs/libxcb/Manifest b/x11-libs/libxcb/Manifest
new file mode 100644
index 000000000000..fc5131a557b6
--- /dev/null
+++ b/x11-libs/libxcb/Manifest
@@ -0,0 +1,4 @@
+DIST libxcb-1.10.tar.bz2 475211 SHA256 98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5 SHA512 c29ab5027498635d58fd7bfcd77899a406116b25fa8c4ec6513fc1395d8a0f99f602ad20b507660a62000b6fc879860d182cafd29af590e8b14f55150a064f7a WHIRLPOOL 4e11ffa276ef717e8f14183385413b30b52e8848669bf0f3075fb82adf4a4e94d8a98a2505797be055ff9f546e4fc11e94ba148099b6a0c2998da3e0f20fe99a
+DIST libxcb-1.11.tar.bz2 517700 SHA256 03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7 SHA512 718f9a44a621daae93eb94dc7b795743253c801ea98efd2041794823fdc8f5eeb031b1fa7d34b72e7a8fccf850d98f2373a49927c8d3198c1d4850af6ae14bb1 WHIRLPOOL 11e9bf3445977570884006de01a2ed44caf273c27d7d9908307cc81d82bba9995de6a0a3c3ef62bd9a06f56e977310616dc7eda909409d199b52305b2b4b0e36
+DIST libxcb-1.9.1.tar.bz2 373312 SHA256 d44a5ff4eb0b9569e6f7183b51fdaf6f58da90e7d6bfc36b612d7263f83e362f SHA512 541d6e07b1a0da61c3cc1dbdae50ce4e55f1a27e79e277db5af192d02c8360bb3958c597d6692f2c6afcf009ae7b312459f65e8c8d2f1bcc446f7f512bacdd41 WHIRLPOOL cc2af531d5beddec577507d4cf983262069144d7e9667958ce03bba6ceebb907488ddf475253e856b879e81333cfac8bfbc2c8092d60fbfa49a3b447af6e6f68
+DIST libxcb-1.9.3.tar.bz2 400283 SHA256 aad09d223fcb5bd345ce4d1737f178a557b6f2e201128e1ee3c83af46028018b SHA512 796673c8df6bf0e3e1f847a3d565502b4ff4e4981c9104c6ca0367d7a15bffd266860dfb545366a4d96695efd060afe205b990983e08b4da8470a7f0a8d4a7a1 WHIRLPOOL 6de787900ef93c13d304739862b04d6c582dbafeebadf9b260064da92821f0681198364265fe5bcaf12f34f9a9020e3ad7e2dbbdb7cd627a909d803105df2f8b
diff --git a/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
new file mode 100644
index 000000000000..0f8aa1198234
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch
@@ -0,0 +1,257 @@
+From e9b5234b3b0b53bd3a35f947ddb8a72d03cf1825 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Mon, 29 Dec 2014 20:18:22 +0100
+Subject: [PATCH] Don't install headers/man pages for disabled extensions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+https://bugs.gentoo.org/show_bug.cgi?id=533906
+
+Signed-off-by: Rémi Cardona <remi@gentoo.org>
+---
+ src/Makefile.am | 52 ++++++++++++++++++++++++++--------------------------
+ 1 file changed, 26 insertions(+), 26 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5a3c52a..774ad8e 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -24,208 +24,208 @@ XCB_LIBS = libxcb.la
+
+ # FIXME: find a way to autogenerate this from the XML files.
+
+-EXTSOURCES += composite.c
+ if BUILD_COMPOSITE
++EXTSOURCES += composite.c
+ lib_LTLIBRARIES += libxcb-composite.la
+ libxcb_composite_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_composite_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_composite_la_SOURCES = composite.c composite.h
+ endif
+
+-EXTSOURCES += damage.c
+ if BUILD_DAMAGE
++EXTSOURCES += damage.c
+ lib_LTLIBRARIES += libxcb-damage.la
+ libxcb_damage_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_damage_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_damage_la_SOURCES = damage.c damage.h
+ endif
+
+-EXTSOURCES += dpms.c
+ if BUILD_DPMS
++EXTSOURCES += dpms.c
+ lib_LTLIBRARIES += libxcb-dpms.la
+ libxcb_dpms_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_dpms_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_dpms_la_SOURCES = dpms.c dpms.h
+ endif
+
+-EXTSOURCES += dri2.c
+ if BUILD_DRI2
++EXTSOURCES += dri2.c
+ lib_LTLIBRARIES += libxcb-dri2.la
+ libxcb_dri2_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_dri2_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_dri2_la_SOURCES = dri2.c dri2.h
+ endif
+
+-EXTSOURCES += dri3.c
+ if BUILD_DRI3
++EXTSOURCES += dri3.c
+ lib_LTLIBRARIES += libxcb-dri3.la
+ libxcb_dri3_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_dri3_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_dri3_la_SOURCES = dri3.c dri3.h
+ endif
+
+-EXTSOURCES += present.c
+ if BUILD_PRESENT
++EXTSOURCES += present.c
+ lib_LTLIBRARIES += libxcb-present.la
+ libxcb_present_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_present_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_present_la_SOURCES = present.c present.h
+ endif
+
+-EXTSOURCES += glx.c
+ if BUILD_GLX
+ lib_LTLIBRARIES += libxcb-glx.la
++EXTSOURCES += glx.c
+ libxcb_glx_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_glx_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_glx_la_SOURCES = glx.c glx.h
+ endif
+
+-EXTSOURCES += randr.c
+ if BUILD_RANDR
++EXTSOURCES += randr.c
+ lib_LTLIBRARIES += libxcb-randr.la
+ libxcb_randr_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
+ libxcb_randr_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_randr_la_SOURCES = randr.c randr.h
+ endif
+
+-EXTSOURCES += record.c
+ if BUILD_RECORD
++EXTSOURCES += record.c
+ lib_LTLIBRARIES += libxcb-record.la
+ libxcb_record_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_record_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_record_la_SOURCES = record.c record.h
+ endif
+
+-EXTSOURCES += render.c
+ if BUILD_RENDER
++EXTSOURCES += render.c
+ lib_LTLIBRARIES += libxcb-render.la
+ libxcb_render_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_render_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_render_la_SOURCES = render.c render.h
+ endif
+
+-EXTSOURCES += res.c
+ if BUILD_RESOURCE
++EXTSOURCES += res.c
+ lib_LTLIBRARIES += libxcb-res.la
+ libxcb_res_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_res_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_res_la_SOURCES = res.c res.h
+ endif
+
+-EXTSOURCES += screensaver.c
+ if BUILD_SCREENSAVER
++EXTSOURCES += screensaver.c
+ lib_LTLIBRARIES += libxcb-screensaver.la
+ libxcb_screensaver_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_screensaver_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_screensaver_la_SOURCES = screensaver.c screensaver.h
+ endif
+
+-EXTSOURCES += shape.c
+ if BUILD_SHAPE
++EXTSOURCES += shape.c
+ lib_LTLIBRARIES += libxcb-shape.la
+ libxcb_shape_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_shape_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_shape_la_SOURCES = shape.c shape.h
+ endif
+
+-EXTSOURCES += shm.c
+ if BUILD_SHM
++EXTSOURCES += shm.c
+ lib_LTLIBRARIES += libxcb-shm.la
+ libxcb_shm_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_shm_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_shm_la_SOURCES = shm.c shm.h
+ endif
+
+-EXTSOURCES += sync.c
+ if BUILD_SYNC
++EXTSOURCES += sync.c
+ lib_LTLIBRARIES += libxcb-sync.la
+ libxcb_sync_la_LDFLAGS = -version-info 1:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_sync_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_sync_la_SOURCES = sync.c sync.h
+ endif
+
+-EXTSOURCES += xevie.c
+ if BUILD_XEVIE
++EXTSOURCES += xevie.c
+ lib_LTLIBRARIES += libxcb-xevie.la
+ libxcb_xevie_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xevie_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xevie_la_SOURCES = xevie.c xevie.h
+ endif
+
+-EXTSOURCES += xf86dri.c
+ if BUILD_XFREE86_DRI
++EXTSOURCES += xf86dri.c
+ lib_LTLIBRARIES += libxcb-xf86dri.la
+ libxcb_xf86dri_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xf86dri_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xf86dri_la_SOURCES = xf86dri.c xf86dri.h
+ endif
+
+-EXTSOURCES += xfixes.c
+ if BUILD_XFIXES
++EXTSOURCES += xfixes.c
+ lib_LTLIBRARIES += libxcb-xfixes.la
+ libxcb_xfixes_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xfixes_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xfixes_la_SOURCES = xfixes.c xfixes.h
+ endif
+
+-EXTSOURCES += xinerama.c
+ if BUILD_XINERAMA
++EXTSOURCES += xinerama.c
+ lib_LTLIBRARIES += libxcb-xinerama.la
+ libxcb_xinerama_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xinerama_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xinerama_la_SOURCES = xinerama.c xinerama.h
+ endif
+
+-EXTSOURCES += xinput.c
+ if BUILD_XINPUT
++EXTSOURCES += xinput.c
+ lib_LTLIBRARIES += libxcb-xinput.la
+ libxcb_xinput_la_LDFLAGS = -version-info 1:0:1 -no-undefined @lt_enable_auto_import@
+ libxcb_xinput_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xinput_la_SOURCES = xinput.c xinput.h
+ endif
+
+-EXTSOURCES += xkb.c
+ if BUILD_XKB
++EXTSOURCES += xkb.c
+ lib_LTLIBRARIES += libxcb-xkb.la
+ libxcb_xkb_la_LDFLAGS = -version-info 1:0:0 -no-undefined
+ libxcb_xkb_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xkb_la_SOURCES = xkb.c xkb.h
+ endif
+
+-EXTSOURCES += xprint.c
+ if BUILD_XPRINT
++EXTSOURCES += xprint.c
+ lib_LTLIBRARIES += libxcb-xprint.la
+ libxcb_xprint_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xprint_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xprint_la_SOURCES = xprint.c xprint.h
+ endif
+
+-EXTSOURCES += xselinux.c
+ if BUILD_SELINUX
++EXTSOURCES += xselinux.c
+ lib_LTLIBRARIES += libxcb-xselinux.la
+ libxcb_xselinux_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xselinux_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xselinux_la_SOURCES = xselinux.c xselinux.h
+ endif
+
+-EXTSOURCES += xtest.c
+ if BUILD_XTEST
++EXTSOURCES += xtest.c
+ lib_LTLIBRARIES += libxcb-xtest.la
+ libxcb_xtest_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xtest_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xtest_la_SOURCES = xtest.c xtest.h
+ endif
+
+-EXTSOURCES += xv.c
+ if BUILD_XV
++EXTSOURCES += xv.c
+ lib_LTLIBRARIES += libxcb-xv.la
+ libxcb_xv_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xv_la_LIBADD = $(XCB_LIBS)
+ nodist_libxcb_xv_la_SOURCES = xv.c xv.h
+ endif
+
+-EXTSOURCES += xvmc.c
+ if BUILD_XVMC
++EXTSOURCES += xvmc.c
+ lib_LTLIBRARIES += libxcb-xvmc.la
+ libxcb_xvmc_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@
+ libxcb_xvmc_la_LIBADD = $(XCB_LIBS)
+--
+2.2.1
+
diff --git a/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch b/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch
new file mode 100644
index 000000000000..e8c24d34b232
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.11-xevie-xprint_removal.patch
@@ -0,0 +1,30 @@
+Both extensions have been dropped from the X-Server in 2008:
+ http://cgit.freedesktop.org/xorg/xserver/commit/?id=1c8bd31
+ http://cgit.freedesktop.org/xorg/xserver/commit/?id=f4036f6
+
+Don't build them by default.
+
+Reviewed-by: Julien Cristau <jcristau@debian.org>
+Signed-off-by: Daniel Martin <consume.noise@gmail.com>
+Signed-off-by: Uli Schlachter <psychon@znc.in>
+
+diff --git a/a/configure.ac b/b/configure.ac
+index eb4a971..c9a1e91 100644
+--- a/a/configure.ac
++++ b/b/configure.ac
+@@ -227,13 +227,13 @@ XCB_EXTENSION(Screensaver, "yes")
+ XCB_EXTENSION(Shape, "yes")
+ XCB_EXTENSION(Shm, "yes")
+ XCB_EXTENSION(Sync, "yes")
+-XCB_EXTENSION(Xevie, "yes")
++XCB_EXTENSION(Xevie, "no")
+ XCB_EXTENSION(XFixes, "yes")
+ XCB_EXTENSION(XFree86-DRI, "yes")
+ XCB_EXTENSION(Xinerama, "yes")
+ XCB_EXTENSION(XInput, "no")
+ XCB_EXTENSION(XKB, "yes")
+-XCB_EXTENSION(Xprint, "yes")
++XCB_EXTENSION(Xprint, "no")
+ XCB_EXTENSION(SELinux, "no")
+ XCB_EXTENSION(XTest, "yes")
+ XCB_EXTENSION(Xv, "yes")
diff --git a/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch b/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch
new file mode 100644
index 000000000000..2c884d79626f
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.9.1-conflicting-types-for-xcb_ge_event_t.patch
@@ -0,0 +1,18 @@
+--- libxcb-1.9.1-orig/src/xcb.h 2013-05-31 01:38:01.000000000 +1000
++++ libxcb-1.9.1/src/xcb.h 2013-11-17 18:30:27.664675840 +1100
+@@ -143,6 +143,7 @@
+ * An event as sent by the XGE extension. The length field specifies the
+ * number of 4-byte blocks trailing the struct.
+ */
++#if 0
+ typedef struct {
+ uint8_t response_type; /**< Type of the response */
+ uint8_t pad0; /**< Padding */
+@@ -153,6 +154,7 @@
+ uint32_t pad[5]; /**< Padding */
+ uint32_t full_sequence; /**< full sequence */
+ } xcb_ge_event_t;
++#endif
+
+ /**
+ * @brief Generic error.
diff --git a/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch b/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch
new file mode 100644
index 000000000000..3ad63ffef2c7
--- /dev/null
+++ b/x11-libs/libxcb/files/libxcb-1.9.1-list-object-has-no-attribute-lenfield_name.patch
@@ -0,0 +1,29 @@
+diff --git a/src/c_client.py b/src/c_client.py
+index ec66223..942e78a 100644
+--- a/src/c_client.py
++++ b/src/c_client.py
+@@ -687,10 +687,20 @@ def _c_serialize_helper_switch(context, self, complex_name,
+ switch_expr = _c_accessor_get_expr(self.expr, None)
+
+ for b in self.bitcases:
+- bitcase_expr = _c_accessor_get_expr(b.type.expr, None)
+- code_lines.append(' if(%s & %s) {' % (switch_expr, bitcase_expr))
+-# code_lines.append(' printf("switch %s: entering bitcase section %s (mask=%%%%d)...\\n", %s);' %
+-# (self.name[-1], b.type.name[-1], bitcase_expr))
++ len_expr = len(b.type.expr)
++ for n, expr in enumerate(b.type.expr):
++ bitcase_expr = _c_accessor_get_expr(expr, None)
++ # only one <enumref> in the <bitcase>
++ if len_expr == 1:
++ code_lines.append(' if(%s & %s) {' % (switch_expr, bitcase_expr))
++ # multiple <enumref> in the <bitcase>
++ elif n == 0: # first
++ code_lines.append(' if((%s & %s) ||' % (switch_expr, bitcase_expr))
++ elif len_expr == (n + 1): # last
++ code_lines.append(' (%s & %s)) {' % (switch_expr, bitcase_expr))
++ else: # between first and last
++ code_lines.append(' (%s & %s) ||' % (switch_expr, bitcase_expr))
++
+ b_prefix = prefix
+ if b.type.has_name:
+ b_prefix = prefix + [(b.c_field_name, '.', b.type)]
diff --git a/x11-libs/libxcb/files/xcb-rebuilder.sh b/x11-libs/libxcb/files/xcb-rebuilder.sh
new file mode 100755
index 000000000000..43625622303b
--- /dev/null
+++ b/x11-libs/libxcb/files/xcb-rebuilder.sh
@@ -0,0 +1,71 @@
+#!/bin/bash
+
+# To use something besides `emerge` to install packages, set
+# XCB_REBUILDER_INSTALL to that binary.
+
+if ! . /lib/gentoo/functions.sh 2>/dev/null; then
+ echo 'Please install sys-apps/gentoo-functions and rerun this script.'
+ exit 1
+fi
+
+case ${1} in
+ '') ;;
+ *)
+ einfo 'Rebuilds broken packages from the XCB library renaming'
+ einfo
+ einfo 'To use something besides `emerge`, set the INSTALL variable to their binary.'
+ exit 1
+ ;;
+esac
+
+if ! type -p qfile >/dev/null; then
+ einfo "Please install app-portage/portage-utils."
+ exit 1
+fi
+
+if ! type -p scanelf >/dev/null; then
+ einfo "Please install app-misc/pax-utils."
+ exit 1
+fi
+
+einfo "Fixing broken libtool archives (.la)"
+for i in $(qlist -a | grep "\.la$"); do
+ sed -i \
+ -e "s:[^[:space:]]*xcb-xlib[^[:space:]]*::g" \
+ "${i}" 2>/dev/null
+done
+
+einfo "Scanning for libraries requiring libxcb-xlib.so..."
+for i in $(qlist -a | grep "\.so$"); do
+ scanelf -n $i \
+ | grep -q xcb-xlib \
+ && XCB_LIBS="${XCB_LIBS} ${i}"
+done
+
+if [[ -n ${XCB_LIBS} ]]; then
+ einfo "Broken libraries:"
+ for lib in ${XCB_LIBS}; do
+ echo " ${lib}"
+ done
+ ebegin "Scanning for packages installing broken libraries"
+ XCB_PACKAGES=$(qfile -qC ${XCB_LIBS} | sort | uniq)
+ eend 0
+else
+ einfo "No broken libraries detected"
+ exit 0
+fi
+
+
+einfo "Broken packages:"
+for pkg in ${XCB_PACKAGES}; do
+ echo " ${pkg}"
+done
+
+echo
+ewarn "Please read the libxcb upgrade guide for further instructions"
+ewarn "http://www.gentoo.org/proj/en/desktop/x/x11/libxcb-1.4-upgrade-guide.xml"
+
+#
+#ebegin "Rebuilding broken packages"
+#${XCB_REBUILDER_INSTALL:-emerge -1} ${XCB_PACKAGES}
+#eend $?
diff --git a/x11-libs/libxcb/libxcb-1.10.ebuild b/x11-libs/libxcb/libxcb-1.10.ebuild
new file mode 100644
index 000000000000..0be16fd7fddf
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.10.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=( python{2_7,3_3} )
+PYTHON_REQ_USE=xml
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit python-any-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="selinux xkb"
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+# Note: ${PYTHON_USEDEP} needs to go verbatim
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep \
+ ">=x11-proto/xcb-proto-1.10[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+
+python_check_deps() {
+ has_version --host-root ">=x11-proto/xcb-proto-1.10[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc build-docs)
+ $(use_enable selinux)
+ $(use_enable xkb)
+ --enable-xinput
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libxcb/libxcb-1.11-r1.ebuild b/x11-libs/libxcb/libxcb-1.11-r1.ebuild
new file mode 100644
index 000000000000..f8ed45074974
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.11-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE=xml
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_EAUTORECONF=yes
+inherit python-any-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc selinux test xkb"
+SLOT="0/${PV}"
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+# Note: ${PYTHON_USEDEP} needs to go verbatim
+DEPEND="${RDEPEND}
+ test? ( dev-libs/check[${MULTILIB_USEDEP}] )
+ doc? ( app-doc/doxygen[dot] )
+ dev-libs/libxslt
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep \
+ ">=x11-proto/xcb-proto-1.11[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+
+python_check_deps() {
+ has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+PATCHES=(
+ "${FILESDIR}/${P}-xevie-xprint_removal.patch"
+ "${FILESDIR}/${PN}-1.11-Don-t-install-headers-man-pages-for-disabled-extensi.patch"
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc devel-docs)
+ $(use_enable selinux)
+ $(use_enable xkb)
+ --enable-xinput
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libxcb/libxcb-1.11.ebuild b/x11-libs/libxcb/libxcb-1.11.ebuild
new file mode 100644
index 000000000000..7aaac06da4c3
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.11.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+PYTHON_REQ_USE=xml
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+XORG_EAUTORECONF=yes
+inherit python-any-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="selinux xkb"
+SLOT="0/${PV}"
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+# Note: ${PYTHON_USEDEP} needs to go verbatim
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ ${PYTHON_DEPS}
+ $(python_gen_any_dep \
+ ">=x11-proto/xcb-proto-1.11[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+
+python_check_deps() {
+ has_version --host-root ">=x11-proto/xcb-proto-1.11[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+PATCHES=( "${FILESDIR}/${P}-xevie-xprint_removal.patch" )
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc build-docs)
+ $(use_enable selinux)
+ $(use_enable xkb)
+ --enable-xinput
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libxcb/libxcb-1.9.1-r1.ebuild b/x11-libs/libxcb/libxcb-1.9.1-r1.ebuild
new file mode 100644
index 000000000000..eaa6f50e515c
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.9.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_REQ_USE=xml
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit eutils python-single-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="selinux xkb"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-lang/python[xml]
+ dev-libs/libxslt
+ >=x11-proto/xcb-proto-1.9-r1[${MULTILIB_USEDEP},${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ # https://bugs.gentoo.org/show_bug.cgi?id=472032
+ sed -e 's@x$(HTML_CHECK_RESULT)@xfalse@' \
+ -i "${S}/tests/Makefile.am" \
+ -i "${S}/tests/Makefile.in" \
+ || die "Could not patch tests/Makefile.am and tests/Makefile.in to fix tests"
+ # http://patchwork.freedesktop.org/patch/15185/
+ # Sounds like this commit is missing:
+ # c_client.py: Handle multiple expr. in a bitcase
+ # http://cgit.freedesktop.org/xcb/libxcb/commit/?id=e602b65
+ epatch "${FILESDIR}/${PN}-1.9.1-list-object-has-no-attribute-lenfield_name.patch"
+ # https://bugs.freedesktop.org/show_bug.cgi?id=71502
+ epatch "${FILESDIR}/${PN}-1.9.1-conflicting-types-for-xcb_ge_event_t.patch"
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc build-docs)
+ $(use_enable selinux)
+ $(use_enable xkb)
+ --enable-xinput
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libxcb/libxcb-1.9.1.ebuild b/x11-libs/libxcb/libxcb-1.9.1.ebuild
new file mode 100644
index 000000000000..c758b921c400
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.9.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
+
+PYTHON_COMPAT=( python{2_7,3_3} )
+PYTHON_REQ_USE=xml
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="selinux xkb"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-lang/python[xml]
+ dev-libs/libxslt
+ >=x11-proto/xcb-proto-1.8-r3[${MULTILIB_USEDEP},${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc build-docs)
+ $(use_enable selinux)
+ $(use_enable xkb)
+ --enable-xinput
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libxcb/libxcb-1.9.3-r1.ebuild b/x11-libs/libxcb/libxcb-1.9.3-r1.ebuild
new file mode 100644
index 000000000000..68ccf64a94db
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.9.3-r1.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=( python{2_7,3_3} )
+PYTHON_REQ_USE=xml
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit python-any-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="selinux xkb"
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+# Note: ${PYTHON_USEDEP} needs to go verbatim
+DEPEND="${RDEPEND}
+ dev-libs/libxslt
+ $(python_gen_any_dep \
+ ">=x11-proto/xcb-proto-1.9-r1[${MULTILIB_USEDEP},\${PYTHON_USEDEP}]")"
+
+python_check_deps() {
+ has_version --host-root ">=x11-proto/xcb-proto-1.9-r1[${MULTILIB_USEDEP},${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc build-docs)
+ $(use_enable selinux)
+ $(use_enable xkb)
+ --enable-sendfds
+ --enable-xinput
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libxcb/libxcb-1.9.3.ebuild b/x11-libs/libxcb/libxcb-1.9.3.ebuild
new file mode 100644
index 000000000000..cc27f01d5b2b
--- /dev/null
+++ b/x11-libs/libxcb/libxcb-1.9.3.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=( python{2_7,3_3} )
+PYTHON_REQ_USE=xml
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="X C-language Bindings library"
+HOMEPAGE="http://xcb.freedesktop.org/"
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/libxcb"
+[[ ${PV} != 9999* ]] && \
+ SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+
+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 ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="selinux xkb"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ dev-lang/python[xml]
+ dev-libs/libxslt
+ >=x11-proto/xcb-proto-1.9-r1[${MULTILIB_USEDEP},${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}"
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc build-docs)
+ $(use_enable selinux)
+ $(use_enable xkb)
+ --enable-sendfds
+ --enable-xinput
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/libxcb/metadata.xml b/x11-libs/libxcb/metadata.xml
new file mode 100644
index 000000000000..6d157b5ddcf9
--- /dev/null
+++ b/x11-libs/libxcb/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="xkb">Enable the XCB keyboard extension</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-libs/libxdl_view/Manifest b/x11-libs/libxdl_view/Manifest
new file mode 100644
index 000000000000..8f5dc9db9b31
--- /dev/null
+++ b/x11-libs/libxdl_view/Manifest
@@ -0,0 +1 @@
+DIST libxdl_view-4.2.tar.gz 857566 SHA256 826adc9c6d6706ffc6f9b52e6f7871e3ebf397837010a75daa971812f162d0b3 SHA512 1ea461cc27e53e94b89cdeef9fc435342d66f618f52a6bb936ff2c7ee63fbc89ecbbecfb4da0209ec8969f09b422af3690408dc61470299ce23e3cf84b202266 WHIRLPOOL 212c7e9f09c804bf58445a116ad75d343f6cd8e393e88ed2b2fcd4f311bd59f8a803c7fbf2d3c3a799cc7e88a9ba55f6e148c07a4956b8c6f22a0398f4b8e91f
diff --git a/x11-libs/libxdl_view/files/4.2-as-needed.patch b/x11-libs/libxdl_view/files/4.2-as-needed.patch
new file mode 100644
index 000000000000..a59d1997c2e5
--- /dev/null
+++ b/x11-libs/libxdl_view/files/4.2-as-needed.patch
@@ -0,0 +1,16 @@
+diff --git a/Makefile.am b/Makefile.am
+index 347bb21..cbb04db 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -19,7 +19,11 @@ lib_LTLIBRARIES = libxdl_view.la libxdl_viewextra.la
+ ## The initial value of this was a mistake!
+ ## See the libtool doc.
+ libxdl_view_la_LDFLAGS = -version-info 2:0:0
++libxdl_view_la_LIBADD = -lX11 -lXt -lm
++
+ libxdl_viewextra_la_LDFLAGS = -version-info 0:0:0
++libxdl_viewextra_la_DEPENDENCIES = libxdl_view.la
++libxdl_viewextra_la_LIBADD = -lm -lxdl_view -ljwc_c
+
+ EXTRA_DIST = doc/xdl_view_icon.gif doc/xdl_view_top.gif \
+ doc/xdl_view_top.html doc/xdl_view_updates.html \
diff --git a/x11-libs/libxdl_view/files/4.2-impl-dec.patch b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
new file mode 100644
index 000000000000..418143777338
--- /dev/null
+++ b/x11-libs/libxdl_view/files/4.2-impl-dec.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile.am b/Makefile.am
+index 347bb21..aa41ba3 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -3,6 +3,8 @@
+
+ ## Process this file with automake.
+
++CFLAGS += -std=c99 -L.libs
++
+ libxdl_view_la_SOURCES = xdl_base_fr.c xdl_blank_obj.c xdl_image.c \
+ xdl_bg.c xdl_img_rd.c xdl_film_img.c xdl_io_window.c \
+ xdl_menu_area.c xdl_text_tab.c xdl_panel_itm.c \
diff --git a/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild b/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild
new file mode 100644
index 000000000000..6a9900710a5c
--- /dev/null
+++ b/x11-libs/libxdl_view/libxdl_view-4.2-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+AUTOTOOLS_AUTORECONF=yes
+
+inherit autotools-utils
+
+DESCRIPTION="An X-Windows Based Toolkit"
+HOMEPAGE="http://www.ccp4.ac.uk/dist/x-windows/xdl_view/doc/xdl_view_top.html"
+SRC_URI="ftp://ftp.ccp4.ac.uk/jwc/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+IUSE="static-libs"
+
+RDEPEND="
+ dev-libs/libjwc_c
+ x11-libs/libXt"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-impl-dec.patch
+ "${FILESDIR}"/${PV}-as-needed.patch )
+
+src_prepare() {
+ rm missing || die
+ autotools-utils_src_prepare
+}
diff --git a/x11-libs/libxdl_view/metadata.xml b/x11-libs/libxdl_view/metadata.xml
new file mode 100644
index 000000000000..d747d72a25b4
--- /dev/null
+++ b/x11-libs/libxdl_view/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>sci</herd>
+ <maintainer>
+ <email>sci@gentoo.org</email>
+ </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
new file mode 100644
index 000000000000..51ea195b6b46
--- /dev/null
+++ b/x11-libs/libxkbcommon/Manifest
@@ -0,0 +1,4 @@
+DIST libxkbcommon-0.2.0.tar.bz2 715987 SHA256 74eb0a121ca3998015fd687591426bb15c524645a72cf602831b2e729172fb42 SHA512 ac8c9bbca8f98b9285bf1672efef0c46e44d08e7870903106313304d892e83892242feead4ee9d1dca074c2f3f14464bc06694daf73b402cf48873b8973d4218 WHIRLPOOL 737ae84c829985933091aec7b352d5651623679c3350d95f2eb0535f442f06bdb643484fc5aaff1d41c035bca7677e98ef2ccadd5bf00560f18b6a3030762db5
+DIST libxkbcommon-0.3.1.tar.xz 605756 SHA256 9c973581bba0c883a301fa6474d9c3e4f3a06c34e4ae4f1f4e113692cb18b38e SHA512 d5682f3663560d54bd3227ca0fdf52e651f2a14af46f49b4e7a5df2dc2e52748748f42c6334d6fd7328be72bd0c7e673e9783aa91d65a55a71266236f8b6a504 WHIRLPOOL f6472fa24c16c6f263e2ace807e4b2c7d4442d82e8d76ec047d4b9c312eaf889be26518fe3ffbd343610a5d966cf6b5df95cc47120ea60811cea4b687cc831ed
+DIST libxkbcommon-0.4.1.tar.xz 551424 SHA256 90ee502ec919814533c65e74c208212854f5bae9b9b87932eeb96fb3876b8ff6 SHA512 b4e416691f0257c85421e782543518ba8f02e0a30d9b3ff4bf4fbe1eade6f661113a843f79f718af6bacadcd44052468663bad7a2d70545acf13a6c04f7a7229 WHIRLPOOL c9d58b5587a0e5b9de64f3e811178f523c72af6e980bbdf85f77628f85c6530f00977081eda5f1d2df1149e554d7d7d9692d45b49730fd155c82fcef76b5e359
+DIST libxkbcommon-0.5.0.tar.xz 615504 SHA256 90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c SHA512 63ef6b586743a1fbee1e4a92dd9709eedfd66d4ed1f342976534a2c818b896aaab7712ea6871abb19845439cae4b17b2e624f1ae279da151ddead53f22a48c2e WHIRLPOOL b4fa342fbca2aa7ac60d2daf2269d891e83564bf016ee420c106c86513a780a279471e3eada9f18600ae9e0f5a3740423d9127ca71bc65f1b00ca5c76b61b756
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.2.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.2.0.ebuild
new file mode 100644
index 000000000000..7e492bd8cab4
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.2.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_EAUTORECONF="yes"
+
+if [[ ${PV} = *9999* ]]; then
+ GIT_ECLASS="git-2"
+ EXPERIMENTAL="true"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+ KEYWORDS=""
+else
+ XORG_BASE_INDIVIDUAL_URI=""
+ SRC_URI="http://xkbcommon.org/download/${P}.tar.bz2"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+inherit xorg-2 ${GIT_ECLASS}
+
+DESCRIPTION="X.Org xkbcommon library"
+
+IUSE="doc"
+
+RDEPEND="
+ x11-proto/xproto
+ >=x11-proto/kbproto-1.0.5"
+DEPEND="${RDEPEND}
+ sys-devel/bison
+ sys-devel/flex
+ doc? ( app-doc/doxygen )"
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb" $(use_with doc doxygen)
+)
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild
new file mode 100644
index 000000000000..6289985e5943
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.3.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_EAUTORECONF="yes"
+
+if [[ ${PV} = *9999* ]]; then
+ GIT_ECLASS="git-2"
+ EXPERIMENTAL="true"
+ EGIT_REPO_URI="git://anongit.freedesktop.org/${PN}"
+ KEYWORDS=""
+else
+ XORG_BASE_INDIVIDUAL_URI=""
+ SRC_URI="http://xkbcommon.org/download/${P}.tar.xz"
+ KEYWORDS="amd64 arm x86"
+fi
+
+inherit xorg-2 ${GIT_ECLASS}
+
+DESCRIPTION="X.Org xkbcommon library"
+
+IUSE="doc"
+
+DEPEND="sys-devel/bison
+ sys-devel/flex
+ x11-proto/xproto
+ >=x11-proto/kbproto-1.0.5
+ doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+XORG_CONFIGURE_OPTIONS=(
+ --with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb" $(use_with doc doxygen)
+)
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.4.1.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.4.1.ebuild
new file mode 100644
index 000000000000..08973c331ae1
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.4.1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_EAUTORECONF="yes"
+XORG_MULTILIB="yes"
+
+if [[ ${PV} = *9999* ]]; then
+ GIT_ECLASS="git-r3"
+ EXPERIMENTAL="true"
+ EGIT_REPO_URI="git://github.com/xkbcommon/${PN}"
+else
+ XORG_BASE_INDIVIDUAL_URI=""
+ SRC_URI="http://xkbcommon.org/download/${P}.tar.xz"
+fi
+
+inherit xorg-2 ${GIT_ECLASS}
+
+DESCRIPTION="X.Org xkbcommon library"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="X doc"
+
+DEPEND="sys-devel/bison
+ sys-devel/flex
+ X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
+ doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ --with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+ $(use X || use_enable X x11)
+ $(use_with doc doxygen)
+ )
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild
new file mode 100644
index 000000000000..fa6a0511ed38
--- /dev/null
+++ b/x11-libs/libxkbcommon/libxkbcommon-0.5.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_EAUTORECONF="yes"
+XORG_MULTILIB="yes"
+
+if [[ ${PV} = *9999* ]]; then
+ GIT_ECLASS="git-r3"
+ EXPERIMENTAL="true"
+ EGIT_REPO_URI="git://github.com/xkbcommon/${PN}"
+else
+ XORG_BASE_INDIVIDUAL_URI=""
+ SRC_URI="http://xkbcommon.org/download/${P}.tar.xz"
+fi
+
+inherit xorg-2 ${GIT_ECLASS}
+
+DESCRIPTION="X.Org xkbcommon library"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86"
+IUSE="X doc test"
+
+DEPEND="sys-devel/bison
+ sys-devel/flex
+ X? ( >=x11-libs/libxcb-1.10[${MULTILIB_USEDEP},xkb] )
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ >=x11-proto/kbproto-1.0.6-r1[${MULTILIB_USEDEP}]
+ doc? ( app-doc/doxygen )"
+RDEPEND=""
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ --with-xkb-config-root="${EPREFIX}/usr/share/X11/xkb"
+ $(use X || use_enable X x11)
+ $(use_with doc doxygen)
+ )
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/libxkbcommon/metadata.xml b/x11-libs/libxkbcommon/metadata.xml
new file mode 100644
index 000000000000..6cc3982431f8
--- /dev/null
+++ b/x11-libs/libxkbcommon/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-libs/libxkbfile/Manifest b/x11-libs/libxkbfile/Manifest
new file mode 100644
index 000000000000..daf6ecb6a0a4
--- /dev/null
+++ b/x11-libs/libxkbfile/Manifest
@@ -0,0 +1,2 @@
+DIST libxkbfile-1.0.8.tar.bz2 335788 SHA256 8aa94e19c537c43558f30906650cea6e15fa012591445d9f927658c3b32a8f3a SHA512 1d8766db2a15fe0a1f3775d38422eabd572ec8ba8417cde9f1ec95b0065e1acb6036fcf9a8e54f2e0517b358f9f3fe6f8b419554ec7688c24ec4072939c5e099 WHIRLPOOL f2a27fecabadffd8aa28434ab98254473191a6d5c211acbe8776287bec2306d3dca4137004db0ddea14a66910a2934030d9b6f67a08bd7d566ad79f7fb7a2202
+DIST libxkbfile-1.0.9.tar.bz2 348009 SHA256 51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a SHA512 5fa268f10d7c4bd7b1e0c9f12adaa53d86b149f193d228fc620b3b81d360b37e4ede0192f5a0dc715bf830a57bd1388af01399fb33609413fc64623ee91cb8d1 WHIRLPOOL 5d8168ae089e15e3a43dd4cfc36445987b7dd995743807dbc184e3ac137e33da5ef1517715a7c6635bab44d94819c1260836d3a7ace66d57f64da322933f786b
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild
new file mode 100644
index 000000000000..79d9c5b3f7bd
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-1.0.8.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="X.Org xkbfile library"
+
+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=""
+
+RDEPEND="x11-libs/libX11
+ x11-proto/kbproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbfile/libxkbfile-1.0.9.ebuild b/x11-libs/libxkbfile/libxkbfile-1.0.9.ebuild
new file mode 100644
index 000000000000..32e5a7d224db
--- /dev/null
+++ b/x11-libs/libxkbfile/libxkbfile-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="X.Org xkbfile library"
+
+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=""
+
+RDEPEND="x11-libs/libX11
+ x11-proto/kbproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbfile/metadata.xml b/x11-libs/libxkbfile/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libxkbfile/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-libs/libxkbui/Manifest b/x11-libs/libxkbui/Manifest
new file mode 100644
index 000000000000..7ad711711b72
--- /dev/null
+++ b/x11-libs/libxkbui/Manifest
@@ -0,0 +1 @@
+DIST libxkbui-1.0.2.tar.bz2 221435 SHA256 20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214 SHA512 ccfa2c8f740ae66e5b7c2ed19a8243696a34fb60d45d8d01bb540eb925d69c95ebe16b7a54f4362acc3170b1543f44eea8910135b11c4af88abce3637726062d WHIRLPOOL cc63816196b5e48ec369307a31cea8c6b3277592d7ba017b418370d914de31e42e02ad02dfe3a6bca3439d7284d0aefe3ce680b5880e0eea457982fd4c67d519
diff --git a/x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild b/x11-libs/libxkbui/libxkbui-1.0.2-r1.ebuild
new file mode 100644
index 000000000000..ace6b7c71406
--- /dev/null
+++ b/x11-libs/libxkbui/libxkbui-1.0.2-r1.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="X.Org xkbui library"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libXt
+ >=x11-libs/libxkbfile-1.0.3
+ x11-proto/kbproto"
+DEPEND="${RDEPEND}"
diff --git a/x11-libs/libxkbui/metadata.xml b/x11-libs/libxkbui/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libxkbui/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-libs/libxklavier/Manifest b/x11-libs/libxklavier/Manifest
new file mode 100644
index 000000000000..fbdf4803b9e0
--- /dev/null
+++ b/x11-libs/libxklavier/Manifest
@@ -0,0 +1,2 @@
+DIST libxklavier-5.2.1.tar.xz 312944 SHA256 a7a1ca8ae493fb652e3456a6b3a0b07514447161aab41feed96b968f2d338b5e SHA512 8e69b8129cfbf2e2649dc81c49dd168e31a095ea9f8b2c4b5c01ffb97533d4556fa25ad3e17ecaa6b207ebaabdd9ac6f9e629561c8b9bbf890a7d3247d039f33 WHIRLPOOL e2bf2959349552f0bd5f0d062f18f092701589d467cafc18c4c526150d339f8e3c706ca2c37c476a31161f5492fb7ac3105f1076cf540b1296c72577f0ec5143
+DIST libxklavier-5.3.tar.xz 315684 SHA256 ebec3bc54b5652838502b96223152fb1cd8fcb14ace5cb02d718fc3276bbd404 SHA512 7bec94aeedbe80aec2c44c9e2a3b7ea170618970fff3c1b5e677f1b292241e208b74eabd825d477eeab25bb0ee1d27f9b55f986a19ea8aacb078651a0c83b289 WHIRLPOOL e9f64343e750397e2ec55311ce8ed650bfb71fb09eccdf3563cd8ac5a83f4203d79d00695978f7d27c0a91a03d67fd29c4842b401fc8b23621121cd9e9b0d84b
diff --git a/x11-libs/libxklavier/libxklavier-5.2.1.ebuild b/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
new file mode 100644
index 000000000000..3ab1e7d97754
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-5.2.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit gnome.org libtool
+
+DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LibXklavier"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +introspection"
+
+RDEPEND="app-text/iso-codes
+ >=dev-libs/glib-2.16
+ dev-libs/libxml2
+ x11-apps/xkbcomp
+ x11-libs/libX11
+ >=x11-libs/libXi-1.1.3
+ x11-libs/libxkbfile
+ >=x11-misc/xkeyboard-config-2.4.1-r3
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="AUTHORS ChangeLog CREDITS NEWS README"
+
+src_prepare() {
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable doc gtk-doc) \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ --with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
+ --with-xkb-bin-base="${EPREFIX}"/usr/bin
+}
+
+src_install() {
+ default
+ find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/x11-libs/libxklavier/libxklavier-5.3.ebuild b/x11-libs/libxklavier/libxklavier-5.3.ebuild
new file mode 100644
index 000000000000..d5aa41237d7a
--- /dev/null
+++ b/x11-libs/libxklavier/libxklavier-5.3.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit eutils gnome.org libtool
+
+DESCRIPTION="A library for the X Keyboard Extension (high-level API)"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/LibXklavier"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="doc +introspection"
+
+RDEPEND="app-text/iso-codes
+ >=dev-libs/glib-2.16
+ dev-libs/libxml2
+ x11-apps/xkbcomp
+ x11-libs/libX11
+ >=x11-libs/libXi-1.1.3
+ x11-libs/libxkbfile
+ >=x11-misc/xkeyboard-config-2.4.1-r3
+ introspection? ( >=dev-libs/gobject-introspection-1.30 )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ sys-devel/gettext
+ doc? ( >=dev-util/gtk-doc-1.4 )"
+
+DOCS="AUTHORS ChangeLog CREDITS NEWS README"
+
+src_prepare() {
+ elibtoolize
+}
+
+src_configure() {
+ econf \
+ --disable-static \
+ $(use_enable introspection) \
+ $(use_enable doc gtk-doc) \
+ --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html \
+ --with-xkb-base="${EPREFIX}"/usr/share/X11/xkb \
+ --with-xkb-bin-base="${EPREFIX}"/usr/bin
+}
+
+src_install() {
+ default
+
+ nonfatal dosym /usr/share/doc/${PF}/html/${PN} /usr/share/gtk-doc/html/${PN}
+
+ prune_libtool_files
+}
diff --git a/x11-libs/libxklavier/metadata.xml b/x11-libs/libxklavier/metadata.xml
new file mode 100644
index 000000000000..91a5284ae802
--- /dev/null
+++ b/x11-libs/libxklavier/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>freedesktop</herd>
+ <maintainer>
+ <email>freedesktop-bugs@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name='introspection'>Use <pkg>dev-libs/gobject-introspection</pkg> for introspection</flag>
+ </use>
+</pkgmetadata>
diff --git a/x11-libs/libxsettings-client/Manifest b/x11-libs/libxsettings-client/Manifest
new file mode 100644
index 000000000000..f59dd4674664
--- /dev/null
+++ b/x11-libs/libxsettings-client/Manifest
@@ -0,0 +1 @@
+DIST libxsettings-client-0.17.tar.bz2 234216 SHA256 900e9b131bd357a3e6bcc5fe9a94d42018d9cf52e85d1c772a7e69a7f99ea9ab SHA512 cc88ef7dd2c0369c237685b169012a0604da3bb4305fb33997b4f0ada10687685a098f87ce5bf07765c8aaa3de42af3744c82755d27f24efdbbbfedfadc14349 WHIRLPOOL 8e6895376798b51fc7b6ac6ad1bb2895c6762c2129b9cae07aaee817308582ae677bd9f048e8212dd45172526cc982135afddfd45d78355ebccb0959267ef452
diff --git a/x11-libs/libxsettings-client/libxsettings-client-0.17-r1.ebuild b/x11-libs/libxsettings-client/libxsettings-client-0.17-r1.ebuild
new file mode 100644
index 000000000000..80243f768200
--- /dev/null
+++ b/x11-libs/libxsettings-client/libxsettings-client-0.17-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
+GPE_TARBALL_SUFFIX="bz2"
+inherit autotools eutils gpe
+
+DESCRIPTION="XSETTINGS client code"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sh ~x86"
+IUSE="static-libs"
+
+DOCS=( ChangeLog )
+
+DEPEND="
+ ${DEPEND}
+ x11-proto/xproto
+ x11-libs/libX11
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i \
+ -e 's|INCLUDES = -I $(includedir)|INCLUDES = -I $(ROOT)/$(includedir)|' \
+ Makefile.am || die
+ sed -i -e '/^CFLAGS="-Os -Wall"/d' configure.ac || die
+ eautoreconf
+}
+
+src_configure() {
+ # override gpe_src_configure() bug #515340
+ econf $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/libxsettings-client/libxsettings-client-0.17.ebuild b/x11-libs/libxsettings-client/libxsettings-client-0.17.ebuild
new file mode 100644
index 000000000000..c2884127d99c
--- /dev/null
+++ b/x11-libs/libxsettings-client/libxsettings-client-0.17.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+GPE_TARBALL_SUFFIX="bz2"
+
+inherit gpe autotools
+
+DESCRIPTION="XSETTINGS client code"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="amd64 arm ~hppa ppc sh x86"
+
+DOCS="ChangeLog"
+IUSE=""
+
+RDEPEND="${RDEPEND}"
+
+DEPEND="${DEPEND}
+ ${RDEPEND}
+ x11-proto/xproto
+ x11-libs/libX11"
+
+src_unpack() {
+ gpe_src_unpack "$@"
+
+ sed -i -e \
+ 's;INCLUDES = -I $(includedir);INCLUDES = -I '$ROOT'/$(includedir);' \
+ Makefile.am || die "sed failed"
+ sed -i -e '/^CFLAGS="-Os -Wall"/d' configure.ac || die "sed failed"
+ eautoreconf
+}
diff --git a/x11-libs/libxsettings-client/metadata.xml b/x11-libs/libxsettings-client/metadata.xml
new file mode 100644
index 000000000000..8619aae1ffb5
--- /dev/null
+++ b/x11-libs/libxsettings-client/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-misc</herd>
+ <herd>gpe</herd>
+</pkgmetadata>
diff --git a/x11-libs/libxshmfence/Manifest b/x11-libs/libxshmfence/Manifest
new file mode 100644
index 000000000000..75a2ffbd6ec7
--- /dev/null
+++ b/x11-libs/libxshmfence/Manifest
@@ -0,0 +1,2 @@
+DIST libxshmfence-1.1.tar.bz2 291347 SHA256 dbc2db2925ca9f216fd1e9c63d0974db9f4d49aaf5877ffb606d2d8d7e58cebe SHA512 ed3aae4a44849c11ce041df53d47667606dba5357059c13d5c0989205df57dfa626598db6ad66432114a80e69ab4118fb067877ea275897aab64d4bbf9bcd346 WHIRLPOOL 79014c8c617aa49296610eb66274aa4f0e86dc4b19d587bd46bf34f496a7cc21697927d8023a510fdb3c631988678fd5fe8d450e652159d9a847ec05ce0f35ae
+DIST libxshmfence-1.2.tar.bz2 267170 SHA256 d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c SHA512 340a6dff5c7ce7f0fe89d8094ee91a0572c8bf0da888861c5262d6a65a13ecad0e2a079949ccc115e15a2d0d108c4f1ba1743874289cacbbc17aa3a05cd8e072 WHIRLPOOL 16916da6d04fc7155f4c5a7f98703385c19dcb3aadb84ec6f52a7887f37cc4d5d38dc280480153dec8327762b10bdd01a562127cc4c550d858312aa9b4f7f7a8
diff --git a/x11-libs/libxshmfence/libxshmfence-1.1.ebuild b/x11-libs/libxshmfence/libxshmfence-1.1.ebuild
new file mode 100644
index 000000000000..2f55d08ced73
--- /dev/null
+++ b/x11-libs/libxshmfence/libxshmfence-1.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
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="Shared memory fences using futexes"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
+ ${RDEPEND}"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.2.ebuild
new file mode 100644
index 000000000000..f7629811c48d
--- /dev/null
+++ b/x11-libs/libxshmfence/libxshmfence-1.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
+XORG_MULTILIB=yes
+inherit xorg-2
+
+DESCRIPTION="Shared memory fences using futexes"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND=">=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]
+ ${RDEPEND}"
diff --git a/x11-libs/libxshmfence/metadata.xml b/x11-libs/libxshmfence/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/libxshmfence/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-libs/libyui-gtk/Manifest b/x11-libs/libyui-gtk/Manifest
new file mode 100644
index 000000000000..35342c418818
--- /dev/null
+++ b/x11-libs/libyui-gtk/Manifest
@@ -0,0 +1 @@
+DIST libyui-gtk-2.44.5.tar.gz 291294 SHA256 934e91fa9cecfd932b71b37a29b485236162799d31ebb9d39ca5c14c845de94b SHA512 8493d46ea78b8e6cd28275c4c2a051c6eaec14d3cbfb20a6bb18346fe9e899c7c9ce4a156fb215c986baf69d398ccab00c3be017d5a30594cdfbb77df4e1e882 WHIRLPOOL 8bb61042b5c4ea9b3bccd4f14c47c258db46d5390e72a4813225cf59a2224ad664e1817a548530e76c75e924f60d7483ee1e7aef8eddf71a513251803a0cb26e
diff --git a/x11-libs/libyui-gtk/libyui-gtk-2.44.5.ebuild b/x11-libs/libyui-gtk/libyui-gtk-2.44.5.ebuild
new file mode 100644
index 000000000000..0b3e410e0314
--- /dev/null
+++ b/x11-libs/libyui-gtk/libyui-gtk-2.44.5.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 cmake-utils
+
+DESCRIPTION="UI abstraction library - GTK plugin"
+HOMEPAGE="https://github.com/libyui/libyui-gtk"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+
+RDEPEND="
+ x11-libs/gtk+:3
+ x11-libs/libyui:${SLOT}
+"
+# Only Boost headers are needed
+DEPEND="${RDEPEND}
+ dev-libs/boost"
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+ cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
+
+ # TODO: set proper docs deps and USE flag for building them
+ sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+ sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_WERROR=OFF
+ -DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+ -DRESPECT_FLAGS=ON
+ $(cmake-utils_use_enable static-libs STATIC)
+ )
+ cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui-gtk/metadata.xml b/x11-libs/libyui-gtk/metadata.xml
new file mode 100644
index 000000000000..ce40a6617a03
--- /dev/null
+++ b/x11-libs/libyui-gtk/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>miska@gentoo.org</email>
+ <name>Michal Hrušecký</name>
+ </maintainer>
+ <longdescription lang="en">
+Gtk plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
+</longdescription>
+ <upstream>
+ <remote-id type="github">libyui/libyui-gtk</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libyui-ncurses/Manifest b/x11-libs/libyui-ncurses/Manifest
new file mode 100644
index 000000000000..a6cf188e5346
--- /dev/null
+++ b/x11-libs/libyui-ncurses/Manifest
@@ -0,0 +1 @@
+DIST libyui-ncurses-2.46.4.tar.gz 181155 SHA256 3b2ec425277f5d4658c3318339076b72b9ee5e229569014ad69fd99948d8dec9 SHA512 9e03aa29ea7660c20d4ce36b7ebcac02af152185af3e91650d0d59379d3b2779515aa0b2325155a4eaaa02a1addc2ac25cf8a13d0e67a32fe94191da06c1b483 WHIRLPOOL fac47b00f9a8fe7c0293dd89f5cc6949104d4ee910487ef55cf0f323724d8079da5b880c8f8f99ba298fa385bc866a3377d21c198e52215d4b22d0d1df72d2f7
diff --git a/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
new file mode 100644
index 000000000000..b69aafe797b1
--- /dev/null
+++ b/x11-libs/libyui-ncurses/files/libyui-ncurses-2.46.4-tinfo.patch
@@ -0,0 +1,21 @@
+Fixes building with sys-libs/ncurses[tinfo]
+
+--- cmake/Modules/FindCurses6.cmake.orig 2014-09-25 16:32:20.000000000 +0400
++++ cmake/Modules/FindCurses6.cmake 2014-09-25 16:33:16.000000000 +0400
+@@ -11,11 +11,12 @@
+ FIND_LIBRARY(CURSES6_TINFO_LIBRARY NAMES tinfo PATHS ${path}/ncurses6 ${path} NO_DEFAULT_PATH)
+ ENDFOREACH()
+
+-SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY})
+ # tinfo is optional (in 12.1 is not there)
+-IF(${CURSES6_TINFO_LIBRARY})
+- SET(CURSES6_LIBRARIES "${CURSES6_LIBRARIES} ${CURSES6_TINFO_LIBRARY}")
+-ENDIF(${CURSES6_TINFO_LIBRARY})
++IF(NOT ${CURSES6_TINFO_LIBRARY} STREQUAL "CURSES6_TINFO_LIBRARY-NOTFOUND")
++ SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY} ${CURSES6_TINFO_LIBRARY})
++ELSE()
++ SET(CURSES6_LIBRARIES ${CURSES6_NCURSESW_LIBRARY} ${CURSES6_PANELW_LIBRARY})
++ENDIF()
+
+ FIND_PATH(CURSES6_INCLUDE_DIR ncurses.h PATH_SUFFIXES ncurses6)
+
diff --git a/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild b/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild
new file mode 100644
index 000000000000..50385b22ea55
--- /dev/null
+++ b/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library - ncurses plugin"
+HOMEPAGE="https://github.com/libyui/libyui-ncurses"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+
+RDEPEND="sys-libs/ncurses
+ x11-libs/libyui:${SLOT}
+"
+# Only Boost headers are needed
+DEPEND="${RDEPEND}
+ dev-libs/boost"
+
+PATCHES=( "${FILESDIR}/${P}-tinfo.patch" )
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+ cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
+
+ # TODO: set proper docs deps and USE flag for building them
+ sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+ sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_WERROR=OFF
+ -DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+ -DRESPECT_FLAGS=ON
+ $(cmake-utils_use_enable static-libs STATIC)
+ )
+ cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui-ncurses/metadata.xml b/x11-libs/libyui-ncurses/metadata.xml
new file mode 100644
index 000000000000..3695e1541170
--- /dev/null
+++ b/x11-libs/libyui-ncurses/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>miska@gentoo.org</email>
+ <name>Michal Hrušecký</name>
+ </maintainer>
+ <longdescription lang="en">
+ncurses plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
+</longdescription>
+ <upstream>
+ <remote-id type="github">libyui/libyui-ncurses</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libyui-qt/Manifest b/x11-libs/libyui-qt/Manifest
new file mode 100644
index 000000000000..6f099d82b351
--- /dev/null
+++ b/x11-libs/libyui-qt/Manifest
@@ -0,0 +1 @@
+DIST libyui-qt-2.44.0.tar.gz 161145 SHA256 2414c91a1b9823191cdddeedefbb994c4a3343baaab6ee61e358a80ce9523d03 SHA512 4bc5e96a663fda5ded2a7d4c75ffef51d1d30bf2f907e758f99570e31d62f7cb90a5441dc74790cbd89f8bf2542768186fda2f3a4bbcf42e2089ced7024ad53b WHIRLPOOL a468a7a1036a4ce6d20ddfc597a657411909740bf33630058d54dc7ac22b26471377df075db7b06932d3b77e5eaafa51e88b07f46ba5db11211597b40498cfdd
diff --git a/x11-libs/libyui-qt/libyui-qt-2.44.0.ebuild b/x11-libs/libyui-qt/libyui-qt-2.44.0.ebuild
new file mode 100644
index 000000000000..5ea2f422f696
--- /dev/null
+++ b/x11-libs/libyui-qt/libyui-qt-2.44.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library - Qt plugin"
+HOMEPAGE="https://github.com/libyui/libyui-qt"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+
+RDEPEND="
+ dev-qt/qtgui:4
+ media-libs/freetype
+ x11-libs/libX11
+ x11-libs/libyui:${SLOT}
+"
+# Only Boost headers are needed
+# QtSvg headers only required, no linking
+DEPEND="${RDEPEND}
+ dev-libs/boost
+ dev-qt/qtsvg:4"
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+ cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
+
+ # TODO: set proper docs deps and USE flag for building them
+ sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+ sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_EXAMPLES=OFF
+ -DENABLE_WERROR=OFF
+ -DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+ -DRESPECT_FLAGS=ON
+ $(cmake-utils_use_enable static-libs STATIC)
+ )
+ cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui-qt/metadata.xml b/x11-libs/libyui-qt/metadata.xml
new file mode 100644
index 000000000000..063649968110
--- /dev/null
+++ b/x11-libs/libyui-qt/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>miska@gentoo.org</email>
+ <name>Michal Hrušecký</name>
+ </maintainer>
+ <longdescription lang="en">
+Qt plugin for libyui -- YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses).
+</longdescription>
+ <upstream>
+ <remote-id type="github">libyui/libyui-qt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/libyui/Manifest b/x11-libs/libyui/Manifest
new file mode 100644
index 000000000000..64dd43bd1736
--- /dev/null
+++ b/x11-libs/libyui/Manifest
@@ -0,0 +1 @@
+DIST libyui-3.0.13.tar.gz 204028 SHA256 aa3d961f4424365efdfffd4de1facdcd870570890681ebc9e59d16ea3687e44f SHA512 b698c4d44d9fa1d888b52f8d5e2216ff4a490ef97c153fac52674a237527807140663d87ceac7b36b0c6092e9035eaec7bfe7a2e1e93922de106873130a69c66 WHIRLPOOL a7c01af68f800e1f27ce5631c0b34ea35d3f82c3d173caea1516887de9bef557662ce0e577daa6ffb2003070adac40f958c7f3dd9c64d32b46fc11d4fed72b15
diff --git a/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch b/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
new file mode 100644
index 000000000000..63ac43ee1af9
--- /dev/null
+++ b/x11-libs/libyui/files/libyui-3.0.13-fix-qt-libs-check.patch
@@ -0,0 +1,34 @@
+--- buildtools/LibyuiCommon.cmake 2014-02-10 19:41:45.000000000 +0400
++++ buildtools/LibyuiCommon.cmake 2014-09-10 23:16:10.317115440 +0400
+@@ -245,12 +245,17 @@
+
+ MACRO( FIND_LINKER_LIBS ) # try to find all libs to be linked against
+ FOREACH( p ${LIB_LINKER})
+- FIND_LIBRARY( ${p}_LOOKUP "${p}" )
+- IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
+- MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
+- ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
+- MESSAGE( STATUS "${p} found" )
+- ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
++ STRING(FIND "${p}" "Qt" ISQT)
++ IF( ISQT GREATER -1 )
++ FIND_PACKAGE(Qt4 4.8 REQUIRED ${p})
++ ELSE( ISQT GREATER -1 )
++ FIND_LIBRARY( ${p}_LOOKUP "${p}" )
++ IF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
++ MESSAGE( FATAL_ERROR "Linker-Library ${p} NOT FOUND" )
++ ELSE( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
++ MESSAGE( STATUS "${p} found" )
++ ENDIF( "${${p}_LOOKUP}" STREQUAL "${p}_LOOKUP-NOTFOUND" )
++ ENDIF( ISQT GREATER -1 )
+ ENDFOREACH()
+
+ ENDMACRO( FIND_LINKER_LIBS )
+@@ -616,6 +616,7 @@
+
+ QT4_AUTOMOC( ${${TARGETLIB}_SOURCES} )
+ QT4_WRAP_UI( ${TARGETLIB}_SOURCES "${${TARGETLIB}_WRAP_UI}" )
++ LINK_DIRECTORIES( ${QT_LIBRARY_DIR} )
+
+ ENDIF( QT_FOUND )
+
diff --git a/x11-libs/libyui/libyui-3.0.13.ebuild b/x11-libs/libyui/libyui-3.0.13.ebuild
new file mode 100644
index 000000000000..4667730c8f82
--- /dev/null
+++ b/x11-libs/libyui/libyui-3.0.13.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library"
+HOMEPAGE="https://github.com/libyui/libyui"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="gtk ncurses qt4 static-libs"
+
+# Only Boost headers are needed
+DEPEND="dev-libs/boost"
+PDEPEND="
+ qt4? ( x11-libs/libyui-qt:${SLOT} )
+ ncurses? ( x11-libs/libyui-ncurses:${SLOT} )
+ gtk? ( x11-libs/libyui-gtk:${SLOT} )
+ "
+
+PATCHES=( "${FILESDIR}/${P}-fix-qt-libs-check.patch" )
+
+REQUIRED_USE="|| ( gtk ncurses qt4 )"
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+ cp buildtools/CMakeLists.common CMakeLists.txt || die
+
+ # TODO: set proper docs deps and USE flag for building them
+ sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+ sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+ cmake-utils_src_prepare
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DENABLE_WERROR=OFF
+ -DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+ -DRESPECT_FLAGS=ON
+ $(cmake-utils_use_enable static-libs STATIC)
+ )
+ cmake-utils_src_configure
+}
diff --git a/x11-libs/libyui/metadata.xml b/x11-libs/libyui/metadata.xml
new file mode 100644
index 000000000000..b0ea2010f934
--- /dev/null
+++ b/x11-libs/libyui/metadata.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>miska@gentoo.org</email>
+ <name>Michal Hrušecký</name>
+ </maintainer>
+ <longdescription lang="en">
+YaST2 user interface engine that provides the abstraction from graphical user interfaces (Qt, Gtk) and text based user interfaces (ncurses). This can be used independently of YaST2 for generic (C++) applications.
+</longdescription>
+ <upstream>
+ <remote-id type="github">libyui/libyui</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/metadata.xml b/x11-libs/metadata.xml
new file mode 100644
index 000000000000..875590a5fe54
--- /dev/null
+++ b/x11-libs/metadata.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE catmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<catmetadata>
+ <longdescription lang="en">
+ The x11-libs category contains various X11-related libraries.
+ </longdescription>
+ <longdescription lang="de">
+ Die Kategorie x11-libs enthält verschiedene Bibliotheken für
+ die X11-Programmierung.
+ </longdescription>
+ <longdescription lang="es">
+ La categoría x11-libs contiene varias librerías para X11.
+ </longdescription>
+ <longdescription lang="ja">
+ x11-libsカテゴリーには様々なX11関連のライブラリが含まれています。
+ </longdescription>
+ <longdescription lang="nl">
+ De categorie x11-libs bevat allerlei aan X11 gerelateerde bibliotheken.
+ </longdescription>
+ <longdescription lang="vi">
+ Nhóm x11-libs chứa các thư viện liên quan đến X11.
+ </longdescription>
+ <longdescription lang="it">
+ La categoria x11-libs contiene varie librerie per X11.
+ </longdescription>
+ <longdescription lang="pt">
+ A categoria x11-libs contém várias bibliotecas relacionadas a
+ X11.
+ </longdescription>
+ <longdescription lang="pl">
+ Kategoria x11-libs zawiera biblioteki powiązane z X11.
+ </longdescription>
+</catmetadata>
+
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
new file mode 100644
index 000000000000..dbb640ebb8ee
--- /dev/null
+++ b/x11-libs/motif/Manifest
@@ -0,0 +1,4 @@
+DIST motif-2.3.4-patches-1.tar.xz 1776 SHA256 b5c9a0d026202c488a95b24beaefc63139b0cd30084af66da4247117c8c2d1e6 SHA512 f6773e0d7720adff8b5225025a682d12a4a60465c2a49d26df29daf7f8d7891f68b7ad3e284ff5cc73938ec4c78ed27216f9304f35905267b28c33f6d29b5666 WHIRLPOOL e677f210513dbb2ce68bffa0662443e232b2515c7796165cfe66e6c15cf765a9477362ba1d9ce42ef606c351df6e342063733fde907995d0954a10929ebacad1
+DIST motif-2.3.4-src.tgz 9527040 SHA256 637efa09608e0b8f93465dbeb7c92e58ebb14c4bc1b488040eb79a65af3efbe0 SHA512 fb1033caa68f25b93282fa6700d5b7856be217b3651072d86e7c93a747df5b31219230998eb93deae22a8fa698e816b1a30e52b3ae88ae1c01c1f0aac59a2af2 WHIRLPOOL 9e4447fb1ac09a41cd6c61af52584f42fee3d026874bc15e258bc79f239f95a21bb3fe79ed7df08d86aaac370a669ec83cacc9eadb11320fbad6df6c27715d95
+DIST openMotif-2.2.3.tar.gz 5149785 SHA256 12fc0d1de53ff30307603e31826db9b63a442f6f743451aed2cb7cedb038d3d9 SHA512 322381faf50bde6bbd2253f1b52a25e5471df87a2b01fba4de7e0d1bb4c1267e2b0d358e13e1b924a60d9e85316959fa6b2be5a458964d03f47a936bb618eae8 WHIRLPOOL 970f3f20eefde787af9fa932dcbf77e870ca6ba248e2632c358bbb7d149c2c4fef31a33a64888bc2b2e891f1c66a803a12e1121378539a94599e0be753c04bad
+DIST openmotif-2.2.3-patches-5.tar.xz 19972 SHA256 69e1b1e37023ce0aa65c1aa8bdb60a6b2ead3472df26f1d10bffae7386b24c35 SHA512 62c0489d1bda83952e1c8d39e8c8fe0ee5a4d2927f9139227cb80b2c58751d63d95b70fff3eb165219e75cdfdc299f92d90482124e6334a28781a13b174786c9 WHIRLPOOL e2f8abc439d25d631b8489e1007788e931ea4982957d50e0e3e1062b76a3d37b279140f30bac95ab378a76cc33d5a49c1c217a66c441959510d9a96d7409d4af
diff --git a/x11-libs/motif/files/Mwm.defaults b/x11-libs/motif/files/Mwm.defaults
new file mode 100644
index 000000000000..ea91b6fb8d86
--- /dev/null
+++ b/x11-libs/motif/files/Mwm.defaults
@@ -0,0 +1,14 @@
+Mwm*fontList: variable
+Mwm*iconClick: False
+Mwm*iconPlacement: top left
+Mwm*moveOpaque: True
+Mwm*rootButtonClick: True
+Mwm*foreground: #000000
+Mwm*background: #B8B8C0
+Mwm*enableThinThickness: True
+Mwm*enableEtchedInMenu: True
+Mwm*menu*fontList: -adobe-helvetica-medium-r-*--*-120-*-*-*-*-*-*
+Mwm*client*title*fontList: -adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
+Mwm*icon*fontList: -adobe-helvetica-bold-r-*--*-80-*-*-*-*-*-*
+Mwm*feedback*fontList: -adobe-helvetica-bold-r-*--*-100-*-*-*-*-*-*
+Mwm*multiClickTime: 300
diff --git a/x11-libs/motif/metadata.xml b/x11-libs/motif/metadata.xml
new file mode 100644
index 000000000000..f632f62c0734
--- /dev/null
+++ b/x11-libs/motif/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>ulm@gentoo.org</email>
+ </maintainer>
+ <use>
+ <flag name="motif22-compatibility">Compatibility with Open Motif 2.2</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">motif</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/motif/motif-2.2.3-r12.ebuild b/x11-libs/motif/motif-2.2.3-r12.ebuild
new file mode 100644
index 000000000000..27b8dec9ef96
--- /dev/null
+++ b/x11-libs/motif/motif-2.2.3-r12.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 autotools eutils flag-o-matic multilib multilib-minimal
+
+MY_P=openMotif-${PV}
+DESCRIPTION="Legacy Open Motif libraries for old binaries"
+HOMEPAGE="http://motif.ics.com/"
+SRC_URI="ftp://ftp.ics.com/openmotif/2.2/${PV}/src/${MY_P}.tar.gz
+ mirror://gentoo/openmotif-${PV}-patches-5.tar.xz"
+
+LICENSE="MOTIF MIT"
+SLOT="2.2"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]"
+
+DEPEND="${RDEPEND}
+ x11-libs/libXaw
+ x11-misc/xbitmaps"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ EPATCH_SUFFIX=patch epatch
+ epatch_user
+
+ # This replaces deprecated, obsoleted and now invalid AC_DEFINE
+ # with their proper alternatives.
+ sed -i -e 's:AC_DEFINE(\([^)]*\)):AC_DEFINE(\1, [], [\1]):g' \
+ configure.in acinclude.m4
+
+ # Build only the libraries
+ sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= lib clients/;}' Makefile.am
+ sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/=.*/= uil/;}' clients/Makefile.am
+
+ AM_OPTS="--force-missing" eautoreconf
+
+ # get around some LANG problems in make (#15119)
+ unset LANG
+
+ # bug #80421
+ filter-flags -ftracer
+
+ # feel free to fix properly if you care
+ append-flags -fno-strict-aliasing
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf --with-x --disable-static
+}
+
+multilib_src_compile() {
+ emake -j1
+}
+
+multilib_src_install() {
+ emake -j1 DESTDIR="${D}" install-exec
+}
+
+multilib_src_install_all() {
+ # cleanups
+ rm -rf "${ED}"/usr/bin
+ rm -f "${ED}"/usr/lib*/*.{so,la,a}
+
+ dodoc README RELEASE RELNOTES BUGREPORT TODO
+}
diff --git a/x11-libs/motif/motif-2.3.4-r3.ebuild b/x11-libs/motif/motif-2.3.4-r3.ebuild
new file mode 100644
index 000000000000..c3193bc2e72f
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.4-r3.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils flag-o-matic multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="http://sourceforge.net/projects/motif/
+ http://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}-src.tgz
+ mirror://gentoo/${P}-patches-1.tar.xz"
+
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND="abi_x86_32? ( !app-emulation/emul-linux-x86-motif[-abi_x86_32(-)] )
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libXp-1.0.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+ jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+ unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+ xft? (
+ >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+ )"
+
+DEPEND="${RDEPEND}
+ sys-devel/flex
+ || ( dev-util/byacc sys-freebsd/freebsd-ubin )
+ x11-misc/xbitmaps"
+
+src_prepare() {
+ EPATCH_SUFFIX=patch epatch
+ epatch_user
+
+ # disable compilation of demo binaries
+ sed -i -e '/^SUBDIRS/{:x;/\\$/{N;bx;};s/[ \t\n\\]*demos//;}' Makefile.am
+
+ # add X.Org vendor string to aliases for virtual bindings
+ echo -e '"The X.Org Foundation"\t\t\t\t\tpc' >>bindings/xmbind.alias
+
+ AT_M4DIR=. eautoreconf
+
+ # get around some LANG problems in make (#15119)
+ LANG=C
+
+ # bug #80421
+ filter-flags -ftracer
+
+ # feel free to fix properly if you care
+ append-flags -fno-strict-aliasing
+
+ # for Solaris Xos_r.h :(
+ [[ ${CHOST} == *-solaris2.11 ]] \
+ && append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+
+ if use !elibc_glibc && use !elibc_uclibc && use unicode; then
+ # libiconv detection in configure script doesn't always work
+ # http://bugs.motifzone.net/show_bug.cgi?id=1423
+ export LIBS="${LIBS} -liconv"
+ fi
+
+ # "bison -y" causes runtime crashes #355795
+ export YACC=byacc
+
+ # remember the name of the C compiler for the native ABI
+ MY_NATIVE_CC=$(tc-getCC)
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --with-x \
+ $(use_enable static-libs static) \
+ $(use_enable motif22-compatibility) \
+ $(use_enable unicode utf8) \
+ $(use_enable xft) \
+ $(use_enable jpeg) \
+ $(use_enable png)
+}
+
+multilib_src_compile() {
+ # The wmluiltok build tool is linked with libfl.a, so always
+ # compile it for the native ABI
+ emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
+ emake
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+
+ if multilib_is_native_abi && use examples; then
+ emake -C demos DESTDIR="${D}" install-data
+ dodir /usr/share/doc/${PF}/demos
+ mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+ fi
+}
+
+multilib_src_install_all() {
+ # mwm default configs
+ insinto /usr/share/X11/app-defaults
+ newins "${FILESDIR}"/Mwm.defaults Mwm
+
+ # cleanup
+ rm -rf "${ED}"/usr/share/Xm
+ prune_libtool_files
+
+ dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}
diff --git a/x11-libs/mx/Manifest b/x11-libs/mx/Manifest
new file mode 100644
index 000000000000..e81627fced40
--- /dev/null
+++ b/x11-libs/mx/Manifest
@@ -0,0 +1 @@
+DIST mx-1.4.7.tar.xz 939672 SHA256 1d2930d196717cacbee0ee101cf21d289b8200b5e938823d852b3b4a2f4a0e9d SHA512 6870898548c947d43947ea6ded7c06d01d18aa721c81927fabf3ee0cfe20f65739e927d32277acce5c2e13968502828e29e043f9a8cf31af8f2bc20ec1ad0349 WHIRLPOOL bab7df74f07569b06a7793a42980c8fe56c337fae0ee05d752b7382db6c31c086a1388dfedfe628e97902d9cb44514aad9ea1def199ddfe3e866dd63215ff4ea
diff --git a/x11-libs/mx/files/mx-1.4.2-gold.patch b/x11-libs/mx/files/mx-1.4.2-gold.patch
new file mode 100644
index 000000000000..0dc1a0f60afa
--- /dev/null
+++ b/x11-libs/mx/files/mx-1.4.2-gold.patch
@@ -0,0 +1,30 @@
+ mx/Makefile.am | 2 +-
+ mx/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/mx/Makefile.am b/mx/Makefile.am
+index 0e5a61e..4f2b4a4 100644
+--- a/mx/Makefile.am
++++ b/mx/Makefile.am
+@@ -268,7 +268,7 @@ libmx_@MX_API_VERSION@_la_SOURCES = \
+ $(top_srcdir)/mx/mx.h \
+ $(NULL)
+
+-libmx_@MX_API_VERSION@_la_LIBADD = $(MX_LIBS)
++libmx_@MX_API_VERSION@_la_LIBADD = $(MX_LIBS) -lm
+
+ if HAVE_INTROSPECTION
+ -include $(INTROSPECTION_MAKEFILE)
+diff --git a/mx/Makefile.in b/mx/Makefile.in
+index 2fbf938..adfc59d 100644
+--- a/mx/Makefile.in
++++ b/mx/Makefile.in
+@@ -717,7 +717,7 @@ libmx_@MX_API_VERSION@_la_SOURCES = \
+ $(top_srcdir)/mx/mx.h \
+ $(NULL)
+
+-libmx_@MX_API_VERSION@_la_LIBADD = $(MX_LIBS)
++libmx_@MX_API_VERSION@_la_LIBADD = $(MX_LIBS) -lm
+ @HAVE_INTROSPECTION_TRUE@INTROSPECTION_GIRS = Mx-@MX_API_VERSION@.gir
+ @HAVE_INTROSPECTION_TRUE@Mx_@MX_API_VERSION_AM@_gir_NAMESPACE = Mx
+ @HAVE_INTROSPECTION_TRUE@Mx_@MX_API_VERSION_AM@_gir_VERSION = @MX_API_VERSION@
diff --git a/x11-libs/mx/files/mx-1.4.7-gl-types.patch b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
new file mode 100644
index 000000000000..85c691378d84
--- /dev/null
+++ b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
@@ -0,0 +1,53 @@
+From 297b654133436c6ee5146fce31529da4e52dfe74 Mon Sep 17 00:00:00 2001
+From: Brian Pepple <bpepple@fedoraproject.org>
+Date: Sat, 25 Aug 2012 17:41:59 -0400
+Subject: [PATCH] Replace GL data types with equivalent glib types.
+
+---
+ mx/mx-deform-texture.c | 8 ++++----
+ mx/mx-texture-frame.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/mx/mx-deform-texture.c b/mx/mx-deform-texture.c
+index 93c54d7..466cc9f 100644
+--- a/mx/mx-deform-texture.c
++++ b/mx/mx-deform-texture.c
+@@ -493,9 +493,9 @@ mx_deform_texture_class_init (MxDeformTextureClass *klass)
+ static void
+ mx_deform_texture_init_arrays (MxDeformTexture *self)
+ {
+- GLushort *idx, *bf_idx;
++ gushort *idx, *bf_idx;
+ gint x, y, direction;
+- GLushort *static_indices, *static_bf_indices;
++ gushort *static_indices, *static_bf_indices;
+ MxDeformTexturePrivate *priv = self->priv;
+
+ mx_deform_texture_free_arrays (self);
+@@ -503,8 +503,8 @@ mx_deform_texture_init_arrays (MxDeformTexture *self)
+ priv->n_indices = (2 + 2 * priv->tiles_x) *
+ priv->tiles_y +
+ (priv->tiles_y - 1);
+- static_indices = g_new (GLushort, priv->n_indices);
+- static_bf_indices = g_new (GLushort, priv->n_indices);
++ static_indices = g_new (gushort, priv->n_indices);
++ static_bf_indices = g_new (gushort, priv->n_indices);
+
+ #define MESH_INDEX(X, Y) (Y) * (priv->tiles_x + 1) + (X)
+
+diff --git a/mx/mx-texture-frame.c b/mx/mx-texture-frame.c
+index bde57ff..a88985f 100644
+--- a/mx/mx-texture-frame.c
++++ b/mx/mx-texture-frame.c
+@@ -200,7 +200,7 @@ mx_texture_frame_paint (ClutterActor *self)
+
+
+ {
+- GLfloat rectangles[] =
++ gfloat rectangles[] =
+ {
+ /* top left corner */
+ 0, 0,
+--
+1.7.12
+
diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml
new file mode 100644
index 000000000000..819f47669909
--- /dev/null
+++ b/x11-libs/mx/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>gnome</herd>
+ <use>
+ <flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+ for introspection</flag>
+ <flag name="glade">Build the <pkg>dev-util/glade</pkg> catalog
+ files</flag>
+ </use>
+ <upstream>
+ <remote-id type="github">clutter-project/mx</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/mx/mx-1.4.7-r1.ebuild b/x11-libs/mx/mx-1.4.7-r1.ebuild
new file mode 100644
index 000000000000..a845ad774823
--- /dev/null
+++ b/x11-libs/mx/mx-1.4.7-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit gnome2 eutils
+
+DESCRIPTION="A widget toolkit using Clutter"
+HOMEPAGE="http://clutter-project.org/"
+SRC_URI="mirror://github/clutter-project/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="dbus debug glade +gtk +introspection startup-notification"
+
+RDEPEND="
+ >=dev-libs/glib-2.28.0:2
+ >=media-libs/clutter-1.7.91:1.0
+ media-libs/cogl:=
+ >=x11-apps/xrandr-1.2.0
+
+ x11-libs/gdk-pixbuf:2[introspection?]
+
+ dbus? ( >=dev-libs/dbus-glib-0.82 )
+ glade? (
+ >=dev-util/glade-3.4.5:3
+ <dev-util/glade-3.9.1:3 )
+ gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
+ startup-notification? ( >=x11-libs/startup-notification-0.9 )
+"
+DEPEND="${RDEPEND}
+ app-arch/xz-utils
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Tests are interactive, no use for us
+ sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
+ -i Makefile.am -i Makefile.in || die
+ # In 1.4.8
+ epatch "${FILESDIR}/${P}-gl-types.patch"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --with-winsys=x11 \
+ $(use_enable gtk gtk-widgets) \
+ $(use_enable introspection) \
+ $(use_enable debug) \
+ $(use_with dbus) \
+ $(use_with glade) \
+ $(use_with startup-notification)
+}
diff --git a/x11-libs/mx/mx-1.4.7-r2.ebuild b/x11-libs/mx/mx-1.4.7-r2.ebuild
new file mode 100644
index 000000000000..215417b0a0fc
--- /dev/null
+++ b/x11-libs/mx/mx-1.4.7-r2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+GCONF_DEBUG="yes"
+
+inherit gnome2 eutils
+
+DESCRIPTION="A widget toolkit using Clutter"
+HOMEPAGE="http://clutter-project.org/"
+SRC_URI="mirror://github/clutter-project/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="1.0"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
+IUSE="dbus +gtk +introspection startup-notification"
+
+RDEPEND="
+ >=dev-libs/glib-2.28.0:2
+ >=media-libs/clutter-1.7.91:1.0
+ media-libs/cogl:=
+ >=x11-apps/xrandr-1.2.0
+
+ x11-libs/gdk-pixbuf:2[introspection?]
+
+ dbus? ( >=dev-libs/dbus-glib-0.82 )
+ gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
+ introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+ startup-notification? ( >=x11-libs/startup-notification-0.9 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.14
+ >=dev-util/intltool-0.35.0
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # Tests are interactive, no use for us
+ sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
+ -i Makefile.am -i Makefile.in || die
+ # In 1.4.8
+ epatch "${FILESDIR}/${P}-gl-types.patch"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --with-winsys=x11 \
+ --without-glade \
+ $(use_enable gtk gtk-widgets) \
+ $(use_enable introspection) \
+ $(use_with dbus) \
+ $(use_with startup-notification)
+}
diff --git a/x11-libs/neXtaw/Manifest b/x11-libs/neXtaw/Manifest
new file mode 100644
index 000000000000..dec95284810f
--- /dev/null
+++ b/x11-libs/neXtaw/Manifest
@@ -0,0 +1 @@
+DIST neXtaw-0.15.1.tar.gz 577459 RMD160 3cbc34162c07f384d51649a2a71b16294ec2c990 SHA1 9fb912e0fbcd5a7319eb7ffafac7a20ce207a0a1 SHA256 7cfe6706b9a76620389e04a7a87f06786c8a6606829c3157c3e9e45a805bb584
diff --git a/x11-libs/neXtaw/metadata.xml b/x11-libs/neXtaw/metadata.xml
new file mode 100644
index 000000000000..ff62877c67ae
--- /dev/null
+++ b/x11-libs/neXtaw/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-libs/neXtaw/neXtaw-0.15.1-r1.ebuild b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
new file mode 100644
index 000000000000..67093deed1cf
--- /dev/null
+++ b/x11-libs/neXtaw/neXtaw-0.15.1-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+DESCRIPTION="Athena Widgets with N*XTSTEP appearance"
+HOMEPAGE="http://siag.nu/neXtaw/"
+SRC_URI="http://siag.nu/pub/neXtaw/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE=""
+
+RDEPEND="x11-libs/libICE
+ x11-libs/libXext
+ x11-libs/libXt
+ x11-libs/libX11
+ x11-libs/libSM
+ x11-libs/libXmu
+ x11-libs/libxkbfile
+ x11-libs/libXpm
+ x11-proto/xextproto
+ x11-proto/xproto
+ !<x11-libs/neXtaw-0.15.1-r1"
+DEPEND="${RDEPEND}"
+
+src_install() {
+ make DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
new file mode 100644
index 000000000000..9a0c7c44902f
--- /dev/null
+++ b/x11-libs/pango/Manifest
@@ -0,0 +1,4 @@
+DIST pango-1.36.3.tar.xz 1021656 SHA256 ad48e32917f94aa9d507486d44366e59355fcfd46ef86d119ddcba566ada5d22 SHA512 74f94c4e853f8d7538990589e5c9796e48cce32f935cf50d0155b57d00fbce155c9dd659b0803b861c568ddedffb14712fbcbefadfeefb43d2ed0fab949258a2 WHIRLPOOL c63a1b5d27eb55530bfc86da77f25fe6c022346cf30f1beeaaa1ef3b90cee6afde44d0735ad77811e7cc487cd35bb18efc667aaa470725c0b2cc3fdb6e495560
+DIST pango-1.36.5.tar.xz 1023952 SHA256 be0e94b2e5c7459f0b6db21efab6253556c8f443837200b8736d697071276ac8 SHA512 d2c2f5ffcc67ec9f4bf942905b09294be4896f11b1fd66b6e63e75c3f269c8b5c1f9e75127f7b550fa354e0fc66eb32de24d262caa784ee7ac66709da776386c WHIRLPOOL ac6ecb13dbba51527a629e1b216ed6affa9881ffffd5ed90d3f1d96772a17c7815ae0a3c2340444c473092a1c2ec8966110bb1f2c6df2b0af7358a1c9e8255de
+DIST pango-1.36.7.tar.xz 1033896 SHA256 1f7b527423a1b3044fd9ae7fbe054107b06723ff1c73e0b5f7bf9b84358d404a SHA512 a048888ffdcf7dd574da01598a86d936540d057d2226d122c73c024d401c281260fd93262e7a683d88b58b9a90e44e7e7597945a84a4d4f81094e1498a4247e3 WHIRLPOOL d88a3fe0f9f6b9c403de1f6662db41c2e3f83e401d4413f9ab22a9e0525edd16eee7248c4b5555fc7c178dd167f06bbd66df5b3c1ee8a0b9febf244abf8256a8
+DIST pango-1.36.8.tar.xz 1033528 SHA256 18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07 SHA512 799fad4add3b1ff297bd151a302d6724c5fb0223c9e0f710f97192c024de0175db9a03458e0c18019bdd987b04b5f74737659e113d6b511cf1fc118b9be3c215 WHIRLPOOL cb352f115a85f02061c1d1d96ad99340372a013eb9249ff2ccf6531926c26dc17b9b88572bccd40e3dbcb6f8e7a673b01ff1821a8acaa5117d96d8d6ed71707e
diff --git a/x11-libs/pango/files/pango-1.32.1-lib64.patch b/x11-libs/pango/files/pango-1.32.1-lib64.patch
new file mode 100644
index 000000000000..0820c78f128f
--- /dev/null
+++ b/x11-libs/pango/files/pango-1.32.1-lib64.patch
@@ -0,0 +1,44 @@
+From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Sun, 28 Oct 2012 23:19:39 +0100
+Subject: [PATCH] Add multilib support
+
+pango.modules list modules specific to a host architecture.
+Add host triplet in path so that machine able to run multiple
+triplet have a proper file per pango library.
+---
+ pango/Makefile.am | 1 +
+ pango/pango-utils.c | 4 ++--
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/pango/Makefile.am b/pango/Makefile.am
+index ab092c9..558108b 100644
+--- a/pango/Makefile.am
++++ b/pango/Makefile.am
+@@ -17,6 +17,7 @@ INCLUDES = \
+ -DPANGO_ENABLE_BACKEND \
+ -DPANGO_ENABLE_ENGINE \
+ -DSYSCONFDIR=\"$(sysconfdir)\" \
++ -DHOST=\"$(host_triplet)\" \
+ -DLIBDIR=\"$(libdir)\" \
+ -I$(top_srcdir) \
+ -I$(top_builddir) \
+diff --git a/pango/pango-utils.c b/pango/pango-utils.c
+index 18ffa26..3b88f15 100644
+--- a/pango/pango-utils.c
++++ b/pango/pango-utils.c
+@@ -738,9 +738,9 @@ pango_get_sysconf_subdirectory (void)
+ #else
+ const char *sysconfdir = g_getenv ("PANGO_SYSCONFDIR");
+ if (sysconfdir != NULL)
+- tmp_result = g_build_filename (sysconfdir, "pango", NULL);
++ tmp_result = g_build_filename (sysconfdir, "pango", HOST, NULL);
+ else
+- tmp_result = SYSCONFDIR "/pango";
++ tmp_result = SYSCONFDIR "/pango/" HOST;
+ #endif
+ g_once_init_leave((gsize*)&result, (gsize)tmp_result);
+ }
+--
+1.7.12.4
+
diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml
new file mode 100644
index 000000000000..e6cd55339ff7
--- /dev/null
+++ b/x11-libs/pango/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>gnome</herd>
+ <upstream>
+ <remote-id type="cpe">cpe:/a:pango:pango</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/pango/pango-1.36.3.ebuild b/x11-libs/pango/pango-1.36.3.ebuild
new file mode 100644
index 000000000000..87a9efa3e76c
--- /dev/null
+++ b/x11-libs/pango/pango-1.36.3.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib toolchain-funcs
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection"
+
+RDEPEND="
+ >=media-libs/harfbuzz-0.9.9:=[glib(+),truetype(+)]
+ >=dev-libs/glib-2.33.12:2
+ >=media-libs/fontconfig-2.10.91:1.0=
+ media-libs/freetype:2=
+ >=x11-libs/cairo-1.12.10:=[X?]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ X? (
+ x11-libs/libXrender
+ x11-libs/libX11
+ >=x11-libs/libXft-2.0.0 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.15
+ virtual/pkgconfig
+ X? ( x11-proto/xproto )
+ !<=sys-devel/autoconf-2.63:2.5
+"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ tc-export CXX
+
+ gnome2_src_configure \
+ --with-cairo \
+ $(use_enable introspection) \
+ $(use_with X xft) \
+ "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+ "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+}
+
+src_install() {
+ gnome2_src_install
+
+ local PANGO_CONFDIR="/etc/pango/${CHOST}"
+ dodir "${PANGO_CONFDIR}"
+ keepdir "${PANGO_CONFDIR}"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ einfo "Generating modules listing..."
+ local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
+ local pango_conf="${PANGO_CONFDIR}/pango.modules"
+ local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
+
+ # be atomic!
+ if pango-querymodules --system \
+ "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
+ > "${tmp_file}"; then
+ cat "${tmp_file}" > "${pango_conf}" || {
+ rm "${tmp_file}"; die; }
+ else
+ ewarn "Cannot update pango.modules, file generation failed"
+ fi
+ rm "${tmp_file}"
+
+ if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then
+ elog "In >=${PN}-1.30.1, default configuration file locations moved from"
+ elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
+ elog "~/.config/pango/pangox.aliases"
+ fi
+}
diff --git a/x11-libs/pango/pango-1.36.5.ebuild b/x11-libs/pango/pango-1.36.5.ebuild
new file mode 100644
index 000000000000..23fbe59b3e4c
--- /dev/null
+++ b/x11-libs/pango/pango-1.36.5.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit autotools eutils gnome2 multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection"
+
+RDEPEND="
+ >=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ virtual/pkgconfig
+ X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+ !<=sys-devel/autoconf-2.63:2.5
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/pango-querymodules
+)
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch"
+ eautoreconf
+
+ gnome2_src_prepare
+}
+
+multilib_src_configure() {
+ tc-export CXX
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --with-cairo \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X xft) \
+ "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+ "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+}
+
+multilib_src_install() {
+ gnome2_src_install
+
+ local PANGO_CONFDIR="/etc/pango/${CHOST}"
+ dodir "${PANGO_CONFDIR}"
+ keepdir "${PANGO_CONFDIR}"
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ einfo "Generating modules listing..."
+ local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}"
+ local pango_conf="${PANGO_CONFDIR}/pango.modules"
+ local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX)
+
+ # be atomic!
+ if "${CHOST}-pango-querymodules" --system \
+ "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \
+ > "${tmp_file}"; then
+ sed "s:^${ROOT}:/:" "${tmp_file}" > "${pango_conf}" || {
+ rm "${tmp_file}"; die; }
+ else
+ ewarn "Cannot update pango.modules, file generation failed"
+ fi
+ rm "${tmp_file}"
+ }
+ multilib_foreach_abi multilib_pkg_postinst
+
+ if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then
+ elog "In >=${PN}-1.30.1, default configuration file locations moved from"
+ elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
+ elog "~/.config/pango/pangox.aliases"
+ fi
+}
diff --git a/x11-libs/pango/pango-1.36.7.ebuild b/x11-libs/pango/pango-1.36.7.ebuild
new file mode 100644
index 000000000000..8b5a85feead2
--- /dev/null
+++ b/x11-libs/pango/pango-1.36.7.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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 ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="X +introspection"
+
+RDEPEND="
+ >=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ virtual/pkgconfig
+ X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+ !<=sys-devel/autoconf-2.63:2.5
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/pango-querymodules
+)
+
+multilib_src_configure() {
+ tc-export CXX
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --with-cairo \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X xft) \
+ "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+ "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/html docs/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ einfo "Generating modules listing..."
+ "${CHOST}-pango-querymodules" --update-cache
+
+ # Remove old autogenerated file to prevent collisions with newer
+ rm -f "${EROOT}/etc/pango/${CHOST}/pango.modules"
+ }
+
+ multilib_foreach_abi multilib_pkg_postinst
+}
diff --git a/x11-libs/pango/pango-1.36.8.ebuild b/x11-libs/pango/pango-1.36.8.ebuild
new file mode 100644
index 000000000000..d434de988749
--- /dev/null
+++ b/x11-libs/pango/pango-1.36.8.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib toolchain-funcs multilib-minimal
+
+DESCRIPTION="Internationalized text layout and rendering library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+ FTL"
+SLOT="0"
+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="X +introspection"
+
+RDEPEND="
+ >=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
+ >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+ )
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.20
+ virtual/pkgconfig
+ X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] )
+ !<=sys-devel/autoconf-2.63:2.5
+"
+
+MULTILIB_CHOST_TOOLS=(
+ /usr/bin/pango-querymodules
+)
+
+multilib_src_configure() {
+ tc-export CXX
+
+ ECONF_SOURCE=${S} \
+ gnome2_src_configure \
+ --with-cairo \
+ $(multilib_native_use_enable introspection) \
+ $(use_with X xft) \
+ "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
+ "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/html docs/html || die
+ fi
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
+
+pkg_postinst() {
+ gnome2_pkg_postinst
+
+ multilib_pkg_postinst() {
+ einfo "Generating modules listing..."
+ "${CHOST}-pango-querymodules" --update-cache
+
+ # Remove old autogenerated file to prevent collisions with newer
+ rm -f "${EROOT}/etc/pango/${CHOST}/pango.modules"
+ }
+
+ multilib_foreach_abi multilib_pkg_postinst
+}
diff --git a/x11-libs/pangox-compat/Manifest b/x11-libs/pangox-compat/Manifest
new file mode 100644
index 000000000000..63b83de2413f
--- /dev/null
+++ b/x11-libs/pangox-compat/Manifest
@@ -0,0 +1 @@
+DIST pangox-compat-0.0.2.tar.xz 267396 SHA256 552092b3b6c23f47f4beee05495d0f9a153781f62a1c4b7ec53857a37dfce046 SHA512 fd3e257157d78c3d86c948e7909226fdebe52408d02a52432de8a295443b64b80b37cb795fe646d581515e6072bd278f2dcab0e43cf27b63b03a82c01eb6b9b3 WHIRLPOOL 35d3eca57ce09c399204ca8d33e9f3fb44761b042e6b3c2672bdcab4d21bf4c772966664b7545288d7dfb6bce7dd712a5904805f662cf8da2690f247de089959
diff --git a/x11-libs/pangox-compat/metadata.xml b/x11-libs/pangox-compat/metadata.xml
new file mode 100644
index 000000000000..da6fd63d0085
--- /dev/null
+++ b/x11-libs/pangox-compat/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>gnome</herd>
+</pkgmetadata>
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
new file mode 100644
index 000000000000..05c62bd6cf87
--- /dev/null
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 multilib-minimal
+
+DESCRIPTION="PangoX compatibility library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
+ >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )
+"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} gnome2_src_configure --disable-static
+}
+
+multilib_src_install() {
+ gnome2_src_install
+}
diff --git a/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
new file mode 100644
index 000000000000..b86cbcce3a7e
--- /dev/null
+++ b/x11-libs/pangox-compat/pangox-compat-0.0.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2
+
+DESCRIPTION="PangoX compatibility library"
+HOMEPAGE="http://www.pango.org/"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+RDEPEND=">=dev-libs/glib-2.31:2
+ >=x11-libs/pango-1.32
+ x11-libs/libX11"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+src_configure() {
+ G2CONF="${G2CONF} --disable-static"
+
+ gnome2_src_configure
+}
diff --git a/x11-libs/pixman/Manifest b/x11-libs/pixman/Manifest
new file mode 100644
index 000000000000..f8b0d0d334c1
--- /dev/null
+++ b/x11-libs/pixman/Manifest
@@ -0,0 +1,2 @@
+DIST pixman-0.32.6.tar.bz2 672201 SHA256 201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4 SHA512 162e34a3ac728b348b8cd429172fa9f6ba1fc8d94716368c84a8081c42c4e2639ec7624e5528d9059695736be785ee210835c7d832b4a07a2175aec349ddffe9 WHIRLPOOL f12567cf1feb7a82956f7b2edd1db29e439933e437a9419bf505eb1ce61ce8ac9ab1fe678f0e91064ef4a776b47892930940a10c9051da165155304f3757cd92
+DIST pixman-0.33.2.tar.bz2 725382 SHA256 0d12c669d69024c055ec9f877ecd6beb253796444ea3de14f8f197d438fb93fd SHA512 d74303840122160888c3983d1cb160ce29ecfbd8266f154fde69a489c7abe2c5d09c15c2414199c6e9f5458fe5dfcc166b02c7721489b493d9c5ee81bdc12b00 WHIRLPOOL 9e983b52ff26a586bec3afabf23553b7de773f3fe232ee19a217225fcc106bca93b437b7468b364a6e0cb63576a5f82a38a570b84b25feb6f490d26f6aec359d
diff --git a/x11-libs/pixman/metadata.xml b/x11-libs/pixman/metadata.xml
new file mode 100644
index 000000000000..ab31961e33f1
--- /dev/null
+++ b/x11-libs/pixman/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<use>
+ <flag name="loongson2f">Enable Loongson2f MMI optimizations.</flag>
+</use>
+<upstream>
+ <remote-id type="cpe">cpe:/a:pixman:pixman</remote-id>
+</upstream>
+</pkgmetadata>
diff --git a/x11-libs/pixman/pixman-0.32.6.ebuild b/x11-libs/pixman/pixman-0.32.6.ebuild
new file mode 100644
index 000000000000..cefd42305df7
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.32.6.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs versionator
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
+DESCRIPTION="Low-level pixel manipulation routines"
+
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+RDEPEND="abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable cpu_flags_x86_mmxext mmx)
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable cpu_flags_x86_ssse3 ssse3)
+ $(use_enable altivec vmx)
+ $(use_enable neon arm-neon)
+ $(use_enable iwmmxt arm-iwmmxt)
+ $(use_enable loongson2f loongson-mmi)
+ --disable-gtk
+ --disable-libpng
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/pixman/pixman-0.33.2.ebuild b/x11-libs/pixman/pixman-0.33.2.ebuild
new file mode 100644
index 000000000000..0b558b8471f3
--- /dev/null
+++ b/x11-libs/pixman/pixman-0.33.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+XORG_MULTILIB=yes
+inherit xorg-2 toolchain-funcs versionator
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/pixman"
+DESCRIPTION="Low-level pixel manipulation routines"
+
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE="altivec iwmmxt loongson2f cpu_flags_x86_mmxext neon cpu_flags_x86_sse2 cpu_flags_x86_ssse3"
+RDEPEND="abi_x86_32? (
+ !<=app-emulation/emul-linux-x86-gtklibs-20131008
+ !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
+ )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable cpu_flags_x86_mmxext mmx)
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable cpu_flags_x86_ssse3 ssse3)
+ $(use_enable altivec vmx)
+ $(use_enable neon arm-neon)
+ $(use_enable iwmmxt arm-iwmmxt)
+ $(use_enable loongson2f loongson-mmi)
+ --disable-gtk
+ --disable-libpng
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
new file mode 100644
index 000000000000..682d80e12cea
--- /dev/null
+++ b/x11-libs/qscintilla/Manifest
@@ -0,0 +1,2 @@
+DIST QScintilla-gpl-2.8.4.tar.gz 3031919 SHA256 9b7b2d7440cc39736bbe937b853506b3bd218af3b79095d4f710cccb0fabe80f SHA512 ab10dc756231b293ddebc06e681bb65a11b2be2a4c4132a5b2a27ca583adef76af325fa95748888d9091f2e89a30494d370df262c4eaba7b7fbed04fb7c76907 WHIRLPOOL 7357addbc0ad8869c5749a67106c18e47d79e32399416cc2867461fa8ad0c662711b8937987cb7c3cd5b83fe9f88e1529911eefec28a972e86c7f242c8c0d634
+DIST QScintilla-gpl-2.9.tar.gz 2435116 SHA256 d7c32e32582f93779de861006d87467b38b9ebc06e3d0b32e981cb24369fa417 SHA512 a74b7b1182e9f602aa9f61072877d8dba93c430453ed70e18d74013dbda8b0faef30629f2c086d3b06d0632b3f4980570362bb6e635c15686be1be47eaeecb00 WHIRLPOOL b27a3ff2b48dbbf034deb4fdf09259815dcee63bfffe29651cf1e5e9ceeedb408ebc0bae440479a8206af7046f80143c291c10a0293942b64eb61c5e02549ed4
diff --git a/x11-libs/qscintilla/metadata.xml b/x11-libs/qscintilla/metadata.xml
new file mode 100644
index 000000000000..661ed4fe6647
--- /dev/null
+++ b/x11-libs/qscintilla/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <herd>python</herd>
+ <use>
+ <flag name="designer">Build plugin for Qt Designer</flag>
+ </use>
+ <upstream>
+ <maintainer status="active">
+ <email>phil@riverbankcomputing.com</email>
+ <name>Phil Thompson</name>
+ </maintainer>
+ <bugs-to>mailto:qscintilla@riverbankcomputing.com</bugs-to>
+ <remote-id type="sourceforge">pyqt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild b/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild
new file mode 100644
index 000000000000..9c5ece9fd7af
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.8.4-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic qmake-utils
+
+MY_P=QScintilla-gpl-${PV}
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0/11"
+KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
+IUSE="designer doc"
+
+DEPEND="
+ >=dev-qt/qtcore-4.8.5:4
+ >=dev-qt/qtgui-4.8.5:4
+ designer? ( >=dev-qt/designer-4.8.5:4 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ default
+
+ # Sub-slot sanity check
+ local subslot=${SLOT#*/}
+ local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
+ local major=${version%%.*}
+ if [[ ${subslot} != ${major} ]]; then
+ eerror
+ eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${major}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+}
+
+src_configure() {
+ pushd Qt4Qt5 > /dev/null
+ eqmake4
+ popd > /dev/null
+
+ if use designer; then
+ # prevent building against system version (bug 466120)
+ append-cxxflags -I../Qt4Qt5
+ append-ldflags -L../Qt4Qt5
+
+ pushd designer-Qt4Qt5 > /dev/null
+ eqmake4
+ popd > /dev/null
+ fi
+}
+
+src_compile() {
+ pushd Qt4Qt5 > /dev/null
+ emake
+ popd > /dev/null
+
+ if use designer; then
+ pushd designer-Qt4Qt5 > /dev/null
+ emake
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ pushd Qt4Qt5 > /dev/null
+ emake INSTALL_ROOT="${D}" install
+ popd > /dev/null
+
+ if use designer; then
+ pushd designer-Qt4Qt5 > /dev/null
+ emake INSTALL_ROOT="${D}" install
+ popd > /dev/null
+ fi
+
+ dodoc NEWS
+
+ if use doc; then
+ docinto html
+ dodoc -r doc/html-Qt4Qt5/*
+ fi
+}
diff --git a/x11-libs/qscintilla/qscintilla-2.9.ebuild b/x11-libs/qscintilla/qscintilla-2.9.ebuild
new file mode 100644
index 000000000000..99f80015ba9b
--- /dev/null
+++ b/x11-libs/qscintilla/qscintilla-2.9.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit flag-o-matic qmake-utils
+
+MY_P=QScintilla-gpl-${PV}
+
+DESCRIPTION="A Qt port of Neil Hodgson's Scintilla C++ editor class"
+HOMEPAGE="http://www.riverbankcomputing.com/software/qscintilla/intro"
+SRC_URI="mirror://sourceforge/pyqt/${MY_P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0/12"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="designer doc"
+
+DEPEND="
+ >=dev-qt/qtcore-4.8.5:4
+ >=dev-qt/qtgui-4.8.5:4
+ designer? ( >=dev-qt/designer-4.8.5:4 )
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+ default
+
+ # Sub-slot sanity check
+ local subslot=${SLOT#*/}
+ local version=$(sed -nre 's:.*VERSION\s*=\s*([0-9\.]+):\1:p' "${S}"/Qt4Qt5/qscintilla.pro)
+ local major=${version%%.*}
+ if [[ ${subslot} != ${major} ]]; then
+ eerror
+ eerror "Ebuild sub-slot (${subslot}) does not match QScintilla major version (${major})"
+ eerror "Please update SLOT variable as follows:"
+ eerror " SLOT=\"${SLOT%%/*}/${major}\""
+ eerror
+ die "sub-slot sanity check failed"
+ fi
+}
+
+src_configure() {
+ pushd Qt4Qt5 > /dev/null
+ eqmake4
+ popd > /dev/null
+
+ if use designer; then
+ # prevent building against system version (bug 466120)
+ append-cxxflags -I../Qt4Qt5
+ append-ldflags -L../Qt4Qt5
+
+ pushd designer-Qt4Qt5 > /dev/null
+ eqmake4
+ popd > /dev/null
+ fi
+}
+
+src_compile() {
+ pushd Qt4Qt5 > /dev/null
+ emake
+ popd > /dev/null
+
+ if use designer; then
+ pushd designer-Qt4Qt5 > /dev/null
+ emake
+ popd > /dev/null
+ fi
+}
+
+src_install() {
+ pushd Qt4Qt5 > /dev/null
+ emake INSTALL_ROOT="${D}" install
+ popd > /dev/null
+
+ if use designer; then
+ pushd designer-Qt4Qt5 > /dev/null
+ emake INSTALL_ROOT="${D}" install
+ popd > /dev/null
+ fi
+
+ dodoc NEWS
+
+ if use doc; then
+ docinto html
+ dodoc -r doc/html-Qt4Qt5/*
+ fi
+}
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
new file mode 100644
index 000000000000..deccf1213fb2
--- /dev/null
+++ b/x11-libs/qtermwidget/Manifest
@@ -0,0 +1,3 @@
+DIST qtermwidget-0.4.0.37.tar.xz 158080 SHA256 a7614bad4821a1028d8796f7c88fd916fa2c01dead57ddd78929070972d417ee SHA512 1b244dc0f5326b39c44c6c330a9be676c085a5d8297e8947735ee553ee5c5acb2389b1bae737842fcc18b18d0e84a485a91b7d9745c8dcf42c28fcf14a313231 WHIRLPOOL 8429f1789b5015964a28b9930312d486bedb659f95034fb34ed9ed213a03cf40bfaa2d60f27ddec539acf79776bee690f7f6bf034e17eb910305e58bd27aa8a5
+DIST qtermwidget-0.4.0.tar.xz 152952 SHA256 c3e25499109db93cc169f8c7fdc8bd6c98e7712acc21a73e5d88148540582508 SHA512 2f2fe47531a0a0103956174ce69bbb954f0a1b4aedc0a6413825d2a4dc7ff000792a06d37bf0fc9f3f6caec963c831661eb79497217003c3c53b935fa702336c WHIRLPOOL 0fa3efa00cc4d98b154c6f4ae56ab60d2318c637ee544e32b39e2397cbd898ee0aa48762a7aeafe8de47e33b7b49b094421a765a4c1931c4ae7d33e3f9460620
+DIST qtermwidget-0.6.0.tar.xz 158312 SHA256 1ea148e67c3e28a53ca24a3c91532507ddd6c5d28611467e7a67334d945cd010 SHA512 2e6c5c4bee50244757aecf461c2f63f3d7306647693176df3587271129a3f12d188ea425d8db3704ec1c52df56d429b06472a7c628b5b916c0852752ebfdb79a WHIRLPOOL 55d3e9544f654dce4139f81e3d933a0d11e3e06e965671e4b17e590219e2e5e991b3bdb61db59203197789d943780f3f40d28f8b5d874479a44cc486ae9a6aad
diff --git a/x11-libs/qtermwidget/metadata.xml b/x11-libs/qtermwidget/metadata.xml
new file mode 100644
index 000000000000..c6123b692e1b
--- /dev/null
+++ b/x11-libs/qtermwidget/metadata.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>qt</herd>
+ <longdescription lang="en">
+ QTermWidget is an opensource project based on KDE4 Konsole application.
+ The main goal of this project is to provide unicode-enabled, embeddable
+ Qt widget for using as a built-in console or terminal emulation widget.
+ </longdescription>
+ <upstream>
+ <remote-id type="github">qterminal/qtermwidget</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/qtermwidget/qtermwidget-0.4.0.37.ebuild b/x11-libs/qtermwidget/qtermwidget-0.4.0.37.ebuild
new file mode 100644
index 000000000000..0ce86ae91611
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.4.0.37.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 vcs-snapshot cmake-utils
+
+DESCRIPTION="Qt4 terminal emulator widget"
+HOMEPAGE="https://github.com/qterminal/"
+SRC_URI="http://dist.leechcraft.org/3rdparty/qtermwidget/qtermwidget-0.4.0-37-gebf7d6c.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug" # todo: python
+
+DEPEND="
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}"
diff --git a/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild
new file mode 100644
index 000000000000..387235664bc7
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit cmake-utils
+
+DESCRIPTION="Qt4 terminal emulator widget"
+HOMEPAGE="https://github.com/qterminal/"
+SRC_URI="mirror://gentoo/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug" # todo: python
+
+DEPEND="
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+"
+RDEPEND="${DEPEND}"
diff --git a/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild b/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild
new file mode 100644
index 000000000000..dd411485d37e
--- /dev/null
+++ b/x11-libs/qtermwidget/qtermwidget-0.6.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit cmake-utils
+
+DESCRIPTION="Qt terminal emulator widget"
+HOMEPAGE="https://github.com/qterminal/qtermwidget"
+SRC_URI="https://github.com/qterminal/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug qt4 qt5"
+REQUIRED_USE="^^ ( qt4 qt5 )"
+
+DEPEND="
+ qt4? ( dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4 )
+ qt5? ( dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5 )"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+ local mycmakeargs=(
+ $(cmake-utils_use_use qt5)
+ $(cmake-utils_use_build qt4 DESIGNER_PLUGIN)
+ )
+ cmake-utils_src_configure
+}
diff --git a/x11-libs/qtscriptgenerator/Manifest b/x11-libs/qtscriptgenerator/Manifest
new file mode 100644
index 000000000000..7815b87fcc53
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/Manifest
@@ -0,0 +1 @@
+DIST qtscriptgenerator-src-0.2.0.tar.gz 379776 SHA256 895feb274470b9272264c7a141e5bd7f90c92e95d37f346f5f95a352541c8e69 SHA512 54b91562d275b634b50ae8f6ae024cf738605efadeb3085527087ebdc8b6b86559088972ab5dafb7ff1ede6d18dc135f935ac1fb307a17ea1975b4f7629cc0fa WHIRLPOOL 7d52a0f88b89f1a374a175b946ef304752c1ced67fa4123f1dd87da35160221c4495834a4012d05a2f8628344b1a58e39ad46e697a16ca358de07406b9db27ec
diff --git a/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch
new file mode 100644
index 000000000000..6305c9ad2a27
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/files/qtscriptgenerator-0.2.0-arm.patch
@@ -0,0 +1,41 @@
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-common.xml 2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-common.xml 2012-03-08 05:36:14.342528441 +0100
+@@ -921,6 +921,7 @@
+ <value-type name="QEasingCurve">
+ <modify-function signature="customType()const" remove="all" />
+ <modify-function signature="setCustomType(double)" remove="all" />
++ <modify-function signature="setCustomType(float)" remove="all" />
+ </value-type>
+
+ <object-type name="QAbstractAnimation" />
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core-qtscript.xml 2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core-qtscript.xml 2012-03-08 05:41:37.492524499 +0100
+@@ -1447,6 +1447,7 @@
+ <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
+ <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
+ <modify-function signature="setCustomType(double)" remove="all"/>
++ <modify-function signature="setCustomType(float)" remove="all"/>
+ <modify-function signature="customType()const" remove="all"/>
+ </value-type>
+
+diff -Nru qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml
+--- qtscriptgenerator-src-0.2.0.orig/generator/typesystem_core.xml 2012-01-23 12:30:03.000000000 +0100
++++ qtscriptgenerator-src-0.2.0/generator/typesystem_core.xml 2012-03-08 05:39:53.932524942 +0100
+@@ -1388,14 +1388,12 @@
+ </value-type>
+
+ <value-type name="QEasingCurve">
+- <modify-function signature="customType()const" remove="all"/>
+- <modify-function signature="setCustomType(double)" remove="all"/>
+-
+ <modify-function signature="QEasingCurve(QEasingCurve)" remove="all"/>
+ <modify-function signature="operator=(QEasingCurve)" remove="all"/>
+ <modify-function signature="operator==(const QEasingCurve &amp;)const" remove="all"/>
+ <modify-function signature="operator!=(const QEasingCurve &amp;)const" remove="all"/>
+ <modify-function signature="setCustomType(double)" remove="all"/>
++ <modify-function signature="setCustomType(float)" remove="all"/>
+ <modify-function signature="customType()const" remove="all"/>
+ </value-type>
+
diff --git a/x11-libs/qtscriptgenerator/metadata.xml b/x11-libs/qtscriptgenerator/metadata.xml
new file mode 100644
index 000000000000..6e3dc974f22a
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/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>kde</herd>
+ <herd>qt</herd>
+ <upstream>
+ <remote-id type="google-code">qtscriptgenerator</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
new file mode 100644
index 000000000000..66df5cdbca54
--- /dev/null
+++ b/x11-libs/qtscriptgenerator/qtscriptgenerator-0.2.0.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils qmake-utils
+
+MY_P=${PN}-src-${PV}
+
+DESCRIPTION="Tool for generating Qt bindings for Qt Script"
+HOMEPAGE="http://code.google.com/p/qtscriptgenerator/"
+SRC_URI="http://qtscriptgenerator.googlecode.com/files/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
+IUSE="debug kde"
+
+DEPEND="
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4[accessibility]
+ dev-qt/qtopengl:4
+ !kde? ( || (
+ dev-qt/qtphonon:4
+ media-libs/phonon[qt4]
+ ) )
+ kde? ( media-libs/phonon[qt4] )
+ dev-qt/qtscript:4
+ dev-qt/qtsql:4
+ dev-qt/qtsvg:4[accessibility]
+ dev-qt/qtwebkit:4
+ dev-qt/qtxmlpatterns:4
+"
+RDEPEND="${DEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ # remove phonon
+ sed -i "/typesystem_phonon.xml/d" generator/generator.qrc || die "sed failed"
+ sed -i "/qtscript_phonon/d" qtbindings/qtbindings.pro || die "sed failed"
+
+ use arm && epatch "${FILESDIR}"/${P}-arm.patch
+}
+
+src_configure() {
+ cd "${S}"/generator || die
+ eqmake4 generator.pro
+
+ cd "${S}"/qtbindings || die
+ eqmake4 qtbindings.pro
+}
+
+src_compile() {
+ cd "${S}"/generator || die
+ emake
+ ./generator --include-paths="$(qt4_get_headerdir)" || die
+
+ cd "${S}"/qtbindings || die
+ emake
+}
+
+src_install() {
+ insinto "$(qt4_get_libdir)"/plugins/script
+ insopts -m0755
+ doins "${S}"/plugins/script/*
+}
diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest
new file mode 100644
index 000000000000..bc316e3cd8cd
--- /dev/null
+++ b/x11-libs/qwt/Manifest
@@ -0,0 +1,5 @@
+DIST qwt-5.2.3.tar.bz2 1983725 SHA256 37feaf306753230b0d8538b4ff9b255c6fddaa3d6609ec5a5cc39a5a4d020ab7 SHA512 60545712790699b145a54baba4c40802d9a58bf5f68f997faed5027db6773a801097be8675e00b2af1de568e36e2e498db0a0310ac4877fd9f2b52871409dd49 WHIRLPOOL 01969f3e52c687b8db211c81c0865762fe908e49255f3517fc4731a8d3e6e1c738a8d18b8a43d8035314832693277cdc6303db2c5151be1385238812e6248ff6
+DIST qwt-6.0.0.tar.bz2 2723203 SHA256 d041d63029ea5f6a64d06be9bfe788e5d8bed8bac1fa129d82466aa09ab4092e SHA512 ccf662bebdef92581b14e5d0e4cf729f803c88345e9fcc7c2da0a64c55cc282386bf2eedc9bac948c74ca47b8453c7dfdeb2847b4d4cb9bdd6d1273875c6db12 WHIRLPOOL 4dee762cb956eb207f8d1fac0fc183e928783f0b1921ba87b216cf0d6dbaffa5231b902e608efaca4c9e17be92698ed2463e4c79d6306bfbd3056645143a0250
+DIST qwt-6.1.0.tar.bz2 3468850 SHA256 a7e3d9f1db917d186a973c5f04a316bc9607c7c35794d7a16de323aba5e17402 SHA512 5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc WHIRLPOOL 590e0078c724c1df7e9f2705f8be08973b8ea8f8aa338f1e782946360dd88c04a6b0003971eb93a6321bdcc778d73d651ee3d4c512d318d846f69a9484963964
+DIST qwt-6.1.1.tar.bz2 3531116 SHA256 9ac2a7f1f699a24cbd4c69b0128ce387bdfa9ed93b689c0ff4387cbc11d7c17f SHA512 7205c618ff0562aab201c3e64d181ba958695afd409b41a51880e871161ce5c932b46c7eda8110779f4fcdfb6caade15b261e64cef62b9b67b58796615f2dba1 WHIRLPOOL a0c50f9c0ce71b058f18f1f776147e719110491ece4bb5ea92a4890218378122a292c02c4405e097f9a5c5a321194c341c2e8b0e8b3bbf2ddac07803c0b8cb4e
+DIST qwt-6.1.2.tar.bz2 3528935 SHA256 2b08f18d1d3970e7c3c6096d850f17aea6b54459389731d3ce715d193e243d0c SHA512 ddaf265890e493554639deae8b3ba3a1673bd6bcb4a7c47931d10aaab550646d103b28dccd3c2e4fdacd56a7963837c25ab02e27c71f891fee1801bcd45d54c0 WHIRLPOOL 575f8c3665ed8075278300f625bb9b321bd2c275573bd4c22cc1b833fde7fa38c36db027216d5da43839d9c70e0ed443327af2d54ac5a4dff3643c7abee16069
diff --git a/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch
new file mode 100644
index 000000000000..48e9385811f8
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-5.2.3-install_qt.patch
@@ -0,0 +1,28 @@
+diff -up qwt-5.2.2/designer/designer.pro.install_qt qwt-5.2.2/designer/designer.pro
+--- qwt-5.2.2/designer/designer.pro.install_qt 2011-08-01 04:28:22.000000000 -0500
++++ qwt-5.2.2/designer/designer.pro 2012-08-14 11:11:22.569229749 -0500
+@@ -36,6 +37,7 @@ contains(CONFIG, QwtDesigner) {
+ else {
+ SUFFIX_STR = $${RELEASE_SUFFIX}
+ }
++ LIBNAME = qwt$${SUFFIX_STR}
+ }
+
+ TEMPLATE = lib
+@@ -45,7 +47,6 @@ contains(CONFIG, QwtDesigner) {
+ INCLUDEPATH += $${QWT_ROOT}/src
+ DEPENDPATH += $${QWT_ROOT}/src
+
+- LIBNAME = qwt$${SUFFIX_STR}
+ contains(CONFIG, QwtDll) {
+ win32 {
+ DEFINES += QT_DLL QWT_DLL
+@@ -103,7 +104,7 @@ contains(CONFIG, QwtDesigner) {
+
+ # Qt 4
+
+- TARGET = qwt_designer_plugin$${SUFFIX_STR}
++ TARGET = qwt5_designer_plugin$${SUFFIX_STR}
+ CONFIG += qt designer plugin
+
+ RCC_DIR = resources
diff --git a/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
new file mode 100644
index 000000000000..a225350990a0
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-6.0.2-invalid-read.patch
@@ -0,0 +1,250 @@
+--- qwt-6.0.2-orig/textengines/mathml/qwt_mml_document.cpp 2012-12-01 00:22:46.752106265 +1100
++++ qwt-6.0.2/textengines/mathml/qwt_mml_document.cpp 2013-01-31 14:29:30.590197611 +1100
+@@ -4421,7 +4421,10 @@
+ if ( ok )
+ return value;
+ else
+- qWarning( "Could not convert %s to form", value_str.toLatin1().data() );
++ {
++ QByteArray value_str_ba = value_str.toLatin1();
++ qWarning( "Could not convert %s to form", value_str_ba.data() );
++ }
+
+ }
+
+@@ -4658,7 +4661,10 @@
+ continue;
+ }
+ else
+- qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value.toLatin1().data() );
++ {
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "MmlMtableNode::layoutSymbol(): could not parse value %s%%", value_ba.data() );
++ }
+ }
+
+ // Relatively sized column, but we failed to parse the factor. Treat is like an auto
+@@ -5167,7 +5173,8 @@
+ double factor = factor_str.toFloat( &float_ok );
+ if ( !float_ok || factor < 0 )
+ {
+- qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
+ return 0;
+ }
+
+@@ -5196,7 +5203,8 @@
+ unit_size = QwtMmlNode::interpretSpacing( "1" + pseudo_unit, &unit_ok );
+ if ( !unit_ok )
+ {
+- qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "MmlMpaddedNode::interpretSpacing(): could not parse \"%s\"", value_ba.data() );
+ return 0;
+ }
+ }
+@@ -5368,7 +5376,8 @@
+ return ( int )( em * factor );
+ else
+ {
+- qWarning( "interpretSpacing(): could not parse \"%sem\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretSpacing(): could not parse \"%sem\"", value_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return 0;
+@@ -5384,7 +5393,8 @@
+ return ( int )( ex * factor );
+ else
+ {
+- qWarning( "interpretSpacing(): could not parse \"%sex\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretSpacing(): could not parse \"%sex\"", value_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return 0;
+@@ -5406,7 +5416,8 @@
+ }
+ else
+ {
+- qWarning( "interpretSpacing(): could not parse \"%scm\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretSpacing(): could not parse \"%scm\"", value_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return 0;
+@@ -5428,7 +5439,8 @@
+ }
+ else
+ {
+- qWarning( "interpretSpacing(): could not parse \"%smm\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretSpacing(): could not parse \"%smm\"", value_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return 0;
+@@ -5450,7 +5462,8 @@
+ }
+ else
+ {
+- qWarning( "interpretSpacing(): could not parse \"%sin\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretSpacing(): could not parse \"%sin\"", value_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return 0;
+@@ -5466,7 +5479,8 @@
+ return i;
+ else
+ {
+- qWarning( "interpretSpacing(): could not parse \"%spx\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretSpacing(): could not parse \"%spx\"", value_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return 0;
+@@ -5478,7 +5492,8 @@
+ if ( float_ok && i >= 0 )
+ return i;
+
+- qWarning( "interpretSpacing(): could not parse \"%s\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretSpacing(): could not parse \"%s\"", value_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return 0;
+@@ -5503,7 +5518,8 @@
+ return ( int )( base * factor / 100.0 );
+ }
+
+- qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretPercentSpacing(): could not parse \"%s%%\"", value_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return 0;
+@@ -5528,7 +5544,8 @@
+ return pt_size;
+ }
+
+- qWarning( "interpretPointSize(): could not parse \"%spt\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretPointSize(): could not parse \"%spt\"", value_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return 0;
+@@ -5737,7 +5754,8 @@
+ */
+ static const QwtMmlOperSpec *searchOperSpecData( const QString &name )
+ {
+- const char *name_latin1 = name.toLatin1().data();
++ QByteArray name_latin1_ba = name.toLatin1();
++ const char *name_latin1 = name_latin1_ba.data();
+
+ // binary search
+ // establish invariant g_oper_spec_data[begin].name < name < g_oper_spec_data[end].name
+@@ -5789,7 +5807,8 @@
+ if ( spec == 0 )
+ continue;
+
+- const char *name_latin1 = name.toLatin1().data();
++ QByteArray name_ba = name.toLatin1();
++ const char *name_latin1 = name_ba.data();
+
+ // backtrack to the first instance of name
+ while ( spec > g_oper_spec_data && qstrcmp( ( spec - 1 )->name, name_latin1 ) == 0 )
+@@ -5918,7 +5937,8 @@
+ if ( ok != 0 )
+ *ok = false;
+
+- qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretMathVariant(): could not parse value: \"%s\"", value_ba.data() );
+
+ return QwtMml::NormalMV;
+ }
+@@ -5938,7 +5958,8 @@
+ if ( ok != 0 )
+ *ok = false;
+
+- qWarning( "interpretForm(): could not parse value \"%s\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretForm(): could not parse value \"%s\"", value_ba.data() );
+ return QwtMml::InfixForm;
+ }
+
+@@ -5959,7 +5980,8 @@
+ if ( ok != 0 )
+ *ok = false;
+
+- qWarning( "interpretColAlign(): could not parse value \"%s\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretColAlign(): could not parse value \"%s\"", value_ba.data() );
+ return QwtMml::ColAlignCenter;
+ }
+
+@@ -5984,7 +6006,8 @@
+ if ( ok != 0 )
+ *ok = false;
+
+- qWarning( "interpretRowAlign(): could not parse value \"%s\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretRowAlign(): could not parse value \"%s\"", value_ba.data() );
+ return QwtMml::RowAlignAxis;
+ }
+
+@@ -6018,7 +6041,8 @@
+ if ( ok != 0 )
+ *ok = false;
+
+- qWarning( "interpretFrameType(): could not parse value \"%s\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretFrameType(): could not parse value \"%s\"", value_ba.data() );
+ return QwtMml::FrameNone;
+ }
+
+@@ -6030,7 +6054,8 @@
+ QStringList l = value_list.split( ' ' );
+ if ( l.count() != 2 )
+ {
+- qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list.toLatin1().data() );
++ QByteArray value_list_ba = value_list.toLatin1();
++ qWarning( "interpretFrameSpacing: could not parse value \"%s\"", value_list_ba.data() );
+ if ( ok != 0 )
+ *ok = false;
+ return QwtMml::FrameSpacing( ( int )( 0.4 * em ), ( int )( 0.5 * ex ) );
+@@ -6089,7 +6114,10 @@
+ else if ( value == "bold" )
+ fn.setBold( true );
+ else
+- qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value.toLatin1().data() );
++ {
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretDepreciatedFontAttr(): could not parse fontweight \"%s\"", value_ba.data() );
++ }
+ }
+
+ if ( font_attr.contains( "fontstyle" ) )
+@@ -6100,7 +6128,10 @@
+ else if ( value == "italic" )
+ fn.setItalic( true );
+ else
+- qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value.toLatin1().data() );
++ {
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretDepreciatedFontAttr(): could not parse fontstyle \"%s\"", value_ba.data() );
++ }
+ }
+
+ if ( font_attr.contains( "fontfamily" ) )
+@@ -6150,7 +6181,8 @@
+
+ if ( ok != 0 )
+ *ok = false;
+- qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value.toLatin1().data() );
++ QByteArray value_ba = value.toLatin1();
++ qWarning( "interpretMathSize(): could not parse mathsize \"%s\"", value_ba.data() );
+ return fn;
+ }
+
diff --git a/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
new file mode 100644
index 000000000000..f00ea604f5f4
--- /dev/null
+++ b/x11-libs/qwt/files/qwt-6.1.1-pc-destdir.patch
@@ -0,0 +1,15 @@
+ textengines/mathml/mathml.pro | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/textengines/mathml/mathml.pro b/textengines/mathml/mathml.pro
+index 7032366..b1372f7 100644
+--- a/textengines/mathml/mathml.pro
++++ b/textengines/mathml/mathml.pro
+@@ -63,6 +63,7 @@ contains(QWT_CONFIG, QwtPkgConfig) {
+
+ # QMAKE_PKGCONFIG_DESTDIR is buggy, in combination
+ # with including pri files: better don't use it
++ QMAKE_PKGCONFIG_DESTDIR = pkgconfig
+
+ greaterThan(QT_MAJOR_VERSION, 4) {
+
diff --git a/x11-libs/qwt/metadata.xml b/x11-libs/qwt/metadata.xml
new file mode 100644
index 000000000000..df37d0ec52a5
--- /dev/null
+++ b/x11-libs/qwt/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <longdescription lang="en">
+ The Qwt library contains GUI Components and utility classes which are
+ primarily useful for programs with a technical background.
+ Besides a 2D plot widget it provides scales, sliders, dials,
+ compasses, thermometers, wheels and knobs to control or display
+ values, arrays or ranges of type double.
+</longdescription>
+ <use>
+ <flag name="mathml">Use the MathML renderer of the Qt solutions package.</flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">qwt</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/qwt/qwt-5.2.3-r2.ebuild b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
new file mode 100644
index 000000000000..24e14e42d1d7
--- /dev/null
+++ b/x11-libs/qwt/qwt-5.2.3-r2.ebuild
@@ -0,0 +1,102 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multibuild qt4-r2
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-macos"
+SLOT="5"
+IUSE="doc examples static-libs svg"
+
+DEPEND="
+ dev-qt/designer:4
+ dev-qt/qtgui:4
+ doc? ( !<media-libs/coin-3.1.3[doc] )
+ svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+DOCS="CHANGES README"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-install_qt.patch
+ sed -e "/QwtVersion/s:5.2.2.:${PV}:g" -i ${PN}.prf || die
+
+ cat > qwtconfig.pri <<-EOF
+ target.path = "${EPREFIX}/usr/$(get_libdir)"
+ headers.path = "${EPREFIX}/usr/include/qwt5"
+ doc.path = "${EPREFIX}/usr/share/doc/${PF}"
+ CONFIG += qt warn_on thread release
+ CONFIG += QwtPlot QwtWidgets QwtDesigner
+ VERSION = ${PV}
+ QWT_VERSION = ${PV/_*}
+ QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features"
+ EOF
+ sed -i -e 's/headers doc/headers/' src/src.pro || die
+ use svg && echo >> qwtconfig.pri "CONFIG += QwtSVGItem"
+
+ MULTIBUILD_VARIANTS=( )
+ use static-libs && MULTIBUILD_VARIANTS+=( static )
+ MULTIBUILD_VARIANTS+=( shared )
+
+ qt4-r2_src_prepare
+
+ preparation() {
+ cp -rf "${S}" "${BUILD_DIR}" || die
+ [[ ${MULTIBUILD_VARIANT} == shared ]] && \
+ echo "CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
+ }
+
+ multibuild_foreach_variant preparation
+}
+
+src_configure() {
+ multibuild_parallel_foreach_variant run_in_build_dir eqmake4 ${PN}.pro
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
+}
+
+src_test() {
+ testing() {
+ cd examples || die
+ eqmake4 examples.pro
+ emake
+ }
+ multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+ multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
+
+ if use doc; then
+ insinto /usr/share/doc/${PF}
+ rm doc/man/*/*license* || die
+ rm -f doc/man/*/{_,deprecated}* || die
+ doman doc/man/*/*
+ doins -r doc/html
+ fi
+ if use examples; then
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt5"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt5"
+ LIBS += -lqwt
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ cp *.pri examples/ || die
+ insinto /usr/share/${PN}5
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/qwt/qwt-6.0.0.ebuild b/x11-libs/qwt/qwt-6.0.0.ebuild
new file mode 100644
index 000000000000..7cd3e9fd9068
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.0.0.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit eutils qt4-r2
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-macos"
+SLOT="6"
+IUSE="doc examples svg"
+
+DEPEND="
+ dev-qt/qtgui:4
+ doc? ( !<media-libs/coin-3.1.3[doc] )
+ svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="CHANGES README"
+
+src_prepare() {
+ cat > qwtconfig.pri <<-EOF
+ QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+ QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+ QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+ QWT_CONFIG += QwtDll QwtPlot QwtWidgets QwtDesigner
+ VERSION = ${PV/_*}
+ QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/$(get_libdir)/qt4/features6"
+ EOF
+
+ cat > qwtbuild.pri <<-EOF
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ EOF
+
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
+ LIBS += -lqwt
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ sed \
+ -e 's/target doc/target/' \
+ -i src/src.pro || die
+
+ # Renaming lib to libqwt6.so to enable slotting
+ sed \
+ -e "/^TARGET/s:qwt:qwt6:g" \
+ -i src/src.pro || die
+ sed \
+ -e '/qtAddLibrary/s:qwt:qwt6:g' \
+ -i qwt.prf designer/designer.pro || die
+ sed \
+ -e 's:libqwt:libqwt6:g' \
+ -i qwtbuild.pri || die
+
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+ cp *.pri examples/ || die
+}
+
+src_compile() {
+ # split compilation to allow parallel building
+ emake sub-src
+ emake
+}
+
+src_install () {
+ rm -f doc/man/*/{_,deprecated}* || die
+ qt4-r2_src_install
+ if use doc; then
+ dohtml -r doc/html/*
+ fi
+ if use examples; then
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/qwt/qwt-6.1.0.ebuild b/x11-libs/qwt/qwt-6.1.0.ebuild
new file mode 100644
index 000000000000..0824ffc92205
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multibuild qt4-r2
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6"
+IUSE="doc examples mathml static-libs svg"
+
+DEPEND="
+ !<x11-libs/qwt-5.2.3
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ doc? ( !<media-libs/coin-3.1.3[doc] )
+ svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="README"
+
+PATCHES=( "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch )
+
+src_prepare() {
+ cat > qwtconfig.pri <<-EOF
+ QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+ QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+ QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+ QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner
+ VERSION = ${PV/_*}
+ QWT_VERSION = ${PV/_*}
+ QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features"
+ EOF
+
+ use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ EOF
+
+ sed \
+ -e 's/target doc/target/' \
+ -e "/^TARGET/s:(qwt):(qwt6):g" \
+ -i src/src.pro || die
+
+ sed \
+ -e '/qwtAddLibrary/s:(qwt):(qwt6):g' \
+ -i qwt.prf designer/designer.pro examples/examples.pri \
+ textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+
+ MULTIBUILD_VARIANTS=( )
+ use static-libs && MULTIBUILD_VARIANTS+=( static )
+ MULTIBUILD_VARIANTS+=( shared )
+
+ qt4-r2_src_prepare
+
+ multibuild_copy_sources
+ preparation() {
+ [[ ${MULTIBUILD_VARIANT} == shared ]] && \
+ echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
+ }
+
+ multibuild_foreach_variant preparation
+}
+
+src_configure() {
+ multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
+}
+
+src_test() {
+ testing() {
+ cd examples || die
+ eqmake4 examples.pro
+ emake
+ }
+ multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+ rm -f doc/man/*/{_,deprecated}* || die
+ multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
+
+ use doc && dohtml -r doc/html/*
+
+ if use examples; then
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
+ LIBS += -lqwt6
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ cp *.pri examples/ || die
+ insinto /usr/share/${PN}6
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/qwt/qwt-6.1.1.ebuild b/x11-libs/qwt/qwt-6.1.1.ebuild
new file mode 100644
index 000000000000..60bfa84bf6ad
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multibuild qt4-r2
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6"
+IUSE="doc examples mathml static-libs svg"
+
+DEPEND="
+ !<x11-libs/qwt-5.2.3
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ doc? ( !<media-libs/coin-3.1.3[doc] )
+ svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="README"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
+ "${FILESDIR}"/${P}-pc-destdir.patch
+ )
+
+src_prepare() {
+ cat > qwtconfig.pri <<-EOF
+ QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+ QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+ QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+ QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner QwtPkgConfig
+ VERSION = ${PV/_*}
+ QWT_VERSION = ${PV/_*}
+ QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features"
+ EOF
+
+ use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ EOF
+
+ sed \
+ -e 's/target doc/target/' \
+ -e "/^TARGET/s:(qwt):(qwt6):g" \
+ -i src/src.pro || die
+
+ sed \
+ -e '/qwtAddLibrary/s:(qwt):(qwt6):g' \
+ -i qwt.prf designer/designer.pro examples/examples.pri \
+ textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+
+ MULTIBUILD_VARIANTS=( )
+ use static-libs && MULTIBUILD_VARIANTS+=( static )
+ MULTIBUILD_VARIANTS+=( shared )
+
+ qt4-r2_src_prepare
+
+ multibuild_copy_sources
+ preparation() {
+ [[ ${MULTIBUILD_VARIANT} == shared ]] && \
+ echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
+ }
+
+ multibuild_foreach_variant preparation
+}
+
+src_configure() {
+ multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
+}
+
+src_test() {
+ testing() {
+ cd examples || die
+ eqmake4 examples.pro
+ emake
+ }
+ multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+ rm -f doc/man/*/{_,deprecated}* || die
+ multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
+
+ use doc && dohtml -r doc/html/*
+
+ if use examples; then
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
+ LIBS += -lqwt6
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ cp *.pri examples/ || die
+ insinto /usr/share/${PN}6
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/qwt/qwt-6.1.2-r1.ebuild b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
new file mode 100644
index 000000000000..0b678c3f629f
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.2-r1.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multibuild multilib qmake-utils
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6"
+IUSE="doc examples mathml opengl qt4 qt5 static-libs svg"
+
+REQUIRED_USE="|| ( qt4 qt5 )"
+
+DEPEND="
+ !<x11-libs/qwt-5.2.3
+ qt4? (
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ opengl? ( dev-qt/qtopengl:4 )
+ svg? ( dev-qt/qtsvg:4 )
+ )
+ qt5? (
+ dev-qt/designer:5
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtconcurrent:5
+ dev-qt/qtwidgets:5
+ opengl? ( dev-qt/qtopengl:5 )
+ svg? ( dev-qt/qtsvg:5 )
+ )
+ doc? ( !<media-libs/coin-3.1.3[doc] )
+ opengl? ( virtual/opengl )
+ "
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="README"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
+ "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
+ )
+
+src_prepare() {
+ cat > qwtconfig.pri <<-EOF
+ QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+ QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+ QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+ QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner QwtPkgConfig
+ VERSION = ${PV/_*}
+ QWT_VERSION = ${PV/_*}
+ EOF
+
+ use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+ use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ EOF
+
+ MULTIBUILD_VARIANTS=( )
+
+ if use qt4; then
+ use static-libs && MULTIBUILD_VARIANTS+=( qt4-static )
+ MULTIBUILD_VARIANTS+=( qt4-shared )
+ fi
+
+ if use qt5; then
+ use static-libs && MULTIBUILD_VARIANTS+=( qt5-static )
+ MULTIBUILD_VARIANTS+=( qt5-shared )
+ fi
+
+ multibuild_copy_sources
+
+ preparation() {
+ if [[ ${MULTIBUILD_VARIANT} == *-shared ]]; then
+ echo "QWT_CONFIG += QwtDll" >> qwtconfig.pri
+ fi
+
+ case "${MULTIBUILD_VARIANT}" in
+ qt4-*)
+ cat >> qwtconfig.pri <<-EOF
+ QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features"
+ EOF
+ sed \
+ -e 's/target doc/target/' \
+ -e "/^TARGET/s:(qwt):(qwt6-qt4):g" \
+ -e "/^TARGET/s:qwt):qwt6-qt4):g" \
+ -i src/src.pro || die
+
+ sed \
+ -e '/qwtAddLibrary/s:(qwt):(qwt6-qt4):g' \
+ -e '/qwtAddLibrary/s:qwt):qwt6-qt4):g' \
+ -i qwt.prf designer/designer.pro examples/examples.pri \
+ textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+
+ ;;
+ qt5-*)
+ cat >> qwtconfig.pri <<-EOF
+ QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt5/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt5/mkspecs/features"
+ EOF
+ sed \
+ -e 's/target doc/target/' \
+ -e "/^TARGET/s:(qwt):(qwt6-qt5):g" \
+ -e "/^TARGET/s:qwt):qwt6-qt5):g" \
+ -i src/src.pro || die
+
+ sed \
+ -e '/qwtAddLibrary/s:(qwt):(qwt6-qt5):g' \
+ -e '/qwtAddLibrary/s:qwt):qwt6-qt5):g' \
+ -i qwt.prf designer/designer.pro examples/examples.pri \
+ textengines/mathml/qwtmathml.prf textengines/textengines.pri || die
+ ;;
+ esac
+ epatch "${PATCHES[@]}"
+ }
+
+ multibuild_foreach_variant run_in_build_dir preparation
+}
+
+src_configure() {
+ configuration() {
+ case "${MULTIBUILD_VARIANT}" in
+ qt4-*)
+ eqmake4
+ ;;
+ qt5-*)
+ eqmake5
+ ;;
+ esac
+ }
+ multibuild_parallel_foreach_variant run_in_build_dir configuration
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir default
+}
+
+src_test() {
+ testing() {
+ cd examples || die
+ case "${MULTIBUILD_VARIANT}" in
+ qt4-*)
+ eqmake4 examples.pro
+ ;;
+ qt5-*)
+ eqmake5 examples.pro
+ ;;
+ esac
+ emake
+ }
+ multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+ rm -f doc/man/*/{_,deprecated}* || die
+
+ multibuild_foreach_variant run_in_build_dir emake INSTALL_ROOT="${D}" install
+
+ if use qt4; then
+ mv "${ED}"/usr/$(get_libdir)/pkgconfig/qwt6{-qt4,}.pc || die
+ fi
+
+ if use mathml; then
+ sed \
+ -e "s: -L${WORKDIR}.* -lqwt6: -lqwt6:g" \
+ -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
+ fi
+
+ use doc && dohtml -r doc/html/*
+
+ if use examples; then
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
+ LIBS += -lqwt6
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ cp *.pri examples/ || die
+ insinto /usr/share/${PN}6
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/qwt/qwt-6.1.2.ebuild b/x11-libs/qwt/qwt-6.1.2.ebuild
new file mode 100644
index 000000000000..0f2ea3b5c222
--- /dev/null
+++ b/x11-libs/qwt/qwt-6.1.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils multibuild qt4-r2
+
+MY_P="${PN}-${PV/_/-}"
+
+DESCRIPTION="2D plotting library for Qt4"
+HOMEPAGE="http://qwt.sourceforge.net/"
+SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV/_/-}/${MY_P}.tar.bz2"
+
+LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+SLOT="6"
+IUSE="doc examples mathml opengl static-libs svg"
+
+DEPEND="
+ !<x11-libs/qwt-5.2.3
+ dev-qt/designer:4
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ doc? ( !<media-libs/coin-3.1.3[doc] )
+ opengl? (
+ dev-qt/qtopengl:4
+ virtual/opengl
+ )
+ svg? ( dev-qt/qtsvg:4 )"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}"/${MY_P}
+
+DOCS="README"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-6.0.2-invalid-read.patch
+ "${FILESDIR}"/${PN}-6.1.1-pc-destdir.patch
+ )
+
+src_prepare() {
+ cat > qwtconfig.pri <<-EOF
+ QWT_INSTALL_LIBS = "${EPREFIX}/usr/$(get_libdir)"
+ QWT_INSTALL_HEADERS = "${EPREFIX}/usr/include/qwt6"
+ QWT_INSTALL_DOCS = "${EPREFIX}/usr/share/doc/${PF}"
+ QWT_CONFIG += QwtPlot QwtWidgets QwtDesigner QwtPkgConfig
+ VERSION = ${PV/_*}
+ QWT_VERSION = ${PV/_*}
+ QWT_INSTALL_PLUGINS = "${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer"
+ QWT_INSTALL_FEATURES = "${EPREFIX}/usr/share/qt4/mkspecs/features"
+ EOF
+
+ use mathml && echo "QWT_CONFIG += QwtMathML" >> qwtconfig.pri
+ use opengl && echo "QWT_CONFIG += QwtOpenGL" >> qwtconfig.pri
+ use svg && echo "QWT_CONFIG += QwtSvg" >> qwtconfig.pri
+
+ cat > qwtbuild.pri <<-EOF
+ QWT_CONFIG += qt warn_on thread release no_keywords
+ EOF
+
+ sed \
+ -e 's/target doc/target/' \
+ -e "/^TARGET/s:(qwt):(qwt6):g" \
+ -i src/src.pro || die
+
+ sed \
+ -e '/qwtAddLibrary/s:qwt):qwt6):g' \
+ -i qwt.prf designer/designer.pro examples/examples.pri \
+ textengines/mathml/qwtmathml.prf textengines/textengines.pri \
+ designer/designer.pro || die
+
+ MULTIBUILD_VARIANTS=( )
+ use static-libs && MULTIBUILD_VARIANTS+=( static )
+ MULTIBUILD_VARIANTS+=( shared )
+
+ qt4-r2_src_prepare
+
+ multibuild_copy_sources
+ preparation() {
+ [[ ${MULTIBUILD_VARIANT} == shared ]] && \
+ echo "QWT_CONFIG += QwtDll" >> "${BUILD_DIR}"/qwtconfig.pri
+ }
+
+ multibuild_foreach_variant preparation
+}
+
+src_configure() {
+ multibuild_parallel_foreach_variant run_in_build_dir qt4-r2_src_configure
+}
+
+src_compile() {
+ multibuild_foreach_variant run_in_build_dir qt4-r2_src_compile
+}
+
+src_test() {
+ testing() {
+ cd examples || die
+ eqmake4 examples.pro
+ emake
+ }
+ multibuild_foreach_variant run_in_build_dir testing
+}
+
+src_install () {
+ rm -f doc/man/*/{_,deprecated}* || die
+ multibuild_foreach_variant run_in_build_dir qt4-r2_src_install
+
+ if use mathml; then
+ sed \
+ -e "s: -L${WORKDIR}.* -lqwt6: -lqwt6:g" \
+ -i "${ED}"/usr/$(get_libdir)/pkgconfig/qwtmathml.pc || die
+ fi
+
+ use doc && dohtml -r doc/html/*
+
+ if use examples; then
+ # don't build examples - fix the qt files to build once installed
+ cat > examples/examples.pri <<-EOF
+ include( qwtconfig.pri )
+ TEMPLATE = app
+ MOC_DIR = moc
+ INCLUDEPATH += "${EPREFIX}/usr/include/qwt6"
+ DEPENDPATH += "${EPREFIX}/usr/include/qwt6"
+ LIBS += -lqwt6
+ EOF
+ sed -i -e 's:../qwtconfig:qwtconfig:' examples/examples.pro || die
+ cp *.pri examples/ || die
+ insinto /usr/share/${PN}6
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/qwtplot3d/Manifest b/x11-libs/qwtplot3d/Manifest
new file mode 100644
index 000000000000..62eefb2c61c4
--- /dev/null
+++ b/x11-libs/qwtplot3d/Manifest
@@ -0,0 +1 @@
+DIST qwtplot3d-0.2.7.tgz 183836 SHA256 1208336b15e82e7a9d22cbc743e46f27e2fad716094a9c133138f259fa299a42
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
new file mode 100644
index 000000000000..b0632a380a2a
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-doxygen.patch
@@ -0,0 +1,28 @@
+--- qwtplot3d/doc/Doxyfile.doxygen.orig 2007-11-26 22:30:57.000000000 +0000
++++ qwtplot3d/doc/Doxyfile.doxygen 2007-11-26 22:30:03.000000000 +0000
+@@ -116,7 +116,7 @@
+ HTML_ALIGN_MEMBERS = YES
+ GENERATE_HTMLHELP = NO
+ CHM_FILE = qwtplot3d.chm
+-HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
++#HHC_LOCATION = "c:\Programme\HTML Help Workshop\hhc.exe"
+ GENERATE_CHI = NO
+ BINARY_TOC = YES
+ TOC_EXPAND = YES
+@@ -181,7 +181,7 @@
+ MACRO_EXPANSION = NO
+ EXPAND_ONLY_PREDEF = NO
+ SEARCH_INCLUDES = YES
+-INCLUDE_PATH = V:/cvs/qwtplot3d/include/
++INCLUDE_PATH = ../include
+ INCLUDE_FILE_PATTERNS = *.h
+ PREDEFINED = QWT3D_NOT_FOR_DOXYGEN \
+ QT_VERSION=0x040000
+@@ -212,7 +212,6 @@
+ GRAPHICAL_HIERARCHY = YES
+ DIRECTORY_GRAPH = YES
+ DOT_IMAGE_FORMAT = png
+-DOT_PATH = V:/graphviz/Graphviz/bin/
+ DOTFILE_DIRS =
+ MAX_DOT_GRAPH_WIDTH = 974
+ MAX_DOT_GRAPH_HEIGHT = 10000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
new file mode 100644
index 000000000000..f142c3379274
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-examples.patch
@@ -0,0 +1,125 @@
+diff -Nur qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp qwtplot3d/examples/axes/src/axesmainwindow.cpp
+--- qwtplot3d.orig/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/axes/src/axesmainwindow.cpp 2007-11-26 22:21:56.000000000 +0000
+@@ -9,7 +9,7 @@
+
+ #include "axes.h"
+ #include "axesmainwindow.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+
+ using namespace std;
+ using namespace Qwt3D;
+diff -Nur qwtplot3d.orig/examples/common.pro qwtplot3d/examples/common.pro
+--- qwtplot3d.orig/examples/common.pro 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/common.pro 2007-11-26 23:43:33.000000000 +0000
+@@ -1,13 +1,13 @@
+ TEMPLATE = app
+-CONFIG += qt warn_on thread debug
++CONFIG += qt warn_on thread
+ UI_DIR = tmp
+ MOC_DIR = tmp
+ OBJECTS_DIR = tmp
+-INCLUDEPATH += ../../include
++INCLUDEPATH += /usr/include/qwtplot3d
+ DEPENDPATH = $$INCLUDEPATH
+ DESTDIR = ../bin
+
+-unix:LIBS += -lqwtplot3d -L../../lib
++unix:LIBS += -lqwtplot3d
+ linux-g++:QMAKE_CXXFLAGS += -fno-exceptions
+
+ win32{
+@@ -25,7 +25,7 @@
+ ISQT4 = $$find(MYVERSION, ^[2-9])
+
+ !isEmpty( ISQT4 ) {
+-RESOURCES = ../images.qrc
++#RESOURCES = ../images.qrc
+ QT += opengl
+ }
+
+diff -Nur qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp
+--- qwtplot3d.orig/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/enrichments/src/enrichmentmainwindow.cpp 2007-11-26 22:22:48.000000000 +0000
+@@ -6,7 +6,7 @@
+
+ #include "enrichmentmainwindow.h"
+ #include "enrichments.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_function.h>
+
+ using namespace Qwt3D;
+
+diff -Nur qwtplot3d.orig/examples/mesh2/src/colormapreader.h qwtplot3d/examples/mesh2/src/colormapreader.h
+--- qwtplot3d.orig/examples/mesh2/src/colormapreader.h 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/colormapreader.h 2007-11-26 22:23:19.000000000 +0000
+@@ -5,7 +5,7 @@
+ #include <qframe.h>
+ #include <qpixmap.h>
+
+-#include "../../../include/qwt3d_types.h"
++#include <qwt3d_types.h>
+
+ #if QT_VERSION < 0x040000
+
+diff -Nur qwtplot3d.orig/examples/mesh2/src/functions.h qwtplot3d/examples/mesh2/src/functions.h
+--- qwtplot3d.orig/examples/mesh2/src/functions.h 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/functions.h 2007-11-26 22:23:47.000000000 +0000
+@@ -2,8 +2,8 @@
+ #define __EXAMPLE_H__
+
+ #include <math.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_function.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_function.h>
+
+ using namespace Qwt3D;
+
+diff -Nur qwtplot3d.orig/examples/mesh2/src/lightingdlg.h qwtplot3d/examples/mesh2/src/lightingdlg.h
+--- qwtplot3d.orig/examples/mesh2/src/lightingdlg.h 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/lightingdlg.h 2007-11-26 22:24:41.000000000 +0000
+@@ -3,10 +3,10 @@
+
+ #include <math.h>
+ #include <qapplication.h>
+-#include "../../../include/qwt3d_parametricsurface.h"
+-#include "../../../include/qwt3d_surfaceplot.h"
+-#include "../../../include/qwt3d_enrichment.h"
+-#include "../../../include/qwt3d_color.h"
++#include <qwt3d_parametricsurface.h>
++#include <qwt3d_surfaceplot.h>
++#include <qwt3d_enrichment.h>
++#include <qwt3d_color.h>
+
+ #if QT_VERSION < 0x040000
+ #include "lightingdlgbase.h"
+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp
+--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.cpp 2007-11-26 22:25:33.000000000 +0000
+@@ -33,9 +33,9 @@
+ #include "colormapreader.h"
+ #include "lightingdlg.h"
+ #include "femreader.h"
+-#include "../../../include/qwt3d_io.h"
+-#include "../../../include/qwt3d_io_gl2ps.h"
+-#include "../../../include/qwt3d_io_reader.h"
++#include <qwt3d_io.h>
++#include <qwt3d_io_gl2ps.h>
++#include <qwt3d_io_reader.h>
+
+ using namespace Qwt3D;
+ using namespace std;
+diff -Nur qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h qwtplot3d/examples/mesh2/src/mesh2mainwindow.h
+--- qwtplot3d.orig/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/examples/mesh2/src/mesh2mainwindow.h 2007-11-26 22:26:09.000000000 +0000
+@@ -1,7 +1,7 @@
+ #ifndef mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+ #define mesh2mainwindow_h__2004_03_07_13_38_begin_guarded_code
+
+-#include "../../../include/qwt3d_surfaceplot.h"
++#include <qwt3d_surfaceplot.h>
+
+
+ #if QT_VERSION < 0x040000
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
new file mode 100644
index 000000000000..a76fe831ab91
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-gcc44.patch
@@ -0,0 +1,12 @@
+diff -ur qwtplot3d-orig/include/qwt3d_function.h qwtplot3d/include/qwt3d_function.h
+--- qwtplot3d-orig/include/qwt3d_function.h 2009-07-25 18:18:58.000000000 -0400
++++ qwtplot3d/include/qwt3d_function.h 2009-07-25 18:19:19.000000000 -0400
+@@ -2,6 +2,7 @@
+ #define qwt3d_function_h__2004_03_05_13_51_begin_guarded_code
+
+ #include "qwt3d_gridmapping.h"
++#include <cstdio>
+
+ namespace Qwt3D
+ {
+Only in qwtplot3d/tmp: qwt3d_function.o
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
new file mode 100644
index 000000000000..831ad558d2f4
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-profile.patch
@@ -0,0 +1,27 @@
+--- qwtplot3d.orig/qwtplot3d.pro 2007-11-26 22:16:54.000000000 +0000
++++ qwtplot3d/qwtplot3d.pro 2007-11-26 23:45:18.000000000 +0000
+@@ -3,7 +3,7 @@
+
+ TARGET = qwtplot3d
+ TEMPLATE = lib
+-CONFIG += qt warn_on opengl thread zlib debug
++CONFIG += qt warn_on opengl thread zlib
+ MOC_DIR = tmp
+ OBJECTS_DIR = tmp
+ INCLUDEPATH = include
+@@ -21,7 +21,7 @@
+ win32:CONFIG -= zlib
+
+ linux-g++:TMAKE_CXXFLAGS += -fno-exceptions
+-unix:VERSION = 0.2.6
++unix:VERSION = 0.2.7
+
+ # Input
+ SOURCES += src/qwt3d_axis.cpp \
+@@ -92,4 +92,4 @@
+ DEFINES += GL2PS_HAVE_ZLIB
+ win32:LIBS += zlib.lib
+ unix:LIBS += -lz
+-}
+\ No newline at end of file
++}
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch b/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch
new file mode 100644
index 000000000000..4e558eda7c96
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-qt48.patch
@@ -0,0 +1,19 @@
+ include/qwt3d_openglhelper.h | 5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/include/qwt3d_openglhelper.h b/include/qwt3d_openglhelper.h
+index e5499c2..a7ecddc 100644
+--- a/include/qwt3d_openglhelper.h
++++ b/include/qwt3d_openglhelper.h
+@@ -8,6 +8,11 @@
+ #include <QtOpenGL/qgl.h>
+ #endif
+
++#if QT_VERSION < 0x047999
++#include <GL/glu.h>
++#endif
++
++
+ namespace Qwt3D
+ {
+
diff --git a/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
new file mode 100644
index 000000000000..81a77e13249f
--- /dev/null
+++ b/x11-libs/qwtplot3d/files/qwtplot3d-sys-gl2ps.patch
@@ -0,0 +1,31 @@
+--- qwtplot3d.pro.orig 2009-04-07 19:45:29.985645378 +0100
++++ qwtplot3d.pro 2009-04-07 19:46:50.095747068 +0100
+@@ -80,13 +80,11 @@
+ include/qwt3d_graphplot.h \
+ include/qwt3d_multiplot.h
+
+-# gl2ps support
+-HEADERS+=3rdparty/gl2ps/gl2ps.h \
+- include/qwt3d_io_gl2ps.h
++# gl2ps support taken from system libs
++HEADERS+=include/qwt3d_io_gl2ps.h
+
+-SOURCES+=src/qwt3d_io_gl2ps.cpp \
+- 3rdparty/gl2ps/gl2ps.c
+-
++SOURCES+=src/qwt3d_io_gl2ps.cpp
++unix:LIBS += -lgl2ps
+ # zlib support for gl2ps
+ zlib {
+ DEFINES += GL2PS_HAVE_ZLIB
+--- src/qwt3d_io_gl2ps.cpp.orig 2009-04-07 19:44:38.536418391 +0100
++++ src/qwt3d_io_gl2ps.cpp 2009-04-07 19:45:03.685133854 +0100
+@@ -4,7 +4,7 @@
+
+ #include <time.h>
+ #include "qwt3d_openglhelper.h"
+-#include "../3rdparty/gl2ps/gl2ps.h"
++#include <gl2ps.h>
+ #include "qwt3d_io_gl2ps.h"
+ #include "qwt3d_plot.h"
+
diff --git a/x11-libs/qwtplot3d/metadata.xml b/x11-libs/qwtplot3d/metadata.xml
new file mode 100644
index 000000000000..e06eb8b1e62d
--- /dev/null
+++ b/x11-libs/qwtplot3d/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <longdescription>
+ QwtPlot3D isa feature-rich Qt/OpenGL-based C++ programming library,
+ providing essentially a bunch of 3D-widgets for programmers.
+ </longdescription>
+ <upstream>
+ <remote-id type="sourceforge">qwtplot3d</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild
new file mode 100644
index 000000000000..b39c275345c8
--- /dev/null
+++ b/x11-libs/qwtplot3d/qwtplot3d-0.2.7-r2.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit qt4-r2
+
+DESCRIPTION="Qt4/OpenGL-based 3D widget library for C++"
+HOMEPAGE="http://qwtplot3d.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="doc examples"
+KEYWORDS="amd64 ~ppc ~ppc64 x86"
+
+RDEPEND="dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ x11-libs/gl2ps"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/${PN}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-profile.patch
+ "${FILESDIR}"/${PN}-examples.patch
+ "${FILESDIR}"/${PN}-doxygen.patch
+ "${FILESDIR}"/${PN}-sys-gl2ps.patch
+ "${FILESDIR}"/${PN}-gcc44.patch
+ "${FILESDIR}"/${PN}-qt48.patch
+ )
+
+src_prepare() {
+ qt4-r2_src_prepare
+ cat >> ${PN}.pro <<-EOF
+ target.path = /usr/$(get_libdir)
+ headers.path = /usr/include/${PN}
+ headers.files = \$\$HEADERS
+ INSTALLS = target headers
+ EOF
+}
+
+src_compile() {
+ qt4-r2_src_compile
+ if use doc ; then
+ cd doc
+ doxygen Doxyfile.doxygen || die "doxygen failed"
+ fi
+}
+
+src_install () {
+ qt4-r2_src_install
+ if use examples; then
+ insinto /usr/share/${PN}
+ doins -r examples
+ fi
+ use doc && dohtml -r doc/web/doxygen/*
+}
diff --git a/x11-libs/qwtpolar/Manifest b/x11-libs/qwtpolar/Manifest
new file mode 100644
index 000000000000..158b95566b34
--- /dev/null
+++ b/x11-libs/qwtpolar/Manifest
@@ -0,0 +1,4 @@
+DIST qwtpolar-0.1.0.tar.bz2 768348 SHA256 af08b0106b1f7187db02dfd7e36f59ad185fbe72d72c62a6c91e9f492127a481
+DIST qwtpolar-1.0.0.zip 636765 SHA256 046cb0378134dbec76fc60435f93fe433c155087a03114eb1b96b605ee0e1e76 SHA512 94536af39e3658d56758d201a29c2e0aaec109ca37b3f9a4e7e7722ea7f63f45e31026d112b384b8e75008c93d10a070ebaa85c0c745a7d11529f7d1de10d4ba WHIRLPOOL 3c8a5d4ffbb8e4b9fc4cfbab3f7faaa1d7c16833c79b43633ded63f89f6efe80b2961985f0ce3d26ede52c48fae934a65616f5b18ecfd03b932225de6b0abae9
+DIST qwtpolar-1.1.0.zip 939175 SHA256 21ba860195985bfcb4e54da6a48aba4f7db44f01a6f26bbe6ffa9123802b78df SHA512 48bc5da93ed18aa83907651569245b77a6bce43e9e87d38f4531fecb20d74bdce4b0a18cee0722065637577cd73937ed8e3b5253df5262347ac382b1673233c0 WHIRLPOOL ba09b46a9da8604feb55bee31d2d336fbe746f2c1b3fb44ec4356f50860d03c713e2049421669a0bf67656afc241e5153c8dd2619d3745b699bfae1316db641c
+DIST qwtpolar-1.1.1.zip 939433 SHA256 41a820400af25190bf6a1a49d49410f9bd8423fabde2f2028b52086b640b4e27 SHA512 d3dfffa2f305be6ee51caf42fe08b5374d78a8916e91055974565b6dc7d7fe0b3fd166de06bc7a6c634a340a94abd27774186238c4a63096522b20576bccac67 WHIRLPOOL 2794b99fb613c1fe33056d107b11d1252a990c464230af57c844519fcb85e2ba60958d1937f8ea0244fdc7d7923a8d85617a2efe3ecb580e8624af1ca73288bd
diff --git a/x11-libs/qwtpolar/metadata.xml b/x11-libs/qwtpolar/metadata.xml
new file mode 100644
index 000000000000..9d090eca6c3f
--- /dev/null
+++ b/x11-libs/qwtpolar/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>sci-geosciences</herd>
+ <upstream>
+ <remote-id type="sourceforge">qwtpolar</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild b/x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..ac5824ae673f
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-0.1.0-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib qt4-r2
+
+DESCRIPTION="Library for displaying values on a polar coordinate system"
+HOMEPAGE="http://qwtpolar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="qwt"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
+
+DEPEND="x11-libs/qwt:5[svg]"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ sed -i \
+ -e "s:/path/to/qwt-5.2/include:${EPREFIX}/usr/include/qwt5:g" \
+ -e "s:/path/to/qwt-5.2/lib:${EPREFIX}/usr/$(get_libdir):g" \
+ -e "/= QwtPolarDesigner/ d" \
+ -e "s:/usr/local/qwtpolar-0.1.0:/usr/:g" \
+ -e "s:INSTALLBASE/lib:INSTALLBASE/$(get_libdir):g" \
+ -e "s:INSTALLBASE/include:INSTALLBASE/include/${PN}:" \
+ ${PN}.pri || die
+
+ sed -i \
+ -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
+ src/src.pro || die
+}
+
+src_install() {
+ qt4-r2_src_install
+
+ rm -rf "${ED}/usr/doc" || die
+
+ doman doc/man/man3/QwtPolar*
+ dohtml -r doc/html
+}
diff --git a/x11-libs/qwtpolar/qwtpolar-1.0.0.ebuild b/x11-libs/qwtpolar/qwtpolar-1.0.0.ebuild
new file mode 100644
index 000000000000..6306bd4e6ffc
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-1.0.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit multilib qt4-r2
+
+DESCRIPTION="Library for displaying values on a polar coordinate system"
+HOMEPAGE="http://qwtpolar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="qwt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/qwt:6[svg]"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+src_prepare() {
+ sed -i \
+ -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
+ -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
+ -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
+ -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6/:g" \
+ -e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${EPREFIX}/usr/$(get_libdir)/qt4/plugins/features6/:g" \
+ -e "/= QwtPolarDesigner/ d" \
+ ${PN}config.pri || die
+
+ sed -i \
+ -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
+ src/src.pro || die
+ echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
+ cat >> designer/designer.pro <<- EOF
+ INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
+ LIBS += -L"${S}"/$(get_libdir)
+ EOF
+}
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.0.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.0.ebuild
new file mode 100644
index 000000000000..22512e480b12
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.0.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 multilib qt4-r2
+
+DESCRIPTION="Library for displaying values on a polar coordinate system"
+HOMEPAGE="http://qwtpolar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="qwt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/qwt:6[svg]"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+src_prepare() {
+ sed \
+ -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
+ -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
+ -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
+ -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6/:g" \
+ -e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${EPREFIX}/usr/$(get_libdir)/qt4/plugins/features6/:g" \
+ -e "/= QwtPolarDesigner/ d" \
+ -e "/= QwtPolarExamples/d" \
+ -i ${PN}config.pri || die
+
+ sed \
+ -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
+ -i src/src.pro || die
+ echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
+ cat >> designer/designer.pro <<- EOF
+ INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
+ LIBS += -L"${S}"/$(get_libdir)
+ EOF
+}
diff --git a/x11-libs/qwtpolar/qwtpolar-1.1.1.ebuild b/x11-libs/qwtpolar/qwtpolar-1.1.1.ebuild
new file mode 100644
index 000000000000..22512e480b12
--- /dev/null
+++ b/x11-libs/qwtpolar/qwtpolar-1.1.1.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 multilib qt4-r2
+
+DESCRIPTION="Library for displaying values on a polar coordinate system"
+HOMEPAGE="http://qwtpolar.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.zip"
+
+LICENSE="qwt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/qwt:6[svg]"
+DEPEND="${RDEPEND}
+ app-arch/unzip"
+
+src_prepare() {
+ sed \
+ -e "/QWT_POLAR_INSTALL_PREFIX /s:=.*$:= ${EPREFIX}/usr:g" \
+ -e "/QWT_POLAR_INSTALL_LIBS/s:lib:$(get_libdir):g" \
+ -e "/QWT_POLAR_INSTALL_DOCS/s:doc:share/doc/${PF}:g" \
+ -e "/QWT_POLAR_INSTALL_PLUGINS/s:=.*$:= ${EPREFIX}/usr/$(get_libdir)/qt4/plugins/designer6/:g" \
+ -e "/QWT_POLAR_INSTALL_FEATURES/s:=.*$:= ${EPREFIX}/usr/$(get_libdir)/qt4/plugins/features6/:g" \
+ -e "/= QwtPolarDesigner/ d" \
+ -e "/= QwtPolarExamples/d" \
+ -i ${PN}config.pri || die
+
+ sed \
+ -e "s:{QWT_POLAR_ROOT}/lib:{QWT_POLAR_ROOT}/$(get_libdir):" \
+ -i src/src.pro || die
+ echo "INCLUDEPATH += ${EPREFIX}/usr/include/qwt6" >> src/src.pro
+ cat >> designer/designer.pro <<- EOF
+ INCLUDEPATH += "${EPREFIX}"/usr/include/qwt6
+ LIBS += -L"${S}"/$(get_libdir)
+ EOF
+}
diff --git a/x11-libs/rep-gtk/Manifest b/x11-libs/rep-gtk/Manifest
new file mode 100644
index 000000000000..0b9be6471b1b
--- /dev/null
+++ b/x11-libs/rep-gtk/Manifest
@@ -0,0 +1 @@
+DIST rep-gtk-0.90.8.1.tar.xz 251652 SHA256 aebb2ae356cb11a2a5a6516703f1b5c6d1d71c48715bc340c13db98b9bd1a650 SHA512 033c148b34591672f29b0a1636b4c962ff82423f627243db07746899bfbf0ccd479322743d0822903bf954cdb3bae662ef7b2f8064cbe2741c5e8cf886e56d1b WHIRLPOOL c76745c3fef4d839b9834940181c5618ad038927f597e866821ee9faf1e6256053d6f60e94776d2a7afb46f9892a1cfcb9b9da229cdd117b1b788922e90771a4
diff --git a/x11-libs/rep-gtk/metadata.xml b/x11-libs/rep-gtk/metadata.xml
new file mode 100644
index 000000000000..4538a68724a6
--- /dev/null
+++ b/x11-libs/rep-gtk/metadata.xml
@@ -0,0 +1,5 @@
+<?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-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild b/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild
new file mode 100644
index 000000000000..45d8f4575920
--- /dev/null
+++ b/x11-libs/rep-gtk/rep-gtk-0.90.8.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="4"
+
+inherit eutils multilib
+
+DESCRIPTION="A GTK+/libglade/GNOME language binding for the librep Lisp environment"
+HOMEPAGE="http://sawfish.wikia.com/wiki/Main_Page"
+SRC_URI="http://download.tuxfamily.org/librep/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="gtk-2.0"
+KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND=">=dev-libs/librep-0.90.5
+ >=dev-libs/glib-2.6:2
+ >=x11-libs/gtk+-2.24.0:2
+ >=x11-libs/gdk-pixbuf-2.23:2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ app-arch/xz-utils"
+
+#src_prepare() {
+ # Fix undefined symbol problems like bug #367623
+ # http://listengine.tuxfamily.org/lists.tuxfamily.org/sawfish/2011/09/msg00026.html
+ # TODO: Doesn't apply, if some people still get the failure, try to push a bit upstream
+ #epatch "${FILESDIR}/${PN}-0.90.7-implicit-def-new.patch"
+#}
+
+src_configure() {
+ econf \
+ --libdir=/usr/$(get_libdir) \
+ --disable-static
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+ find "${D}" -name '*.la' -exec rm -f {} + || die "la file removal failed"
+ dodoc AUTHORS ChangeLog README* TODO
+}
diff --git a/x11-libs/scw/Manifest b/x11-libs/scw/Manifest
new file mode 100644
index 000000000000..16074e5d17d2
--- /dev/null
+++ b/x11-libs/scw/Manifest
@@ -0,0 +1 @@
+DIST scw-0.4.7.tar.gz 410761 SHA256 2d2e14f5c9ca9cdb0014a5fd970b29f0e50b5170ffee4376ec2de60f8453d0cc
diff --git a/x11-libs/scw/metadata.xml b/x11-libs/scw/metadata.xml
new file mode 100644
index 000000000000..77bc185d574a
--- /dev/null
+++ b/x11-libs/scw/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>maintainer-needed@gentoo.org</email>
+ <name>Default assignee for orphaned packages</name>
+ </maintainer>
+ <longdescription lang="en">
+ Scw is a widget set specifically designed for chat programs. It extends
+ the Gtk+ widget set.
+ </longdescription>
+</pkgmetadata>
diff --git a/x11-libs/scw/scw-0.4.7.ebuild b/x11-libs/scw/scw-0.4.7.ebuild
new file mode 100644
index 000000000000..9bfc7a1c3b5f
--- /dev/null
+++ b/x11-libs/scw/scw-0.4.7.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=3
+
+DESCRIPTION="A GTK+ widget set specifically designed for chat programs"
+HOMEPAGE="http://scwwidgets.googlepages.com"
+SRC_URI="http://scwwidgets.googlepages.com/${P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE="doc"
+
+RDEPEND="dev-libs/glib:2
+ x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+ doc? ( dev-util/gtk-doc )
+ virtual/pkgconfig"
+
+src_configure() {
+ econf $(use_enable doc gtk-doc)
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die "emake install failed."
+ dodoc AUTHORS ChangeLog NEWS README
+}
diff --git a/x11-libs/startup-notification/Manifest b/x11-libs/startup-notification/Manifest
new file mode 100644
index 000000000000..45d1792a05ea
--- /dev/null
+++ b/x11-libs/startup-notification/Manifest
@@ -0,0 +1 @@
+DIST startup-notification-0.12.tar.gz 355285 SHA256 3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a SHA512 ea1246acdb50dafd9ced9914ec3c8f0d499c0ca3cfd447b43a444c768a6e9ea7135e5c42d9ca0089354698ac235bd86d42f12c70a3a17c9c79f998c07461f7ab WHIRLPOOL 3ce5fa69c618785443837df43261a5ed7edb9f0b3c13bf19638b1b7db90814957780099014bd61af51562874dd2c1fafea9134fe0af11521dfbc864d1abc9b88
diff --git a/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch b/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch
new file mode 100644
index 000000000000..8c579a71522f
--- /dev/null
+++ b/x11-libs/startup-notification/files/startup-notification-0.12-sys-select_h.patch
@@ -0,0 +1,30 @@
+From ea9f7e4cc6fd8c08d175ed7774ed2c5bd11c8ef0 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 17 Feb 2014 19:37:09 +0000
+Subject: Add include of <sys/select.h> for previous patch
+
+Unfortunately while the standard says that <sys/types.h> is the
+correct header to get suseconds_t, at least with glibc, that requires
+-DXOPEN_SOURCE. Which is problematic for a public header, because
+then all *users* of startup-notification will be required to define
+that.
+
+Poking around a bit, it looks like at least with glibc, <sys/select.h>
+will give us an unconditional define.
+
+Signed-off-by: Julien Danjou <julien@danjou.info>
+---
+diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h
+index 2f639df..cea4e12 100644
+--- a/libsn/sn-monitor.h
++++ b/libsn/sn-monitor.h
+@@ -28,6 +28,7 @@
+ #define __SN_MONITOR_H__
+
+ #include <libsn/sn-common.h>
++#include <sys/select.h>
+
+ SN_BEGIN_DECLS
+
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch b/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch
new file mode 100644
index 000000000000..710d29e93976
--- /dev/null
+++ b/x11-libs/startup-notification/files/startup-notification-0.12-time_t-crash-with-32bit.patch
@@ -0,0 +1,66 @@
+From a7e49fefde18ea8d5bada8096d32f23bcfb5a6dc Mon Sep 17 00:00:00 2001
+From: Federico G. Schwindt <fgsch@openbsd.org>
+Date: Mon, 17 Feb 2014 14:48:12 +0000
+Subject: Fix crash on 32bit architectures where time_t is 64 bit
+
+This is an ABI change on platforms where sizeof(time_t) doesn't equal
+sizeof(long). For most platforms this change shouldn't make a difference
+at present. OpenBSD recently switched to 64bit time_t on all architectures
+to avoid time_t overflow in 2038 on 32bit machines.
+
+This fix extends to consumers of startup-notification, for instance
+the window manager of XFCE, which is how I got involved in this.
+See http://mail.xfce.org/pipermail/xfce4-dev/2014-February/030611.html
+and follow-ups. The XFCE devs pointed out that my patch to fix a
+crash in XFCE's window manager depends on this startup-notification patch.
+
+Signed-off-by: Julien Danjou <julien@danjou.info>
+---
+diff --git a/libsn/sn-monitor.c b/libsn/sn-monitor.c
+index 2a9ad16..f419bc1 100644
+--- a/libsn/sn-monitor.c
++++ b/libsn/sn-monitor.c
+@@ -364,8 +364,8 @@ sn_startup_sequence_get_screen (SnStartupSequence *sequence)
+ **/
+ void
+ sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence,
+- long *tv_sec,
+- long *tv_usec)
++ time_t *tv_sec,
++ suseconds_t *tv_usec)
+ {
+ if (tv_sec)
+ *tv_sec = sequence->initiation_time.tv_sec;
+@@ -386,8 +386,8 @@ sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence,
+ **/
+ void
+ sn_startup_sequence_get_last_active_time (SnStartupSequence *sequence,
+- long *tv_sec,
+- long *tv_usec)
++ time_t *tv_sec,
++ suseconds_t *tv_usec)
+ {
+ /* for now the same as get_initiated_time */
+ if (tv_sec)
+diff --git a/libsn/sn-monitor.h b/libsn/sn-monitor.h
+index b58581f..2f639df 100644
+--- a/libsn/sn-monitor.h
++++ b/libsn/sn-monitor.h
+@@ -77,11 +77,11 @@ const char* sn_startup_sequence_get_application_id (SnStartupSequence *se
+ int sn_startup_sequence_get_screen (SnStartupSequence *sequence);
+
+ void sn_startup_sequence_get_initiated_time (SnStartupSequence *sequence,
+- long *tv_sec,
+- long *tv_usec);
++ time_t *tv_sec,
++ suseconds_t *tv_usec);
+ void sn_startup_sequence_get_last_active_time (SnStartupSequence *sequence,
+- long *tv_sec,
+- long *tv_usec);
++ time_t *tv_sec,
++ suseconds_t *tv_usec);
+
+ void sn_startup_sequence_complete (SnStartupSequence *sequence);
+
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/startup-notification/metadata.xml b/x11-libs/startup-notification/metadata.xml
new file mode 100644
index 000000000000..8c868061b739
--- /dev/null
+++ b/x11-libs/startup-notification/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>freedesktop</herd>
+<maintainer>
+<email>freedesktop-bugs@gentoo.org</email>
+</maintainer>
+</pkgmetadata>
diff --git a/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
new file mode 100644
index 000000000000..b9a529e910de
--- /dev/null
+++ b/x11-libs/startup-notification/startup-notification-0.12-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils xorg-2
+
+DESCRIPTION="Application startup notification and feedback library"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/startup-notification"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2 MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.4.3
+ >x11-libs/libxcb-1.6
+ >=x11-libs/xcb-util-0.3.8"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
+
+DOCS=( AUTHORS ChangeLog NEWS doc/${PN}.txt )
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/${P}-sys-select_h.patch \
+ "${FILESDIR}"/${P}-time_t-crash-with-32bit.patch
+ elibtoolize
+}
diff --git a/x11-libs/startup-notification/startup-notification-0.12.ebuild b/x11-libs/startup-notification/startup-notification-0.12.ebuild
new file mode 100644
index 000000000000..781f9003f49f
--- /dev/null
+++ b/x11-libs/startup-notification/startup-notification-0.12.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+inherit xorg-2
+
+DESCRIPTION="Application startup notification and feedback library"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/startup-notification"
+SRC_URI="http://www.freedesktop.org/software/${PN}/releases/${P}.tar.gz"
+
+LICENSE="LGPL-2 MIT"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=">=x11-libs/libX11-1.4.3
+ >x11-libs/libxcb-1.6
+ >=x11-libs/xcb-util-0.3.8"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
+
+DOCS=( AUTHORS ChangeLog NEWS doc/startup-notification.txt )
diff --git a/x11-libs/tslib/Manifest b/x11-libs/tslib/Manifest
new file mode 100644
index 000000000000..6ddc27b99a1b
--- /dev/null
+++ b/x11-libs/tslib/Manifest
@@ -0,0 +1,2 @@
+DIST tslib-1.0-patches-5.tar.bz2 6602 SHA256 5b4f4183de0bcc9ceb09565d55a2f6f08f3befc0962af423f9a4fd809d36db2f SHA512 dcde900942a3c9e9114e2c36d1d9554eeae8e5ca64463d69c52188a30734b19d6ba0439e8bb009b0d535dfae3f8f8e688a6861ec0a0371fdcb0e9986abb963de WHIRLPOOL fe14ce85a6f5f92e7c919fefcfc6cd303ede10d45670b150bc7baa3db99f64bb6d55f05416a3a8545cca205513fd80a0ebbe76c1ef8715e32235b91780e1374c
+DIST tslib-1.0.tar.bz2 47522 SHA256 9c40d914e4f6fe00bdd77137d671c7ce4f211686228f2eb8b2d3c2360bc249c8 SHA512 a12e569b1d9cd809776a605775c3000f4e405789d95eeda21451d3911b5aa67003c921d9988f5ea8eba8b32108c8b0816e6609b5f013a2594d27b6e00e75de8c WHIRLPOOL 176346c7d5ac9fb36c25bfc3b98699c26acd642ab4621c0a8e5b01999a9451e0ad7f3a87c8268b7c82b326fc6f1867fb2a132810c2a17aa417a245b2efbd3ec3
diff --git a/x11-libs/tslib/metadata.xml b/x11-libs/tslib/metadata.xml
new file mode 100644
index 000000000000..0288e627e3ff
--- /dev/null
+++ b/x11-libs/tslib/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>embedded</herd>
+ <upstream>
+ <remote-id type="github">kergoth/tslib</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/tslib/tslib-1.0-r3.ebuild b/x11-libs/tslib/tslib-1.0-r3.ebuild
new file mode 100644
index 000000000000..72df67001d22
--- /dev/null
+++ b/x11-libs/tslib/tslib-1.0-r3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs autotools multilib-minimal
+
+PATCH_VER="5"
+DESCRIPTION="Touchscreen Access Library"
+HOMEPAGE="https://github.com/kergoth/tslib"
+SRC_URI="http://dev.gentoo.org/~mgorny/dist/${P}.tar.bz2
+ mirror://gentoo/${P}-patches-${PATCH_VER}.tar.bz2"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86"
+IUSE=""
+#extras arctic2 collie corgi h3600 linear-h2200 mk712 ucb1x00"
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+ # patches come from buildroot + openembedded + suse
+ EPATCH_SUFFIX=patch epatch "${WORKDIR}"/patch
+ eautoreconf
+}
+
+multilib_src_configure() {
+ # compile everything. INSTALL_MASK= what you don't want.
+ ECONF_SOURCE=${S} \
+ econf \
+ --enable-linear --enable-dejitter \
+ --enable-variance --enable-pthres \
+ --enable-input --enable-shared \
+ --enable-arctic2 --enable-collie \
+ --enable-corgi --enable-h3600 \
+ --enable-linear-h2200 --enable-mk712 \
+ --enable-ucb1x00 --disable-debug
+}
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
new file mode 100644
index 000000000000..3f322dd98303
--- /dev/null
+++ b/x11-libs/vte/Manifest
@@ -0,0 +1,5 @@
+DIST vte-0.28.2.tar.xz 962340 SHA256 86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae SHA512 d6a50481aaa8946cca3779e0b328fef551be534d70366a75385d1f8ead3fcddec57bed85c7d4bc2d9f34546532129e63083aafa33cbb0efcbc7dc9d66e7c45f6 WHIRLPOOL cf491b80cdfbdda6163ec7562f922f1c449e6e927845de28ad8e0b06b47bbbf092f735fc4b72f6131797d17c02c6172888d4db37a520973118d2bfbacd374c2c
+DIST vte-0.36.3.tar.xz 1013412 SHA256 54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c SHA512 9e0c4e60c5a271720d7b480c9618069752faec6c310cc2477e67cdb1c3e961f6981d39c9116716739390dc8e4bab9bf06cf6c5d7d2546062e48523f85d731c77 WHIRLPOOL 0c582f50a07b9a55e8e7b16ae371b913348e8f93fc50ff734ea04a481a5e1ca30ebf3c3781dcd20fd340f50b34cd8f516de76ca59093f3952f23b99a5b30ddca
+DIST vte-0.36.4.tar.xz 1012848 SHA256 aa549b114c80e18791b57031e5c1714aeb4a104405e3ba78dfd4ac374a71e2a1 SHA512 97bb226abaf2100a21856040039640005809eae647432c03a33eb691c8b0a29c13bd8cf824790c2a6360356c8c5d1b61c48b4a7893c7f0a8d3678b1a0914aa31 WHIRLPOOL d1294540c67e3253b166dc351b68534d9f36b1306449e2a319705cafe0317452e3bbe1768fdc30523f85270c2b949b9d9cf606695989968da4a099355413904c
+DIST vte-0.38.3.tar.xz 1005548 SHA256 3f3ae063207ceea9ca2abd1cf9c9f8bd2b66ca82156609f31f3554288c0c2bf4 SHA512 f8a28be524dcd4a6a5dbdd83655eaea0e41ce20e642130c1db8a1bbb29b71ff2421972cb630322a6e443a4aae21e2cc9350d7b06264bf3a1b7b7f793d3818164 WHIRLPOOL 4f67b4f6060b4178d8dde717577ae534fe68f436ce6d3f10e914c40bad44ce01c48f135c600b3d85c4f78a6577af0652bffa0b7e877ff2dc22b9996c9da00d76
+DIST vte-0.40.2.tar.xz 923852 SHA256 9b68fbc16b27f2d79e6271f2b0708808594ac5acf979d0fccea118608199fd2d SHA512 06d1c9a34e8e82e1bd54810d245d908ebb837538ba19fbaabe683cdf3b96b7cb1630516ddeabf18b0294922b8d98d2b9a2f5028c171fac2ad913974d94555eb2 WHIRLPOOL 2499e01c2b0d38645b61d4c0a1814d7a3196df6d300577380f1e622c06a974a4cd0d9799fff35f1b0680603aa3a0be38730991ace83df90bfb265009873c5858
diff --git a/x11-libs/vte/files/vte-0.28.2-interix.patch b/x11-libs/vte/files/vte-0.28.2-interix.patch
new file mode 100644
index 000000000000..c54d46ebc3dc
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-interix.patch
@@ -0,0 +1,51 @@
+reported upstream: https://bugzilla.gnome.org/show_bug.cgi?id=652290
+
+diff -ru vte-0.26.2.orig/configure.in vte-0.26.2/configure.in
+--- vte-0.26.2.orig/configure.in 2011-08-17 08:30:55 +0200
++++ vte-0.26.2/configure.in 2011-08-17 08:35:42 +0200
+@@ -362,7 +362,11 @@
+ AC_DEFINE(HAVE_RECVMSG,1,[Define if you have the recvmsg function.])
+ fi
+ AC_CHECK_FUNC(floor,,AC_CHECK_LIB(m,floor,LIBS=["$LIBS -lm"]))
+-AC_CHECK_FUNCS([ceil floor])
++dnl if the first check didn't find floor, it caches the "no" value,
++dnl and doesn't recheck. this makes the below check fail always on
++dnl systems with floor in -lm. thus we unset the chached result.
++unset ac_cv_func_floor
++AC_CHECK_FUNCS([ceil floor round])
+
+ # Look for tgetent
+
+--- vte-0.26.2.orig/configure 2012-04-30 20:02:55.000000000 +0200
++++ vte-0.26.2/configure 2012-04-30 20:03:16.000000000 +0200
+@@ -13277,7 +13277,7 @@
+
+ fi
+
+-for ac_func in ceil floor
++for ac_func in ceil floor round
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+diff -ru vte-0.26.2.orig/src/vte.c vte-0.26.2/src/vte.c
+--- vte-0.26.2.orig/src/vte.c 2011-08-17 08:30:58 +0200
++++ vte-0.26.2/src/vte.c 2011-08-17 08:38:09 +0200
+@@ -63,6 +63,18 @@
+ #include <locale.h>
+ #endif
+
++#ifndef HAVE_ROUND
++# if defined(HAVE_CEIL) && defined(HAVE_FLOOR)
++static inline double round(double x) {
++ if(x - floor(x) < 0.5) {
++ return floor(x);
++ } else {
++ return ceil(x);
++ }
++}
++# endif
++#endif
++
+ #if GTK_CHECK_VERSION (2, 90, 7)
+ #define GDK_KEY(symbol) GDK_KEY_##symbol
+ #else
diff --git a/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch b/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
new file mode 100644
index 000000000000..fd454079390f
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.28.2-limit-arguments.patch
@@ -0,0 +1,40 @@
+From feeee4b5832b17641e505b7083e0d299fdae318e Mon Sep 17 00:00:00 2001
+From: Christian Persch <chpe@gnome.org>
+Date: Sat, 19 May 2012 17:36:09 +0000
+Subject: emulation: Limit integer arguments to 65535
+
+To guard against malicious sequences containing excessively big numbers,
+limit all parsed numbers to 16 bit range. Doing this here in the parsing
+routine is a catch-all guard; this doesn't preclude enforcing
+more stringent limits in the handlers themselves.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=676090
+---
+diff --git a/src/table.c b/src/table.c
+index 140e8c8..85cf631 100644
+--- a/src/table.c
++++ b/src/table.c
+@@ -550,7 +550,7 @@ _vte_table_extract_numbers(GValueArray **array,
+ if (G_UNLIKELY (*array == NULL)) {
+ *array = g_value_array_new(1);
+ }
+- g_value_set_long(&value, total);
++ g_value_set_long(&value, CLAMP (total, 0, G_MAXUSHORT));
+ g_value_array_append(*array, &value);
+ } while (i++ < arginfo->length);
+ g_value_unset(&value);
+diff --git a/src/vteseq.c b/src/vteseq.c
+index 457c06a..46def5b 100644
+--- a/src/vteseq.c
++++ b/src/vteseq.c
+@@ -557,7 +557,7 @@ vte_sequence_handler_multiple(VteTerminal *terminal,
+ GValueArray *params,
+ VteTerminalSequenceHandler handler)
+ {
+- vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXLONG);
++ vte_sequence_handler_multiple_limited(terminal, params, handler, G_MAXUSHORT);
+ }
+
+ static void
+--
+cgit v0.9.0.2
diff --git a/x11-libs/vte/files/vte-0.30.1-alt-meta.patch b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
new file mode 100644
index 000000000000..bd364be5846c
--- /dev/null
+++ b/x11-libs/vte/files/vte-0.30.1-alt-meta.patch
@@ -0,0 +1,74 @@
+From 180dcc578e13c6096e277fb853e7162db640f207 Mon Sep 17 00:00:00 2001
+From: Alexandre Rostovtsev <tetromino@gentoo.org>
+Date: Tue, 15 Nov 2011 03:06:40 -0500
+Subject: [PATCH] Map both gdk's Meta and Alt to vte's Meta for >=gtk+-3.2.2
+ compatibility
+
+Also, since VTE_META_MASK is now a mask with multiple bits set, code that
+compares gdk key modifiers to VTE_META_MASK by numerical equality is no
+longer guaranteed to work. Therefore, for such comparisons a new function,
+vte_keymap_fixup_modifiers, is introduced; it ensures that if any bits
+matching matching VTE_META_MASK are set, then all are set.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=663779
+---
+ src/keymap.c | 15 +++++++++++++--
+ src/keymap.h | 2 +-
+ 2 files changed, 14 insertions(+), 3 deletions(-)
+
+diff --git a/src/keymap.c b/src/keymap.c
+index 9a21669..95b4c5b 100644
+--- a/src/keymap.c
++++ b/src/keymap.c
+@@ -990,6 +990,17 @@ static const struct _vte_keymap_group {
+ {GDK_KEY (F35), _vte_keymap_GDK_F35},
+ };
+
++/* Restrict modifiers to the specified mask and ensure that VTE_META_MASK,
++ * despite being a compound mask, is treated as indivisible. */
++GdkModifierType
++_vte_keymap_fixup_modifiers(GdkModifierType modifiers,
++ GdkModifierType mask)
++{
++ if (modifiers & VTE_META_MASK)
++ modifiers |= VTE_META_MASK;
++ return modifiers & mask;
++}
++
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+ * a literal string or a capability name. */
+ void
+@@ -1104,7 +1115,7 @@ _vte_keymap_map(guint keyval,
+ } else {
+ fkey_mode = fkey_default;
+ }
+- modifiers &= (GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
++ modifiers = _vte_keymap_fixup_modifiers(modifiers, GDK_SHIFT_MASK | GDK_CONTROL_MASK | VTE_META_MASK | VTE_NUMLOCK_MASK);
+
+ /* Search for the conditions. */
+ for (i = 0; entries[i].normal_length || entries[i].special[0]; i++)
+@@ -1375,7 +1386,7 @@ _vte_keymap_key_add_key_modifiers(guint keyval,
+ return;
+ }
+
+- switch (modifiers & significant_modifiers) {
++ switch (_vte_keymap_fixup_modifiers(modifiers, significant_modifiers)) {
+ case 0:
+ modifier = 0;
+ break;
+diff --git a/src/keymap.h b/src/keymap.h
+index 243e22e..21d9b8e 100644
+--- a/src/keymap.h
++++ b/src/keymap.h
+@@ -27,7 +27,7 @@
+
+ G_BEGIN_DECLS
+
+-#define VTE_META_MASK GDK_META_MASK
++#define VTE_META_MASK (GDK_META_MASK | GDK_MOD1_MASK)
+ #define VTE_NUMLOCK_MASK GDK_MOD2_MASK
+
+ /* Map the specified keyval/modifier setup, dependent on the mode, to either
+--
+1.7.8.rc3
+
diff --git a/x11-libs/vte/metadata.xml b/x11-libs/vte/metadata.xml
new file mode 100644
index 000000000000..84c40c2c6ea0
--- /dev/null
+++ b/x11-libs/vte/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>gnome</herd>
+<use>
+ <flag name='glade'>Provide integration with <pkg>dev-util/glade</pkg>.</flag>
+</use>
+</pkgmetadata>
diff --git a/x11-libs/vte/vte-0.28.2-r206.ebuild b/x11-libs/vte/vte-0.28.2-r206.ebuild
new file mode 100644
index 000000000000..edf1eaba8f88
--- /dev/null
+++ b/x11-libs/vte/vte-0.28.2-r206.ebuild
@@ -0,0 +1,119 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-r1
+
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="https://live.gnome.org/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug glade +introspection python"
+
+PDEPEND="x11-libs/gnome-pty-helper"
+RDEPEND=">=dev-libs/glib-2.26:2
+ >=x11-libs/gtk+-2.20:2[introspection?]
+ >=x11-libs/pango-1.22.0
+
+ sys-libs/ncurses
+ x11-libs/libX11
+ x11-libs/libXft
+
+ glade? ( dev-util/glade:3 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ )"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+ sys-devel/gettext"
+
+src_prepare() {
+ # Do not disable gnome-pty-helper, bug #401389
+ G2CONF="${G2CONF}
+ --disable-deprecation
+ --disable-static
+ $(use_enable debug)
+ $(use_enable glade glade-catalogue)
+ $(use_enable introspection)
+ --with-gtk=2.0"
+
+ if [[ ${CHOST} == *-interix* ]]; then
+ G2CONF="${G2CONF} --disable-Bsymbolic"
+
+ # interix stropts.h is empty...
+ export ac_cv_header_stropts_h=no
+ fi
+
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=663779
+ epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=652290
+ epatch "${FILESDIR}"/${PN}-0.28.2-interix.patch
+
+ # Fix CVE-2012-2738, upstream bug #676090
+ epatch "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
+
+ prepare_python() {
+ mkdir -p "${BUILD_DIR}" || die
+ }
+ if use python; then
+ python_foreach_impl prepare_python
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ configure_python() {
+ ECONF_SOURCE="${S}" gnome2_src_configure --enable-python
+ }
+
+ if use python; then
+ python_foreach_impl run_in_build_dir configure_python
+ fi
+
+ gnome2_src_configure --disable-python
+}
+
+src_compile() {
+ gnome2_src_compile
+
+ compile_python() {
+ cd "${BUILD_DIR}"/python || die
+ ln -s "${S}"/src/libvte.la "${BUILD_DIR}"/src/ || die
+ mkdir -p "${BUILD_DIR}"/src/.libs || die
+ ln -s "${S}"/src/.libs/libvte.so "${BUILD_DIR}"/src/.libs/ || die
+ emake CPPFLAGS="${CPPFLAGS} -I${S}/src"
+ }
+
+ if use python; then
+ python_foreach_impl run_in_build_dir compile_python
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ install_python() {
+ cd "${BUILD_DIR}"/python || die
+ emake install DESTDIR="${D}" \
+ CPPFLAGS="${CPPFLAGS} -I${S}/src"
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir install_python
+ fi
+
+ rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
diff --git a/x11-libs/vte/vte-0.28.2-r207.ebuild b/x11-libs/vte/vte-0.28.2-r207.ebuild
new file mode 100644
index 000000000000..0b2c3cce2d52
--- /dev/null
+++ b/x11-libs/vte/vte-0.28.2-r207.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils gnome2 python-r1
+
+DESCRIPTION="GNOME terminal widget"
+HOMEPAGE="https://wiki.gnome.org/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="debug +introspection python"
+
+RDEPEND="
+ >=dev-libs/glib-2.26:2
+ >=x11-libs/gtk+-2.20:2[introspection?]
+ >=x11-libs/pango-1.22.0
+
+ sys-libs/ncurses
+ x11-libs/libX11
+ x11-libs/libXft
+
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-python/pygtk:2[${PYTHON_USEDEP}]
+ )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+ sys-devel/gettext
+"
+PDEPEND="x11-libs/gnome-pty-helper"
+
+src_prepare() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=663779
+ epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+
+ # https://bugzilla.gnome.org/show_bug.cgi?id=652290
+ epatch "${FILESDIR}"/${PN}-0.28.2-interix.patch
+
+ # Fix CVE-2012-2738, upstream bug #676090
+ epatch "${FILESDIR}"/${PN}-0.28.2-limit-arguments.patch
+
+ prepare_python() {
+ mkdir -p "${BUILD_DIR}" || die
+ }
+ if use python; then
+ python_foreach_impl prepare_python
+ fi
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ configure_python() {
+ ECONF_SOURCE="${S}" gnome2_src_configure --enable-python
+ }
+
+ if use python; then
+ python_foreach_impl run_in_build_dir configure_python
+ fi
+
+ local myconf=""
+
+ if [[ ${CHOST} == *-interix* ]]; then
+ myconf="${myconf} --disable-Bsymbolic"
+
+ # interix stropts.h is empty...
+ export ac_cv_header_stropts_h=no
+ fi
+
+ # Do not disable gnome-pty-helper, bug #401389
+ gnome2_src_configure --disable-python \
+ --disable-deprecation \
+ --disable-glade-catalogue \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_enable introspection) \
+ --with-gtk=2.0 \
+ ${myconf}
+}
+
+src_compile() {
+ gnome2_src_compile
+
+ compile_python() {
+ cd "${BUILD_DIR}"/python || die
+ ln -s "${S}"/src/libvte.la "${BUILD_DIR}"/src/ || die
+ mkdir -p "${BUILD_DIR}"/src/.libs || die
+ ln -s "${S}"/src/.libs/libvte.so "${BUILD_DIR}"/src/.libs/ || die
+ emake CPPFLAGS="${CPPFLAGS} -I${S}/src"
+ }
+
+ if use python; then
+ python_foreach_impl run_in_build_dir compile_python
+ fi
+}
+
+src_install() {
+ gnome2_src_install
+
+ install_python() {
+ cd "${BUILD_DIR}"/python || die
+ emake install DESTDIR="${D}" \
+ CPPFLAGS="${CPPFLAGS} -I${S}/src"
+ }
+ if use python; then
+ python_foreach_impl run_in_build_dir install_python
+ fi
+
+ rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
diff --git a/x11-libs/vte/vte-0.36.3.ebuild b/x11-libs/vte/vte-0.36.3.ebuild
new file mode 100644
index 000000000000..405172b3bcf2
--- /dev/null
+++ b/x11-libs/vte/vte-0.36.3.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.90"
+IUSE="debug glade +introspection"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
+RDEPEND="
+ >=dev-libs/glib-2.31.13:2
+ >=x11-libs/gtk+-3.1.9:3[introspection?]
+ >=x11-libs/pango-1.22.0
+
+ sys-libs/ncurses
+ x11-libs/libX11
+ x11-libs/libXft
+
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.13
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=663779
+ epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf=""
+
+ if [[ ${CHOST} == *-interix* ]]; then
+ myconf="${myconf} --disable-Bsymbolic"
+
+ # interix stropts.h is empty...
+ export ac_cv_header_stropts_h=no
+ fi
+
+ # Python bindings are via gobject-introspection
+ # Ex: from gi.repository import Vte
+ # Do not disable gnome-pty-helper, bug #401389
+ gnome2_src_configure \
+ --disable-deprecation \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_enable glade glade-catalogue) \
+ $(use_enable introspection)
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_install
+ rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
diff --git a/x11-libs/vte/vte-0.36.4.ebuild b/x11-libs/vte/vte-0.36.4.ebuild
new file mode 100644
index 000000000000..c942207a0bdc
--- /dev/null
+++ b/x11-libs/vte/vte-0.36.4.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+
+inherit eutils gnome2
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.90"
+IUSE="debug glade +introspection"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
+RDEPEND="
+ >=dev-libs/glib-2.31.13:2
+ >=x11-libs/gtk+-3.1.9:3[introspection?]
+ >=x11-libs/pango-1.22.0
+
+ sys-libs/ncurses
+ x11-libs/libX11
+ x11-libs/libXft
+
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.13
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+src_prepare() {
+ # https://bugzilla.gnome.org/show_bug.cgi?id=663779
+ epatch "${FILESDIR}/${PN}-0.30.1-alt-meta.patch"
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf=""
+
+ if [[ ${CHOST} == *-interix* ]]; then
+ myconf="${myconf} --disable-Bsymbolic"
+
+ # interix stropts.h is empty...
+ export ac_cv_header_stropts_h=no
+ fi
+
+ # Python bindings are via gobject-introspection
+ # Ex: from gi.repository import Vte
+ # Do not disable gnome-pty-helper, bug #401389
+ gnome2_src_configure \
+ --disable-deprecation \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_enable glade glade-catalogue) \
+ $(use_enable introspection) \
+ ${myconf}
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_install
+ rm -v "${ED}usr/libexec/gnome-pty-helper" || die
+}
diff --git a/x11-libs/vte/vte-0.38.3.ebuild b/x11-libs/vte/vte-0.38.3.ebuild
new file mode 100644
index 000000000000..d8db59a6aa45
--- /dev/null
+++ b/x11-libs/vte/vte-0.38.3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.91"
+IUSE="debug glade +introspection vala"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
+RDEPEND="
+ >=dev-libs/glib-2.40:2
+ >=x11-libs/gtk+-3.8:3[introspection?]
+ >=x11-libs/pango-1.22.0
+
+ sys-libs/ncurses
+ x11-libs/libX11
+ x11-libs/libXft
+
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=dev-util/gtk-doc-am-1.13
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+RDEPEND="${RDEPEND}
+ !x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+ vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf=""
+
+ if [[ ${CHOST} == *-interix* ]]; then
+ myconf="${myconf} --disable-Bsymbolic"
+
+ # interix stropts.h is empty...
+ export ac_cv_header_stropts_h=no
+ fi
+
+ # Python bindings are via gobject-introspection
+ # Ex: from gi.repository import Vte
+ # Do not disable gnome-pty-helper, bug #401389
+ gnome2_src_configure \
+ --disable-deprecation \
+ --disable-test-application \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_enable glade glade-catalogue) \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ ${myconf}
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_install
+ mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/vte/vte-0.40.2.ebuild b/x11-libs/vte/vte-0.40.2.ebuild
new file mode 100644
index 000000000000..f657aa5aeb51
--- /dev/null
+++ b/x11-libs/vte/vte-0.40.2.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+GCONF_DEBUG="no"
+VALA_USE_DEPEND="vapigen"
+
+inherit eutils gnome2 vala
+
+DESCRIPTION="Library providing a virtual terminal emulator widget"
+HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
+
+LICENSE="LGPL-2+"
+SLOT="2.91"
+IUSE="+crypt debug glade +introspection vala"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+PDEPEND=">=x11-libs/gnome-pty-helper-${PV}"
+RDEPEND="
+ >=dev-libs/glib-2.40:2
+ >=x11-libs/gtk+-3.8:3[introspection?]
+ >=x11-libs/pango-1.22.0
+
+ sys-libs/ncurses
+ sys-libs/zlib
+ x11-libs/libX11
+ x11-libs/libXft
+
+ glade? ( >=dev-util/glade-3.9:3.10 )
+ introspection? ( >=dev-libs/gobject-introspection-0.9.0 )
+"
+DEPEND="${RDEPEND}
+ $(vala_depend)
+ >=dev-util/gtk-doc-am-1.13
+ >=dev-util/intltool-0.35
+ sys-devel/gettext
+ virtual/pkgconfig
+
+ crypt? ( >=net-libs/gnutls-3.2.0 )
+"
+RDEPEND="${RDEPEND}
+ !x11-libs/vte:2.90[glade]
+"
+
+src_prepare() {
+ vala_src_prepare
+ gnome2_src_prepare
+}
+
+src_configure() {
+ local myconf=""
+
+ if [[ ${CHOST} == *-interix* ]]; then
+ myconf="${myconf} --disable-Bsymbolic"
+
+ # interix stropts.h is empty...
+ export ac_cv_header_stropts_h=no
+ fi
+
+ # Python bindings are via gobject-introspection
+ # Ex: from gi.repository import Vte
+ # Do not disable gnome-pty-helper, bug #401389
+ gnome2_src_configure \
+ --disable-deprecation \
+ --disable-test-application \
+ --disable-static \
+ $(use_enable debug) \
+ $(use_enable glade glade-catalogue) \
+ $(use_enable crypt gnutls) \
+ $(use_enable introspection) \
+ $(use_enable vala) \
+ ${myconf}
+}
+
+src_install() {
+ DOCS="AUTHORS ChangeLog HACKING NEWS README"
+ gnome2_src_install
+ mv "${D}"/etc/profile.d/vte{,-${SLOT}}.sh || die
+}
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
new file mode 100644
index 000000000000..3d7ec206f3b4
--- /dev/null
+++ b/x11-libs/wxGTK/Manifest
@@ -0,0 +1,10 @@
+DIST wxPython-docs-2.9.4.0.tar.bz2 15477636 SHA256 42a1683f253aa36ae9ee20b8d511d8704b4e45ba124fec256a7dfce38da9f75f SHA512 f996e69f24baaa8d35bf94ef77f31f6beda5dd4ddd65d6b71558e8dbe33098c951f995172b4ccd93ad08c81df07a9b529813eac5d39ffa06290f2a9ccc87620c WHIRLPOOL b6f6d65d319683f44b1eb4708077abaecd1a972a0d79fb6293b055099a0720d36e83506df6d075243f9e8b180849ae0d44badc8a22d5c764c956d5ecfe0cc6da
+DIST wxPython-docs-3.0.0.0.tar.bz2 21411087 SHA256 4bb98d37ac9fc68a1cbde45efa03f06c4bd167719249d1cba15ac8a6f8e2dcb8 SHA512 30d680edeb88f5cea096cfeb4324ee554aff4bab233557c1155b81b08baea60601d6f8499f03dd603111a181003e00581686ce45a187cbf608eb003388eaf193 WHIRLPOOL 5db92780fc3815333d68a70b66032356dac5f248e9afa948b27ece6bc8bc8794ae877477bf92f0c38ea0875ec99a7db98211d820bc7226db961a0516b0de1b86
+DIST wxPython-docs-3.0.1.1.tar.bz2 21447868 SHA256 c283db35ebd7dec4f83402b9fe9bb12c99ac66923dab95277bb4843617a8d6d3 SHA512 5886341f8e238b6de94d655dbc25572edac49a2ee33f545482b8be24b008aba69eb4cbbacbecc4df74eff1e1b440e5f2618a7aeeadc7ce358f40e16133223dc5 WHIRLPOOL d73998e83882e9be43bd6f9e1e529ae4c46d35137a9d3017eba9ed72cb1d91d7f917e869027721e9e9e6323d2433815cd5b49a41405e05cc668c91ffa4f6615a
+DIST wxPython-docs-3.0.2.0.tar.bz2 21455056 SHA256 9e9b32b7452f8f1885f0326c0382ec1878c68a251146b3e3997c7c3aa70caa57 SHA512 ce4407de4cdf9a3eaa5c64a8a959a0d7010d0d814a710de1ac0ed2a716ea2ee4f4ba34199e271a3e9b7790780294fcadfcd8bc65fead182d4ebe533c35c4d78e WHIRLPOOL ac0b4cd1937c31803399f2d9172158f00f99886462becfb58c3553c263bfe93d54acf5f05662227aeda4fd44610ada0680127b05e165b261104b765f25185715
+DIST wxPython-src-2.8.12.1.tar.bz2 31311482 SHA256 1f3f153d9f1504c6ce2d2c4b23e940b8f58b81f4cba35cda1a5bb31142243cd0 SHA512 4f826ccb57d5f4fc03fe7cae67499be70c727a99aebf9d153ea1060a21641642606d44d079ba897c38b176846336aeaebc21d30d5c7a0abec3934d65cf4529f3 WHIRLPOOL 94f91d359f755a0f805588303e8507b2f1404a7f4af73777f85366265df9f76ca89ac29bff491cffd752b707645952a4f7f2bb12fa7e30f3e7d3728147a9c99d
+DIST wxPython-src-2.9.4.0.tar.bz2 50827671 SHA256 78c35c19e85a17cb9c730b86b49d6a479198d76d19e0b13e86db0b55707004be SHA512 100dd4474bc2508e9a80aed6f08d295e2697926e29c5789e1f6aa7c303921e1c5de2574c3eddde568804da8fc670d0214ef225d46f34a3006d0a947423d01fbf WHIRLPOOL feff68600a40a8f02492e91049ecdd1a1865ee6db8024112aa3a85a7eff616f26653c418a8ffde77121e2bf7d2c7090c5b91896f9a2de8eb980573af2ca65507
+DIST wxPython-src-2.9.4.1.patch 3768 SHA256 075e3a7b1cf69dd2bb20010717505d2508c74bc81658540f3e6d8c4fbf0a6b85 SHA512 4a5254a5bb9c246b75095e3cc0b849073e3cc71ff15ab7fb1db6ecfe71359800b9e1a5493bc39ce5b1f338cdc1d142ce84641611d458a8da4315f3c8a6aef3ba WHIRLPOOL 9bec06da4824fe56c172f4f417966681d1ffbf173dcb54f1579e9a484377bc76c45b4f2389911bbb17eff2476cfca786d68d9524856b21accc64b4dffafb1811
+DIST wxPython-src-3.0.0.0.tar.bz2 57831792 SHA256 af88695e820dd914e8375dc91ecb736f6fb605979bb38460ace61bbea494dc11 SHA512 9328f46817e0c1670a6be5d10347c8a7110c42a5332c5c35eb11ed0412d8dddeb15727d98606bb6c699af961cee171c41b82b1f24f3de25463259106660f7387 WHIRLPOOL 7865997e22db366a41bae8a5d5c47e4f46b20d17871377243abced3a6550c46588ea1d5a426d826ccf011c62898f87d6a55a14ac9b4153af4e0795d5f180a647
+DIST wxPython-src-3.0.1.1.tar.bz2 58139645 SHA256 d51463fe760e2fc00271678700c216809f9db32a6081a1808bd4b7c884dc0a32 SHA512 71f75c1e36c9ac27c15d768f69662b18ff1c66ad111ef6ef8579dfdb5296d7c37ffce9f60000afeac289cd6288980037d3a7eb3ea8d6d25e619d8692cf41b914 WHIRLPOOL bb03b78048b368b1c2f5a8b8689aecf412953ff789b2a8d2ef4826112fdc6bff8ed881255d05859ac07f915dd1070f6147d6bfdd97b0ab4b0939c024df3b855a
+DIST wxPython-src-3.0.2.0.tar.bz2 58304944 SHA256 d54129e5fbea4fb8091c87b2980760b72c22a386cb3b9dd2eebc928ef5e8df61 SHA512 a3798e89ff19344253aac7d771971e519f7fa9723e82bd97e98f16fd7f1572e513170b02295b872dae0b1ae3fa95efc4ef34d078045b839694b4fdad3a27c9e4 WHIRLPOOL 89cdef12c9ef96044adba0340d47b699e685eaec581a4e7d68f3b95a0890715e29b1f5362027df0f3f8b5b1587e8fe404a7fa88049ece9677dd8316fbdf2e41d
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch
new file mode 100644
index 000000000000..3636b64f976a
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.10.1-odbc-defines.patch
@@ -0,0 +1,39 @@
+unixODBC 2.2.14 defines SQLLEN and SQLULEN using the compiler typedef
+declaration instead of preprocessor #define macro definition. This breaks
+the preprocessor checks in this include file.cpp, causing the source to fall
+back to older types instead, leading to compile time errors like this:
+
+db.cpp:1636: error: cannot convert ‘SQLINTEGER*’ to ‘SQLLEN*’ for argument ‘6’ to
+‘SQLRETURN SQLGetData(void*, SQLUSMALLINT, SQLSMALLINT, void*, SQLLEN, SQLLEN*)’
+...
+dbtable.cpp:592: error: cannot convert ‘SQLUINTEGER*’ to ‘SQLULEN*’ for argument ‘4’ to
+‘SQLRETURN SQLExtendedFetch(void*, SQLUSMALLINT, SQLLEN, SQLULEN*, SQLUSMALLINT*)’
+...
+
+This change hard-wires the new names, breaking compatibility with ancient
+(pre 2001) unixODBC versions. This change may break other ODBC implementations
+but in Gentoo only unixODBC is supported.
+
+References:
+http://bugs.gentoo.org/310923
+
+2010-03-23 Martin von Gagern
+
+--- wxPython-src-2.6.4.0.orig/include/wx/db.h
++++ wxPython-src-2.6.4.0/include/wx/db.h
+@@ -134,15 +134,6 @@ enum enumDummy {enumDum1};
+ #endif
+ #endif
+
+-#ifndef _WIN64
+-#ifndef SQLLEN
+-#define SQLLEN SQLINTEGER
+-#endif
+-#ifndef SQLULEN
+-#define SQLULEN SQLUINTEGER
+-#endif
+-#endif
+-
+ const int wxDB_PATH_MAX = 254;
+
+ extern WXDLLIMPEXP_DATA_ODBC(wxChar const *) SQL_LOG_FILENAME;
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
new file mode 100644
index 000000000000..a5c574cb2d6a
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-collision.patch
@@ -0,0 +1,74 @@
+Prevent file collisions between multiple installed SLOTs.
+
+ - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets.
+ - Version the bakefile preset filenames. Unversioned symlinks to these files
+ are handled by eselect.
+ - Version wx-config and wxrc. Unversioned wrapper scripts are installed with
+ eselect-wxwidgets.
+ - Version wxstd.mo and modify AddCatalog to find it. (this might need more
+ work but no one has complained yet)
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -11695,10 +11695,9 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxodbc___depname) $(__wxexpat___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__odbcdll___depname) $(__odbclib___depname) $(__dbgriddll___depname) $(__dbgridlib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxodbc___depname) $(__install_wxexpat___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_odbcdll___depname) $(__install_odbclib___depname) $(__install_dbgriddll___depname) $(__install_dbgridlib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets/ ; for i in wx.bkl wx_unix.bkl wx_win32.bkl; do \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+ if test ! -d $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx/`dirname $$f` ; then \
+@@ -12455,7 +12454,8 @@ install-wxconfig:
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++ && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -12463,7 +12463,7 @@ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+--- a/src/common/intl.cpp
++++ b/src/common/intl.cpp
+@@ -1529,6 +1529,8 @@ void wxLocale::DoCommonInit()
+ m_initialized = false;
+ }
+
++#define wxSTRINGIZE2(x) wxSTRINGIZE(x)
++
+ // NB: this function has (desired) side effect of changing current locale
+ bool wxLocale::Init(const wxChar *szName,
+ const wxChar *szShort,
+@@ -1597,7 +1599,7 @@ bool wxLocale::Init(const wxChar *szName,
+ bool bOk = true;
+ if ( bLoadDefault )
+ {
+- bOk = AddCatalog(wxT("wxstd"));
++ bOk = AddCatalog(wxT("wxstd" wxSTRINGIZE2(wxMAJOR_VERSION) wxSTRINGIZE2(wxMINOR_VERSION)));
+
+ // there may be a catalog with toolkit specific overrides, it is not
+ // an error if this does not exist
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -120,7 +120,6 @@ distclean: clean
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
new file mode 100644
index 000000000000..d272247091b8
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.11-unicode-odbc.patch
@@ -0,0 +1,13 @@
+Allow odbc to be used with unicode builds.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -1217,7 +1217,7 @@ ODBCDLL_CXXFLAGS = $(__odbcdll_PCH_INC) -D__WX$(TOOLKIT)__ \
+ $(__WXUNIV_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
+ $(__THREAD_DEFINE_p) -DWXBUILDING $(__INC_TIFF_p) $(__INC_JPEG_p) \
+ $(__INC_PNG_p) $(__INC_ZLIB_p) $(__INC_ODBC_p) $(__INC_REGEX_p) \
+- $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC $(PIC_FLAG) \
++ $(__INC_EXPAT_p) -DwxUSE_GUI=0 -DWXUSINGDLL -DWXMAKINGDLL_ODBC -DSQL_WCHART_CONVERT $(PIC_FLAG) \
+ $(CPPFLAGS) $(CXXFLAGS)
+ ODBCDLL_OBJECTS = \
+ $(__odbcdll___win32rc) \
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch
new file mode 100644
index 000000000000..2701500d7ad9
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-autoconf.patch
@@ -0,0 +1,27 @@
+From 4164cd68d45ec4b3b46c22ed981c81f766154428 Mon Sep 17 00:00:00 2001
+From: Vadim Zeitlin <vadim@wxwidgets.org>
+Date: Thu, 17 Jun 2010 22:30:27 +0000
+Subject: Backport fix from bakefile svn for autoconf 2.65.
+
+Use AC_REQUIRE() instead of directly using a macro, the latter doesn't work
+with autoconf 2.65.
+
+This is a backport of r1337 from bakefile svn to allow people to use autoconf
+2.65 immediately and will become unnecessary when we update to the next
+bakefile version.
+
+git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64620 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
+
+diff --git a/build/aclocal/bakefile-lang.m4 b/build/aclocal/bakefile-lang.m4
+index 4cc4a67..ec0f711 100644
+--- a/build/aclocal/bakefile-lang.m4
++++ b/build/aclocal/bakefile-lang.m4
+@@ -240,7 +240,7 @@ dnl check for different proprietary compilers depending on target platform
+ dnl _AC_BAKEFILE_PROG_COMPILER(LANG)
+ AC_DEFUN([_AC_BAKEFILE_PROG_COMPILER],
+ [
+- AC_PROG_$1
++ AC_REQUIRE([AC_PROG_$1])
+
+ dnl Intel compiler can be used under several different OS and even
+ dnl different architectures (x86, amd64 and Itanium) so it's easier to just
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch
new file mode 100644
index 000000000000..f497665cef8f
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-bakefile.patch
@@ -0,0 +1,25 @@
+From 006b0650b0f390c1e9a19361988b6af7a327e296 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Wed, 5 Aug 2015 12:38:39 +0300
+Subject: [PATCH 2/2] Fixed bakefile version
+
+---
+ build/aclocal/bakefile.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/aclocal/bakefile.m4 b/build/aclocal/bakefile.m4
+index 88478ca..aa04b16 100644
+--- a/build/aclocal/bakefile.m4
++++ b/build/aclocal/bakefile.m4
+@@ -837,7 +837,7 @@ AC_DEFUN([AC_BAKEFILE],
+ AC_SUBST(OBJCXXFLAGS)
+
+
+- BAKEFILE_BAKEFILE_M4_VERSION="0.2.8"
++ BAKEFILE_BAKEFILE_M4_VERSION="0.2.9"
+
+ dnl includes autoconf_inc.m4:
+ $1
+--
+2.4.6
+
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch
new file mode 100644
index 000000000000..db9571438d86
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.12.1-libdir.patch
@@ -0,0 +1,304 @@
+From e87336e8d583044d62b1a9400db4c29f1474fa50 Mon Sep 17 00:00:00 2001
+From: nE0sIghT <ykonotopov@gmail.com>
+Date: Wed, 5 Aug 2015 12:37:36 +0300
+Subject: [PATCH 1/2] Backported new libraries search code
+
+---
+ acinclude.m4 | 75 ++++++++++++++++++++++++++++++++++++++++++++---
+ configure.in | 96 +++++++++++++++++++++++-------------------------------------
+ 2 files changed, 107 insertions(+), 64 deletions(-)
+
+diff --git a/acinclude.m4 b/acinclude.m4
+index a44747c..1e307c9 100644
+--- a/acinclude.m4
++++ b/acinclude.m4
+@@ -43,16 +43,17 @@ for ac_dir in $1 /usr/include;
+ ])
+
+ dnl ---------------------------------------------------------------------------
+-dnl call WX_PATH_FIND_LIBRARIES(search path, lib name), sets ac_find_libraries
+-dnl to the full name of the file that was found or leaves it empty if not found
++dnl call WX_PATH_FIND_LIBRARIES(lib name, [optional extra search paths])
++dnl sets ac_find_libraries to the full name of the file that was found
++dnl or leaves it empty if not found
+ dnl ---------------------------------------------------------------------------
+ AC_DEFUN([WX_PATH_FIND_LIBRARIES],
+ [
+ ac_find_libraries=
+- for ac_dir in $1;
++ for ac_dir in $2 $SEARCH_LIB
+ do
+ for ac_extension in a so sl dylib dll.a; do
+- if test -f "$ac_dir/lib$2.$ac_extension"; then
++ if test -f "$ac_dir/lib$1.$ac_extension"; then
+ ac_find_libraries=$ac_dir
+ break 2
+ fi
+@@ -115,6 +116,72 @@ AC_DEFUN([WX_LINK_PATH_EXIST],
+ fi
+ ])
+
++dnl ---------------------------------------------------------------------------
++dnl Usage: WX_FIND_LIB(lib-name, [lib-function to test], [extra search paths])
++dnl
++dnl Tests in a variety of ways for the presence of lib-name
++dnl
++dnl On success, returns any novel path found in ac_find_libraries; else "std"
++dnl and any cflags in ac_find_cflags
++dnl On failure, ac_find_libraries will be empty
++dnl ---------------------------------------------------------------------------
++AC_DEFUN([WX_FIND_LIB],
++[
++ ac_find_libraries=
++
++ dnl Try with pkg-config first. It requires its lib-name parameter lowercase
++ fl_pkgname=`echo "$1" | tr [[:upper:]] [[:lower:]]`
++ dnl suppress PKG_PROG_PKG_CONFIG output; we don't want to keep seeing it
++ PKG_PROG_PKG_CONFIG() AS_MESSAGE_FD> /dev/null
++ PKG_CHECK_MODULES([$1], [$fl_pkgname],
++ [
++ dnl Start by assuming there are no novel lib paths
++ ac_find_libraries="std"
++
++ dnl A simple copy of the internal vars $1_CFLAGS $1_LIBS doesn't work
++ dnl inside the macro
++ dnl
++ dnl TODO: When we stop being autoconf 2.61 compatible, the next 2 lines
++ dnl should become:
++ dnl AS_VAR_COPY([ac_find_cflags], [$1_CFLAGS])
++ dnl AS_VAR_COPY([fl_libs], [$1_LIBS])
++ eval ac_find_cflags=\$$1_CFLAGS
++ eval fl_libs=\$$1_LIBS
++
++ dnl fl_libs may now contain -Lfoopath -lfoo (only non-standard paths are
++ dnl added) We only want the path bit, not the lib names
++ for fl_path in $fl_libs
++ do
++ if test `echo "$fl_path" | cut -c 1-2` = "-L"; then
++ dnl there shouldn't be >1 novel path
++ dnl return it without the -L, ready for WX_LINK_PATH_EXIST
++ ac_find_libraries=`echo "$fl_path" | cut -c 3-`
++ fi
++ done
++ ],
++ [
++ if test "x$ac_find_libraries" = "x"; then
++ dnl Next with AC_CHECK_LIB, if a test function was provided
++ if test "x$2" != "x"; then
++ AC_CHECK_LIB([$1], [$2], [ac_find_libraries="std"])
++ fi
++ fi
++
++ if test "x$ac_find_libraries" = "x"; then
++ dnl Finally try the search path
++ dnl Output a message again, as AC_CHECK_LIB will just have said "no"
++ AC_MSG_CHECKING([elsewhere])
++ dnl $3 will occasionally hold extra path(s) to search
++ WX_PATH_FIND_LIBRARIES([$1], [$3])
++ if test "x$ac_find_libraries" != "x"; then
++ AC_MSG_RESULT([yes])
++ else
++ AC_MSG_RESULT([no])
++ fi
++ fi
++ ])
++])
++
+ dnl ===========================================================================
+ dnl C++ features test
+ dnl ===========================================================================
+diff --git a/configure.in b/configure.in
+index 021845d..9c78ba3 100644
+--- a/configure.in
++++ b/configure.in
+@@ -2767,7 +2767,7 @@ if test "$build" != "$host" -a "$GCC" = yes; then
+ x_includes=$ac_find_includes
+ fi
+ if test -z "$x_libraries" -o "$x_libraries" = NONE; then
+- WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xt)
++ WX_PATH_FIND_LIBRARIES(Xt)
+ x_libraries=$ac_find_libraries
+ fi
+ fi
+@@ -3554,7 +3554,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+ dnl test for external libxpm if we're configured to use it
+ if test "$wxUSE_GPE" = "yes"; then
+ AC_MSG_CHECKING(for gpewidget library)
+- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpewidget)
++ WX_PATH_FIND_LIBRARIES(gpewidget)
+ if test "$ac_find_libraries" != "" ; then
+ WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+ dnl -lgpewidget must be before all GTK libs and
+@@ -3567,7 +3567,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+ fi
+
+ dnl AC_MSG_CHECKING(for gpe library)
+- dnl WX_PATH_FIND_LIBRARIES($SEARCH_LIB,gpe)
++ dnl WX_PATH_FIND_LIBRARIES(gpe)
+ dnl if test "$ac_find_libraries" != "" ; then
+ dnl WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+ dnl GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lgpe"
+@@ -3817,7 +3817,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+
+
+ AC_MSG_CHECKING(for Motif/Lesstif library)
+- WX_PATH_FIND_LIBRARIES($SEARCH_LIB, Xm)
++ WX_PATH_FIND_LIBRARIES(Xm)
+
+ if test "x$ac_find_libraries" != "x" ; then
+ AC_MSG_RESULT(found in $ac_find_libraries)
+@@ -3956,7 +3956,7 @@ libraries returned by 'pkg-config gtk+-2.0 --libs' or 'gtk-config
+ dnl test for external libxpm if we're configured to use it
+ if test "$wxUSE_LIBXPM" = "sys"; then
+ AC_MSG_CHECKING(for Xpm library)
+- WX_PATH_FIND_LIBRARIES($SEARCH_LIB,Xpm)
++ WX_PATH_FIND_LIBRARIES(Xpm)
+ if test "$ac_find_libraries" != "" ; then
+ WX_LINK_PATH_EXIST($ac_find_libraries,$GUI_TK_LIBRARY)
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY$ac_path_to_link"
+@@ -4192,41 +4192,23 @@ dnl ---------------------------------------------------------------------------
+ dnl wxDisplay Sanity checks
+ dnl ---------------------------------------------------------------------------
+
++USE_XINERAMA=0
+ if test "$wxUSE_DISPLAY" = "yes"; then
+ dnl ---------------------------------------------------------------------------
+ dnl Xinerama (for unix ) - Brian Victor
+ dnl ---------------------------------------------------------------------------
+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+- AC_MSG_CHECKING([for Xinerama])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xinerama)
++ WX_FIND_LIB(Xinerama, XineramaQueryScreens)
+ if test "$ac_find_libraries" != "" ; then
+- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+- if test "$ac_path_to_link" != " -L/usr/lib" ; then
+- LDFLAGS="$LDFLAGS $ac_path_to_link"
++ if test "$ac_find_libraries" != "std" ; then
++ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++ if test "$ac_path_to_link" != " -L/usr/lib" ; then
++ LDFLAGS="$LDFLAGS $ac_path_to_link"
++ fi
+ fi
++ USE_XINERAMA=1
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXinerama"
+- AC_MSG_RESULT([yes])
+-
+- AC_MSG_CHECKING([for Xxf86vm extension])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],Xxf86vm)
+- if test "$ac_find_libraries" != "" ; then
+- AC_MSG_RESULT([yes])
+- AC_CHECK_HEADERS([X11/extensions/xf86vmode.h],
+- [
+- GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lXxf86vm"
+- ],
+- [],
+- [
+- #if HAVE_X11_XLIB_H
+- #include <X11/Xlib.h>
+- #endif
+- ])
+- else
+- AC_MSG_RESULT([no])
+- fi
+-
+ else
+- AC_MSG_RESULT([no])
+ AC_MSG_WARN([Xinerama not found; disabling wxDisplay])
+ wxUSE_DISPLAY="no"
+ fi
+@@ -4243,17 +4225,16 @@ dnl X11 session management
+ dnl ---------------------------------------------------------------------------
+ if test "$wxUSE_DETECT_SM" = "yes"; then
+ if test "$wxUSE_UNIX" = "yes" -a "$wxUSE_MAC" != 1 -a "$wxUSE_COCOA" != 1; then
+- AC_MSG_CHECKING([for -lSM - X11 session management])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],SM)
++ WX_FIND_LIB(SM, SmcOpenConnection)
+ if test "$ac_find_libraries" != "" ; then
+- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+- if test "$ac_path_to_link" != " -L/usr/lib" ; then
++ if test "$ac_find_libraries" != "std" ; then
++ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++ if test "$ac_path_to_link" != " -L/usr/lib" ; then
+ LDFLAGS="$LDFLAGS $ac_path_to_link"
++ fi
+ fi
+ GUI_TK_LIBRARY="$GUI_TK_LIBRARY -lSM"
+- AC_MSG_RESULT([yes])
+ else
+- AC_MSG_RESULT([no])
+ AC_MSG_WARN([libSM not found; disabling session management detection])
+ wxUSE_DETECT_SM="no"
+ fi
+@@ -4295,51 +4276,46 @@ if test "$wxUSE_OPENGL" = "yes"; then
+ AC_CHECK_HEADER(GL/glu.h, [
+ found_gl=0
+
+- AC_MSG_CHECKING([for -lGL])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB /opt/graphics/OpenGL/lib],GL)
++ WX_FIND_LIB(GL, glBegin, [/opt/graphics/OpenGL/lib])
+ if test "$ac_find_libraries" != "" ; then
+- AC_MSG_RESULT([found in $ac_find_libraries])
+-
+- WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+- if test "$ac_path_to_link" != " -L/usr/lib" ; then
++ if test "$ac_find_libraries" != "std" ; then
++ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
++ if test "$ac_path_to_link" != " -L/usr/lib" ; then
+ LDFLAGS_GL="$ac_path_to_link"
++ fi
+ fi
+
+ dnl don't suppose that libGL and libGLU are always in the
+ dnl same directory -- this is not true for some common
+ dnl distributions
+- AC_MSG_CHECKING([for -lGLU])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],GLU)
++ WX_FIND_LIB(GLU, gluBeginCurve, [/opt/graphics/OpenGL/lib])
+ if test "$ac_find_libraries" != "" ; then
++ if test "$ac_find_libraries" != "std" ; then
+ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+ if test "$ac_path_to_link" != " -L/usr/lib" -a \
+- "$ac_path_to_link" != "$LDFLAGS_GL"; then
+- LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
++ "$ac_path_to_link" != "$LDFLAGS_GL" ; then
++ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
+ fi
++ fi
+
+ found_gl=1
+ OPENGL_LIBS="-lGL -lGLU"
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_RESULT([no])
+ fi
+- else
+- AC_MSG_RESULT([no])
+ fi
+
+ if test "$found_gl" != 1; then
+- AC_MSG_CHECKING([for -lMesaGL])
+- WX_PATH_FIND_LIBRARIES([$SEARCH_LIB],MesaGL)
++ WX_FIND_LIB(MesaGL, glEnable, [/opt/graphics/OpenGL/lib])
+ if test "$ac_find_libraries" != "" ; then
++ if test "$ac_find_libraries" != "std" ; then
+ WX_LINK_PATH_EXIST([$ac_find_libraries],[$LDFLAGS])
+- LDFLAGS_GL="$LDFLAGS$ac_path_to_link"
+- OPENGL_LIBS="-lMesaGL -lMesaGLU"
+- AC_MSG_RESULT([yes])
+- else
+- AC_MSG_RESULT([no])
++ if test "$ac_path_to_link" != " -L/usr/lib" ; then
++ LDFLAGS_GL="$LDFLAGS_GL$ac_path_to_link"
++ fi
++ fi
++ OPENGL_LIBS="-lMesaGL -lMesaGLU"
+ fi
+ fi
+- ])
++ ],, [ ])
+ ],
+ [],
+ [ ])
+--
+2.4.6
+
diff --git a/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
new file mode 100644
index 000000000000..cbe3103a0bce
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.8.7-mmedia.patch
@@ -0,0 +1,11 @@
+diff -Naur wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in wxPython-src-2.8.7.1/contrib/src/Makefile.in
+--- wxPython-src-2.8.7.1-orig/contrib/src/Makefile.in 2007-07-27 17:57:27.000000000 -0600
++++ wxPython-src-2.8.7.1/contrib/src/Makefile.in 2007-12-28 17:34:28.000000000 -0600
+@@ -1,6 +1,6 @@
+ # $Id$
+
+-CONTRIB_SUBDIRS=fl gizmos mmedia ogl plot stc svg #deprecated #applet
++CONTRIB_SUBDIRS=fl gizmos ogl plot stc svg #deprecated #applet mmedia
+
+ all:
+ @for d in $(CONTRIB_SUBDIRS); do (cd $$d && $(MAKE)); done
diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch
new file mode 100644
index 000000000000..ed82c4eb51f1
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.9.3.1-collision.patch
@@ -0,0 +1,77 @@
+Prevent file collisions between multiple installed SLOTs.
+
+ - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets.
+ - Version the bakefile preset filenames. Unversioned symlinks to these files
+ are handled by eselect.
+ - Version wx-config and wxrc. The unversioned forms are wrapper scripts
+ installed with eselect-wxwidgets.
+ - Version wxstd.mo and modify AddStdCatalog to use it.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ $(DYLIB_RPATH_INSTALL)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+@@ -14964,15 +14964,16 @@ install-wxconfig:
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
+-
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
++ && $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+ for l in $(LOCALE_LINGUAS) ; do \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
++ $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+--- a/build/bakefiles/wx.bkl
++++ b/build/bakefiles/wx.bkl
+@@ -138,7 +138,7 @@
+ <using module="gettext"/>
+ <gettext-catalogs id="locale">
+ <srcdir>$(SRCDIR)/locale</srcdir>
+- <catalog-name>wxstd</catalog-name>
++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+ <linguas>
+ ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+ zh zh_CN zh_TW
+--- a/src/common/translation.cpp
++++ b/src/common/translation.cpp
+@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
+
+ bool wxTranslations::AddStdCatalog()
+ {
+- if ( !AddCatalog(wxS("wxstd")) )
++ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
+ return false;
+
+ // there may be a catalog with toolkit specific overrides, it is not
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -124,7 +124,6 @@ distclean: clean
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch b/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch
new file mode 100644
index 000000000000..7657f9b58c63
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-2.9.4.1-collision.patch
@@ -0,0 +1,75 @@
+Prevent file collisions between multiple installed SLOTs.
+
+ - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets.
+ - Version the bakefile preset filenames. Unversioned symlinks to these files
+ are handled by eselect.
+ - Version wx-config and wxrc. The unversioned forms are wrapper scripts
+ installed with eselect-wxwidgets.
+ - Version wxstd.mo and modify AddStdCatalog to use it.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -14774,10 +14774,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ $(DYLIB_RPATH_INSTALL)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+@@ -15662,7 +15662,7 @@ install-wxconfig:
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -15670,7 +15670,7 @@ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+--- a/build/bakefiles/wx.bkl
++++ b/build/bakefiles/wx.bkl
+@@ -138,7 +138,7 @@
+ <using module="gettext"/>
+ <gettext-catalogs id="locale">
+ <srcdir>$(SRCDIR)/locale</srcdir>
+- <catalog-name>wxstd</catalog-name>
++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+ <linguas>
+ ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+ zh zh_CN zh_TW
+--- a/src/common/translation.cpp
++++ b/src/common/translation.cpp
+@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
+
+ bool wxTranslations::AddStdCatalog()
+ {
+- if ( !AddCatalog(wxS("wxstd")) )
++ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
+ return false;
+
+ // there may be a catalog with toolkit specific overrides, it is not
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -125,7 +125,6 @@ distclean: clean
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
new file mode 100644
index 000000000000..a2c6c6e1a8e3
--- /dev/null
+++ b/x11-libs/wxGTK/files/wxGTK-3.0.0.0-collision.patch
@@ -0,0 +1,75 @@
+Prevent file collisions between multiple installed SLOTs.
+
+ - Don't install wxwin.m4. It is installed with app-eselect/eselect-wxwidgets.
+ - Version the bakefile preset filenames. Unversioned symlinks to these files
+ are handled by eselect.
+ - Version wx-config and wxrc. The unversioned forms are wrapper scripts
+ installed with eselect-wxwidgets.
+ - Version wxstd.mo and modify AddStdCatalog to use it.
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -15213,10 +15213,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
+ all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
+
+ install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
+- $(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
+- (cd $(srcdir) ; $(INSTALL_DATA) wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
+- (cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA) wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
++ (cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
++ for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
++ $(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
+ $(DYLIB_RPATH_INSTALL)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
+ for f in setup.h $(RCDEFS_H); do \
+@@ -16101,7 +16101,7 @@ install-wxconfig:
+ $(INSTALL_DIR) $(DESTDIR)$(bindir)
+ $(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
+ $(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
+- (cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
++ (cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) && $(LN_S) $(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE) || cp -p $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
+
+ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
+@@ -16109,7 +16109,7 @@ locale_install:
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
+ $(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
+ if test -f $(srcdir)/locale/$$l.mo ; then \
+- $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
++ $(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
+ fi ; \
+ done
+
+--- a/build/bakefiles/wx.bkl
++++ b/build/bakefiles/wx.bkl
+@@ -137,7 +137,7 @@
+ <using module="gettext"/>
+ <gettext-catalogs id="locale">
+ <srcdir>$(SRCDIR)/locale</srcdir>
+- <catalog-name>wxstd</catalog-name>
++ <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
+ <linguas>
+ ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
+ zh zh_CN zh_TW
+--- a/src/common/translation.cpp
++++ b/src/common/translation.cpp
+@@ -1458,7 +1458,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
+
+ bool wxTranslations::AddStdCatalog()
+ {
+- if ( !AddCatalog(wxS("wxstd")) )
++ if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
+ return false;
+
+ // there may be a catalog with toolkit specific overrides, it is not
+--- a/utils/wxrc/Makefile.in
++++ b/utils/wxrc/Makefile.in
+@@ -125,7 +125,6 @@ distclean: clean
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+ @COND_USE_XRC_1@ $(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
+ @COND_USE_XRC_1@ mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
+-@COND_USE_XRC_1@ (cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
+
+ @COND_USE_XRC_1@uninstall_wxrc:
+ @COND_USE_XRC_1@ rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/x11-libs/wxGTK/metadata.xml b/x11-libs/wxGTK/metadata.xml
new file mode 100644
index 000000000000..bacea1ae3fb7
--- /dev/null
+++ b/x11-libs/wxGTK/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>wxwidgets</herd>
+ <maintainer>
+ <email>wxwidgets@gentoo.org</email>
+ <description>All modifications to this package must be approved by the wxwidgets herd.</description>
+ </maintainer>
+ <use>
+ <flag name="gstreamer">
+ Enable the wxMediaCtrl class for playing audio and video through
+ gstreamer.
+ </flag>
+ <flag name="gnome">
+ Use <pkg>gnome-base/libgnomeprintui</pkg> for printing tasks.
+ </flag>
+ <flag name="sdl">
+ Use Simple Directmedia Layer (<pkg>media-libs/libsdl</pkg>) for
+ audio.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="sourceforge">wxpython</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
new file mode 100644
index 000000000000..0fc560405479
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r1.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib versionator
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff"
+
+SLOT="2.8"
+
+RDEPEND="
+ dev-libs/expat
+ odbc? ( dev-db/unixODBC )
+ sdl? ( media-libs/libsdl )
+ X? (
+ dev-libs/glib:2
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/jpeg
+ x11-libs/gtk+:2
+ x11-libs/libSM
+ x11-libs/libXinerama
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ gnome? ( gnome-base/libgnomeprintui:2.2 )
+ gstreamer? (
+ gnome-base/gconf:2
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10 )
+ opengl? ( virtual/opengl )
+ tiff? ( media-libs/tiff:0 )
+ )
+ aqua? (
+ >=x11-libs/gtk+-2.4[aqua=]
+ virtual/jpeg
+ tiff? ( media-libs/tiff:0 )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ opengl? ( virtual/glu )
+ X? (
+ x11-proto/xproto
+ x11-proto/xineramaproto
+ x11-proto/xf86vidmodeproto
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-0.7"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ odbc? ( LGPL-2 )
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
+ epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
+ epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874
+ epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch # Bug #310923
+
+ # x32 https://bugs.gentoo.org/421851
+ sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
+ # prefix https://bugs.gentoo.org/394123
+ sed -i -e "s:/usr:${EPREFIX}/usr:g" \
+ -e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
+ configure || die
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf
+
+ append-flags -fno-strict-aliasing
+
+ # X independent options
+ myconf="--enable-compat26
+ --enable-shared
+ --enable-unicode
+ --with-regex=builtin
+ --with-zlib=sys
+ --with-expat=sys
+ $(use_enable debug)
+ $(use_enable pch precomp-headers)
+ $(use_with odbc odbc sys)
+ $(use_with sdl)
+ $(use_with tiff libtiff sys)"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ $(use_enable gstreamer mediactrl)
+ $(use_enable opengl)
+ $(use_with opengl)
+ $(use_with gnome gnomeprint)
+ --without-gnomevfs"
+
+ use aqua && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --with-mac
+ --with-opengl"
+ # cocoa toolkit seems to be broken
+
+ # wxBase options
+ if use !X && use !aqua ; then
+ myconf="${myconf}
+ --disable-gui"
+ fi
+
+ mkdir "${S}"/wxgtk_build
+ cd "${S}"/wxgtk_build
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+ cd "${S}"/wxgtk_build
+
+ emake
+
+ if [[ -d contrib/src ]]; then
+ cd contrib/src
+ emake
+ fi
+}
+
+src_install() {
+ cd "${S}"/wxgtk_build
+
+ emake DESTDIR="${D}" install
+
+ if [[ -d contrib/src ]]; then
+ cd contrib/src
+ emake DESTDIR="${D}" install
+ fi
+
+ cd "${S}"/docs
+ dodoc changes.txt readme.txt todo30.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dohtml -r "${S}"/docs/html/*
+ fi
+
+ # Stray windows locale file, causes collisions
+ local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+ [[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
new file mode 100644
index 000000000000..269abdf3ed49
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.8.12.1-r2.ebuild
@@ -0,0 +1,188 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit autotools eutils flag-o-matic versionator multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+BASE_PV="$(get_version_component_range 1-3)"
+BASE_P="${PN}-${BASE_PV}"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gnome gstreamer odbc opengl pch sdl tiff"
+
+SLOT="2.8"
+
+RDEPEND="
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ odbc? ( dev-db/unixODBC[${MULTILIB_USEDEP}] )
+ sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+ X? (
+ dev-libs/glib:2[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg:=[${MULTILIB_USEDEP}]
+ x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libXinerama[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ x11-libs/pango[X,${MULTILIB_USEDEP}]
+ gnome? ( gnome-base/libgnomeprintui:2.2[${MULTILIB_USEDEP}] )
+ gstreamer? (
+ gnome-base/gconf:2[${MULTILIB_USEDEP}]
+ media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ )
+ aqua? (
+ >=x11-libs/gtk+-2.4:2[aqua=,${MULTILIB_USEDEP}]
+ virtual/jpeg:=[${MULTILIB_USEDEP}]
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+ X? (
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+ )
+"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-0.7"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ odbc? ( LGPL-2 )
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.8.11-unicode-odbc.patch
+ epatch "${FILESDIR}"/${PN}-2.8.11-collision.patch
+ epatch "${FILESDIR}"/${PN}-2.8.7-mmedia.patch # Bug #174874
+ epatch "${FILESDIR}"/${PN}-2.8.10.1-odbc-defines.patch # Bug #310923
+
+ # Bug #421851
+ epatch "${FILESDIR}"/${P}-libdir.patch
+ epatch "${FILESDIR}"/${P}-bakefile.patch
+ epatch "${FILESDIR}"/${P}-autoconf.patch
+
+ # prefix https://bugs.gentoo.org/394123
+ sed -i -e "s:/usr:${EPREFIX}/usr:g" \
+ -e '/SEARCH_INCLUDE="\\/,/"/cSEARCH_INCLUDE="'${EPREFIX}'/usr/include"' \
+ configure || die
+
+ epatch_user
+
+ mv configure.in configure.ac || die
+ eautoconf
+}
+
+multilib_src_configure() {
+ local myconf
+
+ append-flags -fno-strict-aliasing
+
+ # X independent options
+ myconf="--enable-compat26
+ --enable-shared
+ --enable-unicode
+ --with-regex=builtin
+ --with-zlib=sys
+ --with-expat=sys
+ $(use_enable debug)
+ $(use_enable pch precomp-headers)
+ $(use_with odbc odbc sys)
+ $(use_with sdl)
+ $(use_with tiff libtiff sys)"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ $(use_enable gstreamer mediactrl)
+ $(use_enable opengl)
+ $(use_with opengl)
+ $(use_with gnome gnomeprint)
+ --without-gnomevfs"
+
+ use aqua && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --with-mac
+ --with-opengl"
+ # cocoa toolkit seems to be broken
+
+ # wxBase options
+ if use !X && use !aqua ; then
+ myconf="${myconf}
+ --disable-gui"
+ fi
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_compile() {
+ emake
+
+ if [[ -d contrib/src ]]; then
+ cd contrib/src || die
+ emake
+ fi
+}
+
+multilib_src_install() {
+ default
+
+ if [[ -d contrib/src ]]; then
+ cd contrib/src || die
+ emake DESTDIR="${D}" install
+ fi
+}
+
+multilib_src_install_all() {
+ cd "${S}"/docs || die
+ dodoc changes.txt readme.txt todo30.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dodoc -r "${S}"/docs/html
+ fi
+
+ # Stray windows locale file, causes collisions
+ local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+ [[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild b/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild
new file mode 100644
index 000000000000..cca3f12633f2
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-2.9.4.1-r1.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-2.9.4.0.tar.bz2
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-2.9.4.0.tar.bz2 )
+ mirror://sourceforge/wxpython/wxPython-src-${PV}.patch"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gnome gstreamer opengl pch sdl tiff webkit"
+
+SLOT="2.9/2.9.4"
+
+RDEPEND="
+ dev-libs/expat
+ sdl? ( media-libs/libsdl )
+ X? (
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/jpeg
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/libSM
+ x11-libs/libXinerama
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ gnome? ( gnome-base/libgnomeprintui:2.2 )
+ gstreamer? (
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10 )
+ opengl? ( virtual/opengl )
+ tiff? ( media-libs/tiff:0 )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ aqua? (
+ >=x11-libs/gtk+-2.4[aqua=]
+ virtual/jpeg
+ tiff? ( media-libs/tiff:0 )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ opengl? ( virtual/glu )
+ X? (
+ x11-proto/xproto
+ x11-proto/xineramaproto
+ x11-proto/xf86vidmodeproto
+ )"
+# test? ( dev-util/cppunit )
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-1.4"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-2.9.4.0"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-collision.patch
+ epatch "${DISTDIR}"/wxPython-src-${PV}.patch
+ epatch_user
+}
+
+src_configure() {
+ local myconf
+
+ append-flags -fno-strict-aliasing
+
+ # X independent options
+ myconf="--enable-compat26
+ --with-zlib=sys
+ --with-expat=sys
+ $(use_enable pch precomp-headers)
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # if USE="debug" set max debug level (wxDEBUG_LEVEL=2)
+ # if USE="-debug" use the default (wxDEBUG_LEVEL=1)
+ # do not use --disable-debug
+ # this means we always build debugging features into the library, and
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # http://docs.wxwidgets.org/2.9/overview_debugging.html
+ # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(use_enable webkit webview)
+ $(use_with opengl)
+ $(use_with gnome gnomeprint)
+ $(use_with !gnome gtkprint)
+ $(use_with tiff libtiff sys)"
+
+ use aqua && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --with-mac
+ --with-opengl"
+ # cocoa toolkit seems to be broken
+
+ # wxBase options
+ if use !X && use !aqua ; then
+ myconf="${myconf}
+ --disable-gui"
+ fi
+
+ mkdir "${S}"/wxgtk_build
+ cd "${S}"/wxgtk_build
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+ cd "${S}"/wxgtk_build
+ emake
+}
+
+# Currently fails - need to investigate
+#src_test() {
+# cd "${S}"/wxgtk_build/tests
+# emake || die "failed building testsuite"
+# ./test -d || ewarn "failed running testsuite"
+#}
+
+src_install() {
+ cd "${S}"/wxgtk_build
+
+ emake DESTDIR="${D}" install
+
+ cd "${S}"/docs
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dohtml -r "${S}"/docs/doxygen/out/html/*
+ fi
+
+ # Stray windows locale file, causes collisions
+ local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+ [[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
new file mode 100644
index 000000000000..ef1e0cbe571e
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.0.0.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+ dev-libs/expat
+ sdl? ( media-libs/libsdl )
+ X? (
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/jpeg
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/gdk-pixbuf
+ x11-libs/libSM
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ gstreamer? (
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10 )
+ libnotify? ( x11-libs/libnotify )
+ opengl? ( virtual/opengl )
+ tiff? ( media-libs/tiff:0 )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ aqua? (
+ >=x11-libs/gtk+-2.4[aqua=]
+ virtual/jpeg
+ tiff? ( media-libs/tiff:0 )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ opengl? ( virtual/glu )
+ X? (
+ x11-proto/xproto
+ x11-proto/xineramaproto
+ x11-proto/xf86vidmodeproto
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-collision.patch
+
+ # https://bugs.gentoo.org/421851
+ # https://bugs.gentoo.org/499984
+ sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ use aqua && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --with-mac
+ --with-opengl"
+ # cocoa toolkit seems to be broken
+
+ # wxBase options
+ if use !X && use !aqua ; then
+ myconf="${myconf}
+ --disable-gui"
+ fi
+
+ mkdir "${S}"/wxgtk_build
+ cd "${S}"/wxgtk_build
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+ cd "${S}"/wxgtk_build
+ emake
+}
+
+src_install() {
+ cd "${S}"/wxgtk_build
+
+ emake DESTDIR="${D}" install
+
+ cd "${S}"/docs
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dohtml -r "${S}"/docs/doxygen/out/html/*
+ fi
+
+ # Stray windows locale file, causes collisions
+ local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+ [[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild
new file mode 100644
index 000000000000..667195eb62a2
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.1.1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+ dev-libs/expat
+ sdl? ( media-libs/libsdl )
+ X? (
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/jpeg
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/gdk-pixbuf
+ x11-libs/libSM
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ gstreamer? (
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10 )
+ libnotify? ( x11-libs/libnotify )
+ opengl? ( virtual/opengl )
+ tiff? ( media-libs/tiff:0 )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ aqua? (
+ >=x11-libs/gtk+-2.4[aqua=]
+ virtual/jpeg
+ tiff? ( media-libs/tiff:0 )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ opengl? ( virtual/glu )
+ X? (
+ x11-proto/xproto
+ x11-proto/xineramaproto
+ x11-proto/xf86vidmodeproto
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+
+ # https://bugs.gentoo.org/421851
+ # https://bugs.gentoo.org/499984
+ sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ use aqua && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --with-mac
+ --with-opengl"
+ # cocoa toolkit seems to be broken
+
+ # wxBase options
+ if use !X && use !aqua ; then
+ myconf="${myconf}
+ --disable-gui"
+ fi
+
+ mkdir "${S}"/wxgtk_build
+ cd "${S}"/wxgtk_build
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+ cd "${S}"/wxgtk_build
+ emake
+}
+
+src_install() {
+ cd "${S}"/wxgtk_build
+
+ emake DESTDIR="${D}" install
+
+ cd "${S}"/docs
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dohtml -r "${S}"/docs/doxygen/out/html/*
+ fi
+
+ # Stray windows locale file, causes collisions
+ local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+ [[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
new file mode 100644
index 000000000000..53f1ed73e61a
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r1.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+ dev-libs/expat
+ sdl? ( media-libs/libsdl )
+ X? (
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/jpeg
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/gdk-pixbuf
+ x11-libs/libSM
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ gstreamer? (
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10 )
+ libnotify? ( x11-libs/libnotify )
+ opengl? ( virtual/opengl )
+ tiff? ( media-libs/tiff:0 )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ aqua? (
+ >=x11-libs/gtk+-2.4[aqua=]
+ virtual/jpeg
+ tiff? ( media-libs/tiff:0 )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ opengl? ( virtual/glu )
+ X? (
+ x11-proto/xproto
+ x11-proto/xineramaproto
+ x11-proto/xf86vidmodeproto
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+
+ # https://bugs.gentoo.org/421851
+ # https://bugs.gentoo.org/499984
+ # https://bugs.gentoo.org/536004
+ sed \
+ -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" \
+ -e 's:3\.0\.1:3.0.2:g' \
+ -e 's:^wx_release_number=1$:wx_release_number=2:' \
+ -i configure || die
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ use aqua && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --with-mac
+ --with-opengl"
+ # cocoa toolkit seems to be broken
+
+ # wxBase options
+ if use !X && use !aqua ; then
+ myconf="${myconf}
+ --disable-gui"
+ fi
+
+ mkdir "${S}"/wxgtk_build
+ cd "${S}"/wxgtk_build
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+ cd "${S}"/wxgtk_build
+ emake
+}
+
+src_install() {
+ cd "${S}"/wxgtk_build
+
+ emake DESTDIR="${D}" install
+
+ cd "${S}"/docs
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dohtml -r "${S}"/docs/doxygen/out/html/*
+ fi
+
+ # Stray windows locale file, causes collisions
+ local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+ [[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
new file mode 100644
index 000000000000..c2317a9a6172
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0-r2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+ dev-libs/expat[${MULTILIB_USEDEP}]
+ sdl? ( media-libs/libsdl[${MULTILIB_USEDEP}] )
+ X? (
+ >=dev-libs/glib-2.22:2[${MULTILIB_USEDEP}]
+ media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ virtual/jpeg:=[${MULTILIB_USEDEP}]
+ >=x11-libs/gtk+-2.18:2[${MULTILIB_USEDEP}]
+ x11-libs/gdk-pixbuf[${MULTILIB_USEDEP}]
+ x11-libs/libSM[${MULTILIB_USEDEP}]
+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
+ x11-libs/pango[X,${MULTILIB_USEDEP}]
+ gstreamer? (
+ media-libs/gstreamer:0.10[${MULTILIB_USEDEP}]
+ media-libs/gst-plugins-base:0.10[${MULTILIB_USEDEP}] )
+ libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] )
+ opengl? ( virtual/opengl[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ aqua? (
+ >=x11-libs/gtk+-2.4:2[aqua=,${MULTILIB_USEDEP}]
+ virtual/jpeg:=[${MULTILIB_USEDEP}]
+ tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ opengl? ( virtual/glu[${MULTILIB_USEDEP}] )
+ X? (
+ x11-proto/xproto[${MULTILIB_USEDEP}]
+ x11-proto/xineramaproto[${MULTILIB_USEDEP}]
+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+ epatch_user
+
+ # https://bugs.gentoo.org/536004
+ sed \
+ -e 's:3\.0\.1:3.0.2:g' \
+ -e 's:^wx_release_number=1$:wx_release_number=2:' \
+ -i "${S}"/configure || die
+
+}
+
+multilib_src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(multilib_native_use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ use aqua && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --with-mac
+ --with-opengl"
+ # cocoa toolkit seems to be broken
+
+ # wxBase options
+ if use !X && use !aqua ; then
+ myconf="${myconf}
+ --disable-gui"
+ fi
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+multilib_src_install_all() {
+ cd "${S}"/docs || die
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dodoc -r "${S}"/docs/doxygen/out/html
+ fi
+
+ # Stray windows locale file, causes collisions
+ local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+ [[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
diff --git a/x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild b/x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild
new file mode 100644
index 000000000000..667195eb62a2
--- /dev/null
+++ b/x11-libs/wxGTK/wxGTK-3.0.2.0.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="GTK+ version of wxWidgets, a cross-platform C++ GUI toolkit"
+HOMEPAGE="http://wxwidgets.org/"
+
+# we use the wxPython tarballs because they include the full wxGTK sources and
+# docs, and are released more frequently than wxGTK.
+SRC_URI="mirror://sourceforge/wxpython/wxPython-src-${PV}.tar.bz2
+ doc? ( mirror://sourceforge/wxpython/wxPython-docs-${PV}.tar.bz2 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit"
+
+SLOT="3.0"
+
+RDEPEND="
+ dev-libs/expat
+ sdl? ( media-libs/libsdl )
+ X? (
+ >=dev-libs/glib-2.22:2
+ media-libs/libpng:0=
+ sys-libs/zlib
+ virtual/jpeg
+ >=x11-libs/gtk+-2.18:2
+ x11-libs/gdk-pixbuf
+ x11-libs/libSM
+ x11-libs/libXxf86vm
+ x11-libs/pango[X]
+ gstreamer? (
+ media-libs/gstreamer:0.10
+ media-libs/gst-plugins-base:0.10 )
+ libnotify? ( x11-libs/libnotify )
+ opengl? ( virtual/opengl )
+ tiff? ( media-libs/tiff:0 )
+ webkit? ( net-libs/webkit-gtk:2 )
+ )
+ aqua? (
+ >=x11-libs/gtk+-2.4[aqua=]
+ virtual/jpeg
+ tiff? ( media-libs/tiff:0 )
+ )"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ opengl? ( virtual/glu )
+ X? (
+ x11-proto/xproto
+ x11-proto/xineramaproto
+ x11-proto/xf86vidmodeproto
+ )"
+
+PDEPEND=">=app-eselect/eselect-wxwidgets-20131230"
+
+LICENSE="wxWinLL-3
+ GPL-2
+ doc? ( wxWinFDL-3 )"
+
+S="${WORKDIR}/wxPython-src-${PV}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-3.0.0.0-collision.patch
+
+ # https://bugs.gentoo.org/421851
+ # https://bugs.gentoo.org/499984
+ sed -i -e "/wx_cv_std_libpath=/s:=.*:=$(get_libdir):" configure || die
+
+ epatch_user
+}
+
+src_configure() {
+ local myconf
+
+ # X independent options
+ myconf="
+ --with-zlib=sys
+ --with-expat=sys
+ --enable-compat28
+ $(use_with sdl)"
+
+ # debug in >=2.9
+ # there is no longer separate debug libraries (gtk2ud)
+ # wxDEBUG_LEVEL=1 is the default and we will leave it enabled
+ # wxDEBUG_LEVEL=2 enables assertions that have expensive runtime costs.
+ # apps can disable these features by building w/ -NDEBUG or wxDEBUG_LEVEL_0.
+ # http://docs.wxwidgets.org/3.0/overview_debugging.html
+ # http://groups.google.com/group/wx-dev/browse_thread/thread/c3c7e78d63d7777f/05dee25410052d9c
+ use debug \
+ && myconf="${myconf} --enable-debug=max"
+
+ # wxGTK options
+ # --enable-graphics_ctx - needed for webkit, editra
+ # --without-gnomevfs - bug #203389
+ use X && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --with-gtkprint
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --without-gnomevfs
+ $(use_enable gstreamer mediactrl)
+ $(use_enable webkit webview)
+ $(use_with libnotify)
+ $(use_with opengl)
+ $(use_with tiff libtiff sys)"
+
+ use aqua && \
+ myconf="${myconf}
+ --enable-graphics_ctx
+ --enable-gui
+ --with-libpng=sys
+ --with-libxpm=sys
+ --with-libjpeg=sys
+ --with-mac
+ --with-opengl"
+ # cocoa toolkit seems to be broken
+
+ # wxBase options
+ if use !X && use !aqua ; then
+ myconf="${myconf}
+ --disable-gui"
+ fi
+
+ mkdir "${S}"/wxgtk_build
+ cd "${S}"/wxgtk_build
+
+ ECONF_SOURCE="${S}" econf ${myconf}
+}
+
+src_compile() {
+ cd "${S}"/wxgtk_build
+ emake
+}
+
+src_install() {
+ cd "${S}"/wxgtk_build
+
+ emake DESTDIR="${D}" install
+
+ cd "${S}"/docs
+ dodoc changes.txt readme.txt
+ newdoc base/readme.txt base_readme.txt
+ newdoc gtk/readme.txt gtk_readme.txt
+
+ if use doc; then
+ dohtml -r "${S}"/docs/doxygen/out/html/*
+ fi
+
+ # Stray windows locale file, causes collisions
+ local wxmsw="${ED}usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
+ [[ -e ${wxmsw} ]] && rm "${wxmsw}"
+}
+
+pkg_postinst() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
+
+pkg_postrm() {
+ has_version app-eselect/eselect-wxwidgets \
+ && eselect wxwidgets update
+}
diff --git a/x11-libs/xbae/Manifest b/x11-libs/xbae/Manifest
new file mode 100644
index 000000000000..487dc08158ae
--- /dev/null
+++ b/x11-libs/xbae/Manifest
@@ -0,0 +1 @@
+DIST xbae-4.60.4.tar.gz 1770938 SHA256 eb72702ed0a36d043f2075a9d5a4545556da1b8dab4d67d85fca92f37aeb04a8 SHA512 e9c2ea59ab598217a5d6a3df0b86ca9fa084c364116d9789334984a0ac83dec0d5b5e3fb643e067036fca10f13b175f6d5134325eb5041af614a4ed00745ba16 WHIRLPOOL 450621768a496149738511998cf6e357ad3d78684d41b4c651ebd7e389be1bd57e20e3b2c3aed156d987dbf07836dae8313f6339529ab5663f5dbe1d5f44105b
diff --git a/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch b/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
new file mode 100644
index 000000000000..aa0625b815af
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-Makefile.in.patch
@@ -0,0 +1,27 @@
+--- Makefile.in.orig 2007-04-03 15:06:53.066980500 +0100
++++ Makefile.in 2007-04-03 15:16:53.795027250 +0100
+@@ -230,14 +230,13 @@
+ x_includes = @x_includes@
+ x_libraries = @x_libraries@
+ MAINTAINERCLEANFILES = Makefile.in configure libtool config.guess config.sub ltconfig ltmain.sh aclocal.m4 config.h.in install-sh missing mkinstalldirs
+-SUBDIRS = include src examples doc scripts
++SUBDIRS = include src
+ EXTRA_DIST = configure ac_find_xbae.m4 Imakefile Xbae.tmpl Xbae.rules \
+ CVSMake
+
+ aclocaldir = @ACLOCALDIR@
+ @Aclocal_TRUE@aclocal_DATA = ac_find_xbae.m4
+ docdir = $(datadir)/Xbae
+-doc_DATA = NEWS README
+
+ #
+ # Some convenient targets for users of Exuberant ctags
+@@ -657,7 +656,7 @@
+
+ info-am:
+
+-install-data-am: install-aclocalDATA install-docDATA
++install-data-am: install-aclocalDATA
+
+ install-exec-am:
+
diff --git a/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch b/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
new file mode 100644
index 000000000000..d5b66015eb0c
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-lxmp.patch
@@ -0,0 +1,11 @@
+--- examples/Mri/Makefile.in.orig 2007-04-03 14:52:55.326625000 +0100
++++ examples/Mri/Makefile.in 2007-04-03 14:53:12.731712750 +0100
+@@ -219,7 +219,7 @@
+ -I$(top_builddir)/include @MOTIF_CFLAGS@ @X_CFLAGS@
+
+ LDADD = ../../src/libXbae.la \
+- -lWc $(link_motif) @X_LIBS@ -lXt ${X_PRE_LIBS} -lXext -lX11 ${X_EXTRA_LIBS}
++ -lWc $(link_motif) @X_LIBS@ -lXt ${X_PRE_LIBS} -lXext -lX11 ${X_EXTRA_LIBS} -lXmp
+
+ all: all-am
+
diff --git a/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch b/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
new file mode 100644
index 000000000000..0e87ba3da39c
--- /dev/null
+++ b/x11-libs/xbae/files/xbae-4.60.4-tmpl.patch
@@ -0,0 +1,11 @@
+--- Xbae.tmpl.orig 2007-04-03 14:45:54.548519000 +0100
++++ Xbae.tmpl 2007-04-03 14:46:12.053613000 +0100
+@@ -13,7 +13,7 @@
+
+ #define DoNormalLib YES
+ #define DoSharedLib YES
+-#define DoDebugLib YES
++#define DoDebugLib NO
+
+ #include <Library.tmpl>
+
diff --git a/x11-libs/xbae/metadata.xml b/x11-libs/xbae/metadata.xml
new file mode 100644
index 000000000000..821284b9a309
--- /dev/null
+++ b/x11-libs/xbae/metadata.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <longdescription lang="en">
+ XbaeMatrix is a free Motif(R) table widget (also compatible with the free
+ LessTif) which presents an editable array of string data to the user in a
+ scrollable table similar to a spreadsheet. The rows and columns of the Matrix
+ may optionally be labelled. A number of "fixed" and "trailing fixed" rows
+ or columns may be specified.
+
+ The XbaeCaption widget is a simple Motif manager widget that associates
+ a label with a child.
+
+ In addition the XbaeInput widget is being distributed, a text input field
+ that provides generic customised data entry and formatting for strings.
+</longdescription>
+ <upstream>
+ <remote-id type="sourceforge">xbae</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/x11-libs/xbae/xbae-4.60.4.ebuild b/x11-libs/xbae/xbae-4.60.4.ebuild
new file mode 100644
index 000000000000..c05fbf5a8158
--- /dev/null
+++ b/x11-libs/xbae/xbae-4.60.4.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+inherit autotools-utils
+
+DESCRIPTION="Motif-based widget to display a grid of cells as a spreadsheet"
+HOMEPAGE="http://xbae.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux"
+SLOT="0"
+IUSE="doc examples static-libs"
+
+RDEPEND="
+ x11-libs/motif:0
+ x11-libs/libXau
+ x11-libs/libXdmcp
+ x11-libs/libXext
+ x11-libs/libXmu
+ x11-libs/libXpm
+ x11-libs/libXt"
+
+DEPEND="${RDEPEND}"
+
+# tests need X display
+# and are interactive so virtualx will not help
+RESTRICT=test
+
+PATCHES=(
+ "${FILESDIR}"/${P}-tmpl.patch
+ "${FILESDIR}"/${P}-lxmp.patch
+ "${FILESDIR}"/${P}-Makefile.in.patch
+ )
+
+src_configure() {
+ local myeconfargs=( --enable-production )
+ autotools-utils_src_configure
+}
+
+src_test() {
+ cd ${AUTOTOOLS_BUILD_DIR}/examples
+ emake
+ "${S}"/examples/testall
+ emake clean
+}
+
+src_install() {
+ autotools-utils_src_install
+
+ insinto /usr/share/aclocal
+ doins ac_find_xbae.m4
+
+ use doc && dohtml -r doc/*
+
+ if use examples; then
+ find examples -name '*akefile*' -delete || die
+ rm examples/{testall,extest} || die
+ insinto /usr/share/doc/${PF}
+ doins -r examples
+ fi
+}
diff --git a/x11-libs/xcb-util-cursor/Manifest b/x11-libs/xcb-util-cursor/Manifest
new file mode 100644
index 000000000000..6c7a2afaf7eb
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/Manifest
@@ -0,0 +1,2 @@
+DIST xcb-util-cursor-0.1.1.tar.bz2 280852 SHA256 517a1febcede3bc994e356c4c066e297a12ca219063b7d39047e29c7a8860652 SHA512 599f9074a9801615a29374a96649c2d9d8de8abd053b7ddb245b7cc50a1c9c94610a8df996a7a79a831ade3d903335fdf7ac299e6b33e735ab087c3fe5923d71 WHIRLPOOL b73856c19e451af35b07de3bc3706ab0374c3c79dcbbc5d19f3cb03324a86d5422a46d51e63a916f53afb5f45d3b689d25d4ea58baa880d42a13fb0dd6693108
+DIST xcb-util-cursor-0.1.2.tar.bz2 289714 SHA256 ed65367b810d47ab637011585135f4a84dd12e235dddcd3b26e0cfb3be21fb3a SHA512 13b9dc0e9f8a61fc72ef6ec722d574ba46c5eacdaf0785d301a3cca00de00b772b6b7fa0b6484f54b4ee19d384a46b3bbf29935bf15ffdde23b004567fc4a85e WHIRLPOOL 7f484e976600dac89762c70135d913ab6a003fd87415f06c92faebca24e5022c561131e3e7e7741df04bd2fd00d6d7ce9b0adf1e803ff705e94fb48dcf624581
diff --git a/x11-libs/xcb-util-cursor/metadata.xml b/x11-libs/xcb-util-cursor/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/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-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
new file mode 100644
index 000000000000..647d473db628
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.1-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-cursor"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
+ >=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild
new file mode 100644
index 000000000000..21c4dbc49058
--- /dev/null
+++ b/x11-libs/xcb-util-cursor/xcb-util-cursor-0.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-cursor"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-image-0.3.9-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
+ >=x11-proto/xcb-proto-1.8-r3:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-image/Manifest b/x11-libs/xcb-util-image/Manifest
new file mode 100644
index 000000000000..83e082f3b75b
--- /dev/null
+++ b/x11-libs/xcb-util-image/Manifest
@@ -0,0 +1,2 @@
+DIST xcb-util-image-0.3.9.tar.bz2 310947 SHA256 d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df SHA512 6cf7e191f3814528d977aa2acb2a106aaba0732c5d5f4041ac39039e18b9064f90f96da087300f4061d700e3521648e5540117794fdc41dad36ca5f973370394 WHIRLPOOL 6848c12e1f98a4989c8ae2f6765de99639aef178c28f5d782eca132e0ea7adf32aecbd1da0b2631213898a2315dec71beacb8a4dfc717d3701d6500e70092828
+DIST xcb-util-image-0.4.0.tar.bz2 327891 SHA256 2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc SHA512 9b7202c054e1160f9ca97a86be1210d9fb47f2119f89ca85f15f20909cca884bfe0cb88e3e71c75b65e1a0a72b980066ccac810e41a91db895c74dde77440d4f WHIRLPOOL aaf72ca6cc1599aa66d1638fca53df46b443d07baab4589577576c9c89d24c9e59bc6968e8e9faea3a9b4e69e009f0bf23596fcb462cc13f3e5153000158bb2c
diff --git a/x11-libs/xcb-util-image/files/xcb-util-image-0.3.9-return-type.patch b/x11-libs/xcb-util-image/files/xcb-util-image-0.3.9-return-type.patch
new file mode 100644
index 000000000000..d1ebc397a942
--- /dev/null
+++ b/x11-libs/xcb-util-image/files/xcb-util-image-0.3.9-return-type.patch
@@ -0,0 +1,46 @@
+From 3577db110e03985d4486cae6caf3ceb5696c45e9 Mon Sep 17 00:00:00 2001
+From: Jon TURNEY <jon.turney@dronecode.org.uk>
+Date: Thu, 20 Dec 2012 22:56:28 +0000
+Subject: Fix compilation when NDEBUG is defined
+
+XORG_DEFAULT_OPTIONS enables -Werror=return-type
+
+xcb_image_get_pixel() and xcb_image_create_native() assume assert(0) is
+noreturn, and don't return a value in that case. But assert(0) isn't noreturn
+if NDEBUG is defined.
+
+Fix this by returning a suitable value.
+
+(Also, on the MinGW target, assert(0) is non-standard and may return even in the
+!NDEBUG case, as the C runtime may ask the user if they want to abort or not...)
+
+/jhbuild/checkout/xcb/xcb-util-image/image/xcb_image.c: In function 'xcb_image_get_pixel':
+/jhbuild/checkout/xcb/xcb-util-image/image/xcb_image.c:754:1: error: control reaches end of non-void function [-Wreturn-type]
+/jhbuild/checkout/xcb/xcb-util-image/image/xcb_image.c: In function 'xcb_image_create_native':
+/jhbuild/checkout/xcb/xcb-util-image/image/xcb_image.c:190:1: error: control reaches end of non-void function [-Wreturn-type]
+
+Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk>
+Signed-off-by: Peter Harris <pharris@opentext.com>
+---
+diff --git a/image/xcb_image.c b/image/xcb_image.c
+index e426cbd..101aa4f 100644
+--- a/image/xcb_image.c
++++ b/image/xcb_image.c
+@@ -187,6 +187,7 @@ xcb_image_create_native (xcb_connection_t * c,
+ assert(0);
+ }
+ assert(0);
++ return NULL;
+ }
+
+
+@@ -751,6 +752,7 @@ xcb_image_get_pixel (xcb_image_t *image,
+ default:
+ assert(0);
+ }
++ return 0;
+ }
+
+
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-libs/xcb-util-image/metadata.xml b/x11-libs/xcb-util-image/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/xcb-util-image/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-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild
new file mode 100644
index 000000000000..bad5828a2bfe
--- /dev/null
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.3.9-r1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-image"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-return-type.patch
+)
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.3.9.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.3.9.ebuild
new file mode 100644
index 000000000000..19f3ea94929b
--- /dev/null
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.3.9.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-image"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.4 )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-return-type.patch
+)
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild b/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
new file mode 100644
index 000000000000..a6a0ecd5c6ff
--- /dev/null
+++ b/x11-libs/xcb-util-image/xcb-util-image-0.4.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-image"
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-${PV}:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-keysyms/Manifest b/x11-libs/xcb-util-keysyms/Manifest
new file mode 100644
index 000000000000..8f96af5df74c
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/Manifest
@@ -0,0 +1,2 @@
+DIST xcb-util-keysyms-0.3.9.tar.bz2 286075 SHA256 7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e SHA512 0c7f9afea5886145760ff055fa9d38ac886306bca926b00c0c7da770b5e9a941887383922b144441d82fd071784cf94334773eae39b59aee094d570778f8f8f8 WHIRLPOOL fea0109e7e61af17170cf8da8a6c521d61f3354b40e16ea78fe2668df0afad551745caf84059db463fd4b7ee75d4d5795007d3a7268922da9bb7974753e4c33e
+DIST xcb-util-keysyms-0.4.0.tar.bz2 289880 SHA256 0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9 SHA512 b14b3100c3ae2379f9df799c0780a1ee39267101e58e4c1c6f390f039348ca2b370bb1df203b9bc68a170d664188d9c73e3553a7ba24d98abea3ed353e8dc0c4 WHIRLPOOL 19659fc2e3445df04cedc7e45c8cccf94f00e84077540838727e52effe7f6621f74a106916efdbc460f4abc50b493244a4381735d63ba86a46991d058ce17b0e
diff --git a/x11-libs/xcb-util-keysyms/metadata.xml b/x11-libs/xcb-util-keysyms/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/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-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild
new file mode 100644
index 000000000000..82b887e41cca
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-keysyms"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9.ebuild
new file mode 100644
index 000000000000..44e9a25976c7
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.3.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-keysyms"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.4 )"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
new file mode 100644
index 000000000000..1752e0a94601
--- /dev/null
+++ b/x11-libs/xcb-util-keysyms/xcb-util-keysyms-0.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-keysyms"
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND="x11-libs/libxcb:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-renderutil/Manifest b/x11-libs/xcb-util-renderutil/Manifest
new file mode 100644
index 000000000000..f44961c2f55b
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/Manifest
@@ -0,0 +1,2 @@
+DIST xcb-util-renderutil-0.3.8.tar.bz2 257492 SHA256 9789a5c55728fa7bae374d9fdf1c61095869bdc68561911760879095644c7452 SHA512 d2f94d23628383a1d2c861e0bfbe6452b89efd1003348dcfacfae9249b49fefb91efdec4cd5f5fc0aadd6f6b72cb2b866089e42b5006f9394fb6b68cb484fa8e WHIRLPOOL 7ef258498c1ca3ebe16e4505f9fe280c4abe72ee04b012842cfb624edb622f611c3843ff5de52a7a455401ec352e02a432d60ab2829654bbe98b2b6450a907b6
+DIST xcb-util-renderutil-0.3.9.tar.bz2 292898 SHA256 c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b SHA512 24b567992ecde7e69a406efd0ffb62266610d73b4dc0e5c71093221090fa134c14b850680d1d28dc1f8f4a6f497b4118491e1894ec7c73d2c6ce959d106771cc WHIRLPOOL 4c503898720aff7f81a75424d4d8f8351044aaa5fef446637474987264ee7487ba0f07b1f92f3f6d2c36495bad9086cc190d085fe7bf83281f2ce9b67a13cfb5
diff --git a/x11-libs/xcb-util-renderutil/metadata.xml b/x11-libs/xcb-util-renderutil/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/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-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild
new file mode 100644
index 000000000000..95a672817966
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.8.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-renderutil"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.4 )"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
new file mode 100644
index 000000000000..f07fc0733c2d
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-renderutil"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9.ebuild b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9.ebuild
new file mode 100644
index 000000000000..634476d119a5
--- /dev/null
+++ b/x11-libs/xcb-util-renderutil/xcb-util-renderutil-0.3.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-renderutil"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.4 )"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/xcb-util-wm/Manifest b/x11-libs/xcb-util-wm/Manifest
new file mode 100644
index 000000000000..e3cde0981b41
--- /dev/null
+++ b/x11-libs/xcb-util-wm/Manifest
@@ -0,0 +1,3 @@
+DIST xcb-util-wm-0.3.9.tar.bz2 320472 SHA256 038f9bdb917b1f6d98a164f57dfb32212a102d771ab6f03de49fef3786746030 SHA512 69f5840a8c27ae56f454962476bc246b56b3520562e26d31dae8388050abe3ebf9d1bcea512f830eaf63887b12df685a0f14c5c4cc963c3605330de29dcee0f1 WHIRLPOOL 4f6c3e0f51cd84272191d3a6a71517125e5e131ddfe367c7330fe23448f9e939fdaa565ad37fa92014635b07ef303a08f56fe5ece669c202301fe743f114e288
+DIST xcb-util-wm-0.4.0.tar.bz2 324316 SHA256 66f97c18f7d98d3c873fe5db5842d2fca34519274c31ee668551ab8995a2f51f SHA512 b0b209ca75b022bb2475f7fbc5cddbeb8a07b0e42b7cd9b302b8456e2f5df802920c48cb89799d738f27580ee89245a06534b7eb1823ede7599f86d10cf6abc4 WHIRLPOOL 5ce3d1167500ecb73b278ba9674429da0fdc26bb709ff796738ce1f18f4f1e4c73f0e3d51ce4003015ba42e8b843ce7fa0fba2b7576d9829632f149335fc389c
+DIST xcb-util-wm-0.4.1.tar.bz2 321855 SHA256 28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f SHA512 cd1b3bcf9fcfc52e329ddc42b370d50dcf7d473c8e94f01cf7ea7fdbe0dc9176790890214eecb2a8ac43405f4938c121e38d282ae988cd8e90a6610d214ef326 WHIRLPOOL aca91af78ccfee5a4bb6658133da4beb7b03b08779b0ed9b73fda95ab1919deef6169f1772f8a2b95aee31ae6c58fb5cb41ab20dd82b190b944d2a4094130f0f
diff --git a/x11-libs/xcb-util-wm/metadata.xml b/x11-libs/xcb-util-wm/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/xcb-util-wm/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-libs/xcb-util-wm/xcb-util-wm-0.3.9.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.3.9.ebuild
new file mode 100644
index 000000000000..1610e45fa498
--- /dev/null
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.3.9.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-wm"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-${PV}
+ x11-proto/xcb-proto
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.4 )"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.0.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.0.ebuild
new file mode 100644
index 000000000000..d72dca952469
--- /dev/null
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-wm"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-0.3.9
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.4 )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
new file mode 100644
index 000000000000..5c46f7e1b801
--- /dev/null
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-wm"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1.ebuild b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1.ebuild
new file mode 100644
index 000000000000..d12dcef3fc3a
--- /dev/null
+++ b/x11-libs/xcb-util-wm/xcb-util-wm-0.4.1.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util-wm"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/xcb-util-0.3.9
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.4 )"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util/Manifest b/x11-libs/xcb-util/Manifest
new file mode 100644
index 000000000000..7b239b48e6e8
--- /dev/null
+++ b/x11-libs/xcb-util/Manifest
@@ -0,0 +1,2 @@
+DIST xcb-util-0.3.9.tar.bz2 287855 SHA256 c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4 SHA512 3cf2e1da2c8099e66e7200e074f31d0c5913533382bceeedb663aab3ef2571533271218a17ad638db26b8ab9be41743e4665e1db8f85c85b1a42890329e1254a WHIRLPOOL 75dbd708103fc775f9bbd21f8e408a205d298389f6232b810e026a87a75580c90529a88a54d6453b79b21b7aa7c17c00473870fd7721d7337af3b262ca83a13c
+DIST xcb-util-0.4.0.tar.bz2 297412 SHA256 46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9 SHA512 e60aaa6f582eacd05896c5fd7c8417938318a1288146f3a5b339f77eed24e211c6099963f8813daa621c94173d2934228936b491c0ed79b09a8a67d835867d0e WHIRLPOOL b8aa70c9bbdbc4b1faaf93cca7b82ccd23ae1075283b6ca4e06f07add3b353f2ae04b7880551e447d5bdae2c4a9ce162339a18ba46ff14af767fd543da8d0e10
diff --git a/x11-libs/xcb-util/metadata.xml b/x11-libs/xcb-util/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/xcb-util/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-libs/xcb-util/xcb-util-0.3.9-r1.ebuild b/x11-libs/xcb-util/xcb-util-0.3.9-r1.ebuild
new file mode 100644
index 000000000000..54108ddac60e
--- /dev/null
+++ b/x11-libs/xcb-util/xcb-util-0.3.9-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
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+PDEPEND="
+ >=x11-libs/xcb-util-image-${PV}[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-keysyms-${PV}[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-renderutil-0.3.9[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-wm-${PV}[${MULTILIB_USEDEP}]
+"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xcb-util/xcb-util-0.3.9.ebuild b/x11-libs/xcb-util/xcb-util-0.3.9.ebuild
new file mode 100644
index 000000000000..d668edd41aad
--- /dev/null
+++ b/x11-libs/xcb-util/xcb-util-0.3.9.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=4
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util"
+EGIT_HAS_SUBMODULES=yes
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.7
+ x11-proto/xproto"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.4 )"
+
+PDEPEND="
+ >=x11-libs/xcb-util-image-${PV}
+ >=x11-libs/xcb-util-keysyms-${PV}
+ >=x11-libs/xcb-util-renderutil-0.3.8
+ >=x11-libs/xcb-util-wm-${PV}
+"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+
+ xorg-2_pkg_setup
+}
diff --git a/x11-libs/xcb-util/xcb-util-0.4.0.ebuild b/x11-libs/xcb-util/xcb-util-0.4.0.ebuild
new file mode 100644
index 000000000000..dfe3518eaa15
--- /dev/null
+++ b/x11-libs/xcb-util/xcb-util-0.4.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_MODULE=/
+XORG_BASE_INDIVIDUAL_URI=http://xcb.freedesktop.org/dist
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit xorg-2
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/util"
+
+DESCRIPTION="X C-language Bindings sample implementations"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+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 ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+IUSE="test"
+
+RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
+ >=x11-proto/xproto-7.0.24:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ >=dev-util/gperf-3.0.1
+ test? ( >=dev-libs/check-0.9.11[${MULTILIB_USEDEP}] )"
+
+PDEPEND="
+ >=x11-libs/xcb-util-cursor-0.1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-image-${PV}:=[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-keysyms-${PV}:=[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-renderutil-0.3.9:=[${MULTILIB_USEDEP}]
+ >=x11-libs/xcb-util-wm-${PV}:=[${MULTILIB_USEDEP}]
+"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc doxygen)
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xforms/Manifest b/x11-libs/xforms/Manifest
new file mode 100644
index 000000000000..86b23e4dc54d
--- /dev/null
+++ b/x11-libs/xforms/Manifest
@@ -0,0 +1 @@
+DIST xforms-1.0.93sp1.tar.gz 2204088 SHA256 0cbef8c16c478b7fc87cf24be618114f9b7d14dc0a06b61a352bb027dd3b2ca4 SHA512 b352b345f110966741f82645f1282805dd27e4eb16642efedb4f7e0132a109f525da678052b501d1d520014bb7f754f5b53676a83cfab5a249c02db835c66a6a WHIRLPOOL e5d83d3aef7bc06612afa6a64f01bbc101c796ae4baf65198088627fcf9e241285707cf9d92b01927fe5970cc8c0e1f1ceb829037c224e0fbb37f41b4997ab54
diff --git a/x11-libs/xforms/metadata.xml b/x11-libs/xforms/metadata.xml
new file mode 100644
index 000000000000..a40624fba8f0
--- /dev/null
+++ b/x11-libs/xforms/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-libs/xforms/xforms-1.0.93_p1-r1.ebuild b/x11-libs/xforms/xforms-1.0.93_p1-r1.ebuild
new file mode 100644
index 000000000000..1249a491816b
--- /dev/null
+++ b/x11-libs/xforms/xforms-1.0.93_p1-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit autotools eutils
+
+MY_P="${P/_/s}"
+
+DESCRIPTION="A graphical user interface toolkit for X"
+HOMEPAGE="http://www.nongnu.org/xforms/"
+SRC_URI="http://savannah.nongnu.org/download/xforms/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="amd64 arm ppc ppc64 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
+IUSE="doc opengl static-libs"
+
+RDEPEND="virtual/jpeg
+ x11-libs/libSM
+ x11-libs/libX11
+ x11-libs/libXpm
+ opengl? ( virtual/opengl )"
+DEPEND="${RDEPEND}
+ x11-proto/xproto"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( ChangeLog NEWS README )
+
+src_prepare() {
+ rm "${S}"/config/libtool.m4 "${S}"/acinclude.m4
+ AT_M4DIR=config eautoreconf
+}
+
+src_configure() {
+ econf \
+ $(use_enable doc docs) \
+ $(use_enable opengl gl) \
+ $(use_enable static-libs static)
+}
+
+src_install() {
+ default
+ prune_libtool_files
+}
diff --git a/x11-libs/xosd/Manifest b/x11-libs/xosd/Manifest
new file mode 100644
index 000000000000..10b729e1c01a
--- /dev/null
+++ b/x11-libs/xosd/Manifest
@@ -0,0 +1,3 @@
+DIST xosd-gentoo-m4-1.tar.bz2 5043 SHA256 6cd8c8e8bef4576e332e9f855e5ae7071b4da5e7ce0e96906531784aec2c061f SHA512 fcf4d8a77cc80bc04a444a4faa9e072ea1e00950b3ce685b7944302d2ee3ebdfc5ec29ccb311495ee2e1fb5e61cc2d49350b303288d1d86430fa6bc8b3772483 WHIRLPOOL 413fd7e89094bacb9c6538304e9b2a4d2bcf9dea67f123d5fd7903ddc6a36321ae5b97e44d626f93b90dab2fed8501b0def9f48cfe9233999aac316b99188a3f
+DIST xosd_2.2.14-1.diff.gz 8616 SHA256 1b74a379030a2a8a1c36b6589023445bc1f620dbfa12ef799590568505f390b2 SHA512 257ada9e0261c45c4c182acceeb24b95bbce08ec2ccae7ef49f9c5ee7a1e9995bd9527df725e0a871d48fa444899669320dc536674d0de71b766e9106097f86e WHIRLPOOL 3ef3c0e5a8fbc31a8e81e7f8ba1f7272672cf6c1cd4f9300ef2c82a91afbd840c4a5b506ad7322e9bec6272beb039f752be564a8fca77b67641cb82ebf200b47
+DIST xosd_2.2.14.orig.tar.gz 418331 SHA256 4f1fa96f4895baee6a3cba40f188a0da23bbac9d68e8c326d749e084143cb508 SHA512 3caf6d106d34488f4823e2a58fdff7a69b90f505b8da2443485167ff0362c6f27614c9a5019e738ff1f897d3c2249c934ff60953e3775566d66e8e9b30e4e473 WHIRLPOOL 64c93f9fedcd9442ccb78980cb157e9ea5db84edaaa1d6965f6a9ac45c6f773b24596da46b153449d6bc3208213d799ab48fe8dc0b67a260c0ccf88568c24b36
diff --git a/x11-libs/xosd/files/xosd-2.2.14-m4.patch b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
new file mode 100644
index 000000000000..3e529728f8b3
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-2.2.14-m4.patch
@@ -0,0 +1,9 @@
+Fix aclocal warning:
+/usr/share/aclocal/libxosd.m4:9: warning: underquoted definition of AM_PATH_LIBXOSD
+--- xosd-2.2.14/libxosd.m4
++++ xosd-2.2.14/libxosd.m4
+@@ -8,3 +8,3 @@
+ dnl
+-AC_DEFUN(AM_PATH_LIBXOSD,
++AC_DEFUN([AM_PATH_LIBXOSD],
+ [dnl
diff --git a/x11-libs/xosd/files/xosd-2.2.14-makefile.patch b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
new file mode 100644
index 000000000000..ed6da80fbb61
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-2.2.14-makefile.patch
@@ -0,0 +1,11 @@
+--- xosd-2.2.14/man/Makefile.am
++++ xosd-2.2.14/man/Makefile.am
+@@ -3,7 +3,7 @@
+ xosd_display.3 xosd_hide.3 xosd_is_onscreen.3 xosd_set_vertical_offset.3 \
+ xosd_set_pos.3 xosd_set_shadow_offset.3 xosd_show.3 xosd_uninit.3 xosd.3 \
+ xosd_get_number_lines.3 xosd_set_align.3 xosd_create.3 \
+- xosd_set_horizontal_offset.3 xosd_destroy.3 xosd_create.3 xosd_is_onscreen.3 \
++ xosd_set_horizontal_offset.3 xosd_destroy.3 \
+ xosd_set_bar_length.3
+
+ EXTRA_DIST = ${man_MANS}
diff --git a/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch
new file mode 100644
index 000000000000..8446297f15ce
--- /dev/null
+++ b/x11-libs/xosd/files/xosd-config-incorrect-dup-filter-fix.patch
@@ -0,0 +1,15 @@
+https://bugs.gentoo.org/show_bug.cgi?id=286632
+
+This patch disables reordering and duplicate removing for non-libs arguments, thus --param and alike gcc options may be used safe now.
+
+written by Andrew Savchenko
+--- script/xosd-config.in.orig
++++ script/xosd-config.in
+@@ -161,7 +161,6 @@
+ fi;;
+ *)
+ case " $af_other_flags " in
+- *\ $i\ *) ;; # already there
+ *) af_other_flags="$af_other_flags $i" ;; # add it to output
+ esac ;;
+ esac
diff --git a/x11-libs/xosd/metadata.xml b/x11-libs/xosd/metadata.xml
new file mode 100644
index 000000000000..a15d7230bf71
--- /dev/null
+++ b/x11-libs/xosd/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer>
+ <email>wired@gentoo.org</email>
+ <name>Alex Alexander</name>
+ </maintainer>
+</pkgmetadata>
diff --git a/x11-libs/xosd/xosd-2.2.14-r1.ebuild b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
new file mode 100644
index 000000000000..57c5b2c8836a
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.2.14-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools
+
+DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display plus binary for sending text from CLI"
+HOMEPAGE="https://sourceforge.net/projects/libxosd/"
+SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
+ mirror://debian/pool/main/x/xosd/${PN}_${PV}-1.diff.gz
+ http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd"
+IUSE="xinerama"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXt
+ media-fonts/font-misc-misc"
+DEPEND="${RDEPEND}
+ xinerama? ( x11-proto/xineramaproto )
+ x11-proto/xextproto
+ x11-proto/xproto
+ virtual/pkgconfig"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-m4.patch
+ epatch "${FILESDIR}"/${P}-makefile.patch
+ epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
+
+ AT_M4DIR="${WORKDIR}/m4" eautoreconf
+}
+
+src_compile() {
+ econf \
+ $(use_enable xinerama)
+ emake || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/x11-libs/xosd/xosd-2.2.14-r2.ebuild b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
new file mode 100644
index 000000000000..f7234df5f064
--- /dev/null
+++ b/x11-libs/xosd/xosd-2.2.14-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+inherit eutils autotools
+
+DESCRIPTION="Library for overlaying text in X-Windows X-On-Screen-Display plus binary for sending text from CLI"
+HOMEPAGE="https://sourceforge.net/projects/libxosd/"
+SRC_URI="mirror://debian/pool/main/x/xosd/${PN}_${PV}.orig.tar.gz
+ mirror://debian/pool/main/x/xosd/${PN}_${PV}-1.diff.gz
+ http://digilander.libero.it/dgp85/gentoo/${PN}-gentoo-m4-1.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
+IUSE="xinerama"
+
+RDEPEND="x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXt
+ media-fonts/font-misc-misc"
+DEPEND="${RDEPEND}
+ xinerama? ( x11-proto/xineramaproto )
+ x11-proto/xextproto
+ x11-proto/xproto
+ virtual/pkgconfig"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+ epatch "${FILESDIR}"/${P}-m4.patch
+ epatch "${FILESDIR}"/${P}-makefile.patch
+ epatch "${DISTDIR}"/${PN}_${PV}-1.diff.gz
+ # bug #286632
+ epatch "${FILESDIR}"/"${PN}"-config-incorrect-dup-filter-fix.patch
+
+ AT_M4DIR="${WORKDIR}/m4" eautoreconf
+}
+
+src_compile() {
+ econf \
+ $(use_enable xinerama)
+ emake || die "emake failed"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install || die
+ dodoc AUTHORS ChangeLog NEWS README TODO
+}
diff --git a/x11-libs/xpa/Manifest b/x11-libs/xpa/Manifest
new file mode 100644
index 000000000000..4f983325ef0a
--- /dev/null
+++ b/x11-libs/xpa/Manifest
@@ -0,0 +1 @@
+DIST xpa-2.1.15.tar.gz 861859 SHA256 ac0e041f9115757fbcbfeb377cb5833544815a70f2b46f6edfbf6d1239ae690a SHA512 62b453eb138197b452fca8d1ded1df97be54bcfbd13a0d5fecafc206c1589913c7d09593247077fb07c8b66a87ac0b22b95dfe74c49f2bd0abb942942fa87ce8 WHIRLPOOL 7dea8b931a1734c216ccfb79604ef5d291e1ea9230bbf0859895ac132ed2ceb7bc8ca13957d2022c34b641e740febf344b44e897faabf5aec9faf5761cf5213f
diff --git a/x11-libs/xpa/files/xpa-2.1.8-makefile.patch b/x11-libs/xpa/files/xpa-2.1.8-makefile.patch
new file mode 100644
index 000000000000..290309662bb5
--- /dev/null
+++ b/x11-libs/xpa/files/xpa-2.1.8-makefile.patch
@@ -0,0 +1,84 @@
+--- Makefile.in.orig 2008-11-03 12:05:33.000000000 +0000
++++ Makefile.in 2008-11-03 12:07:48.000000000 +0000
+@@ -28,6 +28,11 @@
+
+ prefix = @prefix@
+ exec_prefix = @exec_prefix@
++bindir = @bindir@
++libdir = @libdir@
++datadir = @datadir@
++mandir = @mandir@
++includedir = @includedir@
+
+ # The following definition can be set to non-null for special systems
+ # like AFS with replication. It allows the pathnames used for installation
+@@ -37,19 +42,19 @@
+ INSTALL_ROOT =
+
+ # Directory in which to install the .a or .so binary for the XPA library:
+-LIB_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/lib
++LIB_INSTALL_DIR = $(INSTALL_ROOT)$(libdir)
+
+ # Directory in which to install the program wish:
+-BIN_INSTALL_DIR = $(INSTALL_ROOT)$(exec_prefix)/bin
++BIN_INSTALL_DIR = $(INSTALL_ROOT)$(bindir)
+
+ # Directory in which to install the include file xpa.h:
+-INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/include
++INCLUDE_INSTALL_DIR = $(INSTALL_ROOT)$(includedir)
+
+ # Top-level directory for manual entries:
+-MAN_INSTALL_DIR = $(INSTALL_ROOT)$(prefix)/man
++MAN_INSTALL_DIR = $(INSTALL_ROOT)$(mandir)
+
+ # Top-level directory for share entries:
+-MAN_SHARE_DIR = $(INSTALL_ROOT)$(prefix)/share/xpa
++MAN_SHARE_DIR = $(INSTALL_ROOT)$(datadir)/xpa
+
+ # Platform-specific X compiler flags (include file specifications)
+ X_CFLAGS = @X_CFLAGS@
+@@ -175,7 +180,7 @@
+ $(RANLIB) $(LIB)
+
+ shlib: $(LIB)
+- @(rm -rf lib$(PACKAGE).tmp; mkdir lib$(PACKAGE).tmp; \
++ @(rm -rf lib$(PACKAGE).tmp; mkdir -p lib$(PACKAGE).tmp; \
+ (cd lib$(PACKAGE).tmp && ar x ../lib$(PACKAGE).a); \
+ rm -f lib$(PACKAGE).tmp/xt*.o; \
+ rm -f lib$(PACKAGE).tmp/tcl*.o; \
+@@ -184,7 +189,7 @@
+ rm -rf lib$(PACKAGE).tmp)
+
+ tclxpa: $(LIB)
+- @(rm -rf libtclxpa.tmp; mkdir libtclxpa.tmp; \
++ @(rm -rf libtclxpa.tmp; mkdir -p libtclxpa.tmp; \
+ (cd libtclxpa.tmp && ar x ../lib$(PACKAGE).a); \
+ rm -f libtclxpa.tmp/xt*.o; \
+ CC='$(CC)' CXX=$(CXX) \
+@@ -259,7 +264,7 @@
+ do \
+ if [ ! -d $$i ] ; then \
+ echo "Making directory $$i"; \
+- mkdir $$i; \
++ mkdir -p $$i; \
+ chmod 755 $$i; \
+ else true; \
+ fi; \
+@@ -281,7 +286,7 @@
+ install-man:
+ @if [ ! -d $(MAN_INSTALL_DIR) ] ; then \
+ echo "Making directory $(MAN_INSTALL_DIR)"; \
+- mkdir $(MAN_INSTALL_DIR); \
++ mkdir -p $(MAN_INSTALL_DIR); \
+ chmod 755 $(MAN_INSTALL_DIR); \
+ else true; \
+ fi;
+@@ -292,7 +297,7 @@
+ M="$(MAN_INSTALL_DIR)/man$$E"; \
+ if [ ! -d $$M ] ; then \
+ echo "Making directory $$M"; \
+- mkdir $$M; \
++ mkdir -p $$M; \
+ chmod 755 $$M; \
+ else true; \
+ fi; \
diff --git a/x11-libs/xpa/metadata.xml b/x11-libs/xpa/metadata.xml
new file mode 100644
index 000000000000..4bab88844f54
--- /dev/null
+++ b/x11-libs/xpa/metadata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>sci</herd>
+ <longdescription lang="en">
+ The XPA messaging system provides seamless communication between many
+ kinds of Unix programs, including X programs and Tcl/Tk programs.
+ It also provides an easy way for users to communicate with these
+ XPA-enabled programs by executing XPA client commands in the shell or
+ by utilizing such commands in scripts. Because XPA works both at the
+ programming level and the shell level, it is a powerful tool for
+ unifying any analysis environment: users and programmers have great
+ flexibility in choosing the best level or levels at which to access
+ XPA services, and client access can be extended or modified easily
+ at any time.
+</longdescription>
+</pkgmetadata>
diff --git a/x11-libs/xpa/xpa-2.1.15.ebuild b/x11-libs/xpa/xpa-2.1.15.ebuild
new file mode 100644
index 000000000000..92dffa93be42
--- /dev/null
+++ b/x11-libs/xpa/xpa-2.1.15.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils autotools
+
+DESCRIPTION="Messaging system providing communication between programs"
+HOMEPAGE="http://hea-www.harvard.edu/RD/xpa/"
+SRC_URI="http://hea-www.harvard.edu/saord/download/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc static-libs"
+
+RDEPEND="
+ dev-lang/tcl:0=
+ x11-libs/libXt
+ !<sci-astronomy/ds9-5.3"
+DEPEND="${RDEPEND}"
+
+src_prepare() {
+ epatch "${FILESDIR}"/${PN}-2.1.8-makefile.patch
+ sed -i -e "s:\${LINK}:\${LINK} ${LDFLAGS}:" mklib || die
+ eautoconf
+}
+
+src_configure() {
+ econf \
+ --enable-shared \
+ --enable-threaded-xpans \
+ --with-x \
+ --with-tcl \
+ --with-threads
+}
+
+src_compile() {
+ emake shlib tclxpa
+}
+
+src_install () {
+ dodir /usr/$(get_libdir)
+ emake INSTALL_ROOT="${D}" install
+ insinto /usr/$(get_libdir)/tclxpa
+ doins pkgIndex.tcl
+ mv "${ED}"/usr/$(get_libdir)/libtclxpa* \
+ "${ED}"/usr/$(get_libdir)/tclxpa/ || die
+ dodoc README
+ use doc && dodoc doc/*.pdf && dohtml doc/*.html
+ # build system so crappy not worth patching to a non respondant upstream
+ # and builds static with PIC
+ use static-libs || rm -f "${ED}"/usr/$(get_libdir)/*.a
+}
diff --git a/x11-libs/xpyb/Manifest b/x11-libs/xpyb/Manifest
new file mode 100644
index 000000000000..a35e4d1d142c
--- /dev/null
+++ b/x11-libs/xpyb/Manifest
@@ -0,0 +1 @@
+DIST xpyb-1.3.1.tar.bz2 273962 SHA256 fd4c877b05b83893043734a678eca332c6cabf1867d9b6a966c28a97ac987366 SHA512 f3020f9b9d27ae522408d22cbdb14c9eb3d4acbc911e6f8fac425323c3f99233f773c3c4e027aa3812dec11b832cf0df8a38f71d21b0c3a1918eea6efe36c090 WHIRLPOOL 8cb9289125bd6860590c86eeaaddadde32452cdbc64c63f3f82c85ac627378da203f3e1b6331a213e3a17eed3d0d179d1ba5f6279bf613a7cca870a242f81fab
diff --git a/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch
new file mode 100644
index 000000000000..1196741b3cbe
--- /dev/null
+++ b/x11-libs/xpyb/files/xpyb-1.3.1-xcbproto-1.9.patch
@@ -0,0 +1,11 @@
+diff -ruN xpyb-1.3.1_ORIG/src/py_client.py xpyb-1.3.1/src/py_client.py
+--- xpyb-1.3.1_ORIG/src/py_client.py 2013-11-17 12:57:05.157530931 +0100
++++ xpyb-1.3.1/src/py_client.py 2013-11-17 12:57:52.221530100 +0100
+@@ -19,6 +19,7 @@
+ 'INT8': 'b', 'int8_t': 'b',
+ 'INT16': 'h', 'int16_t': 'h',
+ 'INT32': 'i', 'int32_t': 'i',
++ 'INT64': 'i', 'int64_t': 'i',
+ 'BYTE': 'B',
+ 'BOOL': 'B',
+ 'char': 'b',
diff --git a/x11-libs/xpyb/files/xpyb-python.patch b/x11-libs/xpyb/files/xpyb-python.patch
new file mode 100644
index 000000000000..4d5d9ac72956
--- /dev/null
+++ b/x11-libs/xpyb/files/xpyb-python.patch
@@ -0,0 +1,12 @@
+--- xpyb-1.3.1/configure.ac.orig 2013-05-21 19:01:51.054962821 +0400
++++ xpyb-1.3.1/configure.ac 2013-05-21 19:05:22.342961464 +0400
+@@ -38,7 +38,8 @@
+
+ # Find the xcbgen Python package
+ AC_MSG_CHECKING([for xcb-proto python dir])
+-XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`
++XCBPROTO_XCBPYTHONDIR=`$PYTHON -c 'import xcbgen; from os.path import dirname, abspath, join; \
++ print abspath(join(dirname(xcbgen.[__file__]), ".."))'`
+ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
+ AC_SUBST(XCBPROTO_XCBPYTHONDIR)
+
diff --git a/x11-libs/xpyb/metadata.xml b/x11-libs/xpyb/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/xpyb/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-libs/xpyb/xpyb-1.3.1-r2.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r2.ebuild
new file mode 100644
index 000000000000..c563aa3c8b1e
--- /dev/null
+++ b/x11-libs/xpyb/xpyb-1.3.1-r2.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 )
+AUTOTOOLS_AUTORECONF=1
+
+inherit flag-o-matic xorg-2 python-r1
+
+#EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/xpyb"
+SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+DESCRIPTION="XCB-based Python bindings for the X Window System"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="selinux"
+
+RDEPEND=">=x11-libs/libxcb-1.7
+ >=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}]
+ <x11-proto/xcb-proto-1.9
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+PATCHES=( "${FILESDIR}"/${PN}-python.patch )
+DOCS=( NEWS README )
+
+pkg_setup() {
+ xorg-2_pkg_setup
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable selinux)
+ )
+}
+
+src_configure() {
+ append-cflags -fno-strict-aliasing
+ python_foreach_impl xorg-2_src_configure
+}
+
+src_compile() {
+ python_foreach_impl xorg-2_src_compile
+}
+
+src_install() {
+ python_foreach_impl xorg-2_src_install
+}
diff --git a/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
new file mode 100644
index 000000000000..bba57549f3df
--- /dev/null
+++ b/x11-libs/xpyb/xpyb-1.3.1-r3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF=1
+
+inherit flag-o-matic xorg-2 python-r1
+
+#EGIT_REPO_URI="git://anongit.freedesktop.org/git/xcb/xpyb"
+SRC_URI="http://xcb.freedesktop.org/dist/${P}.tar.bz2"
+DESCRIPTION="XCB-based Python bindings for the X Window System"
+HOMEPAGE="http://xcb.freedesktop.org/"
+
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="selinux"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND=">=x11-libs/libxcb-1.7
+ >=x11-proto/xcb-proto-1.7.1[${PYTHON_USEDEP}]
+ ${PYTHON_DEPS}"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-python.patch
+ "${FILESDIR}"/${PN}-1.3.1-xcbproto-1.9.patch
+)
+DOCS=( NEWS README )
+
+pkg_setup() {
+ xorg-2_pkg_setup
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable selinux)
+ )
+}
+
+src_configure() {
+ append-cflags -fno-strict-aliasing
+ python_foreach_impl xorg-2_src_configure
+}
+
+src_compile() {
+ python_foreach_impl xorg-2_src_compile
+}
+
+src_install() {
+ python_foreach_impl xorg-2_src_install
+}
diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest
new file mode 100644
index 000000000000..1ac42df5bbf8
--- /dev/null
+++ b/x11-libs/xtrans/Manifest
@@ -0,0 +1,3 @@
+DIST xtrans-1.3.3.tar.bz2 177244 SHA256 622db4adce224581a44fbe41321bbb0bdc0c78aec586ba83548f1f1c6e8a09bf SHA512 9db9464f8e9f1b48e5b8953e764fce7dc0e454c50c794c7871023380f6881b7e9d2e754831c906000c18467a7946d67c86eb4574f11175f8dc27b53599af01b5 WHIRLPOOL 6413999c16f6fe14bec5436249df941ec4ac91a45dd5e7c33a4b04ceaadb1c9c9923930768a525b3574f63638c05b35e0543e07ba9699d862d460cdee5cec02c
+DIST xtrans-1.3.4.tar.bz2 182341 SHA256 054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a SHA512 0bdf6f120d9a7f5cf39e53e81fd3a6e41ee5949931cb05119261fbfd26c32c7793358ed353f20c8a9efb12897c936f0eca3e63891b4f3b4a3eea3652913715d5 WHIRLPOOL 070ff0a8f12c7469d5307126d41c939b5e201be933e436195c687f87d8092b5be957fda14efbde5b93d3878c91f2fe96b4dde2be73fdf25891aae99af8bf1596
+DIST xtrans-1.3.5.tar.bz2 186833 SHA256 adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301 SHA512 049fb996313e8a1625b66e1645a5f56d8a26c5dd91afe5869269716fce05f6c97c84f8ce4a6df2057106b47982c8291cecc223bef241f694174434c981a7029b WHIRLPOOL 69cbdb9c329a6302c7dcc284d86c7f548f371e90cd1d360e56377fa60e0ce1631f720dc9fa62b457ebab673c99712a2d0f9f54edeb9fa0728a21d4b21b83aba0
diff --git a/x11-libs/xtrans/metadata.xml b/x11-libs/xtrans/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/xtrans/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-libs/xtrans/xtrans-1.3.3.ebuild b/x11-libs/xtrans/xtrans-1.3.3.ebuild
new file mode 100644
index 000000000000..536d97524c53
--- /dev/null
+++ b/x11-libs/xtrans/xtrans-1.3.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_PACKAGE_NAME="lib${PN}"
+# this package just installs some .c and .h files, no libraries
+XORG_STATIC=no
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org xtrans library"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+}
diff --git a/x11-libs/xtrans/xtrans-1.3.4.ebuild b/x11-libs/xtrans/xtrans-1.3.4.ebuild
new file mode 100644
index 000000000000..8b06933b111e
--- /dev/null
+++ b/x11-libs/xtrans/xtrans-1.3.4.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_PACKAGE_NAME="lib${PN}"
+# this package just installs some .c and .h files, no libraries
+XORG_STATIC=no
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org xtrans library"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xtrans/xtrans-1.3.5.ebuild b/x11-libs/xtrans/xtrans-1.3.5.ebuild
new file mode 100644
index 000000000000..82646daa6af4
--- /dev/null
+++ b/x11-libs/xtrans/xtrans-1.3.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+XORG_PACKAGE_NAME="lib${PN}"
+# this package just installs some .c and .h files, no libraries
+XORG_STATIC=no
+XORG_DOC=doc
+inherit xorg-2
+
+DESCRIPTION="X.Org xtrans library"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable doc docs)
+ $(use_with doc xmlto)
+ --without-fop
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-libs/xvba-video/Manifest b/x11-libs/xvba-video/Manifest
new file mode 100644
index 000000000000..819cf84c6df5
--- /dev/null
+++ b/x11-libs/xvba-video/Manifest
@@ -0,0 +1 @@
+DIST xvba-driver-0.8.0.tar.bz2 80424 SHA256 bd56e64c619732956fe3e900520a704de90c1849f0b0e0ab6b8db5ff695d38a2 SHA512 1e968f6123c5563f5dfc1f01cd2b7ed9b3f6afa9cf93b50b2079b1408670f6048f8d6b6d47c1ebbad1defc3600788ddf85a93bee772d90e05a8769ff19e2425b WHIRLPOOL df19706f84c17c6141e9a3cacec230012767b8fb06117477b95ed4b511b52321e9092455d927ff4147b1a951aea234d35575758fd69ba577ade131fb27d79da1
diff --git a/x11-libs/xvba-video/files/xvba-video-0.8.0-VAEncH264VUIBufferType.patch b/x11-libs/xvba-video/files/xvba-video-0.8.0-VAEncH264VUIBufferType.patch
new file mode 100644
index 000000000000..3542d4ee6d19
--- /dev/null
+++ b/x11-libs/xvba-video/files/xvba-video-0.8.0-VAEncH264VUIBufferType.patch
@@ -0,0 +1,12 @@
+diff -ur a/src/xvba_dump.c b/src/xvba_dump.c
+--- a/src/xvba_dump.c 2012-11-23 14:29:10.000000000 +0100
++++ b/src/xvba_dump.c 2014-03-03 18:53:08.772012251 +0100
+@@ -150,8 +150,6 @@
+ _(VAEncSequenceParameterBufferType);
+ _(VAEncPictureParameterBufferType);
+ _(VAEncSliceParameterBufferType);
+- _(VAEncH264VUIBufferType);
+- _(VAEncH264SEIBufferType);
+ #endif
+ #undef _
+ }
diff --git a/x11-libs/xvba-video/files/xvba-video-0.8.0-assert-hw_image_hooks_glx.patch b/x11-libs/xvba-video/files/xvba-video-0.8.0-assert-hw_image_hooks_glx.patch
new file mode 100644
index 000000000000..7cb249a16f48
--- /dev/null
+++ b/x11-libs/xvba-video/files/xvba-video-0.8.0-assert-hw_image_hooks_glx.patch
@@ -0,0 +1,12 @@
+diff -ur xvba-video-0.8.0/src/xvba_image.c xvba-video-0.8.0-patched/src/xvba_image.c
+--- xvba-video-0.8.0/src/xvba_image.c 2011-06-14 13:07:13.000000000 +0200
++++ xvba-video-0.8.0-patched/src/xvba_image.c 2012-07-22 14:55:14.186667413 +0200
+@@ -423,7 +423,7 @@
+ }
+
+ #if USE_GLX
+-const HWImageHooks hw_image_hooks_glx attribute_hidden;
++extern const HWImageHooks hw_image_hooks_glx attribute_hidden;
+ #endif
+
+ // Commit image to the HW
diff --git a/x11-libs/xvba-video/files/xvba-video-fix-mesa-gl.h.patch b/x11-libs/xvba-video/files/xvba-video-fix-mesa-gl.h.patch
new file mode 100644
index 000000000000..578d3321d92d
--- /dev/null
+++ b/x11-libs/xvba-video/files/xvba-video-fix-mesa-gl.h.patch
@@ -0,0 +1,17 @@
+diff -urN xvba-driver-0.8.0.old/src/utils_glx.h xvba-driver-0.8.0/src/utils_glx.h
+--- xvba-driver-0.8.0.old/src/utils_glx.h 2013-02-04 20:04:00.476332874 +0100
++++ xvba-driver-0.8.0/src/utils_glx.h 2013-02-04 20:04:40.228329931 +0100
+@@ -25,6 +25,13 @@
+ #include <GL/glext.h>
+ #include <GL/glx.h>
+
++
++#if GL_GLEXT_VERSION >= 85
++/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
++ block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
++ Redefine the type here as an interim solution */
++typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
++#endif
+ #ifndef GL_FRAMEBUFFER_BINDING
+ #define GL_FRAMEBUFFER_BINDING GL_FRAMEBUFFER_BINDING_EXT
+ #endif
diff --git a/x11-libs/xvba-video/files/xvba-video-fix-out-of-source-builds.patch b/x11-libs/xvba-video/files/xvba-video-fix-out-of-source-builds.patch
new file mode 100644
index 000000000000..23de8559a07a
--- /dev/null
+++ b/x11-libs/xvba-video/files/xvba-video-fix-out-of-source-builds.patch
@@ -0,0 +1,11 @@
+--- src/shaders/Makefile.am 2012-11-23 08:29:10.000000000 -0500
++++ src/shaders/Makefile.am.new 2014-01-30 18:38:27.954753460 -0500
+@@ -25,7 +25,7 @@
+ CLEANFILES += $(shaders_h)
+
+ %.h: %.pso pso2h.py
+- $(PYTHON) pso2h.py -n $*_fp -o $@ $<
++ $(PYTHON) $(top_srcdir)/src/shaders/pso2h.py -n $*_fp -o $@ $<
+ endif
+
+ # Only add those targets if the Cg compiler is available
diff --git a/x11-libs/xvba-video/metadata.xml b/x11-libs/xvba-video/metadata.xml
new file mode 100644
index 000000000000..01c4c004e735
--- /dev/null
+++ b/x11-libs/xvba-video/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-libs/xvba-video/xvba-video-0.8.0-r3.ebuild b/x11-libs/xvba-video/xvba-video-0.8.0-r3.ebuild
new file mode 100644
index 000000000000..0c3eba57de0a
--- /dev/null
+++ b/x11-libs/xvba-video/xvba-video-0.8.0-r3.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/xvba-driver"
+[[ ${PV} = 9999 ]] && inherit git-2
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF="yes"
+inherit eutils autotools-multilib python-any-r1
+
+DESCRIPTION="XVBA Backend for Video Acceleration (VA) API"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+SRC_URI="http://dev.gentooexperimental.org/~scarabeus/xvba-driver-${PV}.tar.bz2"
+# No source release yet, the src_uri is theoretical at best right now
+#[[ ${PV} = 9999 ]] || SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+# newline is needed for broken ekeyword
+[[ ${PV} = 9999 ]] || \
+KEYWORDS="amd64 x86"
+IUSE="debug opengl"
+
+RDEPEND=">=x11-libs/libva-1.2.1-r1[X(+),opengl?,${MULTILIB_USEDEP}]
+ >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}]"
+DEPEND="${DEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ x11-drivers/ati-drivers"
+
+DOCS=( NEWS README AUTHORS )
+PATCHES=(
+ "${FILESDIR}"/${PN}-fix-mesa-gl.h.patch
+ "${FILESDIR}"/${PN}-fix-out-of-source-builds.patch
+ "${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch
+ "${FILESDIR}"/${P}-assert-hw_image_hooks_glx.patch
+)
+
+S="${WORKDIR}/xvba-driver-${PV}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # bug 469208
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable opengl glx)
+ )
+ autotools-utils_src_configure
+}
diff --git a/x11-libs/xvba-video/xvba-video-9999.ebuild b/x11-libs/xvba-video/xvba-video-9999.ebuild
new file mode 100644
index 000000000000..6d66fbbf8cc3
--- /dev/null
+++ b/x11-libs/xvba-video/xvba-video-9999.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/vaapi/xvba-driver"
+[[ ${PV} = 9999 ]] && inherit git-2
+PYTHON_COMPAT=( python2_7 )
+AUTOTOOLS_AUTORECONF="yes"
+inherit eutils autotools-multilib python-any-r1
+
+DESCRIPTION="XVBA Backend for Video Acceleration (VA) API"
+HOMEPAGE="http://www.freedesktop.org/wiki/Software/vaapi"
+# No source release yet, the src_uri is theoretical at best right now
+[[ ${PV} = 9999 ]] || SRC_URI="http://www.freedesktop.org/software/vaapi/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2+ MIT"
+SLOT="0"
+# newline is needed for broken ekeyword
+[[ ${PV} = 9999 ]] || \
+KEYWORDS="~amd64 ~x86"
+IUSE="debug opengl"
+
+RDEPEND=">=x11-libs/libva-1.2.1-r1[X(+),opengl?,${MULTILIB_USEDEP}]
+ >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}]
+ x11-drivers/ati-drivers"
+DEPEND="${DEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig"
+
+DOCS=( NEWS README AUTHORS )
+PATCHES=(
+ "${FILESDIR}"/${PN}-fix-mesa-gl.h.patch
+ "${FILESDIR}"/${PN}-fix-out-of-source-builds.patch
+ "${FILESDIR}"/${P}-VAEncH264VUIBufferType.patch
+ "${FILESDIR}"/${P}-assert-hw_image_hooks_glx.patch
+)
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ # bug 469208
+ sed -i 's/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/g' configure.ac || die
+ autotools-multilib_src_prepare
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ $(use_enable debug)
+ $(use_enable opengl glx)
+ )
+ autotools-utils_src_configure
+}