Removing beta ebuild due to filename conflict with final version. RESTRICT=nomirror since we're grabbing from sf.net

6 files changed, 11 insertions, 80 deletions

diff --git a/media-sound/zinf/ChangeLog b/media-sound/zinf/ChangeLog
index c2cfe6706f6b..55651e89a848 100644
--- a/media-sound/zinf/ChangeLog
+++ b/media-sound/zinf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/zinf
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.18 2004/02/15 13:55:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.19 2004/02/16 20:45:42 eradicator Exp $
+
+  16 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.5.ebuild,
+  zinf-2.2.5_beta1.ebuild:
+  Removing beta ebuild due to filename conflict with final version.
+  RESTRICT=nomirror since we're grabbing from sf.net
 
 *zinf-2.2.5 (15 Feb 2004)
 
diff --git a/media-sound/zinf/Manifest b/media-sound/zinf/Manifest
index 679643c5616c..f757f02060a4 100644
--- a/media-sound/zinf/Manifest
+++ b/media-sound/zinf/Manifest
@@ -1,12 +1,10 @@
 MD5 99e90d25c66bc6c1d4f2ac0a7c3a99c6 zinf-2.2.3.ebuild 1946
-MD5 6dfcebc875fd1f3689fadbb75d6f2ce9 zinf-2.2.5.ebuild 1751
-MD5 4eb44572ed24fa07100491dd18730300 zinf-2.2.5_beta1.ebuild 1755
+MD5 d2a694df65b939f8f3d82842bae0e23c zinf-2.2.5.ebuild 1770
 MD5 a51004f5d04df70c2198b5fff5e20ff2 zinf-2.2.4.ebuild 1943
 MD5 ad04625232e51d8c57f0e8779ca01763 ChangeLog 3046
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 9bacc991fb720230529477fc4523e799 files/digest-zinf-2.2.5_beta1 63
 MD5 2a5b9b0fb8d24a260c166417a2b2fd95 files/zinf-2.2.4-pref.patch 483
 MD5 fe732feaa32b4d6a4f23daa309056288 files/zinf-2.2.3-id3.patch.bz2 12466
 MD5 789bfd8c9959727ea1bd1176b15f8104 files/digest-zinf-2.2.3 63
 MD5 be366a51d3b8fec4068ae8a3f932dcae files/digest-zinf-2.2.4 63
-MD5 212b494996e95b76474e6ddb5c2c850b files/digest-zinf-2.2.5 63
+MD5 9533135ae7a1737f4c5427edfde70088 files/digest-zinf-2.2.5 63
diff --git a/media-sound/zinf/files/digest-zinf-2.2.5 b/media-sound/zinf/files/digest-zinf-2.2.5
index 12cfcd59c17a..c9e0195b3a14 100644
--- a/media-sound/zinf/files/digest-zinf-2.2.5
+++ b/media-sound/zinf/files/digest-zinf-2.2.5
@@ -1 +1 @@
-MD5 1bf1634ad89559d98f5d482c38532c22 zinf-2.2.5.tar.gz 2010567
+MD5 1f2512ff445458d363425533607b471a zinf-2.2.5.tar.gz 2043701
diff --git a/media-sound/zinf/files/digest-zinf-2.2.5_beta1 b/media-sound/zinf/files/digest-zinf-2.2.5_beta1
deleted file mode 100644
index 54ccf6be8692..000000000000
--- a/media-sound/zinf/files/digest-zinf-2.2.5_beta1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 727db1d0d2673f68639d343ca0ec9895 zinf-2.2.5.tar.gz 2033289
diff --git a/media-sound/zinf/zinf-2.2.5.ebuild b/media-sound/zinf/zinf-2.2.5.ebuild
index 93b07faeccd4..05d5b9131f98 100644
--- a/media-sound/zinf/zinf-2.2.5.ebuild
+++ b/media-sound/zinf/zinf-2.2.5.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/zinf/zinf-2.2.5.ebuild,v 1.1 2004/02/15 13:55:57 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5.ebuild,v 1.2 2004/02/16 20:45:42 eradicator Exp $
 
 inherit kde-functions
 
@@ -11,7 +11,7 @@ S=${WORKDIR}/${MY_P}
 DESCRIPTION="An extremely full-featured mp3/vorbis/cd player with ALSA support, previously called FreeAmp"
 HOMEPAGE="http://www.zinf.org/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
+RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86"
diff --git a/media-sound/zinf/zinf-2.2.5_beta1.ebuild b/media-sound/zinf/zinf-2.2.5_beta1.ebuild
deleted file mode 100644
index 178603ee43dd..000000000000
--- a/media-sound/zinf/zinf-2.2.5_beta1.ebuild
+++ /dev/null
@@ -1,71 +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/zinf/zinf-2.2.5_beta1.ebuild,v 1.3 2004/02/11 22:19:10 vapier Exp $
-
-inherit kde-functions
-
-MY_PV="${PV/_beta1/}"
-MY_P="${PN}-${MY_PV}"
-S=${WORKDIR}/${MY_P}
-
-DESCRIPTION="An extremely full-featured mp3/vorbis/cd player with ALSA support, previously called FreeAmp"
-HOMEPAGE="http://www.zinf.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="debug esd X gtk oggvorbis gnome arts alsa nls"
-
-RDEPEND="=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
-	sys-libs/zlib
-	>=sys-libs/ncurses-5.2
-	=media-libs/freetype-1*
-	>=media-libs/musicbrainz-1.0.1
-	X? ( virtual/x11 )
-	esd? ( media-sound/esound )
-	gtk? ( >=media-libs/gdk-pixbuf-0.8 )
-	gnome? ( gnome-base/ORBit )
-	oggvorbis? ( media-libs/libvorbis )
-	alsa? ( >=media-libs/alsa-lib-0.9.8 )
-	arts? ( kde-base/arts )"
-# When updating next, check boost to see if the newer versions fix compilation
-DEPEND="${RDEPEND}
-	x86? ( dev-lang/nasm )
-	nls? ( sys-devel/gettext )
-	>=media-libs/id3lib-3.8.0
-	dev-libs/boost
-	dev-db/metakit
-	dev-lang/perl"
-
-src_compile() {
-	local myconf="--enable-cmdline"
-
-	myconf="${myconf} `use_enable debug`"
-	myconf="${myconf} `use_enable esd`"
-	myconf="${myconf} `use_enable arts`"
-	myconf="${myconf} `use_enable alsa`"
-	myconf="${myconf} `use_enable gnome cobra`"
-
-	if use arts; then
-		set-kdedir 3
-		export ARTSCCONFIG="$KDEDIR/bin/artsc-config"
-	fi
-
-	econf ${myconf} || die
-	make || die
-}
-
-src_install() {
-	into /usr
-	dobin base/zinf
-
-	exeinto /usr/lib/zinf/plugins
-	doexe plugins/*
-
-	insinto /usr/share/zinf/themes
-	doins themes/*
-
-	dodoc AUTHORS ChangeLog NEWS README
-}