added missing libsndfile dependency, fixes #89597. also changed deprecated oggvorbis to vorbis.

(Portage version: 2.0.51.19)

7 files changed, 23 insertions, 147 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index fc5092ed9616..c84b5aeaad7b 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.33 2005/04/19 08:04:55 kloeri Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.34 2005/04/20 19:11:29 luckyduck Exp $
+
+  20 Apr 2005; Jan Brinkmann <luckyduck@gentoo.org> -files/gcc.patch,
+  -alsaplayer-0.99.75-r1.ebuild, alsaplayer-0.99.76-r1.ebuild,
+  alsaplayer-0.99.76.ebuild:
+  added missing libsndfile dependency, fixes #89597. also changed deprecated
+  oggvorbis to vorbis.
 
   19 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove retired developer from metadata.xml.
diff --git a/media-sound/alsaplayer/Manifest b/media-sound/alsaplayer/Manifest
index 13428b8cf643..7004645952bb 100644
--- a/media-sound/alsaplayer/Manifest
+++ b/media-sound/alsaplayer/Manifest
@@ -1,20 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 37043d13fe8dbfc0777fc022cbbb2504 ChangeLog 5665
+MD5 bb47a026ecd36f2982ed48fa7ef1ecd1 alsaplayer-0.99.76-r1.ebuild 1976
+MD5 bd7c5f40bfd838555940004e9bb8e9cb ChangeLog 5928
 MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 c5f31cdad93bab7eef654e895149a993 alsaplayer-0.99.76.ebuild 1587
-MD5 0c04acd35f907a21d4034c4f92e8cf08 alsaplayer-0.99.76-r1.ebuild 1961
-MD5 d41e2deaa8aef46712f1ede969a217d4 alsaplayer-0.99.75-r1.ebuild 2285
+MD5 bffc82f2395e11046f5a5e30bc074d39 alsaplayer-0.99.76.ebuild 1603
 MD5 4d1180a1109044fb119335839a357f95 files/alsaplayer-endian.patch 1143
-MD5 5c35a3140250067b9e24fea110bde6c4 files/gcc.patch 805
-MD5 53bd2804a0e111a7f5fd3e65e8ccd493 files/digest-alsaplayer-0.99.76 71
 MD5 53bd2804a0e111a7f5fd3e65e8ccd493 files/digest-alsaplayer-0.99.76-r1 71
