BMP support, 1.9.1 stable on x86. Old ebuilds cleaned.

Package-Manager: portage-2.0.51-r13

9 files changed, 133 insertions, 69 deletions

diff --git a/net-irc/xchat-xsys/ChangeLog b/net-irc/xchat-xsys/ChangeLog
index 6bbb1c3f6e1b..0740a23c92e3 100644
--- a/net-irc/xchat-xsys/ChangeLog
+++ b/net-irc/xchat-xsys/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-irc/xchat-xsys
-# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.5 2004/12/27 02:58:33 eradicator Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.6 2005/01/16 13:05:01 chainsaw Exp $
+
+*xchat-xsys-1.9.1-r1 (16 Jan 2005)
+
+  16 Jan 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.9.1-bmp-support.patch, -xchat-xsys-1.0.6.ebuild,
+  -xchat-xsys-1.9.0.ebuild, +xchat-xsys-1.9.1-r1.ebuild,
+  xchat-xsys-1.9.1.ebuild:
+  Added BMP/XMMS support via infopipe. 1.9.1 stable on x86. Old ebuilds cleaned.
 
 *xchat-xsys-1.9.1 (26 Dec 2004)
 
diff --git a/net-irc/xchat-xsys/Manifest b/net-irc/xchat-xsys/Manifest
index f6b2852e0bea..5be202516eef 100644
--- a/net-irc/xchat-xsys/Manifest
+++ b/net-irc/xchat-xsys/Manifest
@@ -1,18 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ba951ba554514d3e53a5dbd319dad3d5 ChangeLog 904
+MD5 e47f69b8cff83add69e3bb2c54988367 xchat-xsys-1.9.1-r1.ebuild 854
+MD5 4102cd47e1c2df279bf2fe29cd1d5b89 xchat-xsys-1.9.1.ebuild 687
+MD5 ed54a8e426d9a3116497b8bc634c2118 ChangeLog 1212
 MD5 42cef2da59c81f792584c3f9048a1930 metadata.xml 250
