Fix bug #156304, removed SerialMeter.

Package-Manager: portage-2.1.2-r4

5 files changed, 101 insertions, 18 deletions

diff --git a/x11-misc/xosview/ChangeLog b/x11-misc/xosview/ChangeLog
index e3e2ea946bee..6d57cef53aee 100644
--- a/x11-misc/xosview/ChangeLog
+++ b/x11-misc/xosview/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/xosview
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.31 2007/01/05 09:20:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/ChangeLog,v 1.32 2007/01/28 19:26:17 nelchael Exp $
+
+  28 Jan 2007; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xosview-1.8.3-remove-serialmeter.patch, xosview-1.8.3.ebuild:
+  Fix bug #156304, removed SerialMeter.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org>
   xosview-1.8.2-r1.ebuild, xosview-1.8.3.ebuild:
diff --git a/x11-misc/xosview/Manifest b/x11-misc/xosview/Manifest
index 657247bb38c2..ea3535762069 100644
--- a/x11-misc/xosview/Manifest
+++ b/x11-misc/xosview/Manifest
@@ -1,6 +1,10 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX xosview-1.8.3-remove-serialmeter.patch 2306 RMD160 972a2f585342d8b8bf62a50395628c1b3bdad6ce SHA1 c4420fd9ae13b4840512e22383d4cc4e7aaddfad SHA256 957edf6f7faeda3f8bdad80ffa982cc95a14833e82636d60e918377fec3f8681
+MD5 27624e60306421afdceccbdbbadbefbc files/xosview-1.8.3-remove-serialmeter.patch 2306
+RMD160 972a2f585342d8b8bf62a50395628c1b3bdad6ce files/xosview-1.8.3-remove-serialmeter.patch 2306
+SHA256 957edf6f7faeda3f8bdad80ffa982cc95a14833e82636d60e918377fec3f8681 files/xosview-1.8.3-remove-serialmeter.patch 2306
 AUX xosview-emptyxpaths.patch 1861 RMD160 e3c1d82654843335db656a12cb820f74e5a53692 SHA1 ae1a154a490c086be351ddb432d35fd1814f2007 SHA256 64e87a9c6e03e682be98986fa4fef68b57a779d93908f5bf9c8b2d4efd0930b8
 MD5 e5d743e89fadcc4cc2facb642650e018 files/xosview-emptyxpaths.patch 1861
 RMD160 e3c1d82654843335db656a12cb820f74e5a53692 files/xosview-emptyxpaths.patch 1861
@@ -9,34 +13,34 @@ AUX xosview-resdir.patch 1566 RMD160 1e185bb65f963bdbe09db2eff839d14996b7f511 SH
 MD5 647297fad7639dbf11950956b41194eb files/xosview-resdir.patch 1566
 RMD160 1e185bb65f963bdbe09db2eff839d14996b7f511 files/xosview-resdir.patch 1566
 SHA256 b5c01c4c23119ade31a11bc3d567de83cc9605f6a277a61e89c99b91f942dd6d files/xosview-resdir.patch 1566
-DIST xosview-1.8.2.tar.gz 248859
-DIST xosview-1.8.3.tar.gz 259793 RMD160 595e812dee686ccaa5d95eb537782679d752271b SHA256 3aa28fb12552ea106e06f6958e1a0913bde8b0bb1491c091a3f1849717736b66
+DIST xosview-1.8.2.tar.gz 248859 RMD160 eb2a513629350795b85c41fc61cbd23da4de140e SHA1 54df604641ebbe6872f631cea34c9d91883bf4da SHA256 bf9cbfc2a7dd2824aad4be94211ec92741ef6e21eb7f634772592186a9ff478c
+DIST xosview-1.8.3.tar.gz 259793 RMD160 595e812dee686ccaa5d95eb537782679d752271b SHA1 420fd0620ff9fb9ba83fc833eeb8b872414e377e SHA256 3aa28fb12552ea106e06f6958e1a0913bde8b0bb1491c091a3f1849717736b66
 EBUILD xosview-1.8.2-r1.ebuild 847 RMD160 18c1e18b0b4420fd35cd555ac8cbad53e85fd77b SHA1 343d5df90c201c0d23a2b0a505074e5b8618a87e SHA256 676ddaaf81ed4ea70cb1c8b4f8b500aa1e6d33587877ef8627e2b3447404b968
 MD5 2fa2dad2c56049986717ad8af094486b xosview-1.8.2-r1.ebuild 847
 RMD160 18c1e18b0b4420fd35cd555ac8cbad53e85fd77b xosview-1.8.2-r1.ebuild 847
 SHA256 676ddaaf81ed4ea70cb1c8b4f8b500aa1e6d33587877ef8627e2b3447404b968 xosview-1.8.2-r1.ebuild 847
