Version bumped. Fixes problems with gcc4.1. Closes #137924.

Package-Manager: portage-2.1.1_pre3

5 files changed, 154 insertions, 8 deletions

diff --git a/sys-devel/icecream/ChangeLog b/sys-devel/icecream/ChangeLog
index b6d3e52578e0..e474d8f67b07 100644
--- a/sys-devel/icecream/ChangeLog
+++ b/sys-devel/icecream/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-devel/icecream
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.4 2006/07/16 21:51:23 tantive Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.5 2006/07/16 21:59:01 tantive Exp $
+
+*icecream-0.6.20050413-r1 (16 Jul 2006)
+
+  16 Jul 2006; Michael Imhof <tantive@gentoo.org>
+  +files/icecream-0.6-20050413-gcc41.patch,
+  +icecream-0.6.20050413-r1.ebuild:
+  Version bumped. Fixes problems with gcc4.1. Closes #137924.
 
   16 Jul 2006; Michael Imhof <tantive@gentoo.org>
   icecream-0.6.20050413.ebuild:
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index 26c1dbbfe6b1..5813d15a4ca8 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -17,6 +17,10 @@ AUX icecream-0.6-20050413-dont-create-symlinks.patch 954 RMD160 916e32e1b54f0a79
 MD5 95601b4e6866575f597d577016d829f1 files/icecream-0.6-20050413-dont-create-symlinks.patch 954
 RMD160 916e32e1b54f0a7985be46c931c77254910c73fa files/icecream-0.6-20050413-dont-create-symlinks.patch 954
 SHA256 44459092c0b7260bffaf9914ca9616fb4370f0b4028d3e33e04595a47888da19 files/icecream-0.6-20050413-dont-create-symlinks.patch 954
+AUX icecream-0.6-20050413-gcc41.patch 854 RMD160 282cc93044b0d46e9df302b2798dd388532458dc SHA1 51363a7e769c1ea3f54bba5ef6f6e83ff88de7f0 SHA256 de2b296be72229b10316935a52cbd6cc0b479f97ce141b73a0208e7b421d3a8f
+MD5 4dc0377e0111f0e8947235216537bf32 files/icecream-0.6-20050413-gcc41.patch 854
+RMD160 282cc93044b0d46e9df302b2798dd388532458dc files/icecream-0.6-20050413-gcc41.patch 854
+SHA256 de2b296be72229b10316935a52cbd6cc0b479f97ce141b73a0208e7b421d3a8f files/icecream-0.6-20050413-gcc41.patch 854
 AUX icecream-0.6-20050413-no-kde.patch 2729 RMD160 b7306ee2345f4f4f0a153e030c2c0efb55249c19 SHA1 b401007d65c566bd1e4f5d90dad010462da38526 SHA256 27ac580d4c31c94b24378b2ca6a47b1aa61e96a33d57924bb1d058a4e4c8fc55
 MD5 945acf7b90e7c2eea86fbfd6ab89ff25 files/icecream-0.6-20050413-no-kde.patch 2729
 RMD160 b7306ee2345f4f4f0a153e030c2c0efb55249c19 files/icecream-0.6-20050413-no-kde.patch 2729
@@ -44,14 +48,18 @@ EBUILD icecream-0.6.20040829.ebuild 3069 RMD160 b8dd43b0340cc223303ff3c846b1594e
 MD5 1c323e408c1ef80b9bf9725b8753b8e1 icecream-0.6.20040829.ebuild 3069
 RMD160 b8dd43b0340cc223303ff3c846b1594e90cbc9a8 icecream-0.6.20040829.ebuild 3069
 SHA256 30eede3452f11d75905f58b47b1e34fd1167c96746bb235599793677b1fd807d icecream-0.6.20040829.ebuild 3069
