Migrate to multilib, modernize -9999 ebuild and slat it for medialibs-r5.

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

8 files changed, 191 insertions, 57 deletions

diff --git a/media-libs/libdvdnav/ChangeLog b/media-libs/libdvdnav/ChangeLog
index 38de2cef0e8a..609a2fd6d252 100644
--- a/media-libs/libdvdnav/ChangeLog
+++ b/media-libs/libdvdnav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libdvdnav
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.70 2012/05/17 14:37:58 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/ChangeLog,v 1.71 2013/07/30 12:48:13 aballier Exp $
+
+*libdvdnav-4.2.0-r1 (30 Jul 2013)
+
+  30 Jul 2013; Alexis Ballier <aballier@gentoo.org> +libdvdnav-4.2.0-r1.ebuild,
+  libdvdnav-9999.ebuild:
+  Migrate to multilib, modernize -9999 ebuild and slat it for medialibs-r5.
 
   17 May 2012; Alexis Ballier <aballier@gentoo.org> libdvdnav-4.2.0.ebuild:
   keyword ~amd64-fbsd
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index 854a2a0bbb2c..a50597991803 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
-AUX libdvdnav-4.2.0-pkgconfig.patch 1967 RMD160 154fa8ca08b95e5433e8c99fde29727702599a0e SHA1 2b9e37d2754e80002e58f5ebfcf1135d549f3e8a SHA256 7cafbb8c9d0dc5c49ad785eb992a076d64146d90d0b4b8d231f6aa3a4d47d5df
-DIST libdvdnav-4.2.0.tar.bz2 111575 RMD160 1e957554173feae3bdf1fdd6a83c2a64a2550683 SHA1 ded45d985576169ae3630d8be7179a2323bc0f6f SHA256 8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550
-EBUILD libdvdnav-4.2.0.ebuild 1013 RMD160 b82abd4cfb9615795245b6a0d1ad5a74431f66a0 SHA1 39212ae6a1b5d865dbfc1f091373b0bb444d01b8 SHA256 8ccd921d25d1ea823e6e94029e238e7a5cec14cbf66265ceb6cd41ca8e7a712a
-EBUILD libdvdnav-9999.ebuild 880 RMD160 4833c256f99284aa10b1af33563e3868ac4139ae SHA1 84f55514269608d1de072341e70b2a772625162c SHA256 a5498102e763e33dfc80b4cb013a19535b0aca39529d2d3eec8505535b69aff0
-MISC ChangeLog 9061 RMD160 8f39f9cd79de86555f083488fc4b22a296266c3d SHA1 3cadb108e207a4bf9b998b316176e76250a7ed87 SHA256 9f7630735bdb42da50d31bc4d8db5c27baa96ee4908082772111388cb410c49f
-MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
+AUX libdvdnav-4.2.0-pkgconfig.patch 1967 SHA256 7cafbb8c9d0dc5c49ad785eb992a076d64146d90d0b4b8d231f6aa3a4d47d5df SHA512 c2a29a9948b2a93f0cc3198227c8e0a555231e22893bf9bb987e931cbc7a89074fad9ca65c0a7c342f05304855204157b5c6da436ede8512188be1c6351a707a WHIRLPOOL f96aedf10d66309488654fbf7b7be887bec35574d5855acb03d073bb62a4a144a1f64a8bbfbece17d3e050a7d6b94262f7778be270c787e09100466701d34460
+DIST libdvdnav-4.2.0.tar.bz2 111575 SHA256 8c971b08276c89ddcecd26fc44204460fd250dc57346f03476d3077188c47550 SHA512 f9b9c52af870bc088bc8bbc7a64285dc55906dcfd11d6849d8a7b4046b083472c3e898609ec399a45059e10cffce0ef67ec2dec2ec4f0a1c904b9b6d2a85185f WHIRLPOOL d0521b33689e7d666afaccb374c02fa5be558601f3c9670b84a28774f1f1a7ec8154f2a339bb73f369213891a163fa8b1a0e918ac3a462a41f7c8cd239a10d78
+EBUILD libdvdnav-4.2.0-r1.ebuild 1442 SHA256 2fb4bcbc27c8f27ee8fd4ceb0b319ef81b264e144a34c12cfb76b36b9c9a90c4 SHA512 8bdce4f477f16d4cd32685f359e08f85d0be6657182338853b11ad58610e0ddcd31c744db179cee32ba6ee22ee4fecc01e76842b914c9e36845a396a16760a52 WHIRLPOOL 1c72357983ed30f34a8936f408fc2ec9e3b7f7dbffffc338dcce16831737cbcf560cdf6ac3eda47a082b030f5bc1583e7b101cc482af8b2bd633e7490e5cc66c
+EBUILD libdvdnav-4.2.0.ebuild 1013 SHA256 8ccd921d25d1ea823e6e94029e238e7a5cec14cbf66265ceb6cd41ca8e7a712a SHA512 1c0c7a43ad2c8b2b08e3ed9f3bfe1353823a1af6210318125e395fe684f370b1c6443c0ec0637aedc6d05259c5b1cc30bbbc5cf56d20ed90b16b75f3d156f96e WHIRLPOOL cc04395d661853dfe74f72933cb0acf0c35b8f86509639f6e8d24954da313758c15bb9a46eeb4d9540aa58814c6f9ca7facc2328b6e17edf4d734e6bf4836972
+EBUILD libdvdnav-9999.ebuild 1438 SHA256 f75ca43026443cbca4b1fbcd3495088aabdee70685ff01ed5190d023a924bd4b SHA512 4dbfd2030cb38dc714edfc73ef6e9a8dd0a0013576d8cc55c4f403fcf853e5f8f928b2757665d8c26401842cd7c1cf866cfdda35114960f24177aece07a135ce WHIRLPOOL 7197a966e7ce5689e05e95e8ab0ca9e3705d60c3bbf201ff4fe2280394164c853d5130e5016572c48a1137023d5a33b5ee964758d5d3afb0bc526e85a5ae2609
+MISC ChangeLog 9278 SHA256 66aec2502562338af67d3b63bd15c736501a534d56a69486a9baeed756dac4db SHA512 88bb55bc832d7c8630a39c3023d7dde89be37aca9148b7ee2a9ec0d4741ec5681e7248f1c8837a0354c71170b819bc5d74fc430f300f7802f09d424967c61acd WHIRLPOOL a0a4ca4770b8e1c2d5e06c2f74b4e6104b96b4c1cc3d771cea2631b3438964f9e96469221bd0070ef233bff43b340d50c7d0482627097aee2ad949fb740b8cb2
+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)
 
