From e646274eae7f440229f6c84c0c1c53393e6af054 Mon Sep 17 00:00:00 2001 From: Zack Welch Date: Tue, 18 Mar 2003 06:01:03 +0000 Subject: fix einfo issue in new config function --- sys-devel/distcc/ChangeLog | 8 +- sys-devel/distcc/distcc-1.2.3-r1.ebuild | 102 -------------------------- sys-devel/distcc/distcc-1.2.3-r2.ebuild | 102 ++++++++++++++++++++++++++ sys-devel/distcc/files/1.2.3/distcc-config | 7 +- sys-devel/distcc/files/digest-distcc-1.2.3-r1 | 1 - sys-devel/distcc/files/digest-distcc-1.2.3-r2 | 1 + 6 files changed, 115 insertions(+), 106 deletions(-) delete mode 100644 sys-devel/distcc/distcc-1.2.3-r1.ebuild create mode 100644 sys-devel/distcc/distcc-1.2.3-r2.ebuild delete mode 100644 sys-devel/distcc/files/digest-distcc-1.2.3-r1 create mode 100644 sys-devel/distcc/files/digest-distcc-1.2.3-r2 (limited to 'sys-devel') diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog index 3204f8a791a8..82ed14297023 100644 --- a/sys-devel/distcc/ChangeLog +++ b/sys-devel/distcc/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-devel/distcc # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.33 2003/03/17 23:34:07 zwelch Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.34 2003/03/18 06:01:03 zwelch Exp $ + +*distcc-1.2.3-r2 (17 Mar 2003) + + 17 Mar 2003; Zach Welch distcc-1.2.3-r1.ebuild, + distcc-1.2.3-r1.ebuild, distcc-1.2.3-r2.ebuild, files/1.2.3/distcc-config: + fix einfo issue in new config function *distcc-1.2.3-r1 (17 Mar 2003) diff --git a/sys-devel/distcc/distcc-1.2.3-r1.ebuild b/sys-devel/distcc/distcc-1.2.3-r1.ebuild deleted file mode 100644 index d51d2c98dd37..000000000000 --- a/sys-devel/distcc/distcc-1.2.3-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2003 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-1.2.3-r1.ebuild,v 1.1 2003/03/17 23:34:07 zwelch Exp $ - -inherit eutils - -IUSE="" - -HOMEPAGE="http://distcc.samba.org/" -SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2" -DESCRIPTION="a program to distribute compilation of C code across several machines on a network" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips arm" - -OPV="1.2" -LPV="1.2.1" - -DEPEND=">=sys-apps/portage-2.0.46-r11 - >=sys-devel/gcc-config-1.3.1 - sys-apps/shadow - dev-libs/popt" - -src_unpack() { - unpack distcc-${PV}.tar.bz2 -# cp -a distcc-${PV} distcc-${PV}.orig - epatch "${FILESDIR}/${PV}/wrapper.patch" || die - epatch "${FILESDIR}/${PV}/info.patch" || die -} - -src_compile() { - econf || die "econf failed" - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D%/}" install - - insinto /usr/share/doc/${PN} - doins "${S}/survey.txt" - - exeinto /usr/bin - doexe "${FILESDIR}/${PV}/distcc-config" - - insinto /etc/conf.d - newins "${FILESDIR}/${OPV}/conf" distccd - - exeinto /etc/init.d - newexe "${FILESDIR}/${OPV}/init" distccd - - # create and keep the symlink dir - dodir /usr/lib/distcc/bin - keepdir /usr/lib/distcc/bin - - # create the distccd pid directory - dodir /var/run/distccd - keepdir /var/run/distccd -} - -pkg_preinst() { - # non-/ installs don't require us to do anything here - [ "${ROOT}" != "/" ] && return 0 - - # stop daemon since script is being updated - [ -n "$(pidof distccd)" -a -x /etc/init.d/distccd ] && \ - /etc/init.d/distccd stop - - # moved user creation and permissions to distcc-config script - # because of ROOT install requirements -} - -pkg_postinst() { - if [ "${ROOT}" = "/" ]; then - einfo "Installing links to native compilers..." - /usr/bin/distcc-config --install-user - /usr/bin/distcc-config --install-links - /usr/bin/distcc-config --install-links "${CHOST}" - else - # distcc-config can *almost* handle ROOT installs itself - # but for now, but user must finsh things off - ewarn "*** Installation is not complete ***" - ewarn "You must run the following as root:" - ewarn " /usr/bin/distcc-config --install" - ewarn "after booting or chrooting into ${ROOT}" - fi - - einfo "To use distcc with **non-Portage** C compiling, add" - einfo "/usr/lib/distcc/bin to your path before /usr/bin. If you're" - einfo "combining this with ccache, put the distcc dir AFTER ccache." - einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put" - einfo "distcc into the FEATURES setting in make.conf (and define" - einfo "DISTCC_HOSTS as well). Do NOT set CC=distcc or similar." - ewarn "See http://cvs.gentoo.org/~zwelch/distcc.html for information." -} - -#pkg_prerm() { -# # ztw - not sure if this is the right place -# distcc-config --remove-links "${CHOST}" -# distcc-config --remove-links -#} - diff --git a/sys-devel/distcc/distcc-1.2.3-r2.ebuild b/sys-devel/distcc/distcc-1.2.3-r2.ebuild new file mode 100644 index 000000000000..3a666e2ecc47 --- /dev/null +++ b/sys-devel/distcc/distcc-1.2.3-r2.ebuild @@ -0,0 +1,102 @@ +# Copyright 1999-2003 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-1.2.3-r2.ebuild,v 1.1 2003/03/18 06:01:03 zwelch Exp $ + +inherit eutils + +IUSE="" + +HOMEPAGE="http://distcc.samba.org/" +SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2" +DESCRIPTION="a program to distribute compilation of C code across several machines on a network" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~mips arm" + +OPV="1.2" +LPV="1.2.1" + +DEPEND=">=sys-apps/portage-2.0.46-r11 + >=sys-devel/gcc-config-1.3.1 + sys-apps/shadow + dev-libs/popt" + +src_unpack() { + unpack distcc-${PV}.tar.bz2 +# cp -a distcc-${PV} distcc-${PV}.orig + epatch "${FILESDIR}/${PV}/wrapper.patch" || die + epatch "${FILESDIR}/${PV}/info.patch" || die +} + +src_compile() { + econf || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D%/}" install + + insinto /usr/share/doc/${PN} + doins "${S}/survey.txt" + + exeinto /usr/bin + doexe "${FILESDIR}/${PV}/distcc-config" + + insinto /etc/conf.d + newins "${FILESDIR}/${OPV}/conf" distccd + + exeinto /etc/init.d + newexe "${FILESDIR}/${OPV}/init" distccd + + # create and keep the symlink dir + dodir /usr/lib/distcc/bin + keepdir /usr/lib/distcc/bin + + # create the distccd pid directory + dodir /var/run/distccd + keepdir /var/run/distccd +} + +pkg_preinst() { + # non-/ installs don't require us to do anything here + [ "${ROOT}" != "/" ] && return 0 + + # stop daemon since script is being updated + [ -n "$(pidof distccd)" -a -x /etc/init.d/distccd ] && \ + /etc/init.d/distccd stop + + # moved user creation and permissions to distcc-config script + # because of ROOT install requirements +} + +pkg_postinst() { + if [ "${ROOT}" = "/" ]; then + einfo "Installing links to native compilers..." + /usr/bin/distcc-config --install-user + /usr/bin/distcc-config --install-links + /usr/bin/distcc-config --install-links "${CHOST}" + else + # distcc-config can *almost* handle ROOT installs itself + # but for now, but user must finsh things off + ewarn "*** Installation is not complete ***" + ewarn "You must run the following as root:" + ewarn " /usr/bin/distcc-config --install" + ewarn "after booting or chrooting into ${ROOT}" + fi + + einfo "To use distcc with **non-Portage** C compiling, add" + einfo "/usr/lib/distcc/bin to your path before /usr/bin. If you're" + einfo "combining this with ccache, put the distcc dir AFTER ccache." + einfo "Portage 2.0.46-r11+ will take advantage of distcc if you put" + einfo "distcc into the FEATURES setting in make.conf (and define" + einfo "DISTCC_HOSTS as well). Do NOT set CC=distcc or similar." + ewarn "See http://cvs.gentoo.org/~zwelch/distcc.html for information." +} + +#pkg_prerm() { +# # ztw - not sure if this is the right place +# distcc-config --remove-links "${CHOST}" +# distcc-config --remove-links +#} + diff --git a/sys-devel/distcc/files/1.2.3/distcc-config b/sys-devel/distcc/files/1.2.3/distcc-config index 384af08147f1..46beb3abf67b 100644 --- a/sys-devel/distcc/files/1.2.3/distcc-config +++ b/sys-devel/distcc/files/1.2.3/distcc-config @@ -130,14 +130,17 @@ dccc_set_env() { shift dccc_install_env mv -f ${DISTCC_ENV_FILE} ${DISTCC_ENV_FILE}.tmp + if [ -n "${*}" ]; then + einfo "Setting ${xxENV}=\"${*}\"" + else + einfo "Clearing ${xxENV}" + fi # redirect the following block to create new file { egrep -v "${xxENV}[= ]" ${DISTCC_ENV_FILE}.tmp if [ -n "${*}" ]; then - einfo "Setting ${xxENV}=\"${*}\"" echo "${xxENV}=\"${*}\"" else - einfo "Setting ${xxENV}=\"${*}\"" echo "# ${xxENV} is not set" fi } >> ${DISTCC_ENV_FILE} diff --git a/sys-devel/distcc/files/digest-distcc-1.2.3-r1 b/sys-devel/distcc/files/digest-distcc-1.2.3-r1 deleted file mode 100644 index 2064bb1d46a2..000000000000 --- a/sys-devel/distcc/files/digest-distcc-1.2.3-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 4e6f47493d39a87d2361f72ac94673f1 distcc-1.2.3.tar.bz2 214321 diff --git a/sys-devel/distcc/files/digest-distcc-1.2.3-r2 b/sys-devel/distcc/files/digest-distcc-1.2.3-r2 new file mode 100644 index 000000000000..2064bb1d46a2 --- /dev/null +++ b/sys-devel/distcc/files/digest-distcc-1.2.3-r2 @@ -0,0 +1 @@ +MD5 4e6f47493d39a87d2361f72ac94673f1 distcc-1.2.3.tar.bz2 214321 -- cgit v1.2.3-65-gdbad