-MD5 d7c5048a47693b7a9ba603a3fadd8cd1 files/digest-alsaplayer-0.99.75-r1 71
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCZLu4Kf2g/qXtneoRAkxcAJ9u7RvDyZ2lVgXDNDX3zvGg+DQjQQCcDpZD
-aikL7DtB1czWtnH1r2gHgKw=
-=Tluo
------END PGP SIGNATURE-----
+MD5 53bd2804a0e111a7f5fd3e65e8ccd493 files/digest-alsaplayer-0.99.76 71
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild
deleted file mode 100644
index 7b15e1a29f61..000000000000
--- a/media-sound/alsaplayer/alsaplayer-0.99.75-r1.ebuild
+++ /dev/null
@@ -1,95 +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/alsaplayer/alsaplayer-0.99.75-r1.ebuild,v 1.11 2005/02/13 03:36:26 robbat2 Exp $
-
-inherit eutils
-
-IUSE="nas nls esd opengl doc oss gtk oggvorbis alsa"
-
-DESCRIPTION="Media player primarily utilising ALSA"
-HOMEPAGE="http://www.alsaplayer.org/"
-SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~alpha ~amd64"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-0.9 )
-	doc? ( app-doc/doxygen )
-	esd? ( media-sound/esound )
-	gtk? ( =x11-libs/gtk+-1* )
-	nas? ( media-libs/nas )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( media-libs/libvorbis )
-	>=media-libs/libmikmod-3.1.10
-	>=dev-libs/glib-1.2.10"
-
-DEPEND="${RDEPEND}
-	sys-apps/sed
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-
-	sed -i "/#if SND_LIB_MAJOR>0 || (SND_LIB_MAJOR==0 && SND_LIB_MINOR==5)/s/SND_LIB_MAJOR>0 ||//" configure
-}
-
-src_compile() {
-	epatch ${FILESDIR}/gcc.patch
-
-	local myconf
-
-	use oggvorbis \
-		&& myconf="--enable-oggvorbis" \
-		|| myconf="--disable-oggvorbis --disable-oggtest --disable-vorbistest"
-
-	use oss \
-		&& myconf="${myconf} --enable-oss" \
-		|| myconf="${myconf} --disable-oss"
-
-	use esd \
-		&& myconf="${myconf} --enable-esd" \
-		|| myconf="${myconf} --disable-esd --disable-esdtest"
-
-	use nas \
-		&& myconf="${myconf} --enable-nas" \
-		|| myconf="${myconf} --disable-nas"
-
-	use opengl \
-		&& myconf="${myconf} --enable-opengl" \
-		|| myconf="${myconf} --disable-opengl"
-
-	use gtk \
-		&& myconf="${myconf} --enable-gtk" \
-		|| myconf="${myconf} --disable-gtk --disable-gtktest --disable-glibtest"
-
-	use nls \
-		&& myconf="${myconf} --enable-nls" \
-		|| myconf="${myconf} --disable-nls"
-
-	use sparc \
-		&& myconf="${myconf} --enable-sparc" \
-		|| myconf="${myconf} --disable-sparc"
-
-	export CPPFLAGS="${CPPFLAGS} -I/usr/X11R6/include"
-
-	econf \
-		--disable-sgi \
-		${myconf} || die "econf failed"
-
-#	./configure --enable-gtk --libdir=/usr/lib/alsaplayer
-
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} docdir=${D}/usr/share/doc/${PF} install
-
-#	einstall \
-#		docdir=${D}/usr/share/doc/${P}
-
-	dodoc AUTHORS COPYING ChangeLog README TODO DONATION*
-	dodoc docs/sockmon.txt docs/wishlist.txt
-}
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild
index d5eb63013fc6..8e8310c65ac3 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild,v 1.3 2005/03/13 14:42:29 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76-r1.ebuild,v 1.4 2005/04/20 19:11:29 luckyduck Exp $
 
 inherit eutils
 
-IUSE="nas nls esd opengl doc oss gtk ogg oggvorbis alsa jack mikmod flac xosd"
+IUSE="nas nls esd opengl doc oss gtk ogg vorbis alsa jack mikmod flac xosd"
 
 DESCRIPTION="Media player primarily utilising ALSA"
 HOMEPAGE="http://www.alsaplayer.org/"
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~mips"
 
 RDEPEND=">=dev-libs/glib-1.2.10
+	media-libs/libsndfile
 	esd? ( media-sound/esound )
 	gtk? ( =x11-libs/gtk+-1* )
 	nas? ( media-libs/nas )
@@ -23,7 +24,7 @@ RDEPEND=">=dev-libs/glib-1.2.10
 	flac? ( media-libs/flac )
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	opengl? ( virtual/opengl )
-	oggvorbis? ( media-libs/libvorbis )
+	vorbis? ( media-libs/libvorbis )
 	ogg? ( media-libs/libogg )
 	xosd? ( x11-libs/xosd )"
 
