Remove the python-magic dependency wrt bug #488270, and remove the pavement.py line that tries to install it instead.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 26 insertions, 21 deletions

diff --git a/dev-python/eyeD3/ChangeLog b/dev-python/eyeD3/ChangeLog
index 36c87f9c67df..0a21b5e8d889 100644
--- a/dev-python/eyeD3/ChangeLog
+++ b/dev-python/eyeD3/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/eyeD3
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/ChangeLog,v 1.69 2014/06/11 13:52:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/ChangeLog,v 1.70 2014/06/11 14:06:32 mgorny Exp $
+
+  11 Jun 2014; Michał Górny <mgorny@gentoo.org> eyeD3-0.7.4-r2.ebuild:
+  Remove the python-magic dependency wrt bug #488270, and remove the pavement.py
+  line that tries to install it instead.
 
 *eyeD3-0.7.4-r2 (11 Jun 2014)
 
diff --git a/dev-python/eyeD3/Manifest b/dev-python/eyeD3/Manifest
index a6e5f826a07c..d3534e3f7310 100644
--- a/dev-python/eyeD3/Manifest
+++ b/dev-python/eyeD3/Manifest
@@ -9,26 +9,26 @@ EBUILD eyeD3-0.6.18-r1.ebuild 1126 SHA256 bcf0a7c1600741763fdec1cdcb194433769957
 EBUILD eyeD3-0.6.18.ebuild 1091 SHA256 1e1e6aa310542daebcd98018f2ce49e0c4d6db886295f795575c9cd108998c04 SHA512 4de7f57bda4d8f3d40087a282ae4f0c10b4eedf8b24afc77333608020d90e5f2b5d16dc906bf6697cdaa2bac8293f674d93ff1d5fd1531cea670c8a5040d6bb9 WHIRLPOOL 5034c74aa6095e5f00b2e2d2f19646bf575c6d82fdf88a4a0402228bc30e429d0cd40cc1693f3e3c4b3119cf318a7d8389632c019f450f16efc72587611a3c11
 EBUILD eyeD3-0.7.1.ebuild 783 SHA256 5e99b1d6d25632fa6803c7dcbffc40c0524376757db1cd9a25356f56576e0c8e SHA512 546a3f004beb6eef37b50ca719f389613a27d6a491e624e041dc5305a8b3781f27fffb4186da2c9061bd5125d07e1d940ddd3f31ac9c93d884701356f44ed383 WHIRLPOOL 3fd22a98f0edb18634ebb189b7f4dbda65dff0501bedf15d8d2e26b5e43b69b8b64188ce3f2a31eea74cdc7e5dacaa311554f0a1139ac753b0f67a64d702dd16
 EBUILD eyeD3-0.7.4-r1.ebuild 921 SHA256 f60f0fe1993011ad354f95f59584b0fede783269e09f55d71c49d20cdd43d951 SHA512 2e2cee6473f2bf6b2687ad89e5662d93b37219714646b2e50d0d90750c9afc7294a8639aa1f15ceb877a70b737165fd09508fefc5572ba303da5ec18266d20d3 WHIRLPOOL 39e0de5a5ae801279346b571526e50d79e05d5dba9ca481e5f79d3af28b0650018ac37b1874680e40f2f46f53bd755746ded0145754ff7b61b1ee52a8092da33
