Fixed bug 100067 and 139936.

Package-Manager: portage-2.1-r1

7 files changed, 64 insertions, 23 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index 639d384ce2f0..02692e1ee12e 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.42 2006/06/06 11:16:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.43 2006/08/06 02:22:41 matsuu Exp $
+
+  06 Aug 2006; MATSUU Takuto <matsuu@gentoo.org>
+  +files/audacity-1.3.0b-x86.patch, audacity-1.2.4b-r1.ebuild,
+  audacity-1.3.0b.ebuild:
+  Added RESTICT="test", Bug 100067.
+  Fixed compilation on x86, Bug 139936.
 
 *audacity-1.3.0b (06 Jun 2006)
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 3c2bd5a88d06..d2ca76b7ac79 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -6,12 +6,16 @@ AUX audacity-1.2.3-x86.patch 995 RMD160 2b78053f34ed3ee2cd0e0a8e4be581dfb3c47652
 MD5 502eabf8993eb2af91e1265425024091 files/audacity-1.2.3-x86.patch 995
 RMD160 2b78053f34ed3ee2cd0e0a8e4be581dfb3c47652 files/audacity-1.2.3-x86.patch 995
 SHA256 858c60a82be1a533e1f1799f34033f7a32b991ad12f76a5850631a5591c889b9 files/audacity-1.2.3-x86.patch 995
+AUX audacity-1.3.0b-x86.patch 1278 RMD160 3b9a2af0fc9c4c4b6287112cd035205c6eb508c7 SHA1 ffafddda30463ad1597c34d8bb3a4ed3705113e6 SHA256 865b06b9089d5fc0af194268316aa09deba80fabb1e058708d13e47f364e5dea
+MD5 7824e4b13601ac393e05a72a195ef97b files/audacity-1.3.0b-x86.patch 1278
+RMD160 3b9a2af0fc9c4c4b6287112cd035205c6eb508c7 files/audacity-1.3.0b-x86.patch 1278
+SHA256 865b06b9089d5fc0af194268316aa09deba80fabb1e058708d13e47f364e5dea files/audacity-1.3.0b-x86.patch 1278
 AUX audacity.desktop 155 RMD160 7b9c9ba3ece67e05b559aa4084acb2f8ef460fc6 SHA1 4bbfb063c543da30faa5918db08e50e48723d199 SHA256 bdb6be282827d7a5995fb53529978233411c611b4eebbc24fe6ec0a6a6834b5a
 MD5 8332a9c72a43ed19ab1904a935a25e03 files/audacity.desktop 155
 RMD160 7b9c9ba3ece67e05b559aa4084acb2f8ef460fc6 files/audacity.desktop 155
 SHA256 bdb6be282827d7a5995fb53529978233411c611b4eebbc24fe6ec0a6a6834b5a files/audacity.desktop 155
-DIST audacity-src-1.2.1.tar.bz2 2742327
-DIST audacity-src-1.2.3.tar.gz 4175943
+DIST audacity-src-1.2.1.tar.bz2 2742327 RMD160 3b7f9562cbd19b4555995cc3bc58a168bbc845cf SHA1 71b8fd675efd00ad591510e3b7bbdafd87318ff3 SHA256 7566dd73d6df5f1a9ed35ec609b5602c465486573ecc77dc548e4c768cc1fce0
+DIST audacity-src-1.2.3.tar.gz 4175943 RMD160 87b24db9252554ac5a9386efe1390d7c13927196 SHA1 98c3a171c1f5735df7c63baf1fcef52e5c38ceb8 SHA256 fce24bd61100ae4a792727d083a895679a7ad3871084c86e90457a8b1ee46de4
 DIST audacity-src-1.2.4b.tar.gz 4499894 RMD160 4c6609b200a86ff081ecaa1789525404031563d6 SHA1 cc159cbda4647af91460a1785db2bfa6a1ab9760 SHA256 7c6f53ceffc10fbff96cc3fdf2a2b61072ed8b527d4f7313b3216390907de113
 DIST audacity-src-1.3.0b.tar.gz 4938302 RMD160 4ada2e40799f60477d6c2aabb0b91bb03c8882f9 SHA1 6ba57ee1a3a9b6c57bf98142fbe4561b7cadf5db SHA256 cff02da856622acbca7b6ce9e0c05ad0cabc0c10fc5f79e349d2e586176e49f9
 EBUILD audacity-1.2.1.ebuild 2263 RMD160 6a76742c6d067e4f42cbd3ea8a24f52cfdf8a55e SHA1 2eede53289c766507984526435f9107e442f326a SHA256 f93c97a76b5361e4ea3b8a21c3868cd3b0e57f12265047cc510a97f6fbcbb139
