1.9.3 stable on x86. Add -r1 with ppc support. Old ebuilds cleaned.

(Portage version: 2.0.51.21)

10 files changed, 215 insertions, 53 deletions

diff --git a/net-irc/xchat-xsys/ChangeLog b/net-irc/xchat-xsys/ChangeLog
index 851acba04f53..d6e441365a59 100644
--- a/net-irc/xchat-xsys/ChangeLog
+++ b/net-irc/xchat-xsys/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-irc/xchat-xsys
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.9 2005/04/17 22:27:35 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.10 2005/05/14 13:13:09 chainsaw Exp $
+
+*xchat-xsys-1.9.3-r1 (14 May 2005)
+
+  14 May 2005; Tony Vroon <chainsaw@gentoo.org>
+  +files/1.9.3-sysfs-instead-of-lspci-2.patch,
+  +files/1.9.3-ppc-support.patch, -xchat-xsys-1.9.1.ebuild,
+  -xchat-xsys-1.9.1-r1.ebuild, xchat-xsys-1.9.3.ebuild,
+  +xchat-xsys-1.9.3-r1.ebuild:
+  1.9.3 stable on x86. Add -r1 with ppc support. Old ebuilds cleaned.
 
   17 Apr 2005; Tony Vroon <chainsaw@gentoo.org>
   files/1.9.3-sysfs-instead-of-lspci.patch:
diff --git a/net-irc/xchat-xsys/Manifest b/net-irc/xchat-xsys/Manifest
index 44b99d2a25c6..9871433cb815 100644
--- a/net-irc/xchat-xsys/Manifest
+++ b/net-irc/xchat-xsys/Manifest
@@ -1,20 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a94b4009fe101872797d273b603cf610 xchat-xsys-1.9.3.ebuild 862
 MD5 e47f69b8cff83add69e3bb2c54988367 xchat-xsys-1.9.1-r1.ebuild 854
 MD5 42cef2da59c81f792584c3f9048a1930 metadata.xml 250
-MD5 c8113baaa486e570eaefb14c458a158a ChangeLog 1855
+MD5 e16e686cf27531942ed5284cab4d5dbe ChangeLog 2099
 MD5 4102cd47e1c2df279bf2fe29cd1d5b89 xchat-xsys-1.9.1.ebuild 687
-MD5 6f20a4397c64b29491d5ce2e585c3cae files/1.9.3-sysfs-instead-of-lspci.patch 3710
+MD5 a94b4009fe101872797d273b603cf610 xchat-xsys-1.9.3.ebuild 862
+MD5 ef5fa37afaf0644de8430bf3a5b2c5e8 xchat-xsys-1.9.3-r1.ebuild 912
 MD5 f9d3eedf5907d949b6f52bfdbc580bd7 files/digest-xchat-xsys-1.9.1-r1 61
 MD5 b9c39b3537e8ee29aa9af6c33467223b files/1.9.1-bmp-support.patch 3230
 MD5 f9d3eedf5907d949b6f52bfdbc580bd7 files/digest-xchat-xsys-1.9.1 61