-EBUILD eyeD3-0.7.4-r2.ebuild 1169 SHA256 ba256092084a0118c124157fa1b9cfddcb9ef4f6f751489ccefc79e1237ff73a SHA512 0d6a94f9e808c1c9f6d7cebea5dced81a83528c555791fa67b0eee55af356ec818f9d32d36a633914616a66ce6cf1c21e2de1f238e7b592b0a1537a5537c6d15 WHIRLPOOL 1bfb43c7d51753a40f049346f4ba7e3808fe81a415fb9910a6176c3f59dec758ba50b8a8ce436546bfc8783f43b0729fe81edb7c09c5da4b33c3b8e72c5dd46f
+EBUILD eyeD3-0.7.4-r2.ebuild 1208 SHA256 33864e4806efda434edc93292792fbc876ef324aadf18e40d1d7cf875b767e96 SHA512 ac79d39d1caee06cdf37866af5fa39f97b31e5264732d4fff3eaa81522fdd219d91a8e6b9d002efd413731f4fec74fdbe797f373bcde1826633cc434ea0ddfc8 WHIRLPOOL a2f957bd52114a524543c0eb0d888604231d7fe077a90c6522308d65c8604bac1e297145cd3b7a44e7445749d1a68a4e5b8539fe7c1fdd99f8cd353ebe6113f5
 EBUILD eyeD3-0.7.4.ebuild 807 SHA256 cd6a5d001d7c6658495bdef43757ca994015f621052f48eed7ff323899b04f72 SHA512 793c31ffb459061f8d8266fee062bdd46586e92c9dc08e87f426f9d240e38c206edbc0ab70b988dc665f3ffcb7155d3481cc9905aa05d168429d3106df1d4c81 WHIRLPOOL 136abae3e9c12b3644848e4775b78ef9380b848d1557bbc7b92455a4738c1193862969fb3fd2e4c3449cb0d36e6f16ebcdf903fe227062a65b35fff964f4f423
-MISC ChangeLog 8446 SHA256 e179aa9b45b6b6948f44396b43254d79efaa81a4200c6af696c28f6d010ebe65 SHA512 b009c62b90042759a041680153533277fe0a53756a2678739573fd1f1587f5e8a7f382fb33d35257a8b0538a25ff0474aab626c3f24c2d8174d8887832a456f8 WHIRLPOOL 0ae7efb2badd884955177435fa89ec2661ef22cefeaada518c0c52faae68fe344236ac6a948a36a178e30db2b67218aa1e89fb7d0e272dc742f8bd11c496589a
+MISC ChangeLog 8642 SHA256 09b8c69908179e221e0ff94297f93b222f4032a6bea7e87d7b54e59ae923c0d9 SHA512 936ccf9ef2d0c1ab46afe6de7d6c564a13d27cf69bb19b458780fa95922e203433ca9eaac57b3a9ff4b93f12a3e655fe5c977a28cd9f780ed118003de63a570d WHIRLPOOL 455a19f40c2236a4146cd58b81023fee7f2b011f98560e3d6c4e357dd7424776acc6781cb99d33b9ae124a45e3cf9daa29c2a039ce50de36c6e392ce4d8206cd
 MISC metadata.xml 180 SHA256 cc06a12ae2dbcff1975aaa40f4b1e52c85cc3522a2a306f8ec0e386025e5ec15 SHA512 741a8e3f9dfadab3abb90022147a515e34026d4604e4d7655a3173e728c93400dda1ad251faba402e31667c9644cb9d0a74aa6b5a178f7d20295ab5ec9fb2cc7 WHIRLPOOL c32378f2b4a23a9f2d13edd2d6492a7ed0a1a34edf681c637fccbbe674f66fbea4401b728958f616b4bcc595e169399e14fa883ac13b1d0a3d0bdd1a92cbd16d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJTmF87XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJTmGJpXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOWaMQAMrgnhAHOlDI6tZqlPa6CiSU
