Added patch to fix wrong assert. Patch by Timothy Redaelli <drizzt@gentoo.org> on...

Package-Manager: portage-2.1.1-r1

diff --git a/media-libs/mutagen/ChangeLog b/media-libs/mutagen/ChangeLog
index 04620779d6f4bd1d36760a17901aba5dbec90e5f..d4c57813088a43824be753a56e092920bf21ce08 100644 (file)
--- a/media-libs/mutagen/ChangeLog
+++ b/media-libs/mutagen/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/mutagen
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mutagen/ChangeLog,v 1.35 2006/11/04 20:13:23 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mutagen/ChangeLog,v 1.36 2006/11/06 11:37:16 tcort Exp $
+
+  06 Nov 2006; <tcort@gentoo.org> +files/mutagen-1.8-test.patch,
+  mutagen-1.8.ebuild:
+  Added patch to fix wrong assert. Patch by Timothy Redaelli
+  <drizzt@gentoo.org> on Bug #154063.
 
   04 Nov 2006; <tcort@gentoo.org> mutagen-1.8.ebuild:
   Stable on alpha and amd64 wrt Bug #154063.

diff --git a/media-libs/mutagen/Manifest b/media-libs/mutagen/Manifest
index 75ce063f1c8ab5f10bafe92b0aa25525d3745845..afd1cf3f460ff22640a6a3c249de8619126155f5 100644 (file)
--- a/media-libs/mutagen/Manifest
+++ b/media-libs/mutagen/Manifest
@@ -1,3 +1,7 @@
+AUX mutagen-1.8-test.patch 468 RMD160 c0817bc19f58732eadc37065fbd3e4de6ea86259 SHA1 1f9d7b88bf52ed131c773f262a02c3cc93ed9d06 SHA256 2078cc60a9be3179e34dd9ec14d4af571191e622b31eb4e6677dbf0fd7b63357
+MD5 2481efe2648a70de5b2b7ad6d0b8e98c files/mutagen-1.8-test.patch 468
+RMD160 c0817bc19f58732eadc37065fbd3e4de6ea86259 files/mutagen-1.8-test.patch 468
+SHA256 2078cc60a9be3179e34dd9ec14d4af571191e622b31eb4e6677dbf0fd7b63357 files/mutagen-1.8-test.patch 468
 DIST mutagen-1.5.1.tar.gz 296326 RMD160 054bfbe666d81e08a50781793cc09a3bdde5d0d5 SHA1 bec18e4cc4724efd63366a5e849e3811e81fac44 SHA256 e706226b3349fbeb74006a8cb2f7f1ef7d5f2f6c13f1458e02f9547f7d4e5173
 DIST mutagen-1.6.tar.gz 418422 RMD160 cd601870a9d3c0546b04c6546a47ac9a5477dc5a SHA1 7115172d52c9a21a9167d88f4341ff9524cb56c2 SHA256 151e7b5483ee44b03e9f03fdbc159c2354aeb2afde37bed7207463d9818e014e
 DIST mutagen-1.7.1.tar.gz 423243 RMD160 9a2cb3bc87ddf4cf55169e3512ccc9b38fbdc268 SHA1 ef131737e12b9cfa40ba092a349b157a19b92e95 SHA256 039071ae7a05752d70a3290fc23d6d51f90861d071b70c76fe5bc956e8b4736b
@@ -14,14 +18,14 @@ EBUILD mutagen-1.7.1.ebuild 772 RMD160 8248897bacb41105c7403c56f2ffbb0ee77189e7
 MD5 43d08684aee280f4bd1bf554236114a7 mutagen-1.7.1.ebuild 772
 RMD160 8248897bacb41105c7403c56f2ffbb0ee77189e7 mutagen-1.7.1.ebuild 772
 SHA256 91fc883d58872666d95ec7f870fae63ac514fc582a22ce943c3c3d545bf031c7 mutagen-1.7.1.ebuild 772