@@ -22,28 +26,28 @@ EBUILD audacity-1.2.3.ebuild 2175 RMD160 51aa5e0400c9fcb04dc1b50b92c2d1efd8b1733
 MD5 466b743fd1ead3cc85a21538f707d2aa audacity-1.2.3.ebuild 2175
 RMD160 51aa5e0400c9fcb04dc1b50b92c2d1efd8b17330 audacity-1.2.3.ebuild 2175
 SHA256 4a5bd7dc10e92a34f047eaca4b99b18199f48d89620dfc079b87bb7b7519932c audacity-1.2.3.ebuild 2175
-EBUILD audacity-1.2.4b-r1.ebuild 1585 RMD160 d8ae98f60b50ecee55c247a14d129f874d82bc6f SHA1 7e7988f1ffcd68638daad94a06ee49d8e4ad11ab SHA256 f189a3bddff6dab768f1c7b18ad6134483b15e97f51fe96edcd7bd792a86eda3
-MD5 e70429c147ff7db0336207930a462b0c audacity-1.2.4b-r1.ebuild 1585
-RMD160 d8ae98f60b50ecee55c247a14d129f874d82bc6f audacity-1.2.4b-r1.ebuild 1585
-SHA256 f189a3bddff6dab768f1c7b18ad6134483b15e97f51fe96edcd7bd792a86eda3 audacity-1.2.4b-r1.ebuild 1585
-EBUILD audacity-1.3.0b.ebuild 1508 RMD160 731cfc41e144d0ab8104f5394c7cf80c1647baf8 SHA1 f960394d843d1c2f29faaf8c832ca31a44c14d4b SHA256 cf5353f2572d75495d3f4572489b0d79f1e449b25d8c5ecaba9fc4da7c92a6dd
-MD5 7cf6d14fc780525b574cac56be2bf6e3 audacity-1.3.0b.ebuild 1508
-RMD160 731cfc41e144d0ab8104f5394c7cf80c1647baf8 audacity-1.3.0b.ebuild 1508
-SHA256 cf5353f2572d75495d3f4572489b0d79f1e449b25d8c5ecaba9fc4da7c92a6dd audacity-1.3.0b.ebuild 1508
-MISC ChangeLog 8144 RMD160 5c7d9381afee892040f7c1b94f1f1d21f7c833c2 SHA1 b4505c097e3988a4ba4a079af79a255fb6038e25 SHA256 6430af829f527b070af2f3ceb1f2578a0427a53cb9bc25628f937cb9149dcb06
-MD5 f84d31415bcee7eecfe469c76f72d335 ChangeLog 8144
-RMD160 5c7d9381afee892040f7c1b94f1f1d21f7c833c2 ChangeLog 8144
-SHA256 6430af829f527b070af2f3ceb1f2578a0427a53cb9bc25628f937cb9149dcb06 ChangeLog 8144
+EBUILD audacity-1.2.4b-r1.ebuild 1601 RMD160 ebe34f4642c4cc88f862fef52d7db4bc5aa2a85a SHA1 9a99eece349bc996d45746e66c32c09f1d6822cb SHA256 00846089367bd252d7bfbe71027a5e4899ff5549b7fc8641fece10250d8c3d4c
+MD5 0f7eb766b2dff2dd8f9f686e3669f963 audacity-1.2.4b-r1.ebuild 1601
+RMD160 ebe34f4642c4cc88f862fef52d7db4bc5aa2a85a audacity-1.2.4b-r1.ebuild 1601
+SHA256 00846089367bd252d7bfbe71027a5e4899ff5549b7fc8641fece10250d8c3d4c audacity-1.2.4b-r1.ebuild 1601
+EBUILD audacity-1.3.0b.ebuild 1574 RMD160 1c7e90f9df22c19bc0f71238f6de8407bfe74057 SHA1 bd0443adf6cefcd1a8dfd5d4d1eb455e9c0ffdaf SHA256 d7514b5845b67fda29cd00c05c2f782ae09acd378b6c14e1e2fe20a917ce5c64
+MD5 199603b85ae332313929cd895a73eda5 audacity-1.3.0b.ebuild 1574
+RMD160 1c7e90f9df22c19bc0f71238f6de8407bfe74057 audacity-1.3.0b.ebuild 1574
+SHA256 d7514b5845b67fda29cd00c05c2f782ae09acd378b6c14e1e2fe20a917ce5c64 audacity-1.3.0b.ebuild 1574
+MISC ChangeLog 8359 RMD160 ad3f052ea170431a38c2a1645908da873ccc6e3b SHA1 e7a9b5b1b268ece8faa503259a915a6b4db0a00d SHA256 4fed5d693b261f976f4a7b4473bacae8b6d815613c04dc3ae9bd7fd184373775
+MD5 6abdd8fcfd81cdcdc5a7f31041db5b78 ChangeLog 8359
+RMD160 ad3f052ea170431a38c2a1645908da873ccc6e3b ChangeLog 8359
+SHA256 4fed5d693b261f976f4a7b4473bacae8b6d815613c04dc3ae9bd7fd184373775 ChangeLog 8359
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158
 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b metadata.xml 158