-iEYEARECAAYFAk+1DUsACgkQvFcC4BYPU0qoWwCgxPN/YkLvkcAcEQFEvgqHvOpA
-bpQAnRyhqhJPJP652WBpSRg+A75TZobg
-=7+DF
+iEYEAREIAAYFAlH3tg4ACgkQvFcC4BYPU0o0xgCdHLM4Uevn+JTJSzCcwcSIuNbH
+F7oAn0RHBQRV5I86ddW90JMfRlJ3RWbh
+=1Zhm
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libdvdnav/libdvdnav-4.2.0-r1.ebuild b/media-libs/libdvdnav/libdvdnav-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..05bb75819a43
--- /dev/null
+++ b/media-libs/libdvdnav/libdvdnav-4.2.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-4.2.0-r1.ebuild,v 1.1 2013/07/30 12:48:13 aballier Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="subversion"
+	ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav"
+	ESVN_PROJECT="libdvdnav"
+	SRC_URI=""
+else
+	SRC_URI="http://dvdnav.mplayerhq.hu/releases/${P}.tar.bz2"
+fi
+
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="Library for DVD navigation tools"
+HOMEPAGE="http://dvdnav.mplayerhq.hu/"
+
+LICENSE="GPL-2"
+SLOT="0"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS=""
+fi
+IUSE=""
+RDEPEND=">=media-libs/libdvdread-4.2[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
+
+DOCS=( AUTHORS ChangeLog DEVELOPMENT-POLICY.txt doc/dvd_structures NEWS README TODO )
+
+PATCHES=( "${FILESDIR}"/${PN}-4.2.0-pkgconfig.patch )
+
+src_prepare() {
+	[ "${PV#9999}" != "${PV}" ] && subversion_src_prepare
+	autotools-multilib_src_prepare
+}
diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild
index 158e03d0f582..87042dab5ced 100644
--- a/media-libs/libdvdnav/libdvdnav-9999.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild
@@ -1,36 +1,47 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-9999.ebuild,v 1.7 2012/05/15 17:03:16 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdnav/libdvdnav-9999.ebuild,v 1.8 2013/07/30 12:48:13 aballier Exp $
 
