Restore eyeD3 test dependency and run ./setup.py test again by overriding distutils-r1 src_test()

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

3 files changed, 22 insertions, 13 deletions

diff --git a/media-libs/mutagen/ChangeLog b/media-libs/mutagen/ChangeLog
index a7e21dd5bfeb..e5143d4201bb 100644
--- a/media-libs/mutagen/ChangeLog
+++ b/media-libs/mutagen/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/mutagen
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mutagen/ChangeLog,v 1.92 2013/02/18 14:49:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mutagen/ChangeLog,v 1.93 2013/02/18 15:02:53 ssuominen Exp $
+
+  18 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> mutagen-1.21.ebuild:
+  Restore eyeD3 test dependency and run ./setup.py test again by overriding
+  distutils-r1 src_test()
 
 *mutagen-1.21 (18 Feb 2013)
 
diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index d0f2fcc64cdf..41c43b85d9f3 100644
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -4,17 +4,17 @@ Hash: SHA256
 DIST mutagen-1.20.tar.gz 651649 SHA256 7e56c478de154fdcd00d257ebc77be8718188f1a0db916f51f129b7ca01de6e7 SHA512 7c167dce471dd4ca07f4baaf59a60a7a11d48168ad030138b081324180dbd14233fca1b97fb0911d9c6046bca6d2721d8fa6d7fd98f990ee14b51329cc444bcb WHIRLPOOL 69a1b0886372b7683fdd795d938d53cf64e711a9d1a30d4cedb87c91e9f9dc5b7f8df0ecc048b64fd330a590cb5e271a6174eb5224ba890cdd9159ef5b5d25d6
 DIST mutagen-1.21.tar.gz 795419 SHA256 4dd30af3a291c0a152838f2bbf1d592bf6ede752b11a159cbf84e75815bcc2b5 SHA512 7f1da34969e6e3d399875abd029dce1b1f7446f9a353c20d789fe45bc0f52c6c294ea13754d37886315ba30ef3627b944c3d8665fa3b575cc455d8aa157cf982 WHIRLPOOL 4c2646664e981220748a7f7ac31d24a9f32b8c6d65170b448e6d83d3b43ad0b13e43e33521104ab8e760cbbd0a9fb041de6d23e4ca05185fb7427f82c87e7e8e
 EBUILD mutagen-1.20.ebuild 874 SHA256 64acd75bc380d8f0638177144a9b8f83d114449a8fdd7c0a9ee87d89a165fa48 SHA512 1f99e57e8e1ea1968c9f83a43ca3834d0b8a98dd8f99ff1e3d7cbb6f0f6a3e46a322c8f25713e2a601dd1b1cf44058925bfa337827958e719d51a7a9769cd249 WHIRLPOOL 5de5b42fd97d8732ac2812f9f530183ec486f2338cbbb60a90d7a0bbc3c22dbe9a0018e389dd01be0236112d811ef3b5ac4af511d00136bb2ba37d2020f78846