+EBUILD icecream-0.6.20050413-r1.ebuild 3968 RMD160 2a4ad3f0b149f5a71a9a1896c6382f19a86ed4c1 SHA1 c72d3d4dc2d5b38a7cca5b8919f3f085ebd5fda6 SHA256 24fc9de5fa70033b9cdc84bf17519446c5c3291cbd237857b942173c8fd6747b
+MD5 e37ab9c6f7eaef98d73883ed8b56929f icecream-0.6.20050413-r1.ebuild 3968
+RMD160 2a4ad3f0b149f5a71a9a1896c6382f19a86ed4c1 icecream-0.6.20050413-r1.ebuild 3968
+SHA256 24fc9de5fa70033b9cdc84bf17519446c5c3291cbd237857b942173c8fd6747b icecream-0.6.20050413-r1.ebuild 3968
 EBUILD icecream-0.6.20050413.ebuild 3878 RMD160 35e94b6175f7e9fc0430f21a58e31098306b1766 SHA1 91bf72cecfe886afac8d574bb83c4c86f28211e5 SHA256 d25d0ce84ee0f39c4eeb1743f6ff2e3501b3ecf0afc27b6bcff359481b61255c
 MD5 011e07f9e7563a7f133d36bbc55b8976 icecream-0.6.20050413.ebuild 3878
 RMD160 35e94b6175f7e9fc0430f21a58e31098306b1766 icecream-0.6.20050413.ebuild 3878
 SHA256 d25d0ce84ee0f39c4eeb1743f6ff2e3501b3ecf0afc27b6bcff359481b61255c icecream-0.6.20050413.ebuild 3878
-MISC ChangeLog 1138 RMD160 f1626c69835d910cb410ef2320a7efca17c5957a SHA1 5bd93abedc0fb7eb52a60d732799514204ef0dc3 SHA256 4ca6e9f165592b1b5681534dd4d42bbbfa0022db14b78c2e710460712d1e25ed
-MD5 775960c8b6b78b923333c4544356107b ChangeLog 1138
-RMD160 f1626c69835d910cb410ef2320a7efca17c5957a ChangeLog 1138
-SHA256 4ca6e9f165592b1b5681534dd4d42bbbfa0022db14b78c2e710460712d1e25ed ChangeLog 1138
+MISC ChangeLog 1372 RMD160 06a9aed3cf7e72c2e0265cda13f25c1c494cbaa8 SHA1 1e17b3af93c2052826a71e6d9873ffab7de83086 SHA256 d7e51ee71200314830a7a5e3daa97d06f8ffdfa6af0af1a4042a5bc84627fa47
+MD5 710e88f03c987a50fb1c705dca9cd295 ChangeLog 1372
+RMD160 06a9aed3cf7e72c2e0265cda13f25c1c494cbaa8 ChangeLog 1372
+SHA256 d7e51ee71200314830a7a5e3daa97d06f8ffdfa6af0af1a4042a5bc84627fa47 ChangeLog 1372
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
 MD5 cde8b4e93c9339eb99fe3ad45941c99b metadata.xml 160
 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 metadata.xml 160
@@ -62,10 +70,13 @@ SHA256 b3ba3eb80a351483363fc49b2c3532c079350dd307eb3b7d8cc09ef8ed7de622 files/di
 MD5 3d1ff4008e6c4348d6a6cd3b2c094829 files/digest-icecream-0.6.20050413 268
 RMD160 d455d07e0f4dacf107730972a88fb607cc11fe04 files/digest-icecream-0.6.20050413 268
 SHA256 11dc37cd7e9cb0b166fcb3555d8ddd6ea4f468a5fe84790f85fbfd1b48c13986 files/digest-icecream-0.6.20050413 268
+MD5 3d1ff4008e6c4348d6a6cd3b2c094829 files/digest-icecream-0.6.20050413-r1 268
+RMD160 d455d07e0f4dacf107730972a88fb607cc11fe04 files/digest-icecream-0.6.20050413-r1 268
+SHA256 11dc37cd7e9cb0b166fcb3555d8ddd6ea4f468a5fe84790f85fbfd1b48c13986 files/digest-icecream-0.6.20050413-r1 268
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.2 (GNU/Linux)
 
