no need to bzip a smallish patch

Package-Manager: portage-2.1_pre3-r1

5 files changed, 45 insertions, 20 deletions

diff --git a/sys-devel/icecream/ChangeLog b/sys-devel/icecream/ChangeLog
index 11fba61eadcc..d7276251b05b 100644
--- a/sys-devel/icecream/ChangeLog
+++ b/sys-devel/icecream/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-devel/icecream
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.1 2005/01/11 22:40:00 tantive Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.2 2006/01/28 13:45:24 blubb Exp $
+
+  28 Jan 2006; Simon Stelling <blubb@gentoo.org>
+  +files/icecream_disable.patch, -files/icecream_disable.patch.bz2,
+  icecream-0.6.20040829.ebuild:
+  no need to bzip a smallish patch
 
   11 Jan 2005; Michael Imhof <tantive@gentoo.org> +files/99icecream,
   +files/icecream.nokde.patch, +files/icecream_disable.patch,
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index ee15869ff9d7..69005b8e695f 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ea60760140f2090a5cd09bf0c896b729 icecream-0.6.20040829.ebuild 3074
-MD5 821ac28605bc2f1fa3c102ef193e0c14 ChangeLog 459
-MD5 b5b8e00fbdd696a2030334749ab1184b files/icecreamscheduler 366
-MD5 de86e8bf5603c45b9b2f9d565feda153 files/digest-icecream-0.6.20040829 155
-MD5 b1b6fb13f50e10d75174baac7bcaf65e files/icecream_disable.patch.bz2 738
+MD5 d8f329b56662151b25612dff3f636938 ChangeLog 642
 MD5 70af2ad7d27b5da02a1653d2098e8ee4 files/99icecream 69
+MD5 de86e8bf5603c45b9b2f9d565feda153 files/digest-icecream-0.6.20040829 155
+MD5 ed4be6637604b623bd3b0ffd2e1bae18 files/icecream_disable.patch 1247
 MD5 11da9aee8c0bd3a91fdf7a5d883846ea files/icecreamdaemon 387
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFB5F0AKtJO8LeSoosRAutdAKCkpakBaeH99aGu/U0mnAAr5hPPLgCfdPuT
-3sAHmn8LuiXXLzdc+7+LBG0=
-=6x3P
------END PGP SIGNATURE-----
+MD5 b5b8e00fbdd696a2030334749ab1184b files/icecreamscheduler 366
+MD5 1c323e408c1ef80b9bf9725b8753b8e1 icecream-0.6.20040829.ebuild 3069
diff --git a/sys-devel/icecream/files/icecream_disable.patch b/sys-devel/icecream/files/icecream_disable.patch
new file mode 100644
index 000000000000..2c77dd56f271
--- /dev/null
+++ b/sys-devel/icecream/files/icecream_disable.patch
@@ -0,0 +1,29 @@
+diff -Naur icecream.orig/client/main.cpp icecream/client/main.cpp
+--- icecream.orig/client/main.cpp	2004-08-29 13:27:02.000000000 +0200
++++ icecream/client/main.cpp	2004-11-21 06:00:39.178542387 +0100
+@@ -70,6 +70,7 @@
+ "   --help                     explain usage and exit\n"
+ "   --version                  show version and exit\n"
+ "Environment Variables:\n"
++"   ICECC_DISABLE              if set the local compiler is used.\n"
+ "   ICECC_VERSION              use a specific icecc environment, see create-env\n"
+ "   ICECC_REPEAT_RATE          the number of jobs out of 1000 that should be\n"
+ "                              compiled on multiple hosts to ensure that they're\n"
+@@ -112,6 +113,7 @@
+ int main(int argc, char **argv)
+ {
+     char *env = getenv( "ICECC_DEBUG" );
++    char *icecc_disable = getenv( "ICECC_DISABLE" );
+     int debug_level = Error;
+     if ( env ) {
+         if ( !strcasecmp( env, "info" ) )  {
+@@ -156,6 +158,9 @@
+     CompileJob job;
+     bool local = analyse_argv( argv, job );
+ 
++    if(icecc_disable != NULL) 
++      return build_local( job, 0 );
++
+     Service *serv = new Service ("127.0.0.1", 10245);
+     MsgChannel *local_daemon = serv->channel();
+     if ( ! local_daemon || !local_daemon->protocol ) {
diff --git a/sys-devel/icecream/files/icecream_disable.patch.bz2 b/sys-devel/icecream/files/icecream_disable.patch.bz2
deleted file mode 100644
index ee96241b0583..000000000000
--- a/sys-devel/icecream/files/icecream_disable.patch.bz2
+++ /dev/null
diff --git a/sys-devel/icecream/icecream-0.6.20040829.ebuild b/sys-devel/icecream/icecream-0.6.20040829.ebuild
index 250057dbc602..8b058f679ca1 100644
--- a/sys-devel/icecream/icecream-0.6.20040829.ebuild
+++ b/sys-devel/icecream/icecream-0.6.20040829.ebuild
@@ -1,6 +1,7 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.6.20040829.ebuild,v 1.2 2005/01/11 23:08:56 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.6.20040829.ebuild,v 1.3 2006/01/28 13:45:24 blubb Exp $
+
 inherit eutils
 DESCRIPTION="Icecream is a program for distributed compiling of C(++) code across several machines based on ideas and code by distcc."
 HOMEPAGE="http://wiki.kde.org/icecream"
@@ -16,7 +17,7 @@ IUSE="kde"
 
 src_compile() {
 	cd ${WORKDIR}/icecream
-	epatch ${FILESDIR}/icecream_disable.patch.bz2 || die "error patching icecream"
+	epatch ${FILESDIR}/icecream_disable.patch || die "error patching icecream"
 
 	if ! use kde ; then
 		epatch $DISTDIR/${PN}-${PV}.nokde.patch.bz2 || die "error patching icecream"