-EBUILD xosview-1.8.3.ebuild 850 RMD160 dc2a0ad0ffea91df8944cb65e49b23042927fe82 SHA1 ce959a66640a4945ff980c333c08e434ccf47b1d SHA256 e81d096ca7c0bcd10ae952ebb3c4fe01c455ac48b680ac2932b5d9cac579ecf9
-MD5 161e8a10ae5b97c457c57a0ccb311291 xosview-1.8.3.ebuild 850
-RMD160 dc2a0ad0ffea91df8944cb65e49b23042927fe82 xosview-1.8.3.ebuild 850
-SHA256 e81d096ca7c0bcd10ae952ebb3c4fe01c455ac48b680ac2932b5d9cac579ecf9 xosview-1.8.3.ebuild 850
-MISC ChangeLog 5671 RMD160 133771924891bd291215debb0c0953541a1b0b80 SHA1 d3d3fed7046c1c92fb7a09fea9131581a38ff37c SHA256 e87647c211286580ab132b22cdae4ef595617064f155cef59b1569014a377ab3
-MD5 cdeb9d85d471338e14f3587143eecb74 ChangeLog 5671
-RMD160 133771924891bd291215debb0c0953541a1b0b80 ChangeLog 5671
-SHA256 e87647c211286580ab132b22cdae4ef595617064f155cef59b1569014a377ab3 ChangeLog 5671
+EBUILD xosview-1.8.3.ebuild 901 RMD160 2be022fbcc6850cb46618e0c16facee37d36e6ee SHA1 7e96b22bae31ccad3922c78b3eafa91e858d0924 SHA256 e60d3e132a99beb15aeee5bba143df3e3063cf186d028ad99fc2ca222ba83bb9
+MD5 91e466ccf3de6a69c70130cc7559cf8e xosview-1.8.3.ebuild 901
+RMD160 2be022fbcc6850cb46618e0c16facee37d36e6ee xosview-1.8.3.ebuild 901
+SHA256 e60d3e132a99beb15aeee5bba143df3e3063cf186d028ad99fc2ca222ba83bb9 xosview-1.8.3.ebuild 901
+MISC ChangeLog 5835 RMD160 a8ae2cd235794374223bb95412ea3963909c7081 SHA1 3edc758c7ac92a042f2d72c92db02d4c23654888 SHA256 f643fdeb45453d4e1168bae264dacfcd96fc5cc313653173749e85f1fa3e2a91
+MD5 3da3abc0e48d630b5d753f3450953e02 ChangeLog 5835
+RMD160 a8ae2cd235794374223bb95412ea3963909c7081 ChangeLog 5835
+SHA256 f643fdeb45453d4e1168bae264dacfcd96fc5cc313653173749e85f1fa3e2a91 ChangeLog 5835
 MISC metadata.xml 173 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e SHA1 ca2ea648208cc74669b8a084f1b74e5cd4415777 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f
 MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
 RMD160 f74c5ca8d8aa0d0897c7c107f6eb4424d4f4343e metadata.xml 173
 SHA256 2f2c48f12680e78f700e809ba6ff98c67b1ea8b707291659c1bfb6b20d28835f metadata.xml 173
-MD5 efaaa39f5b7d26d1feffe219417ed633 files/digest-xosview-1.8.2-r1 65
-RMD160 96db2522b6fb6e4e125ff2b94c171b4a914e705c files/digest-xosview-1.8.2-r1 65
-SHA256 2c6914adb3af2a0c05c252d915fc0f9daa0e00464109647d91e9d868b8a40a4f files/digest-xosview-1.8.2-r1 65
+MD5 0b87d6784737f943f66d4189742d8526 files/digest-xosview-1.8.2-r1 241
+RMD160 41d240366ec5575c7f8a8adfcd6e5c3b3fdc583c files/digest-xosview-1.8.2-r1 241
+SHA256 cffc2176ae3bd2ff69b739212b78875673dd0bf45348ea5937b3ef192cfaeecf files/digest-xosview-1.8.2-r1 241
 MD5 8c6c1708135ded34438c8f4bc5139405 files/digest-xosview-1.8.3 241
 RMD160 04d1608e43b1de54cb92a9608bcfd09ac9b58e98 files/digest-xosview-1.8.3 241
 SHA256 d368c4c5870b977f44d160c9502d28bd84e22e3528731a52deb848f5dddf4822 files/digest-xosview-1.8.3 241
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.1 (GNU/Linux)
 
-iD8DBQFFnhhlAiZjviIA2XgRAnzDAJ0Uu6ImehErU8daDE3DnAVGGWpxeQCgpn/G
-r4lRRxaLzJrN8GRFANs5wuQ=
-=7kvX
+iD8DBQFFvPjggo/w9rxVVVERAs/jAJ9gZyd4dbeBeVeJnNtNWEEF3zvdQwCgjUcG
+h5urzh57y6DFYqPvM6j/ZVw=
+=gnxJ
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/xosview/files/digest-xosview-1.8.2-r1 b/x11-misc/xosview/files/digest-xosview-1.8.2-r1
index 1627abd4cc5e..6e12839a9428 100644
--- a/x11-misc/xosview/files/digest-xosview-1.8.2-r1
+++ b/x11-misc/xosview/files/digest-xosview-1.8.2-r1
@@ -1 +1,3 @@
 MD5 cc8b261b1f8d82da29239f1cc2ee55e9 xosview-1.8.2.tar.gz 248859