-MD5 8f1e5073472cee2da1987db62e7db3a9 files/digest-audacity-1.2.1 72
-RMD160 c06dcb4355a0531458247c8f5c87784b5f60f5c0 files/digest-audacity-1.2.1 72
-SHA256 9eab83781c400cac50b16183982a7ef17a110f39d0bae88138bac3f8e722cdaa files/digest-audacity-1.2.1 72
-MD5 bf35b35e84d0c0be6fa8e87acf085294 files/digest-audacity-1.2.3 71
-RMD160 447743dd8bc035a958e8eb6813d5b3851c1e57c2 files/digest-audacity-1.2.3 71
-SHA256 6ba40a320564d094975a753f8ecbbbeada91ee65ef92e1ca925ca1bad17b75a5 files/digest-audacity-1.2.3 71
+MD5 ac3722329da73efa53d2305ad755faba files/digest-audacity-1.2.1 262
+RMD160 f2502ddbd91fd9a0d1799448cfa0ab26c09eb4d0 files/digest-audacity-1.2.1 262
+SHA256 f26b6c8537f3e20ea09e9fbb3c1212f09455fe204ef3a5db3bde59190d414af0 files/digest-audacity-1.2.1 262
+MD5 630b6f56d836e86a37700cdb2661bac7 files/digest-audacity-1.2.3 259
+RMD160 5cea11b04070c4021de2308976d51c300c156d8d files/digest-audacity-1.2.3 259
+SHA256 a9375435e4386417c6934679b4a3c4b4780afd958119690ac688cd8a79914878 files/digest-audacity-1.2.3 259
 MD5 4200ff5195300f61f256370299c1b52a files/digest-audacity-1.2.4b-r1 262
 RMD160 258cf7ca06b6a8c052e4c51c6a98fe72520f0087 files/digest-audacity-1.2.4b-r1 262
 SHA256 db7f49eddca3d4c1c19248124eb9c64c4a97cdf8a3b8a760dee13e64fb3cf303 files/digest-audacity-1.2.4b-r1 262
diff --git a/media-sound/audacity/audacity-1.2.4b-r1.ebuild b/media-sound/audacity/audacity-1.2.4b-r1.ebuild
index a94714e5209c..13ca3e2bcb19 100644
--- a/media-sound/audacity/audacity-1.2.4b-r1.ebuild
+++ b/media-sound/audacity/audacity-1.2.4b-r1.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-sound/audacity/audacity-1.2.4b-r1.ebuild,v 1.2 2006/02/27 15:40:02 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.4b-r1.ebuild,v 1.3 2006/08/06 02:22:41 matsuu Exp $
 
 inherit wxwidgets eutils flag-o-matic
 
@@ -14,6 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RESTRICT="test"
 
 DEPEND="=x11-libs/wxGTK-2.4*
 	>=app-arch/zip-2.3
