non-gnome fix0rs

5 files changed, 4 insertions, 243 deletions

diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r6 b/media-sound/xmms/files/digest-xmms-1.2.7-r6
deleted file mode 100644
index bd6731115e58..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
diff --git a/media-sound/xmms/files/digest-xmms-1.2.7-r7 b/media-sound/xmms/files/digest-xmms-1.2.7-r7
deleted file mode 100644
index 52a743c50769..000000000000
--- a/media-sound/xmms/files/digest-xmms-1.2.7-r7
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8aa14a305d1eeb1bb53dba2197ba695a xmms-1.2.7.tar.gz 2860908
-MD5 a1adac3e8c4430e735d763c1ef242e9d plover-xmms127.tar.gz 32804
-MD5 daea40648c3ae296597dcd3e78500279 xmms-1.2.7-mmx.patch.gz 14990
diff --git a/media-sound/xmms/xmms-1.2.7-r10.ebuild b/media-sound/xmms/xmms-1.2.7-r10.ebuild
index ad142101392a..c071d5ee19cc 100644
--- a/media-sound/xmms/xmms-1.2.7-r10.ebuild
+++ b/media-sound/xmms/xmms-1.2.7-r10.ebuild
@@ -117,12 +117,13 @@ src_install() {
 	insinto /etc/X11/wmconfig
 	donewins xmms/xmms.wmconfig xmms
 
-	if [ "`use gnome`" ]
-	then
+	use gnome && ( \
 		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
+	) || ( \
+		rm ${D}/usr/share/man/man1/gnomexmms*
+	)
 }
 
