Remove stale versions, fix ogg bug (see ChangeLog)

9 files changed, 16 insertions, 52 deletions

diff --git a/media-sound/juk/ChangeLog b/media-sound/juk/ChangeLog
index 59ab71ab4c5c..410db0a19ec1 100644
--- a/media-sound/juk/ChangeLog
+++ b/media-sound/juk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/juk
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/juk/ChangeLog,v 1.5 2003/09/20 13:10:52 jje Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/juk/ChangeLog,v 1.6 2003/10/31 18:15:20 caleb Exp $
+
+  31 Oct 2003; Caleb Tennis <caleb@gentoo.org> juk-1.0_p1.ebuild,
+  juk-2.0_beta1-r1.ebuild, juk-2.0_beta1.ebuild:
+  Remove stale versions, and set the SRC_URI to the proper file
+  (should be 1.95a instead of 1.95).  Fixes bug #30325 without a patch.
 
 *juk-2.0_beta1-r1 (20 Sep 2003)
 
diff --git a/media-sound/juk/Manifest b/media-sound/juk/Manifest
index ca57bf3a5771..784f3b318bf6 100644
--- a/media-sound/juk/Manifest
+++ b/media-sound/juk/Manifest
@@ -1,13 +1,6 @@
-MD5 90beef717c95194318949de04e01cb20 juk-2.0_beta1-r2.ebuild 750
+MD5 250073adf52619db8e495bdc1dcc3e44 juk-2.0_beta1-r2.ebuild 710
 MD5 98f08502ed677930d96509a3d08d4d0a juk-1.1.ebuild 587
-MD5 36bd2da7f24dfa0caa9db1e53c51e94d juk-1.0_p1.ebuild 607
-MD5 f179ba3c166e8a7fb87023569e124150 juk-2.0_beta1.ebuild 632
-MD5 871298743a2cc3d871ba2fbd9b3ccb8a juk-2.0_beta1-r1.ebuild 749
-MD5 6b4a553d6a57bce2f176d0d7281865ce ChangeLog 983
+MD5 a4ded11cff8fe050037de10b3970fb5e ChangeLog 1237
 MD5 1b6808bbd78c9161f8b7efb090d966f8 metadata.xml 162
-MD5 81b9791dfd5426c2dec36b1c899f2349 files/digest-juk-2.0_beta1 60
 MD5 b3db71172386f86837027560598cf62e files/digest-juk-1.1 59
-MD5 81b9791dfd5426c2dec36b1c899f2349 files/digest-juk-2.0_beta1-r1 60
 MD5 526acb8baf65545d1d3eb73604bb2e99 files/digest-juk-2.0_beta1-r2 61
