Convert to multilib and stack it for medialibs r11.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 61 insertions, 6 deletions

diff --git a/dev-libs/fribidi/ChangeLog b/dev-libs/fribidi/ChangeLog
index 728f407ca92f..5ba7a26c961c 100644
--- a/dev-libs/fribidi/ChangeLog
+++ b/dev-libs/fribidi/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/fribidi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.80 2013/02/03 12:13:52 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/ChangeLog,v 1.81 2013/08/10 22:08:07 aballier Exp $
+
+*fribidi-0.19.5-r2 (10 Aug 2013)
+
+  10 Aug 2013; Alexis Ballier <aballier@gentoo.org> +fribidi-0.19.5-r2.ebuild:
+  Convert to multilib and stack it for medialibs r11.
 
   03 Feb 2013; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Cleanup due #22900
diff --git a/dev-libs/fribidi/Manifest b/dev-libs/fribidi/Manifest
index ef8de0055b3b..18957bb8e2d7 100644
--- a/dev-libs/fribidi/Manifest
+++ b/dev-libs/fribidi/Manifest
@@ -5,12 +5,13 @@ AUX fribidi-0.19.2-nodoc.patch 326 SHA256 e72ede72adab960ed4b1f436a77511c52ce9c9
 AUX fribidi-0.19.5-signedwarning.patch 617 SHA256 920f334e80b6831bfce797b0b95b7a9bc4861ea66997756293412f70447a257d SHA512 3fa29f77adb19d2da52ff46d39d3da7662edf80d4cde98d87d3827a8b844c2e272408a611d7ef1364f72b78e801ce585a5ff89fe2a85729fa95982c3aecaedd5 WHIRLPOOL 95023548003833e46c4fe02a65900c9a175edd6acf7ffd642b6e87d32c7937b5acb017c85380024b4f253fa1c9d24074790ec2d425a0eb67a7e6c90b8a86911a
 DIST fribidi-0.19.5.tar.bz2 625034 SHA256 501231e4260f83fccedae1cafe983a7de87082e3f5387e0b283d016f7f4cb428 SHA512 0a1216d3ff23f76dd90a1fa5b1eadd1276cfedc07bd636e345df23911d2e23bc3780a5ba2e32f2025b517f7137135fb3de6d337f872932466efe480ece364e43 WHIRLPOOL 5241696a5477f9cd1931213b14a27a21647ccabbaaaa0d2f8112a51efeeb7557b3b614bbb30500cd1ebf17fd4332007c22c42c1667e738dc2a2e94e1c182211a
 EBUILD fribidi-0.19.5-r1.ebuild 1348 SHA256 8dea84dd202f14402b72582cd76954f0ae930bfefddbaf057262e0c808a1ecba SHA512 62eea4309094f1b64d97714462fc41748abe6545b06d7bb9d1107e2df63c657599e630fa37abb7ffc41c7a90ed5d2bba5d93cffaa4e637fa7f19acbd8c63f230 WHIRLPOOL 42ac649924906f4165e8627d104551f2cd02d3f45dbdd4006033518bbabba1d971d1a4593e587eec005f4e3c96be404d40f82bc4e77588df98233169eeb79fd7
-MISC ChangeLog 10309 SHA256 cde90d148859297b85ab8fe664a2909aac198a7a3074b8cc2db3f56cfda3d9ce SHA512 8dc1c808b40fad4929ee604774ea233f8764d7d86829d88eaeabcd0b5a22437e2740a09a780b826a3b1831aa37132e6c7b674d1a34165380e03e2e424bcc2d99 WHIRLPOOL 0eaabba9a1fc7c0b4ca35cafbd954f55d5d4a7b5ff31fafeac13c386e9c750c1afa1a1af2e23e199c5d2fdf0bf9a162a156fe3c8e102b7d99dea2df1e4b29085
+EBUILD fribidi-0.19.5-r2.ebuild 1533 SHA256 c846216327ba287cc779cd6955d4bfdec1a54d80c4d82344c78e687e17c7a95f SHA512 544127ac045470cb8c8d5e730fc0d81dfe52e3d02a1ed797e7c59fad02b22f3d0177ed8c530069e2204de938fe4b8828de9215f98d3db5c07e3a725437023af5 WHIRLPOOL b4e7457852600bfea0854dc80e9befcb4ba6cf113c7f7d64fe38e6e1a430d9c720e7ec19a2ef799bdf4c3fc669a6b90f1c2e787ebf42e063759a8e205e235ae1
+MISC ChangeLog 10480 SHA256 a3de6bbfd252f36241eaadaed064774628d7d64d36f7d16899a37c363e2f13f3 SHA512 d79e52a47ec5c5c28a9a8731a0e848e2d72c2679a98d301d70e96f056ca22dde1d94b8399d2b0c47a4feb8e6a3973aa535903e146fe590c6fe8257d4fd685a72 WHIRLPOOL f43056ae973f6f7e6b4697b418781013d1875936507ee9b1687f533bfed3671a7dca3ca7926026fcf6ac1f32249367a586ea6a10ab622ac6daade10c183d74db
 MISC metadata.xml 210 SHA256 90082fe26a119a63ca8fbe227f66c33ba74167b6cf28e2cef02dea6c4f656c39 SHA512 4554adeece55ce9adfdadba04443a3ede6ff910b96a11b77bb1f07ddd6bdbc756b8e6e1873660f8f54e67f46db1065980794a6136c6de7883b24d0ee13ff51fe WHIRLPOOL f546bd1233d5a9934ba0480881ceba944cb8ff1869c12ed2421d4ccbb247ee38dc0c7c8b979f10533ad0fc603b5e4829d0ddf174a83d0bda8e8dd62c1c873eeb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlEOVIEACgkQCaWpQKGI+9TuPQCeOz2NViVoOc9t8nwyxmkW47dJ
-so0AoIJ2yuLDp8aXDdqsB0Y5QrcTlqC/
-=/TTt
+iEYEAREIAAYFAlIGucgACgkQvFcC4BYPU0oRwgCeN+9YK5PnqTF2hoFbgQh8gtjP
+WjQAoJ5oBtjTAyooPrYE4pGha+edC4HL
+=o9Pv
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/fribidi/fribidi-0.19.5-r2.ebuild b/dev-libs/fribidi/fribidi-0.19.5-r2.ebuild
new file mode 100644
index 000000000000..dc9d7445582c
--- /dev/null
+++ b/dev-libs/fribidi/fribidi-0.19.5-r2.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.5-r2.ebuild,v 1.1 2013/08/10 22:08:07 aballier Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools eutils autotools-multilib
+
+DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
+HOMEPAGE="http://fribidi.org/"
+SRC_URI="http://fribidi.org/download/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RESTRICT="test" #397347
+
+RDEPEND=">=dev-libs/glib-2:2[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS NEWS README ChangeLog THANKS TODO )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-0.19.2-nodoc.patch \
+		"${FILESDIR}"/${P}-signedwarning.patch
+
+	# Fix compability with dev-libs/glib >= 2.31
+	sed -i \
+		-e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \
+		-e '/include/s:<glib/gmem.h>:<glib.h>:' \
+		charset/fribidi-char-sets.c lib/mem.h || die
+
+	autotools-multilib_src_prepare
+}
+
+src_configure() {
+	# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
+	# present in /usr/lib/pkgconfig/fribidi.pc
+	local myeconfargs=( --with-glib=yes )
+	autotools-multilib_src_configure
+}