From 01f9c3c8d9220b1fc985e98e540dc9aca0e1d410 Mon Sep 17 00:00:00 2001 From: "Lisa M. Seelye" Date: Wed, 18 May 2005 10:44:10 +0000 Subject: Edit ebuilds to comply with bug #92745, inherit gcc -> toolchain-funcs. Also do a little cleanup. Arches, 2.18.3 has been out for ages, please test if its suitable to bump to stable. --- sys-devel/distcc/ChangeLog | 10 +- sys-devel/distcc/Manifest | 16 +-- sys-devel/distcc/distcc-2.16-r2.ebuild | 4 +- sys-devel/distcc/distcc-2.18.3-r2.ebuild | 160 ------------------------- sys-devel/distcc/distcc-2.18.3-r4.ebuild | 160 ------------------------- sys-devel/distcc/distcc-2.18.3-r5.ebuild | 153 ----------------------- sys-devel/distcc/distcc-2.18.3-r6.ebuild | 154 ++++++++++++++++++++++++ sys-devel/distcc/files/digest-distcc-2.18.3-r2 | 1 - sys-devel/distcc/files/digest-distcc-2.18.3-r4 | 1 - sys-devel/distcc/files/digest-distcc-2.18.3-r5 | 1 - sys-devel/distcc/files/digest-distcc-2.18.3-r6 | 1 + 11 files changed, 175 insertions(+), 486 deletions(-) delete mode 100644 sys-devel/distcc/distcc-2.18.3-r2.ebuild delete mode 100644 sys-devel/distcc/distcc-2.18.3-r4.ebuild delete mode 100644 sys-devel/distcc/distcc-2.18.3-r5.ebuild create mode 100644 sys-devel/distcc/distcc-2.18.3-r6.ebuild delete mode 100644 sys-devel/distcc/files/digest-distcc-2.18.3-r2 delete mode 100644 sys-devel/distcc/files/digest-distcc-2.18.3-r4 delete mode 100644 sys-devel/distcc/files/digest-distcc-2.18.3-r5 create mode 100644 sys-devel/distcc/files/digest-distcc-2.18.3-r6 diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog index d7a76f4834f2..6f90c6c43927 100644 --- a/sys-devel/distcc/ChangeLog +++ b/sys-devel/distcc/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for sys-devel/distcc # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.139 2005/05/09 03:19:15 agriffis Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.140 2005/05/18 10:44:10 lisa Exp $ + +*distcc-2.18.3-r6 (18 May 2005) + + 18 May 2005; Lisa Seelye distcc-2.16-r2.ebuild, + -distcc-2.18.3-r2.ebuild, -distcc-2.18.3-r4.ebuild, + -distcc-2.18.3-r5.ebuild, +distcc-2.18.3-r6.ebuild: + Edit ebuilds to comply with bug #92745, inherit gcc -> toolchain-funcs. Also + do a little cleanup. 09 May 2005; Aron Griffis distcc-2.18.3-r2.ebuild: stable on ia64 diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index 499612830604..d459996f0399 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -1,16 +1,18 @@ -MD5 71814b963a24a7fd295433932da974b1 distcc-2.18.3-r4.ebuild 4795 -MD5 226fbaefb55345566d2a38d00f6dc160 distcc-2.16-r2.ebuild 4844 -MD5 4d624398dfce16bcb68bb43e3c952b74 distcc-2.18.3-r5.ebuild 4562 MD5 56d0854f22a4be5ddad7dd6738b634a2 ChangeLog 25452 -MD5 c04441917ccb5e5f9790642545c1f469 metadata.xml 375 +MD5 226fbaefb55345566d2a38d00f6dc160 distcc-2.16-r2.ebuild 4844 MD5 fb77a9dd100229eff867e223f57361b0 distcc-2.18.3-r2.ebuild 4788 +MD5 71814b963a24a7fd295433932da974b1 distcc-2.18.3-r4.ebuild 4795 +MD5 c04441917ccb5e5f9790642545c1f469 metadata.xml 375 +MD5 4d624398dfce16bcb68bb43e3c952b74 distcc-2.18.3-r5.ebuild 4562 +MD5 9590da00d0ebb8f8cfaf3325298f5e28 distcc-2.18.3-r6.ebuild 4595 +MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r2 64 MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r2 66 MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r4 66 -MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r5 66 -MD5 ec06b50c03c5002d4df60e49b9798445 files/distcc-gentoo-multilib-r1.patch 4245 -MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r2 64 MD5 fec77b3be8d8bd8f2d6e5a708cb35717 files/distcc-config 4874 +MD5 ec06b50c03c5002d4df60e49b9798445 files/distcc-gentoo-multilib-r1.patch 4245 MD5 687a622f11f457581b267ce5fb3c2721 files/distcc-gentoo-multilib.patch 3784 +MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r5 66 +MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r6 66 MD5 69a089566bd18a1bfba2da639964c19e files/2.17/conf 1317 MD5 1161999a5d25185f95a8c284bd7307d1 files/2.17/init 733 MD5 bb53a18e009ef62f4402a23f83bfda20 files/2.18/conf 1384 diff --git a/sys-devel/distcc/distcc-2.16-r2.ebuild b/sys-devel/distcc/distcc-2.16-r2.ebuild index 20d279af9f37..04d81c1e2dd2 100644 --- a/sys-devel/distcc/distcc-2.16-r2.ebuild +++ b/sys-devel/distcc/distcc-2.16-r2.ebuild @@ -1,11 +1,11 @@ # Copyright 1999-2005 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16-r2.ebuild,v 1.6 2005/01/12 06:30:25 lisa Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16-r2.ebuild,v 1.7 2005/05/18 10:44:10 lisa Exp $ # If you change this in any way please email lisa@gentoo.org and make an # entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye -inherit eutils gcc flag-o-matic gnuconfig +inherit eutils flag-o-matic gnuconfig toolchain-funcs PATCHLEVEL="2.17" diff --git a/sys-devel/distcc/distcc-2.18.3-r2.ebuild b/sys-devel/distcc/distcc-2.18.3-r2.ebuild deleted file mode 100644 index 40ab0890a378..000000000000 --- a/sys-devel/distcc/distcc-2.18.3-r2.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r2.ebuild,v 1.2 2005/05/09 03:19:15 agriffis Exp $ - -# If you change this in any way please email lisa@gentoo.org and make an -# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye - -inherit eutils gcc flag-o-matic gnuconfig - -PATCHLEVEL="2.18" - -DESCRIPTION="a program to distribute compilation of C code across several machines on a network" -HOMEPAGE="http://distcc.samba.org/" -SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~s390 ~sparc ~x86" - -IUSE="gnome gtk selinux ipv6" - -DEPEND=">=sys-apps/portage-2.0.49-r6 - >=sys-devel/gcc-config-1.3.1 - sys-apps/shadow - gnome? ( - dev-util/pkgconfig - ) - gtk? ( - dev-util/pkgconfig - )" -RDEPEND=" - 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 - >=gnome-base/gconf-2.0.0 - ) - gtk? ( - >=x11-libs/gtk+-2.0.0 - x11-libs/pango - ) - selinux? ( sec-policy/selinux-distcc )" - -src_unpack() { - unpack ${A} - cd ${S} - - # lisa's note: included for testing. if you wish to use this - # please put distcc in your package.unmask file. - # See bug #75420 for more multilib stuff - epatch ${FILESDIR}/distcc-gentoo-multilib.patch - einfo "Please report to bug #75420 success or failure of this patch." - gnuconfig_update -} - -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" - - [ `gcc-major-version` -eq 2 ] && filter-lfs-flags - - if use ipv6; then - ewarn "To use IPV6 you must have IPV6 compiled into your kernel" - ewarn "either via a module or compiled code" - ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc" - myconf=" ${myconf} --enable-rfc2553 " - epause 5 - fi - 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}/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 -} - -pkg_postinst() { - enewuser distcc 240 - # 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 "Setting permissions on ${ROOT}var/run/distccd" - chown -R distcc:daemon ${ROOT}var/run/distccd - echo "" - - 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 " DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N" - use gnome || use gtk && einfo "Or: DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome" - - ewarn "***SECURITY NOTICE***" - ewarn "If you are upgrading distcc please make sure to run etc-update to" - ewarn "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" - ewarn "added security precautions (the --listen and --allow directives)" - ebeep 5 -} diff --git a/sys-devel/distcc/distcc-2.18.3-r4.ebuild b/sys-devel/distcc/distcc-2.18.3-r4.ebuild deleted file mode 100644 index 5e937952cf4e..000000000000 --- a/sys-devel/distcc/distcc-2.18.3-r4.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r4.ebuild,v 1.1 2005/02/06 06:09:24 eradicator Exp $ - -# If you change this in any way please email lisa@gentoo.org and make an -# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye - -inherit eutils gcc flag-o-matic gnuconfig - -PATCHLEVEL="2.18" - -DESCRIPTION="a program to distribute compilation of C code across several machines on a network" -HOMEPAGE="http://distcc.samba.org/" -SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~ia64 ~amd64 ~s390" - -IUSE="gnome gtk selinux ipv6" - -DEPEND=">=sys-apps/portage-2.0.49-r6 - >=sys-devel/gcc-config-1.3.1 - sys-apps/shadow - gnome? ( - dev-util/pkgconfig - ) - gtk? ( - dev-util/pkgconfig - )" -RDEPEND=" - 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 - >=gnome-base/gconf-2.0.0 - ) - gtk? ( - >=x11-libs/gtk+-2.0.0 - x11-libs/pango - ) - selinux? ( sec-policy/selinux-distcc )" - -src_unpack() { - unpack ${A} - cd ${S} - - # lisa's note: included for testing. if you wish to use this - # please put distcc in your package.unmask file. - # See bug #75420 for more multilib stuff - epatch ${FILESDIR}/distcc-gentoo-multilib-r1.patch - einfo "Please report to bug #75420 success or failure of this patch." - gnuconfig_update -} - -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" - - [ `gcc-major-version` -eq 2 ] && filter-lfs-flags - - if use ipv6; then - ewarn "To use IPV6 you must have IPV6 compiled into your kernel" - ewarn "either via a module or compiled code" - ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc" - myconf=" ${myconf} --enable-rfc2553 " - epause 5 - fi - 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}/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 -} - -pkg_postinst() { - enewuser distcc 240 - # 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 "Setting permissions on ${ROOT}var/run/distccd" - chown -R distcc:daemon ${ROOT}var/run/distccd - echo "" - - 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 " DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N" - use gnome || use gtk && einfo "Or: DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome" - - ewarn "***SECURITY NOTICE***" - ewarn "If you are upgrading distcc please make sure to run etc-update to" - ewarn "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" - ewarn "added security precautions (the --listen and --allow directives)" - ebeep 5 -} diff --git a/sys-devel/distcc/distcc-2.18.3-r5.ebuild b/sys-devel/distcc/distcc-2.18.3-r5.ebuild deleted file mode 100644 index 33245e3f09f0..000000000000 --- a/sys-devel/distcc/distcc-2.18.3-r5.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r5.ebuild,v 1.1 2005/03/19 14:57:39 lisa Exp $ - -# If you change this in any way please email lisa@gentoo.org and make an -# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye - -inherit eutils gcc flag-o-matic gnuconfig - -PATCHLEVEL="2.18" - -DESCRIPTION="a program to distribute compilation of C code across several machines on a network" -HOMEPAGE="http://distcc.samba.org/" -SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ~ia64 ~amd64 ~s390" - -IUSE="gnome gtk selinux ipv6" - -DEPEND=">=sys-apps/portage-2.0.49-r6 - >=sys-devel/gcc-config-1.3.1 - sys-apps/shadow - gnome? ( - dev-util/pkgconfig - ) - gtk? ( - dev-util/pkgconfig - )" -RDEPEND=" - 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 - >=gnome-base/gconf-2.0.0 - ) - gtk? ( - >=x11-libs/gtk+-2.0.0 - x11-libs/pango - ) - selinux? ( sec-policy/selinux-distcc )" - -src_unpack() { - unpack ${A} - cd ${S} - - # See bug #75420 for more multilib stuff - epatch ${FILESDIR}/distcc-gentoo-multilib-r1.patch - einfo "Please report to bug #75420 success or failure of this patch." - gnuconfig_update -} - -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" - - [ `gcc-major-version` -eq 2 ] && filter-lfs-flags - - if use ipv6; then - ewarn "To use IPV6 you must have IPV6 compiled into your kernel" - ewarn "either via a module or compiled code" - ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc" - myconf=" ${myconf} --enable-rfc2553 " - epause 5 - fi - 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}/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 -} - -pkg_postinst() { - #are we doing bootstrap with has no useradd? - if [ -x /usr/sbin/useradd ]; then - enewuser distcc 240 - else - ewarn "You do not have useradd (bootstrap) from shadow so I didn't" - ewarn "install the distcc user. Note that attempting to start the daemon" - ewarn "will fail. Please install shadow and re-emerge distcc." - ebeep 2 - fi - - # By now everyone should be using the right envfile - - 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 "Setting permissions on ${ROOT}var/run/distccd" - chown -R distcc:daemon ${ROOT}var/run/distccd - echo "" - - 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 " DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N" - use gnome || use gtk && einfo "Or: DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome" - - ewarn "***SECURITY NOTICE***" - ewarn "If you are upgrading distcc please make sure to run etc-update to" - ewarn "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" - ewarn "added security precautions (the --listen and --allow directives)" - ebeep 5 -} diff --git a/sys-devel/distcc/distcc-2.18.3-r6.ebuild b/sys-devel/distcc/distcc-2.18.3-r6.ebuild new file mode 100644 index 000000000000..77d6a690e866 --- /dev/null +++ b/sys-devel/distcc/distcc-2.18.3-r6.ebuild @@ -0,0 +1,154 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r6.ebuild,v 1.1 2005/05/18 10:44:10 lisa Exp $ + +# If you change this in any way please email lisa@gentoo.org and make an +# entry in the ChangeLog (this means you spanky :P). (2004-04-11) Lisa Seelye + +inherit eutils flag-o-matic gnuconfig toolchain-funcs + +PATCHLEVEL="2.18" + +DESCRIPTION="a program to distribute compilation of C code across several machines on a network" +HOMEPAGE="http://distcc.samba.org/" +SRC_URI="http://distcc.samba.org/ftp/distcc/distcc-${PV}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~arm ~hppa ia64 amd64 ~s390" + +IUSE="gnome gtk selinux ipv6" + +DEPEND=">=sys-apps/portage-2.0.49-r6 + >=sys-devel/gcc-config-1.3.1 + sys-apps/shadow + gnome? ( + dev-util/pkgconfig + ) + gtk? ( + dev-util/pkgconfig + )" +RDEPEND=" + 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 + >=gnome-base/gconf-2.0.0 + ) + gtk? ( + >=x11-libs/gtk+-2.0.0 + x11-libs/pango + ) + selinux? ( sec-policy/selinux-distcc )" + +src_unpack() { + unpack ${A} + cd ${S} + + # See bug #75420 for more multilib stuff + epatch ${FILESDIR}/distcc-gentoo-multilib-r1.patch + einfo "Please report to bug #75420 success or failure of this patch." + gnuconfig_update +} + +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" + + #More legacy stuff? + [ `gcc-major-version` -eq 2 ] && filter-lfs-flags + + if use ipv6; then + ewarn "To use IPV6 you must have IPV6 compiled into your kernel" + ewarn "either via a module or compiled code" + ewarn "You can recompile without ipv6 with: USE='-ipv6' emerge distcc" + myconf=" ${myconf} --enable-rfc2553 " + epause 5 + fi + 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}/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 +} + +pkg_postinst() { + #are we doing bootstrap with has no useradd? + if [ -x /usr/sbin/useradd ]; then + enewuser distcc 240 + else + ewarn "You do not have useradd (bootstrap) from shadow so I didn't" + ewarn "install the distcc user. Note that attempting to start the daemon" + ewarn "will fail. Please install shadow and re-emerge distcc." + ebeep 2 + fi + + # By now everyone should be using the right envfile + + 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 "Setting permissions on ${ROOT}var/run/distccd" + chown -R distcc:daemon ${ROOT}var/run/distccd + echo "" + + 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 " DISTCC_DIR=/var/tmp/portage/.distcc distccmon-text N" + use gnome || use gtk && einfo "Or: DISTCC_DIR=/var/tmp/portage/.distcc distccmon-gnome" + + ewarn "***SECURITY NOTICE***" + ewarn "If you are upgrading distcc please make sure to run etc-update to" + ewarn "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" + ewarn "added security precautions (the --listen and --allow directives)" + ebeep 5 +} diff --git a/sys-devel/distcc/files/digest-distcc-2.18.3-r2 b/sys-devel/distcc/files/digest-distcc-2.18.3-r2 deleted file mode 100644 index 7f1ca5e12714..000000000000 --- a/sys-devel/distcc/files/digest-distcc-2.18.3-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 341601 diff --git a/sys-devel/distcc/files/digest-distcc-2.18.3-r4 b/sys-devel/distcc/files/digest-distcc-2.18.3-r4 deleted file mode 100644 index 7f1ca5e12714..000000000000 --- a/sys-devel/distcc/files/digest-distcc-2.18.3-r4 +++ /dev/null @@ -1 +0,0 @@ -MD5 0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 341601 diff --git a/sys-devel/distcc/files/digest-distcc-2.18.3-r5 b/sys-devel/distcc/files/digest-distcc-2.18.3-r5 deleted file mode 100644 index 7f1ca5e12714..000000000000 --- a/sys-devel/distcc/files/digest-distcc-2.18.3-r5 +++ /dev/null @@ -1 +0,0 @@ -MD5 0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 341601 diff --git a/sys-devel/distcc/files/digest-distcc-2.18.3-r6 b/sys-devel/distcc/files/digest-distcc-2.18.3-r6 new file mode 100644 index 000000000000..7f1ca5e12714 --- /dev/null +++ b/sys-devel/distcc/files/digest-distcc-2.18.3-r6 @@ -0,0 +1 @@ +MD5 0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 341601 -- cgit v1.2.3-65-gdbad