Removing broken ebuild (2.2.0). Version Bump (2.2.5_beta1). 2.2.3 now in stable x86. Added support for more USE flags. Cleaned up DEPEND/RDEPEND. Remove -Werror so it compiles with gcc 3.3. Closes bugs #29875, #33085, and #38556.

9 files changed, 160 insertions, 126 deletions

diff --git a/media-sound/zinf/ChangeLog b/media-sound/zinf/ChangeLog
index 5187421e03a2..7d7a8ef55249 100644
--- a/media-sound/zinf/ChangeLog
+++ b/media-sound/zinf/ChangeLog
@@ -1,6 +1,16 @@
 # 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.15 2004/01/19 20:55:57 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/ChangeLog,v 1.16 2004/02/08 03:06:27 eradicator Exp $
+
+*zinf-2.2.5_beta1 (07 Feb 2004)
+
+  07 Feb 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
+  zinf-2.2.0.ebuild, zinf-2.2.3.ebuild, zinf-2.2.4.ebuild,
+  zinf-2.2.5_beta1.ebuild:
+  Removing broken ebuild (2.2.0). Version Bump (2.2.5_beta1). 2.2.3 now in
+  stable x86. Added support for more USE flags. Cleaned up DEPEND/RDEPEND.
+  Remove -Werror so it compiles with gcc 3.3.  Closes bugs #29875, #33085,
+  and #38556.
 
 *zinf-2.2.3 (19 Jan 2004)
 