-EBUILD mutagen-1.8.ebuild 770 RMD160 247350e4b131a1ba8c2a43cef43cf52bc7a1daf2 SHA1 92db063cde086ef994a6798a9ff685a77ccfd300 SHA256 678a80b276b03783dfd382291f3e18889d4161a08671338dff786709273e4c22
-MD5 5312506b7f6b72dd93a3d02aefaa8a66 mutagen-1.8.ebuild 770
-RMD160 247350e4b131a1ba8c2a43cef43cf52bc7a1daf2 mutagen-1.8.ebuild 770
-SHA256 678a80b276b03783dfd382291f3e18889d4161a08671338dff786709273e4c22 mutagen-1.8.ebuild 770
-MISC ChangeLog 4241 RMD160 c7fbd4a89f049887295c5d572cd077441fceaa65 SHA1 c5bcbdfe985f56da96ded65b83c59c88544c5a9c SHA256 8ac000d98d5f41e4c5377fd108c1ae5b33e7ac522cece227f348cce41e243862
-MD5 c30888b2b96a44590306ef98522a27b6 ChangeLog 4241
-RMD160 c7fbd4a89f049887295c5d572cd077441fceaa65 ChangeLog 4241
-SHA256 8ac000d98d5f41e4c5377fd108c1ae5b33e7ac522cece227f348cce41e243862 ChangeLog 4241
+EBUILD mutagen-1.8.ebuild 852 RMD160 f0173308a64e8bfd04d8eb31c05c954b9d179f78 SHA1 549f198d603e647b50027682617aef125a122838 SHA256 3583e9b145915e5b9c7242ca4398eb896a683644c6f14cf298f20943654eac11
+MD5 aa5483e4b1f73a99740376e9e9d9f756 mutagen-1.8.ebuild 852
+RMD160 f0173308a64e8bfd04d8eb31c05c954b9d179f78 mutagen-1.8.ebuild 852
+SHA256 3583e9b145915e5b9c7242ca4398eb896a683644c6f14cf298f20943654eac11 mutagen-1.8.ebuild 852
+MISC ChangeLog 4428 RMD160 cc508f78c4ddcbe18d2b0b3e263c28da85f31f57 SHA1 5daaefc2647b79fb26cdd565ea1491e9b78ce92b SHA256 9384f8889c95a327ce792770632c49d79ae2fc6c283c9840cedff13f55a53012
+MD5 ca8968238c24620acb512d148c316c73 ChangeLog 4428
+RMD160 cc508f78c4ddcbe18d2b0b3e263c28da85f31f57 ChangeLog 4428
+SHA256 9384f8889c95a327ce792770632c49d79ae2fc6c283c9840cedff13f55a53012 ChangeLog 4428
 MISC metadata.xml 248 RMD160 c697218a44606450b98f7b5417564b6b3cde6e16 SHA1 b9e67799079f43398e144e3106351ece7bd7074a SHA256 fedcb689a47bc5b2be227c6d50698926c0d2c27836d7281fd9be10cefdcfa4d2
 MD5 bb06a2f53cdc5a7c45ee2dd9511e4b08 metadata.xml 248
 RMD160 c697218a44606450b98f7b5417564b6b3cde6e16 metadata.xml 248

diff --git a/media-libs/mutagen/files/mutagen-1.8-test.patch b/media-libs/mutagen/files/mutagen-1.8-test.patch
new file mode 100644 (file)
index 0000000..4dabe26
--- /dev/null
+++ b/media-libs/mutagen/files/mutagen-1.8-test.patch
@@ -0,0 +1,10 @@
+--- tests/test___init__.py.old 2006-11-04 22:14:02.000000000 +0100
++++ tests/test___init__.py     2006-11-04 22:17:38.000000000 +0100
+@@ -146,6 +146,6 @@
+         from mutagen import version
+         from os.path import dirname, basename, abspath
+         trunk = basename(dirname(dirname(dirname(abspath(__file__)))))
+-        if trunk != "trunk":
++        if trunk == "trunk":
+             self.failIf(version[-1] < 0, "mutagen.version is a prerelease.")
+ add(TMutagen)

diff --git a/media-libs/mutagen/mutagen-1.8.ebuild b/media-libs/mutagen/mutagen-1.8.ebuild
index 180dd95d529308d161d10927e8d302ac1bd60c82..abcc9da39bf122973e0ccf178230b1f020547d55 100644 (file)
--- a/media-libs/mutagen/mutagen-1.8.ebuild
+++ b/media-libs/mutagen/mutagen-1.8.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mutagen/mutagen-1.8.ebuild,v 1.2 2006/11/04 20:13:23 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mutagen/mutagen-1.8.ebuild,v 1.3 2006/11/06 11:37:16 tcort Exp $
 
 inherit distutils
 
@@ -23,6 +23,12 @@ DEPEND="test? (
 
 RDEPEND=">=virtual/python-2.4"
 
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-test.patch
+}
+
 src_test() {
        python setup.py test || die "src_test failed."
 }