Fix floating point exception with no swap mounted. Bug found and patched by Emopig <andrew@nelless.net>, closes bug #195966. Preemptively fix dependencies so the 2.1 branch will not be built against Audacious 1.4, this would fail.

Package-Manager: portage-2.1.3.13

6 files changed, 274 insertions, 18 deletions

diff --git a/net-irc/xchat-xsys/ChangeLog b/net-irc/xchat-xsys/ChangeLog
index 1dec18f3f937..d889329c0858 100644
--- a/net-irc/xchat-xsys/ChangeLog
+++ b/net-irc/xchat-xsys/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-irc/xchat-xsys
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.58 2007/07/05 10:29:07 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/ChangeLog,v 1.59 2007/10/16 10:17:16 chainsaw Exp $
+
+*xchat-xsys-2.1.0-r2 (16 Oct 2007)
+
+  16 Oct 2007; Tony Vroon <chainsaw@gentoo.org>
+  +files/2.1.0-fix-meminfo-swapoff.patch, xchat-xsys-2.1.0-r1.ebuild,
+  +xchat-xsys-2.1.0-r2.ebuild:
+  Fix floating point exception with no swap mounted. Bug found and patched by
+  Emopig <andrew@nelless.net>, closes bug #195966. Preemptively fix
+  dependencies so the 2.1 branch will not be built against Audacious 1.4, this
+  would fail.
 
   05 Jul 2007; Tony Vroon <chainsaw@gentoo.org>
   -files/2.0.8-pciutils-headerchange.patch:
diff --git a/net-irc/xchat-xsys/Manifest b/net-irc/xchat-xsys/Manifest
index f26afa84ec9e..f360670a5754 100644
--- a/net-irc/xchat-xsys/Manifest
+++ b/net-irc/xchat-xsys/Manifest
@@ -5,15 +5,23 @@ AUX 2.1.0-alpha-L2-cache.patch 407 RMD160 d6784c34be04400424ce8171590b80ab71a3bb
 MD5 bf9ad01450017a6f707b20412a2766a4 files/2.1.0-alpha-L2-cache.patch 407
 RMD160 d6784c34be04400424ce8171590b80ab71a3bbe4 files/2.1.0-alpha-L2-cache.patch 407
 SHA256 90598dda2efcf0acb77595e68071ab44e5c96540a746b50064de142551fe5a37 files/2.1.0-alpha-L2-cache.patch 407
+AUX 2.1.0-fix-meminfo-swapoff.patch 5262 RMD160 51c371be64c7b18ecdb7c3fb442577a2891d9509 SHA1 202c751fda6d9f6ea693b1ae63fdfcf8282ae4eb SHA256 605af13995682717079e96b3b76db2a337250cafc8cf43d2e6a32ebc01e3fafa
+MD5 57d93a85eb415caef8000a955404edce files/2.1.0-fix-meminfo-swapoff.patch 5262
+RMD160 51c371be64c7b18ecdb7c3fb442577a2891d9509 files/2.1.0-fix-meminfo-swapoff.patch 5262
+SHA256 605af13995682717079e96b3b76db2a337250cafc8cf43d2e6a32ebc01e3fafa files/2.1.0-fix-meminfo-swapoff.patch 5262
 DIST xsys-2.1.0.tar.bz2 16499 RMD160 cca47892379b0022d306370a93e35b0a0c8dfbd8 SHA1 33f7b4383c1ec65e4e7aeae93136bfa2589adf7f SHA256 d91b302bdf9583cc769c664d98a28f76d8d34d635a0446a14833ad4f5b6ef61d