-MD5 dbd4b7b71936891f6cc92d162118e76e files/juk-2.0_beta1-fix-ogg.patch 533
-MD5 57e69a74f7ed7c94cf0047e53d2e16c4 files/digest-juk-1.0_p1 61
diff --git a/media-sound/juk/files/digest-juk-1.0_p1 b/media-sound/juk/files/digest-juk-1.0_p1
deleted file mode 100644
index e7140f29f653..000000000000
--- a/media-sound/juk/files/digest-juk-1.0_p1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 52373efb9db08946437ee2c5ec54a95a juk-1.0-1.tar.gz 623082
diff --git a/media-sound/juk/files/digest-juk-2.0_beta1 b/media-sound/juk/files/digest-juk-2.0_beta1
deleted file mode 100644
index 3a4516c049a6..000000000000
--- a/media-sound/juk/files/digest-juk-2.0_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f57303d60ce67ec20987287ca2c5d98b juk-1.95.tar.gz 997875
diff --git a/media-sound/juk/files/digest-juk-2.0_beta1-r1 b/media-sound/juk/files/digest-juk-2.0_beta1-r1
deleted file mode 100644
index 3a4516c049a6..000000000000
--- a/media-sound/juk/files/digest-juk-2.0_beta1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f57303d60ce67ec20987287ca2c5d98b juk-1.95.tar.gz 997875
diff --git a/media-sound/juk/files/digest-juk-2.0_beta1-r2 b/media-sound/juk/files/digest-juk-2.0_beta1-r2
new file mode 100644
index 000000000000..e80814df5555
--- /dev/null
+++ b/media-sound/juk/files/digest-juk-2.0_beta1-r2
@@ -0,0 +1 @@
+MD5 4217cd546b98aa3d4be901df62119e9b juk-1.95a.tar.gz 997643
diff --git a/media-sound/juk/juk-1.0_p1.ebuild b/media-sound/juk/juk-1.0_p1.ebuild
deleted file mode 100644
index 70534e58632f..000000000000
--- a/media-sound/juk/juk-1.0_p1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/juk/juk-1.0_p1.ebuild,v 1.2 2003/07/12 20:30:52 aliz Exp $
-
-inherit kde-base
-need-kde 3.1 # see its website - it says it really needs >=3.1
-
-newdepend ">=media-libs/id3lib-3.8
-	    >=kde-base/kdemultimedia-3.1"
-
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="x86"
-DESCRIPTION="Jukebox and music manager for the KDE desktop"
-SRC_URI="http://www.slackorama.net/oss/${PN}/${P//_p/-}.tar.gz"
-HOMEPAGE="http://www.slackorama.net/oss/juk/"
-S="${WORKDIR}/juk-1.0"
diff --git a/media-sound/juk/juk-2.0_beta1-r1.ebuild b/media-sound/juk/juk-2.0_beta1-r2.ebuild
index 0ec199813379..2cbad157572f 100644
--- a/media-sound/juk/juk-2.0_beta1-r1.ebuild
+++ b/media-sound/juk/juk-2.0_beta1-r2.ebuild
@@ -1,14 +1,14 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/juk/juk-2.0_beta1-r1.ebuild,v 1.2 2003/10/03 13:56:06 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/juk/juk-2.0_beta1-r2.ebuild,v 1.1 2003/10/31 18:15:20 caleb Exp $
 
-inherit kde-base
+inherit kde
 need-kde 3.1 # see its website - it says it really needs >=3.1
 
 newdepend ">=media-libs/id3lib-3.8
 	   >=kde-base/kdemultimedia-3.1"
 
-MY_P="juk-1.95"
+MY_P="juk-1.95a"
 S=${WORKDIR}/${MY_P}
 
 IUSE=""
@@ -18,6 +18,10 @@ DESCRIPTION="Jukebox and music manager for the KDE desktop"
 SRC_URI="http://developer.kde.org/~wheeler/files/src/${MY_P}.tar.gz"
 HOMEPAGE="http://www.slackorama.net/oss/juk/"
 
+src_unpack() {
+	kde_src_unpack
+}
+
 src_compile() {
 	econf || die
 	emake || die
diff --git a/media-sound/juk/juk-2.0_beta1.ebuild b/media-sound/juk/juk-2.0_beta1.ebuild
deleted file mode 100644
index 9dd3b054be68..000000000000
--- a/media-sound/juk/juk-2.0_beta1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/juk/juk-2.0_beta1.ebuild,v 1.1 2003/08/26 14:23:26 caleb Exp $
-
-inherit kde-base
-need-kde 3.1 # see its website - it says it really needs >=3.1
-
-newdepend ">=media-libs/id3lib-3.8
-	   >=kde-base/kdemultimedia-3.1"
-
-MY_P="juk-1.95"
-S=${WORKDIR}/${MY_P}
-
-IUSE=""
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-DESCRIPTION="Jukebox and music manager for the KDE desktop"
-SRC_URI="http://developer.kde.org/~wheeler/files/src/${MY_P}.tar.gz"
-HOMEPAGE="http://www.slackorama.net/oss/juk/"