Enable multilib.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0x9627F456F9DA7643!

3 files changed, 79 insertions, 5 deletions

diff --git a/x11-libs/libX11/ChangeLog b/x11-libs/libX11/ChangeLog
index 43b4a66d2243..1df63085b377 100644
--- a/x11-libs/libX11/ChangeLog
+++ b/x11-libs/libX11/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libX11
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.202 2013/02/22 18:08:38 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/ChangeLog,v 1.203 2013/02/25 23:17:14 mgorny Exp $
+
+*libX11-1.5.0-r1 (25 Feb 2013)
+
+  25 Feb 2013; Michał Górny <mgorny@gentoo.org> +libX11-1.5.0-r1.ebuild:
+  Enable multilib.
 
   22 Feb 2013; Zac Medico <zmedico@gentoo.org> libX11-1.5.0.ebuild:
   Add ~arm-linux keyword.
diff --git a/x11-libs/libX11/Manifest b/x11-libs/libX11/Manifest
index 396dd7423fd7..8822236608b4 100644
--- a/x11-libs/libX11/Manifest
+++ b/x11-libs/libX11/Manifest
@@ -11,13 +11,26 @@ DIST libX11-1.5.0.tar.bz2 2322265 SHA256 c382efd7e92bfc3cef39a4b7f1ecf2744ba4414
 EBUILD libX11-1.4.1.ebuild 1436 SHA256 095f6e1772f2fef52ba1f489f224348955a95ce229488da7bb89722c85045b45 SHA512 706dce3d7b60de36214ab33bc3271824728b67f93e00792d6d07683e95dfceedc1fe10145e32503060472a3ca3e3eac0d9bb909364ba6f7ec995448132a895f4 WHIRLPOOL 6176474e34549ece58e8f1454d4f03175d5f84fc4dbcabedbc73d0922f5b27896b36a31dc7a55d2b77bc5345cbed1669abcd0f92c34c8bf58780924bc9f80c40
 EBUILD libX11-1.4.3.ebuild 1494 SHA256 1f2fd1e6d0ce5c14cf70a00273e25d342e2826aade1273885732547a26348ba2 SHA512 55000776585a350f1a8e723510a0ce631c88c067b781608f0430b07de99894714d7af5c4c170f535281ac71f3cdf2bf5b1f8ca3c43a162109770c0475f42dc4c WHIRLPOOL 5432ea184e2b8e3c9b99ec5e51eaf252e008bed9216cda42b4a4fbc5c699024dbacdd6d4268c0343abf7182bd171e84ab1cfa6cd0a93221ee22fa60cafdfd782
 EBUILD libX11-1.4.4.ebuild 1531 SHA256 91ea601baff404c4789e90b5466a858a0f8fd20ea71ff4899dce553b06a7f076 SHA512 d98e59b8f8edd6a3737a5883dbff46b81998eb48821f31a8c5737c512df0b2a5df2bda58f01b4c4abe53d989fd92925cc44b9506f9ff88589fca53640279ef2e WHIRLPOOL 0d8c96f1d7d0a01619d1248636e2d982688745d450b5610e1203422ee2ffb0c6ff5cb6647c50c818abb3e8ea616b23af2e4184f851886f4626c77f5d55c47d2a
+EBUILD libX11-1.5.0-r1.ebuild 1669 SHA256 30d986be98274d4b380e21062c636cd1077f34d5e129fcd59fbd09da24ab0fca SHA512 906a814536281aafcb43ad3187dd0a12fa149b2bff8691799dcd5db708dbd516ffd0a0998a863319da696eb36d4ae91c34dba5ed22e28bebfb0424009ca78e4a WHIRLPOOL af47407fc79107347adcc59832c7d1152e4462a8c08dc588bbc7836e1e074fb70c0de361b8f17230e8aa8324cc09d292d45ead5ef38a5462b8d7071b0c4ebb24
 EBUILD libX11-1.5.0.ebuild 1518 SHA256 c50146479c32e88d396a71ef734470d928480282a8bd1176ad0c6660306d0273 SHA512 262a22aabcb56a011d5fa961b3a8f8a2017c195229c83cb1fd6d4c057b1c098ace1d62dad0e887c18a15c6b2d6d1f845782c46e80125a7f71e1d191df7ecd8ea WHIRLPOOL b51ff154c29b48153c17b9cfcc16e64790e325e904c0da4a599e6838b4027b5bfe4922cf4a660f4c75c39a3250d49cce8c64146610ff78207d097f5977638f4f
