small fix0rs

6 files changed, 27 insertions, 71 deletions

diff --git a/media-sound/alsaplayer/ChangeLog b/media-sound/alsaplayer/ChangeLog
index 9aae20dca1b2..23f2c9bdea23 100644
--- a/media-sound/alsaplayer/ChangeLog
+++ b/media-sound/alsaplayer/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-sound/alsaplayer
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.4 2002/05/22 22:14:36 mkennedy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/ChangeLog,v 1.5 2002/06/04 10:08:39 seemant Exp $
+
+*alsaplayer-0.99.70-r1 (4 Jun 2002)
+
+  4 Jun 2002; Seemant Kulleen <seemant@gentoo.org>
+  alsaplayer-0.99.70-r1.ebuild files/digest-alsaplayer-0.99.70-r1 :
+
+  sandbox violation fix for installing the documentation if doxygen is on
+  the system.  Closes bug # 3322, by ryan.shaw@stanfordalumni.org (Ryan
+  Shaw)
 
 *alsaplayer-0.99.70 (22 May 2002)
 
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.60.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.60.ebuild
deleted file mode 100644
index 3c9f0715a1de..000000000000
--- a/media-sound/alsaplayer/alsaplayer-0.99.60.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.60.ebuild,v 1.1 2002/05/03 04:09:41 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="Media player primarily utilising ALSA"
-SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
-HOMEPAGE="http://www.alsa-project.org/"
-QTROOT="/usr/qt/3"
-
-DEPEND=">=media-libs/alsa-lib-0.5.10
-	qt? ( >=x11-libs/qt-3.0.1 )
-	esd? ( media-sound/esound )
-	gtk? ( x11-libs/gtk+ )
-	oggvorbis? ( media-libs/libvorbis )
-	>=media-libs/libmikmod-3.1.10
-	>=dev-libs/glib-1.2.10"
-	
-
-src_compile() {
-
-	local myconf
-
-	use oggvorbis \
-		|| myconf="--enable-vorbis=no"
-
-	use oss \
-		|| myconf="${myconf} --enable-oss=no"
-
-	use esd \
-		&& myconf="${myconf} --enable-audiofile=yes" \
-		|| myconf="${myconf} --enable-esd=no"
-
-	use nas \
-		&& myconf="${myconf} --enable-nas=yes"
-
-	use gtk \
-		|| myconf="${myconf} --enable-gtk=no"
-
-	use qt \
-		&& myconf="${myconf} --enable-qt=yes \
-				--with-qt-libdir=${QTROOT}/lib \
-				--with-qt-indir=${QTROOT}/include \
-				--with-qt-bindir=${QTROOT}/bin"
-
-	econf ${myconf} || die
-
-	emake || die
-}
-
-src_install() {
-
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		install || die
-
-	dodoc AUTHORS COPYING ChangeLog README TODO
-	dodoc docs/sockmon.txt docs/wishlist.txt
-}
diff --git a/media-sound/alsaplayer/alsaplayer-0.99.60-r1.ebuild b/media-sound/alsaplayer/alsaplayer-0.99.70-r1.ebuild
index 4af6fe53acd7..336f3048ec2f 100644
--- a/media-sound/alsaplayer/alsaplayer-0.99.60-r1.ebuild
+++ b/media-sound/alsaplayer/alsaplayer-0.99.70-r1.ebuild
@@ -1,16 +1,17 @@
 # Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author: Seemant Kulleen <seemant@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.60-r1.ebuild,v 1.2 2002/05/31 09:23:15 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/alsaplayer/alsaplayer-0.99.70-r1.ebuild,v 1.1 2002/06/04 10:08:39 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="Media player primarily utilising ALSA"
 SRC_URI="http://www.alsaplayer.org/${P}.tar.bz2"
-HOMEPAGE="http://www.alsaplayer.org/"
+HOMEPAGE="http://www.alsa-project.org/"
 QTROOT="/usr/qt/3"
 
 DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.10 )
 	qt? ( >=x11-libs/qt-3.0.1 )
+	doc? ( app-doc/doxygen )
 	esd? ( media-sound/esound )
 	gtk? ( x11-libs/gtk+ )
 	opengl? ( virtual/opengl )
@@ -20,6 +21,15 @@ DEPEND="alsa? ( >=media-libs/alsa-lib-0.5.10 )
 	
 RDEPEND="nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# minor correction to some C++ code required for
+	# building. will be submitted upstream.
+	patch -p1 <${FILESDIR}/alsaplayer-0.99.70-gcc3.1-gentoo.patch
+}
+
 src_compile() {
 
 	local myconf
@@ -67,11 +77,10 @@ src_compile() {
 }
 
 src_install() {
-
-	make \
-		prefix=${D}/usr \
-		mandir=${D}/usr/share/man \
-		install || die
+	
+	einstall \
+		docdir=${D}/usr/share/doc/${P} \
+		|| die
 
 	dodoc AUTHORS COPYING ChangeLog README TODO
 	dodoc docs/sockmon.txt docs/wishlist.txt
diff --git a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.60 b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.60
deleted file mode 100644
index 34c7b96ad6bf..000000000000
--- a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.60
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1c7a8de18d05db2abf5646d3dd1f62f alsaplayer-0.99.60.tar.bz2 490394
diff --git a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.60-r1 b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.60-r1
deleted file mode 100644
index 34c7b96ad6bf..000000000000
--- a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.60-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a1c7a8de18d05db2abf5646d3dd1f62f alsaplayer-0.99.60.tar.bz2 490394
diff --git a/media-sound/alsaplayer/files/digest-alsaplayer-0.99.70-r1 b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.70-r1
new file mode 100644
index 000000000000..471119478288
--- /dev/null
+++ b/media-sound/alsaplayer/files/digest-alsaplayer-0.99.70-r1
@@ -0,0 +1 @@
+MD5 c799f85e9009b17535c16deb3247a506 alsaplayer-0.99.70.tar.bz2 506686