@@ -59,7 +60,7 @@ src_compile() {
 		$(use_enable opengl) \
 		$(use_enable nls) \
 		$(use_enable sparc) \
-		$(use_enable oggvorbis) \
+		$(use_enable vorbis oggvorbis) \
 		$(use_enable esd) \
 		$(use_enable gtk) \
 		$(use_enable jack) \
@@ -67,7 +68,6 @@ src_compile() {
 		$(use_enable flac) \
 		${myconf} \
 		--disable-sgi --disable-dependency-tracking || die "./configure failed"
-
 	emake || die "make failed"
 }
 
@@ -75,6 +75,6 @@ src_install() {
 	make DESTDIR=${D} docdir=${D}/usr/share/doc/${PF} install \
 		|| die "make install failed"
 
-	dodoc AUTHORS COPYING ChangeLog README TODO
+	dodoc AUTHORS ChangeLog README TODO
 	dodoc docs/wishlist.txt
 }
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild
index c84433f4f2fb..7791b18a26a9 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild,v 1.14 2005/03/06 02:00:06 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.76.ebuild,v 1.15 2005/04/20 19:11:29 luckyduck Exp $
 
 inherit eutils
 
-IUSE="nas nls esd opengl doc oss gtk oggvorbis alsa jack mikmod flac"
+IUSE="nas nls esd opengl doc oss gtk vorbis alsa jack mikmod flac"
 
 DESCRIPTION="Media player primarily utilising ALSA"
 HOMEPAGE="http://www.alsaplayer.org/"
@@ -15,6 +15,7 @@ LICENSE="GPL-2"
 KEYWORDS="~alpha amd64 ~ia64 ppc ~sparc x86 ~mips"
 
 RDEPEND=">=dev-libs/glib-1.2.10
+	media-libs/libsndfile
 	doc? ( app-doc/doxygen )
 	esd? ( media-sound/esound )
 	gtk? ( =x11-libs/gtk+-1* )
@@ -24,7 +25,7 @@ RDEPEND=">=dev-libs/glib-1.2.10
 	flac? ( media-libs/flac )
 	mikmod? ( >=media-libs/libmikmod-3.1.10 )
 	opengl? ( virtual/opengl )
-	oggvorbis? ( media-libs/libvorbis )"
+	vorbis? ( media-libs/libvorbis )"
 
 DEPEND="${RDEPEND}
 	sys-apps/sed
@@ -47,7 +48,7 @@ src_compile() {
 		`use_enable opengl` \
 		`use_enable nls` \
 		`use_enable sparc` \
-		`use_enable oggvorbis` \
+		`use_enable vorbis oggvorbis` \
 		`use_enable esd` \
 		`use_enable gtk` \
 		`use_enable jack` \
@@ -62,6 +63,6 @@ src_install() {
 
 	make DESTDIR=${D} docdir=${D}/usr/share/doc/${PF} install
 
-	dodoc AUTHORS COPYING ChangeLog README TODO
+	dodoc AUTHORS ChangeLog README TODO
 	dodoc docs/wishlist.txt
 }
diff --git a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.75-r1 b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.75-r1
deleted file mode 100644
index ffc5e6840824..000000000000
--- a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.75-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 353b57058e05aa5f0c01f93fc049c650 alsaplayer-0.99.75.tar.bz2 635893
diff --git a/media-sound/alsaplayer/files/gcc.patch b/media-sound/alsaplayer/files/gcc.patch
deleted file mode 100644
index 0d26bcc656b1..000000000000
--- a/media-sound/alsaplayer/files/gcc.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ruN interface/gtk/PlaylistWindow.cpp interface.new/gtk/PlaylistWindow.cpp
---- interface/gtk/PlaylistWindow.cpp	2003-09-26 16:00:26.000000000 +0900
-+++ interface.new/gtk/PlaylistWindow.cpp	2003-09-26 16:02:12.000000000 +0900
-@@ -22,6 +22,7 @@
- #include <unistd.h>
- #include <pthread.h>
- #include <sys/stat.h>
-+#include <assert.h>
- #include <gtk/gtk.h>
- #include <gdk/gdkkeysyms.h>
- #include <gtk/gtkdnd.h>
-diff -ruN interface/gtk/gtk_interface.cpp interface.new/gtk/gtk_interface.cpp
---- interface/gtk/gtk_interface.cpp	2003-09-26 16:00:35.000000000 +0900
-+++ interface.new/gtk/gtk_interface.cpp	2003-09-26 16:02:04.000000000 +0900
-@@ -22,6 +22,7 @@
- #include "alsaplayer_error.h"
- #include <unistd.h>
- #include <sys/types.h>
-+#include <assert.h>
- //#define NEW_SCALE
- //#define SUBSECOND_DISPLAY 
-