-EAPI=4
-WANT_AUTOCONF=2.5
+EAPI=5
 
-inherit autotools eutils subversion
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="subversion"
+	ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav"
+	ESVN_PROJECT="libdvdnav"
+	SRC_URI=""
+else
+	SRC_URI="http://dvdnav.mplayerhq.hu/releases/${P}.tar.bz2"
+fi
+
+inherit autotools-multilib ${SCM}
 
 DESCRIPTION="Library for DVD navigation tools"
 HOMEPAGE="http://dvdnav.mplayerhq.hu/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS=""
+fi
 IUSE=""
-
-RDEPEND=">=media-libs/libdvdread-${PV}"
+RDEPEND=">=media-libs/libdvdread-4.2[${MULTILIB_USEDEP}]
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391
 
-DOCS=( AUTHORS DEVELOPMENT-POLICY.txt ChangeLog TODO doc/dvd_structures README )
+DOCS=( AUTHORS ChangeLog DEVELOPMENT-POLICY.txt doc/dvd_structures NEWS README TODO )
 
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdnav"
-ESVN_PROJECT="libdvdnav"
+PATCHES=( "${FILESDIR}"/${PN}-4.2.0-pkgconfig.patch )
 
 src_prepare() {
-	subversion_src_prepare
-	epatch "${FILESDIR}"/${PN}-4.2.0-pkgconfig.patch
-	eautoreconf
-}
-
-src_install() {
-	default
-	rm -f "${ED}"usr/lib*/${PN}*.la
+	[ "${PV#9999}" != "${PV}" ] && subversion_src_prepare
+	autotools-multilib_src_prepare
 }
diff --git a/media-libs/libdvdread/ChangeLog b/media-libs/libdvdread/ChangeLog
index 8a846e895dd4..a20805e93d3b 100644
--- a/media-libs/libdvdread/ChangeLog
+++ b/media-libs/libdvdread/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libdvdread
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/ChangeLog,v 1.87 2012/07/26 20:09:07 grobian Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/ChangeLog,v 1.88 2013/07/30 12:48:06 aballier Exp $
+
+*libdvdread-4.2.0-r1 (30 Jul 2013)
+
+  30 Jul 2013; Alexis Ballier <aballier@gentoo.org>
+  +libdvdread-4.2.0-r1.ebuild, libdvdread-9999.ebuild:
+  Migrate to multilib, modernize -9999 ebuild and slat it for medialibs-r5.
 
   26 Jul 2012; Fabian Groffen <grobian@gentoo.org> libdvdread-4.2.0.ebuild:
   Marked ~x64-macos
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index e52a9af56a93..280e89986301 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -2,14 +2,15 @@
 Hash: SHA256
 
 DIST libdvdread-4.2.0.tar.bz2 97469 SHA256 0bea15da842a4b04a482b009d72dcc6d9c9524ccc1bf67e5748319ec5ada8097 SHA512 192802a05f4b6561bd3d85ea54a29861d98ec947a5eeaa45a8d53389744c31570ee5dbdf3fbd0645ea8e6b254795e39d0948d54849dad99252155db00501b21f WHIRLPOOL cc693a27d268bfd5bc8376c3d8990439782d943d6bb20d1b49acda442ffc79de88edface937aa69de20785686cb30c5464771c5e642f8e4286e027e25bb74e5c