-EBUILD xchat-xsys-2.1.0-r1.ebuild 1308 RMD160 e3e4b3e9a04df4bd34e4a2352fa26271ae83955b SHA1 adb3e9b2df076b465419e907c67508ebc6c29993 SHA256 247469eeed321f81a2bc48f9a78a123fff4fa5691e1901cd3da14f8ec716937b
-MD5 affa951e7357d5f8fccf71fb0be124f7 xchat-xsys-2.1.0-r1.ebuild 1308
-RMD160 e3e4b3e9a04df4bd34e4a2352fa26271ae83955b xchat-xsys-2.1.0-r1.ebuild 1308
-SHA256 247469eeed321f81a2bc48f9a78a123fff4fa5691e1901cd3da14f8ec716937b xchat-xsys-2.1.0-r1.ebuild 1308
-MISC ChangeLog 9582 RMD160 fe991e0ea28372bf14cba52464ce41538f8d0dcd SHA1 222f8244fb9d37ac275d19dcd6ea7f28c5fa82cf SHA256 810b8a336bdc2ae9af90cb65e167fe7b56d6aaad5ce7d391d595eb523da895e0
-MD5 f5c22fb0327a7f18f5db08b4cee810c9 ChangeLog 9582
-RMD160 fe991e0ea28372bf14cba52464ce41538f8d0dcd ChangeLog 9582
-SHA256 810b8a336bdc2ae9af90cb65e167fe7b56d6aaad5ce7d391d595eb523da895e0 ChangeLog 9582
+EBUILD xchat-xsys-2.1.0-r1.ebuild 1323 RMD160 e70aa4964045e9ec316874ec28186b8e12c3b5c6 SHA1 b37115c3c30d4d88fc94043dc77bd1e393d9a929 SHA256 d1805eaeffd016d32a2d8ddf9099fa9fb0e019266767d11f15df795a9ef00021
+MD5 a4f045b32f9b080e0fbbd31718a0cc17 xchat-xsys-2.1.0-r1.ebuild 1323
+RMD160 e70aa4964045e9ec316874ec28186b8e12c3b5c6 xchat-xsys-2.1.0-r1.ebuild 1323
+SHA256 d1805eaeffd016d32a2d8ddf9099fa9fb0e019266767d11f15df795a9ef00021 xchat-xsys-2.1.0-r1.ebuild 1323
+EBUILD xchat-xsys-2.1.0-r2.ebuild 1382 RMD160 195edab76418667db419363fbf2208b373345317 SHA1 23c196f4e267c9d99d2d0ce9925940b175139e61 SHA256 1f532da27e48de57a2d61e1d3d20ff6017c911c1d43ebdcfac472eb90a4c1ac6
+MD5 c000677a6c864ca3430dcbea60ca929d xchat-xsys-2.1.0-r2.ebuild 1382
+RMD160 195edab76418667db419363fbf2208b373345317 xchat-xsys-2.1.0-r2.ebuild 1382
+SHA256 1f532da27e48de57a2d61e1d3d20ff6017c911c1d43ebdcfac472eb90a4c1ac6 xchat-xsys-2.1.0-r2.ebuild 1382
+MISC ChangeLog 10007 RMD160 7c8462cc7a8f87889ae462e23b4082de10d819d5 SHA1 8ede41ca38b50611ff5dc93fccb41b7c633189e3 SHA256 69f2dfc6bab7a33dcb7a9bee3d83d8fa170b2b39b455160cf58ce2541834307e
+MD5 cb1c0cc1b131fb11aad60e6b3743cbf4 ChangeLog 10007
+RMD160 7c8462cc7a8f87889ae462e23b4082de10d819d5 ChangeLog 10007
+SHA256 69f2dfc6bab7a33dcb7a9bee3d83d8fa170b2b39b455160cf58ce2541834307e ChangeLog 10007
 MISC metadata.xml 250 RMD160 bbb8dc8eb566565cca20e2b1946b628de99d67b9 SHA1 d25f4394511b1f01d39ef163eada07751c158862 SHA256 304cf815927a5988355b9fd06d13eea56178bff87b2fe5262f9d0b6640c3050d
 MD5 42cef2da59c81f792584c3f9048a1930 metadata.xml 250
 RMD160 bbb8dc8eb566565cca20e2b1946b628de99d67b9 metadata.xml 250