diff --git a/media-sound/audacity/audacity-1.3.0b.ebuild b/media-sound/audacity/audacity-1.3.0b.ebuild
index e75a80105a8c..0da06dad33f4 100644
--- a/media-sound/audacity/audacity-1.3.0b.ebuild
+++ b/media-sound/audacity/audacity-1.3.0b.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-sound/audacity/audacity-1.3.0b.ebuild,v 1.1 2006/06/06 11:16:17 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.3.0b.ebuild,v 1.2 2006/08/06 02:22:41 matsuu Exp $
 
 inherit wxwidgets eutils
 
@@ -14,6 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+RESTRICT="test"
 
 DEPEND=">=x11-libs/wxGTK-2.6
 	>=app-arch/zip-2.3
@@ -32,6 +33,7 @@ src_unpack() {
 
 	cd "${S}"
 	epatch "${FILESDIR}"/${PN}-1.2.3-gcc41.patch # bug 113754
+	epatch "${FILESDIR}"/${P}-x86.patch # Bug 139936
 }
 
 src_compile() {
diff --git a/media-sound/audacity/files/audacity-1.3.0b-x86.patch b/media-sound/audacity/files/audacity-1.3.0b-x86.patch
new file mode 100644
index 000000000000..c43091ac011c
--- /dev/null
+++ b/media-sound/audacity/files/audacity-1.3.0b-x86.patch
@@ -0,0 +1,24 @@
+diff -Naur audacity-src-1.3.0b-beta.orig/lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp audacity-src-1.3.0b-beta/lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp
+--- audacity-src-1.3.0b-beta.orig/lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp	2005-11-28 01:47:29.000000000 +0900
++++ audacity-src-1.3.0b-beta/lib-src/soundtouch/source/SoundTouch/cpu_detect_x86_gcc.cpp	2006-08-06 08:25:36.000000000 +0900
+@@ -95,7 +95,7 @@
+         "\n\tpushf"                      // save updated eflags to stack

+         "\n\tpop     %%eax"              // load from stack

+         "\n\txor     %%edx, %%edx"       // clear edx for defaulting no mmx

+-        "\n\tcmp     %%eax, %%ecx"       // compare to original eflags values

++        "\n\tcmp     %%ecx, %%eax"       // compare to original eflags values

+         "\n\tjz      end"                // jumps to 'end' if cpuid not present

+ 

+         // cpuid instruction available, test for presence of mmx instructions

+@@ -132,9 +132,9 @@
+ 

+         "\n\tmov     %%esi, %0"

+ 

+-      : "=rm" (res)

++      : "=r" (res)

+       : /* no inputs */

+-      : "%edx", "%eax", "%ecx", "%ebx", "%esi" );

++      : "%edx", "%eax", "%ecx", "%esi" );

+       

+     return res & ~_dwDisabledISA;

+ #endif

diff --git a/media-sound/audacity/files/digest-audacity-1.2.1 b/media-sound/audacity/files/digest-audacity-1.2.1
index 582b8ec83095..fccf4dd0e914 100644
--- a/media-sound/audacity/files/digest-audacity-1.2.1
+++ b/media-sound/audacity/files/digest-audacity-1.2.1
@@ -1 +1,3 @@
 MD5 8914538a3edb6f88e2f70fb2fec3790f audacity-src-1.2.1.tar.bz2 2742327
+RMD160 3b7f9562cbd19b4555995cc3bc58a168bbc845cf audacity-src-1.2.1.tar.bz2 2742327
+SHA256 7566dd73d6df5f1a9ed35ec609b5602c465486573ecc77dc548e4c768cc1fce0 audacity-src-1.2.1.tar.bz2 2742327
diff --git a/media-sound/audacity/files/digest-audacity-1.2.3 b/media-sound/audacity/files/digest-audacity-1.2.3
index e3ad05e9d285..0b661c21f3ac 100644
--- a/media-sound/audacity/files/digest-audacity-1.2.3
+++ b/media-sound/audacity/files/digest-audacity-1.2.3
@@ -1 +1,3 @@
 MD5 dbfc1b401420aa694753d35acb5a8a28 audacity-src-1.2.3.tar.gz 4175943
+RMD160 87b24db9252554ac5a9386efe1390d7c13927196 audacity-src-1.2.3.tar.gz 4175943
+SHA256 fce24bd61100ae4a792727d083a895679a7ad3871084c86e90457a8b1ee46de4 audacity-src-1.2.3.tar.gz 4175943