+MD5 6f20a4397c64b29491d5ce2e585c3cae files/1.9.3-sysfs-instead-of-lspci.patch 3710
 MD5 6a0d14cce311c0075599544fd3a107c1 files/digest-xchat-xsys-1.9.3 62
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCYuLap5vW4rUFj5oRAsXhAKCrsy26X4RRqZpZmF4JXXH9geEKSQCfekfS
-lQ2FNiBZ+ENKoG8JhkrJl/8=
-=WBKr
------END PGP SIGNATURE-----
+MD5 43e7dc494b9615bbc75b6444664d8ffd files/1.9.3-ppc-support.patch 1528
+MD5 c0f1338214a6804b08666fa5c5a05bce files/1.9.3-sysfs-instead-of-lspci-2.patch 3712
+MD5 6a0d14cce311c0075599544fd3a107c1 files/digest-xchat-xsys-1.9.3-r1 62
diff --git a/net-irc/xchat-xsys/files/1.9.3-ppc-support.patch b/net-irc/xchat-xsys/files/1.9.3-ppc-support.patch
new file mode 100644
index 000000000000..5464ec54ca7d
--- /dev/null
+++ b/net-irc/xchat-xsys/files/1.9.3-ppc-support.patch
@@ -0,0 +1,62 @@
+--- xsys2/parse.c.orig	2005-05-14 13:29:35.000000000 +0100
++++ xsys2/parse.c	2005-05-14 13:40:50.000000000 +0100
+@@ -36,6 +36,7 @@
+ 		return 1;
+ 	if(count != NULL) *count = 0;
+ 	
++	#ifdef __i386__
+ 	while(fgets(buffer, 1024, fp) != NULL)
+ 	{
+ 		if(strstr(buffer, "model name") != NULL && model != NULL)
+@@ -76,7 +77,50 @@
+ 				*count = strtoul(buffer, NULL, 0)+1;
+ 		}
+ 	}
+-	
++	#endif
++	#ifdef __powerpc__
++	while(fgets(buffer, 1024, fp) != NULL)
++	{
++		if(strstr(buffer, "cpu") != NULL && model != NULL)
++		{
++			position = strstr(buffer, ":");
++			position += 2;
++			strcpy(model, position);
++			position = strstr(model, "\n");
++			*(position) = '\0';
++		}
++		else if(strstr(buffer, "pmac-generation") != NULL && vendor != NULL)
++		{
++			position = strstr(buffer, ":");
++			position += 2;
++			strcpy(vendor, position);
++			position = strstr(vendor, "\n");
++			*(position) = '\0';
++		}
++		else if(strstr(buffer, "clock") != NULL && freq != NULL)
++		{
++			position = strstr(buffer, ":");
++			position += 2;
++			*freq = strtod(position, NULL);
++		}
++		else if(strstr(buffer, "L2 cache") != NULL && cache != NULL)
++		{
++			position = strstr(buffer, ":");
++			position += 2;
++			strcpy(cache, position);
++			position = strstr(cache, "\n");
++			*(position) = '\0';
++		}
++		else if(strstr(buffer, "processor") != NULL && count != NULL)
++		{
++			position = strstr(buffer, ":");
++			position += 2;
++			if((strtoul(buffer, NULL, 0)+1) > *count)
++				*count = strtoul(buffer, NULL, 0)+1;
++		}
++	}
++	#endif
++
+ 	fclose(fp);
+ 	
+ 	return 0;
diff --git a/net-irc/xchat-xsys/files/1.9.3-sysfs-instead-of-lspci-2.patch b/net-irc/xchat-xsys/files/1.9.3-sysfs-instead-of-lspci-2.patch
new file mode 100644
index 000000000000..f10fd7db6c91
--- /dev/null
+++ b/net-irc/xchat-xsys/files/1.9.3-sysfs-instead-of-lspci-2.patch
@@ -0,0 +1,127 @@
+--- xsys2/parse.c.orig	2005-04-17 21:01:24.000000000 +0100
++++ xsys2/parse.c	2005-04-17 23:05:40.000000000 +0100
+@@ -150,19 +150,91 @@
+ 
+ int xs_parse_video(char *vid_card)
+ {
+-	char *pos = NULL;
+-	FILE *pipe = popen(LSPCI" | grep VGA | cut -d\" \" -f5-", "r");
+-	if(pipe == NULL)
+-		return 1;
+-	while(fgets(vid_card, 1024, pipe) != NULL)
++	char buffer[1024], pcibus[42], vendor[7], device[7], vendorname[128] = "", devicename[128] = "", *position;
++	int busnr = 0, devnr = 0, cardfound = 0;
++
++	while ( busnr <= 20 )
+ 	{
+-		if((pos = strchr(vid_card, '\n')) != NULL)
+-			*pos = '\0';
++		while ( devnr <= 20 ) {
++			snprintf(pcibus, 42, "/sys/bus/pci/devices/0000:%.2d:%.2d.0/class", busnr, devnr);
++			FILE *fp = fopen(pcibus, "r");
++			if(fp != NULL) {
++				if(fgets(buffer, 1024, fp) != NULL)
++					if(strncmp("0x03", buffer, 4) == 0) {
++						cardfound = 1;
++						break;
++					}
++				fclose(fp);
++			}
++			devnr++;
++		}
++		if (cardfound == 1)
++			break;
++		busnr++;
++		devnr = 0;
++        }
++
++	if (cardfound == 0) {
++		strncpy(vid_card, "No AGP card found", 42);
++		return 0;
+ 	}
+-	if(pos == NULL) return 2;
++
++	snprintf(pcibus, 42, "/sys/bus/pci/devices/0000:%.2d:%.2d.0/device", busnr, devnr);
++	FILE *fp = fopen(pcibus, "r");
++	if(fp != NULL) {
++		if(fgets(buffer, 1024, fp) != NULL)
++			if(strstr(buffer, "0x") != NULL) {
++				position = strstr(buffer, "0x");
++				position += 2;
++				strncpy(device, position, 7);
++				position = strstr(device, "\n");
++				*(position) = '\0';
++			}
++			fclose(fp);
++		}
++
++	snprintf(pcibus, 42, "/sys/bus/pci/devices/0000:%.2d:%.2d.0/vendor", busnr, devnr);
++	FILE *fp2 = fopen(pcibus, "r");
++	if(fp2 != NULL) {
++		if(fgets(buffer, 1024, fp) != NULL)
++			if(strstr(buffer, "0x") != NULL) {
++				position = strstr(buffer, "0x");
++				position += 2;
++				strncpy(vendor, position, 7);
++				position = strstr(vendor, "\n");
++				*(position) = '\0';
++			}
++			fclose(fp2);
++		}
+ 	
+-	pclose(pipe);
++	FILE *fp3 = fopen("/usr/share/misc/pci.ids", "r");
++	if(fp3 == NULL) {
++		snprintf(vid_card, 42, "Found AGP card %s:%s", vendor, device);
++		return 0;
++	}
+ 
++	while(fgets(buffer, 1024, fp3) != NULL)	{
++		if (!isspace(buffer[0]) && strstr(buffer, vendor) != NULL) {
++                       	position = strstr(buffer, vendor);
++                       	position += 6;
++                       	strncpy(vendorname, position, 128);
++                       	position = strstr(vendorname, "\n");
++                       	*(position) = '\0';
++			break;
++                }
++	}
++	while(fgets(buffer, 1024, fp3) != NULL) {
++		if(strstr(buffer, device) != NULL) {
++                        position = strstr(buffer, device);
++                        position += 6;
++                        strncpy(devicename, position, 128);
++                        position = strstr(devicename, "\n");
++                        *(position) = '\0';
++			break;
++ 		}
++	}
++	fclose(fp3);
++	snprintf(vid_card, 256, "%s %s", vendorname, devicename);
+ 	return 0;
+ }
+ 
+@@ -389,4 +461,3 @@
+ 	}
+ 	return 0;
+ }
+-
+--- xsys2/Makefile.orig	2005-04-17 21:01:27.000000000 +0100
++++ xsys2/Makefile	2005-04-17 21:01:31.000000000 +0100
+@@ -1,7 +1,3 @@
+-#### SET THIS VALUE TO THE LOCATION OF 'lspci' ####
+-LSPCI = /sbin/lspci
+-
+-
+ #### SHOULD NOT NEED TO EDIT BELOW THIS LINE ####
+ VER_MAJOR = 1
+ VER_MINOR = 9
+@@ -9,7 +5,7 @@
+ CC = gcc
+ CFLAGS += -O2 -Wall -fPIC
+ CFLAGS += -DVER_MINOR=$(VER_MINOR) -DVER_MAJOR=$(VER_MAJOR) -DVER_PATCH=$(VER_PATCH) \
+-          -DVER_STRING=\"$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)\" -DLSPCI=\"$(LSPCI)\"
++          -DVER_STRING=\"$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH)\"
+ LDFLAGS = $(CFLAGS) -shared
+ LIBRARY = xsys-$(VER_MAJOR).$(VER_MINOR).$(VER_PATCH).so
+ OBJECTS = xsys.o parse.o
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.1 b/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.1
deleted file mode 100644
index 27870bce7dfe..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fb06c0dfc2ac280b14d705aa1ae9d63 xsys-1.9.1.tar.bz2 9679
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
deleted file mode 100644
index 27870bce7dfe..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1fb06c0dfc2ac280b14d705aa1ae9d63 xsys-1.9.1.tar.bz2 9679
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.3-r1 b/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.3-r1
new file mode 100644
index 000000000000..717d41bf4a89
--- /dev/null
+++ b/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.3-r1
@@ -0,0 +1 @@
+MD5 7a284ae9aea5f951e8e89e1c846848fb xsys-1.9.3.tar.bz2 10578
diff --git a/net-irc/xchat-xsys/xchat-xsys-1.9.1.ebuild b/net-irc/xchat-xsys/xchat-xsys-1.9.1.ebuild
deleted file mode 100644
index ae7ffb8da6ec..000000000000
--- a/net-irc/xchat-xsys/xchat-xsys-1.9.1.ebuild
+++ /dev/null
@@ -1,30 +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-1.9.1.ebuild,v 1.4 2005/01/16 13:05:01 chainsaw Exp $
-
-IUSE=""
-
-inherit eutils
-
-MY_P=${P/xchat-/}
-DESCRIPTION="Sysinfo plugin for X-Chat."
-SRC_URI="http://mshoup.us/downloads/xsys/${MY_P}.tar.bz2"
-HOMEPAGE="http://mshoup.us/downloads/xsys/README-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 x86"
-S=${WORKDIR}/${MY_P}
-
-DEPEND=">=net-irc/xchat-2.4.0"
-
-src_compile() {
-	emake -j1 || die "Compile failed"
-}
-
-src_install() {
-	exeinto /usr/$(get_libdir)/xchat/plugins
-	doexe xsys-${PV}.so
-
-	dodoc ChangeLog README
-}
diff --git a/net-irc/xchat-xsys/xchat-xsys-1.9.1-r1.ebuild b/net-irc/xchat-xsys/xchat-xsys-1.9.3-r1.ebuild
index 1643778135a0..c2d3bd145df8 100644
--- a/net-irc/xchat-xsys/xchat-xsys-1.9.1-r1.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-1.9.3-r1.ebuild
@@ -1,19 +1,19 @@
 # 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-r1.ebuild,v 1.1 2005/01/16 13:05:01 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-1.9.3-r1.ebuild,v 1.1 2005/05/14 13:13:09 chainsaw Exp $
 
 inherit eutils
 