-MD5 a5f4dd9b255c8dbe5ab46f6dac13a68e xchat-xsys-1.0.6.ebuild 982
-MD5 e9341f9089bb5c3425f9d9b391c65d8f xchat-xsys-1.9.0.ebuild 690
-MD5 a847f331c64fbf3e3dd1b4cf2fa15c9f xchat-xsys-1.9.1.ebuild 703
-MD5 d17f93776f6856c326d07b3ac7526e14 files/digest-xchat-xsys-1.0.6 62
-MD5 4e2a8543fa153a78874311b727f4dde3 files/digest-xchat-xsys-1.9.0 61
+MD5 f9d3eedf5907d949b6f52bfdbc580bd7 files/digest-xchat-xsys-1.9.1-r1 61
 MD5 f9d3eedf5907d949b6f52bfdbc580bd7 files/digest-xchat-xsys-1.9.1 61
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBz3r+ArHZZzCEUG0RAre+AJ4wra0AyASzyvHBQpzVlAgNVtdOIgCfQV+w
-9TM5HRqBYSTd9aPCc04Arn4=
-=aKRg
------END PGP SIGNATURE-----
+MD5 b9c39b3537e8ee29aa9af6c33467223b files/1.9.1-bmp-support.patch 3230
diff --git a/net-irc/xchat-xsys/files/1.9.1-bmp-support.patch b/net-irc/xchat-xsys/files/1.9.1-bmp-support.patch
new file mode 100644
index 000000000000..f08767d3fc4c
--- /dev/null
+++ b/net-irc/xchat-xsys/files/1.9.1-bmp-support.patch
@@ -0,0 +1,100 @@
+--- parse.c.orig	2005-01-16 10:28:16.271149064 +0000
++++ parse.c	2005-01-16 10:38:13.400371624 +0000
+@@ -28,6 +28,45 @@
+ 
+ #include "xchat-plugin.h"
+ 
++int xs_parse_bmp(char *title, char *pos, char *time)
++{
++	char buffer[1024], *position;
++	FILE *fp = fopen("/tmp/xmms-info", "r");
++	if(fp == NULL)
++		return 1;
++	
++	while(fgets(buffer, 1024, fp) != NULL)
++	{
++		if(strstr(buffer, "Position") != NULL && pos != NULL)
++		{
++			position = strstr(buffer, ":");
++			position += 2;
++			strcpy(pos, position);
++			position = strstr(pos, "\n");
++			*(position) = '\0';
++		}
++		else if(strstr(buffer, "Time") != NULL && time != NULL)
++		{
++			position = strstr(buffer, ":");
++			position += 2;
++			strcpy(time, position);
++			position = strstr(time, "\n");
++			*(position) = '\0';
++		}
++		else if(strstr(buffer, "Title") != NULL && title != NULL)
++		{
++			position = strstr(buffer, ":");
++			position += 2;
++			strcpy(title, position);
++			position = strstr(title, "\n");
++			*(position) = '\0';
++		}
++	}
++	fclose(fp);
++	
++	return 0;
++}
++
+ int xs_parse_cpu(char *model, char *vendor, double *freq, char *cache, unsigned int *count)
+ {
+ 	char buffer[1024], *position;
+--- parse.h.orig	2005-01-16 10:36:30.070080216 +0000
++++ parse.h	2005-01-16 10:36:48.007353336 +0000
+@@ -22,6 +22,7 @@
+ #ifndef _PARSE_H_
+ #define _PARSE_H_
+ 
++int xs_parse_bmp(char *title, char *pos, char *time);
+ int xs_parse_cpu(char *model, char *vendor, double *freq, char *cache, unsigned int *count);
+ int xs_parse_uptime(int *weeks, int *days, int *hours, int *minutes, int *seconds);
+ int xs_parse_os(char *user, char *host, char *kernel);
+--- xsys.c.orig	2005-01-16 10:38:50.338756136 +0000
++++ xsys.c	2005-01-16 10:49:31.290316688 +0000
+@@ -46,6 +46,7 @@
+ static int disk_cb     (char *word[], char *word_eol[], void *userdata);
+ static int mem_cb      (char *word[], char *word_eol[], void *userdata);
+ static int video_cb    (char *word[], char *word_eol[], void *userdata);
++static int bmp_cb      (char *word[], char *word_eol[], void *userdata);
+ 
+ int xchat_plugin_init(xchat_plugin *plugin_handle, char **plugin_name,
+                       char **plugin_desc, char **plugin_version, char *arg)
+@@ -80,6 +81,8 @@
+ 	xchat_hook_command(ph, "EMEMINFO",   XCHAT_PRI_NORM, mem_cb,       NULL, (void *) 1);
+ 	xchat_hook_command(ph, "VIDEO",      XCHAT_PRI_NORM, video_cb,     NULL, (void *) 0);
+ 	xchat_hook_command(ph, "EVIDEO",     XCHAT_PRI_NORM, video_cb,     NULL, (void *) 1);
++	xchat_hook_command(ph, "BMP",	     XCHAT_PRI_NORM, bmp_cb,       NULL, (void *) 0);
++	xchat_hook_command(ph, "EBMP",       XCHAT_PRI_NORM, bmp_cb,       NULL, (void *) 1);
+ 	
+ 	load_format();
+ 	xchat_printf(ph, "X-Sys 2 Loaded Succesfully");
+@@ -580,3 +583,22 @@
+ 	return XCHAT_EAT_ALL;
+ }
+ 
++static int bmp_cb(char *word[], char *word_eol[], void *userdata)
++{
++	char buffer[1024], time[16], pos[16], title[256];
++	if(xs_parse_bmp(title, pos, time) != 0)
++	{
++		xchat_printf(ph, "BMP/XMMS is not running");
++		return XCHAT_EAT_NONE;
++	}
++
++	snprintf(buffer, 1024, "%s (%s/%s)", title, pos, time);
++
++	format_output("bmp_playing", buffer);
++	if((int)userdata)
++		xchat_printf(ph, "%s", buffer);
++	else
++		xchat_commandf(ph, "say %s", buffer);
++	
++	return XCHAT_EAT_ALL;
++}
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.0.6 b/net-irc/xchat-xsys/files/digest-xchat-xsys-1.0.6
deleted file mode 100644
index 24b0816ccd6e..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.0.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dc422869d02d092946d058b61f24837d xsys-1.0.6.tar.bz2 16224
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.0 b/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.0
deleted file mode 100644
index a9b023615b67..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7611e3c88a72c5789b11bedfbe2738a6 xsys-1.9.0.tar.bz2 8397
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.1-r1 b/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.1-r1
new file mode 100644
index 000000000000..27870bce7dfe
--- /dev/null
+++ b/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.1-r1
@@ -0,0 +1 @@
+MD5 1fb06c0dfc2ac280b14d705aa1ae9d63 xsys-1.9.1.tar.bz2 9679
diff --git a/net-irc/xchat-xsys/xchat-xsys-1.0.6.ebuild b/net-irc/xchat-xsys/xchat-xsys-1.0.6.ebuild
deleted file mode 100644
index 90fe9de589b0..000000000000
--- a/net-irc/xchat-xsys/xchat-xsys-1.0.6.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-1.0.6.ebuild,v 1.2 2004/12/16 20:30:07 chainsaw Exp $
-
-inherit flag-o-matic
-
-MY_P=${P/xchat-/}
-DESCRIPTION="Sysinfo plugin for X-Chat."
-SRC_URI="http://dev.gentoo.org/~chainsaw/xsys/download/${MY_P}.tar.bz2 mirror://gentoo/${MY_P}.tar.bz2"
-HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="bmp uptimed"
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=dev-libs/glib-2.0.3
-	>=net-irc/xchat-2.4.0
-	bmp? ( media-sound/beep-media-player )
-	uptimed? ( app-misc/uptimed )"
-
-src_compile() {
-	if use uptimed; then
-		append-flags -DUSE_UPRECORD
-	fi
-	if use bmp; then
-		append-flags -DUSE_BMP -I/usr/include/beep-media-player
-		append-ldflags -lbeep
-	fi
-	emake -j1 || die "Compile failed"
-}
-
-src_install() {
-	exeinto /usr/lib/xchat/plugins
-	doexe libxsys-${PV}.so
-
-	dodoc ChangeLog README
-}
diff --git a/net-irc/xchat-xsys/xchat-xsys-1.9.0.ebuild b/net-irc/xchat-xsys/xchat-xsys-1.9.1-r1.ebuild
index 35692a24c689..1643778135a0 100644
--- a/net-irc/xchat-xsys/xchat-xsys-1.9.0.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-1.9.1-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-1.9.0.ebuild,v 1.2 2004/12/27 02:58:33 eradicator Exp $
-
-IUSE=""
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-1.9.1-r1.ebuild,v 1.1 2005/01/16 13:05:01 chainsaw Exp $
 
 inherit eutils
 
