added xmms-1.2.6-r2 (contributed by spider) and removed older ebuilds

7 files changed, 51 insertions, 172 deletions

diff --git a/media-sound/xmms/ChangeLog b/media-sound/xmms/ChangeLog
index 94754e6fd236..52c8823038e0 100644
--- a/media-sound/xmms/ChangeLog
+++ b/media-sound/xmms/ChangeLog
@@ -1,13 +1,11 @@
 # ChangeLog for media-sound/xmms
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.1 2002/02/01 21:53:31 gbevin Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/ChangeLog,v 1.2 2002/02/28 07:25:36 blocke Exp $
 
-*xmms-1.2.6-r1 (1 Feb 2002)
+*xmms-1.2.6-r2 (28 Feb 2002)
+
+  22 Feb 2002; Bruce A. Locke <blocke@shivan.org> xmms-1.2.6-r2.ebuild :
+
+  spider.gentoo@darkmere.wanfear.com (Spider) contributed additional
+  USE keyword checks
 
-  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
-  Added initial ChangeLog which should be updated whenever the package is
-  updated in any way. This changelog is targetted to users. This means that the
-  comments should well explained and written in clean English. The details about
-  writing correct changelogs are explained in the skel.ChangeLog file which you
-  can find in the root directory of the portage repository.
diff --git a/media-sound/xmms/files/digest-xmms-1.2.5-r1 b/media-sound/xmms/files/digest-xmms-1.2.5-r1
deleted file mode 100644
index 1f613d90ee23..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.5-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99bc40bffa66789ecc9d91ce7ae4ed09 xmms-1.2.5.tar.gz 2414840
diff --git a/media-sound/xmms/files/digest-xmms-1.2.5-r2 b/media-sound/xmms/files/digest-xmms-1.2.5-r2
deleted file mode 100644
index 1f613d90ee23..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.5-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 99bc40bffa66789ecc9d91ce7ae4ed09 xmms-1.2.5.tar.gz 2414840
diff --git a/media-sound/xmms/files/digest-xmms-1.2.6 b/media-sound/xmms/files/digest-xmms-1.2.6-r2
index cc26433ccea1..cc26433ccea1 100644
--- a/media-sound/xmms/files/digest-xmms-1.2.6
+++ b/media-sound/xmms/files/digest-xmms-1.2.6-r2
diff --git a/media-sound/xmms/xmms-1.2.5-r1.ebuild b/media-sound/xmms/xmms-1.2.5-r1.ebuild
deleted file mode 100644
index 5045a6cfc52a..000000000000
--- a/media-sound/xmms/xmms-1.2.5-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.5-r1.ebuild,v 1.4 2001/10/09 22:15:31 woodchip Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
-HOMEPAGE="http://www.xmms.org/"
-
-DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	>=dev-libs/libxml-1.8.15
-	>=media-libs/libmikmod-3.1.9
-	esd? ( >=media-sound/esound-0.2.22 )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/opengl"
-
-RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	>=dev-libs/libxml-1.8.15
-	>=media-libs/libmikmod-3.1.9
-	esd? ( >=media-sound/esound-0.2.22 )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	cp configure configure.orig
-	sed -e "s:-m486::" configure.orig > configure
-}
-src_compile() {
-	local myopts
-
-	if [ -n "`use gnome`" ]
-	then
-		myopts="--with-gnome"
-	else
-		myopts="--without-gnome"
-	fi
-
-	if [ "`use 3dnow`" ] ; then
-		myopts="$myopts --enable-3dnow"
-	else
-		myopts="$myopts --disable-3dnow"
-	fi
-
-	if [ "`use ogg`" ] ; then
-		myopts="$myopts --with-ogg"
-	else
-		myopts="$myopts --disable-ogg-test"
-	fi
-
-	if [ "`use vorbis`" ] ; then
-		myopts="$myopts --with-vorbis"
-	else
-		myopts="$myopts --disable-vorbis-test"
-	fi
-
-	./configure --host=${CHOST} --prefix=/usr ${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr 						\
-	     sysconfdir=${D}/etc					\
-	     sysdir=${D}/usr/share/applets/Multimedia 			\
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	insinto /usr/share/pixmaps/
-	donewins gnomexmms/gnomexmms.xpm xmms.xpm
-}
diff --git a/media-sound/xmms/xmms-1.2.5-r2.ebuild b/media-sound/xmms/xmms-1.2.5-r2.ebuild
deleted file mode 100644
index cc2b62a60200..000000000000
--- a/media-sound/xmms/xmms-1.2.5-r2.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.5-r2.ebuild,v 1.1 2001/11/08 01:10:24 azarah Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
-HOMEPAGE="http://www.xmms.org/"
-
-DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	>=dev-libs/libxml-1.8.15
-	>=media-libs/libmikmod-3.1.9
-	esd? ( >=media-sound/esound-0.2.22 )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/opengl"
-
-RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	>=dev-libs/libxml-1.8.15
-	>=media-libs/libmikmod-3.1.9
-	esd? ( >=media-sound/esound-0.2.22 )
-	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/opengl"
-
-src_unpack() {
-	unpack ${A}
-
-	cd ${S}
-	cp configure configure.orig
-	sed -e "s:-m486::" configure.orig > configure
-}
-src_compile() {
-	local myopts
-
-	if [ -n "`use gnome`" ]
-	then
-		myopts="--with-gnome"
-	else
-		myopts="--without-gnome"
-	fi
-
-	if [ "`use 3dnow`" ] ; then
-		myopts="$myopts --enable-3dnow"
-	else
-		myopts="$myopts --disable-3dnow"
-	fi
-
-	if [ "`use ogg`" ] ; then
-		myopts="$myopts --with-ogg"
-	else
-		myopts="$myopts --disable-ogg-test"
-	fi
-
-	if [ "`use vorbis`" ] ; then
-		myopts="$myopts --with-vorbis"
-	else
-		myopts="$myopts --disable-vorbis-test"
-	fi
-
-	./configure --host=${CHOST} --prefix=/usr ${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr 						\
-	     sysconfdir=${D}/etc					\
-	     sysdir=${D}/usr/share/applets/Multimedia 			\
-	     GNOME_SYSCONFDIR=${D}/etc					\
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	insinto /usr/share/pixmaps/
-	donewins gnomexmms/gnomexmms.xpm xmms.xpm
-}
diff --git a/media-sound/xmms/xmms-1.2.6.ebuild b/media-sound/xmms/xmms-1.2.6-r2.ebuild
index 9b8310e6d56f..bc652342b75a 100644
--- a/media-sound/xmms/xmms-1.2.6.ebuild
+++ b/media-sound/xmms/xmms-1.2.6-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# Author Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.6.ebuild,v 1.1 2002/01/11 18:28:35 verwilst Exp $
+# Maintainer: Achim Gottinger <achim@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.6-r2.ebuild,v 1.1 2002/02/28 07:25:37 blocke Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="X MultiMedia System"
@@ -13,16 +13,17 @@ DEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
 	>=media-libs/libmikmod-3.1.9
 	esd? ( >=media-sound/esound-0.2.22 )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/opengl"
+	opengl? ( virtual/opengl )
+	nls? ( dev-util/intltool )
+	>=x11-libs/gtk+-1.2.10-r4"
 
 RDEPEND="gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
 	>=dev-libs/libxml-1.8.15
 	>=media-libs/libmikmod-3.1.9
 	esd? ( >=media-sound/esound-0.2.22 )
 	vorbis? ( >=media-libs/libvorbis-1.0_beta4 )
-	>=x11-libs/gtk+-1.2.10-r4
-	virtual/opengl"
+	opengl? ( virtual/opengl )
+	>=x11-libs/gtk+-1.2.10-r4"
 
 src_unpack() {
 	unpack ${A}
@@ -31,6 +32,7 @@ src_unpack() {
 	cp configure configure.orig
 	sed -e "s:-m486::" configure.orig > configure
 }
+
 src_compile() {
 	local myopts
 
@@ -47,6 +49,18 @@ src_compile() {
 		myopts="$myopts --disable-3dnow"
 	fi
 
+	if [ "`use esd`" ] ; then
+		myopts="$myopts --enable-esd"
+	else
+		myopts="$myopts --disable-esd"
+	fi	
+
+	if [ "`use opengl`" ] ; then
+		myopts="$myopts --enable-opengl"
+	else
+		myopts="$myopts --disable-opengl"
+	fi
+	
 	if [ "`use ogg`" ] ; then
 		myopts="$myopts --with-ogg"
 	else
@@ -59,7 +73,14 @@ src_compile() {
 		myopts="$myopts --disable-vorbis-test"
 	fi
 
-	./configure --host=${CHOST} --prefix=/usr ${myopts} || die
+	if [ ! "`use nls`" ] ; then
+		myopts="$myopts --disable-nls"
+	fi
+
+	
+	./configure --host=${CHOST} \
+		--prefix=/usr \
+		${myopts} || die
 
 	emake || die
 }
@@ -72,6 +93,21 @@ src_install() {
 	     install || die
 
 	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
+	
 	insinto /usr/share/pixmaps/
 	donewins gnomexmms/gnomexmms.xpm xmms.xpm
+	doins xmms/xmms_logo.xpm
+	insinto /usr/share/pixmaps/mini
+	doins xmms/xmms_mini.xpm
+
+	insinto /etc/X11/wmconfig
+	donewins xmms/xmms.wmconfig xmms
+
+	if [ "`use gnome`" ]
+	then
+		insinto /usr/share/gnome/apps/Multimedia
+		doins xmms/xmms.desktop
+		dosed "s:xmms_mini.xpm:mini/xmms_mini.xpm:" \
+			/usr/share/gnome/apps/Multimedia/xmms.desktop
+	fi
 }