+RMD160 eb2a513629350795b85c41fc61cbd23da4de140e xosview-1.8.2.tar.gz 248859
+SHA256 bf9cbfc2a7dd2824aad4be94211ec92741ef6e21eb7f634772592186a9ff478c xosview-1.8.2.tar.gz 248859
diff --git a/x11-misc/xosview/files/xosview-1.8.3-remove-serialmeter.patch b/x11-misc/xosview/files/xosview-1.8.3-remove-serialmeter.patch
new file mode 100644
index 000000000000..21af07120fee
--- /dev/null
+++ b/x11-misc/xosview/files/xosview-1.8.3-remove-serialmeter.patch
@@ -0,0 +1,72 @@
+diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/linux/MeterMaker.cc xosview-1.8.3/linux/MeterMaker.cc
+--- xosview-1.8.3.vanilla/linux/MeterMaker.cc	2007-01-28 20:09:28.000000000 +0100
++++ xosview-1.8.3/linux/MeterMaker.cc	2007-01-28 20:19:04.000000000 +0100
+@@ -76,10 +76,12 @@
+ #if defined (__arm__) || defined(__mc68000__) || defined(__powerpc__) || defined(__sparc__) || defined(__s390__) || defined(__s390x__)
+   /* these architectures have no ioperm() */
+ #else
++  /*
+   for (int i = 0 ; i < SerialMeter::numDevices() ; i++)
+     if (_xos->isResourceTrue(SerialMeter::getResourceName(
+       (SerialMeter::Device)i)))
+         push(new SerialMeter(_xos, (SerialMeter::Device)i));
++  */
+ #endif
+ 
+   // check for the interrupt meter
+diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/linux/serialmeter.cc xosview-1.8.3/linux/serialmeter.cc
+--- xosview-1.8.3.vanilla/linux/serialmeter.cc	2007-01-28 20:09:28.000000000 +0100
++++ xosview-1.8.3/linux/serialmeter.cc	2007-01-28 20:18:08.000000000 +0100
+@@ -10,6 +10,7 @@
+ //
+ //  In order to use this new serial meter, xosview needs to be suid root.
+ //
++/*
+ #include "serialmeter.h"
+ #include "xosview.h"
+ #include <fcntl.h>
+@@ -154,4 +155,4 @@
+   }
+ 
+   return 0;
+-}
++}*/
+diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/snprintf.cc xosview-1.8.3/snprintf.cc
+--- xosview-1.8.3.vanilla/snprintf.cc	2007-01-28 20:09:28.000000000 +0100
++++ xosview-1.8.3/snprintf.cc	2007-01-28 20:18:47.000000000 +0100
+@@ -1,11 +1,11 @@
+ #ifndef HAVE_SNPRINTF
+ 
++/*
+ #include <stdarg.h>
+ #include <stdio.h>
+ 
+ extern "C" int snprintf ( char *str, int n, const char *format, ...)
+     {
+-    /* punt the warning */
+     n++;
+     va_list ap;
+     va_start(ap, format);
+@@ -13,5 +13,6 @@
+     va_end(ap);
+     return rval;
+     }
++*/
+ 
+ #endif
+diff -Nru --exclude='Makefile*' --exclude='config.*' xosview-1.8.3.vanilla/snprintf.h xosview-1.8.3/snprintf.h
+--- xosview-1.8.3.vanilla/snprintf.h	2007-01-28 20:09:28.000000000 +0100
++++ xosview-1.8.3/snprintf.h	2007-01-28 20:18:20.000000000 +0100
+@@ -1,10 +1,12 @@
+ #ifndef snprintf_h
+ #define snprintf_h
+ 
++/*
+ #ifndef HAVE_SNPRINTF
+ extern "C" int snprintf ( char *str, int n, const char *format, ...);
+ #else
+ #include <stdio.h>
+ #endif
++*/
+ 
+ #endif
diff --git a/x11-misc/xosview/xosview-1.8.3.ebuild b/x11-misc/xosview/xosview-1.8.3.ebuild
index 3adfe6e2f38e..b2b78611d33a 100644
--- a/x11-misc/xosview/xosview-1.8.3.ebuild
+++ b/x11-misc/xosview/xosview-1.8.3.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/x11-misc/xosview/xosview-1.8.3.ebuild,v 1.3 2007/01/05 09:20:30 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xosview/xosview-1.8.3.ebuild,v 1.4 2007/01/28 19:26:17 nelchael Exp $
 
 inherit eutils
 
@@ -24,6 +24,7 @@ src_unpack() {
 	cd "${S}"
 	epatch "${FILESDIR}/xosview-emptyxpaths.patch"
 	epatch "${FILESDIR}/xosview-resdir.patch"
+	epatch "${FILESDIR}/${P}-remove-serialmeter.patch"
 }
 
 src_install() {