8 files changed, 4 insertions, 303 deletions
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 875e1bc82117..2109b8cdd039 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -10,47 +10,19 @@ AUX audacity-1.3.0b-x86.patch 1278 RMD160 3b9a2af0fc9c4c4b6287112cd035205c6eb508
 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 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
-MD5 93c9059ec89a928748fbc4c6ff7ce950 audacity-1.2.1.ebuild 2263
-RMD160 6a76742c6d067e4f42cbd3ea8a24f52cfdf8a55e audacity-1.2.1.ebuild 2263
-SHA256 f93c97a76b5361e4ea3b8a21c3868cd3b0e57f12265047cc510a97f6fbcbb139 audacity-1.2.1.ebuild 2263
-EBUILD audacity-1.2.3.ebuild 2175 RMD160 51aa5e0400c9fcb04dc1b50b92c2d1efd8b17330 SHA1 a7aad717f3b17d287ab62fcbd277b308f861dd2a SHA256 4a5bd7dc10e92a34f047eaca4b99b18199f48d89620dfc079b87bb7b7519932c
-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 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 1573 RMD160 5005afb897ea3550edd72db97ef25133e5ebf673 SHA1 a29f66a5eeba25e0ff34dc2c6788ed273fba8673 SHA256 b376bb19fd9185bcdc63b4da7d62304b7a795a5d79bdb61d2ae0da4476081b6c
 MD5 0a21ba61cb716c2c973da46f569e7827 audacity-1.3.0b.ebuild 1573
 RMD160 5005afb897ea3550edd72db97ef25133e5ebf673 audacity-1.3.0b.ebuild 1573
 SHA256 b376bb19fd9185bcdc63b4da7d62304b7a795a5d79bdb61d2ae0da4476081b6c audacity-1.3.0b.ebuild 1573
-MISC ChangeLog 8685 RMD160 fee80da03ac201a18d9acc4154b8f6f09c2306a6 SHA1 d6507e59a9c1a1afe42e665f91a63f31daaa09ce SHA256 258da71b1e68e5d0cb830f7f85ba82c023ece1a0a065e669090e347d1201b1e3
-MD5 cc931ddc59e81dae765949691179c4e2 ChangeLog 8685
-RMD160 fee80da03ac201a18d9acc4154b8f6f09c2306a6 ChangeLog 8685
-SHA256 258da71b1e68e5d0cb830f7f85ba82c023ece1a0a065e669090e347d1201b1e3 ChangeLog 8685
+MISC ChangeLog 8861 RMD160 e29a5a074cdd941f7360f20a82912f1893278a05 SHA1 ef0540ff62fb1fb1c244706b3fcf3cbfeb70a5c6 SHA256 7d3a02f3fe746345d8a6def378462f626f3adfa66335951fe5dffb720280e6b9
+MD5 669697776a8402674267bdad2e51b6e1 ChangeLog 8861
+RMD160 e29a5a074cdd941f7360f20a82912f1893278a05 ChangeLog 8861
+SHA256 7d3a02f3fe746345d8a6def378462f626f3adfa66335951fe5dffb720280e6b9 ChangeLog 8861
 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 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
 MD5 a0e48e967a9c450f62afb1d8e879d7e1 files/digest-audacity-1.3.0b 262
 RMD160 ac06a2a7424a43ec4eb978934ed239787bbf051b files/digest-audacity-1.3.0b 262
 SHA256 6b57e9e5b74084d73ba901bf32af44a0e9b4bf4eb1da81905f1f7ae523d91e27 files/digest-audacity-1.3.0b 262