+EBUILD libdvdread-4.2.0-r1.ebuild 1351 SHA256 1d6e13ac2984784398ca9ffee76f3892aaf72949c49b623176fa3db3a23ec721 SHA512 a6f49ee8bb6b7ae9b12e99d590ab7475d7e9ccedc15a249d250cfa1c4e15a4977895c2da0179ef405f5b753f00bf765fe5eb8dce947e73c0e1f6acf71c18d81f WHIRLPOOL dc74b7475d584dedb265744d46d1b3d470f3b4ad3b45129d755d8a61c92492bce49776c79564abccef39afb19f16f110f1b272b5391e8ba0e57046aac6102779
 EBUILD libdvdread-4.2.0.ebuild 933 SHA256 54a83682e77c8a6ae3180b5a68dcddc60b760ed2f70cdb3c9bee59939f7b4b0f SHA512 ba1e3e9d207e97d2a8d71d43419aa4a906df5169d59ad03be6407d17370fb840f0eb14f83becce63a7b60fe97bd749073e682864a67bb511e88bc498c1e18024 WHIRLPOOL 843e9942daa416c56e22639281e57b7495626c18cf51fdb5eea2494dede8a330a70c2504690f5ab1eca5e6b3ec2a170873c5da108ba5f486c847f451057ce857
-EBUILD libdvdread-9999.ebuild 719 SHA256 2f494eef8b2843caab1d11f13d88b035739503b384dcbade3bef8f81498d9e72 SHA512 3f60e786e77ee381112610f14de2525b30e4f803c2446cccb650800e3000c04d301dfccc6419ed304a707a5a1bccaa1f62aee9c074588d8f14fb393921b9334e WHIRLPOOL f4bd16894d6367c39375f3610878688ae994fe27f95d6e124669babf27d22fedcc1dc78f5863caa4fd7500963a3f4d6932ed660a623f7d9c09fdabbfd1de4649
-MISC ChangeLog 11151 SHA256 76396fd2f1db3c1df65d0183b09010b1e4254119e7e6ef8502e1c3388e32b1d4 SHA512 9db8e66495fdd2d507f3b67529f5febfd668411295497e5e920a92d1052282b718135e4d93b7d7a3c9e1c356451c4c5f98245a94ff1b138b075f131dc60b75c1 WHIRLPOOL dfb5b3b964de5b52d63b82170714c3892aa6691becf31178855afd3813366f6997c413405ab1a8d12c11b1275ab7e317258267c364985fa1deb3e936da5a03eb
+EBUILD libdvdread-9999.ebuild 1347 SHA256 9e047ffb728568d662f3f53bfdd0654feedbe51ddfd3ea5d6a59ad37d8abc4fc SHA512 b0703378fdd7caf36a493b77c0469502153aa218c8e3ae8368e876a405a11207c6e6dd89d119ef20f313da39a3b70b54f0bdfe34a402b62fa2824162302467e2 WHIRLPOOL 303dfd431d03aa2c1b834b5c7090c1219cd426007acad9bb716543e2504bee72fc86d0de1cd37b638238eab7169ece353c74d5b645ce8e7711c9f2a63dc23cc2
+MISC ChangeLog 11372 SHA256 57a174b83584995bc7461af2da7d084763403b85fb349bd29ea42f8141bb9ba4 SHA512 75c2561ae14649d36394831652db14d505b8c54f084f5876c21c97248d94ec477f51e7c0ef09c4f147d74f0eae5d8f0982535d635e01779015281f6fd58c7293 WHIRLPOOL 3ab38b0a8eb28217b12bff62059035b70be63619979be0228dae0539e50ae89f283bdba52f230ae7fd9266d733151c7cfdb73694aeafc8b18d1ed8909fc12a70
 MISC metadata.xml 225 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 SHA512 79bf53ca11044e2cbddf8ba8c661abd2a6f7602748ef4dc1d1a3447d4f0e5a15a4d69f6e1f60e0f854465097019607a6fe7157906bc41ddfe41fb747de3ca7d6 WHIRLPOOL d257430e16390fc27365e2f58796f0f0b7c2c818f1bae76bb2a13b7971e5d33baa9d8aa33a12605653d05e0c7bd52b020aa96b737c56ac1038c32897c481a12c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (Darwin)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlARo+kACgkQX3X2B8XHTomGKwCePbghTFLhMMbm/3O4y1PR3l+B
