new upstream version, fixes #89440

(Portage version: 2.0.51.19)

10 files changed, 20 insertions, 109 deletions

diff --git a/media-sound/streamripper/ChangeLog b/media-sound/streamripper/ChangeLog
index e8f5591bf31c..f3317dedca75 100644
--- a/media-sound/streamripper/ChangeLog
+++ b/media-sound/streamripper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/streamripper
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/ChangeLog,v 1.22 2005/04/04 18:20:39 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/ChangeLog,v 1.23 2005/04/18 16:45:48 luckyduck Exp $
+
+*streamripper-1.61.7 (18 Apr 2005)
+
+  18 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org>
+  streamripper-1.60.10.ebuild, -streamripper-1.60.8.ebuild,
+  -streamripper-1.60.ebuild, -streamripper-1.61.5.ebuild,
+  +streamripper-1.61.7.ebuild:
+  new upstream version, fixes #89440
 
 *streamripper-1.61.5 (04 Apr 2005)
 
diff --git a/media-sound/streamripper/Manifest b/media-sound/streamripper/Manifest
index 05707e597dc9..fe3844f668e9 100644
--- a/media-sound/streamripper/Manifest
+++ b/media-sound/streamripper/Manifest
@@ -1,13 +1,11 @@
-MD5 0285f5cf97b16b85d6d9c60a76cdfa21 streamripper-1.61.5.ebuild 873
-MD5 921d5052867278f8d76a93d9d7b7ca30 streamripper-1.60.ebuild 995
-MD5 6290054285bc624fc3d0b13c2c440883 streamripper-1.60.10.ebuild 971
-MD5 5c6529482aab7802afb3b2be093800ea streamripper-1.60.8.ebuild 947
+MD5 3dda3627f81e5ac0128fb0a5c926a103 streamripper-1.61.5.ebuild 845
+MD5 032a8b8e26faa1fc8c7b0e721c126c5b streamripper-1.61.7.ebuild 845
+MD5 d06c9fcda70cc5831ae3e60f0f7d3311 streamripper-1.60.10.ebuild 992
 MD5 8624493747d09e57f20ca46a47379c4b ChangeLog 3211
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 d9ccc9cd26549470b4fbb3f2a30a3362 files/digest-streamripper-1.60.10 72
-MD5 2288ebab62148f6e89111ee55bd0ad9a files/digest-streamripper-1.60 149
 MD5 f14a8f3e07e34e02752ffc14533b357d files/streamripper-1.60.8-syslibmad.patch 2661
 MD5 541244ccd6075be3d6b8faea14a3171d files/streamripper-1.60.5-syslibmad.patch 2290
 MD5 e7f48c69571878c1462918c755772c49 files/streamripper-1.60.5-interface.patch 14184
-MD5 842015e40d37b6ecfd836869deceb5c0 files/digest-streamripper-1.60.8 71
 MD5 47d4857ba50bf7f39081addf1d3770cd files/digest-streamripper-1.61.5 72
+MD5 f1ca63bdc20bab75b36a6877a3dd5a3f files/digest-streamripper-1.61.7 72
diff --git a/media-sound/streamripper/files/digest-streamripper-1.60 b/media-sound/streamripper/files/digest-streamripper-1.60
deleted file mode 100644
index 07a64672a35b..000000000000
--- a/media-sound/streamripper/files/digest-streamripper-1.60
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a8b742181971b0173dcd8dea8326c60d streamripper-1.60.tar.gz 399376
-MD5 6a29b268b619f04c12c69a3a0bcc5f64 streamripper-1.60-interface.patch.bz2 3438
diff --git a/media-sound/streamripper/files/digest-streamripper-1.60.8 b/media-sound/streamripper/files/digest-streamripper-1.60.8
deleted file mode 100644
index 504cd45a22c6..000000000000
--- a/media-sound/streamripper/files/digest-streamripper-1.60.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56b3c089e80149b3548ba0dab42e8062 streamripper-1.60.8.tar.gz 688444
diff --git a/media-sound/streamripper/files/digest-streamripper-1.61.5 b/media-sound/streamripper/files/digest-streamripper-1.61.5
deleted file mode 100644
index 72d06dc5af0e..000000000000
--- a/media-sound/streamripper/files/digest-streamripper-1.61.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38f2ea96fddccee5350b2711f75d1b6a streamripper-1.61.5.tar.gz 1154335
diff --git a/media-sound/streamripper/files/digest-streamripper-1.61.7 b/media-sound/streamripper/files/digest-streamripper-1.61.7
new file mode 100644
index 000000000000..1d7e807a8b1d
--- /dev/null
+++ b/media-sound/streamripper/files/digest-streamripper-1.61.7
@@ -0,0 +1 @@
+MD5 b17c5d0f3302e89ee26977a44182ecf4 streamripper-1.61.7.tar.gz 1156108
diff --git a/media-sound/streamripper/streamripper-1.60.10.ebuild b/media-sound/streamripper/streamripper-1.60.10.ebuild
index ff03d95c762b..080283b0a773 100644
--- a/media-sound/streamripper/streamripper-1.60.10.ebuild
+++ b/media-sound/streamripper/streamripper-1.60.10.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.60.10.ebuild,v 1.8 2005/03/26 00:28:12 hansmi Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.60.10.ebuild,v 1.9 2005/04/18 16:45:48 luckyduck Exp $
 
 inherit eutils
 