-iD8DBQFEurTrKtJO8LeSoosRAhnsAJwKFQ5LV62tugj7dvmQA3+YDZsFHQCgnhOz
-QiCvcjS+lR3oE9hq2RfLoQ0=
-=hpDd
+iD8DBQFEura1KtJO8LeSoosRAshVAJ4ur+6H5z211H7svYelgx8VfMr3RwCfVodh
+9w4eaP3iGVFtYcAVhJkwNJ4=
+=pwaA
 -----END PGP SIGNATURE-----
diff --git a/sys-devel/icecream/files/digest-icecream-0.6.20050413-r1 b/sys-devel/icecream/files/digest-icecream-0.6.20050413-r1
new file mode 100644
index 000000000000..d77c1bcb1320
--- /dev/null
+++ b/sys-devel/icecream/files/digest-icecream-0.6.20050413-r1
@@ -0,0 +1,3 @@
+MD5 eb304444a47d6b144dbc76b5638020d0 icecream-0.6-20050413.tar.bz2 594135
+RMD160 dca34e902610ad887e926c27f2f4bc21f8416e7c icecream-0.6-20050413.tar.bz2 594135
+SHA256 f47aaa70044342f046a8ca356ae5ec553ac01c940f48e7bf045b91a6ee3517b2 icecream-0.6-20050413.tar.bz2 594135
diff --git a/sys-devel/icecream/files/icecream-0.6-20050413-gcc41.patch b/sys-devel/icecream/files/icecream-0.6-20050413-gcc41.patch
new file mode 100644
index 000000000000..6e0fc9969c60
--- /dev/null
+++ b/sys-devel/icecream/files/icecream-0.6-20050413-gcc41.patch
@@ -0,0 +1,24 @@
+diff -urN icecream.orig/mon/hostinfo.h icecream/mon/hostinfo.h
+--- icecream.orig/mon/hostinfo.h	2004-08-27 12:24:46.000000000 +0100
++++ icecream/mon/hostinfo.h	2006-06-26 00:23:34.000000000 +0100
+@@ -54,7 +54,7 @@
+   protected:
+     static void initColor( const QString &value, const QString &name );
+ 
+-    QColor HostInfo::createColor();
++    QColor createColor();
+     QColor createColor( const QString &name );
+ 
+   private:
+diff -urN icecream.orig/mon/starview.h icecream/mon/starview.h
+--- icecream.orig/mon/starview.h	2005-01-13 11:56:26.000000000 +0000
++++ icecream/mon/starview.h	2006-06-26 00:24:49.000000000 +0100
+@@ -142,7 +142,7 @@
+ 
+     QString id() const { return "star"; }
+ 
+-    HostItem *StarView::findHostItem( unsigned int hostid );
++    HostItem *findHostItem( unsigned int hostid );
+ 
+     void checkNode( unsigned int hostid );
+ 
diff --git a/sys-devel/icecream/icecream-0.6.20050413-r1.ebuild b/sys-devel/icecream/icecream-0.6.20050413-r1.ebuild
new file mode 100644
index 000000000000..989677d5c898
--- /dev/null
+++ b/sys-devel/icecream/icecream-0.6.20050413-r1.ebuild
@@ -0,0 +1,101 @@
+# 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.20050413-r1.ebuild,v 1.1 2006/07/16 21:59:01 tantive 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://www.opensuse.org/icecream"
+SRC_URI="ftp://ftp.suse.com/pub/projects/icecream/${PN}-0.6-20050413.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+RDEPEND="virtual/libc
+	kde? ( kde-base/kdelibs )"
+DEPEND="${RDEPEND}"
+IUSE="arts kde"
+
+src_compile() {
+	cd ${WORKDIR}/icecream
+	epatch ${FILESDIR}/icecream-0.6-20050413-add-disable-option.patch || die "error patching icecream"
+	epatch ${FILESDIR}/icecream-0.6-20050413-dont-create-symlinks.patch || die "error patching icecream"
+	epatch ${FILESDIR}/icecream-0.6-20050413-gcc41.patch || die "error patching icecream"
+
+	if ! use kde ; then
+		epatch ${FILESDIR}/${PN}-0.6-20050413-no-kde.patch || die "error patching icecream"
+		aclocal
+		automake
+		autoconf
+	fi
+
+	use amd64 && export CFLAGS="${CFLAGS} -fPIC -DPIC"
+	use amd64 && export CXXFLAGS="${CXXFLAGS} -fPIC -DPIC"
+	use !arts && local myconfig="--without-arts"
+	./configure --prefix=/usr $myconfig
+	emake || die "error compiling"
+}
+
+src_install() {
+	cd ${WORKDIR}/icecream
+	make DESTDIR=${D} install || die "error installing"
+	newbin ${FILESDIR}/icecream-config icecream-config
+	cp suse/sysconfig.icecream icecream
+	insinto "/etc/conf.d"
+	doins "icecream"
+	newinitd ${FILESDIR}/icecream icecream
+	diropts -m0755
+	dodir /usr/lib/icecream/bin
+	keepdir /usr/lib/icecream/bin
+}
+
+pkg_postinst() {
+	enewgroup icecream || die "Problem creating icecream group"
+
+	#are we doing bootstrap with has no useradd?
+	if [ -x /usr/sbin/useradd ]; then
+		enewuser icecream -1 -1 /var/cache/icecream icecream || die "Problem adding icecream user"
+	else
+		ewarn "You do not have useradd (bootstrap) from shadow so I didn't"
+		ewarn "install the icecream user.  Note that attempting to start the daemon"
+		ewarn "will fail. Please install shadow and re-emerge icecream."
+		ebeep 2
+	fi
+
+	if [[ ${ROOT} = "/" ]] ; then
+		einfo "Scanning for compiler front-ends..."
+		/usr/bin/icecream-config --install-links
+		/usr/bin/icecream-config --install-links ${CHOST}
+	else
+		ewarn "Install is incomplete; you must run the following command:"
+		ewarn " # icecream-config --install-links ${CHOST}"
+		ewarn "after booting or chrooting to ${ROOT} to complete installation."
+	fi
+
+	einfo
+	einfo "If you have compiled binutils/gcc/glibc with processor-specific flags"
+	einfo "(as normal using Gentoo), there is a greater chance that your compiler"
+	einfo "won't work on other machines. The best would be to build gcc, glibc and"
+	einfo "binutils without those flags and then copy the needed files into your"
+	einfo "tarball for distribution to other machines. This tarball can be created"
+	einfo "using the /usr/bin/create-env script, and used by setting ICECC_VERSION"
+	einfo "in /etc/conf.d/icecream"
+	einfo '  ICECC_VERSION=<filename_of_archive_containing_your_environment>'
+	einfo
+	einfo "To use icecream with portage add the following line to /etc/make.conf"
+	einfo '  PREROOTPATH=/usr/lib/icecream/bin'
+	einfo
+	einfo "To use icecream with normal make use (e.g. in /etc/profile)"
+	einfo '  PATH=/usr/lib/icecream/bin:$PATH'
+	einfo
+	einfo "N.B. To use icecream with ccache, the ccache PATH should come first:"
+	einfo '  PATH=/usr/lib/ccache/bin:/usr/lib/icecream/bin:$PATH'
+	einfo
+	einfo "Don't forget to open the following ports in your firewall(s):"
+	einfo " TCP/10245 on the daemon computers (required)"
+	einfo " TCP/8765 for the the scheduler computer (required)"
+	einfo " TCP/8766 for the telnet interface to the scheduler (optional)"
+	einfo " UDP/8765 for broadcast to find the scheduler (optional)"
+	einfo
+	einfo "Further usage instructions: http://www.opensuse.org/icecream"
+	einfo
+}