Bumped to stable x86. Added pyvorbis dep to close bug #43934. Corrected DEPEND/RDEPEND.

4 files changed, 11 insertions, 50 deletions

diff --git a/media-sound/jack/ChangeLog b/media-sound/jack/ChangeLog
index 23d0b229f387..fc78e08d5c69 100644
--- a/media-sound/jack/ChangeLog
+++ b/media-sound/jack/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/jack
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.3 2004/02/15 13:05:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/ChangeLog,v 1.4 2004/03/21 04:40:26 eradicator Exp $
+
+  20 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> jack-2.99.9.ebuild,
+  jack-3.0.0.ebuild:
+  Bumped to stable x86.  added pyvorbis dep to close bug #43934.
 
   15 Feb 2004; David Holm <dholm@gentoo.org> jack-3.0.0.ebuild:
   Added to ~ppc.
diff --git a/media-sound/jack/files/digest-jack-2.99.9 b/media-sound/jack/files/digest-jack-2.99.9
deleted file mode 100644
index a7c314cbde0d..000000000000
--- a/media-sound/jack/files/digest-jack-2.99.9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 453a0628c583c44e9f485b203dbfb220 jack-2.99.9.tar.gz 304448
diff --git a/media-sound/jack/jack-2.99.9.ebuild b/media-sound/jack/jack-2.99.9.ebuild
deleted file mode 100644
index 035ffa176b4a..000000000000
--- a/media-sound/jack/jack-2.99.9.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-2.99.9.ebuild,v 1.4 2004/03/01 05:37:14 eradicator Exp $
-
-inherit distutils
-
-DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
-HOMEPAGE="http://www.home.unix-ag.org/arne/jack/"
-SRC_URI="http://www.home.unix-ag.org/arne/jack/${P}.tar.gz"
-
-KEYWORDS="~x86"
-SLOT="0"
-LICENSE="GPL-2"
-
-DEPEND=">=virtual/python-1.5.2
-	dev-python/cddb-py
-	dev-python/id3-py
-	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
-	media-sound/lame
-	media-sound/cdparanoia"
-
-src_compile() {
-	python setup-cursesmodule.py build || die "compilation failed"
-}
-
-src_install() {
-	python setup-cursesmodule.py install --root=${D} \
-		|| die "curses module install failed"
-
-	dobin jack
-
-	distutils_python_version
-	dodir /usr/lib/python${PYVER}/site-packages
-	insinto /usr/lib/python${PYVER}/site-packages
-	doins jack_*py
-
-	newman jack.man jack.1
-
-	dodoc README doc/ChangeLog doc/INSTALL doc/TODO
-
-	dohtml doc/*html doc/*css doc/*gif
-}
diff --git a/media-sound/jack/jack-3.0.0.ebuild b/media-sound/jack/jack-3.0.0.ebuild
index a23513ab980f..a3228d28dfcd 100644
--- a/media-sound/jack/jack-3.0.0.ebuild
+++ b/media-sound/jack/jack-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.0.0.ebuild,v 1.2 2004/02/15 13:05:17 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/jack/jack-3.0.0.ebuild,v 1.3 2004/03/21 04:40:26 eradicator Exp $
 
 inherit distutils
 
@@ -8,16 +8,18 @@ DESCRIPTION="A frontend for several cd-rippers and mp3 encoders"
 HOMEPAGE="http://www.home.unix-ag.org/arne/jack/"
 SRC_URI="http://www.home.unix-ag.org/arne/jack/${P}.tar.gz"
 
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 SLOT="0"
 LICENSE="GPL-2"
 
 DEPEND=">=virtual/python-1.5.2
+	sys-libs/ncurses"
+
+RDEPEND="${DEPEND}
 	dev-python/cddb-py
 	dev-python/id3-py
+	dev-python/pyvorbis
 	media-libs/flac
-	media-libs/libogg
-	media-libs/libvorbis
 	media-sound/lame
 	media-sound/cdparanoia"