From d316b1c5c5cf632e436a92032801b86a6fbbf8e8 Mon Sep 17 00:00:00 2001
From: Simon Stelling <blubb@gentoo.org>
Date: Fri, 17 Feb 2006 16:48:49 +0000
Subject: [PATCH] no need to bzip smallish patches Package-Manager:
 portage-2.1_pre4-r1

---
 sys-cluster/openmosix-3dmon-stats/ChangeLog   |  10 +-
 ...mon-stats-0.2.1-makefile+init-script.patch |  53 ++++++
 ...stats-0.2.1-makefile+init-script.patch.bz2 | Bin 760 -> 0 bytes
 .../openmosix-3dmon-stats-0.2.1.ebuild        |   6 +-
 sys-cluster/openmosix-3dmon/ChangeLog         |  10 +-
 .../files/openmosix-3dmon-0.2.1-trivial.patch | 165 ++++++++++++++++++
 .../openmosix-3dmon-0.2.1-trivial.patch.bz2   | Bin 1162 -> 0 bytes
 .../openmosix-3dmon-0.2.1.ebuild              |   8 +-
 8 files changed, 241 insertions(+), 11 deletions(-)
 create mode 100644 sys-cluster/openmosix-3dmon-stats/files/openmosix-3dmon-stats-0.2.1-makefile+init-script.patch
 delete mode 100644 sys-cluster/openmosix-3dmon-stats/files/openmosix-3dmon-stats-0.2.1-makefile+init-script.patch.bz2
 create mode 100644 sys-cluster/openmosix-3dmon/files/openmosix-3dmon-0.2.1-trivial.patch
 delete mode 100644 sys-cluster/openmosix-3dmon/files/openmosix-3dmon-0.2.1-trivial.patch.bz2