diff --git a/media-sound/xmms/xmms-1.2.7-r6.ebuild b/media-sound/xmms/xmms-1.2.7-r6.ebuild
deleted file mode 100644
index 6b6c8c8b34c6..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r6.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r6.ebuild,v 1.1 2002/05/26 14:05:33 azarah Exp $
-
-PLO_VER="$(echo ${PV} | sed -e "s:\.::g")"
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-SRC_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz"
-# This if for the Plover patch
-#	avi? ( http://www.openface.ca/~nephtes/plover-xmms${PLO_VER}.tar.gz )"
-HOMEPAGE="http://www.xmms.org/"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/libmikmod-3.1.9
-	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-
-	# For plugins such as avi4xmms, xmms needs to be linked to libavifile
-	# and libstdcxx.
-	use avi && patch -p1 <${FILESDIR}/${P}-enable-avifile-plugins.patch || die
-
-# This is for the Plover patch
-#	use avi	&& (\
-#		tar -zxf ${DISTDIR}/plover-xmms${PLO_VER}.tar.gz || die
-#		cp plover-xmms${PLO_VER}.diff plover-xmms${PLO_VER}.diff.orig || die
-#		sed -e "s:avifile-config:avifile-config0.7:g" \
-#			plover-xmms${PLO_VER}.diff.orig >plover-xmms${PLO_VER}.diff
-#		patch -p1 <plover-xmms${PLO_VER}.diff || die
-#	)
-}
-
-src_compile() {
-	local myopts
-
-	use gnome \
-		&& myopts="${myopts} --with-gnome" \
-		|| myopts="${myopts} --without-gnome"
-
-	use 3dnow \
-		&& myopts="${myopts} --enable-3dnow" \
-		|| myopts="${myopts} --disable-3dnow"
-
-	use esd \
-		&& myopts="${myopts} --enable-esd" \
-		|| myopts="${myopts} --disable-esd"
-
-	use opengl \
-		&& myopts="${myopts} --enable-opengl" \
-		|| myopts="${myopts} --disable-opengl"
-	
-	use oggvorbis \
-		&& myopts="${myopts} --with-ogg --with-vorbis" \
-		|| myopts="${myopts} --disable-ogg-test --disable-vorbis-test"
-
-	use xml \
-		|| myopts="${myopts} --disable-cdindex"
-
-	use nls \
-		|| myopts="${myopts} --disable-nls"
-
-	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     sysconfdir=${D}/etc \
-	     sysdir=${D}/usr/share/applets/Multimedia \
-	     GNOME_SYSCONFDIR=${D}/etc \
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	
-	mkdir -p ${D}/usr/share/xmms/Skins
-	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
-}
-
diff --git a/media-sound/xmms/xmms-1.2.7-r7.ebuild b/media-sound/xmms/xmms-1.2.7-r7.ebuild
deleted file mode 100644
index 0d0a30db3f73..000000000000
--- a/media-sound/xmms/xmms-1.2.7-r7.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2002 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Maintainer: Achim Gottinger <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-sound/xmms/xmms-1.2.7-r7.ebuild,v 1.2 2002/05/31 14:34:51 seemant Exp $
-
-PLO_VER="$(echo ${PV} | sed -e "s:\.::g")"
-S=${WORKDIR}/${P}
-DESCRIPTION="X MultiMedia System"
-XMMS_URI="ftp://ftp.xmms.org/xmms/1.2.x/${P}.tar.gz
-	avi?( http://www.openface.ca/~nephtes/plover-${PN}${PLO_VER}.tar.gz )"
-MMX_URI="http://members.jcom.home.ne.jp/jacobi/linux/etc/${P}-mmx.patch.gz"
-use mmx || use 3dnow \
-	&& SOURCE_HTTP="${XMMS_URI} ${MMX_URI}" \
-	|| SOURCE_HTTP="${XMMS_URI}"
-SRC_URI="${SOURCE_HTTP}"
-HOMEPAGE="http://www.xmms.org/"
-
-RDEPEND="=x11-libs/gtk+-1.2*
-	>=media-libs/libmikmod-3.1.9
-	avi? ( >=media-video/avifile-0.7.4.20020426-r2 )
-	esd? ( >=media-sound/esound-0.2.22 )
-	xml? ( >=dev-libs/libxml-1.8.15 )
-	gnome? ( >=gnome-base/gnome-core-1.4.0.4-r1 )
-	opengl? ( virtual/opengl )
-	oggvorbis? ( >=media-libs/libvorbis-1.0_beta4 )"
-	
-
-DEPEND="${RDEPEND}
-	nls? ( dev-util/intltool )"
-
-src_unpack() {
-	unpack ${P}.tar.gz
-
-	cd ${S}
-
-	# For plugins such as avi4xmms, xmms needs to be linked to libavifile
-	# and libstdcxx.
-	use avi && ( \
-		patch -p1 <${FILESDIR}/${P}-enable-avifile-plugins.patch || die
-	)
-
-	# For mmx/3dnow enabled CPUs, this patch adds mmx/3dnow optimisations
-	( use mmx || use 3dnow ) && \
-		cat ${DISTDIR}/${P}-mmx.patch.gz | gunzip -c | patch -p1 || die
-
-
-# This is for the Plover patch
-#	use avi	&& (\
-#		tar -zxf ${DISTDIR}/plover-xmms${PLO_VER}.tar.gz || die
-#		cp plover-xmms${PLO_VER}.diff plover-xmms${PLO_VER}.diff.orig || die
-#		sed -e "s:avifile-config:avifile-config0.7:g" \
-#			plover-xmms${PLO_VER}.diff.orig >plover-xmms${PLO_VER}.diff
-#		patch -p1 <plover-xmms${PLO_VER}.diff || die
-#	)
-}
-
-src_compile() {
-	local myopts
-
-	use gnome \
-		&& myopts="${myopts} --with-gnome" \
-		|| myopts="${myopts} --without-gnome"
-
-	use 3dnow \
-		&& myopts="${myopts} --enable-3dnow" \
-		|| myopts="${myopts} --disable-3dnow"
-
-	use esd \
-		&& myopts="${myopts} --enable-esd" \
-		|| myopts="${myopts} --disable-esd"
-
-	use opengl \
-		&& myopts="${myopts} --enable-opengl" \
-		|| myopts="${myopts} --disable-opengl"
-	
-	use oggvorbis \
-		&& myopts="${myopts} --with-ogg --with-vorbis" \
-		|| myopts="${myopts} --disable-ogg-test --disable-vorbis-test"
-
-	use xml \
-		|| myopts="${myopts} --disable-cdindex"
-
-	use nls \
-		|| myopts="${myopts} --disable-nls"
-
-	
-	./configure --host=${CHOST} \
-		--prefix=/usr \
-		--mandir=/usr/share/man \
-		${myopts} || die
-
-	emake || die
-}
-
-src_install() {                               
-	make prefix=${D}/usr \
-	     mandir=${D}/usr/share/man \
-	     sysconfdir=${D}/etc \
-	     sysdir=${D}/usr/share/applets/Multimedia \
-	     GNOME_SYSCONFDIR=${D}/etc \
-	     install || die
-
-	dodoc AUTHORS ChangeLog COPYING FAQ NEWS README TODO 
-	
-	mkdir -p ${D}/usr/share/xmms/Skins
-	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
-}
-