commit: dee8c1cf023188cb2bfe67ed2189016c02941bc3 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Dec 8 11:22:52 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Dec 8 11:25:14 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dee8c1cf
sys-devel/distcc: Drop old Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-devel/distcc/Manifest | 1 - sys-devel/distcc/distcc-3.1-r10.ebuild | 169 -------------- sys-devel/distcc/files/3.0/conf | 40 ---- sys-devel/distcc/files/3.0/distcc-config | 122 ---------- sys-devel/distcc/files/3.1/conf | 35 --- sys-devel/distcc/files/3.1/init | 31 --- sys-devel/distcc/files/distcc-3.1-argc-fix.patch | 17 -- .../distcc/files/distcc-3.1-freedesktop.patch | 76 ------ sys-devel/distcc/files/distcc-3.1-python.patch | 258 --------------------- sys-devel/distcc/files/distcc-config | 164 ------------- 10 files changed, 913 deletions(-) diff --git a/sys-devel/distcc/Manifest b/sys-devel/distcc/Manifest index fecfec3da50..1d4758855f8 100644 --- a/sys-devel/distcc/Manifest +++ b/sys-devel/distcc/Manifest @@ -1,3 +1,2 @@ -DIST distcc-3.1.tar.bz2 588820 BLAKE2B fbd00a9cf8af0b2a0c901a60086901e505d9859827a8249ed7937cb8298fc946f6f72470e40dba17e143dbf1525cb0aef4deec3d083268d608f24f1447301df0 SHA512 0ca7167309badf5d36d2783bab398295b52c43fde0355cf1902032c70b27fc40c21729c98af0ee4c0aeea0c48755e4626308e9385d938b7822de27cdb048e7bd DIST distcc-3.2rc1.tar.bz2 609904 BLAKE2B e6b928f3b9231524d37bdf86b39cd6a3601b6cdb1e03d913ae562286794240b4dd364d5d01da2176f9bb440809b166b4b877443459751adf8bd3ecf92ceb8476 SHA512 98b2e8423d724bbb6a615d946d170441a8e293310785f867d7a277b318c043a37b0af39ae8ed1f7a0667803de9db1d1925199bad85130cf9bd9cb347635125ee DIST distcc-3.3.tar.gz 1171281 BLAKE2B f637cacbfdaaca6efb56e912de55fcfa49e3fffcb8f34649e339f16376250e18a20d30281a46f207992c0b300c726427a3ad5a77bd8976d2993f8f49b9b6b970 SHA512 459c175c8ac905bc70299e77ac11b6d24782bd69c9152126249c9af8fbb4c269e6f7317b02abf50cf6cc0405dd0f887e803320e19dc528a19c4c488640c615dc diff --git a/sys-devel/distcc/distcc-3.1-r10.ebuild b/sys-devel/distcc/distcc-3.1-r10.ebuild deleted file mode 100644 index 49ff6bd8242..00000000000 --- a/sys-devel/distcc/distcc-3.1-r10.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit eutils fdo-mime flag-o-matic multilib python-single-r1 systemd toolchain-funcs user - -DESCRIPTION="Distribute compilation of C code across several machines on a network" -HOMEPAGE="http://distcc.org/"; -SRC_URI="https://distcc.googlecode.com/files/${P}.tar.bz2"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="avahi gtk hardened ipv6 selinux xinetd" - -RESTRICT="test" - -CDEPEND="${PYTHON_DEPS} - dev-libs/popt - avahi? ( >=net-dns/avahi-0.6[dbus] ) - gtk? ( x11-libs/gtk+:2 )" -DEPEND="${CDEPEND} - virtual/pkgconfig" -RDEPEND="${CDEPEND} - !net-misc/pump - >=sys-devel/gcc-config-1.4.1 - selinux? ( sec-policy/selinux-distcc ) - xinetd? ( sys-apps/xinetd )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DISTCC_LOG="" -DCCC_PATH="/usr/$(get_libdir)/distcc/bin" -DISTCC_VERBOSE="0" - -pkg_setup() { - enewuser distcc 240 -1 -1 daemon - python-single-r1_pkg_setup -} - -src_prepare() { - epatch "${FILESDIR}/${PN}-3.0-xinetd.patch" - # bug #253786 - epatch "${FILESDIR}/${PN}-3.0-fix-fortify.patch" - # bug #255188 - epatch "${FILESDIR}/${P}-freedesktop.patch" - # bug #258364 - epatch "${FILESDIR}/${P}-python.patch" - # bug #351979 - epatch "${FILESDIR}/${P}-argc-fix.patch" - epatch_user - - sed -i -e "/PATH/s:\$distcc_location:${DCCC_PATH}:" pump.in || die - - # Bugs #120001, #167844 and probably more. See patch for description. - use hardened && epatch "${FILESDIR}/distcc-hardened.patch" -} - -src_configure() { - local myconf="--disable-Werror --with-docdir=/usr/share/doc/${PF}" - # More legacy stuff? - [ "$(gcc-major-version)" = "2" ] && filter-lfs-flags - - # --disable-rfc2553 b0rked, bug #254176 - use ipv6 && myconf="${myconf} --enable-rfc2553" - - econf \ - $(use_with avahi) \ - $(use_with gtk) \ - ${myconf} -} - -src_install() { - # In rare cases, parallel make install failed - MAKEOPTS+=" -j1" - default - - dobin "${FILESDIR}/3.0/distcc-config" - - newinitd "${FILESDIR}/${PV}/init" distccd - systemd_dounit "${FILESDIR}/distccd.service" - systemd_install_serviced "${FILESDIR}/distccd.service.conf" - - cp "${FILESDIR}/3.1/conf" "${T}/distccd" || die - if use avahi; then - cat >> "${T}/distccd" <<-EOF - - # Enable zeroconf support in distccd - DISTCCD_OPTS="\${DISTCCD_OPTS} --zeroconf" - EOF - - sed -i '/ExecStart/ s|$| --zeroconf|' "${ED}"/usr/lib/systemd/system/distccd.service || die - fi - doconfd "${T}/distccd" - - cat > "${T}/02distcc" <<-EOF - # This file is managed by distcc-config; use it to change these settings. - DISTCC_LOG="${DISTCC_LOG}" - DCCC_PATH="${DCCC_PATH}" - DISTCC_VERBOSE="${DISTCC_VERBOSE}" - EOF - doenvd "${T}/02distcc" - - # create the masquerade directory - dodir "${DCCC_PATH}" - for f in cc c++ gcc g++; do - dosym /usr/bin/distcc "${DCCC_PATH}/${f}" - if [ "${f}" != "cc" ]; then - dosym /usr/bin/distcc "${DCCC_PATH}/${CTARGET:-${CHOST}}-${f}" - fi - done - - if use gtk; then - einfo "Renaming /usr/bin/distccmon-gnome to /usr/bin/distccmon-gui" - einfo "This is to have a little sensability in naming schemes between distccmon programs" - mv "${ED}/usr/bin/distccmon-gnome" "${ED}/usr/bin/distccmon-gui" || die - dosym distccmon-gui /usr/bin/distccmon-gnome - fi - - if use xinetd; then - insinto /etc/xinetd.d - newins "doc/example/xinetd" distcc - fi - - rm -rf "${ED}/etc/default" || die - rm -f "${ED}/etc/distcc/clients.allow" || die - rm -f "${ED}/etc/distcc/commands.allow.sh" || die - - python_fix_shebang "${ED}" - python_optimize -} - -pkg_postinst() { - use gtk && fdo-mime_desktop_database_update - - if use ipv6; then - elog - elog "IPv6 is not supported yet by ${P}." - fi - elog - elog "Tips on using distcc with Gentoo can be found at" - elog "https://wiki.gentoo.org/wiki/Distcc"; - elog - elog "How to use pump mode with Gentoo:" - elog "# distcc-config --set-hosts \"foo,cpp,lzo bar,cpp,lzo baz,cpp,lzo\"" - elog "# pump emerge -u world" - elog - elog "To use the distccmon programs with Gentoo you should use this command:" - elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-text 5" - - if use gtk; then - elog "Or:" - elog "# DISTCC_DIR=\"${DISTCC_DIR}\" distccmon-gnome" - fi - - elog - elog "***SECURITY NOTICE***" - elog "If you are upgrading distcc please make sure to run etc-update to" - elog "update your /etc/conf.d/distccd and /etc/init.d/distccd files with" - elog "added security precautions (the --listen and --allow directives)" - elog -} - -pkg_postrm() { - use gtk && fdo-mime_desktop_database_update -} diff --git a/sys-devel/distcc/files/3.0/conf b/sys-devel/distcc/files/3.0/conf deleted file mode 100644 index c499271685e..00000000000 --- a/sys-devel/distcc/files/3.0/conf +++ /dev/null @@ -1,40 +0,0 @@ -# /etc/conf.d/distccd: config file for /etc/init.d/distccd - -DISTCCD_OPTS="" - -# 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="${DISTCCD_OPTS} --port 3632" - -# Logging -# You can change some logging options here: -# --log-file FILE -# --log-level LEVEL [critical,error,warning, notice, info, debug] -# -# Leaving --log-file blank will log to syslog -# example: --log-file /dev/null --log-level warning -# example: --log-level critical - -DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical" - -# SECURITY NOTICE: -# It is HIGHLY recommended that you use the --listen option -# for increased security. You can specify an IP to permit connections -# from or a CIDR mask -# --listen accepts only a single IP -# --allow is now mandatory as of distcc-2.18. -# example: --allow 192.168.0.0/24 -# example: --allow 192.168.0.5 --allow 192.168.0.150 -# example: --listen 192.168.0.2 -DISTCCD_OPTS="${DISTCCD_OPTS} --allow 192.168.0.0/24" -#DISTCCD_OPTS="${DISTCCD_OPTS} --listen 192.168.0.2" - -# set this for niceness -# Default is 15 -DISTCCD_OPTS="${DISTCCD_OPTS} -N 15" diff --git a/sys-devel/distcc/files/3.0/distcc-config b/sys-devel/distcc/files/3.0/distcc-config deleted file mode 100644 index ed2a2eec435..00000000000 --- a/sys-devel/distcc/files/3.0/distcc-config +++ /dev/null @@ -1,122 +0,0 @@ -#!/usr/bin/env python -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -import os, re, signal, sys -from string import rstrip -from subprocess import Popen - -options=[ - '--get-hosts', - '--set-hosts', - '--get-verbose', - '--set-verbose', - '--get-log', - '--set-log', - '--help', - '--get-env', - '--set-env' -] - -tmpcmdline=sys.argv[1:] -cmdline=[] -envfile = '/etc/env.d/02distcc' - -def exithandler(foo,bar): - os.kill(0,signal.SIGKILL) - sys.exit(1) - -signal.signal(signal.SIGINT,exithandler) - -def isroot(ret=0): - if os.getuid() != 0: - if ret == 0: - print '!!!',sys.argv[:1][0],tmpcmdline[0],'must be run as root' - sys.exit(1) - else: - retval = 0 - else: - retval = 1 - return retval - -def writeenv(var,value): - isroot() - distcc_env = [] - distcc_env = open(envfile, 'r').readlines() - distcc_env_new = open(envfile, 'w') - for i in range(len(distcc_env)): - if re.compile(var+'="(.*)"').match(distcc_env[i]): - distcc_env[i] = var+'="'+value+'"\n' - distcc_env_new.write(distcc_env[i]) - #print 'Set',var,'to:',value - Popen('/usr/sbin/env-update', shell=True) - print 'If you want to use these new settings in an existing shell,' - print 'you need to "source /etc/profile" to get the changes.' - -def readenv(var): - distcc_env = open(envfile, 'r').read() - match = re.compile(var+'="(.*)"').search(distcc_env) - if match: - print var+'='+match.group(1) - else: - print var,'not set.' - -def createdistccdir(dir): - if not os.path.exists(dir): - os.mkdir(dir) - os.chmod(dir, 0755) - -for x in tmpcmdline: - if not x: - continue - if x[0:2]=="--": - if not x in options: - print "!!! Error:",x,"is an invalid option." - sys.exit(1) - else: - cmdline = x - -if '--get-hosts' in tmpcmdline: - HOSTS_ENV = os.environ.get('DISTCC_HOSTS') - HOSTS_HOME = os.environ.get('HOME')+'/hosts' - if HOSTS_ENV: - print HOSTS_ENV - elif os.path.isfile(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0: - print rstrip(open(HOSTS_HOME, 'r').read()) - elif os.path.exists('/etc/distcc/hosts'): - print rstrip(open('/etc/distcc/hosts', 'r').read()) - else: - print 'No configuration file found. Setup your hosts with --set-hosts.' -elif '--set-hosts' in tmpcmdline: - if isroot(1): - PATH = '/etc/distcc' - else: - PATH = os.environ.get('HOME') - createdistccdir(PATH) - open(PATH+'/hosts', 'w').write(cmdline + '\n') -elif '--get-verbose' in tmpcmdline: - readenv('DISTCC_VERBOSE') -elif '--set-verbose' in tmpcmdline: - writeenv('DISTCC_VERBOSE',tmpcmdline[1]) -elif '--get-log' in tmpcmdline: - readenv('DISTCC_LOG') -elif '--set-log' in tmpcmdline: - writeenv('DISTCC_LOG',tmpcmdline[1]) -elif '--get-env' in tmpcmdline: - if len(tmpcmdline) == 1: - print rstrip(open(envfile, 'r').read()) - elif len(tmpcmdline) == 2: - readenv(tmpcmdline[1]) - else: - print '!!! Error: Specify only one variable.' -elif '--set-env' in tmpcmdline: - if len(tmpcmdline) > 2 and len(tmpcmdline) <= 3: - isroot() - writeenv(tmpcmdline[1],tmpcmdline[2]) - else: - print '!!! Error: Awaiting two parameters.' -else: - print 'Usage: %s --set-hosts DISTCC_HOSTS | --get-hosts' % sys.argv[0] - print ' %s --set-verbose { 0 | 1 } | --get-verbose' % sys.argv[0] - print ' %s --set-log FILE | --get-log' % sys.argv[0] - print ' %s --set-env VARIABLE VALUE | --get-env [VARIABLE]' % sys.argv[0] diff --git a/sys-devel/distcc/files/3.1/conf b/sys-devel/distcc/files/3.1/conf deleted file mode 100644 index 39f6e3e86f4..00000000000 --- a/sys-devel/distcc/files/3.1/conf +++ /dev/null @@ -1,35 +0,0 @@ -# /etc/conf.d/distccd: config file for /etc/init.d/distccd - -# 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" - -# Ports: -# Default port is 3632. For most people the default is okay. -# -# Logging: -# You can change some logging options here: -# --log-file FILE -# --log-level LEVEL [critical,error,warning, notice, info, debug] -# -# Leaving --log-file blank will log to syslog -# example: --log-file /dev/null --log-level warning -# example: --log-level critical -# -# Nice level: -# The default nice level is 15. You can change it by adding: -N xx -# where xx is the nice level. - -# SECURITY NOTICE: -# It is HIGHLY recommended that you use the --listen option -# for increased security. You can specify an IP to permit connections -# from or a CIDR mask -# --listen accepts only a single IP -# --allow is now mandatory as of distcc-2.18. -# example: --allow 192.168.0.0/24 -# example: --allow 192.168.0.5 --allow 192.168.0.150 -# example: --listen 192.168.0.2 - -DISTCCD_OPTS="--port 3632 --log-level notice --log-file /var/log/distccd.log -N 15" diff --git a/sys-devel/distcc/files/3.1/init b/sys-devel/distcc/files/3.1/init deleted file mode 100644 index e89dcb3702b..00000000000 --- a/sys-devel/distcc/files/3.1/init +++ /dev/null @@ -1,31 +0,0 @@ -#!/sbin/openrc-run -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -depend() { - need net - use avahi-daemon ypbind -} - -start() { - ebegin "Starting distccd" - - if [ ! -e /var/run/distccd ] ; then - mkdir -p /var/run/distccd - chown distcc:daemon /var/run/distccd - fi - - # Load PATH and GCC_SPECS from gcc-config, bug #262773 - eval "$(gcc-config -E)" - - start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" --user distcc -- \ - --daemon --pid-file "${DISTCCD_PIDFILE}" \ - ${DISTCCD_OPTS} - eend $? -} - -stop() { - ebegin "Stopping distccd" - start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}" - eend $? -} diff --git a/sys-devel/distcc/files/distcc-3.1-argc-fix.patch b/sys-devel/distcc/files/distcc-3.1-argc-fix.patch deleted file mode 100644 index d7f30b5567f..00000000000 --- a/sys-devel/distcc/files/distcc-3.1-argc-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -this fixes virtualbox not compiling with distcc - -https://bugs.gentoo.org/show_bug.cgi?id=351979 -http://code.google.com/p/distcc/issues/detail?id=83 -http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=626926 - ---- distcc-3.1.orig/source/src/arg.c -+++ distcc-3.1/source/src/arg.c -@@ -515,6 +515,8 @@ - } - free(argv); - *argv_ptr = argv = new_argv; -+ i += extra_args - 1; -+ argc += extra_args - 1; - } - } - return 0; diff --git a/sys-devel/distcc/files/distcc-3.1-freedesktop.patch b/sys-devel/distcc/files/distcc-3.1-freedesktop.patch deleted file mode 100644 index b23db21a255..00000000000 --- a/sys-devel/distcc/files/distcc-3.1-freedesktop.patch +++ /dev/null @@ -1,76 +0,0 @@ -diff -Naur distcc-3.1.orig/Makefile.in distcc-3.1/Makefile.in ---- distcc-3.1.orig/Makefile.in 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/Makefile.in 2009-02-02 00:40:20.000000000 +0900 -@@ -49,13 +49,14 @@ - includedir = @includedir@ - oldincludedir = /usr/include - docdir = @docdir@ --pkgdatadir = $(datadir)/@PACKAGE_NAME@ -+icondir = $(datadir)/pixmaps -+desktopdir = $(datadir)/applications - - include_server_builddir = $(builddir)/_include_server - - # These must be done from here, not from autoconf, because they can - # contain variable expansions written in Make syntax. Ew. --DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DPKGDATADIR="\"${pkgdatadir}\"" -+DIR_DEFS = -DSYSCONFDIR="\"${sysconfdir}\"" -DICONDIR="\"${icondir}\"" - - # arguments to pkgconfig - GNOME_PACKAGES = @GNOME_PACKAGES@ -@@ -1003,7 +1004,8 @@ - @echo " documents $(DESTDIR)$(docdir)" - @echo " programs $(DESTDIR)$(bindir)" - @echo " system configuration $(DESTDIR)$(sysconfdir)" -- @echo " shared data files $(DESTDIR)$(pkgdatadir)" -+ @echo " icons $(DESTDIR)$(icondir)" -+ @echo " .desktop file $(DESTDIR)$(desktopdir)" - - - # install-sh can't handle multiple arguments, but we don't need any -@@ -1086,10 +1088,10 @@ - done - - install-gnome-data: $(gnome_data) -- $(mkinstalldirs) "$(DESTDIR)$(pkgdatadir)" -- for p in $(gnome_data); do \ -- $(INSTALL_DATA) "$$p" "$(DESTDIR)$(pkgdatadir)" || exit 1; \ -- done -+ $(mkinstalldirs) $(DESTDIR)$(icondir) -+ $(mkinstalldirs) $(DESTDIR)$(desktopdir) -+ $(INSTALL_DATA) gnome/distccmon-gnome-icon.png $(DESTDIR)$(icondir) -+ $(INSTALL_DATA) gnome/distccmon-gnome.desktop $(DESTDIR)$(desktopdir) - - install-conf: $(conf_files) $(default_files) - $(mkinstalldirs) "$(DESTDIR)$(sysconfdir)/distcc" -diff -Naur distcc-3.1.orig/gnome/distccmon-gnome.desktop distcc-3.1/gnome/distccmon-gnome.desktop ---- distcc-3.1.orig/gnome/distccmon-gnome.desktop 2008-12-03 06:50:27.000000000 +0900 -+++ distcc-3.1/gnome/distccmon-gnome.desktop 2009-02-02 00:40:55.000000000 +0900 -@@ -1,13 +1,11 @@ - [Desktop Entry] --Version=0.9.4 --Encoding=UTF-8 - Exec=distccmon-gnome - Name=distcc monitor - GenericName=Distributed Compile Monitor - Comment=Graphical view of distributed compile tasks --Icon=distccmon-gnome-icon.png -+Icon=distccmon-gnome-icon - TryExec=distccmon-gnome - Terminal=false - Type=Application --Categories=GNOME;Application;Development; -+Categories=GNOME;Development; - StartupNotify=true -diff -Naur distcc-3.1.orig/src/mon-gnome.c distcc-3.1/src/mon-gnome.c ---- distcc-3.1.orig/src/mon-gnome.c 2008-12-03 06:50:25.000000000 +0900 -+++ distcc-3.1/src/mon-gnome.c 2009-02-02 00:41:18.000000000 +0900 -@@ -599,7 +599,7 @@ - - #if GTK_CHECK_VERSION(2,2,0) - gtk_window_set_icon_from_file (GTK_WINDOW (mainwin), -- PKGDATADIR "/distccmon-gnome-icon.png", -+ ICONDIR "/distccmon-gnome-icon.png", - NULL); - #endif - diff --git a/sys-devel/distcc/files/distcc-3.1-python.patch b/sys-devel/distcc/files/distcc-3.1-python.patch deleted file mode 100644 index 733357a5393..00000000000 --- a/sys-devel/distcc/files/distcc-3.1-python.patch +++ /dev/null @@ -1,258 +0,0 @@ -diff -Naur distcc-3.1.orig/bench/statistics.py distcc-3.1/bench/statistics.py ---- distcc-3.1.orig/bench/statistics.py 2008-12-03 06:50:21.000000000 +0900 -+++ distcc-3.1/bench/statistics.py 2009-03-17 01:29:26.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python2.2 -+#! /usr/bin/env python - - # benchmark -- automated system for testing distcc correctness - # and performance on various source trees. -diff -Naur distcc-3.1.orig/configure distcc-3.1/configure ---- distcc-3.1.orig/configure 2008-12-03 06:50:34.000000000 +0900 -+++ distcc-3.1/configure 2009-03-17 01:31:09.000000000 +0900 -@@ -3629,7 +3629,7 @@ - # - # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present - # in autoconf 2.53. --for ac_prog in python2.5 python-2.5 python2.4 python-2.4 python -+for ac_prog in python - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 -diff -Naur distcc-3.1.orig/configure.ac distcc-3.1/configure.ac ---- distcc-3.1.orig/configure.ac 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/configure.ac 2009-03-17 01:29:04.000000000 +0900 -@@ -243,7 +243,7 @@ - # - # NB: Cannot use AC_CONFIG_LIBOBJ_DIR here, because it's not present - # in autoconf 2.53. --AC_PATH_PROGS(PYTHON, [python2.5 python-2.5 python2.4 python-2.4 python]) -+AC_PATH_PROGS(PYTHON, [python]) - AC_ARG_VAR(PYTHON, [Python interpreter]) - # Python 1 doesn't even support -V - if ! "$PYTHON" -V 2>&1 | grep "^Python" >/dev/null; then -diff -Naur distcc-3.1.orig/include_server/basics.py distcc-3.1/include_server/basics.py ---- distcc-3.1.orig/include_server/basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/basics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/basics_test.py distcc-3.1/include_server/basics_test.py ---- distcc-3.1.orig/include_server/basics_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/basics_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/c_extensions_test.py distcc-3.1/include_server/c_extensions_test.py ---- distcc-3.1.orig/include_server/c_extensions_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/c_extensions_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/cache_basics.py distcc-3.1/include_server/cache_basics.py ---- distcc-3.1.orig/include_server/cache_basics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/cache_basics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/compiler_defaults.py distcc-3.1/include_server/compiler_defaults.py ---- distcc-3.1.orig/include_server/compiler_defaults.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/compiler_defaults.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/compress_files.py distcc-3.1/include_server/compress_files.py ---- distcc-3.1.orig/include_server/compress_files.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/compress_files.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer.py distcc-3.1/include_server/include_analyzer.py ---- distcc-3.1.orig/include_server/include_analyzer.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py distcc-3.1/include_server/include_analyzer_memoizing_node.py ---- distcc-3.1.orig/include_server/include_analyzer_memoizing_node.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_memoizing_node.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py distcc-3.1/include_server/include_analyzer_memoizing_node_test.py ---- distcc-3.1.orig/include_server/include_analyzer_memoizing_node_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_memoizing_node_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_analyzer_test.py distcc-3.1/include_server/include_analyzer_test.py ---- distcc-3.1.orig/include_server/include_analyzer_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_analyzer_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_server.py distcc-3.1/include_server/include_server.py ---- distcc-3.1.orig/include_server/include_server.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_server.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/include_server_test.py distcc-3.1/include_server/include_server_test.py ---- distcc-3.1.orig/include_server/include_server_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/include_server_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/macro_eval.py distcc-3.1/include_server/macro_eval.py ---- distcc-3.1.orig/include_server/macro_eval.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/macro_eval.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/macro_eval_test.py distcc-3.1/include_server/macro_eval_test.py ---- distcc-3.1.orig/include_server/macro_eval_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/macro_eval_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/mirror_path.py distcc-3.1/include_server/mirror_path.py ---- distcc-3.1.orig/include_server/mirror_path.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/mirror_path.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/mirror_path_test.py distcc-3.1/include_server/mirror_path_test.py ---- distcc-3.1.orig/include_server/mirror_path_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/mirror_path_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_command.py distcc-3.1/include_server/parse_command.py ---- distcc-3.1.orig/include_server/parse_command.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_command.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_command_test.py distcc-3.1/include_server/parse_command_test.py ---- distcc-3.1.orig/include_server/parse_command_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_command_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_file.py distcc-3.1/include_server/parse_file.py ---- distcc-3.1.orig/include_server/parse_file.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_file.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/parse_file_test.py distcc-3.1/include_server/parse_file_test.py ---- distcc-3.1.orig/include_server/parse_file_test.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/parse_file_test.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/run.py distcc-3.1/include_server/run.py ---- distcc-3.1.orig/include_server/run.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/run.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/setup.py distcc-3.1/include_server/setup.py ---- distcc-3.1.orig/include_server/setup.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/setup.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/include_server/statistics.py distcc-3.1/include_server/statistics.py ---- distcc-3.1.orig/include_server/statistics.py 2008-12-03 06:50:31.000000000 +0900 -+++ distcc-3.1/include_server/statistics.py 2009-03-17 01:30:46.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/python2.4 -+#! /usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/test/onetest.py distcc-3.1/test/onetest.py ---- distcc-3.1.orig/test/onetest.py 2008-12-03 06:50:22.000000000 +0900 -+++ distcc-3.1/test/onetest.py 2009-03-17 01:29:44.000000000 +0900 -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.4 -+#!/usr/bin/python - # - # Copyright 2007 Google Inc. - # -diff -Naur distcc-3.1.orig/test/testdistcc.py distcc-3.1/test/testdistcc.py ---- distcc-3.1.orig/test/testdistcc.py 2008-12-03 06:50:22.000000000 +0900 -+++ distcc-3.1/test/testdistcc.py 2009-03-17 01:29:36.000000000 +0900 -@@ -1,4 +1,4 @@ --#! /usr/bin/env python2.2 -+#! /usr/bin/env python - - # Copyright (C) 2002, 2003, 2004 by Martin Pool <[email protected]> - # Copyright 2007 Google Inc. diff --git a/sys-devel/distcc/files/distcc-config b/sys-devel/distcc/files/distcc-config deleted file mode 100644 index 094307c1050..00000000000 --- a/sys-devel/distcc/files/distcc-config +++ /dev/null @@ -1,164 +0,0 @@ -#!/usr/bin/env python -# Copyright 1999-2004 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -import os, re, signal, sys, commands, pwd -from string import rstrip - -options=[ - '--get-hosts', - '--set-hosts', - '--get-verbose', - '--set-verbose', - '--get-log', - '--set-log', - '--install', - '--help', - '--get-env', - '--set-env' -] - -tmpcmdline=sys.argv[1:] -cmdline=[] -envfile = '/etc/env.d/02distcc' - -def exithandler(foo,bar): - os.kill(0,signal.SIGKILL) - sys.exit(1) - -signal.signal(signal.SIGINT,exithandler) - -def isroot(ret=0): - if os.getuid() != 0: - if ret == 0: - print '!!!',sys.argv[:1][0],tmpcmdline[0],'must be run as root' - sys.exit(1) - else: - retval = 0 - else: - retval = 1 - return retval - -def writeenv(var,value): - isroot() - distcc_env = [] - distcc_env = open(envfile, 'r').readlines() - distcc_env_new = open(envfile, 'w') - for i in range(len(distcc_env)): - if re.compile(var+'="(.*)"').match(distcc_env[i]): - distcc_env[i] = var+'="'+value+'"\n' - distcc_env_new.write(distcc_env[i]) - #print 'Set',var,'to:',value - os.popen('/usr/sbin/env-update') - print 'If you want to use these new settings in an existing shell,' - print 'you need to "source /etc/profile" to get the changes.' - -def readenv(var): - distcc_env = open(envfile, 'r').read() - match = re.compile(var+'="(.*)"').search(distcc_env) - if match: - print var+'='+match.group(1) - else: - print var,'not set.' - -def permissions(path,user,group): - for file in os.listdir(path): - #print 'Configuring',path+file+'...' - os.chown(path+file,user,group) - -def installlinks(chost=''): - for file in ['gcc', 'cc', 'c++', 'g++']: - path = '/usr/lib/distcc/bin/' - if not chost == '': - file = chost+'-'+file - if os.path.exists('/usr/bin/'+file): - #print 'Creating',path+file,'symlink...' - if not os.path.exists(path+file): - os.symlink('/usr/bin/distcc',path+file) - #else: - # print 'Already exists. Skipping...' - -def createdistccdir(dir): - if not os.path.exists(dir): - os.mkdir(dir) - os.chmod(dir, 1777) - -for x in tmpcmdline: - if not x: - continue - if x[0:2]=="--": - if not x in options: - print "!!! Error:",x,"is an invalid option." - sys.exit(1) - else: - cmdline = x - -if '--get-hosts' in tmpcmdline: - HOSTS_ENV = os.environ.get('DISTCC_HOSTS') - HOSTS_HOME = os.environ.get('HOME')+'/hosts' - if HOSTS_ENV: - print HOSTS_ENV - elif os.path.isfile(HOSTS_HOME) and os.path.getsize(HOSTS_HOME) != 0: - print HOSTS_HOME - elif os.path.exists('/etc/distcc/hosts'): - print rstrip(open('/etc/distcc/hosts', 'r').read()) - else: - print 'No configuration file found. Setup your hosts with --set-hosts.' -elif '--set-hosts' in tmpcmdline: - if isroot(1): - PATH = '/etc/distcc' - else: - PATH = os.environ.get('HOME') - createdistccdir(PATH) - open(PATH+'/hosts', 'w').write(cmdline + '\n') -elif '--get-verbose' in tmpcmdline: - readenv('DISTCC_VERBOSE') -elif '--set-verbose' in tmpcmdline: - writeenv('DISTCC_VERBOSE',tmpcmdline[1]) -elif '--get-log' in tmpcmdline: - readenv('DISTCC_LOG') -elif '--set-log' in tmpcmdline: - writeenv('DISTCC_LOG',tmpcmdline[1]) -elif '--install' in tmpcmdline: - isroot() - print 'Creating',envfile+'...' - distcc_env = open(envfile, 'w') - distcc_env.write('# This file is managed by distcc-config; use it to change these settings.\n') - distcc_env.write('DISTCC_LOG=""\n') - distcc_env.write('DCCC_PATH="/usr/lib/distcc/bin"\n') - distcc_env.write('DISTCC_VERBOSE="0"\n') - - if os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/useradd -u 240 -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) == 9: - os.WEXITSTATUS(commands.getstatusoutput('/usr/sbin/usermod -g daemon -s /bin/false -d /dev/null -c "distccd" distcc')[0]) - - foobar = pwd.getpwnam('distcc') - user = foobar[2] - group = foobar[3] - - makeconf = open('/etc/make.conf', 'r').read() - chost = re.compile('CHOST="(.*)"').search(makeconf).group(1) - print 'Creating symlinks...' - installlinks() - installlinks(chost) - - print 'Checking permissions...' - permissions('/usr/lib/distcc/bin/',user,group) - permissions('/var/run/distccd/',user,group) -elif '--get-env' in tmpcmdline: - if len(tmpcmdline) == 1: - print rstrip(open(envfile, 'r').read()) - elif len(tmpcmdline) == 2: - readenv(tmpcmdline[1]) - else: - print '!!! Error: Specify only one variable.' -elif '--set-env' in tmpcmdline: - if len(tmpcmdline) > 2 and len(tmpcmdline) <= 3: - isroot() - writeenv(tmpcmdline[1],tmpcmdline[2]) - else: - print '!!! Error: Awaiting two parameters.' -else: - print 'Usage: /usr/bin/distcc-config --set-hosts DISTCC_HOSTS | --get-hosts' - print ' /usr/bin/distcc-config --set-verbose { 0 | 1 } | --get-verbose' - print ' /usr/bin/distcc-config --set-log FILE | --get-log' - print ' /usr/bin/distcc-config --set-env VARIABLE VALUE | --get-env [VARIABLE]'