-xNcAnRkKa/4T08yI9Y1EbfDTh0qCWEwX
-=+0/V
+iEYEAREIAAYFAlH3tgcACgkQvFcC4BYPU0pGWwCeI4KOeVBMzv1sBZv/XyVUofY1
+5/YAoMiQsRO1RtRYeCT7SS8cN+NNb3Eh
+=k7sy
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libdvdread/libdvdread-4.2.0-r1.ebuild b/media-libs/libdvdread/libdvdread-4.2.0-r1.ebuild
new file mode 100644
index 000000000000..67e97c7b18e6
--- /dev/null
+++ b/media-libs/libdvdread/libdvdread-4.2.0-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/libdvdread-4.2.0-r1.ebuild,v 1.1 2013/07/30 12:48:06 aballier Exp $
+
+EAPI=5
+
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="subversion"
+	ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread"
+	ESVN_PROJECT="libdvdread"
+	SRC_URI=""
+else
+	SRC_URI="http://dvdnav.mplayerhq.hu/releases/${P}.tar.bz2"
+fi
+
+inherit autotools-multilib ${SCM}
+
+DESCRIPTION="Library for DVD navigation tools"
+HOMEPAGE="http://dvdnav.mplayerhq.hu/"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS=""
+fi
+IUSE="+css"
+
+RDEPEND="!<media-libs/libdvdnav-4.2.0
+	css? ( media-libs/libdvdcss[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog DEVELOPMENT-POLICY.txt NEWS TODO README )
+
+src_prepare() {
+	[ "${PV#9999}" != "${PV}" ] && subversion_src_prepare
+	autotools-multilib_src_prepare
+}
diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild
index dca47194d66a..9430032d49c8 100644
--- a/media-libs/libdvdread/libdvdread-9999.ebuild
+++ b/media-libs/libdvdread/libdvdread-9999.ebuild
@@ -1,32 +1,47 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/libdvdread-9999.ebuild,v 1.4 2011/10/10 22:57:36 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libdvdread/libdvdread-9999.ebuild,v 1.5 2013/07/30 12:48:06 aballier Exp $
 
-EAPI=4
-WANT_AUTOCONF=2.5
+EAPI=5
 
-inherit autotools libtool multilib subversion
+AUTOTOOLS_AUTORECONF=1
+AUTOTOOLS_PRUNE_LIBTOOL_FILES=all
+
+SCM=""
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="subversion"
+	ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread"
+	ESVN_PROJECT="libdvdread"
+	SRC_URI=""
+else
+	SRC_URI="http://dvdnav.mplayerhq.hu/releases/${P}.tar.bz2"
+fi
+
+inherit autotools-multilib ${SCM}
 
 DESCRIPTION="Library for DVD navigation tools"
 HOMEPAGE="http://dvdnav.mplayerhq.hu/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
+
+if [ "${PV#9999}" = "${PV}" ] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+else
+	KEYWORDS=""
+fi
 IUSE="+css"
 
-ESVN_REPO_URI="svn://svn.mplayerhq.hu/dvdnav/trunk/libdvdread"
-ESVN_PROJECT="libdvdread"
+RDEPEND="!<media-libs/libdvdnav-4.2.0
+	css? ( media-libs/libdvdcss[${MULTILIB_USEDEP}] )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4
+		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
+DEPEND="${RDEPEND}"
 
-DOCS=( AUTHORS DEVELOPMENT-POLICY.txt ChangeLog TODO README )
+DOCS=( AUTHORS ChangeLog DEVELOPMENT-POLICY.txt NEWS TODO README )
 
 src_prepare() {
-	subversion_src_prepare
-	elibtoolize
-	eautoreconf
-}
-
-src_install() {
-	default
-	rm -f "${ED}"usr/lib*/${PN}.la
+	[ "${PV#9999}" != "${PV}" ] && subversion_src_prepare
+	autotools-multilib_src_prepare
 }