@@ -13,10 +11,19 @@ HOMEPAGE="http://mshoup.us/downloads/xsys/README-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~x86 ~amd64"
+IUSE="bmp xmms"
 S=${WORKDIR}/${MY_P}
 
-DEPEND=">=net-irc/xchat-2.4.0"
+DEPEND=">=net-irc/xchat-2.4.0
+	bmp? (media-plugins/bmp-infopipe)
+	xmms? (media-plugins/xmms-infopipe)"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-bmp-support.patch
+}
 
 src_compile() {
 	emake -j1 || die "Compile failed"
diff --git a/net-irc/xchat-xsys/xchat-xsys-1.9.1.ebuild b/net-irc/xchat-xsys/xchat-xsys-1.9.1.ebuild
index 3ac83fae05c3..ae7ffb8da6ec 100644
--- a/net-irc/xchat-xsys/xchat-xsys-1.9.1.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-1.9.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-1.9.1.ebuild,v 1.3 2004/12/27 03:01:07 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-1.9.1.ebuild,v 1.4 2005/01/16 13:05:01 chainsaw Exp $
 
 IUSE=""
 
-inherit flag-o-matic eutils
+inherit eutils
 
 MY_P=${P/xchat-/}
 DESCRIPTION="Sysinfo plugin for X-Chat."
@@ -13,7 +13,7 @@ HOMEPAGE="http://mshoup.us/downloads/xsys/README-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 x86"
 S=${WORKDIR}/${MY_P}
 
 DEPEND=">=net-irc/xchat-2.4.0"