Version bump, clean up old ebuilds.

(Portage version: 2.0.51.22-r1)

14 files changed, 22 insertions, 325 deletions

diff --git a/net-irc/xchat-xsys/ChangeLog b/net-irc/xchat-xsys/ChangeLog
index d0dcf0a168aa..4d13766b5ce8 100644
--- a/net-irc/xchat-xsys/ChangeLog
+++ b/net-irc/xchat-xsys/ChangeLog
@@ -1,6 +1,17 @@
 # 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.18 2005/06/14 06:33:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.19 2005/06/19 17:21:00 chainsaw Exp $
+
+*xchat-xsys-2.0.6 (19 Jun 2005)
+
+  19 Jun 2005; Tony Vroon <chainsaw@gentoo.org>
+  -files/1.9.3-ppc-support.patch,
+  -files/1.9.3-sysfs-instead-of-lspci-2.patch, -xchat-xsys-1.9.3-r1.ebuild,
+  -xchat-xsys-2.0.0-r1.ebuild, -xchat-xsys-2.0.2.ebuild,
+  -xchat-xsys-2.0.4.ebuild, xchat-xsys-2.0.5.ebuild,
+  +xchat-xsys-2.0.6.ebuild:
+  Version bump, no longer requires a 2.6 kernel. 2.0.5 stable on x86. Clean up
+  old ebuilds.
 
   14 Jun 2005; Markus Rothe <corsair@gentoo.org> xchat-xsys-2.0.5.ebuild:
   Added ~ppc64
diff --git a/net-irc/xchat-xsys/Manifest b/net-irc/xchat-xsys/Manifest
index bad7681bffd4..17eab57301f7 100644
--- a/net-irc/xchat-xsys/Manifest
+++ b/net-irc/xchat-xsys/Manifest
@@ -1,14 +1,6 @@
-MD5 ceaa8f45acc9a3078a3cae449942abb0 ChangeLog 3520
 MD5 42cef2da59c81f792584c3f9048a1930 metadata.xml 250
-MD5 409509e5312a334bb459709268d2e524 xchat-xsys-1.9.3-r1.ebuild 1005
-MD5 c86ad9ee5763973a091881dccc2987b7 xchat-xsys-2.0.0-r1.ebuild 1009
-MD5 461f66d4febb1217bd8aaeb7ddd65d63 xchat-xsys-2.0.2.ebuild 992
-MD5 5a0fe2777d80bf3a1ab0b520632b784d xchat-xsys-2.0.4.ebuild 992
-MD5 52ddd7714a8653124d2ef7d4a9eec8d3 xchat-xsys-2.0.5.ebuild 1005
-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
-MD5 d741c852e1ee3fcc0d4fbc5ba8025234 files/digest-xchat-xsys-2.0.0-r1 62
-MD5 e12f6271ad83cfb1691a0b8fc619b593 files/digest-xchat-xsys-2.0.2 62
-MD5 b99e516eb8f8f5630e6cc9adbeb7f3f0 files/digest-xchat-xsys-2.0.4 62
+MD5 ceaa8f45acc9a3078a3cae449942abb0 ChangeLog 3520
+MD5 43d50a61b1ac46ae202f1e736996d944 xchat-xsys-2.0.5.ebuild 1004
+MD5 43d50a61b1ac46ae202f1e736996d944 xchat-xsys-2.0.6.ebuild 1004
+MD5 cfd00aeca2a4bbf333f23e4f44bb9feb files/digest-xchat-xsys-2.0.6 62
 MD5 c4b3f86959972270bb4a3c32ce850dd9 files/digest-xchat-xsys-2.0.5 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
