diff options
author | Lisa M. Seelye <lisa@gentoo.org> | 2004-02-23 01:53:12 +0000 |
---|---|---|
committer | Lisa M. Seelye <lisa@gentoo.org> | 2004-02-23 01:53:12 +0000 |
commit | 2e4dcd00ba47fd093072417d14beeeb1b85c680c (patch) | |
tree | 9f26602739b0bc51022a64945e79ea5269210a7e /sys-devel/distcc | |
parent | parallel build fails atm #42472 (diff) | |
download | historical-2e4dcd00ba47fd093072417d14beeeb1b85c680c.tar.gz historical-2e4dcd00ba47fd093072417d14beeeb1b85c680c.tar.bz2 historical-2e4dcd00ba47fd093072417d14beeeb1b85c680c.zip |
Removing old stuff since everyone is now stable on 2.12.1. (cool huh)
Diffstat (limited to 'sys-devel/distcc')
26 files changed, 7 insertions, 2112 deletions
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog index 7f060893b7eb..6078037909ec 100644 --- a/sys-devel/distcc/ChangeLog +++ b/sys-devel/distcc/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-devel/distcc # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.95 2004/02/23 01:20:01 lisa Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.96 2004/02/23 01:53:12 lisa Exp $ + + 22 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.11.1.ebuild, + distcc-2.11.2-r1.ebuild, distcc-2.11.2.ebuild, distcc-2.8-r2.ebuild, + distcc-2.9.ebuild: + Removing old stuff since everyone is now stable on 2.12.1. (cool huh) 22 Feb 2004; Lisa Seelye <lisa@gentoo.org> distcc-2.12.1.ebuild: Move 2.12.1 to stable on ppc. Directory cleanup in this dir to follow diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index 0bb563fee869..5dd6adf363a7 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -1,31 +1,7 @@ -MD5 37e5ba6ccf3e85fa2648c567de8e7089 distcc-2.11.2.ebuild 4058 -MD5 cdaed817d844c36ba7ced99a3f516cc5 distcc-2.11.2-r1.ebuild 4061 -MD5 5263b5361ec14a67ca799473c2ce12b3 distcc-2.8-r2.ebuild 3368 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443 -MD5 b7e89f810bea86b2961c4e902c6820ba ChangeLog 17291 -MD5 fe917ad577ccf7fa5f5d90409202960f distcc-2.9.ebuild 3457 -MD5 ed97af1dc861dbd229fae273affcde6e distcc-2.11.1.ebuild 3944 +MD5 840291cb64e469a7695bfd60cfa62623 ChangeLog 17523 MD5 5d5758311cdd7fd437eca2ce9fc078ca distcc-2.12.1.ebuild 4556 -MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2-r1 66 -MD5 86e7b8c5c35c5e34e2adfe2c55369f7a files/digest-distcc-2.11.1 66 -MD5 56fd1ac60c1b8402e1632da62f32a890 files/digest-distcc-2.8-r2 63 -MD5 ade4e8cda892045944e204fc2c3df8bd files/digest-distcc-2.9 63 MD5 9ca407ce154707a1f27485523adf943c files/digest-distcc-2.12.1 66 -MD5 c09d755beeab4ae675a8352f4ee04c63 files/digest-distcc-2.11.2 66 MD5 0d27e364d11fcecd8fdd7eb1c4be732a files/2.11.1p/distcc-config 4839 MD5 606dd55609a04a0f21b9875259148332 files/2.11.1p/init 633 MD5 66c4af6f8dd87d270e5da50341ca6e14 files/2.11.1p/conf 658 -MD5 6f1edaee7eef7537a80b5f35851332fa files/2.8/distcc-config 7564 -MD5 ee4f0fde9d5e6fe88bf7f513cf12920c files/2.8/001_fix_tempfile.patch.gz 251 -MD5 a985e7680ba7958cb9a170c8e2019e8e files/2.8/init 625 -MD5 41f782125d594b7249fcd1fc6c306b02 files/2.8/conf 592 -MD5 ced4e94d8c61a8f175d62a39478e7afc files/2.9/001_fix_tmpdir.patch.gz 248 -MD5 f5d409e6e7b796d8976516a6bb7cd842 files/2.9/distcc-config 7564 -MD5 c400119892789344a9702d466476ddbd files/2.9/init 625 -MD5 05483b8174e619ee439b905cca85c7ad files/2.9/conf 592 -MD5 1ebd94379f324ed4563036a24f36f342 files/2.11/distcc-config 7572 -MD5 c8ff220b60c105fcede2c72f274995db files/2.11/init 630 -MD5 e40dfa1f21a9a2301faaff21cf76e7d8 files/2.11/conf 655 -MD5 6e5308b89b53f805c225d2777361488a files/2.10/distcc-config 7565 -MD5 813a6a43167076da271ef55188a77826 files/2.10/init 630 -MD5 d69d2e510421afc34c73a9cb50c5fb0d files/2.10/conf 655 diff --git a/sys-devel/distcc/distcc-2.11.1.ebuild b/sys-devel/distcc/distcc-2.11.1.ebuild deleted file mode 100644 index 7d09b98e4a44..000000000000 --- a/sys-devel/distcc/distcc-2.11.1.ebuild +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.1.ebuild,v 1.6 2004/02/21 20:08:23 lisa Exp $ - -inherit eutils gcc flag-o-matic -[ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - -PATCHLEVEL="2.11" - -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" -IUSE="gnome gtk selinux" - -DEPEND=">=sys-apps/portage-2.0.49-r6 - >=sys-devel/gcc-config-1.3.1 - sys-apps/shadow" - -RDEPEND="!mips? ( gnome? ( >=x11-libs/gtk+-2.0.0 - >=gnome-base/libgnome-2.0.0 - >=gnome-base/libgnomeui-2.0.0.0 - >=gnome-base/libglade-2.0.0 - x11-libs/pango - ) ) - !mips? ( gtk? ( - >=x11-libs/gtk+-2.0.0 - >=gnome-base/libglade-2.0.0 - x11-libs/pango - ) ) - selinux? ( sec-policy/selinux-distcc )" - -src_compile() { - local myconf="--with-included-popt " - #Here we use the built in parse-options package. saves a dependancy - - #not taking any chances here, guessing which takes precedence in the - #configure script, so we'll just make the distinction here: - #gnome takes precedence over gtk if both are specified (gnome pulls - #in gtk anyways...) - use gtk && ! use gnome && myconf="${myconf} --with-gtk" - use gtk && use gnome && myconf="${myconf} --with-gnome" - - econf ${myconf} || die "econf ${myconf} 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}/${PATCHLEVEL}/distcc-config" - - insinto /etc/conf.d - newins "${FILESDIR}/${PATCHLEVEL}/conf" distccd - - exeinto /etc/init.d - newexe "${FILESDIR}/${PATCHLEVEL}/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() { - # handle DISTCC_HOSTS upgrade better - local ENVFILE - ENVFILE="${ROOT}etc/env.d/02distcc" - [ ! -f "${ENVFILE}" ] && \ - ENVFILE="${ROOT}etc/env.d/04distcc" - if [ -f "${ENVFILE}" ] - then - # save hosts to new file - ROOT="${ROOT}" ${ROOT}usr/bin/distcc-config --set-hosts \ - $(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,') - # now remove from the file - grep -v 'DISTCC_HOSTS' "${ENVFILE}" > "${ENVFILE}.new" - mv "${ENVFILE}.new" "${ENVFILE}" - fi - - 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}" - /usr/bin/distcc-config --set-env DISTCC_DIR "" - 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 "Tips on using distcc with Gentoo can be found at" - einfo "http://www.gentoo.org/doc/en/distcc.xml" - ewarn "As of distcc-2.11, the only thing you have to do to configure distcc" - ewarn "is to set your hosts (see the Guide, above) and to add distcc to" - ewarn "the FEATURES line in /etc/make.conf" - echo "" - einfo "To use the distccmon programs with Gentoo you should use this command:" - einfo " DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N" -} diff --git a/sys-devel/distcc/distcc-2.11.2-r1.ebuild b/sys-devel/distcc/distcc-2.11.2-r1.ebuild deleted file mode 100644 index ffa886c08ec8..000000000000 --- a/sys-devel/distcc/distcc-2.11.2-r1.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.2-r1.ebuild,v 1.4 2004/02/21 20:08:23 lisa Exp $ - -inherit eutils gcc flag-o-matic -[ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - -PATCHLEVEL="2.11.1p" - -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" -IUSE="gnome gtk selinux" - -DEPEND=">=sys-apps/portage-2.0.49-r6 - >=sys-devel/gcc-config-1.3.1 - sys-apps/shadow" - -RDEPEND="!mips? ( gnome? ( >=x11-libs/gtk+-2.0.0 - >=gnome-base/libgnome-2.0.0 - >=gnome-base/libgnomeui-2.0.0.0 - >=gnome-base/libglade-2.0.0 - x11-libs/pango - ) ) - !mips? ( gtk? ( - >=x11-libs/gtk+-2.0.0 - x11-libs/pango - ) ) - selinux? ( sec-policy/selinux-distcc )" - -src_compile() { - local myconf="--with-included-popt " - #Here we use the built in parse-options package. saves a dependancy - - #not taking any chances here, guessing which takes precedence in the - #configure script, so we'll just make the distinction here: - #gnome takes precedence over gtk if both are specified (gnome pulls - #in gtk anyways...) - use gtk && ! use gnome && myconf="${myconf} --with-gtk" - use gtk && use gnome && myconf="${myconf} --with-gnome" - - econf ${myconf} || die "econf ${myconf} 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}/${PATCHLEVEL}/distcc-config" - - insinto /etc/conf.d - newins "${FILESDIR}/${PATCHLEVEL}/conf" distccd - - exeinto /etc/init.d - newexe "${FILESDIR}/${PATCHLEVEL}/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() { - # handle DISTCC_HOSTS upgrade better - local ENVFILE - ENVFILE="${ROOT}etc/env.d/02distcc" - [ ! -f "${ENVFILE}" ] && \ - ENVFILE="${ROOT}etc/env.d/04distcc" - if [ -f "${ENVFILE}" ] - then - # save hosts to new file - ROOT="${ROOT}" - HOSTS=$(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,') - [ ${HOSTS} ] && ${ROOT}usr/bin/distcc-config --set-hosts ${HOSTS} - # now remove from the file - grep -v 'DISTCC_HOSTS' "${ENVFILE}" > "${ENVFILE}.new" - mv "${ENVFILE}.new" "${ENVFILE}" - fi - - if [ "${ROOT}" = "/" ]; then - einfo "Installing links to native compilers..." - /usr/bin/distcc-config --install - 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 "Tips on using distcc with Gentoo can be found at" - einfo "http://www.gentoo.org/doc/en/distcc.xml" - ewarn "As of distcc-2.11, the only thing you have to do to configure distcc" - ewarn "is to set your hosts (see the Guide, above) and to add distcc to" - ewarn "the FEATURES line in /etc/make.conf" - ewarn "This version includes a new distcc-config. If you encounter problems with it," - ewarn "please report them to our Bugzilla at bugs.gentoo.org" - echo "" - einfo "To use the distccmon programs with Gentoo you should use this command:" - einfo " DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N" - use gnome || use gtk && einfo "Or: DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome" - sleep 10 -} diff --git a/sys-devel/distcc/distcc-2.11.2.ebuild b/sys-devel/distcc/distcc-2.11.2.ebuild deleted file mode 100644 index 20b52f0de765..000000000000 --- a/sys-devel/distcc/distcc-2.11.2.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.11.2.ebuild,v 1.5 2004/02/21 20:08:23 lisa Exp $ - -inherit eutils gcc flag-o-matic -[ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - -PATCHLEVEL="2.11.1p" - -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" -IUSE="gnome gtk selinux" - -DEPEND=">=sys-apps/portage-2.0.49-r6 - >=sys-devel/gcc-config-1.3.1 - sys-apps/shadow" - -RDEPEND="!mips? ( gnome? ( >=x11-libs/gtk+-2.0.0 - >=gnome-base/libgnome-2.0.0 - >=gnome-base/libgnomeui-2.0.0.0 - >=gnome-base/libglade-2.0.0 - x11-libs/pango - ) ) - !mips? ( gtk? ( - >=x11-libs/gtk+-2.0.0 - x11-libs/pango - ) ) - selinux? ( sec-policy/selinux-distcc )" - -src_compile() { - local myconf="--with-included-popt " - #Here we use the built in parse-options package. saves a dependancy - - #not taking any chances here, guessing which takes precedence in the - #configure script, so we'll just make the distinction here: - #gnome takes precedence over gtk if both are specified (gnome pulls - #in gtk anyways...) - use gtk && ! use gnome && myconf="${myconf} --with-gtk" - use gtk && use gnome && myconf="${myconf} --with-gnome" - - econf ${myconf} || die "econf ${myconf} 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}/${PATCHLEVEL}/distcc-config" - - insinto /etc/conf.d - newins "${FILESDIR}/${PATCHLEVEL}/conf" distccd - - exeinto /etc/init.d - newexe "${FILESDIR}/${PATCHLEVEL}/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() { - # handle DISTCC_HOSTS upgrade better - local ENVFILE - ENVFILE="${ROOT}etc/env.d/02distcc" - [ ! -f "${ENVFILE}" ] && \ - ENVFILE="${ROOT}etc/env.d/04distcc" - if [ -f "${ENVFILE}" ] - then - # save hosts to new file - ROOT="${ROOT}" - HOSTS=$(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,') - [ ${HOSTS} ] && ${ROOT}usr/bin/distcc-config --set-hosts ${HOSTS} - # now remove from the file - grep -v 'DISTCC_HOSTS' "${ENVFILE}" > "${ENVFILE}.new" - mv "${ENVFILE}.new" "${ENVFILE}" - fi - - if [ "${ROOT}" = "/" ]; then - einfo "Installing links to native compilers..." - /usr/bin/distcc-config --install - 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 "Tips on using distcc with Gentoo can be found at" - einfo "http://www.gentoo.org/doc/en/distcc.xml" - ewarn "As of distcc-2.11, the only thing you have to do to configure distcc" - ewarn "is to set your hosts (see the Guide, above) and to add distcc to" - ewarn "the FEATURES line in /etc/make.conf" - ewarn "This version includes a new distcc-config. If you encounter problems with it," - ewarn "please report them to our Bugzilla at bugs.gentoo.org" - echo "" - einfo "To use the distccmon programs with Gentoo you should use this command:" - einfo " DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N" - use gnome || use gtk && einfo "Or: DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome" - sleep 10 -} diff --git a/sys-devel/distcc/distcc-2.8-r2.ebuild b/sys-devel/distcc/distcc-2.8-r2.ebuild deleted file mode 100644 index 3d4b30da148a..000000000000 --- a/sys-devel/distcc/distcc-2.8-r2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.8-r2.ebuild,v 1.11 2004/02/21 20:08:23 lisa Exp $ - -inherit eutils gcc flag-o-matic -[ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - -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" -IUSE="gtk selinux" - -DEPEND=">=sys-apps/portage-2.0.46-r11 - >=sys-devel/gcc-config-1.3.1 - sys-apps/shadow - dev-libs/popt" - -RDEPEND="!mips? ( gtk? ( >=x11-libs/gtk+-2.2.1 ) ) - selinux? ( sec-policy/selinux-distcc )" - -src_unpack() { - unpack ${A} - - #this patch fixes the problem with portage reassigning $TMPDIR - #and rendering the monitor programs useless, unless a rather - #icky hack is used. now sudo -u portage distccmon-{gnome,text} - #will work. - Lisa - cd ${S}/src - epatch ${FILESDIR}/${PV}/001*.gz -} - -src_compile() { - local myconf - use gtk && myconf="--enable-gnome" - econf ${myconf} || die "econf ${myconf} 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}/${PV}/conf" distccd - - exeinto /etc/init.d - newexe "${FILESDIR}/${PV}/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() { - # handle DISTCC_HOSTS upgrade better - local ENVFILE - ENVFILE="${ROOT}etc/env.d/02distcc" - [ ! -f "${ENVFILE}" ] && \ - ENVFILE="${ROOT}etc/env.d/04distcc" - if [ -f "${ENVFILE}" ] - then - # save hosts to new file - ROOT="${ROOT}" ${ROOT}usr/bin/distcc-config --set-hosts \ - $(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,') - # now remove from the file - grep -v 'DISTCC_HOSTS' "${ENVFILE}" > "${ENVFILE}.new" - mv "${ENVFILE}.new" "${ENVFILE}" - fi - - 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 "Documentation and how to set up distcc can be found at" - einfo "http://www.gentoo.org/doc/en/distcc.xml" - echo "" - einfo "To use the distccmon programs with Gentoo you should use this command:" - einfo " sudo -H -u portage distccmon-text OR sudo -H -u portage distccmon-gnome" -} diff --git a/sys-devel/distcc/distcc-2.9.ebuild b/sys-devel/distcc/distcc-2.9.ebuild deleted file mode 100644 index 8cd36029bc4b..000000000000 --- a/sys-devel/distcc/distcc-2.9.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2004 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.9.ebuild,v 1.9 2004/02/21 20:08:23 lisa Exp $ - -inherit eutils gcc flag-o-matic -[ `gcc-major-version` -eq 2 ] && filter-flags -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE - -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" -IUSE="gtk selinux" - -DEPEND=">=sys-apps/portage-2.0.46-r11 - >=sys-devel/gcc-config-1.3.1 - sys-apps/shadow" - -RDEPEND="!mips? ( gtk? ( >=x11-libs/gtk+-2.2.1 ) ) - selinux? ( sec-policy/selinux-distcc )" - -src_unpack() { - unpack ${A} - - #this patch fixes the problem with portage reassigning $TMPDIR - #and rendering the monitor programs useless, unless a rather - #icky hack is used. now sudo -u portage distccmon-{gnome,text} - #will work. - Lisa - cd ${S}/src - epatch ${FILESDIR}/${PV}/001_fix_tmpdir.patch.gz -} - -src_compile() { - local myconf="--with-included-popt " - #Here we use the built in parse-options package. It saves a dependancy - use gtk && myconf="--enable-gnome" - econf ${myconf} || die "econf ${myconf} 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}/${PV}/conf" distccd - - exeinto /etc/init.d - newexe "${FILESDIR}/${PV}/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() { - # handle DISTCC_HOSTS upgrade better - local ENVFILE - ENVFILE="${ROOT}etc/env.d/02distcc" - [ ! -f "${ENVFILE}" ] && \ - ENVFILE="${ROOT}etc/env.d/04distcc" - if [ -f "${ENVFILE}" ] - then - # save hosts to new file - ROOT="${ROOT}" ${ROOT}usr/bin/distcc-config --set-hosts \ - $(egrep '^DISTCC_HOSTS' "${ENVFILE}" | sed 's,[^=]*=,,') - # now remove from the file - grep -v 'DISTCC_HOSTS' "${ENVFILE}" > "${ENVFILE}.new" - mv "${ENVFILE}.new" "${ENVFILE}" - fi - - 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 "Tips on using distcc with Gentoo can be found at" - einfo "http://www.gentoo.org/doc/en/distcc.xml" - echo "" - einfo "To use the distccmon programs with Gentoo you should use this command:" - einfo " sudo -H -u portage distccmon-text OR sudo -H -u portage distccmon-gnome" -} diff --git a/sys-devel/distcc/files/2.10/conf b/sys-devel/distcc/files/2.10/conf deleted file mode 100644 index d1892ca3b580..000000000000 --- a/sys-devel/distcc/files/2.10/conf +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2003 Gentoo Technologies, Inc -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.10/conf,v 1.2 2003/09/15 04:46:59 lisa Exp $ -# distccd configuration file - -# this is the distccd executable -DISTCCD_EXEC=/usr/bin/distccd - -# this is where distccd will store its pid file -DISTCCD_PIDFILE=/var/run/distccd/distccd.pid - -# set this option to run distccd with extra parameters -# Default port is 3632. For most people the default is okay. -# DISTCCD_OPTS="--port 3632" - -# set this for niceness -# Default is 15 -DISTCCD_NICE="15" - -# This is the path that distccd and the monitors will look -# for the state files. -DISTCC_DIR="/var/tmp/distccd" diff --git a/sys-devel/distcc/files/2.10/distcc-config b/sys-devel/distcc/files/2.10/distcc-config deleted file mode 100644 index ce075c379144..000000000000 --- a/sys-devel/distcc/files/2.10/distcc-config +++ /dev/null @@ -1,324 +0,0 @@ -#!/bin/bash -# -# distcc-config - helper script for distcc and distccd -# -# Copyright 2003 Superlucidity Services, LLC -# This program licensed under the GNU GPL version 2. -# -# This script developed by Zachary T Welch at Superlucidity Services, LLC -# based on ideas from irc discussion and the clear need for this support -# -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.10/distcc-config,v 1.3 2004/01/05 23:23:10 robbat2 Exp $ -# Changelog -# -# 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc. -# The hosts are stored by default to /etc/distcc/hosts. <lisa@gentoo.org> - -[ -z "${ROOT}" ] && ROOT=/ - -# distcc-config manges the DISTCC_{HOSTS,LOG,VERBOSE} settings here -# moved to accomodate 02ccache and leave 0[14]* free -DCCC_ENV_FILE="${ROOT}etc/env.d/02distcc" -DCCC_OLD_ENV="${ROOT}etc/env.d/04distcc" - -is_super_user() { - [ "$(id -u)" = 0 ] -} -# this should be getopt'd someday (override with DCCC_QUIET) -DCCC_VERBOSE=1 - -source /sbin/functions.sh - -dccc_echo() { - [ -z "${DCCC_QUIET}" -a -n "${DCCC_VERBOSE}" ] && echo "$*" -} -dccc_exit() { - dccc_echo "$*" - exit 1 -} - -# create the appropriate configuration directory -is_super_user && \ - DCCC_HOSTS_FILE="${ROOT}etc/distcc/hosts" || \ - DCCC_HOSTS_FILE="${ROOT}${HOME#/}/.distcc/hosts" -mkdir -p $(dirname ${DCCC_HOSTS_FILE}) || \ - dccc_exit "unable to create configuration directory" - - -### -# the following functions manage the distcc symlinks -# they allow the user or other scripts (namely gcc-config) to -# automatically update distcc's links when upgrading toolchains -# -dccc_remove_link() { - local t="${ROOT}usr/lib/distcc/bin/${1}" - if [ -L ${t} ]; then - dccc_echo "Removing ${t}..." - rm -f "${t}" - fi -} -dccc_install_link() { - # Search the PATH for the specified compiler - # then create shadow link in ${ROOT}usr/lib/distcc/bin to distcc - # note: this `type' doesn't do the right thing if ROOT != / - if [ -n "$(type -p ${1})" ]; then - # first be sure any old link is removed - DCCC_QUIET=1 dccc_remove_link "${1}" - - # then create the new link - local t="${ROOT}usr/lib/distcc/bin/${1}" - dccc_echo "Creating distcc shadow link: ${t}..." - ln -s /usr/bin/distcc "${t}" - fi -} -dccc_links() { - local a - for a in gcc cc c++ g++ ; do - [ -n "${2}" ] && a="${2}-${a}" - eval "dccc_${1}_link" "${a}" - done -} - -dccc_install_user() { - # update or create, depending on whether user already exists - einfo "Updating or creating distcc user..." - local USERFIX - id distcc >/dev/null 2>&1 && USERFIX=usermod || USERFIX=useradd - USERFIX="/usr/sbin/${USERFIX}" - if [ -x "${USERFIX}" ] - then - if ! ${USERFIX} -g daemon -s /bin/false -d /dev/null \ - -c "distccd" distcc - then - dccc_exit "unable to create or modify user" - fi - elif [ "${USERFIX}" = "/usr/sbin/useradd" ] - then - ewarn "${USERFIX} not found: You need to add the distcc user" - ewarn "to /etc/passwd by hand. Add the following line:\n" - ewarn " distcc:x:240:2:distccd:/dev/null:/bin/false\n" - ewarn "and then run 'distcc-config --install' again root." - dccc_exit "Unable to create distcc user!" - fi - - for d in ${ROOT}usr/lib/distcc/bin ${ROOT}var/run/distccd ; do - einfo "Configuring $d..." - chown distcc:daemon $d && chmod 0755 $d || \ - dccc_exit "Unable to configure ${d}!" - done -} - -dccc_guess_chost() { - echo "$(grep CHOST /etc/make.conf | \ - grep -v '^#' | sed 's,^.*=\"\(.*\)\",\1,')" - -} - -###### -# routines for manipulating ${DCCC_ENV_FILE} - -dccc_install_env() { - [ -f ${DCCC_OLD_ENV} ] && mv ${DCCC_OLD_ENV} ${DCCC_ENV_FILE} - [ -f ${DCCC_ENV_FILE} ] && return - einfo "Creating ${DCCC_ENV_FILE}..." - cat <<_EOF_ > ${DCCC_ENV_FILE} || \ - dccc_exit "Unable to create ${DCCC_ENV_FILE}..." -# This file is managed by distcc-config; use it to change these settings. -# DISTCC_VERBOSE is not set -# DISTCC_LOG is not set -# DCCC_PATH is not set -_EOF_ -} - -dccc_show_env() { - grep -v '^#' ${DCCC_ENV_FILE} | sed -e 's,^,export ,' -} - -dccc_test_env() { - dccc_show_env | grep "$1" | tail -n1 | sed -e "s,${1}=,," -} - -dccc_load_defaults() { - rm -f ${DCCC_ENV_FILE} - dccc_install_env -} - -dccc_set_env() { - local xxENV="${1}" - shift - dccc_install_env - mv -f ${DCCC_ENV_FILE} ${DCCC_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}[= ]" ${DCCC_ENV_FILE}.tmp - if [ -n "${*}" ]; then - echo "${xxENV}=\"${*}\"" - else - echo "# ${xxENV} is not set" - fi - } >> ${DCCC_ENV_FILE} - rm -f ${DCCC_ENV_FILE}.tmp -} -dccc_regen_env() { - env-update - if [ -z "${DCCC_NO_WARN}" ]; then - einfo "If you want to use these new settings in an existing shell," - einfo "you need to 'source /etc/profile' to get the changes." - fi -} - -dccc_get_env() { - if [ -f ${DCCC_ENV_FILE} ]; then - local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \ - grep -v '^#' | tail -n1)" - echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,' - elif [ -n "${2}" ]; then - echo "${2}" - fi -} - -dccc_set_hosts() { - echo "${*}" > $DCCC_HOSTS_FILE -} -dccc_get_hosts() { - cat $DCCC_HOSTS_FILE -} - -dccc_set_verbose() { - dccc_set_env DISTCC_VERBOSE ${1} - dccc_regen_env -} -dccc_get_verbose() { - dccc_get_env DISTCC_VERBOSE -} - -dccc_set_log() { - dccc_set_env DISTCC_LOG ${1} - dccc_regen_env -} -dccc_get_log() { - dccc_get_env DISTCC_LOG -} - -dccc_set_j() { - local j="$(echo ${1} | sed -e 's,[^0-9],,g')" - [ -z "${j}" ] && \ - dccc_exit "$0: invalid -j option (must be a number)" - dccc_set_env MAKEOPTS "-j${j}" - dccc_regen_env -} -dccc_get_j() { - dccc_get_env MAKEOPTS -} - -#### -# main install routine - -dccc_install() { - local xxCHOST - dccc_install_user - dccc_links install "" - for f in make.conf make.globals make.profile/make.defaults - do - xxCHOST="$(dccc_guess_chost /etc/${f})" - if [ -n "${xxCHOST}" ]; then - dccc_links install "${xxCHOST}" - break - fi - done - - dccc_install_env -} - - -### -# main routine - -# helper checks that user has privs -must_be_root() { - if ! is_super_user - then - [ -n "${1}" -a "${1}" = "${2}" ] && return - dccc_exit "$0 $1 must be run by root" - fi -} - - -# The --no-profile-warning option is meant to be used with -# the following helper function (add to ~/.bashrc) -# -# distcc-config() { -# command distcc-config --no-profile-warning "$@" && \ -# source /etc/profile -# } - -if [ "${1}" = "--no-profile-warning" ]; then - DCCC_NO_WARN=1 - shift -fi - -case "${1}" in - --get-* ) - eval "dccc_$(echo ${1} | sed -e 's/^--//;s/-/_/g')" - ;; - --set-* ) - must_be_root "--set-hosts" "${1}" - SET_FUNC="$(echo ${1} | sed -e 's/^--//;s/-/_/g')" - shift - [ "${#}" -eq 0 ] && dccc_exit "argument required" - eval "dccc_${SET_FUNC} ${*}" - ;; - --has-path ) - dccc_test_env DCCC_PATH - ;; - --add-path ) - must_be_root - dccc_set_env DCCC_PATH "/usr/lib/distcc/bin" - dccc_regen_env - if [ -z "${DCCC_NO_WARN}" ]; then - einfo "You must then set PATH=\"${DCCC_PATH}/\${PATH}\"" - fi - ;; - --no-path ) - must_be_root - dccc_set_env DCCC_PATH "" - dccc_regen_env - ;; - --show-env ) - dccc_show_env - ;; - --load-defaults ) - must_be_root - dccc_load_defaults - ;; - --install ) - must_be_root - dccc_install - ;; - --install-user ) - must_be_root - dccc_install_user - ;; - --install-links ) - must_be_root - dccc_links install "${2}" - ;; - --remove-links ) - must_be_root - dccc_links remove "${2}" - ;; - * ) - echo "usage: ${0} --set-hosts DISTCC_HOSTS | --get-hosts" - echo " ${0} --set-verbose { 0 | 1 } | --get-verbose" - echo " ${0} --set-log FILE | --get-log" - echo " ${0} --add-path | --no-path" -# echo " ${0} --install-links | --remove-links } [ CHOST ]" - exit 1 - ;; -esac - diff --git a/sys-devel/distcc/files/2.10/init b/sys-devel/distcc/files/2.10/init deleted file mode 100644 index ce274b34e391..000000000000 --- a/sys-devel/distcc/files/2.10/init +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.10/init,v 1.2 2003/09/15 04:46:59 lisa Exp $ - -depend() { - need net -} - -start() { - rm -f ${DISTCCD_PIDFILE} - ebegin "Starting distccd" - DISTCC_DIR="${DISTCC_DIR}" \ - PATH="$(gcc-config --get-bin-path):${PATH}" \ - /sbin/start-stop-daemon --start --quiet --startas ${DISTCCD_EXEC} \ - --pidfile ${DISTCCD_PIDFILE} -- \ - --pid-file ${DISTCCD_PIDFILE} -N ${DISTCCD_NICE} --user distcc \ - ${DISTCCD_OPTS} - - eend $? -} - -stop() { - ebegin "Stopping distccd" - start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" - rm -f "${DISTCCD_PIDFILE}" - eend $? -} - diff --git a/sys-devel/distcc/files/2.11/conf b/sys-devel/distcc/files/2.11/conf deleted file mode 100644 index ab0b752c548e..000000000000 --- a/sys-devel/distcc/files/2.11/conf +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 2003 Gentoo Technologies, Inc -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11/conf,v 1.1 2003/09/24 00:46:02 lisa Exp $ -# distccd configuration file - -# this is the distccd executable -DISTCCD_EXEC=/usr/bin/distccd - -# this is where distccd will store its pid file -DISTCCD_PIDFILE=/var/run/distccd/distccd.pid - -# set this option to run distccd with extra parameters -# Default port is 3632. For most people the default is okay. -# DISTCCD_OPTS="--port 3632" - -# set this for niceness -# Default is 15 -DISTCCD_NICE="15" - -# This is the path that distccd and the monitors will look -# for the state files. -DISTCC_DIR="/var/tmp/distccd" diff --git a/sys-devel/distcc/files/2.11/distcc-config b/sys-devel/distcc/files/2.11/distcc-config deleted file mode 100644 index 84f2af5ee1de..000000000000 --- a/sys-devel/distcc/files/2.11/distcc-config +++ /dev/null @@ -1,324 +0,0 @@ -#!/bin/bash -# -# distcc-config - helper script for distcc and distccd -# -# Copyright 2003 Superlucidity Services, LLC -# This program licensed under the GNU GPL version 2. -# -# This script developed by Zachary T Welch at Superlucidity Services, LLC -# based on ideas from irc discussion and the clear need for this support -# -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11/distcc-config,v 1.3 2004/01/05 23:23:10 robbat2 Exp $ -# Changelog -# -# 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc. -# The hosts are stored by default to /etc/distcc/hosts. <lisa@gentoo.org> - -[ -z "${ROOT}" ] && ROOT=/ - -# distcc-config manges the DISTCC_{HOSTS,LOG,VERBOSE} settings here -# moved to accomodate 02ccache and leave 0[14]* free -DCCC_ENV_FILE="${ROOT}etc/env.d/02distcc" -DCCC_OLD_ENV="${ROOT}etc/env.d/04distcc" - -is_super_user() { - [ "$(id -u)" = 0 ] -} -# this should be getopt'd someday (override with DCCC_QUIET) -DCCC_VERBOSE=1 - -source /sbin/functions.sh - -dccc_echo() { - [ -z "${DCCC_QUIET}" -a -n "${DCCC_VERBOSE}" ] && echo "$*" -} -dccc_exit() { - dccc_echo "$*" - exit 1 -} - -# create the appropriate configuration directory -is_super_user && \ - DCCC_HOSTS_FILE="${ROOT}etc/distcc/hosts" || \ - DCCC_HOSTS_FILE="${ROOT}${HOME#/}/.distcc/hosts" -mkdir -p $(dirname ${DCCC_HOSTS_FILE}) || \ - dccc_exit "unable to create configuration directory" - - -### -# the following functions manage the distcc symlinks -# they allow the user or other scripts (namely gcc-config) to -# automatically update distcc's links when upgrading toolchains -# -dccc_remove_link() { - local t="${ROOT}usr/lib/distcc/bin/${1}" - if [ -L ${t} ]; then - dccc_echo "Removing ${t}..." - rm -f "${t}" - fi -} -dccc_install_link() { - # Search the PATH for the specified compiler - # then create shadow link in ${ROOT}usr/lib/distcc/bin to distcc - # note: this `type' doesn't do the right thing if ROOT != / - if [ -n "$(type -p ${1})" ]; then - # first be sure any old link is removed - DCCC_QUIET=1 dccc_remove_link "${1}" - - # then create the new link - local t="${ROOT}usr/lib/distcc/bin/${1}" - dccc_echo "Creating distcc shadow link: ${t}..." - ln -s /usr/bin/distcc "${t}" - fi -} -dccc_links() { - local a - for a in gcc cc c++ g++ ; do - [ -n "${2}" ] && a="${2}-${a}" - eval "dccc_${1}_link" "${a}" - done -} - -dccc_install_user() { - # update or create, depending on whether user already exists - einfo "Updating or creating distcc user..." - local USERFIX - id distcc >/dev/null 2>&1 && USERFIX=usermod || USERFIX=useradd - USERFIX="/usr/sbin/${USERFIX}" - if [ -x "${USERFIX}" ] - then - if ! ${USERFIX} -u 240 -g daemon -s /bin/false -d /dev/null \ - -c "distccd" distcc - then - dccc_exit "unable to create or modify user" - fi - elif [ "${USERFIX}" = "/usr/sbin/useradd" ] - then - ewarn "${USERFIX} not found: You need to add the distcc user" - ewarn "to /etc/passwd by hand. Add the following line:\n" - ewarn " distcc:x:240:2:distccd:/dev/null:/bin/false\n" - ewarn "and then run 'distcc-config --install' again root." - dccc_exit "Unable to create distcc user!" - fi - - for d in ${ROOT}usr/lib/distcc/bin ${ROOT}var/run/distccd ; do - einfo "Configuring $d..." - chown distcc:daemon $d && chmod 0755 $d || \ - dccc_exit "Unable to configure ${d}!" - done -} - -dccc_guess_chost() { - echo "$(grep CHOST /etc/make.conf | \ - grep -v '^#' | sed 's,^.*=\"\(.*\)\",\1,')" - -} - -###### -# routines for manipulating ${DCCC_ENV_FILE} - -dccc_install_env() { - [ -f ${DCCC_OLD_ENV} ] && mv ${DCCC_OLD_ENV} ${DCCC_ENV_FILE} - [ -f ${DCCC_ENV_FILE} ] && return - einfo "Creating ${DCCC_ENV_FILE}..." - cat <<_EOF_ > ${DCCC_ENV_FILE} || \ - dccc_exit "Unable to create ${DCCC_ENV_FILE}..." -# This file is managed by distcc-config; use it to change these settings. -# DISTCC_VERBOSE is not set -# DISTCC_LOG is not set -# DCCC_PATH is not set -_EOF_ -} - -dccc_show_env() { - grep -v '^#' ${DCCC_ENV_FILE} | sed -e 's,^,export ,' -} - -dccc_test_env() { - dccc_show_env | grep "$1" | tail -n1 | sed -e "s,${1}=,," -} - -dccc_load_defaults() { - rm -f ${DCCC_ENV_FILE} - dccc_install_env -} - -dccc_set_env() { - local xxENV="${1}" - shift - dccc_install_env - mv -f ${DCCC_ENV_FILE} ${DCCC_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}[= ]" ${DCCC_ENV_FILE}.tmp - if [ -n "${*}" ]; then - echo "${xxENV}=\"${*}\"" - else - echo "# ${xxENV} is not set" - fi - } >> ${DCCC_ENV_FILE} - rm -f ${DCCC_ENV_FILE}.tmp -} -dccc_regen_env() { - env-update - if [ -z "${DCCC_NO_WARN}" ]; then - einfo "If you want to use these new settings in an existing shell," - einfo "you need to 'source /etc/profile' to get the changes." - fi -} - -dccc_get_env() { - if [ -f ${DCCC_ENV_FILE} ]; then - local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \ - grep -v '^#' | tail -n1)" - echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,' - elif [ -n "${2}" ]; then - echo "${2}" - fi -} - -dccc_set_hosts() { - echo "${*}" > $DCCC_HOSTS_FILE -} -dccc_get_hosts() { - cat $DCCC_HOSTS_FILE -} - -dccc_set_verbose() { - dccc_set_env DISTCC_VERBOSE ${1} - dccc_regen_env -} -dccc_get_verbose() { - dccc_get_env DISTCC_VERBOSE -} - -dccc_set_log() { - dccc_set_env DISTCC_LOG ${1} - dccc_regen_env -} -dccc_get_log() { - dccc_get_env DISTCC_LOG -} - -dccc_set_j() { - local j="$(echo ${1} | sed -e 's,[^0-9],,g')" - [ -z "${j}" ] && \ - dccc_exit "$0: invalid -j option (must be a number)" - dccc_set_env MAKEOPTS "-j${j}" - dccc_regen_env -} -dccc_get_j() { - dccc_get_env MAKEOPTS -} - -#### -# main install routine - -dccc_install() { - local xxCHOST - dccc_install_user - dccc_links install "" - for f in make.conf make.globals make.profile/make.defaults - do - xxCHOST="$(dccc_guess_chost /etc/${f})" - if [ -n "${xxCHOST}" ]; then - dccc_links install "${xxCHOST}" - break - fi - done - - dccc_install_env -} - - -### -# main routine - -# helper checks that user has privs -must_be_root() { - if ! is_super_user - then - [ -n "${1}" -a "${1}" = "${2}" ] && return - dccc_exit "$0 $1 must be run by root" - fi -} - - -# The --no-profile-warning option is meant to be used with -# the following helper function (add to ~/.bashrc) -# -# distcc-config() { -# command distcc-config --no-profile-warning "$@" && \ -# source /etc/profile -# } - -if [ "${1}" = "--no-profile-warning" ]; then - DCCC_NO_WARN=1 - shift -fi - -case "${1}" in - --get-* ) - eval "dccc_$(echo ${1} | sed -e 's/^--//;s/-/_/g')" - ;; - --set-* ) - must_be_root "--set-hosts" "${1}" - SET_FUNC="$(echo ${1} | sed -e 's/^--//;s/-/_/g')" - shift - [ "${#}" -eq 0 ] && dccc_exit "argument required" - eval "dccc_${SET_FUNC} ${*}" - ;; - --has-path ) - dccc_test_env DCCC_PATH - ;; - --add-path ) - must_be_root - dccc_set_env DCCC_PATH "/usr/lib/distcc/bin" - dccc_regen_env - if [ -z "${DCCC_NO_WARN}" ]; then - einfo "You must then set PATH=\"${DCCC_PATH}/\${PATH}\"" - fi - ;; - --no-path ) - must_be_root - dccc_set_env DCCC_PATH "" - dccc_regen_env - ;; - --show-env ) - dccc_show_env - ;; - --load-defaults ) - must_be_root - dccc_load_defaults - ;; - --install ) - must_be_root - dccc_install - ;; - --install-user ) - must_be_root - dccc_install_user - ;; - --install-links ) - must_be_root - dccc_links install "${2}" - ;; - --remove-links ) - must_be_root - dccc_links remove "${2}" - ;; - * ) - echo "usage: ${0} --set-hosts DISTCC_HOSTS | --get-hosts" - echo " ${0} --set-verbose { 0 | 1 } | --get-verbose" - echo " ${0} --set-log FILE | --get-log" - echo " ${0} --add-path | --no-path" -# echo " ${0} --install-links | --remove-links } [ CHOST ]" - exit 1 - ;; -esac - diff --git a/sys-devel/distcc/files/2.11/init b/sys-devel/distcc/files/2.11/init deleted file mode 100644 index de7333e3fdd3..000000000000 --- a/sys-devel/distcc/files/2.11/init +++ /dev/null @@ -1,27 +0,0 @@ -#!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.11/init,v 1.1 2003/09/24 00:46:02 lisa Exp $ - -depend() { - need net -} - -start() { - rm -f ${DISTCCD_PIDFILE} - ebegin "Starting distccd" - DISTCC_DIR="${DISTCC_DIR}" \ - PATH="$(gcc-config --get-bin-path):${PATH}" \ - /sbin/start-stop-daemon --start --quiet --startas ${DISTCCD_EXEC} \ - --pidfile ${DISTCCD_PIDFILE} -- \ - --pid-file ${DISTCCD_PIDFILE} -N ${DISTCCD_NICE} --user distcc \ - ${DISTCCD_OPTS} - - eend $? -} - -stop() { - ebegin "Stopping distccd" - start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" - rm -f "${DISTCCD_PIDFILE}" - eend $? -} - diff --git a/sys-devel/distcc/files/2.8/001_fix_tempfile.patch.gz b/sys-devel/distcc/files/2.8/001_fix_tempfile.patch.gz Binary files differdeleted file mode 100644 index c4f3bb42b20d..000000000000 --- a/sys-devel/distcc/files/2.8/001_fix_tempfile.patch.gz +++ /dev/null diff --git a/sys-devel/distcc/files/2.8/conf b/sys-devel/distcc/files/2.8/conf deleted file mode 100644 index e4ba6c620c87..000000000000 --- a/sys-devel/distcc/files/2.8/conf +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2003 Gentoo Technologies, Inc -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.8/conf,v 1.3 2003/08/08 20:31:11 lisa Exp $ -# distccd configuration file - -# this is the distccd executable -DISTCCD_EXEC=/usr/bin/distccd - -# this is where distccd will store its pid file -DISTCCD_PIDFILE=/var/run/distccd/distccd.pid - -# set this option to run distccd with extra parameters -# Default port is 3632. For most people the default is okay. -# DISTCCD_OPTS="--nice 20 --port 3632" - -# This is the path that distccd and the monitors will look -# for the state files. -DISTCC_TMPDIR="" diff --git a/sys-devel/distcc/files/2.8/distcc-config b/sys-devel/distcc/files/2.8/distcc-config deleted file mode 100644 index 089323320f03..000000000000 --- a/sys-devel/distcc/files/2.8/distcc-config +++ /dev/null @@ -1,324 +0,0 @@ -#!/bin/bash -# -# distcc-config - helper script for distcc and distccd -# -# Copyright 2003 Superlucidity Services, LLC -# This program licensed under the GNU GPL version 2. -# -# This script developed by Zachary T Welch at Superlucidity Services, LLC -# based on ideas from irc discussion and the clear need for this support -# -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.8/distcc-config,v 1.3 2004/01/05 23:23:10 robbat2 Exp $ -# Changelog -# -# 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc. -# The hosts are stored by default to /etc/distcc/hosts. <lisa@gentoo.org> - -[ -z "${ROOT}" ] && ROOT=/ - -# distcc-config manges the DISTCC_{HOSTS,LOG,VERBOSE} settings here -# moved to accomodate 02ccache and leave 0[14]* free -DCCC_ENV_FILE="${ROOT}etc/env.d/02distcc" -DCCC_OLD_ENV="${ROOT}etc/env.d/04distcc" - -is_super_user() { - [ "$(id -u)" = 0 ] -} -# this should be getopt'd someday (override with DCCC_QUIET) -DCCC_VERBOSE=1 - -source /sbin/functions.sh - -dccc_echo() { - [ -z "${DCCC_QUIET}" -a -n "${DCCC_VERBOSE}" ] && echo "$*" -} -dccc_exit() { - dccc_echo "$*" - exit 1 -} - -# create the appropriate configuration directory -is_super_user && \ - DCCC_HOSTS_FILE="${ROOT}etc/distcc/hosts" || \ - DCCC_HOSTS_FILE="${ROOT}${HOME#/}/.distcc/hosts" -mkdir -p $(dirname ${DCCC_HOSTS_FILE}) || \ - dccc_exit "unable to create configuration directory" - - -### -# the following functions manage the distcc symlinks -# they allow the user or other scripts (namely gcc-config) to -# automatically update distcc's links when upgrading toolchains -# -dccc_remove_link() { - local t="${ROOT}usr/lib/distcc/bin/${1}" - if [ -L ${t} ]; then - dccc_echo "Removing ${t}..." - rm -f "${t}" - fi -} -dccc_install_link() { - # Search the PATH for the specified compiler - # then create shadow link in ${ROOT}usr/lib/distcc/bin to distcc - # note: this `type' doesn't do the right thing if ROOT != / - if [ -n "$(type -p ${1})" ]; then - # first be sure any old link is removed - DCCC_QUIET=1 dccc_remove_link "${1}" - - # then create the new link - local t="${ROOT}usr/lib/distcc/bin/${1}" - dccc_echo "Creating distcc shadow link: ${t}..." - ln -s /usr/bin/distcc "${t}" - fi -} -dccc_links() { - local a - for a in gcc cc c++ g++ ; do - [ -n "${2}" ] && a="${2}-${a}" - eval "dccc_${1}_link" "${a}" - done -} - -dccc_install_user() { - # update or create, depending on whether user already exists - einfo "Updating or creating distcc user..." - local USERFIX - id distcc >/dev/null 2>&1 && USERFIX=usermod || USERFIX=useradd - USERFIX="/usr/sbin/${USERFIX}" - if [ -x "${USERFIX}" ] - then - if ! ${USERFIX} -g daemon -s /bin/false -d /dev/null \ - -c "distccd" distcc - then - dccc_exit "unable to create or modify user" - fi - elif [ "${USERFIX}" = "/usr/sbin/useradd" ] - then - ewarn "${USERFIX} not found: You need to add the distcc user" - ewarn "to /etc/passwd by hand. Add the following line:\n" - ewarn " distcc:x:240:2:distccd:/dev/null:/bin/false\n" - ewarn "and then run 'distcc-config --install' again root." - dccc_exit "Unable to create distcc user!" - fi - - for d in ${ROOT}usr/lib/distcc/bin ${ROOT}var/run/distccd ; do - einfo "Configuring $d..." - chown distcc:daemon $d && chmod 0755 $d || \ - dccc_exit "Unable to configure ${d}!" - done -} - -dccc_guess_chost() { - echo "$(grep CHOST /etc/make.conf | \ - grep -v '^#' | sed 's,^.*=\"\(.*\)\",\1,')" - -} - -###### -# routines for manipulating ${DCCC_ENV_FILE} - -dccc_install_env() { - [ -f ${DCCC_OLD_ENV} ] && mv ${DCCC_OLD_ENV} ${DCCC_ENV_FILE} - [ -f ${DCCC_ENV_FILE} ] && return - einfo "Creating ${DCCC_ENV_FILE}..." - cat <<_EOF_ > ${DCCC_ENV_FILE} || \ - dccc_exit "Unable to create ${DCCC_ENV_FILE}..." -# This file is managed by distcc-config; use it to change these settings. -# DISTCC_VERBOSE is not set -# DISTCC_LOG is not set -# DCCC_PATH is not set -_EOF_ -} - -dccc_show_env() { - grep -v '^#' ${DCCC_ENV_FILE} | sed -e 's,^,export ,' -} - -dccc_test_env() { - dccc_show_env | grep "$1" | tail -n1 | sed -e "s,${1}=,," -} - -dccc_load_defaults() { - rm -f ${DCCC_ENV_FILE} - dccc_install_env -} - -dccc_set_env() { - local xxENV="${1}" - shift - dccc_install_env - mv -f ${DCCC_ENV_FILE} ${DCCC_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}[= ]" ${DCCC_ENV_FILE}.tmp - if [ -n "${*}" ]; then - echo "${xxENV}=\"${*}\"" - else - echo "# ${xxENV} is not set" - fi - } >> ${DCCC_ENV_FILE} - rm -f ${DCCC_ENV_FILE}.tmp -} -dccc_regen_env() { - env-update - if [ -z "${DCCC_NO_WARN}" ]; then - einfo "If you want to use these new settings in an existing shell," - einfo "you need to 'source /etc/profile' to get the changes." - fi -} - -dccc_get_env() { - if [ -f ${DCCC_ENV_FILE} ]; then - local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \ - grep -v '^#' | tail -n1)" - echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,' - elif [ -n "${2}" ]; then - echo "${2}" - fi -} - -dccc_set_hosts() { - echo "${*}" > $DCCC_HOSTS_FILE -} -dccc_get_hosts() { - cat $DCCC_HOSTS_FILE -} - -dccc_set_verbose() { - dccc_set_env DISTCC_VERBOSE ${1} - dccc_regen_env -} -dccc_get_verbose() { - dccc_get_env DISTCC_VERBOSE -} - -dccc_set_log() { - dccc_set_env DISTCC_LOG ${1} - dccc_regen_env -} -dccc_get_log() { - dccc_get_env DISTCC_LOG -} - -dccc_set_j() { - local j="$(echo ${1} | sed -e 's,[^0-9],,g')" - [ -z "${j}" ] && \ - dccc_exit "$0: invalid -j option (must be a number)" - dccc_set_env MAKEOPTS "-j${j}" - dccc_regen_env -} -dccc_get_j() { - dccc_get_env MAKEOPTS -} - -#### -# main install routine - -dccc_install() { - local xxCHOST - dccc_install_user - dccc_links install "" - for f in make.conf make.globals make.profile/make.defaults - do - xxCHOST="$(dccc_guess_chost /etc/${f})" - if [ -n "${xxCHOST}" ]; then - dccc_links install "${xxCHOST}" - break - fi - done - - dccc_install_env -} - - -### -# main routine - -# helper checks that user has privs -must_be_root() { - if ! is_super_user - then - [ -n "${1}" -a "${1}" = "${2}" ] && return - dccc_exit "$0 $1 must be run by root" - fi -} - - -# The --no-profile-warning option is meant to be used with -# the following helper function (add to ~/.bashrc) -# -# distcc-config() { -# command distcc-config --no-profile-warning "$@" && \ -# source /etc/profile -# } - -if [ "${1}" = "--no-profile-warning" ]; then - DCCC_NO_WARN=1 - shift -fi - -case "${1}" in - --get-* ) - eval "dccc_$(echo ${1} | sed -e 's/^--//;s/-/_/g')" - ;; - --set-* ) - must_be_root "--set-hosts" "${1}" - SET_FUNC="$(echo ${1} | sed -e 's/^--//;s/-/_/g')" - shift - [ "${#}" -eq 0 ] && dccc_exit "argument required" - eval "dccc_${SET_FUNC} ${*}" - ;; - --has-path ) - dccc_test_env DCCC_PATH - ;; - --add-path ) - must_be_root - dccc_set_env DCCC_PATH "/usr/lib/distcc/bin" - dccc_regen_env - if [ -z "${DCCC_NO_WARN}" ]; then - einfo "You must then set PATH=\"${DCCC_PATH}/\${PATH}\"" - fi - ;; - --no-path ) - must_be_root - dccc_set_env DCCC_PATH "" - dccc_regen_env - ;; - --show-env ) - dccc_show_env - ;; - --load-defaults ) - must_be_root - dccc_load_defaults - ;; - --install ) - must_be_root - dccc_install - ;; - --install-user ) - must_be_root - dccc_install_user - ;; - --install-links ) - must_be_root - dccc_links install "${2}" - ;; - --remove-links ) - must_be_root - dccc_links remove "${2}" - ;; - * ) - echo "usage: ${0} --set-hosts DISTCC_HOSTS | --get-hosts" - echo " ${0} --set-verbose { 0 | 1 } | --get-verbose" - echo " ${0} --set-log FILE | --get-log" - echo " ${0} --add-path | --no-path" -# echo " ${0} --install-links | --remove-links } [ CHOST ]" - exit 1 - ;; -esac - diff --git a/sys-devel/distcc/files/2.8/init b/sys-devel/distcc/files/2.8/init deleted file mode 100644 index d89d77125f1a..000000000000 --- a/sys-devel/distcc/files/2.8/init +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.8/init,v 1.2 2003/08/08 20:31:11 lisa Exp $ - -depend() { - need net -} - -start() { - rm -f ${DISTCCD_PIDFILE} - ebegin "Starting distccd" - DISTCC_TMPDIR="${DISTCC_TMPDIR}" \ - PATH="$(gcc-config --get-bin-path):${PATH}" \ - /sbin/start-stop-daemon --start --quiet \ - --startas ${DISTCCD_EXEC} \ - -c distcc --pidfile ${DISTCCD_PIDFILE} \ - -- --pid-file ${DISTCCD_PIDFILE} ${DISTCCD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping distccd" - start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" - rm -f "${DISTCCD_PIDFILE}" - eend $? -} - diff --git a/sys-devel/distcc/files/2.9/001_fix_tmpdir.patch.gz b/sys-devel/distcc/files/2.9/001_fix_tmpdir.patch.gz Binary files differdeleted file mode 100644 index 5258329bdf8c..000000000000 --- a/sys-devel/distcc/files/2.9/001_fix_tmpdir.patch.gz +++ /dev/null diff --git a/sys-devel/distcc/files/2.9/conf b/sys-devel/distcc/files/2.9/conf deleted file mode 100644 index 0c8b4210db64..000000000000 --- a/sys-devel/distcc/files/2.9/conf +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2003 Gentoo Technologies, Inc -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.9/conf,v 1.2 2003/08/08 20:31:11 lisa Exp $ -# distccd configuration file - -# this is the distccd executable -DISTCCD_EXEC=/usr/bin/distccd - -# this is where distccd will store its pid file -DISTCCD_PIDFILE=/var/run/distccd/distccd.pid - -# set this option to run distccd with extra parameters -# Default port is 3632. For most people the default is okay. -# DISTCCD_OPTS="--nice 20 --port 3632" - -# This is the path that distccd and the monitors will look -# for the state files. -DISTCC_TMPDIR="" diff --git a/sys-devel/distcc/files/2.9/distcc-config b/sys-devel/distcc/files/2.9/distcc-config deleted file mode 100644 index bf999702033b..000000000000 --- a/sys-devel/distcc/files/2.9/distcc-config +++ /dev/null @@ -1,324 +0,0 @@ -#!/bin/bash -# -# distcc-config - helper script for distcc and distccd -# -# Copyright 2003 Superlucidity Services, LLC -# This program licensed under the GNU GPL version 2. -# -# This script developed by Zachary T Welch at Superlucidity Services, LLC -# based on ideas from irc discussion and the clear need for this support -# -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.9/distcc-config,v 1.2 2004/01/05 23:23:10 robbat2 Exp $ -# Changelog -# -# 21 Jul 2003 - Changed install environment to EXCLUDE DISTCC_HOSTS from /etc/env.d/02distcc. -# The hosts are stored by default to /etc/distcc/hosts. <lisa@gentoo.org> - -[ -z "${ROOT}" ] && ROOT=/ - -# distcc-config manges the DISTCC_{HOSTS,LOG,VERBOSE} settings here -# moved to accomodate 02ccache and leave 0[14]* free -DCCC_ENV_FILE="${ROOT}etc/env.d/02distcc" -DCCC_OLD_ENV="${ROOT}etc/env.d/04distcc" - -is_super_user() { - [ "$(id -u)" = 0 ] -} -# this should be getopt'd someday (override with DCCC_QUIET) -DCCC_VERBOSE=1 - -source /sbin/functions.sh - -dccc_echo() { - [ -z "${DCCC_QUIET}" -a -n "${DCCC_VERBOSE}" ] && echo "$*" -} -dccc_exit() { - dccc_echo "$*" - exit 1 -} - -# create the appropriate configuration directory -is_super_user && \ - DCCC_HOSTS_FILE="${ROOT}etc/distcc/hosts" || \ - DCCC_HOSTS_FILE="${ROOT}${HOME#/}/.distcc/hosts" -mkdir -p $(dirname ${DCCC_HOSTS_FILE}) || \ - dccc_exit "unable to create configuration directory" - - -### -# the following functions manage the distcc symlinks -# they allow the user or other scripts (namely gcc-config) to -# automatically update distcc's links when upgrading toolchains -# -dccc_remove_link() { - local t="${ROOT}usr/lib/distcc/bin/${1}" - if [ -L ${t} ]; then - dccc_echo "Removing ${t}..." - rm -f "${t}" - fi -} -dccc_install_link() { - # Search the PATH for the specified compiler - # then create shadow link in ${ROOT}usr/lib/distcc/bin to distcc - # note: this `type' doesn't do the right thing if ROOT != / - if [ -n "$(type -p ${1})" ]; then - # first be sure any old link is removed - DCCC_QUIET=1 dccc_remove_link "${1}" - - # then create the new link - local t="${ROOT}usr/lib/distcc/bin/${1}" - dccc_echo "Creating distcc shadow link: ${t}..." - ln -s /usr/bin/distcc "${t}" - fi -} -dccc_links() { - local a - for a in gcc cc c++ g++ ; do - [ -n "${2}" ] && a="${2}-${a}" - eval "dccc_${1}_link" "${a}" - done -} - -dccc_install_user() { - # update or create, depending on whether user already exists - einfo "Updating or creating distcc user..." - local USERFIX - id distcc >/dev/null 2>&1 && USERFIX=usermod || USERFIX=useradd - USERFIX="/usr/sbin/${USERFIX}" - if [ -x "${USERFIX}" ] - then - if ! ${USERFIX} -g daemon -s /bin/false -d /dev/null \ - -c "distccd" distcc - then - dccc_exit "unable to create or modify user" - fi - elif [ "${USERFIX}" = "/usr/sbin/useradd" ] - then - ewarn "${USERFIX} not found: You need to add the distcc user" - ewarn "to /etc/passwd by hand. Add the following line:\n" - ewarn " distcc:x:240:2:distccd:/dev/null:/bin/false\n" - ewarn "and then run 'distcc-config --install' again root." - dccc_exit "Unable to create distcc user!" - fi - - for d in ${ROOT}usr/lib/distcc/bin ${ROOT}var/run/distccd ; do - einfo "Configuring $d..." - chown distcc:daemon $d && chmod 0755 $d || \ - dccc_exit "Unable to configure ${d}!" - done -} - -dccc_guess_chost() { - echo "$(grep CHOST /etc/make.conf | \ - grep -v '^#' | sed 's,^.*=\"\(.*\)\",\1,')" - -} - -###### -# routines for manipulating ${DCCC_ENV_FILE} - -dccc_install_env() { - [ -f ${DCCC_OLD_ENV} ] && mv ${DCCC_OLD_ENV} ${DCCC_ENV_FILE} - [ -f ${DCCC_ENV_FILE} ] && return - einfo "Creating ${DCCC_ENV_FILE}..." - cat <<_EOF_ > ${DCCC_ENV_FILE} || \ - dccc_exit "Unable to create ${DCCC_ENV_FILE}..." -# This file is managed by distcc-config; use it to change these settings. -# DISTCC_VERBOSE is not set -# DISTCC_LOG is not set -# DCCC_PATH is not set -_EOF_ -} - -dccc_show_env() { - grep -v '^#' ${DCCC_ENV_FILE} | sed -e 's,^,export ,' -} - -dccc_test_env() { - dccc_show_env | grep "$1" | tail -n1 | sed -e "s,${1}=,," -} - -dccc_load_defaults() { - rm -f ${DCCC_ENV_FILE} - dccc_install_env -} - -dccc_set_env() { - local xxENV="${1}" - shift - dccc_install_env - mv -f ${DCCC_ENV_FILE} ${DCCC_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}[= ]" ${DCCC_ENV_FILE}.tmp - if [ -n "${*}" ]; then - echo "${xxENV}=\"${*}\"" - else - echo "# ${xxENV} is not set" - fi - } >> ${DCCC_ENV_FILE} - rm -f ${DCCC_ENV_FILE}.tmp -} -dccc_regen_env() { - env-update - if [ -z "${DCCC_NO_WARN}" ]; then - einfo "If you want to use these new settings in an existing shell," - einfo "you need to 'source /etc/profile' to get the changes." - fi -} - -dccc_get_env() { - if [ -f ${DCCC_ENV_FILE} ]; then - local xxENV="$(grep ${1} ${DCCC_ENV_FILE} | \ - grep -v '^#' | tail -n1)" - echo ${xxENV#*=} | sed -e 's,^",,;s,"$,,' - elif [ -n "${2}" ]; then - echo "${2}" - fi -} - -dccc_set_hosts() { - echo "${*}" > $DCCC_HOSTS_FILE -} -dccc_get_hosts() { - cat $DCCC_HOSTS_FILE -} - -dccc_set_verbose() { - dccc_set_env DISTCC_VERBOSE ${1} - dccc_regen_env -} -dccc_get_verbose() { - dccc_get_env DISTCC_VERBOSE -} - -dccc_set_log() { - dccc_set_env DISTCC_LOG ${1} - dccc_regen_env -} -dccc_get_log() { - dccc_get_env DISTCC_LOG -} - -dccc_set_j() { - local j="$(echo ${1} | sed -e 's,[^0-9],,g')" - [ -z "${j}" ] && \ - dccc_exit "$0: invalid -j option (must be a number)" - dccc_set_env MAKEOPTS "-j${j}" - dccc_regen_env -} -dccc_get_j() { - dccc_get_env MAKEOPTS -} - -#### -# main install routine - -dccc_install() { - local xxCHOST - dccc_install_user - dccc_links install "" - for f in make.conf make.globals make.profile/make.defaults - do - xxCHOST="$(dccc_guess_chost /etc/${f})" - if [ -n "${xxCHOST}" ]; then - dccc_links install "${xxCHOST}" - break - fi - done - - dccc_install_env -} - - -### -# main routine - -# helper checks that user has privs -must_be_root() { - if ! is_super_user - then - [ -n "${1}" -a "${1}" = "${2}" ] && return - dccc_exit "$0 $1 must be run by root" - fi -} - - -# The --no-profile-warning option is meant to be used with -# the following helper function (add to ~/.bashrc) -# -# distcc-config() { -# command distcc-config --no-profile-warning "$@" && \ -# source /etc/profile -# } - -if [ "${1}" = "--no-profile-warning" ]; then - DCCC_NO_WARN=1 - shift -fi - -case "${1}" in - --get-* ) - eval "dccc_$(echo ${1} | sed -e 's/^--//;s/-/_/g')" - ;; - --set-* ) - must_be_root "--set-hosts" "${1}" - SET_FUNC="$(echo ${1} | sed -e 's/^--//;s/-/_/g')" - shift - [ "${#}" -eq 0 ] && dccc_exit "argument required" - eval "dccc_${SET_FUNC} ${*}" - ;; - --has-path ) - dccc_test_env DCCC_PATH - ;; - --add-path ) - must_be_root - dccc_set_env DCCC_PATH "/usr/lib/distcc/bin" - dccc_regen_env - if [ -z "${DCCC_NO_WARN}" ]; then - einfo "You must then set PATH=\"${DCCC_PATH}/\${PATH}\"" - fi - ;; - --no-path ) - must_be_root - dccc_set_env DCCC_PATH "" - dccc_regen_env - ;; - --show-env ) - dccc_show_env - ;; - --load-defaults ) - must_be_root - dccc_load_defaults - ;; - --install ) - must_be_root - dccc_install - ;; - --install-user ) - must_be_root - dccc_install_user - ;; - --install-links ) - must_be_root - dccc_links install "${2}" - ;; - --remove-links ) - must_be_root - dccc_links remove "${2}" - ;; - * ) - echo "usage: ${0} --set-hosts DISTCC_HOSTS | --get-hosts" - echo " ${0} --set-verbose { 0 | 1 } | --get-verbose" - echo " ${0} --set-log FILE | --get-log" - echo " ${0} --add-path | --no-path" -# echo " ${0} --install-links | --remove-links } [ CHOST ]" - exit 1 - ;; -esac - diff --git a/sys-devel/distcc/files/2.9/init b/sys-devel/distcc/files/2.9/init deleted file mode 100644 index 7241a1eefc64..000000000000 --- a/sys-devel/distcc/files/2.9/init +++ /dev/null @@ -1,26 +0,0 @@ -#!/sbin/runscript -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/files/2.9/init,v 1.2 2003/08/08 20:31:11 lisa Exp $ - -depend() { - need net -} - -start() { - rm -f ${DISTCCD_PIDFILE} - ebegin "Starting distccd" - DISTCC_TMPDIR="${DISTCC_TMPDIR}" \ - PATH="$(gcc-config --get-bin-path):${PATH}" \ - /sbin/start-stop-daemon --start --quiet \ - --startas ${DISTCCD_EXEC} \ - -c distcc --pidfile ${DISTCCD_PIDFILE} \ - -- --pid-file ${DISTCCD_PIDFILE} ${DISTCCD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping distccd" - start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" - rm -f "${DISTCCD_PIDFILE}" - eend $? -} - diff --git a/sys-devel/distcc/files/digest-distcc-2.11.1 b/sys-devel/distcc/files/digest-distcc-2.11.1 deleted file mode 100644 index 078e2ae837ea..000000000000 --- a/sys-devel/distcc/files/digest-distcc-2.11.1 +++ /dev/null @@ -1 +0,0 @@ -MD5 7b096504d7ef4805d30b0638224c7f46 distcc-2.11.1.tar.bz2 251577 diff --git a/sys-devel/distcc/files/digest-distcc-2.11.2 b/sys-devel/distcc/files/digest-distcc-2.11.2 deleted file mode 100644 index d210bdc6c35d..000000000000 --- a/sys-devel/distcc/files/digest-distcc-2.11.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 034bc9c36bd5c3d9c26241600510927b distcc-2.11.2.tar.bz2 253066 diff --git a/sys-devel/distcc/files/digest-distcc-2.11.2-r1 b/sys-devel/distcc/files/digest-distcc-2.11.2-r1 deleted file mode 100644 index d210bdc6c35d..000000000000 --- a/sys-devel/distcc/files/digest-distcc-2.11.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 034bc9c36bd5c3d9c26241600510927b distcc-2.11.2.tar.bz2 253066 diff --git a/sys-devel/distcc/files/digest-distcc-2.8-r2 b/sys-devel/distcc/files/digest-distcc-2.8-r2 deleted file mode 100644 index 9943b1256d40..000000000000 --- a/sys-devel/distcc/files/digest-distcc-2.8-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 da86497ab23f34a8630a2758d3c1b8cc distcc-2.8.tar.bz2 235859 diff --git a/sys-devel/distcc/files/digest-distcc-2.9 b/sys-devel/distcc/files/digest-distcc-2.9 deleted file mode 100644 index 3b38ccc367cd..000000000000 --- a/sys-devel/distcc/files/digest-distcc-2.9 +++ /dev/null @@ -1 +0,0 @@ -MD5 fa4cbb8dbebb0d87b0d1da7d2d34bf57 distcc-2.9.tar.bz2 237390 |