@@ -13,6 +11,7 @@ SRC_URI="http://streamripper.sourceforge.net/files/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
+IUSE=""
 
 RDEPEND="media-libs/libmad"
 DEPEND="${RDEPEND}
@@ -37,6 +36,6 @@ src_unpack() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc TODO README THANKS readme_xfade.txt
 }
diff --git a/media-sound/streamripper/streamripper-1.60.8.ebuild b/media-sound/streamripper/streamripper-1.60.8.ebuild
deleted file mode 100644
index dd1b9c7365b7..000000000000
--- a/media-sound/streamripper/streamripper-1.60.8.ebuild
+++ /dev/null
@@ -1,41 +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/streamripper/streamripper-1.60.8.ebuild,v 1.5 2005/03/26 00:28:12 hansmi Exp $
-
-inherit eutils
-
-DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams"
-HOMEPAGE="http://streamripper.sourceforge.net/"
-SRC_URI="http://streamripper.sourceforge.net/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~ppc sparc amd64"
-IUSE=""
-
-RDEPEND="media-libs/libmad"
-DEPEND="${RDEPEND}
-	>=sys-devel/automake-1.8"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	epatch ${FILESDIR}/${P}-syslibmad.patch
-
-	# Force package to use system libmad
-	rm -rf libmad-0.15.1b
-
-	export WANT_AUTOMAKE=1.8
-	export WANT_AUTOCONF=2.5
-
-	libtoolize --copy --force
-	aclocal
-	automake -a -f -c
-	autoconf
-}
-
-src_install() {
-	make install DESTDIR=${D} || die
-	dodoc TODO README THANKS readme_xfade.txt
-}
diff --git a/media-sound/streamripper/streamripper-1.60.ebuild b/media-sound/streamripper/streamripper-1.60.ebuild
deleted file mode 100644
index 796e77b3fcf1..000000000000
--- a/media-sound/streamripper/streamripper-1.60.ebuild
+++ /dev/null
@@ -1,42 +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/streamripper/streamripper-1.60.ebuild,v 1.4 2005/03/26 00:28:12 hansmi Exp $
-
-inherit eutils
-
-MY_P="${P/_/.}"
-DESCRIPTION="Extracts and records individual MP3 file tracks from shoutcast streams"
-HOMEPAGE="http://streamripper.sourceforge.net/"
-SRC_URI="http://streamripper.sourceforge.net/files/${MY_P}.tar.gz
-	mirror://gentoo/${P}-interface.patch.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc ~amd64"
-IUSE=""
-
-DEPEND="media-libs/libmad"
-
-S=${WORKDIR}/${MY_P}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${P}-interface.patch
-
-	# Force package to use system libmad
-	cd ${S}
-	sed -i 's:libmad::' configure
-	rm libmad/*
-	echo 'all:' > libmad/Makefile
-}
-
-src_compile() {
-	econf || die
-	emake MADLIBOBJS=/usr/lib/libmad.so || die
-}
-
-src_install() {
-	dobin streamripper || die
-	doman streamripper.1
-	dodoc CHANGES README THANKS TODO readme_xfade.txt
-}
diff --git a/media-sound/streamripper/streamripper-1.61.5.ebuild b/media-sound/streamripper/streamripper-1.61.7.ebuild
index 2e260fd8ce81..18e226927037 100644
--- a/media-sound/streamripper/streamripper-1.61.5.ebuild
+++ b/media-sound/streamripper/streamripper-1.61.7.ebuild
@@ -1,8 +1,7 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.61.5.ebuild,v 1.1 2005/04/04 18:20:39 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/streamripper/streamripper-1.61.7.ebuild,v 1.1 2005/04/18 16:45:48 luckyduck Exp $
 
-IUSE=""
 
 inherit eutils
 
@@ -13,6 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
 
 RDEPEND="media-libs/libmad"
 DEPEND="${RDEPEND}
@@ -20,22 +20,14 @@ DEPEND="${RDEPEND}
 
 src_unpack() {
 	unpack ${A}
-
 	cd ${S}
 
 	# Force package to use system libmad
 	rm -rf libmad*
 	sed -i -e 's/libmad//' Makefile.in || die
-
-}
-
-src_compile() {
-	econf || die
-	emake || die
-
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	make DESTDIR="${D}" install || die "make install failed"
 	dodoc TODO README THANKS readme_xfade.txt
 }