libX11, xorg-proto: upgraded packages to upstream
Upgraded x11-base/xorg-proto to version 2020.1 on amd64
Upgraded x11-libs/libX11 to version 1.6.11 on amd64
BUG=chromium:1115945
TEST=build_packages
Change-Id: Ie91a2b2b71b9c6381a5b1b407dad254aea48ccb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/2364995
Tested-by: David Riley <davidriley@chromium.org>
Commit-Queue: David Riley <davidriley@chromium.org>
Auto-Submit: David Riley <davidriley@chromium.org>
Reviewed-by: Fergus Dall <sidereal@google.com>
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2018.4 b/metadata/md5-cache/x11-base/xorg-proto-2018.4
deleted file mode 100644
index 9abb6df..0000000
--- a/metadata/md5-cache/x11-base/xorg-proto-2018.4
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install test unpack
-DEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
-DESCRIPTION=X.Org combined protocol headers
-EAPI=6
-HOMEPAGE=https://cgit.freedesktop.org/xorg/proto/xorgproto/
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=!<x11-proto/bigreqsproto-1.1.2-r1 !<x11-proto/compositeproto-0.4.2-r2 !<x11-proto/damageproto-1.2.1-r2 !<x11-proto/dmxproto-2.3.1-r2 !<x11-proto/dri2proto-2.8-r2 !<x11-proto/dri3proto-1.0-r1 !<x11-proto/fixesproto-5.0-r2 !<x11-proto/fontsproto-2.1.3-r1 !<x11-proto/glproto-1.4.17-r2 !<x11-proto/inputproto-2.3.2-r1 !<x11-proto/kbproto-1.0.7-r1 !<x11-proto/presentproto-1.1-r1 !<x11-proto/randrproto-1.5.0-r1 !<x11-proto/recordproto-1.14.2-r2 !<x11-proto/renderproto-0.11.1-r2 !<x11-proto/resourceproto-1.2.0-r1 !<x11-proto/scrnsaverproto-1.2.2-r2 !<x11-proto/trapproto-3.4.3-r1 !<x11-proto/videoproto-2.3.3-r1 !<x11-proto/xcmiscproto-1.2.2-r1 !<x11-proto/xextproto-7.3.0-r1 !<x11-proto/xf86bigfontproto-1.2.0-r2 !<x11-proto/xf86dgaproto-2.1-r3 !<x11-proto/xf86driproto-2.1.1-r2 !<x11-proto/xf86miscproto-0.9.3-r1 !<x11-proto/xf86vidmodeproto-2.3.1-r2 !<x11-proto/xineramaproto-1.2.1-r2 !<x11-proto/xproto-7.0.31-r1 !x11-proto/fontcacheproto !x11-proto/xf86rushproto
-SLOT=0
-SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2018.4.tar.gz
-_eclasses_=meson b5ee7a05833ab91225acf30ffdeed006 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing e32940a7b2a9992ad217eccddb84d548 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 157a6a7a3e99c7dbdf81acc9dd4f57cd toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
-_md5_=d23086e9a5872a66bdb1a53d2c64a27d
diff --git a/metadata/md5-cache/x11-base/xorg-proto-2020.1 b/metadata/md5-cache/x11-base/xorg-proto-2020.1
new file mode 100644
index 0000000..a457c5f
--- /dev/null
+++ b/metadata/md5-cache/x11-base/xorg-proto-2020.1
@@ -0,0 +1,11 @@
+BDEPEND=>=dev-util/meson-0.48.2 >=dev-util/ninja-1.7.2
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=X.Org combined protocol headers
+EAPI=7
+HOMEPAGE=https://gitlab.freedesktop.org/xorg/proto/xorgproto
+KEYWORDS=*
+LICENSE=MIT
+SLOT=0
+SRC_URI=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2020.1.tar.gz
+_eclasses_=meson b5ee7a05833ab91225acf30ffdeed006 multilib 2477ebe553d3e4d2c606191fe6c33602 multiprocessing e32940a7b2a9992ad217eccddb84d548 ninja-utils 132cbb376048d079b5a012f5467c4e7f python-utils-r1 157a6a7a3e99c7dbdf81acc9dd4f57cd toolchain-funcs 605c126bed8d87e4378d5ff1645330cb
+_md5_=243c858f410007973c458eb0eeb8aa9d
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.11 b/metadata/md5-cache/x11-libs/libX11-1.6.11
new file mode 100644
index 0000000..36523b6
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libX11-1.6.11
@@ -0,0 +1,15 @@
+BDEPEND=test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) virtual/pkgconfig doc? ( doc? ( || ( app-text/asciidoc dev-ruby/asciidoctor ) app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<x11-base/xorg-proto-2019.2 x11-base/xorg-proto x11-libs/xtrans !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=X.Org X11 library
+EAPI=7
+HOMEPAGE=https://www.x.org/wiki/ https://gitlab.freedesktop.org/xorg/lib/libX11
+IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
+KEYWORDS=*
+LICENSE=MIT
+RDEPEND=>=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] !<x11-base/xorg-proto-2019.2
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.x.org/releases/individual/lib/libX11-1.6.11.tar.bz2
+_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 1979aa0ff4d356d32507ca4650d9f37d multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xorg-3 8cad61092536d3b5fcfc558b8c5d44cc
+_md5_=894b19c7a3496b582ae85245dfdaa0f4
diff --git a/metadata/md5-cache/x11-libs/libX11-1.6.6 b/metadata/md5-cache/x11-libs/libX11-1.6.6
deleted file mode 100644
index 81bc49e..0000000
--- a/metadata/md5-cache/x11-libs/libX11-1.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-libs/xtrans test? ( dev-lang/perl ) >=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 x86-interix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) ppc-aix? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) x86-winnt? ( >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 ) >=sys-devel/libtool-2.2.6a sys-devel/m4 >=x11-misc/util-macros-1.18 >=media-fonts/font-util-1.2.0 virtual/pkgconfig doc? ( doc? ( app-text/asciidoc app-text/xmlto app-doc/doxygen app-text/docbook-xml-dtd:4.1.2 app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.3 ) )
-DESCRIPTION=X.Org X11 library
-EAPI=5
-HOMEPAGE=http://xorg.freedesktop.org/
-IUSE=ipv6 test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 abi_arm_32 abi_arm_64 static-libs doc
-KEYWORDS=*
-LICENSE=MIT
-RDEPEND=x11-base/xorg-proto >=x11-libs/libxcb-1.11.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,abi_arm_32(-)?,abi_arm_64(-)?] x11-libs/xtrans abi_x86_32? ( !app-emulation/emul-linux-x86-xlibs[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://xorg.freedesktop.org/releases/individual/lib/libX11-1.6.6.tar.bz2
-_eclasses_=autotools d0e5375d47f4c809f406eb892e531513 autotools-multilib 037c4046d25f29e78dd44dccabd5d66b autotools-utils 3727db64c7b960903d5033280f108080 eutils 06133990e861be0fe60c2b428fd025d9 flag-o-matic 5d5921a298e95441da2f85be419894c0 libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib 2477ebe553d3e4d2c606191fe6c33602 multilib-build 1979aa0ff4d356d32507ca4650d9f37d multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs 605c126bed8d87e4378d5ff1645330cb xorg-2 50dd640df6d0554c259daa81531ed3ee
-_md5_=507931659f320015e22ad2afe6e54d22
diff --git a/x11-base/xorg-proto/Manifest b/x11-base/xorg-proto/Manifest
index 239705b..c916712 100644
--- a/x11-base/xorg-proto/Manifest
+++ b/x11-base/xorg-proto/Manifest
@@ -1 +1 @@
-DIST xorgproto-2018.4.tar.gz 493597 SHA256 8e48d851efea0e951bcb6cf0d537f84ba3803de95e488bd039fe59fc75ec8f7d SHA512 f79a47fc3de04d7258769869c11e99eff7fa4a4b5925cf60f9f7579f946d7d0e737224e9a54d18e439a3586126e66e0764c0f09ed50987c781955b9b9a1e0362 WHIRLPOOL 8465c1e1fa7b1271a87a3cc779e1e3785a38f86bf4b1d58b35db7c87ad0cd01d32d62dae1c5357d7c42cb4054793657b871306cdb1dc03faf895d73d5f64555d
+DIST xorgproto-2020.1.tar.gz 1081369 BLAKE2B 1bed8d65499926a830180ee1fce5e5e57a276a6412231508eabb6c5eea5ee20dcce4046fc82203d5be88d1f24fb7919289393551d339e5cf5cb80b1c14f22c42 SHA512 d0bc3aec517fd00fa5fd32a5715760c34810a19154e10fb1f92f2e2fe7f26136f7ba9b76b47fcd37c3c4796663154f4e5abf6a18dd634619b0f718f3e4737ae9
diff --git a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild b/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
deleted file mode 100644
index 0f081d6..0000000
--- a/x11-base/xorg-proto/xorg-proto-2018.4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PN="${PN/xorg-/xorg}"
-MY_P="${MY_PN}-${PV}"
-
-EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/proto/${MY_PN}"
-
-if [[ ${PV} = 9999* ]]; then
- GIT_ECLASS="git-r3"
-fi
-
-inherit ${GIT_ECLASS} meson
-
-DESCRIPTION="X.Org combined protocol headers"
-HOMEPAGE="https://cgit.freedesktop.org/xorg/proto/xorgproto/"
-if [[ ${PV} = 9999* ]]; then
- SRC_URI=""
-else
- KEYWORDS="*"
- SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- !<x11-proto/bigreqsproto-1.1.2-r1
- !<x11-proto/compositeproto-0.4.2-r2
- !<x11-proto/damageproto-1.2.1-r2
- !<x11-proto/dmxproto-2.3.1-r2
- !<x11-proto/dri2proto-2.8-r2
- !<x11-proto/dri3proto-1.0-r1
- !<x11-proto/fixesproto-5.0-r2
- !<x11-proto/fontsproto-2.1.3-r1
- !<x11-proto/glproto-1.4.17-r2
- !<x11-proto/inputproto-2.3.2-r1
- !<x11-proto/kbproto-1.0.7-r1
- !<x11-proto/presentproto-1.1-r1
- !<x11-proto/randrproto-1.5.0-r1
- !<x11-proto/recordproto-1.14.2-r2
- !<x11-proto/renderproto-0.11.1-r2
- !<x11-proto/resourceproto-1.2.0-r1
- !<x11-proto/scrnsaverproto-1.2.2-r2
- !<x11-proto/trapproto-3.4.3-r1
- !<x11-proto/videoproto-2.3.3-r1
- !<x11-proto/xcmiscproto-1.2.2-r1
- !<x11-proto/xextproto-7.3.0-r1
- !<x11-proto/xf86bigfontproto-1.2.0-r2
- !<x11-proto/xf86dgaproto-2.1-r3
- !<x11-proto/xf86driproto-2.1.1-r2
- !<x11-proto/xf86miscproto-0.9.3-r1
- !<x11-proto/xf86vidmodeproto-2.3.1-r2
- !<x11-proto/xineramaproto-1.2.1-r2
- !<x11-proto/xproto-7.0.31-r1
-
- !x11-proto/fontcacheproto
- !x11-proto/xf86rushproto"
-
-src_unpack() {
- default
- [[ $PV = 9999* ]] && git-r3_src_unpack
-}
diff --git a/x11-base/xorg-proto/xorg-proto-2020.1.ebuild b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
new file mode 100644
index 0000000..c822e78
--- /dev/null
+++ b/x11-base/xorg-proto/xorg-proto-2020.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="${PN/xorg-/xorg}"
+MY_P="${MY_PN}-${PV}"
+
+EGIT_REPO_URI="https://gitlab.freedesktop.org/xorg/proto/${MY_PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} meson
+
+DESCRIPTION="X.Org combined protocol headers"
+HOMEPAGE="https://gitlab.freedesktop.org/xorg/proto/xorgproto"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ KEYWORDS="*"
+ SRC_URI="https://xorg.freedesktop.org/archive/individual/proto/${MY_P}.tar.gz"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 2972ad1..b0ba9d9 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -1 +1 @@
-DIST libX11-1.6.6.tar.bz2 2342730 SHA256 65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f SHA512 9866dc6b158b15a96efe140b6fa68a775889a37e5565a126216211fee63868e02629a9f9f41816d590ef150560f43b8864010a77a6318c9109e76aec1d21b4d7 WHIRLPOOL 11294d7b01cb649cd57411c4e45728131bcb26450359ca3de47d9f29373355f843b38b553e8f6ccf820dba424b3920f0b3709a0cccafc1c23ba2e8767f5921d8
+DIST libX11-1.6.11.tar.bz2 2389687 BLAKE2B 996cd32d4d408b15c400fa9472cba884513d78d278282434a85983171f7b3205ed1eb720fa39e49668e036cbbe06523c29c6cb49895f4465fc5f8cecb9a6237f SHA512 2cb4e215c1e3ccb327e02586844f8c426068536a0f472a39f12191feace607f61a6a08586f03758248199678c2f6897a984b0f1222bc0d68fd2e02702f4ce0bf
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
deleted file mode 100644
index c854e0b..0000000
--- a/x11-libs/libX11/files/libX11-1.1.4-aix-pthread.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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
deleted file mode 100644
index a7926a5..0000000
--- a/x11-libs/libX11/files/libX11-1.1.5-solaris.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
deleted file mode 100644
index 4539f11..0000000
--- a/x11-libs/libX11/files/libX11-1.1.5-winnt-private.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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.11.ebuild b/x11-libs/libX11/libX11-1.6.11.ebuild
new file mode 100644
index 0000000..179e57c
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.6.11.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+inherit toolchain-funcs xorg-3
+
+DESCRIPTION="X.Org X11 library"
+
+KEYWORDS="*"
+IUSE="ipv6 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND=">=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
+ !<x11-base/xorg-proto-2019.2"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto
+ x11-libs/xtrans"
+BDEPEND="test? ( dev-lang/perl )"
+
+pkg_setup() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_with doc xmlto)
+ $(use_enable doc specs)
+ $(use_enable ipv6)
+ --without-fop
+ CPP="$(tc-getPROG CPP cpp)"
+ )
+}
diff --git a/x11-libs/libX11/libX11-1.6.6.ebuild b/x11-libs/libX11/libX11-1.6.6.ebuild
deleted file mode 100644
index 6d23b81..0000000
--- a/x11-libs/libX11/libX11-1.6.6.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-XORG_DOC=doc
-XORG_EAUTORECONF=yes
-XORG_MULTILIB=yes
-inherit xorg-2 toolchain-funcs
-
-DESCRIPTION="X.Org X11 library"
-
-KEYWORDS="*"
-IUSE="ipv6 test"
-
-RDEPEND="x11-base/xorg-proto
- >=x11-libs/libxcb-1.11.1[${MULTILIB_USEDEP}]
- x11-libs/xtrans"
-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
-}
