go multilib

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

3 files changed, 99 insertions, 10 deletions

diff --git a/media-libs/libtheora/ChangeLog b/media-libs/libtheora/ChangeLog
index be3b46dfe408..884b8f5caf7f 100644
--- a/media-libs/libtheora/ChangeLog
+++ b/media-libs/libtheora/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libtheora
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.110 2013/04/25 18:54:13 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/ChangeLog,v 1.111 2013/06/27 16:22:31 aballier Exp $
+
+*libtheora-1.1.1-r1 (27 Jun 2013)
+
+  27 Jun 2013; Alexis Ballier <aballier@gentoo.org> +libtheora-1.1.1-r1.ebuild:
+  go multilib
 
   25 Apr 2013; Tim Harder <radhermit@gentoo.org> libtheora-1.1.1.ebuild:
   Fix autoreconf failures with automake-1.13 (bug #467006).
diff --git a/media-libs/libtheora/Manifest b/media-libs/libtheora/Manifest
index a51746de3c79..56537b362c7a 100644
--- a/media-libs/libtheora/Manifest
+++ b/media-libs/libtheora/Manifest
@@ -4,17 +4,14 @@ Hash: SHA256
 AUX libtheora-1.0_beta2-flags.patch 763 SHA256 7efb7aec3e472914ffc0facbdc9769e088e5d69e285254d19f353555ca90c7d6 SHA512 72916c4ed0f9609b84af7c72b35b558ecfb2ed7533739e170ed088e06d0e82a585dcc1185f3c5a5d0644d30901459813b635df2ba951e2290bcd4303cfebc20b WHIRLPOOL 6545f1566ae050c109b786dc7d1a5ee42b4d093fcd4d418ac4e86a51f0ac753f6c9ca2837a43db2dd60623a0c9b1650d0243dcf06bcf7a0eab455856eb08f2ab
 AUX libtheora-1.1.1-libpng16.patch 512 SHA256 e4c9a8dc798c596ed32a2a720020ae27a0e72f5add1a47cb8fadebe0e7180d7e SHA512 856da5da7788863c59c9cb6c4fa102d250e60d6b302a5c118799169bcbc5350ab0bf6798f2ae2586f1d361ff9030d1d715214d8df900d7e1aa4a4e1d58f44276 WHIRLPOOL 51bf5187e103aa9b02240d60e200d545fcbed9ce5850705fff542d69822688694e29e5924de8cc6fd39442baa165a5e0958ebe38d4984d586e14be0f076d315c
 DIST libtheora-1.1.1.tar.bz2 1903175 SHA256 b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc SHA512 9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd WHIRLPOOL deeb71454da7b32e3561ef31925e685170123bb18b0b4963db18cad8c422ede3a8e0a29662dbd45edce51ceca12c7ad5d2fe70f33db0c3a9b1cabe84fb37376b
+EBUILD libtheora-1.1.1-r1.ebuild 2390 SHA256 761c3362dbae4791b4f44848ffb954c20c6d4b1666906dd53f579b31083a62e4 SHA512 d6817b56d914fdc8c0595ee24582584a90faf9884934daf2a3cebf577a281da21e461b6861566e858d6ba96c2d4fa84d60c82f5af520dd59b8fdb292944b285d WHIRLPOOL 7bd8332e60bdf988171be9dbeb1a48b79474510d3299e31e52b3433efa1c1f01f053e61f43e42e01d328f7242146988615940115b8e321ce6cfc89a11f5ff2d7
 EBUILD libtheora-1.1.1.ebuild 1960 SHA256 905477070fbc01671a6cc4d3e00aa2afbc9c7e1d601bb06f167978882cbf064e SHA512 6f5249a60c994010a7ed6753ea72b357e165b6eea68d15d035cf998db4a8c8234040ee8e879abce75306e1e002a43db01556f54bf43111d6fa08d715b6519102 WHIRLPOOL 16e77d1ff3eaff9660d457790eb44f87d3d7d2e3f5ac25d9aeec98c52f2e133a69ae6442ca4d2d529b7046eb6eac42ee968f23339748d20b4772f826f98353bf
-MISC ChangeLog 15559 SHA256 2469a33bb5f59958de04029e0e0c1e3857883ea884e6dabde3dcfd3110fca107 SHA512 b4b19e3964dd4d4bc2f93e217f113b6a1a2d006641562d21708d322d4eeb6d00037785ed90dccff46e050e42031076d93f1bd7ec2523992ef4ca6aba1267e5cd WHIRLPOOL 4b42ff475133cdaf0cace21fe5408d7a87626d4d8c305a0f215ce6b06398ca6ec9639d5033a5d42108ab869a20230fdab6ebd46e83feef86d242a9962fdec8b2
+MISC ChangeLog 15688 SHA256 fafb3496c51f2318f51e51d74826003794c14daa86a749808c0a8dc463ea5e82 SHA512 511e8cb5d8aadd688fada325d651b6b15cce713c9344b26336d0abd820e6dfd3e0607706eddf18cb5acace9687847d350961ef03bac809cecd0711a217164fd0 WHIRLPOOL eb3a1583ec82255546c932e30321e4e1cc90053d136bb9741b440e2bae0a2bebe0bc2b1596e7bb5956f045676ec39df45c207d803bc724a47a729bcd9b1c2618
 MISC metadata.xml 225 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 SHA512 79bf53ca11044e2cbddf8ba8c661abd2a6f7602748ef4dc1d1a3447d4f0e5a15a4d69f6e1f60e0f854465097019607a6fe7157906bc41ddfe41fb747de3ca7d6 WHIRLPOOL d257430e16390fc27365e2f58796f0f0b7c2c818f1bae76bb2a13b7971e5d33baa9d8aa33a12605653d05e0c7bd52b020aa96b737c56ac1038c32897c481a12c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJReXvXAAoJEEqz6FtPBkyjynMH+wTByQPVlYaLHnEyTKNaOJc8
-X8/2n5je2QD63u6QVCtvZ8wgq8muXsrEGoXGwcuZixitARdV/tLUzU3sHohR/ChU
-B3ebwpMY5e0rAg5pOTx2shKMne97NVtI3+yowcadreD4PyTVaK9MMdzvh2deXeD6
-9ubHC0cXjFb9MNgT81nW5zO9SERRysAFQoIQpdKbmJxhUxmD49TxZhz09e0eS6eb
-ZYoLagBZ02HFPi65leX3ssznb3/gReb7ulaKRrm97H/qxBcv2OfNo31vYvyI9B2a
-ET7gHjUtB28RopOKXZYpRgPPVxVjWv+VIGgeXX5EBE9RX+ErhiRMHLFY0mim2/U=
-=qpiM
+iEYEAREIAAYFAlHMZsgACgkQvFcC4BYPU0qw2wCdH55BDKcBBFffT7RtZowtcVv3
+0KgAn1ffZCrWZx/OJIVmA+QXwVonmQ3p
+=UuKw
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libtheora/libtheora-1.1.1-r1.ebuild b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
new file mode 100644
index 000000000000..668f7e3650b8
--- /dev/null
+++ b/media-libs/libtheora/libtheora-1.1.1-r1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libtheora/libtheora-1.1.1-r1.ebuild,v 1.1 2013/06/27 16:22:31 aballier Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic multilib-minimal
+
+DESCRIPTION="The Theora Video Compression Codec"
+HOMEPAGE="http://www.theora.org"
+SRC_URI="http://downloads.xiph.org/releases/theora/${P/_}.tar.bz2"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="doc +encode examples static-libs"
+
+RDEPEND="media-libs/libogg:=[${MULTILIB_USEDEP}]
+	encode? ( media-libs/libvorbis:=[${MULTILIB_USEDEP}] )
+	examples? (
+		media-libs/libpng:0=
+		>=media-libs/libsdl-0.11.0
+		media-libs/libvorbis:=
+		)
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r1
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+REQUIRED_USE="examples? ( encode )" #285895
+
+S=${WORKDIR}/${P/_}
+
+VARTEXFONTS=${T}/fonts
+
+DOCS=( AUTHORS CHANGES README )
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${PN}-1.0_beta2-flags.patch \
+		"${FILESDIR}"/${P}-libpng16.patch #465450
+
+	# bug 467006
+	sed -i "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" configure.ac || die
+
+	AT_M4DIR=m4 eautoreconf
+}
+
+multilib_src_configure() {
+	use x86 && filter-flags -fforce-addr -frename-registers #200549
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+
+	local myconf
+	if [ "${ABI}" = "${DEFAULT_ABI}" ] ; then
+		myconf=" $(use_enable examples)"
+	else
+		# those will be overwritten anyway
+		myconf=" --disable-examples"
+	fi
+
+	# --disable-spec because LaTeX documentation has been prebuilt
+	ECONF_SOURCE="${S}" econf \
+		$(use_enable static-libs static) \
+		--disable-spec \
+		$(use_enable encode) \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="${EPREFIX}"/usr/share/doc/${PF} \
+		install
+
+	if use examples && [ "${ABI}" = "${DEFAULT_ABI}" ]; then
+		if use doc; then
+			insinto /usr/share/doc/${PF}/examples
+			doins examples/*.[ch]
+		fi
+
+		dobin examples/.libs/png2theora
+		for bin in dump_{psnr,video} {encoder,player}_example; do
+			newbin examples/.libs/${bin} theora_${bin}
+		done
+	fi
+
+	prune_libtool_files
+}