diff --git a/media-sound/audacity/audacity-1.2.1.ebuild b/media-sound/audacity/audacity-1.2.1.ebuild
deleted file mode 100644
index 3ce53feb4889..000000000000
--- a/media-sound/audacity/audacity-1.2.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2005 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.7 2005/12/26 14:38:49 lu_zero Exp $
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-src-${MY_PV}"
-
-DESCRIPTION="A free, crossplatform audio editor."
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-RESTRICT="nomirror"
-
-LICENSE="GPL-2"
-IUSE="encode flac mad vorbis"
-SLOT="0"
-
-# Do not unmask on amd64 without talking to eradicator
-KEYWORDS="x86 ~ppc ~sparc ~amd64"
-
-DEPEND="=x11-libs/wxGTK-2.4*
-	>=app-arch/zip-2.3
-	>=media-libs/id3lib-3.8.0
-	media-libs/libid3tag
-	>=media-libs/libsndfile-1.0.0
-	>=media-libs/libsamplerate-0.0.14
-	>=media-libs/ladspa-sdk-1.12
-	flac? ( media-libs/flac )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mad? ( >=media-sound/madplay-0.14 )
-	encode? ( >=media-sound/lame-3.92 )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOC="LICENSE.txt README.txt audacity-1.2-help.htb"
-
-pkg_setup() {
-	if wx-config --cppflags | grep gtk2u >& /dev/null; then
-		einfo "Audacity will not build if wxGTK was compiled"
-		einfo "with unicode support.  If you are using a version of"
-		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
-		einfo "you must set USE=-unicode."
-		die "wxGTK must be re-emerged without unicode suport"
-	fi
-}
-
-src_compile() {
-	local myconf;
-
-	myconf="--with-libsndfile=system --with-id3tag=system"
-
-	# MAD support
-	if use mad; then
-		myconf="${myconf} --with-libmad=system"
-	else
-		myconf="${myconf} --with-libmad=none"
-	fi
-
-	# FLAC support
-	if use flac; then
-		myconf="${myconf} --with-libflac=system"
-	else
-		myconf="${myconf} --with-libflac=none"
-	fi
-
-	# Ogg Vorbis support
-	if use vorbis; then
-		myconf="${myconf} --with-vorbis=system"
-	else
-		myconf="${myconf} --with-vorbis=none"
-	fi
-
-	econf ${myconf} || die
-
-	# parallel borks 
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR=${D} install || die
-
-	# Install our docs
-	dodoc ${DOC}
-
-	# Remove bad doc install
-	rm -rf ${D}/share/doc
-
-	insinto /usr/share/gnome/apps/Multimedia
-	doins ${FILESDIR}/audacity.desktop
-	insinto /usr/share/applnk/Multimedia
-	doins ${FILESDIR}/audacity.desktop
-	insinto /usr/share/applications
-	doins ${FILESDIR}/audacity.desktop
-}
diff --git a/media-sound/audacity/audacity-1.2.3.ebuild b/media-sound/audacity/audacity-1.2.3.ebuild
deleted file mode 100644
index bb9b32d6d7df..000000000000
--- a/media-sound/audacity/audacity-1.2.3.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/audacity/audacity-1.2.3.ebuild,v 1.7 2005/12/26 14:38:49 lu_zero Exp $
-
-IUSE="encode flac mad vorbis"
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-src-${MY_PV}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="A free, crossplatform audio editor."
-HOMEPAGE="http://audacity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-# amd64: causes xfce pannel to crash...
-# Bad x86 assembly: #73248
-KEYWORDS="~amd64 ~ppc sparc -x86 ppc64"
-
-DEPEND="=x11-libs/wxGTK-2.4*
-	>=app-arch/zip-2.3
-	>=media-libs/id3lib-3.8.0
-	media-libs/libid3tag
-	>=media-libs/libsndfile-1.0.0
-	>=media-libs/libsamplerate-0.0.14
-	>=media-libs/ladspa-sdk-1.12
-	flac? ( media-libs/flac )
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	mad? ( >=media-sound/madplay-0.14 )
-	encode? ( >=media-sound/lame-3.92 )"
-
-pkg_setup() {
-	if wx-config --cppflags | grep gtk2u >& /dev/null; then
-		einfo "Audacity will not build if wxGTK was compiled"
-		einfo "with unicode support.  If you are using a version of"
-		einfo "wxGTK <= 2.4.2, you must set USE=-gtk2.  In newer versions,"
-		einfo "you must set USE=-unicode."
-		die "wxGTK must be re-emerged without unicode suport"
-	fi
-}
-
-src_compile() {
-	local myconf;
-
-	myconf="--with-libsndfile=system --with-id3tag=system"
-
-	# MAD support
-	if use mad; then
-		myconf="${myconf} --with-libmad=system"
-	else
-		myconf="${myconf} --with-libmad=none"
-	fi
-
-	# FLAC support
-	if use flac; then
-		myconf="${myconf} --with-libflac=system"
-	else
-		myconf="${myconf} --with-libflac=none"
-	fi
-
-	# Ogg Vorbis support
-	if use vorbis; then
-		myconf="${myconf} --with-vorbis=system"
-	else
-		myconf="${myconf} --with-vorbis=none"
-	fi
-
-	econf ${myconf} || die
-
-	# parallel borks 
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	# Install our docs
-	dodoc LICENSE.txt README.txt audacity-1.2-help.htb
-
-	# Remove bad doc install
-	rm -rf ${D}/share/doc
-
-	insinto /usr/share/pixmaps
-	newins images/AudacityLogo48x48.xpm audacity.xpm
-
-	insinto /usr/share/applications
-	doins ${FILESDIR}/audacity.desktop
-}
diff --git a/media-sound/audacity/audacity-1.2.4b-r1.ebuild b/media-sound/audacity/audacity-1.2.4b-r1.ebuild
deleted file mode 100644
index 13ca3e2bcb19..000000000000
--- a/media-sound/audacity/audacity-1.2.4b-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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.3 2006/08/06 02:22:41 matsuu Exp $
-
-inherit wxwidgets eutils flag-o-matic
-
-IUSE="encode mad vorbis"
-
-MY_P="${PN}-src-${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://audacity.sourceforge.net/"
-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
-	media-libs/libid3tag
-	>=media-libs/libsndfile-1.0.0
-	vorbis? ( >=media-libs/libvorbis-1.0 )
-	encode? ( >=media-sound/lame-3.92 )
-	mad? ( >=media-libs/libmad-0.14.2b )"
-
-WX_GTK_VER="2.4"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-1.2.3-gcc41.patch # bug 113754
-	epatch "${FILESDIR}"/${PN}-1.2.3-x86.patch # bug 121634
-}
-
-src_compile() {
-	if built_with_use '=x11-libs/wxGTK-2.4*' gtk2 ; then
-		need-wxwidgets gtk2
-	else
-		need-wxwidgets gtk
-	fi
-
-	filter-flags -fPIC
-
-	econf \
-		$(use_with mad libmad system) \
-		$(use_with vorbis vorbis system) \
-		--with-id3tag=system \
-		--with-libsndfile=system || die
-
-	# parallel borks
-	emake -j1 || die
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die
-
-	# Remove bad doc install
-	rm -rf ${D}/usr/share/doc
-
-	# Install our docs
-	dodoc README.txt audacity-1.2-help.htb
-
-	insinto /usr/share/icons/hicolor/48x48/apps
-	newins images/AudacityLogo48x48.xpm audacity.xpm
-
-	make_desktop_entry audacity Audacity audacity
-}
diff --git a/media-sound/audacity/files/audacity.desktop b/media-sound/audacity/files/audacity.desktop
deleted file mode 100644
index a1619f271fc6..000000000000
--- a/media-sound/audacity/files/audacity.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Audacity
-Comment=Sound Editor
-Exec=/usr/bin/audacity
-Icon=audacity.xpm
-Terminal=0
-Type=Application
-Categories=Application;AudioVideo;
diff --git a/media-sound/audacity/files/digest-audacity-1.2.1 b/media-sound/audacity/files/digest-audacity-1.2.1
deleted file mode 100644
index fccf4dd0e914..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.2.1
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 0b661c21f3ac..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.2.3
+++ /dev/null
@@ -1,3 +0,0 @@
-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
diff --git a/media-sound/audacity/files/digest-audacity-1.2.4b-r1 b/media-sound/audacity/files/digest-audacity-1.2.4b-r1
deleted file mode 100644
index ea0d798f8d94..000000000000
--- a/media-sound/audacity/files/digest-audacity-1.2.4b-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 37df5b6119302f7ab77ca16d25311756 audacity-src-1.2.4b.tar.gz 4499894
-RMD160 4c6609b200a86ff081ecaa1789525404031563d6 audacity-src-1.2.4b.tar.gz 4499894
-SHA256 7c6f53ceffc10fbff96cc3fdf2a2b61072ed8b527d4f7313b3216390907de113 audacity-src-1.2.4b.tar.gz 4499894