2.18 and 2.18.2 are obsoleted by 2.18.3. a 2.18.3-r1 will be around real soon now that uses eutils to add a user.

7 files changed, 17 insertions, 168 deletions

diff --git a/sys-devel/distcc/ChangeLog b/sys-devel/distcc/ChangeLog
index 963f2918a644..b682a7c6fa64 100644
--- a/sys-devel/distcc/ChangeLog
+++ b/sys-devel/distcc/ChangeLog
@@ -1,6 +1,16 @@
 # 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.127 2004/11/24 11:58:00 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/ChangeLog,v 1.128 2004/12/14 21:12:41 lisa Exp $
+
+*distcc-2.18.3 (14 Dec 2004)
+
+  14 Dec 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.18.2.ebuild,
+  +distcc-2.18.3.ebuild, -distcc-2.18.ebuild:
+  version bump, too
+
+  14 Dec 2004; Lisa Seelye <lisa@gentoo.org> -distcc-2.18.2.ebuild,
+  -distcc-2.18.ebuild:
+  2.18 and 2.18.2 are outdated by 2.18.3
 
   24 Nov 2004; Hardave Riar <hardave@gentoo.org> distcc-2.16-r2.ebuild,
   distcc-2.18.2.ebuild:
diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest
index 7501731361a4..363677800172 100644
--- a/sys-devel/distcc/Manifest
+++ b/sys-devel/distcc/Manifest
@@ -1,14 +1,12 @@
+MD5 15573b0990d99230ea3d9b86a00eee2f ChangeLog 23391
 MD5 fdc538f8cbd4354cd059f94668bcfef3 distcc-2.16-r2.ebuild 4847
-MD5 b634e8c42c191a882dab36a1e1fddd7b distcc-2.17-r1.ebuild 5169
-MD5 a2ab277352c124e91d48f2a70b257c16 distcc-2.18.ebuild 4984
-MD5 a914cefac4802acd27753c203b223eee distcc-2.18.2.ebuild 4803
-MD5 a284a961bf2523cceb7ec5357e25d194 ChangeLog 23096
+MD5 975fbc3229c9cf07eaa01627c02af0e2 distcc-2.18.3.ebuild 4800
 MD5 70619e7eb5fa4fd0aa4f3588579cd50d metadata.xml 443
+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 fec77b3be8d8bd8f2d6e5a708cb35717 files/distcc-config 4874
-MD5 8909ee9939e4da6c5649e91e9208fdc1 files/digest-distcc-2.18.2 66
-MD5 d846f3713232d9c263e6adbfdd521b02 files/digest-distcc-2.18 64
 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
diff --git a/sys-devel/distcc/distcc-2.18.2.ebuild b/sys-devel/distcc/distcc-2.18.3.ebuild
index 52a2e5c83e47..b400b55328f0 100644
--- a/sys-devel/distcc/distcc-2.18.2.ebuild
+++ b/sys-devel/distcc/distcc-2.18.3.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2004/11/24 11:58:00 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-devel/distcc/distcc-2.18.3.ebuild,v 1.1 2004/12/14 21:12:41 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.18.ebuild b/sys-devel/distcc/distcc-2.18.ebuild
deleted file mode 100644
index b56effa4864c..000000000000
--- a/sys-devel/distcc/distcc-2.18.ebuild
+++ /dev/null
@@ -1,158 +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.ebuild,v 1.2 2004/10/29 00:43:24 vapier 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
-	dev-util/pkgconfig"
-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
-		>=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}
-	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/files/digest-distcc-2.18 b/sys-devel/distcc/files/digest-distcc-2.18
deleted file mode 100644
index a3d04bc07f68..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.18
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a55b547d4ff62d8500e290b82671db50 distcc-2.18.tar.bz2 339939
diff --git a/sys-devel/distcc/files/digest-distcc-2.18.2 b/sys-devel/distcc/files/digest-distcc-2.18.2
deleted file mode 100644
index a93a40a3c5c4..000000000000
--- a/sys-devel/distcc/files/digest-distcc-2.18.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 38b2291e085db59be518594bd7d74b07 distcc-2.18.2.tar.bz2 340542
diff --git a/sys-devel/distcc/files/digest-distcc-2.18.3 b/sys-devel/distcc/files/digest-distcc-2.18.3
new file mode 100644
index 000000000000..7f1ca5e12714
--- /dev/null
+++ b/sys-devel/distcc/files/digest-distcc-2.18.3
@@ -0,0 +1 @@
+MD5 0d6b80a1efc3a3d816c4f4175f63eaa2 distcc-2.18.3.tar.bz2 341601