-MY_P=${P/xchat-/}
+MY_P="${P/xchat-/}"
 DESCRIPTION="Sysinfo plugin for X-Chat."
 SRC_URI="http://mshoup.us/downloads/xsys/${MY_P}.tar.bz2"
 HOMEPAGE="http://mshoup.us/downloads/xsys/README-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64 ~ppc"
 IUSE="bmp xmms"
-S=${WORKDIR}/${MY_P}
+S=${WORKDIR}/xsys2
 
 DEPEND=">=net-irc/xchat-2.4.0
 	bmp? (media-plugins/bmp-infopipe)
@@ -22,7 +22,8 @@ DEPEND=">=net-irc/xchat-2.4.0
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}-bmp-support.patch
+	epatch ${FILESDIR}/${PV}-sysfs-instead-of-lspci-2.patch
+	epatch ${FILESDIR}/${PV}-ppc-support.patch
 }
 
 src_compile() {
diff --git a/net-irc/xchat-xsys/xchat-xsys-1.9.3.ebuild b/net-irc/xchat-xsys/xchat-xsys-1.9.3.ebuild
index 3903cf0bdf40..a6165dac634d 100644
--- a/net-irc/xchat-xsys/xchat-xsys-1.9.3.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-1.9.3.ebuild
@@ -1,6 +1,6 @@
 # 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.3.ebuild,v 1.1 2005/04/16 19:26:20 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-1.9.3.ebuild,v 1.2 2005/05/14 13:13:09 chainsaw Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ HOMEPAGE="http://mshoup.us/downloads/xsys/README-${PV}"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64"
+KEYWORDS="x86 ~amd64"
 IUSE="bmp xmms"
 S=${WORKDIR}/xsys2