Drop all old releases. Cleanup ebuild. Remove only stable version. Open stablereq if you use it in stable environment and trust it is working reliably.

Package-Manager: portage-2.2_rc79/cvs/Linux x86_64

10 files changed, 69 insertions, 324 deletions

diff --git a/sys-devel/icecream/ChangeLog b/sys-devel/icecream/ChangeLog
index 8296113ad246..09a95a007e92 100644
--- a/sys-devel/icecream/ChangeLog
+++ b/sys-devel/icecream/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for sys-devel/icecream
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.37 2010/06/02 06:47:39 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.38 2010/09/11 12:30:59 scarabeus Exp $
+
+*icecream-0.9.6 (11 Sep 2010)
+
+  11 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/0.9.6-symlinks.patch, -icecream-0.9.2.ebuild,
+  -icecream-0.9.3.ebuild, -icecream-0.9.4.ebuild, +icecream-0.9.6.ebuild,
+  files/icecream, files/icecream-config, files/icecream-create-env,
+  -files/icecream-dont-create-symlinks.patch:
+  Drop all old releases. Cleanup ebuild. Remove only stable version. Open
+  stablereq if you use it in stable environment and trust it is working
+  reliably.
 
   02 Jun 2010; Torsten Veller <tove@gentoo.org> metadata.xml:
   Remove bluebird from metadata.xml (#223101)
diff --git a/sys-devel/icecream/Manifest b/sys-devel/icecream/Manifest
index 199ee0102e1d..858a38097edf 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,26 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX icecream 1546 RMD160 f99d695c7cfe3ee93a4ded66cb7f1d24bbbf740e SHA1 ca9270513e40d27650a823fd39f14a4fc0875419 SHA256 d122f104e141d6e0c4f368ece47a871adf01919f6fdaa4ea6785d83293040fbb
+AUX 0.9.6-symlinks.patch 614 RMD160 b6882810d96141d46d029b33bd68c29d98ec9662 SHA1 d4d0a6091533698c5b905e0ce490fc0400bfff4d SHA256 4100330fb48453abe7facecff4eb199e5285093df49d082e14050a4c30cb2dfb
+AUX icecream 1724 RMD160 2527e0a0a7c2dc37ef0d0afe64875cd2c3768b80 SHA1 6dc26e75a42571f72b913cc811abe23a15c12a28 SHA256 07b5e4645e99646e1448147ef1e30b4a50f1478b25578ba9e71c6aa2c151ca53
 AUX icecream-conf.d-verbosity.patch 463 RMD160 b08c0f5cfec00b5dcc968bac3b598892055edf6f SHA1 6adc235bb1e6b4a27e9d7610385d6bc8ef6d389d SHA256 c103468c3303809181b554b152a7ee0db041d12dd040d5196cc9da453303c957
-AUX icecream-config 1689 RMD160 1f49cb792ea34fb90cadb40fa4febbb02512fb46 SHA1 f52ab186856598591ecbf299bfa68912b41f21ac SHA256 f6723b36c8955f2b919445ada3bcf51862139a2a691d677133b10baa21d87410
-AUX icecream-create-env 2085 RMD160 5eae1d583d6d0fb225e7663719dfee65026a7764 SHA1 47ed90ab8b14e6402df33608b6bdea951ca35350 SHA256 232dcd991da3f679a265c0672286d32a159aed7ec228584e7f8e0b33f722e817
-AUX icecream-dont-create-symlinks.patch 406 RMD160 c7454778e79367e7cfdbac07ab15af0dff772051 SHA1 7f070673b5d3576538885392ab0f025336e1288e SHA256 4800a6611cff4ca0845eb1b98aa20ab96f2949710c4249fc45c861d8936d33ee
+AUX icecream-config 1692 RMD160 2d6c85b86b2c8308c08f5876308165044195fd34 SHA1 42091716b09a2511a31981b2ae2836e9f43ac2e6 SHA256 24acbd8e5b0218ce966e78f451985f72530865f86e5a1ee2b6c92d8bf50ff66b
+AUX icecream-create-env 2083 RMD160 dacf42fe2cb7e0ff7541a37807b9a3f1be50a9ab SHA1 8ebc28004b91e93fd9aca10ce513fd5b8024cd51 SHA256 b3dc943e562deda940335e8e64d65e295f7d1cc8c47139a384979f340dedab14
 AUX icecream-gentoo-multilib.patch 1579 RMD160 35671f69f782e326749f8ff50bd25ede3ffca628 SHA1 64c2f0c7b54911735792c5f14c78549d2c3f9a4e SHA256 0efa29f5cb350aa8118cb9c4ba8d62cf675b6af5692ee18e25021f463465fc8a
-DIST icecc-0.9.2.tar.bz2 369567 RMD160 833f22c1219dcb5442aaf10d2f501028651405f8 SHA1 ee4e1315063aff057081bd021585632ea1c0ddfe SHA256 6aafc5eb6557b65f650f600bd6ff9d5ed33df6dd516216f23d0872e82b88540b
-DIST icecc-0.9.3.tar.bz2 370148 RMD160 1b3e2db85b3129a2a22d91369d5ef6463c8454aa SHA1 64d56c66f0cdc071429d6a52edadce2d86102840 SHA256 fe05ac81b46b8c8786d4d81026ba15a506f9774283ed53ab046fb2c20f3822a4
-DIST icecc-0.9.4.tar.bz2 370207 RMD160 d7b1af137e0dee42e1b1a43b18dd7a881104bf97 SHA1 8211a50bd45e2a05b0e682489bf1f9038b907b5e SHA256 27088ba28e2885a43ad00bc429ad3093232e7fc7e8ef13b9e3e6f76ebce39a06
-EBUILD icecream-0.9.2.ebuild 3679 RMD160 1556adc3fe05e9d0fb77741fb6f307ad95f95111 SHA1 755f3ee1654ae80451715deb46df279b308c750b SHA256 511f63024508ff255b102d55dd392e87cd0d93237a5c1be87cbcac00cc6c3a9b
-EBUILD icecream-0.9.3.ebuild 3683 RMD160 93bfafeafda5152cb8c260943a941e208a434950 SHA1 f44b8d0d198e2a56ab4a1b86b678575e8da0f0f8 SHA256 8011b44bc99f25fedd6901715184bebf3f602c7851a5a387d6f18d5277656a43
-EBUILD icecream-0.9.4.ebuild 4239 RMD160 85c39a6d73fd7d79e2d450e7cee3e950e7003149 SHA1 665d8c8f09cd08e7ed080b104387c59b1f111dfd SHA256 3d882a87192485dd5c9491843d60a048ee08b7948a89a600d92cdf4378774f06
-MISC ChangeLog 7084 RMD160 276899ae60e1240f9e015bbee04ce3fc545b5a17 SHA1 97bccdb00798b9c8d9acc38dba824f33c7947143 SHA256 e4fea85088633c901bf304775f7075d070dab09e3a84eb589c73185a9ad53fba
+DIST icecc-0.9.6.tar.bz2 378702 RMD160 c210061fbe5c2046d13e8c7d78e0a107fd94f761 SHA1 2591652c56a574f985f47719af40ad0484151982 SHA256 d0e6000f2d5e6f4936aa568e5bb3e4f75f836335aed8e3fef5369487df3741a6
+EBUILD icecream-0.9.6.ebuild 2748 RMD160 1609ca3a73cfa51faaed56f2dc5eeb1060b48b14 SHA1 4845c46361457fae545e4f329b6459361245c863 SHA256 15b4cbfae1d369a66322c717f01da99725101ebc7af20a23f68d4403f7e2115e
+MISC ChangeLog 7577 RMD160 7263a8861834a2dcf1eb24efb8b2eb2341715a70 SHA1 69028338255ec2ffc8c10fa177162bc63d920133 SHA256 55118265a813851831a3b1072174a9d0d01230b4744f3796e469b1945ce83142
 MISC metadata.xml 160 RMD160 1233ca29861ca7c47f0b09d1d7a29def80f7df02 SHA1 1bfdc9d282a84c95e2bdcda19ace5b94e2e67349 SHA256 56717bdb03ad5d833acecfbc612a67f569256b328bf610fbc6cc33714186dae9
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iJwEAQECAAYFAkyKjDoACgkQIiMqcbOVdxQwZQP/Urh7zhyeg3ylgPAEkcUCLXZ7
-I+P5MgwQjvIxHEBwCq5P/QlDIIY4b/WKWTOye6QhJEGxwisxYASCGV5wRGeb0Qvt
-RUiU2PfiBE+lVmyDX1ZnpnvdY61fPr62X61hrsI7+lDrpZ9yPZn5pf2DZh8O0r82
-fVmy6nAtIkbkWC1RHY8=
-=MgcE
------END PGP SIGNATURE-----
diff --git a/sys-devel/icecream/files/0.9.6-symlinks.patch b/sys-devel/icecream/files/0.9.6-symlinks.patch
new file mode 100644
index 000000000000..279ee0cc0f99
--- /dev/null
+++ b/sys-devel/icecream/files/0.9.6-symlinks.patch
@@ -0,0 +1,19 @@
+diff -urN icecc-0.9.6//client/Makefile.am icecc-0.9.6.new//client/Makefile.am
+--- icecc-0.9.6//client/Makefile.am	2010-09-11 13:43:53.922000148 +0200
++++ icecc-0.9.6.new//client/Makefile.am	2010-09-11 13:44:39.950000148 +0200
+@@ -7,15 +7,3 @@
+ noinst_HEADERS = client.h md5.h util.h
+ 
+ EXTRA_DIST = icecc-create-env
+-
+-install-exec-local:
+-	$(mkinstalldirs) $(DESTDIR)$(bindir)
+-	for link in g++ gcc c++ cc icerun; do \
+-	  rm -f $(DESTDIR)$(bindir)/$$link ;\
+-	  $(LN_S) icecc $(DESTDIR)$(bindir)/$$link ;\
+-	done
+-
+-uninstall-local:
+-	for link in g++ gcc c++ cc; do \
+-	  rm $(DESTDIR)$(bindir)/$$link ;\
+-	done
diff --git a/sys-devel/icecream/files/icecream b/sys-devel/icecream/files/icecream
index cae25eb28a4f..b3f5d791a686 100644
--- a/sys-devel/icecream/files/icecream
+++ b/sys-devel/icecream/files/icecream
@@ -1,13 +1,13 @@
 #!/sbin/runscript
-
-#NB: Config is in /etc/conf.d/icecream
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/files/icecream,v 1.3 2010/09/11 12:30:59 scarabeus Exp $
 
 depend() {
         need net
 }
 
 start() {
-
 	local basedir=${ICECREAM_BASEDIR:-"/var/cache/icecream"}
 	local netname=${ICECREAM_NETNAME:+"-n ${ICECREAM_NETNAME}"}
 	local logfile=${ICECREAM_LOG_FILE:+"-l ${ICECREAM_LOG_FILE}"}
@@ -35,6 +35,7 @@ stop() {
 	ebegin "Stopping Distributed Compiler Daemon"
 	start-stop-daemon --stop --quiet --name iceccd
 	eend ${?}
+
 	if [[ "${ICECREAM_RUN_SCHEDULER}" == "yes" ]]; then
 		ebegin "Stopping Distributed Compiler Scheduler"
 		start-stop-daemon --stop --quiet --name scheduler
diff --git a/sys-devel/icecream/files/icecream-config b/sys-devel/icecream/files/icecream-config
index d520072090f0..6ed24c743772 100644
--- a/sys-devel/icecream/files/icecream-config
+++ b/sys-devel/icecream/files/icecream-config
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 #
 # icecream-config - helper script for icecream and its ebuild
 #
-# Copyright 2003 Superlucidity Services, LLC 
+# Copyright 2003-2010 Superlucidity Services, LLC 
 # This program licensed under the GNU GPL version 2.
 #
 # This script developed by Zachary T Welch at Superlucidity Services, LLC
diff --git a/sys-devel/icecream/files/icecream-create-env b/sys-devel/icecream/files/icecream-create-env
index 92b08364d908..632bdc5bd2dd 100644
--- a/sys-devel/icecream/files/icecream-create-env
+++ b/sys-devel/icecream/files/icecream-create-env
@@ -1,8 +1,8 @@
-#!/bin/bash
+#!/bin/sh
 #
 # icecream-create-env - helper script to create icecc environments(mostly for cross-compiling)
 #
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 #
 # Please note, this script has been designed to work with Gentoo's crossdev, it may or may
diff --git a/sys-devel/icecream/files/icecream-dont-create-symlinks.patch b/sys-devel/icecream/files/icecream-dont-create-symlinks.patch
deleted file mode 100644
index 5f9daa5f7e18..000000000000
--- a/sys-devel/icecream/files/icecream-dont-create-symlinks.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN icecream.orig/client/Makefile.am icecream/client/Makefile.am
---- icecream.orig/client/Makefile.am
-+++ icecream/client/Makefile.am
-@@ -17,10 +17,6 @@
- 
- install-exec-local:
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
--	for link in g++ gcc c++ cc; do \
--	  rm -f $(DESTDIR)$(bindir)/$$link ;\
--	  $(LN_S) icecc $(DESTDIR)$(bindir)/$$link ;\
--	done
- 
- uninstall-local:
- 	for link in g++ gcc c++ cc; do \
diff --git a/sys-devel/icecream/icecream-0.9.3.ebuild b/sys-devel/icecream/icecream-0.9.3.ebuild
deleted file mode 100644
index ef61b2430ab1..000000000000
--- a/sys-devel/icecream/icecream-0.9.3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.3.ebuild,v 1.4 2010/02/12 19:38:47 armin76 Exp $
-
-inherit autotools eutils flag-o-matic
-
-MY_P="icecc-${PV}"
-
-DESCRIPTION="icecc is a program for distributed compiling of C(++) code across several machines; based on distcc"
-HOMEPAGE="http://en.opensuse.org/Icecream"
-SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-dont-create-symlinks.patch"
-	epatch "${FILESDIR}/${PN}-conf.d-verbosity.patch"
-
-	# honour ${CFLAGS_${ABI}} environment variable, bug #232931
-	epatch "${FILESDIR}/${PN}-gentoo-multilib.patch"
-
-	use amd64 && append-flags -fPIC -DPIC
-
-	eautoreconf
-}
-
-src_compile() {
-	econf
-	emake || die "compiling icecc failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dosbin "${FILESDIR}"/icecream-config || die "install failed"
-
-	dosbin "${FILESDIR}"/icecream-create-env || die "install failed"
-
-	newconfd suse/sysconfig.icecream icecream || die "install failed"
-	doinitd "${FILESDIR}"/icecream || die "install failed"
-
-	diropts -m0755
-	keepdir /usr/lib/icecc/bin
-}
-
-pkg_postinst() {
-	enewgroup icecream
-
-	#are we doing bootstrap with has no useradd?
-	if [ -x /usr/sbin/useradd ]; then
-		enewuser icecream -1 -1 /var/cache/icecream icecream
-	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/sbin/icecream-config --install-links
-		/usr/sbin/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
-
-	elog
-	elog "If you have compiled binutils/gcc/glibc with processor-specific flags"
-	elog "(as normal using Gentoo), there is a greater chance that your compiler"
-	elog "won't work on other machines. The best would be to build gcc, glibc and"
-	elog "binutils without those flags and then copy the needed files into your"
-	elog "tarball for distribution to other machines. This tarball can be created"
-	elog "by running /usr/bin/icecc --build-native, and used by setting"
-	elog "ICECC_VERSION in /etc/conf.d/icecream"
-	elog '  ICECC_VERSION=<filename_of_archive_containing_your_environment>'
-	elog
-	elog "To use icecream with portage add the following line to /etc/make.conf"
-	elog '  PREROOTPATH=/usr/lib/icecc/bin'
-	elog
-	elog "To use icecream with normal make use (e.g. in /etc/profile)"
-	elog '  PATH=/usr/lib/icecc/bin:$PATH'
-	elog
-	elog "N.B. To use icecream with ccache, the ccache PATH should come first:"
-	elog '  PATH=/usr/lib/ccache/bin:/usr/lib/icecc/bin:$PATH'
-	elog
-	elog "Don't forget to open the following ports in your firewall(s):"
-	elog " TCP/10245 on the daemon computers (required)"
-	elog " TCP/8765 for the the scheduler computer (required)"
-	elog " TCP/8766 for the telnet interface to the scheduler (optional)"
-	elog " UDP/8765 for broadcast to find the scheduler (optional)"
-	elog
-	elog "Further usage instructions: http://www.opensuse.org/icecream"
-	elog
-	elog "The icecream monitor is no longer included in this package."
-	elog "See http://bugs.gentoo.org/show_bug.cgi?id=139432 for more info."
-}
diff --git a/sys-devel/icecream/icecream-0.9.4.ebuild b/sys-devel/icecream/icecream-0.9.4.ebuild
deleted file mode 100644
index 28e185e34e45..000000000000
--- a/sys-devel/icecream/icecream-0.9.4.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.4.ebuild,v 1.6 2010/02/12 19:38:47 armin76 Exp $
-
-inherit autotools eutils flag-o-matic
-
-MY_P="icecc-${PV}"
-
-DESCRIPTION="icecc is a program for distributed compiling of C(++) code across several machines; based on distcc"
-HOMEPAGE="http://en.opensuse.org/Icecream"
-SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND="!x11-misc/icecc"
-
-S="${WORKDIR}/${MY_P}"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-dont-create-symlinks.patch"
-	epatch "${FILESDIR}/${PN}-conf.d-verbosity.patch"
-
-	# honour ${CFLAGS_${ABI}} environment variable, bug #232931
-	epatch "${FILESDIR}/${PN}-gentoo-multilib.patch"
-
-	use amd64 && append-flags -fPIC -DPIC
-
-	eautoreconf
-}
-
-src_compile() {
-	econf
-	emake || die "compiling icecc failed"
-
-	# compile manpages...yeah, we need meinproc, ergo kdelibs for this :(
-	#if use doc; then
-	#	cd doc
-	#	for docfile in *.docbook; do
-	#		outputfile="${docfile/man-/}"
-	#		outputfile="${outputfile/.docbook/}"
-
-	#		meinproc \
-	#		--stylesheet /usr/kde/3.5/share/apps/ksgmltools2/customization/kde-man.xsl \
-	#		"${docfile}" && \
-	#		mv manpage.troff "${outputfile}" || \
-	#		die "compiling manpages failed"
-	#	done
-	#fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-
-	dosbin "${FILESDIR}"/icecream-config || die "install failed"
-
-	dosbin "${FILESDIR}"/icecream-create-env || die "install failed"
-
-	newconfd suse/sysconfig.icecream icecream || die "install failed"
-	doinitd "${FILESDIR}"/icecream || die "install failed"
-
-	diropts -m0755
-	keepdir /usr/lib/icecc/bin
-
-	#if use doc; then
-	#	cd doc
-	#	doman icecc.1 iceccd.1 icecream.7 scheduler.1 || die "doman failed"
-	#fi
-}
-
-pkg_postinst() {
-	enewgroup icecream
-
-	#are we doing bootstrap with has no useradd?
-	if [ -x /usr/sbin/useradd ]; then
-		enewuser icecream -1 -1 /var/cache/icecream icecream
-	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/sbin/icecream-config --install-links
-		/usr/sbin/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
-
-	elog
-	elog "If you have compiled binutils/gcc/glibc with processor-specific flags"
-	elog "(as normal using Gentoo), there is a greater chance that your compiler"
-	elog "won't work on other machines. The best would be to build gcc, glibc and"
-	elog "binutils without those flags and then copy the needed files into your"
-	elog "tarball for distribution to other machines. This tarball can be created"
-	elog "by running /usr/bin/icecc --build-native, and used by setting"
-	elog "ICECC_VERSION in /etc/conf.d/icecream"
-	elog '  ICECC_VERSION=<filename_of_archive_containing_your_environment>'
-	elog
-	elog "To use icecream with portage add the following line to /etc/make.conf"
-	elog '  PREROOTPATH=/usr/lib/icecc/bin'
-	elog
-	elog "To use icecream with normal make use (e.g. in /etc/profile)"
-	elog '  PATH=/usr/lib/icecc/bin:$PATH'
-	elog
-	elog "N.B. To use icecream with ccache, the ccache PATH should come first:"
-	elog '  PATH=/usr/lib/ccache/bin:/usr/lib/icecc/bin:$PATH'
-	elog
-	elog "Don't forget to open the following ports in your firewall(s):"
-	elog " TCP/10245 on the daemon computers (required)"
-	elog " TCP/8765 for the the scheduler computer (required)"
-	elog " TCP/8766 for the telnet interface to the scheduler (optional)"
-	elog " UDP/8765 for broadcast to find the scheduler (optional)"
-	elog
-	elog "Further usage instructions: http://www.opensuse.org/icecream"
-	elog
-	elog "The icecream monitor is no longer included in this package."
-	elog "See http://bugs.gentoo.org/show_bug.cgi?id=139432 for more info."
-}
diff --git a/sys-devel/icecream/icecream-0.9.2.ebuild b/sys-devel/icecream/icecream-0.9.6.ebuild
index 05232541d331..3b1846ae21cc 100644
--- a/sys-devel/icecream/icecream-0.9.2.ebuild
+++ b/sys-devel/icecream/icecream-0.9.6.ebuild
@@ -1,47 +1,45 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.2.ebuild,v 1.7 2010/02/12 19:38:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.6.ebuild,v 1.1 2010/09/11 12:30:59 scarabeus Exp $
 
-inherit autotools eutils flag-o-matic
+EAPI=3
+
+inherit base autotools
 
 MY_P="icecc-${PV}"
 
 DESCRIPTION="icecc is a program for distributed compiling of C(++) code across several machines; based on distcc"
-HOMEPAGE="http://en.opensuse.org/Icecream"
+HOMEPAGE="http://old-en.opensuse.org/Icecream"
 SRC_URI="ftp://ftp.suse.com/pub/projects/${PN}/${MY_P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ppc sparc x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~sparc ~x86"
 IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	epatch "${FILESDIR}/${PN}-dont-create-symlinks.patch"
-	epatch "${FILESDIR}/${PN}-conf.d-verbosity.patch"
+PATCHES=(
+	"${FILESDIR}/${PV}-symlinks.patch"
+	"${FILESDIR}/${PN}-conf.d-verbosity.patch"
+	"${FILESDIR}/${PN}-gentoo-multilib.patch"
+)
 
-	# honour ${CFLAGS_${ABI}} environment variable, bug #232931
-	epatch "${FILESDIR}/${PN}-gentoo-multilib.patch"
+pkg_setup() {
+	enewgroup icecream
+	enewuser icecream -1 -1 /var/cache/icecream icecream
+}
 
-	use amd64 && append-flags -fPIC -DPIC
+src_prepare() {
+	base_src_prepare
 
 	eautoreconf
 }
 
-src_compile() {
-	econf
-	emake || die "compiling icecc failed"
-}
-
 src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
+	base_src_install
 
 	dosbin "${FILESDIR}"/icecream-config || die "install failed"
-
 	dosbin "${FILESDIR}"/icecream-create-env || die "install failed"
 
 	newconfd suse/sysconfig.icecream icecream || die "install failed"
@@ -52,27 +50,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	enewgroup icecream
-
-	#are we doing bootstrap with has no useradd?
-	if [ -x /usr/sbin/useradd ]; then
-		enewuser icecream -1 -1 /var/cache/icecream icecream
-	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/sbin/icecream-config --install-links
-		/usr/sbin/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
+	ebegin "Scanning for compiler front-ends..."
+	/usr/sbin/icecream-config --install-links
+	/usr/sbin/icecream-config --install-links "${CHOST}"
+	eend ${?}
 
 	elog
 	elog "If you have compiled binutils/gcc/glibc with processor-specific flags"
@@ -99,8 +80,5 @@ pkg_postinst() {
 	elog " TCP/8766 for the telnet interface to the scheduler (optional)"
 	elog " UDP/8765 for broadcast to find the scheduler (optional)"
 	elog
-	elog "Further usage instructions: http://www.opensuse.org/icecream"
-	elog
-	elog "The icecream monitor is no longer included in this package."
-	elog "See http://bugs.gentoo.org/show_bug.cgi?id=139432 for more info."
+	elog "Further usage instructions: ${HOMEPAGE}"
 }