Version bump and cosmetic cleanup, bug #247589

Package-Manager: portage-2.1.4.5

6 files changed, 150 insertions, 8 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/Manifest b/sys-devel/icecream/Manifest
index 69f04f3e1987..c4a64ab2eb1d 100644
--- a/sys-devel/icecream/Manifest
+++ b/sys-devel/icecream/Manifest
@@ -1,10 +1,12 @@
-AUX 0.9.1-conf.d-verbosity.patch 463 RMD160 b08c0f5cfec00b5dcc968bac3b598892055edf6f SHA1 6adc235bb1e6b4a27e9d7610385d6bc8ef6d389d SHA256 c103468c3303809181b554b152a7ee0db041d12dd040d5196cc9da453303c957
-AUX 0.9.1-dont-create-symlinks.patch 406 RMD160 c7454778e79367e7cfdbac07ab15af0dff772051 SHA1 7f070673b5d3576538885392ab0f025336e1288e SHA256 4800a6611cff4ca0845eb1b98aa20ab96f2949710c4249fc45c861d8936d33ee
 AUX icecream 1546 RMD160 f99d695c7cfe3ee93a4ded66cb7f1d24bbbf740e SHA1 ca9270513e40d27650a823fd39f14a4fc0875419 SHA256 d122f104e141d6e0c4f368ece47a871adf01919f6fdaa4ea6785d83293040fbb
+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-gentoo-multilib.patch 1579 RMD160 35671f69f782e326749f8ff50bd25ede3ffca628 SHA1 64c2f0c7b54911735792c5f14c78549d2c3f9a4e SHA256 0efa29f5cb350aa8118cb9c4ba8d62cf675b6af5692ee18e25021f463465fc8a
 DIST icecc-0.9.1.tar.bz2 355333 RMD160 ac25c70186960c06f92b66ce794e188fd9bcf996 SHA1 3741badedc15b1fe780b3a93ac434846b9cdc6ff SHA256 1facf28f7356405bf85f7d31d7ce2cd52e59ed509866c2c095e2e2fbe01f1ef4
-EBUILD icecream-0.9.1-r2.ebuild 4265 RMD160 ccc98a718194342d5c9320a8a52d8ed9b54b2860 SHA1 5345e8109803b2ec12017396df163b80c3caeb10 SHA256 347d048feef7b287384e11ad6f8c77f4d50cc9e2ecf21cc9122b42b4d52631c6
-MISC ChangeLog 5259 RMD160 87236739b29c64640826fda4b3a96f91b14030fd SHA1 305f41d92fc93c42ee4fbc338318ed6c03cf2317 SHA256 00e9c27021bcda3467a557eeba0996c10ceb60c42d18c205dca05738ed759782
+DIST icecc-0.9.2.tar.bz2 369567 RMD160 833f22c1219dcb5442aaf10d2f501028651405f8 SHA1 ee4e1315063aff057081bd021585632ea1c0ddfe SHA256 6aafc5eb6557b65f650f600bd6ff9d5ed33df6dd516216f23d0872e82b88540b
+EBUILD icecream-0.9.1-r2.ebuild 4267 RMD160 9a552fb52e3d75b08b8e929b743a355cd9e9110c SHA1 209af94bb32b61a30040ed2a8a820932561dafdd SHA256 17cb3e4fec539b2af8be1a90b6d505f75b88249e5e3eb36393e9a19e9c0b57d1
+EBUILD icecream-0.9.2.ebuild 4268 RMD160 bd62342559d6d8f68882c4267033bdbe26d4243f SHA1 b99a1bd930da96ffe80e699853e2cb132d8d24c0 SHA256 5bf41d9ed7c8174ed6271c375840016fa28e72e44074c80c1100cd82b3d63bb9
+MISC ChangeLog 5618 RMD160 ae3df1bc38373339a0e3d64f46e7010c492ba53c SHA1 f153c094cea25b0ed217f6ad11779b22076e9328 SHA256 f3abd044402236858eda0061789d35a93e8bf8dce93728e3b053cd1574511bdb
 MISC metadata.xml 227 RMD160 7155b031dbc4292fbe0c64b51a6ef7d51f4788cb SHA1 126258ae6d52b655b4cafbf037d68d7f4b98399c SHA256 280f0489d26db834f76dd978c65c87644670e968026df54877242cf1a28d1c10
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."
+}