add multilib support and make build verbose

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

3 files changed, 84 insertions, 17 deletions

diff --git a/media-libs/xvid/ChangeLog b/media-libs/xvid/ChangeLog
index 16f16428f14e..c2e93a5a35f3 100644
--- a/media-libs/xvid/ChangeLog
+++ b/media-libs/xvid/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/xvid
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.134 2012/09/11 06:57:39 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/ChangeLog,v 1.135 2013/06/19 15:51:41 aballier Exp $
+
+*xvid-1.3.2-r1 (19 Jun 2013)
+
+  19 Jun 2013; Alexis Ballier <aballier@gentoo.org> +xvid-1.3.2-r1.ebuild:
+  add multilib support and make build verbose
 
   11 Sep 2012; Mike Frysinger <vapier@gentoo.org> xvid-1.3.2.ebuild:
   Disable assembly code for x32 ABI for now #421841 by Xavier Miller.
diff --git a/media-libs/xvid/Manifest b/media-libs/xvid/Manifest
index 78aa64bee9fb..d0f6b8d32b91 100644
--- a/media-libs/xvid/Manifest
+++ b/media-libs/xvid/Manifest
@@ -7,23 +7,14 @@ DIST xvidcore-1.3.1.tar.bz2 710007 SHA256 c51ae8449b04fd8c8d5e15546d5e7c022d7201
 DIST xvidcore-1.3.2.tar.bz2 697038 SHA256 d6c11334e1e771f9e4722eff454762325fd0989f6a4217abca296d6770160bf4 SHA512 0b7725314abc1dbe1f0ba4700393c391b8f98589300051ad7ebc5bdef7e87b20f19dcc88c37afbc1dfa117b6c8c1d5051b8f8d263c419e6965c5bc5f0201dc97 WHIRLPOOL c9e3f1a99544fe5b2394afc9adee3764565572b7b7fb46e2c92500d13851a8225b3e8b8e0db280a37aba72ff978e11a8c9f80d3a65b27f682087b1308f506dfa
 EBUILD xvid-1.2.2-r2.ebuild 1483 SHA256 c6ff1d32b53ce1c24b592829dc5037d3b1cc9e64b3ed550dcd85396a7ddaf0fd SHA512 2182a8c97d419285a52dc626c90f1384ade37459ba41ff2f4a1eceb947ddaab1167a0a89b48d92274cdc6dda76d0ec2182ef35432f7ec25d359d22df2400f08c WHIRLPOOL 6134b17950d34ca2f6f485ac70d892cc4d28d6770d736900bc42dfedc9ad5cffb87e2a15af6d76c513a5d444e68d0ec5805d19db808f414e948e316d4bd63664
 EBUILD xvid-1.3.1.ebuild 1330 SHA256 efbe0f233d0779b1bc99ca76a49f35331aa1c3d09f55134168add9b6573da21e SHA512 97db9a283ab6030be8421e15cca403dd5584a3a3c1ea6389d06b7689692ba9e60f80417d9b1e3b3b28cf7f37efe29f8f3ff2f1974ec6e4bf4a692410f0087c5f WHIRLPOOL 5a91328bf499be33914872a328476b73d102213535c001e4560d7563b7669ff6a00b8605b05c7e5edb940407d687ed92c40fe088c75853d3ae8dae524bb11e7f
+EBUILD xvid-1.3.2-r1.ebuild 1863 SHA256 d02f259bc261a9e4527bcd689cbe6e7413a441bf86da6ee1bc10b596ccd3ecc7 SHA512 47283e3e42823bddeefa091f6663d92253ab7823dac3ccd66ba81306a1fd73cf6f3b55a24dc10435873e67bcf6e9506df85e4dfc695d055ccefb1835d3ee5088 WHIRLPOOL 596f8a6168838751e8d1c58de4108574ff781017746417b04ce0723519c77c6417cf8e2570d2db17a95e73ed9b18c0f52ae847f24b1369a4a36a822535ba8c19
 EBUILD xvid-1.3.2.ebuild 1407 SHA256 94d8f7fe834e9c510a1d8caa5e7b906b459324f880e8ced4abf162a3fc9ec046 SHA512 701ceff32fa0a811fec700ff2034078d04e0fd5a55107e27759d64c3f506dc2a687d64e3ff2f1efd68934ca4c0486595dbd54b358b58b7e30e4a3c72cd2e0db9 WHIRLPOOL 7f2195e71311cfd61976589debd6e7efaa1e78baa2dbfc90f92c5f5244f14540585ee3ccad96dccde8f00981fd8a9b8ecf50ad3e9c75463a7301d6ba6a0e3221
