9 files changed, 14 insertions, 130 deletions
diff --git a/net-irc/xchat-xsys/ChangeLog b/net-irc/xchat-xsys/ChangeLog
index a896ee53e073..725125b7b3ef 100644
--- a/net-irc/xchat-xsys/ChangeLog
+++ b/net-irc/xchat-xsys/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-irc/xchat-xsys
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.40 2006/02/17 18:36:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.41 2006/02/19 18:40:09 chainsaw Exp $
+
+  19 Feb 2006; Tony Vroon <chainsaw@gentoo.org>
+  -files/2.0.6-localisation.patch, -files/2.0.7-glib_version.patch,
+  -xchat-xsys-2.0.6-r1.ebuild, -xchat-xsys-2.0.7.ebuild,
+  xchat-xsys-2.0.8-r1.ebuild, xchat-xsys-2.0.9.ebuild:
+  Purge stale ebuilds and patches. Remove dependencies for beep-media-player
+  which is pending removal from the tree.
 
   17 Feb 2006; Joseph Jezak <josejx@gentoo.org> xchat-xsys-2.0.8-r1.ebuild:
   Marked ppc stable for bug #117628.
diff --git a/net-irc/xchat-xsys/files/2.0.6-localisation.patch b/net-irc/xchat-xsys/files/2.0.6-localisation.patch
deleted file mode 100644
index 1cdb7e3dfb1d..000000000000
--- a/net-irc/xchat-xsys/files/2.0.6-localisation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xsys-2.0.6/parse.c.orig	2005-06-19 17:47:14.000000000 +0100
-+++ xsys-2.0.6/parse.c	2005-06-20 19:34:46.000000000 +0100
-@@ -266,7 +266,7 @@
- 	unsigned long long total_k=0, free_k=0;
- 	int i=0;
- 	
--	pipe = popen("df -k -l -P --exclude-type=tmpfs", "r");
-+	pipe = popen("LC_ALL='C' df -k -l -P --exclude-type=tmpfs", "r");
- 	if(pipe==NULL)
- 		return 1;
- 	
diff --git a/net-irc/xchat-xsys/files/2.0.7-glib_version.patch b/net-irc/xchat-xsys/files/2.0.7-glib_version.patch
deleted file mode 100644
index f4c226e0d72e..000000000000
--- a/net-irc/xchat-xsys/files/2.0.7-glib_version.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xsys-2.0.7-old/Makefile	2005-07-17 20:13:33.000000000 +0200
-+++ xsys-2.0.7/Makefile	2005-07-18 22:13:14.000000000 +0200
-@@ -11,7 +11,7 @@
- CC = gcc
- CFLAGS += -O2 -Wall -fPIC
- # FOR BMP # CFLAGS += -I/usr/include/beep-media-player -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DUSE_BMP
--# FOR XMMS # CFLAGS += -I/usr/include/xmms -I/usr/include/glib-1.2 -I/usr/lib/glib-1.2/include -DUSE_XMMS
-+# FOR XMMS # CFLAGS += -I/usr/include/xmms -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -DUSE_XMMS
- CFLAGS += -DVER_MINOR=$(VER_MINOR) -DVER_MAJOR=$(VER_MAJOR) -DVER_PATCH=$(VER_PATCH) \
-           -DVER_STRING=\"$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)\" -DPCIIDS=\"$(PCIIDS)\" $(BUTTON)
- LDFLAGS = $(CFLAGS) -shared
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.6-r1 b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.6-r1
deleted file mode 100644
index 34395b541dd8..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b8dfda189eb5ab4d91aed0718b1697ee xsys-2.0.6.tar.bz2 13845
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.7 b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.7
deleted file mode 100644
index 1f0634d289df..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.7
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8479a68ef30bce46d2995e0b96f63386 xsys-2.0.7.tar.bz2 14109
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild
deleted file mode 100644
index 5c23c7603b14..000000000000
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.6-r1.ebuild,v 1.4 2005/07/21 14:41:48 corsair Exp $
-
-inherit toolchain-funcs eutils
-
-MY_P="${P/xchat-/}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Sysinfo plugin for X-Chat."
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ppc64 x86"
-IUSE="bmp xmms buttons"
-
-DEPEND="|| (
-		>=net-irc/xchat-2.4.0
-		>=net-irc/xchat-gnome-0.4
-	)
-	sys-apps/pciutils
-	bmp? ( media-plugins/bmp-infopipe )
-	xmms? ( media-plugins/xmms-infopipe )"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:-O2 -Wall:${CFLAGS} -Wall:" ${S}/Makefile
-	if use buttons; then
-		sed -i -e "s:#BUTTON:BUTTON:" ${S}/Makefile
-	fi
-	epatch ${FILESDIR}/${PV}-localisation.patch
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "Compile failed"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/xchat/plugins
-	doexe xsys-${PV}.so || die "doexe failed"
-
-	dodoc ChangeLog README || die "dodoc failed"
-}
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild
deleted file mode 100644
index e63af47071de..000000000000
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.7.ebuild,v 1.6 2005/09/16 01:03:36 agriffis Exp $
-
-inherit toolchain-funcs eutils
-
-MY_P="${P/xchat-/}"
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="Sysinfo plugin for X-Chat."
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 ~ppc ppc64 x86"
-IUSE="bmp xmms buttons"
-
-DEPEND="|| (
-		>=net-irc/xchat-2.4.0
-		>=net-irc/xchat-gnome-0.4
-	)
-	sys-apps/pciutils
-	bmp? ( media-sound/beep-media-player )
-	xmms? ( media-sound/xmms )"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:-O2 -Wall:${CFLAGS} -Wall:" ${S}/Makefile
-	if use buttons; then
-		sed -i -e "s:#BUTTON:BUTTON:" ${S}/Makefile
-	fi
-	if use bmp; then
-		sed -i -e "s:# FOR BMP # ::g" ${S}/Makefile
-	elif use xmms; then
-		epatch ${FILESDIR}/${PV}-glib_version.patch
-		sed -i -e "s:# FOR XMMS # ::g" ${S}/Makefile
-	fi
-}
-
-src_compile() {
-	emake -j1 CC="$(tc-getCC)" || die "Compile failed"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/xchat/plugins
-	doexe xsys-${PV}.so || die "doexe failed"
-
-	dodoc ChangeLog README || die "dodoc failed"
-}
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild
index f27594adb501..5eb51331050c 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild,v 1.7 2006/02/17 18:36:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.8-r1.ebuild,v 1.8 2006/02/19 18:40:09 chainsaw Exp $
 
 inherit toolchain-funcs eutils
 