-DUSAV9hLxsZHtGN1n60zBkOawvn2suOwOODuQ/1Nd1yARoHvQDrvBYfDEcsBMgW+
-Zg02IGujSIe87kQc5rBfgjuUDqvEidG+LxLiQzk8f4a7aD/R5TUjJX1n2FCwvgj6
-U3bDoON+bZTaPiIfupnwNK/kxrINO5NHi06xap0lweHQMejqlR+S8+EHXAB8K65d
-Zp+hu/UtLbGCulWTk5xtm78PpF6BLkFdrorpmvwV7JFNVM9v9buUQzOr95jmi/6v
-1B3Qg2WyaTYZo2sA3jJ2UfwKDYqH6KkA5T/TVMZhdBQz1K/30OtDGImbf6eqKKkf
-jihgjoxkVqbiBt62E/uKAw1HSiifJ9BlTvz2Yc5qspi/7SyofuvA0dR9DYNYH1zS
-9DLWWifvAoKZHjUHDWBjWTi58mlpoGlGL1JkZg71kfcR5BCNO4lLjaKDAz9WQ0xk
-Cmh0RSjmyN0nl/vx4JuPVe4oFW9BnkxOrmNAHM4azZPaJRzwRVUhpB9DpNjKA8nP
-Bg1X//mmyXhULa19s9hLtVN28N3HYyjUogT7mtoCiPOnxBNkSrUn/X/wX3iuGUUO
-sCYfyAdWaTY7yDk8qOpdNr909RtY/Wy2ZYprgBCOzWuF4bWysDdaitmUAu1b007X
-FPk9q0pW9F/7qcSoXtAw
-=6H4C
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOyBkP/3LbZemBYGHqi0BXRGCkek3L
+rtKVY2gytzfbO4WZyp3CK1VHd5ni4D3i1peDHj+lFGgFFBKjRaEynS/+4dr/XZlG
+CPJx1czn4hamb2/ahKwJ2GQEP94CPqhKWBf71AzxPcr3cmYOEMHPZlfWjWGyBZka
+UdqJ4XX2KlGDOnEzObQR5DCYTItIVYbkwu2m0upcQ5fu/2wX+anBnzogW2Z8Ow7/
+5rNG1j7sJO9ulMl87fccy0iuQkwxD3ed9C0e2Rs2sAIQN3fRkZ6nCI5XXWVkvVsn
+3nLnrKyNAno1tjfS4oIYwtWsJNceh17FP9GwuGvRW+/y9aaNvni7Yl26WmONJmQQ
+W/PdLQAj0mDaCERDDeNAN1we8JIun4Py0WmQGupi79BKzvFlvZ2/TSBXiPr6RUYy
+G8eNakaLicBVuH0xUrt59qfT14ym5juXALQPupHebEPbJIDV+6997EgKQUFQn/ue
+dYA1rxmBlqVmnsXnD7eVy80yWbeptOaRWFyCPQMJ3xvd12x257qLfmjIdf+l0udX
+CcOT3jxNgAYdPrMLug+6zbPmRTpizJ58NJ28fouPoGCeHh+8VCggTi5RSvMeiRTC
+stc72PZCLTPCPLczhgy6AytXBaLauc3dD9y9m+YKC1/qcmtOg9zpVybWVuq8rYgz
+AQZxOlnQSjfKvBus8vOC
+=YVkD
 -----END PGP SIGNATURE-----
diff --git a/dev-python/eyeD3/eyeD3-0.7.4-r2.ebuild b/dev-python/eyeD3/eyeD3-0.7.4-r2.ebuild
index 0d0e06336edc..2d565aa91921 100644
--- a/dev-python/eyeD3/eyeD3-0.7.4-r2.ebuild
+++ b/dev-python/eyeD3/eyeD3-0.7.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.7.4-r2.ebuild,v 1.1 2014/06/11 13:52:58 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/eyeD3/eyeD3-0.7.4-r2.ebuild,v 1.2 2014/06/11 14:06:32 mgorny Exp $
 
 EAPI=5
 
@@ -19,14 +19,15 @@ SLOT="0.7"
 KEYWORDS="~amd64 ~hppa ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris"
 IUSE=""
 
-RDEPEND="!<${CATEGORY}/${PN}-0.6.18-r1:0
-	dev-python/python-magic[${PYTHON_USEDEP}]"
+RDEPEND="!<${CATEGORY}/${PN}-0.6.18-r1:0"
 DEPEND="${RDEPEND}
 	dev-python/paver[${PYTHON_USEDEP}]"
 
 python_prepare_all() {
 	# prevent the build system from installing unwrapped bash script
-	sed -i -e '/scripts/d' pavement.py || die
+	# and prevent it from pulling optional python-magic
+	sed -i -e '/scripts/d' \
+		-e '/install_requires/d' pavement.py || die
 
 	distutils-r1_python_prepare_all
 }