deleted file mode 100644
index 5464ec54ca7d..000000000000
--- a/net-irc/xchat-xsys/files/1.9.3-ppc-support.patch
+++ /dev/null
@@ -1,62 +0,0 @@
---- 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
deleted file mode 100644
index f10fd7db6c91..000000000000
--- a/net-irc/xchat-xsys/files/1.9.3-sysfs-instead-of-lspci-2.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- 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.3-r1 b/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.3-r1
deleted file mode 100644
index 717d41bf4a89..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-1.9.3-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 7a284ae9aea5f951e8e89e1c846848fb xsys-1.9.3.tar.bz2 10578
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.0-r1 b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.0-r1
deleted file mode 100644
index add2070f83b5..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a0c8726e3486807086d79c5fdd576126 xsys-2.0.0.tar.bz2 11120
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.2 b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.2
deleted file mode 100644
index 4a8c79fa3ad1..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c97caae74ee74738fb9de0e3a9f98c32 xsys-2.0.2.tar.bz2 11760
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.4 b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.4
deleted file mode 100644
index a525c1133bc0..000000000000
--- a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3d25caa6b07e3d5d19d5fbe673987693 xsys-2.0.4.tar.bz2 12651
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.6 b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.6
new file mode 100644
index 000000000000..34395b541dd8
--- /dev/null
+++ b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.0.6
@@ -0,0 +1 @@
+MD5 b8dfda189eb5ab4d91aed0718b1697ee xsys-2.0.6.tar.bz2 13845
diff --git a/net-irc/xchat-xsys/xchat-xsys-1.9.3-r1.ebuild b/net-irc/xchat-xsys/xchat-xsys-1.9.3-r1.ebuild
deleted file mode 100644
index 4fcc87ab7cfe..000000000000
--- a/net-irc/xchat-xsys/xchat-xsys-1.9.3-r1.ebuild
+++ /dev/null
@@ -1,39 +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.3-r1.ebuild,v 1.2 2005/05/16 15:55:08 swegener Exp $
-
-inherit eutils toolchain-funcs
-
-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 ~ppc"
-IUSE="bmp xmms"
-S="${WORKDIR}"/xsys2
-
-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}-sysfs-instead-of-lspci-2.patch
-	epatch "${FILESDIR}"/${PV}-ppc-support.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.0-r1.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.0-r1.ebuild
deleted file mode 100644
index af386f4dbc31..000000000000
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,37 +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.0-r1.ebuild,v 1.1 2005/05/20 22:44:43 chainsaw Exp $
-
-inherit eutils toolchain-funcs
-
-MY_P="${P/xchat-/}"
-S=${WORKDIR}/${MY_P}
-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 ~ppc"
-IUSE="bmp xmms"
-
-DEPEND=">=net-irc/xchat-2.4.0
-	bmp? ( media-plugins/bmp-infopipe )
-	xmms? ( media-plugins/xmms-infopipe )"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:/usr/share/hwdata:/usr/share/misc:" ${S}/Makefile
-	sed -i -e "s:-O2 -Wall:${CFLAGS} -Wall:" ${S}/Makefile
-}
-
-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.2.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.2.ebuild
deleted file mode 100644
index 29893ef5d2e6..000000000000
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.2.ebuild
+++ /dev/null
@@ -1,39 +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.2.ebuild,v 1.1 2005/05/30 00:07:41 chainsaw Exp $
-
-inherit toolchain-funcs
-
-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="~x86 ~amd64 ~ppc"
-IUSE="bmp xmms buttons"
-
-DEPEND=">=net-irc/xchat-2.4.0
-	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
-}
-
-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.5.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.5.ebuild
index 6723fca4427a..1ee5f970b03e 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.5.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.5.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-2.0.5.ebuild,v 1.3 2005/06/14 06:33:05 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.5.ebuild,v 1.4 2005/06/19 17:21:00 chainsaw Exp $
 
 inherit toolchain-funcs
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 x86"
 IUSE="bmp xmms buttons"
 
 DEPEND=">=net-irc/xchat-2.4.0
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.0.4.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.0.6.ebuild
index 1c04673c97a1..f53d1efb6c4f 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.0.4.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.0.6.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-2.0.4.ebuild,v 1.1 2005/06/06 18:49:11 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.0.6.ebuild,v 1.1 2005/06/19 17:21:00 chainsaw Exp $
 
 inherit toolchain-funcs
 
@@ -12,10 +12,11 @@ HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~x86"
 IUSE="bmp xmms buttons"
 
 DEPEND=">=net-irc/xchat-2.4.0
+	sys-apps/pciutils
 	bmp? ( media-plugins/bmp-infopipe )
 	xmms? ( media-plugins/xmms-infopipe )"