Push Gentoo Prefix changes from x11 overlay, as approved

Package-Manager: portage-2.1.9.35/cvs/Linux i686

21 files changed, 257 insertions, 39 deletions

diff --git a/x11-libs/libSM/ChangeLog b/x11-libs/libSM/ChangeLog
index 7cbe9b31eb55..54282ebd5aff 100644
--- a/x11-libs/libSM/ChangeLog
+++ b/x11-libs/libSM/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libSM
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.84 2010/12/31 19:59:19 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/ChangeLog,v 1.85 2011/01/27 16:48:02 darkside Exp $
+
+  27 Jan 2011; Jeremy Olexa <darkside@gentoo.org> libSM-1.2.0.ebuild:
+  Push Gentoo Prefix changes from x11 overlay, as approved
 
   31 Dec 2010; Jeroen Roovers <jer@gentoo.org> libSM-1.2.0.ebuild:
   Stable for HPPA (bug #344827).
diff --git a/x11-libs/libSM/libSM-1.2.0.ebuild b/x11-libs/libSM/libSM-1.2.0.ebuild
index e81adaef503d..dfee00bafaa3 100644
--- a/x11-libs/libSM/libSM-1.2.0.ebuild
+++ b/x11-libs/libSM/libSM-1.2.0.ebuild
@@ -1,21 +1,21 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.7 2010/12/31 19:59:19 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libSM/libSM-1.2.0.ebuild,v 1.8 2011/01/27 16:48:02 darkside Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org SM library"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="doc ipv6 +uuid"
 
 RDEPEND="x11-libs/libICE
 	x11-libs/xtrans
 	x11-proto/xproto
-	!elibc_FreeBSD? (
+	!elibc_FreeBSD? ( !elibc_IRIX? ( !elibc_SunOS? (
 		uuid? ( >=sys-apps/util-linux-2.16 )
-	)"
+	) ) )"
 DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto )"
 
@@ -29,4 +29,14 @@ pkg_setup() {
 		--without-fop"
 	# do not use uuid even if available in libc (like on FreeBSD)
 	use uuid || export ac_cv_func_uuid_create=no
+	# solaris hack
+	if use uuid &&
+		[[ ${CHOST} == *-solaris* ]] &&
+		[[ ! -d ${EROOT}/usr/include/uuid ]] &&
+		[[ -d ${ROOT}/usr/include/uuid ]]
+	then
+		# ${ROOT} is proper here
+		export LIBUUID_CFLAGS="-I${ROOT}/usr/include/uuid"
+		export LIBUUID_LIBS="-luuid"
+	fi
 }
diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index ede367a0cfd3..d4fe3a82f6af 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libX11
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.160 2011/01/15 17:41:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.161 2011/01/27 16:50:29 darkside Exp $
+
+  27 Jan 2011; Jeremy Olexa <darkside@gentoo.org>
+  +files/libX11-1.1.4-aix-pthread.patch, +files/libX11-1.1.5-solaris.patch,
+  +files/libX11-1.1.5-winnt-private.patch, libX11-1.4.1.ebuild:
+  Push Gentoo Prefix changes from x11 overlay, as approved
 
 *libX11-1.4.1 (15 Jan 2011)
 
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.4.1.ebuild b/x11-libs/libX11/libX11-1.4.1.ebuild
index d57b532ac3b2..fe4f5588357d 100644
--- a/x11-libs/libX11/libX11-1.4.1.ebuild
+++ b/x11-libs/libX11/libX11-1.4.1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.1.ebuild,v 1.1 2011/01/15 17:41:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.4.1.ebuild,v 1.2 2011/01/27 16:50:29 darkside Exp $
 
 EAPI=3
 inherit xorg-2 toolchain-funcs flag-o-matic
 
 DESCRIPTION="X.Org X11 library"
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ppc-aix ~x64-freebsd ~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="doc ipv6 test"
 
 RDEPEND=">=x11-libs/libxcb-1.1.92
@@ -21,6 +21,12 @@ DEPEND="${RDEPEND}
 	doc? ( app-text/xmlto )
 	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