-MISC ChangeLog 17201 SHA256 6e843da4c5db995f9bda260505c61b832a8c687e2ce139dbdb69f43954a45f77 SHA512 7ebb114ef3d5373e3e41fda3c6c03da62e8e57f2254dcdb13596414cc695038cb4d9d12f9f4ea596c1f3b85b627578e4aaff3ad25d88bdf432b5ea5c40b6b050 WHIRLPOOL 6340796d0d8b0a2b47fb3887af0c6718363072974a8bf9bb1107c417f8c08f2dabbce3f64372469fa805ebd05efcc5755a33ddce9a6e4603a1068602f146450d
+MISC ChangeLog 17355 SHA256 9536dcaf2dcd8823ccdb2095ad476371f948e498427c8d9cb33ff1a0e6f7ebcc SHA512 372921b76569d5212f8dbed1dbbb1ac06182ba3ff3504a85055a958c82c45c60151e75ebc491ac0d48ac0e87efe13db73cbbec7c2d4483736de7484a5be0225e WHIRLPOOL 54879c83c32c3f08db8878f77e039a41546e166556a4e2d823f880bb7aeabe8479a9fedd75444c77e32cafcaa71e63f0fb2e910161a8e4037ec8ef1b01f4a105
 MISC metadata.xml 326 SHA256 44f920b8335d7708c3208af6281abb98d71274f3400ed3538ca469c3846705c9 SHA512 56eb9fa6a5cebf28725a3b0023545cc5c7d1967f63b94358d30f69e08c1837c9129e761108200579f209b9743695999b45ab9c0301e190eadd59bbb17346c42e WHIRLPOOL de611ff8bb19c90f6810575bc79b83cd0116ab70715e7445364236e6ad78f1665fd7a5e33b3a84500b9bd45f853f809dcc98586494f57d743f6bec559ed1ae70
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQTuFvAAoJELEHsLL7fEFWzMYP/jjSw1dzz1chih7RW7+EGCIE
-kq3xYhWL22xOSf2pxSSzuibGEeOjrHgJRN0TbM510V+lQuzcf5I4fu/ofHxszXHt
-U+T9LCJ/m2WesbE5+G5s5jKgZ95Sydo34JydsVoJq14yyqKYNXPKaQcad9XUbrwT
-6Dq037b3r/FYF3iCfNjzDw1kkvqrHZ4jOA80QdQXgt2McyVxUFdvTKC6/Jy+nkc0
-L2aiFvy1a4+4H91IwgmX84EiAM2osuyV0SU+VrexYjer1PPRlfdn5kiOJqK93ywm
-/pYPOsnTnTxkgS5Z/w8hPBcQIxW2FZinuleqtizjSNyn88giwCMSH5Y3sdTwJiB9
-3v3Na18zj3lVVFKUap75Bxnmyi73ZJ1bV13HR/ZN330XysExMR6O/ZIePo0QMaSd
-4sHta3O5olyjp999kmAjkSUahGMVxQI6QI+GcaUsfVTS4tb2WC95tQHLeu+l4+yG
-lrmBlZ5hQgD7EbiTNz+Y5bipEie+ssSTw7SdycaMfDMO7E3r7Bk7/2MLcjJofg1W
-o4WAOOF6Got0ZgOI3Abn9FPdmFhdk99X9tJCPuhjijlDT//EhOgm96ZqWvw5RfYh
-8aUKzgdTdKoD/RobhwkjZSVIPhafJBMgmrx2QHnquDzZLtjAap4rWEmZN7G2UJ9b
-VNgWbAJ8VSUPCl4QYWbi
-=FmJ/
+iEYEAREIAAYFAlHB048ACgkQvFcC4BYPU0r9cwCfcgv80dO+wxjNmH9fu5IeOs4g
+F3UAn2utKdSdNMJ8qJm96zuM7bhGSr64
+=MUTY
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xvid/xvid-1.3.2-r1.ebuild b/media-libs/xvid/xvid-1.3.2-r1.ebuild
new file mode 100644
index 000000000000..05eeb14c4721
--- /dev/null
+++ b/media-libs/xvid/xvid-1.3.2-r1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xvid/xvid-1.3.2-r1.ebuild,v 1.1 2013/06/19 15:51:41 aballier Exp $
+
+EAPI=5
+inherit flag-o-matic multilib multilib-minimal
+
+MY_PN=${PN}core
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="XviD, a high performance/quality MPEG-4 video de-/encoding solution"
+HOMEPAGE="http://www.xvid.org/"
+SRC_URI="http://downloads.xvid.org/downloads/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="examples +threads pic"
+
+NASM=">=dev-lang/nasm-2"
+YASM=">=dev-lang/yasm-1"
+
+DEPEND="amd64? ( || ( ${YASM} ${NASM} ) )
+	x86? ( || ( ${YASM} ${NASM} ) )
+	x86-fbsd? ( || ( ${YASM} ${NASM} ) )"
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224 )"
+
+S=${WORKDIR}/${MY_PN}/build/generic
+
+src_prepare() {
+	# make build verbose
+	sed \
+		-e 's/@$(CC)/$(CC)/' \
+		-e 's/@$(AS)/$(AS)/' \
+		-e 's/@$(RM)/$(RM)/' \
+		-e 's/@$(INSTALL)/$(INSTALL)/' \
+		-e 's/@cd/cd/' \
+		-i Makefile || die
+	# Since only the build system is in $S, this will only copy it but not the
+	# entire sources.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	use sparc && append-cflags -mno-vis #357149
+
+	local myconf
+	if use pic || [[ ${ABI} == "x32" ]] ; then #421841
+		myconf="--disable-assembly"
+	fi
+
+	econf ${myconf} \
+		$(use_enable threads pthread)
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	local mylib=$(basename $(ls "${D}"/usr/$(get_libdir)/libxvidcore.so*))
+	dosym ${mylib} /usr/$(get_libdir)/libxvidcore.so
+	dosym ${mylib} /usr/$(get_libdir)/${mylib%.?}
+}
+
+multilib_src_install_all() {
+	dodoc "${S}"/../../{AUTHORS,ChangeLog*,CodingStyle,README,TODO}
+
+	if use examples; then
+		insinto /usr/share/${PN}
+		doins -r "${S}"/../../examples
+	fi
+}