1.2.0 is -amd64, and added a note not to remove 1.2.1 from ~amd64 because of xfce4 problem (bug #54331).

4 files changed, 17 insertions, 10 deletions

diff --git a/media-sound/audacity/ChangeLog b/media-sound/audacity/ChangeLog
index f17e832778f4..adb2c518631c 100644
--- a/media-sound/audacity/ChangeLog
+++ b/media-sound/audacity/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/audacity
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.25 2004/06/24 23:51:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/ChangeLog,v 1.26 2004/07/01 07:25:21 eradicator Exp $
+
+  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  audacity-1.2.0-r1.ebuild, audacity-1.2.1.ebuild:
+  1.2.0 is -amd64, and added a note not to remove 1.2.1 from ~amd64 because of
+  xfce4 problem (bug #54331).
 
 *audacity-1.2.1 (10 May 2004)
 
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index f9d4b0c18427..a9a62b94925a 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,10 +1,10 @@
+MD5 439b28abde1bbf6f129c9af21fd90f18 ChangeLog 5385
 MD5 d054f422f23fc1a2790bf0a3a8e14be7 audacity-1.1.3.ebuild 2069
-MD5 227c84ce02c4426bf14ec98300546ed8 audacity-1.2.1.ebuild 2219
-MD5 b75f1a846b2a617d7c8670126c344b10 audacity-1.2.0-r1.ebuild 2309
-MD5 b7669ecc64006490091a8aa320e629ac ChangeLog 5165
+MD5 5c05985b53931ceb077c814a2d1a939d audacity-1.2.0-r1.ebuild 2318
+MD5 a4b9a9c19045d3e0455e825217505db8 audacity-1.2.1.ebuild 2277
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 3997cded5596ed884d44484d5a650a5b files/digest-audacity-1.2.0-r1 71
-MD5 cb2f75d37538e9688fe397cf178f57ad files/digest-audacity-1.1.3 68
-MD5 8f1e5073472cee2da1987db62e7db3a9 files/digest-audacity-1.2.1 72
 MD5 e2ae7b2007d03d608173fd4faecc1a06 files/audacity-1.2.0-STTypes.patch 499
 MD5 8332a9c72a43ed19ab1904a935a25e03 files/audacity.desktop 155
+MD5 cb2f75d37538e9688fe397cf178f57ad files/digest-audacity-1.1.3 68
+MD5 3997cded5596ed884d44484d5a650a5b files/digest-audacity-1.2.0-r1 71
+MD5 8f1e5073472cee2da1987db62e7db3a9 files/digest-audacity-1.2.1 72
diff --git a/media-sound/audacity/audacity-1.2.0-r1.ebuild b/media-sound/audacity/audacity-1.2.0-r1.ebuild
index 77660f011ee3..2f777d53abca 100644
--- a/media-sound/audacity/audacity-1.2.0-r1.ebuild
+++ b/media-sound/audacity/audacity-1.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0-r1.ebuild,v 1.5 2004/06/24 23:51:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.0-r1.ebuild,v 1.6 2004/07/01 07:25:21 eradicator Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 IUSE="encode flac mad oggvorbis"
 SLOT="0"
-KEYWORDS="x86 ~ppc ~sparc"
+KEYWORDS="x86 ~ppc ~sparc -amd64"
 
 DEPEND=">=x11-libs/wxGTK-2.2.9
 	>=app-arch/zip-2.3
diff --git a/media-sound/audacity/audacity-1.2.1.ebuild b/media-sound/audacity/audacity-1.2.1.ebuild
index 4f46f9d27f18..016b2de32456 100644
--- a/media-sound/audacity/audacity-1.2.1.ebuild
+++ b/media-sound/audacity/audacity-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.1.ebuild,v 1.3 2004/06/24 23:51:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.1.ebuild,v 1.4 2004/07/01 07:25:21 eradicator Exp $
 
 MY_PV="${PV/_/-}"
 MY_P="${PN}-src-${MY_PV}"
@@ -13,6 +13,8 @@ RESTRICT="nomirror"
 LICENSE="GPL-2"
 IUSE="encode flac mad oggvorbis"
 SLOT="0"
+
+# Do not unmask on amd64 without talking to eradicator
 KEYWORDS="x86 ~ppc ~sparc ~amd64"
 
 DEPEND=">=x11-libs/wxGTK-2.2.9