-MISC ChangeLog 26713 SHA256 d1175a2496e745ce5de621980523c2a192a52b806347363035b82dac34a729f4 SHA512 a357ecbe70bc4c71fb7b415201a999ed3245dd913148c9d26689f4c9b44379210334ac6ac9a8b0f9bc37609e5228f2ae7c4dae59534df5d9973c7e349a40ae71 WHIRLPOOL baea0efffc776cff66b6aea7284a5000693c15ac0e48537f6a1ddd1f44cb77db701e94770cbcd904ae20dd4093c648dafc12812d57dc4018cac6ea53c5efd8bf
+MISC ChangeLog 26839 SHA256 f268c82be56591aa4094a5b80742536e59675bf3e6379a1e91a43c42418a680b SHA512 ecb9ab0b58ac60cfdc20839d0c75ede66eded409ab0dc64e29a096a9ef7d3899f2d4d36bdea1e503405e48e6e391fdf6143a76ba35cb9f3bbcf0a23e997bfedd WHIRLPOOL 80a8652af7040b39ad9c412fbf73dc03e215df62634b65ff63ef6577ee58c50666f704802eab2aa25b2c361c250cece1e4b2cb9a4975f3dbaedb429c368c088f
 MISC metadata.xml 156 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 SHA512 daa9bb2a9b1a16220327bc394f10d93a1a8a427bfbed8808cd247c1dfd5a5b87a4945d55d8243e07fede2c8182a208c618ebd483773d77e9d23862ec77016019 WHIRLPOOL 691e028648bb8b60771d74ef718c51fdb0f4a587e984f6ac4c13d7796415ecf770df2e0fd766399091771924bb65995e9bb290baa35971c56e07d76f2bbf6d93
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEntCgACgkQ/ejvha5XGaMwugCgpxu9wDhHpgnmYght23/TQOYS
-E28AoNESeLigEoxprfu730Q1JtgCuJTN
-=ENN2
+iQJ8BAEBCABmBQJRK/ETXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
+NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDDn8P/3Sbn1KbtV/f2/CqI9wxEuGK
+Ih6U70Q9FrGKVJfvemSN1bjq0pmayP0cl5Fj6wX+ZgSWuxf2EEzAy5et9+cKj6w3
+2fZD1O9lUWZbHfrXMshbQUlWWltI9k434FllqfmxXJFZnlKFsfCDyfbgzZ8Bk7Vq
+12RYcjx0XcvgxYiCWvcefgpZgogprurRP+DHbdvUbJjm9u+xP+c4Mfx2LI+iKNWR
+LEFbJbmyJoiN3+3+nC/b1FWL3un1Dcy0GbrWAheuI/dZe71AUF38Kv6PS6xqDTxd
+D+e6j2u1sgpLcy7MxT8b7UGMd2lgjwsbGQoOCcVnlVy5FeiWNyDVio87QP4IYIU/
+6ch2J9LccicneNIHYa+zqjK4I5bIeU5Mnd5CcfVWwvgetIl+aJQzqdB33qEzvKAi
+bSxuPFbNmBYvdz/blaCy6jvDeTZuCZinurMEQGNxqGaN0crQQx6BlBOTmP38P91O
+f33tDn2Sbtx/j6KEaWRoVmm646GlMtsE2avrSrd0/PPWSlI/Io2TUV9pUVTs9hKG
+1xGrqtT72TpZ9TN++8YYKYj7J1D+QjIlGLWysYoC1K4ksNRye3P6MiuAjmcVh9YM
+Bh6I9nqZkTKSSKgErG1o19ttIZYdO72eb0XgZAzKxtxA1T7D3kwUb0HOoabsy43z
+6KFKgbrbiHtC+UhoY0Aw
+=P982
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libX11/libX11-1.5.0-r1.ebuild b/x11-libs/libX11/libX11-1.5.0-r1.ebuild
new file mode 100644
index 000000000000..3196f925b695
--- /dev/null
+++ b/x11-libs/libX11/libX11-1.5.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libX11/libX11-1.5.0-r1.ebuild,v 1.1 2013/02/25 23:17:14 mgorny Exp $
+
+EAPI=5
+
+XORG_DOC=doc
+XORG_MULTILIB=yes
+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 ~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.8.1[${MULTILIB_USEDEP}]
+	x11-libs/xtrans
+	>=x11-proto/xproto-7.0.17[${MULTILIB_USEDEP}]
+	x11-proto/xf86bigfontproto[${MULTILIB_USEDEP}]
+	x11-proto/inputproto[${MULTILIB_USEDEP}]
+	x11-proto/kbproto[${MULTILIB_USEDEP}]
+	x11-proto/xextproto[${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
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_with doc xmlto)
+		$(use_enable doc specs)
+		$(use_enable ipv6)
+		--without-fop
+	)
+}
+
+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'
+	if tc-is-cross-compiler; then
+		(
+			filter-flags -m*
+			emake -C "${AUTOTOOLS_BUILD_DIR}"/src/util CC=$(tc-getBUILD_CC) CFLAGS="${CFLAGS}" LDFLAGS="" clean all || die
+		)
+	fi
+	xorg-2_src_compile
+}