diff --git a/sys-cluster/openmosix-3dmon-stats/ChangeLog b/sys-cluster/openmosix-3dmon-stats/ChangeLog
index 452701a61497..e2a25e381fc3 100644
--- a/sys-cluster/openmosix-3dmon-stats/ChangeLog
+++ b/sys-cluster/openmosix-3dmon-stats/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/openmosix-3dmon-stats
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmosix-3dmon-stats/ChangeLog,v 1.4 2004/07/01 21:48:30 eradicator Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmosix-3dmon-stats/ChangeLog,v 1.5 2006/02/17 16:48:49 blubb Exp $
+
+  17 Feb 2006; Simon Stelling <blubb@gentoo.org>
+  +files/openmosix-3dmon-stats-0.2.1-makefile+init-script.patch,
+  -files/openmosix-3dmon-stats-0.2.1-makefile+init-script.patch.bz2,
+  openmosix-3dmon-stats-0.2.1.ebuild:
+  no need to bzip smallish patches
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   openmosix-3dmon-stats-0.2.1.ebuild:
diff --git a/sys-cluster/openmosix-3dmon-stats/files/openmosix-3dmon-stats-0.2.1-makefile+init-script.patch b/sys-cluster/openmosix-3dmon-stats/files/openmosix-3dmon-stats-0.2.1-makefile+init-script.patch
new file mode 100644
index 000000000000..24663d54d6a7
--- /dev/null
+++ b/sys-cluster/openmosix-3dmon-stats/files/openmosix-3dmon-stats-0.2.1-makefile+init-script.patch
@@ -0,0 +1,53 @@
+diff -Nru mosstatd-0.2.1/Makefile mosstatd-0.2.1-fix/Makefile
+--- mosstatd-0.2.1/Makefile	2002-11-16 12:49:11.000000000 +0300
++++ mosstatd-0.2.1-fix/Makefile	2004-03-21 23:09:33.000000000 +0300
+@@ -4,13 +4,15 @@
+ OWNER=root
+ GROUP=root
+ CTAGS= ctags -x >tags
+-CFLAGS= -O
++INCLUDE=/usr/src/linux/include
++CFLAGS= -O -I$(INCLUDE)
+ LDFLAGS= -s -lmos
+ CC=gcc
+ INSTALL=install
+ SRCS=mosstatd.c
+ OBJS=mosstatd.o
+ BINDIR=/usr/bin
++INITDIR=/etc/init.d
+ 
+ 
+ 
+@@ -22,6 +24,7 @@
+ 
+ # To install it in the right place
+ install: mosstatd
++	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 750 omstat $(INITDIR)
+ 	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 mosstatd $(BINDIR)
+ 
+ # To uninstall it
+diff -Nru mosstatd-0.2.1/mosstat mosstatd-0.2.1-fix/mosstat
+--- mosstatd-0.2.1/mosstat	1970-01-01 03:00:00.000000000 +0300
++++ mosstatd-0.2.1-fix/mosstat	2004-03-21 23:07:09.000000000 +0300
+@@ -0,0 +1,21 @@
++#!/sbin/runscript
++# Copyright 1999-2003 Gentoo Technologies, Inc.
++# Distributed under the terms of the GNU General Public License, v2 or later
++
++depend() {
++	need net
++}
++
++start() {
++	ebegin "Starting statistics daemon for 3d openmosix monitor"
++	einfon
++	start-stop-daemon --start --quiet --exec /usr/sbin/mosstatd
++	eend $?
++}
++
++stop() {
++	ebegin "Stopping statistics daemon for 3d openmosix monitor"
++	start-stop-daemon --stop --quiet --exec /usr/sbin/mosstatd && \
++		rm /var/run/mosstatd.pid
++	eend $?
++}
diff --git a/sys-cluster/openmosix-3dmon-stats/files/openmosix-3dmon-stats-0.2.1-makefile+init-script.patch.bz2 b/sys-cluster/openmosix-3dmon-stats/files/openmosix-3dmon-stats-0.2.1-makefile+init-script.patch.bz2
deleted file mode 100644
index 32e04b1bbddf9c434bbbddc01f9f3348b69c8c20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 760
zcmV<U0tfv<T4*^jL0KkKSv5LoasUCSUw{HIeQ*D>|F_<RKkxr)Kmy=^ssa*;8BH2Z
zqtcnE^i4F=)C?dpVrXqcBS1=OXeLRKq{^Q3lhqH@!$?LNjSLM<k`0jN0E`n53<6-9
zG8z~J!5En40E`n53<6-9G8z~J!5EszR~xrNtO7Yp8XbZLB|B=Gny%R%n%|<2XUjK#
z74JtWADvlJrXj3-P8E(BgsLfKk{g5x#1VAR<lR_$Kj6q-2dQ|11{=D#E3lk|{mGHD
zB?Z<~ZJmo@N*3%#T(X=*uBj0#&gbEJ)yKV81&&r7u8Rn_-z7)QeI{u^Xi-%)E-^xN
zl8X6IHX40K8xIt~f>;$4QZz+Co@w(Ocf;}u7c*)CbeTu~IFv3-+=YpQvp`7LLyT{&
zYy*L!<WHnr++M_BE)67)YMugC1BX_xJYWJ1LDvB64Pf#jBXC*BvLw-lngT&d(((MS
z;cDCjri4*YwTd<9FIFZ}j}lbF0?xk+6oQNv=kzQKl*{{rfzR>iiP0>2PQjqu?MCko
zG5xQG?cL^xorSF=quN2LLGKsL5qsa-LI{k);u5oeZ1rmp?GIpmSux#+OD4pIOr~Zb
zXLB|E?zEc-T#*e%+AawO4&d)TgDV3fpd(cBCd``uGx&K55%$+d%l(w+dzo6JsS1Cn
zo!N`Z7<Egm$knnR`ch2hlN6Fh(|B(gY#eK$Nf{+&tjmm2dxa%1k%U5dkRW`dPG%*W
z4d>&ZmPWa6HIy<9vNgfEF}0s9bTPh%vLu_Bz%_-*HS^dQ;V|2`ZkI9&m*P|%B!I|;
zDrjU0wl0-seBoHMRLGm-2!dQOC%n5(m~8GFJwgbJu0y#Yn5ftzM=akJi8wMwe5svV
z#_aabGUhtX#ryD8GOXKaLoj$V1BKlf88uJ_lUX^U8cLj)JX8)|XvPlD;g*0r=w>dt
qnYFA!C0xnEmLVhg-{L(*v^ZKX$zZ`4k8*IQ_`8xR!i0gT(@T(eP+4#Q

diff --git a/sys-cluster/openmosix-3dmon-stats/openmosix-3dmon-stats-0.2.1.ebuild b/sys-cluster/openmosix-3dmon-stats/openmosix-3dmon-stats-0.2.1.ebuild
index 6c0a5467ca80..e027e53c153f 100644
--- a/sys-cluster/openmosix-3dmon-stats/openmosix-3dmon-stats-0.2.1.ebuild
+++ b/sys-cluster/openmosix-3dmon-stats/openmosix-3dmon-stats-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmosix-3dmon-stats/openmosix-3dmon-stats-0.2.1.ebuild,v 1.5 2004/07/15 03:04:10 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmosix-3dmon-stats/openmosix-3dmon-stats-0.2.1.ebuild,v 1.6 2006/02/17 16:48:49 blubb Exp $
 
 inherit eutils
 
@@ -30,7 +30,7 @@ src_unpack() {
 	unpack ${A}
 
 	cd ${S}
-	epatch ${FILESDIR}/${P}-makefile+init-script.patch.bz2 \
+	epatch ${FILESDIR}/${P}-makefile+init-script.patch \
 		|| die "Failed to patch the source."
 }
 
diff --git a/sys-cluster/openmosix-3dmon/ChangeLog b/sys-cluster/openmosix-3dmon/ChangeLog
index e4b3b2524382..4365a5cadd07 100644
--- a/sys-cluster/openmosix-3dmon/ChangeLog
+++ b/sys-cluster/openmosix-3dmon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/openmosix-3dmon
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmosix-3dmon/ChangeLog,v 1.4 2004/07/01 21:48:17 eradicator Exp $
+# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmosix-3dmon/ChangeLog,v 1.5 2006/02/17 16:47:16 blubb Exp $
+
+  17 Feb 2006; Simon Stelling <blubb@gentoo.org>
+  +files/openmosix-3dmon-0.2.1-trivial.patch,
+  -files/openmosix-3dmon-0.2.1-trivial.patch.bz2,
+  openmosix-3dmon-0.2.1.ebuild:
+  no need to bzip smallish patches
 
   01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
   openmosix-3dmon-0.2.1.ebuild:
diff --git a/sys-cluster/openmosix-3dmon/files/openmosix-3dmon-0.2.1-trivial.patch b/sys-cluster/openmosix-3dmon/files/openmosix-3dmon-0.2.1-trivial.patch
new file mode 100644
index 000000000000..c71636e9f871
--- /dev/null
+++ b/sys-cluster/openmosix-3dmon/files/openmosix-3dmon-0.2.1-trivial.patch
@@ -0,0 +1,165 @@
+diff -Nru 3dmon-0.2.1/3dmosmon/3dmosmon.cpp 3dmon-0.2.1-fix/3dmosmon/3dmosmon.cpp
+--- 3dmon-0.2.1/3dmosmon/3dmosmon.cpp	2002-11-15 20:03:23.000000000 +0300
++++ 3dmon-0.2.1-fix/3dmosmon/3dmosmon.cpp	2004-03-21 21:42:22.805031659 +0300
+@@ -457,7 +457,8 @@
+ 	switch (key)
+ 	{ 
+ 	case 'q': kill(kpid, SIGKILL); Barmanager.quit(); break;
+-    
++        case 27 : kill(kpid, SIGKILL); Barmanager.quit(); break;
++	
+ 	case 'r': Barmanager.ToggleSpin(); break;
+ 	
+ 	case 'w':
+@@ -655,7 +656,7 @@
+ }
+ 
+ 	
+-void main(int argc, char** argv)
++int main(int argc, char** argv)
+ {
+ 
+ 	ParseArguments(argc, argv);
+diff -Nru 3dmon-0.2.1/3dmosmon/barmanager.h 3dmon-0.2.1-fix/3dmosmon/barmanager.h
+--- 3dmon-0.2.1/3dmosmon/barmanager.h	2002-11-09 17:30:32.000000000 +0300
++++ 3dmon-0.2.1-fix/3dmosmon/barmanager.h	2004-03-21 21:36:40.892913624 +0300
+@@ -27,7 +27,7 @@
+ 
+ #include "rand.h"
+ #include "spin.h"
+-#include "map.h"
++#include <map>
+ 
+ #define LOAD 1 //values for display mode
+ #define MEM 2
+@@ -68,11 +68,11 @@
+ private:
+ 	//TwoDMosixMap map;
+ //        map MosixMap;
+-	list <CObject *> ObjectList;
+-	list<CObject *> ::iterator ObjectIter;
++	std::list <CObject *> ObjectList;
++	std::list <CObject *> ::iterator ObjectIter;
+ 	
+-	list <bar_record> BarList;
+-	list <bar_record> ::iterator BarIter;
++	std::list <bar_record> BarList;
++	std::list <bar_record> ::iterator BarIter;
+ 
+ 	int Spin;
+ 
+diff -Nru 3dmon-0.2.1/3dmosmon/materials.h 3dmon-0.2.1-fix/3dmosmon/materials.h
+--- 3dmon-0.2.1/3dmosmon/materials.h	2002-10-11 15:57:04.000000000 +0400
++++ 3dmon-0.2.1-fix/3dmosmon/materials.h	2004-03-21 21:36:40.892913624 +0300
+@@ -29,20 +29,20 @@
+ 	{1.0, 1.0, 1.0, 1.0},
+ 	{0.0, 0.0, 0.0, 1.0},   
+ 	{1.0, 1.0, 1.0, 1.0},
+-	{20.0}
++	20.0
+ };
+  
+ static material_struct lensMaterials = {
+ 	{0.1, 0.1, 0.1, 1.0},
+ 	{0.1, 0.1, 0.1, 1.0},   
+ 	{1.0, 1.0, 1.0, 1.0},
+-	{20.0}
++	20.0
+ };
+ static material_struct redMaterials = {
+ 	{1.0, 0.0, 0.0, 0.4},
+ 	{0.0, 0.0, 0.0, 0.4},
+ 	{0.0, 0.0, 0.0, 0.4},
+-	{20.0}
++	20.0
+ };
+ 
+ 
+@@ -50,14 +50,14 @@
+ 	{0.0, 0.6, 0.2, 0.4},
+ 	{0.0, 0.0, 0.0, 0.4},
+ 	{0.3, 0.3, 0.3, 0.4},
+-	{20.0}
++	20.0
+ };
+ 
+ static material_struct blueMaterials = {
+ 	{0.0, 0.0, 1.0, 0.4},
+ 	{0.0, 0.0, 0.0, 0.4},
+ 	{0.6, 0.6, 0.8, 0.4},
+-	{20.0}
++	20.0
+ };
+ 
+ 
+@@ -65,7 +65,7 @@
+ 	{1.0, 1.0, 0.0, 1.0},
+ 	{0.0, 0.0, 0.0, 1.0},
+ 	{0.8, 0.8, 0.6, 1.0},
+-	{25.0}
++	25.0
+ 
+ };
+ 
+@@ -74,7 +74,7 @@
+ 	{1.0, 0.75, 0.5, 1.0},
+ 	{0.0, 0.0, 0.0, 1.0},
+ 	{0.8, 0.8, 0.6, 1.0},
+-	{25.0}
++	25.0
+ 
+ };
+ 
+@@ -83,35 +83,35 @@
+ 	{0.0, 0.3, 0.0, 0.3},
+ 	{1.0, 1.0, 1.0, 0.3},
+ 	{0.2, 0.2, 0.2, 0.3},
+-	{30.0}
++	30.0
+ };
+ 
+ static material_struct groundMaterials = {
+ 	{0.0, 0.3, 0.0, 1.0},
+ 	{0.0, 0.0, 0.0, 1.0},
+ 	{0.6, 0.8, 0.6, 1.0},
+-	{0.0}
++	0.0
+ };
+ 
+ static material_struct brownMaterials = {
+ 	{0.4, 0.24, 0.11, 1.0},
+ 	{0.0, 0.0, 0.0, 1.0},
+ 	{0.3, 0.3, 0.3, 1.0},
+-	{35.0}
++	35.0
+ };
+ 
+ static material_struct moonMaterials = {
+ 	{0.5, 0.5, 0.6, 1.0},
+ 	{0.0, 0.0, 0.0, 1.0},
+ 	{0.6, 0.6, 0.8, 1.0},
+-	{20.0}
++	20.0
+ };
+ 
+ static material_struct sunMaterials = {
+ 	{0.75, 0.5, 0.0,1.0},
+ 	{0.0, 0.0, 0.0, 1.0},
+ 	{0.6, 0.6, 0.8, 1.0},
+-	{20.0}
++	20.0
+ };
+ 
+ 
+diff -Nru 3dmon-0.2.1/3dmosmon/objects.cpp 3dmon-0.2.1-fix/3dmosmon/objects.cpp
+--- 3dmon-0.2.1/3dmosmon/objects.cpp	2002-11-04 22:13:04.000000000 +0300
++++ 3dmon-0.2.1-fix/3dmosmon/objects.cpp	2004-03-21 21:46:31.954585523 +0300
+@@ -314,7 +314,7 @@
+ 	glutSolidCone(cone_data.base, cone_data.height, (int)cone_data.stacks, (int)cone_data.slices);
+     
+     glFlush();
+-//    glEnd();
++    glEnd();
+     glLoadIdentity();
+ 	glPopMatrix();
+ }
diff --git a/sys-cluster/openmosix-3dmon/files/openmosix-3dmon-0.2.1-trivial.patch.bz2 b/sys-cluster/openmosix-3dmon/files/openmosix-3dmon-0.2.1-trivial.patch.bz2
deleted file mode 100644
index 1466176108e298ab3797f06ffe4f0372676d711b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1162
zcmV;51a<pDT4*^jL0KkKS<dA0%m4)9Uw~#XSpWb3f3M5{zyJU0Pz65YUAvS8!<bN_
z;UuPtex{RTN2K)8G(As905ky58fejppp`vD$)Tc8C<my}000000MG=QkqS1DPeL>X
zo}s3LKmY&$0nIWp88Aae69j3aMj&aEBLD#cq>)b`0EVVSZA}l=4=D8yP{bMy8X9<}
z197Uw56jzCN?5v0#fw2|h^ZV!aVC=8dpq0`AKNQHh$zub&-L*RJSrPzB}F${_B<BG
z(5E|FATA|n2*Xxa46bcEK^!@nhS+2p4c?s^aiSdA0%~YLQV9lNEE8M55`qbnfs{p`
z(4kUOzU}FliHe&B$d6Fl!)SyKRsdFhO^XJN-CY+_wZHmRUEN{9Bylm5ZdWH6D#eJT
z(ZW<<c=I5!n`2u$6IlEXphuM-32BD&GEIdj5>zeJP{rTrbV94irK8aytvia#IUbkY
zjTZfunOzNRruhxUQALoh!WpsnLUz(98v3EHl=IdGAeUAhi)Ag0tIJrSD27!<+a$Hh
zD8jG8btet-6OhQ`(&kiaH)I}isHpOW2By6AEtuYt!yN1qs#$<61r`ih5lD%KITix}
zZ~{>-0Kx#JaDDgl6;i^hz1F@M3Enq1JPskFScr&-<6w@E^aMcLDiTe@8wSrZr-nl~
zEQpb08j{pn3p9W-hD9K;ijiQ6sL&V`!h=9$1qMOVlRisaD8D}V>}&)LtlNWNQHUCE
z5kZr*k{H|!uC-I3XLADh)3Odhq%S}h;MXQ;C}WVLEo!$*E(};>uB%Hv%E&e~j;5C}
zk}0Lmu!J#*g!;fO1`=gM-kRp#l*1<yl&y5^3!<A8k#rR!(5RxAT|KJewA$nho}#Lf
zds{rk!z)Y_=|T}57&r<A2tmTGAtG$<lI05Rh}Oz$28gO5cv=VL{L4&XdU1uVew-3>
z+(P7|a|uHkP{SQyh(uH)B<@QPKhIBZI{7l6L+wn>^mLCTiXo%P4>4-LMdby|PvQx3
z1B0eW32a;E?YP=uCK1D2o-8MVABECnu9{VPp5wgr?2E1`@BB-;4EbcuB^xBrUANG0
zIeszBY>o1GP80mQPb2f_I9=B1G>Sd4P|J#yl-^yM{!as5L*C=qYV?ruoJ!9vuCnxA
zY?H*5im0I4x|MMXI&kF+fjPnkysCt*YGyN=mRhx7zA0)rS!^#uY@E6~7UnkZU$sv$
z%Gu|Bw9A@K!n}`nsM)ogb2`bgXyB&}4tV5~eXz;TrM{}E(#az+qTTtkHOa@m?z)q#
z=eLkHk!umEZ6c^Eg|O8n=W^FvzCH^jFzL>EJbQgN5X;>_JF1YT5b7cXT{i%jRriY&
zGe!j%_y?j2#PTS4tX_3bu*rn=)WHo~?vvulZxZ=9$&IUZi;u4e<?7bmL~ZJccG)<a
z<h8kuc{EEEQx%=J#pZn_!wN0jTv`(vi{!Qi`jRY*F+2649IAdDm%ju_5>G|2Eua%)
c1ld9WJhe*-XjT-<1pkY<BAh5lXL5OF07jn}8UO$Q

diff --git a/sys-cluster/openmosix-3dmon/openmosix-3dmon-0.2.1.ebuild b/sys-cluster/openmosix-3dmon/openmosix-3dmon-0.2.1.ebuild
index 5e78d752ce19..68fd2f2474fb 100644
--- a/sys-cluster/openmosix-3dmon/openmosix-3dmon-0.2.1.ebuild
+++ b/sys-cluster/openmosix-3dmon/openmosix-3dmon-0.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmosix-3dmon/openmosix-3dmon-0.2.1.ebuild,v 1.5 2004/07/15 03:03:40 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmosix-3dmon/openmosix-3dmon-0.2.1.ebuild,v 1.6 2006/02/17 16:47:16 blubb Exp $
 
 inherit eutils
 
@@ -19,8 +19,8 @@ IUSE=""
 src_unpack() {
 	unpack ${A}
 
-	cd ${S}											&& \
-		epatch ${FILESDIR}/${P}-trivial.patch.bz2	|| die "Failed to patch the source."
+	cd ${S}	&& \
+		epatch ${FILESDIR}/${P}-trivial.patch || die "Failed to patch the source."
 }
 
 src_compile() {
-- 
2.26.2