Fixed DEPs, and stuff caught by aliz's QA script.

5 files changed, 25 insertions, 27 deletions

diff --git a/media-sound/zinf/ChangeLog b/media-sound/zinf/ChangeLog
index 07481e526370..47c71427bd6f 100644
--- a/media-sound/zinf/ChangeLog
+++ b/media-sound/zinf/ChangeLog
@@ -1,6 +1,10 @@
 # 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.22 2004/02/24 02:07:17 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.23 2004/03/26 21:13:37 eradicator Exp $
+
+  26 Mar 2004; Jeremy Huddleston <eradicator@gentoo.org> zinf-2.2.3.ebuild,
+  zinf-2.2.4.ebuild, zinf-2.2.5.ebuild:
+  Fixed DEPs, and stuff caught by aliz's QA script.
 
   24 Feb 2004; Sven Blumenstein <bazik@gentoo.org> zinf-2.2.5.ebuild:
   Masked on sparc. Segfault on playing mp3 :(
diff --git a/media-sound/zinf/Manifest b/media-sound/zinf/Manifest
index 3da6ae914152..951f1981c7ad 100644
--- a/media-sound/zinf/Manifest
+++ b/media-sound/zinf/Manifest
@@ -1,7 +1,7 @@
-MD5 99e90d25c66bc6c1d4f2ac0a7c3a99c6 zinf-2.2.3.ebuild 1946
-MD5 8e8713580170abd5de05eded7c331510 zinf-2.2.5.ebuild 1878
-MD5 a51004f5d04df70c2198b5fff5e20ff2 zinf-2.2.4.ebuild 1943
-MD5 6fae336f96f7994b2515ad407156e437 ChangeLog 3654
+MD5 f7dcaa880f6c587167c265943347aa7a zinf-2.2.3.ebuild 1935
+MD5 3866c20ab73cc6b0611ece4cb0eb8a37 zinf-2.2.5.ebuild 1823
+MD5 fbe38d5f389cdac420890bf3ed72731c zinf-2.2.4.ebuild 1932
+MD5 d06acea154afb800dbff85d47077c5bf ChangeLog 3828
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
 MD5 2a5b9b0fb8d24a260c166417a2b2fd95 files/zinf-2.2.4-pref.patch 483
 MD5 fe732feaa32b4d6a4f23daa309056288 files/zinf-2.2.3-id3.patch.bz2 12466
diff --git a/media-sound/zinf/zinf-2.2.3.ebuild b/media-sound/zinf/zinf-2.2.3.ebuild
index 8b5a470b3938..554c9accddb7 100644
--- a/media-sound/zinf/zinf-2.2.3.ebuild
+++ b/media-sound/zinf/zinf-2.2.3.ebuild
@@ -1,12 +1,11 @@
 # 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.3.ebuild,v 1.10 2004/02/08 03:06:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.3.ebuild,v 1.11 2004/03/26 21:13:37 eradicator Exp $
 
 IUSE="debug esd X gtk oggvorbis gnome arts alsa nls"
 
-inherit kde-functions
+inherit kde-functions eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="An extremely full-featured mp3/vorbis/cd player with ALSA support, previously called FreeAmp"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
@@ -58,7 +57,7 @@ src_compile() {
 	myconf="${myconf} `use_enable esd`"
 	myconf="${myconf} `use_enable arts`"
 	myconf="${myconf} `use_enable alsa`"
-	myconf="${myconf} `use_enable gnome cobra`"
+	myconf="${myconf} `use_enable gnome corba`"
 
 	if use arts; then
 		set-kdedir 3
diff --git a/media-sound/zinf/zinf-2.2.4.ebuild b/media-sound/zinf/zinf-2.2.4.ebuild
index aedb8f3ba707..8d46895527e7 100644
--- a/media-sound/zinf/zinf-2.2.4.ebuild
+++ b/media-sound/zinf/zinf-2.2.4.ebuild
@@ -1,12 +1,11 @@
 # 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.4.ebuild,v 1.6 2004/02/09 03:27:14 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.4.ebuild,v 1.7 2004/03/26 21:13:37 eradicator Exp $
 
 IUSE="debug esd X gtk oggvorbis gnome arts nls"
 
-inherit kde-functions
+inherit kde-functions eutils
 
-S=${WORKDIR}/${P}
 DESCRIPTION="An extremely full-featured mp3/vorbis/cd player with ALSA support, previously called FreeAmp"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
@@ -51,7 +50,7 @@ src_compile() {
 	myconf="${myconf} `use_enable arts`"
 #	myconf="${myconf} `use_enable alsa`"
 	myconf="${myconf} --disable-alsa"
-	myconf="${myconf} `use_enable gnome cobra`"
+	myconf="${myconf} `use_enable gnome corba`"
 
 	if use arts; then
 		set-kdedir 3
diff --git a/media-sound/zinf/zinf-2.2.5.ebuild b/media-sound/zinf/zinf-2.2.5.ebuild
index 9bd0ed5c30c8..1b952e634b0e 100644
--- a/media-sound/zinf/zinf-2.2.5.ebuild
+++ b/media-sound/zinf/zinf-2.2.5.ebuild
@@ -1,35 +1,30 @@
 # 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.4 2004/02/24 02:07:18 bazik Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.5.ebuild,v 1.5 2004/03/26 21:13:37 eradicator Exp $
 
-inherit kde-functions
-
-MY_PV="${PV/_beta1/}"
-MY_P="${PN}-${MY_PV}"
-S=${WORKDIR}/${MY_P}
+inherit kde-functions eutils
 
 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"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 RESTRICT="nomirror"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~amd64 -sparc"
-IUSE="debug esd X gtk oggvorbis gnome arts alsa nls"
+IUSE="debug esd X gtk oggvorbis gnome arts alsa nls ipv6"
 
-RDEPEND="=dev-libs/glib-1.2*
-	=x11-libs/gtk+-1.2*
+RDEPEND=">=dev-libs/glib-2.0.0
 	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 )
+	gtk? ( >=x11-libs/gtk+-2.0.0 )
+	gnome? ( >=gnome-base/ORBit-0.5.0 )
 	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 )
@@ -46,7 +41,8 @@ src_compile() {
 	myconf="${myconf} `use_enable esd`"
 	myconf="${myconf} `use_enable arts`"
 	myconf="${myconf} `use_enable alsa`"
-	myconf="${myconf} `use_enable gnome cobra`"
+	myconf="${myconf} `use_enable gnome corba`"
+	myconf="${myconf} `use_enable ipv6`"
 
 	if [ $ARCH == "amd64" ]; then
 		replace-flags -O? -O