+)
+
 pkg_setup() {
 	xorg-2_pkg_setup
 	CONFIGURE_OPTIONS="
@@ -31,6 +37,11 @@ pkg_setup() {
 	"
 }
 
+src_configure() {
+	[[ ${CHOST} == *-interix* ]] && export ac_cv_func_poll=no
+	xorg-2_src_configure
+}
+
 src_compile() {
 	# [Cross-Compile Love] Disable {C,LD}FLAGS and redefine CC= for 'makekeys'
 	( filter-flags -m* ; cd src/util && make CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all)
diff --git a/x11-libs/libXfont/ChangeLog b/x11-libs/libXfont/ChangeLog
index 9710b96b2863..044f97894d0b 100644
--- a/x11-libs/libXfont/ChangeLog
+++ b/x11-libs/libXfont/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libXfont
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.142 2010/12/31 20:04:55 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/ChangeLog,v 1.143 2011/01/27 16:52:22 darkside Exp $
+
+  27 Jan 2011; Jeremy Olexa <darkside@gentoo.org> libXfont-1.4.3.ebuild:
+  Push Gentoo Prefix changes from x11 overlay, as approved
 
   31 Dec 2010; Jeroen Roovers <jer@gentoo.org> libXfont-1.4.3.ebuild:
   Stable for HPPA (bug #344827).
diff --git a/x11-libs/libXfont/libXfont-1.4.3.ebuild b/x11-libs/libXfont/libXfont-1.4.3.ebuild
index 92bdda5aa8b5..12efd4789877 100644
--- a/x11-libs/libXfont/libXfont-1.4.3.ebuild
+++ b/x11-libs/libXfont/libXfont-1.4.3.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.3.ebuild,v 1.7 2010/12/31 20:04:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXfont/libXfont-1.4.3.ebuild,v 1.8 2011/01/27 16:52:22 darkside Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org Xfont library"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc ipv6"
 
 RDEPEND="x11-libs/xtrans
@@ -25,5 +25,6 @@ pkg_setup() {
 		$(use_enable doc devel-docs)
 		$(use_with doc xmlto)
 		--with-bzip2
-		--without-fop"
+		--without-fop
+		--with-encodingsdir=${EPREFIX}/usr/share/fonts/encodings"
 }
diff --git a/x11-libs/libXt/ChangeLog b/x11-libs/libXt/ChangeLog
index e38823126b22..82e49779038f 100644
--- a/x11-libs/libXt/ChangeLog
+++ b/x11-libs/libXt/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libXt
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/ChangeLog,v 1.87 2010/12/31 20:08:09 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/ChangeLog,v 1.88 2011/01/27 16:54:16 darkside Exp $
+
+  27 Jan 2011; Jeremy Olexa <darkside@gentoo.org> libXt-1.0.9.ebuild:
+  Push Gentoo Prefix changes from x11 overlay, as approved
 
   31 Dec 2010; Jeroen Roovers <jer@gentoo.org> libXt-1.0.9.ebuild:
   Stable for HPPA (bug #344827).
diff --git a/x11-libs/libXt/libXt-1.0.9.ebuild b/x11-libs/libXt/libXt-1.0.9.ebuild
index 7420baecfe76..883874455731 100644
--- a/x11-libs/libXt/libXt-1.0.9.ebuild
+++ b/x11-libs/libXt/libXt-1.0.9.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.9.ebuild,v 1.7 2010/12/31 20:08:09 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libXt/libXt-1.0.9.ebuild,v 1.8 2011/01/27 16:54:16 darkside Exp $
 
 EAPI=3
 inherit xorg-2 toolchain-funcs
 
 DESCRIPTION="X.Org Xt library"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="x11-libs/libX11
diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index bcf2020a3967..8f57b561eded 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libdrm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.141 2010/12/31 19:45:31 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.142 2011/01/27 16:55:38 darkside Exp $
+
+  27 Jan 2011; Jeremy Olexa <darkside@gentoo.org>
+  +files/libdrm-2.4.15-solaris.patch, +files/libdrm-2.4.16-solaris.patch,
+  libdrm-2.4.23.ebuild:
+  Push Gentoo Prefix changes from x11 overlay, as approved
 
   31 Dec 2010; Jeroen Roovers <jer@gentoo.org> libdrm-2.4.22.ebuild:
   Stable for HPPA (bug #344827).
diff --git a/x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch
new file mode 100644
index 000000000000..f344f0c75afc
--- /dev/null
+++ b/x11-libs/libdrm/files/libdrm-2.4.15-solaris.patch
@@ -0,0 +1,33 @@
+http://bugs.gentoo.org/show_bug.cgi?id=288064
+
+--- libdrm/nouveau/nouveau_bo.c
++++ libdrm/nouveau/nouveau_bo.c
+@@ -31,6 +31,12 @@
+ #include <sys/mman.h>
+ #include <sys/ioctl.h>
+ 
++/* On solaris unistd.h and stropts.h are needed for ioctl */
++#ifdef __sun
++#include <unistd.h>
++#include <stropts.h>
++#endif
++
+ #include "nouveau_private.h"
+ 
+ int
+--- libdrm/radeon/radeon_bo_gem.c
++++ libdrm/radeon/radeon_bo_gem.c
+@@ -39,6 +39,13 @@
+ #include <sys/mman.h>
+ #include <sys/ioctl.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 "drm.h"
+ #include "radeon_drm.h"
diff --git a/x11-libs/libdrm/files/libdrm-2.4.16-solaris.patch b/x11-libs/libdrm/files/libdrm-2.4.16-solaris.patch
new file mode 100644
index 000000000000..90f9a3de7c6e
--- /dev/null
+++ b/x11-libs/libdrm/files/libdrm-2.4.16-solaris.patch
@@ -0,0 +1,91 @@
+This is a reapply (hopefully in the relevant places) of the original
+patch found here:
+http://www.mail-archive.com/dri-devel@lists.sourceforge.net/msg35327.html
+
+--- libdrm-2.4.16/include/drm/drm.h
++++ libdrm-2.4.16/include/drm/drm.h
+@@ -54,7 +54,11 @@
+ 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 @@
+  * \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 */
+ };
+@@ -375,6 +389,9 @@
+ 	int count;		/**< Length of the buffer list */
+ 	void *virtual;		/**< Mmap'd area in user-virtual */
+ 	struct drm_buf_pub *list;	/**< Buffer information */
++#ifdef __sun
++	int fd;
++#endif
+ };
+ 
+ /**
+--- libdrm-2.4.16/xf86drm.c
++++ libdrm-2.4.16/xf86drm.c
+@@ -967,7 +967,11 @@
+ {
+     drm_map_t map;
+ 
++#ifdef __sun
++    map.handle = handle;
++#else
+     map.handle = (void *)handle;
++#endif
+ 
+     if(drmIoctl(fd, DRM_IOCTL_RM_MAP, &map))
+ 	return -errno;
+@@ -1205,6 +1209,9 @@
+     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;
+ 
+--- libdrm-2.4.16/xf86drm.h
++++ libdrm-2.4.16/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.23.ebuild b/x11-libs/libdrm/libdrm-2.4.23.ebuild
index c5463ee274cb..ef5f2108a179 100644
--- a/x11-libs/libdrm/libdrm-2.4.23.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.23.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.23.ebuild,v 1.1 2010/12/10 19:18:18 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.23.ebuild,v 1.2 2011/01/27 16:55:39 darkside Exp $
 
 EAPI=3
 inherit xorg-2
@@ -15,7 +15,7 @@ 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 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 VIDEO_CARDS="intel nouveau radeon vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
@@ -27,6 +27,11 @@ RESTRICT="test" # see bug #236845
 RDEPEND="dev-libs/libpthread-stubs"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.16-solaris.patch
+	"${FILESDIR}"/${PN}-2.4.15-solaris.patch
+)
+
 pkg_setup() {
 	CONFIGURE_OPTIONS="--enable-udev
 			$(use_enable video_cards_intel intel)
diff --git a/x11-libs/libfontenc/ChangeLog b/x11-libs/libfontenc/ChangeLog
index b52ee63fb449..6462c83c085d 100644
--- a/x11-libs/libfontenc/ChangeLog
+++ b/x11-libs/libfontenc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libfontenc
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/ChangeLog,v 1.60 2010/12/31 20:12:53 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/ChangeLog,v 1.61 2011/01/27 16:57:53 darkside Exp $
+
+  27 Jan 2011; Jeremy Olexa <darkside@gentoo.org> libfontenc-1.1.0.ebuild:
+  Push Gentoo Prefix changes from x11 overlay, as approved
 
   31 Dec 2010; Jeroen Roovers <jer@gentoo.org> libfontenc-1.1.0.ebuild:
   Stable for HPPA (bug #344827).
diff --git a/x11-libs/libfontenc/libfontenc-1.1.0.ebuild b/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
index ecd6a454cb87..c23c4d0e4fed 100644
--- a/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
+++ b/x11-libs/libfontenc/libfontenc-1.1.0.ebuild
@@ -1,15 +1,17 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.1.0.ebuild,v 1.7 2010/12/31 20:12:53 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libfontenc/libfontenc-1.1.0.ebuild,v 1.8 2011/01/27 16:57:53 darkside Exp $
 
 EAPI=3
 inherit xorg-2
 
 DESCRIPTION="X.Org fontenc library"
 
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-libs/zlib
 	x11-proto/xproto"
 DEPEND="${RDEPEND}"
+
+CONFIGURE_OPTIONS="--with-encodingsdir=${EPREFIX}/usr/share/fonts/encodings"
diff --git a/x11-libs/libxcb/ChangeLog b/x11-libs/libxcb/ChangeLog
index 483e3304b0cf..524ee60b12e5 100644
--- a/x11-libs/libxcb/ChangeLog
+++ b/x11-libs/libxcb/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libxcb
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.76 2010/12/31 20:13:45 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/ChangeLog,v 1.77 2011/01/27 16:59:39 darkside Exp $
+
+  27 Jan 2011; Jeremy Olexa <darkside@gentoo.org> libxcb-1.7.ebuild:
+  Push Gentoo Prefix changes from x11 overlay, as approved
 
   31 Dec 2010; Jeroen Roovers <jer@gentoo.org> libxcb-1.7.ebuild:
   Stable for HPPA (bug #344827).
diff --git a/x11-libs/libxcb/libxcb-1.7.ebuild b/x11-libs/libxcb/libxcb-1.7.ebuild
index 27136496b12c..6b608c445ef9 100644
--- a/x11-libs/libxcb/libxcb-1.7.ebuild
+++ b/x11-libs/libxcb/libxcb-1.7.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.7.ebuild,v 1.7 2010/12/31 20:13:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libxcb/libxcb-1.7.ebuild,v 1.8 2011/01/27 16:59:39 darkside Exp $
 
 EAPI=3
 
@@ -12,7 +12,7 @@ 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 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc selinux"
 
 RDEPEND="x11-libs/libXau
diff --git a/x11-libs/pixman/ChangeLog b/x11-libs/pixman/ChangeLog
index 8797308191da..b9aed01b8a09 100644
--- a/x11-libs/pixman/ChangeLog
+++ b/x11-libs/pixman/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/pixman
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.85 2011/01/19 15:03:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/ChangeLog,v 1.86 2011/01/27 17:00:21 darkside Exp $
+
+  27 Jan 2011; Jeremy Olexa <darkside@gentoo.org> pixman-0.20.2.ebuild:
+  Push Gentoo Prefix changes from x11 overlay, as approved
 
 *pixman-0.20.2 (19 Jan 2011)
 
diff --git a/x11-libs/pixman/pixman-0.20.2.ebuild b/x11-libs/pixman/pixman-0.20.2.ebuild
index f5bb67cbc4d5..15ce6dfe5ba1 100644
--- a/x11-libs/pixman/pixman-0.20.2.ebuild
+++ b/x11-libs/pixman/pixman-0.20.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.20.2.ebuild,v 1.1 2011/01/19 15:03:24 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/pixman/pixman-0.20.2.ebuild,v 1.2 2011/01/27 17:00:21 darkside Exp $
 
 EAPI=3
 inherit xorg-2 toolchain-funcs versionator
@@ -8,7 +8,7 @@ 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="altivec mmx sse2"
 
 pkg_setup() {