@@ -21,10 +29,13 @@ SHA256 304cf815927a5988355b9fd06d13eea56178bff87b2fe5262f9d0b6640c3050d metadata
 MD5 73086e18e7c828e40f50c6eaa75a796a files/digest-xchat-xsys-2.1.0-r1 232
 RMD160 8e209649aa1ae46de43084ad32d5f41eac4ea589 files/digest-xchat-xsys-2.1.0-r1 232
 SHA256 507eafa485cc794f4e0eb283ef3b4bd79de35d60fbd2cc6f87bb504d119b6abd files/digest-xchat-xsys-2.1.0-r1 232
+MD5 73086e18e7c828e40f50c6eaa75a796a files/digest-xchat-xsys-2.1.0-r2 232
+RMD160 8e209649aa1ae46de43084ad32d5f41eac4ea589 files/digest-xchat-xsys-2.1.0-r2 232
+SHA256 507eafa485cc794f4e0eb283ef3b4bd79de35d60fbd2cc6f87bb504d119b6abd files/digest-xchat-xsys-2.1.0-r2 232
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
+Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFGjMfip5vW4rUFj5oRAqgRAJoC9lcNdcY5mOHFcmtNqgE9WZqR8ACgigQU
-/V53kHcCbmBs5zeIpjDuRD0=
-=hISg
+iD8DBQFHFI8+p5vW4rUFj5oRAh+TAJ9NDKizWvuXfuFskFxneHiyBlUt7ACfdAan
+bmlOhnfsiObotXW5TUiRaO4=
+=UPt6
 -----END PGP SIGNATURE-----
