Version bump and cosmetic cleanup, bug #247589

(Portage version: 2.1.4.5)

5 files changed, 144 insertions, 4 deletions

diff --git a/sys-devel/icecream/ChangeLog b/sys-devel/icecream/ChangeLog
index a05a3b24766e..e7e2367ae43b 100644
--- a/sys-devel/icecream/ChangeLog
+++ b/sys-devel/icecream/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-devel/icecream
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.24 2008/09/11 13:32:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/ChangeLog,v 1.25 2008/11/24 23:34:41 bluebird Exp $
+
+*icecream-0.9.2 (24 Nov 2008)
+
+  24 Nov 2008; Friedrich Oslage <bluebird@gentoo.org>
+  -files/0.9.1-conf.d-verbosity.patch,
+  -files/0.9.1-dont-create-symlinks.patch,
+  +files/icecream-conf.d-verbosity.patch,
+  +files/icecream-dont-create-symlinks.patch, icecream-0.9.1-r2.ebuild,
+  +icecream-0.9.2.ebuild:
+  Version bump and cosmetic cleanup, bug #247589
 
   11 Sep 2008; Brent Baude <ranger@gentoo.org> icecream-0.9.1-r2.ebuild:
   stable ppc, bug 236965
diff --git a/sys-devel/icecream/files/0.9.1-conf.d-verbosity.patch b/sys-devel/icecream/files/icecream-conf.d-verbosity.patch
index 8e68a898eb7f..8e68a898eb7f 100644
--- a/sys-devel/icecream/files/0.9.1-conf.d-verbosity.patch
+++ b/sys-devel/icecream/files/icecream-conf.d-verbosity.patch
diff --git a/sys-devel/icecream/files/0.9.1-dont-create-symlinks.patch b/sys-devel/icecream/files/icecream-dont-create-symlinks.patch
index 5f9daa5f7e18..5f9daa5f7e18 100644
--- a/sys-devel/icecream/files/0.9.1-dont-create-symlinks.patch
+++ b/sys-devel/icecream/files/icecream-dont-create-symlinks.patch
diff --git a/sys-devel/icecream/icecream-0.9.1-r2.ebuild b/sys-devel/icecream/icecream-0.9.1-r2.ebuild
index 2fd483537672..793e71860184 100644
--- a/sys-devel/icecream/icecream-0.9.1-r2.ebuild
+++ b/sys-devel/icecream/icecream-0.9.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.1-r2.ebuild,v 1.5 2008/09/11 13:32:11 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/icecream/icecream-0.9.1-r2.ebuild,v 1.6 2008/11/24 23:34:41 bluebird Exp $
 
 inherit autotools eutils flag-o-matic
 
@@ -25,8 +25,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 
-	epatch "${FILESDIR}/${PV}-dont-create-symlinks.patch"
-	epatch "${FILESDIR}/${PV}-conf.d-verbosity.patch"
+	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"
diff --git a/sys-devel/icecream/icecream-0.9.2.ebuild b/sys-devel/icecream/icecream-0.9.2.ebuild
new file mode 100644
index 000000000000..9cf242b79100
--- /dev/null
+++ b/sys-devel/icecream/icecream-0.9.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2008 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.1 2008/11/24 23:34:41 bluebird 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 ~ppc ~sparc ~x86"
+IUSE="doc"
+
+RDEPEND="virtual/libc"
+DEPEND="${RDEPEND}
+		doc? ( =kde-base/kdelibs-3.5* )"
+
+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."
+}