diff --git a/media-sound/zinf/Manifest b/media-sound/zinf/Manifest
index bd16fa276f28..aba71dc7f8db 100644
--- a/media-sound/zinf/Manifest
+++ b/media-sound/zinf/Manifest
@@ -1,8 +1,9 @@
-MD5 c18394f46dc7c8c440db7560ad1e1155 zinf-2.2.3.ebuild 1697
-MD5 ec772e11f46e89240bca1edb0d23cc51 zinf-2.2.4.ebuild 1780
-MD5 f597ecd1b20d628f63eb36241938debf zinf-2.2.0.ebuild 2043
-MD5 d241134efed8a974413baf018b4bc47e ChangeLog 2297
-MD5 65ed1ba37e686b30fd8151d8f1f2f018 files/digest-zinf-2.2.0 63
+MD5 99e90d25c66bc6c1d4f2ac0a7c3a99c6 zinf-2.2.3.ebuild 1946
+MD5 5c2107277f7c3a28f602fe98e47f268c zinf-2.2.5_beta1.ebuild 1686
+MD5 918b1ed8874dc2ecaf5103d908f1d84d zinf-2.2.4.ebuild 1780
+MD5 c363eed8eea4bb92818150935d27e406 ChangeLog 2730
+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
diff --git a/media-sound/zinf/files/digest-zinf-2.2.0 b/media-sound/zinf/files/digest-zinf-2.2.0
deleted file mode 100644
index 5440be49fc40..000000000000
--- a/media-sound/zinf/files/digest-zinf-2.2.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0484ae0c4a462a347054892b32fdcfe9 zinf-2.2.0.tar.gz 2163858
diff --git a/media-sound/zinf/files/digest-zinf-2.2.5_beta1 b/media-sound/zinf/files/digest-zinf-2.2.5_beta1
new file mode 100644
index 000000000000..54ccf6be8692
--- /dev/null
+++ b/media-sound/zinf/files/digest-zinf-2.2.5_beta1
@@ -0,0 +1 @@
+MD5 727db1d0d2673f68639d343ca0ec9895 zinf-2.2.5.tar.gz 2033289
diff --git a/media-sound/zinf/metadata.xml b/media-sound/zinf/metadata.xml
new file mode 100644
index 000000000000..e1774e3d9ad7
--- /dev/null
+++ b/media-sound/zinf/metadata.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sound</herd>
+</pkgmetadata>
diff --git a/media-sound/zinf/zinf-2.2.0.ebuild b/media-sound/zinf/zinf-2.2.0.ebuild
deleted file mode 100644
index 67c40b1325db..000000000000
--- a/media-sound/zinf/zinf-2.2.0.ebuild
+++ /dev/null
@@ -1,79 +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/zinf/zinf-2.2.0.ebuild,v 1.17 2003/09/11 01:21:32 msterret Exp $
-
-IUSE="arts esd X gtk oggvorbis gnome alsa"
-
-inherit kde-functions
-
-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"
-HOMEPAGE="http://www.zinf.org/"
-
-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 )
-	alsa? ( media-libs/alsa-lib )
-	arts? ( kde-base/arts )
-	gnome? ( gnome-base/ORBit )
-	oggvorbis? ( media-libs/libvorbis )"
-
-DEPEND="x86? ( dev-lang/nasm )
-	media-libs/id3lib
-	dev-lang/perl"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-# Unfortunately you can't selectively build a lot of the features. Therefore
-# this whole package is essentially a judgement call. However, I've made the
-# DEPEND in a strategic manner to ensure that your USE variable is respected
-# when the knobs are *set*.
-
-src_unpack() {
-
-	unpack ${A}
-
-	if [ "`use arts`" ]; then
-		cd ${S}/io/arts/src
-		cp artspmo.cpp 1
-		sed -e 's:artsc/artsc.h:artsc.h:g' 1 > artspmo.cpp
-	fi
-
-}
-
-src_compile() {
-
-	if [ -n "`which artsc-config`" ]; then
-	    ARTSPREFIX="`artsc-config --arts-prefix`"
-	else
-	    ARTSPREFIX="/usr/kde/3"
-	fi
-
-	local myconf
-	use alsa || myconf="${myconf} --disable-alsa"
-	use esd  || myconf="${myconf} --disable-esd"
-	use arts && myconf="${myconf} --with-extra-includes=${ARTSPREFIX}/include"
-
-	./configure --prefix=/usr --host=${CHOST} ${myconf} || die
-	make ; assert "compile problem :("
-}
-
-src_install() {
-
-	into /usr ; dobin zinf
-	exeinto /usr/lib/zinf/plugins  ; doexe plugins/*
-	insinto /usr/share/zinf/themes ; doins themes/*
-	dodir /usr/share/zinf/fonts
-
-	dodoc AUTHORS CHANGES COPYING NEWS README README.linux
-
-}
diff --git a/media-sound/zinf/zinf-2.2.3.ebuild b/media-sound/zinf/zinf-2.2.3.ebuild
index d3263e4317d8..8b5a470b3938 100644
--- a/media-sound/zinf/zinf-2.2.3.ebuild
+++ b/media-sound/zinf/zinf-2.2.3.ebuild
@@ -1,8 +1,8 @@
 # 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.9 2004/01/19 20:55:57 mholzer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.3.ebuild,v 1.10 2004/02/08 03:06:27 eradicator Exp $
 
-IUSE="esd X gtk oggvorbis gnome arts"
+IUSE="debug esd X gtk oggvorbis gnome arts alsa nls"
 
 inherit kde-functions
 
@@ -18,40 +18,51 @@ RDEPEND="=dev-libs/glib-1.2*
 	>=sys-libs/ncurses-5.2
 	=media-libs/freetype-1*
 	>=media-libs/musicbrainz-1.0.1
-	>=media-libs/id3lib-3.8.0
 	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 )"
-	#alsa? ( media-libs/alsa-lib ) # it only supports alsa 0.5.x, so support disabled
 
-DEPEND="$RDEPEND x86? ( dev-lang/nasm )
-	media-libs/id3lib
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	nls? ( sys-devel/gettext )
+	>=media-libs/id3lib-3.8.0
+	sys-apps/sed
 	dev-lang/perl"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~alpha"
+KEYWORDS="x86 ~alpha"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${FILESDIR}/zinf-2.2.3-id3.patch.bz2
+
+	# Remove -Werror so it compiles with gcc3.3
+	for file in Makefile.header.in configure.in configure
+	do
+		mv ${file} ${file}.orig
+		sed 's/-Werror//g' < ${file}.orig > ${file}
+	done
+	chmod 755 configure
 }
 
 src_compile() {
-	set-kdedir 3
+	local myconf="--enable-cmdline"
 
-	local myconf="--disable-alsa --enable-debug --enable-cmdline"
-	use esd  || myconf="${myconf} --disable-esd"
-	use gnome && myconf="${myconf} --enable-corba"
+	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 [ -n "`use arts`" ]; then
-	    export ARTSCCONFIG="$KDEDIR/bin/artsc-config"
-	else
-	    myconf="$myconf --disable-arts"
+	if use arts; then
+		set-kdedir 3
+		export ARTSCCONFIG="$KDEDIR/bin/artsc-config"
 	fi
 
 	econf ${myconf} || die
@@ -59,9 +70,14 @@ src_compile() {
 }
 
 src_install() {
-	into /usr ; dobin zinf
-	exeinto /usr/lib/zinf/plugins  ; doexe plugins/*
-	insinto /usr/share/zinf/themes ; doins themes/*
+	into /usr
+	dobin zinf
+
+	exeinto /usr/lib/zinf/plugins
+	doexe plugins/*
+
+	insinto /usr/share/zinf/themes
+	doins themes/*
 
-	dodoc AUTHORS COPYING NEWS README
+	dodoc AUTHORS CHANGES COPYING NEWS README README.linux WISHLIST
 }
diff --git a/media-sound/zinf/zinf-2.2.4.ebuild b/media-sound/zinf/zinf-2.2.4.ebuild
index 73a5fcbee25a..3ce8155f9663 100644
--- a/media-sound/zinf/zinf-2.2.4.ebuild
+++ b/media-sound/zinf/zinf-2.2.4.ebuild
@@ -1,14 +1,15 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
+# 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.4 2003/09/11 01:21:32 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/zinf/zinf-2.2.4.ebuild,v 1.5 2004/02/08 03:06:27 eradicator Exp $
 
-IUSE="esd X gtk oggvorbis gnome arts"
+IUSE="debug esd X gtk oggvorbis gnome arts nls"
 
 inherit kde-functions
 
 S=${WORKDIR}/${P}
 DESCRIPTION="An extremely full-featured mp3/vorbis/cd player with ALSA support, previously called FreeAmp"
-SRC_URI="http://telia.dl.sourceforge.net/sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+RESTRICT="nomirror"
 HOMEPAGE="http://www.zinf.org/"
 
 RDEPEND="=dev-libs/glib-1.2*
@@ -23,11 +24,13 @@ RDEPEND="=dev-libs/glib-1.2*
 	gtk? ( >=media-libs/gdk-pixbuf-0.8 )
 	gnome? ( gnome-base/ORBit )
 	oggvorbis? ( media-libs/libvorbis )
-	arts? ( kde-base/arts )" # doesn't work anymore? see bug #9675
-	#alsa? ( media-libs/alsa-lib ) # it only supports alsa 0.5.x, so support disabled
+	arts? ( kde-base/arts )"
+#	alsa? ( >=media-libs/alsa-lib-0.9.8 ) # Broken in 2.2.4
 
-DEPEND="$RDEPEND x86? ( dev-lang/nasm )
-	media-libs/id3lib
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	nls? ( sys-devel/gettext )
+	>=media-libs/id3lib-3.8.0
 	dev-lang/perl"
 
 SLOT="0"
@@ -41,17 +44,18 @@ src_unpack() {
 }
 
 src_compile() {
-	set-kdedir 3
+	local myconf="--enable-cmdline"
 
-	local myconf="--disable-alsa --enable-debug --enable-cmdline"
-	use esd  || myconf="${myconf} --disable-esd"
-	use gnome && myconf="${myconf} --enable-corba"
+	myconf="${myconf} `use_enable debug`"
+	myconf="${myconf} `use_enable esd`"
+	myconf="${myconf} `use_enable arts`"
+#	myconf="${myconf} `use_enable alsa`"
+	myconf="${myconf} --disable-alsa"
+	myconf="${myconf} `use_enable gnome cobra`"
 
-	if [ -n "`use arts`" ]; then
-	    export ARTSCCONFIG="$KDEDIR/bin/artsc-config"
-	    myconf="${myconf} --enable-arts"
-	else
-	    myconf="$myconf --disable-arts"
+	if use arts; then
+		set-kdedir 3
+		export ARTSCCONFIG="$KDEDIR/bin/artsc-config"
 	fi
 
 	econf ${myconf} || die
@@ -59,10 +63,15 @@ src_compile() {
 }
 
 src_install() {
-	into /usr ; dobin base/zinf
-	exeinto /usr/lib/zinf/plugins  ; doexe plugins/*
-	insinto /usr/share/zinf/themes ; doins themes/*
+	into /usr
+	dobin base/zinf
+
+	exeinto /usr/lib/zinf/plugins
+	doexe plugins/*
+
+	insinto /usr/share/zinf/themes
+	doins themes/*
 
-	dodoc AUTHORS COPYING NEWS README
+	dodoc AUTHORS ChangeLog NEWS README
 }
 
diff --git a/media-sound/zinf/zinf-2.2.5_beta1.ebuild b/media-sound/zinf/zinf-2.2.5_beta1.ebuild
new file mode 100644
index 000000000000..fa0d986888af
--- /dev/null
+++ b/media-sound/zinf/zinf-2.2.5_beta1.ebuild
@@ -0,0 +1,72 @@
+# 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.1 2004/02/08 03:06:27 eradicator Exp $
+
+IUSE="debug esd X gtk oggvorbis gnome arts alsa nls"
+
+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"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+RESTRICT="nomirror"
+HOMEPAGE="http://www.zinf.org/"
+
+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 )"
+
+DEPEND="${RDEPEND}
+	x86? ( dev-lang/nasm )
+	nls? ( sys-devel/gettext )
+	>=media-libs/id3lib-3.8.0
+	dev-db/metakit
+	dev-lang/perl"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+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
+}