diff --git a/net-irc/xchat-xsys/files/2.1.0-fix-meminfo-swapoff.patch b/net-irc/xchat-xsys/files/2.1.0-fix-meminfo-swapoff.patch
new file mode 100644
index 000000000000..f9cac399f1d9
--- /dev/null
+++ b/net-irc/xchat-xsys/files/2.1.0-fix-meminfo-swapoff.patch
@@ -0,0 +1,181 @@
+--- xsys.orig.c	2006-06-02 22:49:34.000000000 +0100
++++ xsys.c	2007-10-15 18:46:10.000000000 +0100
+@@ -611,40 +611,157 @@
+ 	return XCHAT_EAT_ALL;
+ }
+ 
++
++static unsigned int mem_sprint_stats
++(
++    const char*         mem_type_name,
++    unsigned long long  total_kb,
++    unsigned long long  free_kb,
++    char*               string_buffer,
++    int                 string_buffer_size
++)
++{
++    char*               str_i               = string_buffer;
++    int                 str_buf_remaining   = string_buffer_size;
++    
++    if ((string_buffer_size <= 0) || (!string_buffer) || (!mem_type_name))
++    {
++        return 0;
++    }
++
++    str_i  = strncpy (str_i, mem_type_name, str_buf_remaining);
++    str_i += strlen  (mem_type_name);
++    str_i  = strncpy (str_i, " : ", str_buf_remaining);
++    str_i += 3;
++    
++    str_buf_remaining -= (str_i - string_buffer);
++    
++    if (total_kb >= 1048576)
++    {
++        if (percentages == 0)
++        {
++            str_i += snprintf 
++            (
++                str_i,
++                str_buf_remaining, 
++                "%.1fGB/%.1fGB free",
++                (float) (free_kb / 1048576), 
++                (float) (total_kb / 1048576)
++            );                
++        }
++        else
++        {
++            str_i += snprintf 
++            (
++                str_i,
++                str_buf_remaining,
++                "%.1fGB, %.1f%% free", 
++                (float) (total_kb / 1048576), 
++                percentage (&free_kb, &total_kb)
++            );                    
++        }
++    }
++    else
++    {        
++        if (percentages == 0)
++        {
++            str_i += snprintf
++            (
++                str_i,
++                str_buf_remaining,
++                "%lldMB/%lldMB free",
++                (free_kb / 1024),
++                (total_kb / 1024)
++            );
++        }
++        else
++        {
++            str_i += snprintf
++            (
++                str_i,
++                str_buf_remaining,
++                "%lldMB, %.1f%% free", 
++                (total_kb / 1024),
++                percentage (&free_kb, &total_kb)
++            );                   
++        }
++    }
++    
++    str_buf_remaining = string_buffer_size - (str_i - string_buffer);
++    if (str_buf_remaining < 0)
++    {
++        // The string has been truncated and won't be NUL character 
++        // terminated. This is unlikely but possible when using snprintf()
++        
++        string_buffer[string_buffer_size - 1] = '\0';
++        return (string_buffer_size - 1);
++    }
++    
++    return (str_i - string_buffer);
++}
++
++
+ static int mem_cb(char *word[], char *word_eol[], void *userdata)
+ {
+-	unsigned long long mem_total, mem_free, swap_total, swap_free;
+-	char string[bsize];
++	unsigned long long  mem_total, mem_free, swap_total, swap_free;
++	char                string[bsize];
++	char*               str_i              = string;
++	int                 str_buf_remaining  = sizeof(string);
++
+ 	
+ 	if(xs_parse_meminfo(&mem_total, &mem_free, 0) == 1)
+ 	{
+ 		xchat_printf(ph, "ERROR in parse_meminfo!");
+ 		return XCHAT_EAT_ALL;
+ 	}
++	
+ 	if(xs_parse_meminfo(&swap_total, &swap_free, 1) == 1)
+ 	{
+ 		xchat_printf(ph, "ERROR in parse_meminfo!");
+ 		return XCHAT_EAT_ALL;
+ 	}
+-
+-	if (percentages != 0)
+-		if (mem_total >= 1048576)
+-			snprintf(string, bsize, "Physical : %.1fGB, %.1f%% free | Swap : %.1fGB, %.1f%% free",
+-				(float)mem_total/1048576, percentage(&mem_free, &mem_total), (float)swap_total/1048576,
+-				percentage(&swap_free, &swap_total));
+-		else
+-			snprintf(string, bsize, "Physical : %lldMB, %.1f%% free | Swap : %lldMB, %.1f%% free",
+-				mem_total/1024, percentage(&mem_free, &mem_total), swap_total/1024,
+-				percentage(&swap_free, &swap_total));
+-	else
+-		if (mem_total >= 1048576)
+-			snprintf(string, bsize, "Physical : %.1fGB/%.1fGB Free | Swap : %.1fGB/%.1fGB Free",
+-        			(float)mem_free/1048576, (float)mem_total/1048576, (float)swap_free/1048576, (float)swap_total/1048576);
+-		else
+-			snprintf(string, bsize, "Physical : %lldMB/%lldMB Free | Swap : %lldMB/%lldMB Free",
+-        			mem_free/1024, mem_total/1024, swap_free/1024, swap_total/1024);
+-		
+-	format_output("mem", string, format);
++    
++    if (mem_total != 0)
++    {
++        str_i += mem_sprint_stats
++        (
++            "Physical",
++            mem_total,
++            mem_free,
++            str_i,
++            str_buf_remaining       
++        );
++        
++        str_buf_remaining -= (str_i - string);
++    }
++    
++    str_i = strncpy (str_i, " | ", str_buf_remaining);
++    str_i += 3;
++    str_buf_remaining -= 3;
++    
++    if (swap_total == 0)
++    {
++        const char no_swap[] = "Swap : None mounted";
++        
++        str_i = strncpy (str_i, no_swap, str_buf_remaining);
++        str_i += (sizeof (no_swap) - 1);
++        str_buf_remaining -= (sizeof (no_swap) - 1);
++    }
++    else
++    {
++        str_i += mem_sprint_stats
++        (
++            "Swap",
++            swap_total,
++            swap_free,
++            str_i,
++            str_buf_remaining       
++        );
++        
++        str_buf_remaining -= (str_i - string);
++    }
++    
++	format_output ("mem", string, format);
+ 	
+ 	if((long)userdata)
+ 		xchat_printf(ph, "%s", string);
diff --git a/net-irc/xchat-xsys/files/digest-xchat-xsys-2.1.0-r2 b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.1.0-r2
new file mode 100644
index 000000000000..a8764842ccab
--- /dev/null
+++ b/net-irc/xchat-xsys/files/digest-xchat-xsys-2.1.0-r2
@@ -0,0 +1,3 @@
+MD5 fd4d97152422341b5ce81469481d10a8 xsys-2.1.0.tar.bz2 16499
+RMD160 cca47892379b0022d306370a93e35b0a0c8dfbd8 xsys-2.1.0.tar.bz2 16499
+SHA256 d91b302bdf9583cc769c664d98a28f76d8d34d635a0446a14833ad4f5b6ef61d xsys-2.1.0.tar.bz2 16499
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.1.0-r1.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.1.0-r1.ebuild
index 3d988e09ec57..cc66374a5101 100644
--- a/net-irc/xchat-xsys/xchat-xsys-2.1.0-r1.ebuild
+++ b/net-irc/xchat-xsys/xchat-xsys-2.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.1.0-r1.ebuild,v 1.7 2007/02/20 21:09:35 welp Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/xchat-xsys/xchat-xsys-2.1.0-r1.ebuild,v 1.8 2007/10/16 10:17:16 chainsaw Exp $
 
 inherit toolchain-funcs eutils
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://dev.gentoo.org/~chainsaw/xsys/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ppc ppc64 sparc x86"
 IUSE="audacious buttons"
 
 DEPEND="|| (
@@ -20,11 +20,11 @@ DEPEND="|| (
 		>=net-irc/xchat-gnome-0.4
 	)
 	sys-apps/pciutils