@@ -13,14 +13,13 @@ HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
-IUSE="bmp xmms buttons"
+IUSE="xmms buttons"
 
 DEPEND="|| (
 		>=net-irc/xchat-2.4.0
 		>=net-irc/xchat-gnome-0.4
 	)
 	sys-apps/pciutils
-	bmp? ( media-sound/beep-media-player )
 	xmms? ( media-sound/xmms )"
 
 src_unpack() {
@@ -29,9 +28,7 @@ src_unpack() {
 	if use buttons; then
 		sed -i -e "s:#BUTTON:BUTTON:" ${S}/Makefile
 	fi
-	if use bmp; then
-		sed -i -e "s:# FOR BMP # ::g" ${S}/Makefile
-	elif use xmms; then
+	if use xmms; then
 		sed -i -e "s:# FOR XMMS # ::g" ${S}/Makefile
 	fi
 	epatch ${FILESDIR}/${PV}-pciutils-headerchange.patch
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild
index 30af936eb4e9..b6df6cb9f774 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild,v 1.3 2005/11/14 17:08:47 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.9.ebuild,v 1.4 2006/02/19 18:40:09 chainsaw Exp $
 
 inherit toolchain-funcs eutils
 
@@ -13,7 +13,7 @@ HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="audacious bmp buttons xmms"
+IUSE="audacious buttons xmms"
 
 DEPEND="|| (
 		>=net-irc/xchat-2.4.0
@@ -21,7 +21,6 @@ DEPEND="|| (
 	)
 	sys-apps/pciutils
 	audacious? ( media-sound/audacious )
-	bmp? ( media-sound/beep-media-player )
 	xmms? ( media-sound/xmms )"
 
 src_unpack() {
@@ -32,8 +31,6 @@ src_unpack() {
 	fi
 	if use audacious; then
 		sed -i -e "s:# FOR AUDACIOUS # ::g" ${S}/Makefile
-	elif use bmp; then
-		sed -i -e "s:# FOR BMP # ::g" ${S}/Makefile
 	elif use xmms; then
 		sed -i -e "s:# FOR XMMS # ::g" ${S}/Makefile
 	fi