-EBUILD mutagen-1.21.ebuild 769 SHA256 13f435493a58d7a4e9997a4b89f54582463e8e75c9cc1af70b9ccca6fc17ef0f SHA512 c988bb8814789e780b82e9573cc2e8943a4c511ec8abc78e81af28efc0f261b1a5867b3b25883fbf1e617556ef91169c82d59fd1c83c607916897a24c1cdfb0d WHIRLPOOL f3f2a73459f2eae0a8a2d816f656798d87c139247a0506857bc10a9915273f1a4521c4153c0c6bb15a60dbcdac766d378bc6d4d82c07f18c246685a6d0f30810
-MISC ChangeLog 11207 SHA256 1ed571922111ab68d9912b00f5f79239f36baa5b0fd7989507d8fd313e96ee95 SHA512 81511763c7c59e03f2a77b8b20e1a98bb6000b5d3697c44d9114fe4cee7d45a09776837daff60f7fb301fb6d91ca368ac770e3a91da534a6dff8abd14e54f9b6 WHIRLPOOL 49b281525494fd54ceb76096f1d50269862e33dca2b1512331cb2a333645eaab63bb9fb3300742c68be2a3f52c9f8cd1c7f35c48837c1a0e52626285c76ccb8f
+EBUILD mutagen-1.21.ebuild 796 SHA256 9084c64ba72a0b22d4082f8618abc1b1ce4be53f21a5ea5029e00ebd65974be1 SHA512 df71c8977282f8bd9714adabf7a5648fc3127551598c5d6139c3a07717ccf2f2e3a04906bccc6e0f4bd4fd8a3c9dadb5ce494f16732f845e61559fa83cb7767d WHIRLPOOL 975bb09b02f6fbab84b290fafeabbeb162fc2952ca8a57ab715a65f728f6f3d0e15937687baf3cfe81e41c903d2cc81e1d7162ac766f26eb44eb5420bf9ab356
+MISC ChangeLog 11385 SHA256 544ceea9d6e86228cc70e93666ad2970d971bf312fe75b2a16787b866c2d89af SHA512 470a26c61941f1c90a034eb9ea335b40ce2dd901e8e18dad37c0f45cf7ee95306b1fd588c260301b6a59bff1e00fe9177cfa6e65b04f9305b2a386f434ced3ee WHIRLPOOL 6802e3d0fa8ad7d5a81979bb7f4eb9575a9c84687fbcfa38abc63de836abd7816ca2275389c444828ffaa88614a074daabee18413335c13c785b6440dd962e62
 MISC metadata.xml 236 SHA256 83a8f4921f877d876d20905df47d1bfd3b5f8ff4737830cc6cae1de1fed4f20b SHA512 f630705dff92536d6935ba117712b4ac367e387e00c273f807f39c3167d826e11475987404780250a060c0cb37660b2f63db9adc9be8b38e029220c00acf05ff WHIRLPOOL d62a1fdd032b9d657d9664bdb6d1b3385c48b0da4213297c384ec4a57f4a2b22c0780e13ce0dfa8bd02c7c124b23261e2358c66e81281c2ca2c6119f4ee62ca8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRIj9kAAoJEEdUh39IaPFNQGwIAIoG8+g9FRUkCvS6ZVZQ6GKR
-JAi3ReJrUb2xr9nUFC1nqKZNOKHr3OJoa7mnngHjSg64oAhZqYfiQWvzorqGDIWD
-2IrZ83szOfN6taHM38UmBb1HUtrbrIBPVs3boBlIOTVtAYI+eImDplh9u8jR7Zsh
-uCPGsR0whykF/XnbgzjzUSdKsnfLdt5CEerXxOUZGtxmVaGuo7hulP2vUEqrlYQB
-2CDmcUaOk3hLkS0dq1HfTgTQwFMPFLrGtyLJPgmhwKJ3mGdRN3lD+TdpilTX1r6c
-04DhCm/qtDzZJRhRIh9UwWIS5zplgfGiFZbE3VJ1ByC94A0kDqcaE+TDmahPD0s=
-=BbiU
+iQEcBAEBCAAGBQJRIkKFAAoJEEdUh39IaPFNeYIH/1JwyO6WgdcBwww9mZlz36UE
++e+xaPmFVpYd2PIv0RCBJJOUQyyzYTJbok4DltV4Mf0zpFKQRHcuZNnDnIJUYipV
+l95UZM35Nkk7RCtsc+XIcrGZ9jiMIJPTWSsmXbtKET2o5rbQg9pBJuR6ICLxKSM5
+mV0YLpl7dV4bpkfcpSpCOidqSXMdGLesUfueFiVf6QBKvWE6Qn88Aa6E9R4pif7f
+Jo27kRzDKTLwGBQPRqfJDbhMqfPyBguuw6JmCKDgjrHZAnnoKC6ifUuzDVup12S/
+C1GVRKE/jNkHfpHdswsXQeGjJShSG1RYdlsnhn3ALG7Me6wi0rrnFbPuoseI518=
+=DSov
 -----END PGP SIGNATURE-----
diff --git a/media-libs/mutagen/mutagen-1.21.ebuild b/media-libs/mutagen/mutagen-1.21.ebuild
index bb6b70612255..bcf679c4ef0a 100644
--- a/media-libs/mutagen/mutagen-1.21.ebuild
+++ b/media-libs/mutagen/mutagen-1.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mutagen/mutagen-1.21.ebuild,v 1.1 2013/02/18 14:49:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mutagen/mutagen-1.21.ebuild,v 1.2 2013/02/18 15:02:53 ssuominen Exp $
 
 EAPI=5
 
@@ -15,8 +15,13 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=""
+IUSE="test"
+
+RDEPEND=""
+DEPEND="test? ( dev-python/eyeD3 )"
 
 DOCS=( API-NOTES NEWS README TODO TUTORIAL )
 
-#TODO: Backport DISTUTILS_SRC_TEST="setup.py" + deps from mutagen-1.20.ebuild
+src_test() {
+	"${PYTHON:-python2.7}" setup.py test
+}