summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLisa M. Seelye <lisa@gentoo.org>2005-01-12 06:30:25 +0000
committerLisa M. Seelye <lisa@gentoo.org>2005-01-12 06:30:25 +0000
commitcbca5ad5a12bff8734f77f7cd5fea12989f825ed (patch)
treeec1cb6460c7f37bc9673428b7975260999d47c32
parentremove distcc-2.18.3-r1 (test period over) (diff)
downloadhistorical-cbca5ad5a12bff8734f77f7cd5fea12989f825ed.tar.gz
historical-cbca5ad5a12bff8734f77f7cd5fea12989f825ed.tar.bz2
historical-cbca5ad5a12bff8734f77f7cd5fea12989f825ed.zip
Removed 2.18.3-r1 from p.mask and 2.17-r1 from the repository: no point in it, especially since users with ~arch will get 2.18.3 anyways. Also cleaned up the message in 2.18.3-r1
-rw-r--r--sys-devel/distcc/ChangeLog9
-rw-r--r--sys-devel/distcc/Manifest11
-rw-r--r--sys-devel/distcc/distcc-2.16-r2.ebuild4
-rw-r--r--sys-devel/distcc/distcc-2.17-r1.ebuild163
-rw-r--r--sys-devel/distcc/distcc-2.18.3-r1.ebuild13
-rw-r--r--sys-devel/distcc/distcc-2.18.3.ebuild163
-rw-r--r--sys-devel/distcc/files/2.17/2.17-ipv6-fix.diff.gzbin237 -> 0 bytes
-rw-r--r--sys-devel/distcc/files/digest-distcc-2.17-r11
-rw-r--r--sys-devel/distcc/files/digest-distcc-2.18.31
9 files changed, 16 insertions, 349 deletions
diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 4cb4a4ad150c..05d678e6aa0d 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for sys-devel/distcc
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.131 2004/12/31 21:28:41 lisa Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.132 2005/01/12 06:30:25 lisa Exp $
+
+ 12 Jan 2005; Lisa Seelye <lisa@gentoo.org> -distcc-2.17-r1.ebuild,
+ -distcc-2.18.3.ebuild:
+ Removed 2.18.3-r1 from p.mask and 2.17-r1 from the repository: no point in
+ it, especially since users with ~arch will get 2.18.3 anyways.
31 Dec 2004; Lisa Seelye <lisa@gentoo.org> :
Added distcc-2.18.3-r1.ebuild with the ABI patch in bug #75420. this release
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index d1a08e390b66..bac82d35c5bf 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,17 +1,12 @@
-MD5 efd3b8edc07358a752399e7a5ee4601b ChangeLog 23928
-MD5 4f19a7fd4494273142eabb9752a63f55 distcc-2.18.3-r1.ebuild 5121
-MD5 fdc538f8cbd4354cd059f94668bcfef3 distcc-2.16-r2.ebuild 4847
-MD5 19d88c612c82c68e8c9393933cc02646 distcc-2.18.3.ebuild 5008
+MD5 429deece7578777d6f00428a8177b2e7 ChangeLog 24165
+MD5 09886e721dd720a9bae16853ece7036a distcc-2.18.3-r1.ebuild 4786
+MD5 226fbaefb55345566d2a38d00f6dc160 distcc-2.16-r2.ebuild 4844
MD5 c04441917ccb5e5f9790642545c1f469 metadata.xml 375
-MD5 b634e8c42c191a882dab36a1e1fddd7b distcc-2.17-r1.ebuild 5169
MD5 c462167d99c154e9f8b9f94022ed2a71 files/digest-distcc-2.16-r2 64
-MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3 66
-MD5 af5f3983a736bd552e83d92ac9955a03 files/digest-distcc-2.17-r1 64
MD5 d939dfd2b17a6e52a1519151c4619dcf files/distcc-gentoo-multilib.patch 3780
MD5 fec77b3be8d8bd8f2d6e5a708cb35717 files/distcc-config 4874
MD5 fa3f7ab9f7829ba28b454f624b11da53 files/digest-distcc-2.18.3-r1 66
MD5 69a089566bd18a1bfba2da639964c19e files/2.17/conf 1317
MD5 1161999a5d25185f95a8c284bd7307d1 files/2.17/init 733
-MD5 a053c2281c30835b1025f307b09b78ae files/2.17/2.17-ipv6-fix.diff.gz 237
MD5 bb53a18e009ef62f4402a23f83bfda20 files/2.18/conf 1384
MD5 739ebfc62fe125b76021cf7987a158f7 files/2.18/init 733
diff --git a/sys-devel/distcc/distcc-2.16-r2.ebuild b/sys-devel/distcc/distcc-2.16-r2.ebuild
index 2cf0cb32d91d..20d279af9f37 100644
--- a/sys-devel/distcc/distcc-2.16-r2.ebuild
+++ b/sys-devel/distcc/distcc-2.16-r2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.5 2004/11/24 11:58:00 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.16-r2.ebuild,v 1.6 2005/01/12 06:30:25 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
diff --git a/sys-devel/distcc/distcc-2.17-r1.ebuild b/sys-devel/distcc/distcc-2.17-r1.ebuild
deleted file mode 100644
index b3e3244edc6e..000000000000
--- a/sys-devel/distcc/distcc-2.17-r1.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.17-r1.ebuild,v 1.6 2004/09/22 18:32:03 pvdabeel 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.17"
-
-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"
-# ATTN s390 MAINTANER: if you bump this stable on s390 please remove 2.14 from cvs -lisa
-# 2004-07-08
-
-
-IUSE="gnome gtk selinux ipv6"
-
-DEPEND=">=sys-apps/portage-2.0.49-r6
- >=sys-devel/gcc-config-1.3.1
- sys-apps/shadow
- dev-util/pkgconfig"
-RDEPEND="
- !arm? ( !mips? ( !s390? (
- 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}
- epatch ${FILESDIR}/${PATCHLEVEL}/2.17-ipv6-fix.diff.gz
- 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 && ! use mips && myconf="${myconf} --with-gtk"
- use gtk && use gnome && ! use mips && myconf="${myconf} --with-gnome"
- use mips && use gtk || use gnome && ewarn "X support for Mips has been disabled."
- #Above, mips is excluded due to version issues. 2004-02-20
-
- [ `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
- einfo "${D}"
- 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() {
- # 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"
- 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"
-
- 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-r1.ebuild b/sys-devel/distcc/distcc-2.18.3-r1.ebuild
index 4fb4050b00e9..3df000c357e7 100644
--- a/sys-devel/distcc/distcc-2.18.3-r1.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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-r1.ebuild,v 1.1 2004/12/31 21:28:41 lisa Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3-r1.ebuild,v 1.2 2005/01/12 06:30:25 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
@@ -51,8 +51,7 @@ src_unpack() {
# 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!"
- ebeep 3
+ einfo "Please report to bug #75420 success or failure of this patch."
gnuconfig_update
}
@@ -114,6 +113,7 @@ pkg_preinst() {
}
pkg_postinst() {
+ enewuser distcc 240
# handle DISTCC_HOSTS upgrade better
local ENVFILE
ENVFILE="${ROOT}etc/env.d/02distcc"
@@ -147,11 +147,6 @@ pkg_postinst() {
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"
diff --git a/sys-devel/distcc/distcc-2.18.3.ebuild b/sys-devel/distcc/distcc-2.18.3.ebuild
deleted file mode 100644
index 95639afad132..000000000000
--- a/sys-devel/distcc/distcc-2.18.3.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2004 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.ebuild,v 1.3 2004/12/28 08:49:55 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}
-
- # Commented out pending lisa's approval, since I'm not the maintainer.
- # See bug #75420 --eradicator
- #epatch ${FILESDIR}/distcc-gentoo-multilib.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
- einfo "${D}"
- 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() {
- # 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"
- 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"
-
- 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/2.17/2.17-ipv6-fix.diff.gz b/sys-devel/distcc/files/2.17/2.17-ipv6-fix.diff.gz
deleted file mode 100644
index 26d165f8eb8b..000000000000
--- a/sys-devel/distcc/files/2.17/2.17-ipv6-fix.diff.gz
+++ /dev/null
Binary files differ
diff --git a/sys-devel/distcc/files/digest-distcc-2.17-r1 b/sys-devel/distcc/files/digest-distcc-2.17-r1
deleted file mode 100644
index 26143c9d7cf5..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.17-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 8ac5c032cde68c525afe9f53eae5cbf7 distcc-2.17.tar.bz2 339527
diff --git a/sys-devel/distcc/files/digest-distcc-2.18.3 b/sys-devel/distcc/files/digest-distcc-2.18.3
deleted file mode 100644
index 7f1ca5e12714..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.18.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 341601