-	audacious? ( media-sound/audacious )"
+	audacious? ( =media-sound/audacious-1.3* )"
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 	sed -i -e "s:-O2 -Wall:${CFLAGS} -Wall:" Makefile
 	if use buttons; then
 		sed -i -e "s:#BUTTON:BUTTON:" Makefile
@@ -32,7 +32,7 @@ src_unpack() {
 	if use audacious; then
 		sed -i -e "s:# FOR AUDACIOUS # ::g" Makefile
 	fi
-	epatch ${FILESDIR}/${PV}-alpha-L2-cache.patch
+	epatch "${FILESDIR}"/${PV}-alpha-L2-cache.patch
 }
 
 src_compile() {
diff --git a/net-irc/xchat-xsys/xchat-xsys-2.1.0-r2.ebuild b/net-irc/xchat-xsys/xchat-xsys-2.1.0-r2.ebuild
new file mode 100644
index 000000000000..cc437c734d5d
--- /dev/null
+++ b/net-irc/xchat-xsys/xchat-xsys-2.1.0-r2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2007 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.1.0-r2.ebuild,v 1.1 2007/10/16 10:17:16 chainsaw Exp $
+
+inherit toolchain-funcs eutils
+
+MY_P="${P/xchat-/}"
+S=${WORKDIR}/${MY_P}
+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="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="audacious buttons"
+
+DEPEND="|| (
+		>=net-irc/xchat-2.4.0
+		>=net-irc/xchat-gnome-0.4
+	)
+	sys-apps/pciutils
+	audacious? ( =media-sound/audacious-1.3* )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s:-O2 -Wall:${CFLAGS} -Wall:" Makefile
+	if use buttons; then
+		sed -i -e "s:#BUTTON:BUTTON:" Makefile
+	fi
+	if use audacious; then
+		sed -i -e "s:# FOR AUDACIOUS # ::g" Makefile
+	fi
+	epatch "${FILESDIR}"/${PV}-alpha-L2-cache.patch
+	epatch "${FILESDIR}"/${PV}-fix-meminfo-swapoff.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"
+
+	exeinto /usr/$(get_libdir)/xchat-gnome/plugins
+	doexe xsys-${PV}.so || die "doexe failed"
+
+	dodoc ChangeLog README || die "dodoc failed"
+}