sys-devel/distcc: Remove old. Fix one type.

Package-Manager: portage-2.2.23

17 files changed, 2 insertions, 721 deletions

diff --git a/sys-devel/distcc/files/2.18-r1/conf b/sys-devel/distcc/files/2.18-r1/conf
deleted file mode 100644
index 783236aa410f..000000000000
--- a/sys-devel/distcc/files/2.18-r1/conf
+++ /dev/null
@@ -1,45 +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 recomended 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_NICE="15"
-
-#ifdef AVAHI
-# Enable zeroconf support in distccd
-DISTCCD_AVAHI="yes"
-#endif
diff --git a/sys-devel/distcc/files/2.18-r1/init b/sys-devel/distcc/files/2.18-r1/init
deleted file mode 100644
index 7676e9827891..000000000000
--- a/sys-devel/distcc/files/2.18-r1/init
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/sbin/runscript
-# $Id$
-
-depend() {
-	local avahi
-#ifdef AVAHI
-	[ ${DISTCCD_AVAHI} = yes ] && avahi="avahi-daemon"
-#endif
-	need net ${avahi}
-	use ypbind
-}
-
-start() {
-	[ -e "${DISTCCD_PIDFILE}" ] && rm -f ${DISTCCD_PIDFILE} &>/dev/null
-	
-	local args
-#ifdef AVAHI
-	[ ${DISTCCD_AVAHI} = yes ] && args="--zeroconf"
-#endif
-	
-	ebegin "Starting distccd"
-	chown distcc `dirname ${DISTCCD_PIDFILE}` &>/dev/null
-	TMPDIR="${TMPDIR}" \
-	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 \
-	${args} ${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.18/conf b/sys-devel/distcc/files/2.18/conf
deleted file mode 100644
index 3f6c3f07fa76..000000000000
--- a/sys-devel/distcc/files/2.18/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 recomended 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_NICE="15"
diff --git a/sys-devel/distcc/files/2.18/init b/sys-devel/distcc/files/2.18/init
deleted file mode 100644
index f9bf8ed4b86f..000000000000
--- a/sys-devel/distcc/files/2.18/init
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# $Id$
-
-depend() {
-	need net
-	use ypbind
-}
-
-start() {
-	[ -e "${DISTCCD_PIDFILE}" ] && rm -f ${DISTCCD_PIDFILE} &>/dev/null
-	
-	ebegin "Starting distccd"
-	chown distcc `dirname ${DISTCCD_PIDFILE}` &>/dev/null
-	TMPDIR="${TMPDIR}" \
-	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/3.0/conf b/sys-devel/distcc/files/3.0/conf
index eb784c3ac88b..c499271685e9 100644
--- a/sys-devel/distcc/files/3.0/conf
+++ b/sys-devel/distcc/files/3.0/conf
@@ -24,7 +24,7 @@ DISTCCD_OPTS="${DISTCCD_OPTS} --port 3632"
 DISTCCD_OPTS="${DISTCCD_OPTS} --log-level critical"
 
 # SECURITY NOTICE:
-# It is HIGHLY recomended that you use the --listen option
+# 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
diff --git a/sys-devel/distcc/files/3.0/init b/sys-devel/distcc/files/3.0/init
deleted file mode 100644
index 2740f2b5636a..000000000000
--- a/sys-devel/distcc/files/3.0/init
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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 GCC_SPECS from profile.env bug #164818
-	GCC_SPECS="$(. /etc/profile.env; echo "${GCC_SPECS}")" \
-	PATH="$(gcc-config --get-bin-path):${PATH}" \
-	start-stop-daemon --start --quiet --exec "${DISTCCD_EXEC}" -- \
-		--daemon --pid-file "${DISTCCD_PIDFILE}" --user distcc \
-		${DISTCCD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping distccd"
-	start-stop-daemon --stop --quiet --pidfile "${DISTCCD_PIDFILE}"
-	eend $?
-}
diff --git a/sys-devel/distcc/files/3.1/conf b/sys-devel/distcc/files/3.1/conf
index 4b1faf145b75..39f6e3e86f45 100644
--- a/sys-devel/distcc/files/3.1/conf
+++ b/sys-devel/distcc/files/3.1/conf
@@ -23,7 +23,7 @@ DISTCCD_PIDFILE="/var/run/distccd/distccd.pid"
 # where xx is the nice level.
 
 # SECURITY NOTICE:
-# It is HIGHLY recomended that you use the --listen option
+# 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
diff --git a/sys-devel/distcc/files/distcc-3.0-gentoo.patch b/sys-devel/distcc/files/distcc-3.0-gentoo.patch
deleted file mode 100644
index e2464dfa5abc..000000000000
--- a/sys-devel/distcc/files/distcc-3.0-gentoo.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -Naur distcc-3.0.orig/include_server/c_extensions/distcc_pump_c_extensions_module.c distcc-3.0/include_server/c_extensions/distcc_pump_c_extensions_module.c
---- distcc-3.0.orig/include_server/c_extensions/distcc_pump_c_extensions_module.c	2008-08-07 05:52:20.000000000 +0900
-+++ distcc-3.0/include_server/c_extensions/distcc_pump_c_extensions_module.c	2008-10-14 22:34:38.000000000 +0900
-@@ -23,17 +23,18 @@
- 
- #include "Python.h"
- 
--static char *version = ".01";
-+static const char *version = ".01";
- 
- /* To suppress compiler warnings */
- #define UNUSED(v) ((void)&v)
- 
--char *rs_program_name = "distcc_include_server";
-+const char *rs_program_name = "distcc_include_server";
- 
- #include "distcc.h"
- #include "rpc.h"
- 
- static PyObject *distcc_pump_c_extensionsError;
-+void initdistcc_pump_c_extensions(void);
- 
- 
- /***********************************************************************
-@@ -385,7 +386,7 @@
-   PyObject *module;
-   PyObject *py_str;
-   distcc_pump_c_extensionsError = PyErr_NewException(
--      "distcc_pump_c_extensions.Error", NULL, NULL);
-+      (char *)"distcc_pump_c_extensions.Error", NULL, NULL);
-   
-   module = Py_InitModule4("distcc_pump_c_extensions", 
-                           methods, 
diff --git a/sys-devel/distcc/files/distcc-3.0-svn617.patch b/sys-devel/distcc/files/distcc-3.0-svn617.patch
deleted file mode 100644
index 54f55dcea15a..000000000000
--- a/sys-devel/distcc/files/distcc-3.0-svn617.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/arg.c
-===================================================================
---- src/arg.c	(revision 616)
-+++ src/arg.c	(revision 617)
-@@ -453,7 +453,7 @@
-         dest_argv[i] = strdup(opt);
-         if (!dest_argv[i]) return EXIT_OUT_OF_MEMORY;
-         i++;
--        if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD")) {
-+        if (strcmp(opt, "-MD") == 0 || strcmp(opt, "-MMD") == 0) {
-             char *filename;
-             if (!comma) {
-                 rs_log_warning("'-Wp,-MD' or '-Wp,-MMD' option is missing "
diff --git a/sys-devel/distcc/files/distcc-3.0-uninitialized.patch b/sys-devel/distcc/files/distcc-3.0-uninitialized.patch
deleted file mode 100644
index 28b226b7966c..000000000000
--- a/sys-devel/distcc/files/distcc-3.0-uninitialized.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: src/where.c
-===================================================================
---- src/where.c	(revision 622)
-+++ src/where.c	(working copy)
-@@ -190,7 +190,7 @@
- int dcc_lock_local_cpp(int *cpu_lock_fd)
- {
-     int ret;
--    struct dcc_hostdef *chosen;
-+    struct dcc_hostdef *chosen = NULL;
-     ret = dcc_lock_one(dcc_hostdef_local_cpp, &chosen, cpu_lock_fd);
-     dcc_note_state(DCC_PHASE_CPP, NULL, chosen->hostname);
-     return ret;
diff --git a/sys-devel/distcc/files/distcc-as-needed.patch b/sys-devel/distcc/files/distcc-as-needed.patch
deleted file mode 100644
index 6678e4d78d1a..000000000000
--- a/sys-devel/distcc/files/distcc-as-needed.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: distcc-2.18.3/Makefile.in
-===================================================================
---- distcc-2.18.3.orig/Makefile.in
-+++ distcc-2.18.3/Makefile.in
-@@ -377,9 +377,9 @@ src/renderer.o: src/renderer.c
- 		$(srcdir)/src/renderer.c
- 
- distccmon-gnome@EXEEXT@: $(mon_obj) $(gnome_obj)
--	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) $(LIBS)	\
--		$(GNOME_CFLAGS) $(GNOME_LIBS)			\
--		$(mon_obj) $(gnome_obj)
-+	$(CC) -o $@ $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) \
-+		$(mon_obj) $(gnome_obj) \
-+		$(LIBS) $(GNOME_CFLAGS) $(GNOME_LIBS)
- 
- 
- ## Dist targets
diff --git a/sys-devel/distcc/files/distcc-avahi-configure.patch b/sys-devel/distcc/files/distcc-avahi-configure.patch
deleted file mode 100644
index cc1097d643d1..000000000000
--- a/sys-devel/distcc/files/distcc-avahi-configure.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -ur distcc-2.18.3.old/configure.ac distcc-2.18.3/configure.ac
---- distcc-2.18.3.old/configure.ac	2008-01-01 21:08:02.000000000 +0200
-+++ distcc-2.18.3/configure.ac	2008-01-01 21:09:56.000000000 +0200
-@@ -387,14 +387,18 @@
-     [#include <sys/socket.h>])
- 
- dnl check for avahi
-+AC_ARG_ENABLE(avahi, AC_HELP_STRING([--enable-avahi], [enable avahi support]), [], [enable_avahi=auto])
-+ZEROCONF_DISTCC_OBJS=""
-+ZEROCONF_DISTCCD_OBJS=""
- PKG_CHECK_MODULES(AVAHI, [avahi-client >= 0.6.5],
--[AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available])
--CFLAGS="$CFLAGS $AVAHI_CFLAGS"
--LIBS="$LIBS $AVAHI_LIBS"
--ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o"
--ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o"],
--[ZEROCONF_DISTCC_OBJS=""
--ZEROCONF_DISTCCD_OBJS=""])
-+[if test x"${enable_avahi}" = x"yes" || test x"${enable_avahi}" = x"auto"; then
-+ AC_DEFINE(HAVE_AVAHI, 1, [defined if Avahi is available])
-+ CFLAGS="$CFLAGS $AVAHI_CFLAGS"
-+ LIBS="$LIBS $AVAHI_LIBS"
-+ ZEROCONF_DISTCC_OBJS="src/zeroconf.o src/gcc-id.o"
-+ ZEROCONF_DISTCCD_OBJS="src/zeroconf-reg.o src/gcc-id.o"
-+fi],
-+[test x"${enable_avahi}" = x"yes" && AC_MSG_ERROR(avahi support needs avahi-client >= 0.6.5 installed)])
- AC_SUBST(ZEROCONF_DISTCC_OBJS)
- AC_SUBST(ZEROCONF_DISTCCD_OBJS)
- 
diff --git a/sys-devel/distcc/files/distcc-create-dir.patch b/sys-devel/distcc/files/distcc-create-dir.patch
deleted file mode 100644
index 8c818e1bd8ac..000000000000
--- a/sys-devel/distcc/files/distcc-create-dir.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-* local directory is at mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-* comparing to mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-M  ./src/tempfile.c
-
-* modified files
-
---- orig/src/tempfile.c
-+++ mod/src/tempfile.c
-@@ -145,7 +145,7 @@
- int dcc_get_top_dir(char **path_ret)
- {
-     char *env;
--    static char *cached;
-+    static char *cached = NULL;
-     int ret;
- 
-     if (cached) {
-@@ -154,22 +154,23 @@
-     }
- 
-     if ((env = getenv("DISTCC_DIR"))) {
--        if ((cached = strdup(env)) == NULL) {
-+
-+        if ((cached = strdup(env)) == NULL)
-             return EXIT_OUT_OF_MEMORY;
--        } else {
-+        else
-             *path_ret = cached;
--            return 0;
--        }
--    }
- 
--    if ((env = getenv("HOME")) == NULL) {
--        rs_log_warning("HOME is not set; can't find distcc directory");
--        return EXIT_BAD_ARGUMENTS;
--    }
-+    } else {
- 
--    if (asprintf(path_ret, "%s/.distcc", env) == -1) {
--        rs_log_error("asprintf failed");
--        return EXIT_OUT_OF_MEMORY;
-+        if ((env = getenv("HOME")) == NULL) {
-+            rs_log_warning("HOME is not set; can't find distcc directory");
-+            return EXIT_BAD_ARGUMENTS;
-+        }
-+
-+        if (asprintf(path_ret, "%s/.distcc", env) == -1) {
-+            rs_log_error("asprintf failed");
-+            return EXIT_OUT_OF_MEMORY;
-+        }
-     }
- 
-     ret = dcc_mkdir(*path_ret);
-
-
-
diff --git a/sys-devel/distcc/files/distcc-freedesktop.patch b/sys-devel/distcc/files/distcc-freedesktop.patch
deleted file mode 100644
index 26981097f2dc..000000000000
--- a/sys-devel/distcc/files/distcc-freedesktop.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-* local directory is at mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-* comparing to mbp@sourcefrog.net--2004/distcc--devel--2--patch-183
-M  src/mon-gnome.c
-M  Makefile.in
-M  gnome/distccmon-gnome.desktop
-
-* modified files
-
---- orig/Makefile.in
-+++ mod/Makefile.in
-@@ -45,11 +45,12 @@
- includedir = @includedir@
- oldincludedir = /usr/include
- docdir = @docdir@
--pkgdatadir = $(datadir)/@PACKAGE_NAME@
-+icondir = $(datadir)/pixmaps
-+desktopdir = $(datadir)/applications
- 
- # 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@
-@@ -508,7 +509,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
-@@ -541,8 +543,8 @@
- 	done
- 
- install-gnome-data: $(gnome_data)
--	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
--	for p in $^; 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)
- 
-
-
---- orig/gnome/distccmon-gnome.desktop
-+++ mod/gnome/distccmon-gnome.desktop
-@@ -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
-
-
---- orig/src/mon-gnome.c
-+++ mod/src/mon-gnome.c
-@@ -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-gentoo-multilib-r1.patch b/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
deleted file mode 100644
index 8a7b37e878bb..000000000000
--- a/sys-devel/distcc/files/distcc-gentoo-multilib-r1.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Naurp distcc-2.18.3.orig/src/distcc.c distcc-2.18.3/src/distcc.c
---- distcc-2.18.3.orig/src/distcc.c	2004-10-01 17:47:07.000000000 -0700
-+++ distcc-2.18.3/src/distcc.c	2005-01-30 22:15:43.883870942 -0800
-@@ -135,7 +135,106 @@ static void dcc_client_catch_signals(voi
-     signal(SIGHUP, &dcc_client_signalled);
- }
- 
-+#define MAXNEWFLAGS 32
-+#define MAXFLAGLEN  127
- 
-+static char **getNewArgv(char **argv, const char *newflagsStr) {
-+	char **newargv;
-+	char newflags[MAXNEWFLAGS][MAXFLAGLEN + 1];
-+	unsigned newflagsCount = 0;
-+	unsigned argc;
-+	unsigned i;
-+	char **p;
-+
-+	unsigned s, f; /* start/finish of each flag. f points to
-+	                * the char AFTER the end (ie the space/\0
-+	                */
-+
-+	/* Tokenize the flag list */
-+	for(s=0; s < strlen(newflagsStr); s=f+1) {
-+		/* Put s at the start of the next flag */
-+		while(newflagsStr[s] == ' ' || 
-+		      newflagsStr[s] == '\t')
-+			s++;
-+		if(s == strlen(newflagsStr))
-+			break;
-+
-+		f = s + 1;
-+		while(newflagsStr[f] != ' ' && 
-+		      newflagsStr[f] != '\t' &&
-+		      newflagsStr[f] != '\0')
-+			f++;
-+
-+		/* Detect overrun */
-+		if(MAXFLAGLEN < f - s || MAXNEWFLAGS == newflagsCount)
-+			return NULL;
-+
-+		strncpy(newflags[newflagsCount], newflagsStr + s, f - s);
-+		newflags[newflagsCount][f - s]='\0';
-+		newflagsCount++;
-+	}
-+
-+	/* Calculate original argc and see if it contains -m{abi,32,64} */
-+	for(argc=0, p=argv; *p; p++, argc++) {
-+		if(newflagsCount && (strncmp(*p, "-m32", 4) == 0 ||
-+		                     strncmp(*p, "-m64", 4) == 0 ||
-+		                     strncmp(*p, "-mabi", 5) == 0)) {
-+			/* Our command line sets the ABI, warn the user about this and ignore 
-+		     newArgs by setting newflagsCount to 0.
-+			 */
-+			newflagsCount = 0;
-+			fprintf(stderr, "%s: %s detected on the command line overrides implicit %s added by the wrapper.\n", argv[0], *p, newflagsStr);
-+		}
-+	}
-+
-+	/* Allocate our array */
-+	newargv = (char **)malloc(sizeof(char *) * (argc + newflagsCount + 1));
-+
-+	/* Make room for the original, new ones, and the NULL terminator */
-+	if(!newargv)
-+		return NULL;
-+
-+	/* Build argv */
-+	newargv[0] = argv[0];
-+
-+	/* The newFlags come first since we want the environment to override them. */
-+	for(i=1; i - 1 < newflagsCount; i++) {
-+		newargv[i] = newflags[i - 1];
-+	}
-+
-+	/* We just use the existing argv[i] as the start. */
-+	for(; i - newflagsCount < argc; i++) {
-+		newargv[i] = argv[i - newflagsCount];
-+	}
-+
-+	/* And now cap it off... */
-+	newargv[i] = NULL;
-+
-+	return newargv;
-+}
-+
-+static char **getNewArgvFromEnv(char **argv) {
-+	char **newargv = argv;
-+
-+	if(getenv("ABI")) {
-+		char *envar = (char *)malloc(sizeof(char) * (strlen("CFLAGS_") + strlen(getenv("ABI")) + 1 ));
-+
-+		if(!envar)
-+			return NULL;
-+
-+		/* We use CFLAGS_${ABI} for gcc, g++, g77, etc as they are
-+		 * the same no matter which compiler we are using.
-+		 */
-+		sprintf(envar, "CFLAGS_%s", getenv("ABI"));
-+
-+		if(getenv(envar))
-+			newargv = getNewArgv(argv, getenv(envar));
-+
-+		free(envar);
-+	}
-+
-+	return newargv;
-+}
- 
- /**
-  * distcc client entry point.
-@@ -150,6 +249,7 @@ int main(int argc, char **argv)
-     int status, sg_level, tweaked_path = 0;
-     char **compiler_args;
-     char *compiler_name;
-+    char **newargv;
-     int ret;
- 
-     dcc_client_catch_signals();
-@@ -183,7 +283,12 @@ int main(int argc, char **argv)
-             goto out;
-         }
-         
--        dcc_find_compiler(argv, &compiler_args);
-+        if(!(newargv = getNewArgvFromEnv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_find_compiler(newargv, &compiler_args);
-+        if (newargv != argv) free(newargv);
-         /* compiler_args is now respectively either "cc -c hello.c" or
-          * "gcc -c hello.c" */
- 
-@@ -200,7 +305,12 @@ int main(int argc, char **argv)
-                                           &tweaked_path)) != 0)
-             goto out;
-         
--        dcc_copy_argv(argv, &compiler_args, 0);
-+        if(!(newargv = getNewArgvFromEnv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_copy_argv(newargv, &compiler_args, 0);
-+        if (newargv != argv) free(newargv);
-         compiler_args[0] = compiler_name;
-     }
- 
diff --git a/sys-devel/distcc/files/distcc-gentoo-multilib.patch b/sys-devel/distcc/files/distcc-gentoo-multilib.patch
deleted file mode 100644
index 02e0486c2a8b..000000000000
--- a/sys-devel/distcc/files/distcc-gentoo-multilib.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Naur distcc-2.18.3-vanilla/src/distcc.c distcc-2.18.3/src/distcc.c
---- distcc-2.18.3-vanilla/src/distcc.c	2004-10-01 17:47:07.000000000 -0700
-+++ distcc-2.18.3/src/distcc.c	2004-12-28 01:04:51.017574246 -0800
-@@ -135,7 +135,86 @@
-     signal(SIGHUP, &dcc_client_signalled);
- }
- 
-+#define MAXNEWFLAGS 32
-+#define MAXFLAGLEN  127
- 
-+static char **getNewArgv(char **argv) {
-+    char **newargv;
-+    char newflags[MAXNEWFLAGS][MAXFLAGLEN + 1];
-+    unsigned newflagsCount = 0;
-+    unsigned argc;
-+    unsigned i;
-+    char **p;
-+
-+    if(getenv("ABI")) {
-+        char *envar = (char *)malloc(sizeof(char) * 
-+                                     (strlen("CFLAGS_") + strlen(getenv("ABI")) + 1 ));
-+        if(!envar)
-+            return NULL;
-+
-+        /* We use CFLAGS_${ABI} for gcc, g++, g77, etc as they are
-+         * the same no matter which compiler we are using.
-+         */
-+        sprintf(envar, "CFLAGS_%s", getenv("ABI"));
-+
-+        if(getenv(envar)) {
-+            const char *newflagsStr = getenv(envar);
-+            unsigned s, f; /* start/finish of each flag. f points to
-+                            * the char AFTER the end (ie the space/\0
-+                            */
-+
-+            /* Tokenize the flag list */
-+            for(s=0; s < strlen(newflagsStr); s=f+1) {
-+                /* Put s at the start of the next flag */
-+                while(newflagsStr[s] == ' ' || 
-+                      newflagsStr[s] == '\t')
-+                    s++;
-+                if(s == strlen(newflagsStr))
-+                    break;
-+
-+                f = s + 1;
-+                while(newflagsStr[f] != ' ' && 
-+                      newflagsStr[f] != '\t' &&
-+                      newflagsStr[f] != '\0')
-+                    f++;
-+
-+                /* Detect overrun */
-+                if(MAXFLAGLEN < f - s || MAXNEWFLAGS == newflagsCount)
-+                    return NULL;
-+
-+                strncpy(newflags[newflagsCount], newflagsStr + s, f - s);
-+                newflagsCount++;
-+            }
-+        }
-+
-+        free(envar);
-+    }
-+
-+    /* Calculate argc */
-+    for(argc=0, p=argv; *p; p++, argc++);
-+
-+    /* Allocate our array */
-+    newargv = (char **)malloc(sizeof(char *) * (argc + newflagsCount + 1));
-+
-+    /* Make room for the original, new ones, and the NULL terminator */
-+    if(!newargv)
-+        return NULL;
-+
-+    /* We just use the existing argv[i] as the start. */
-+    for(i=0; i < argc; i++) {
-+        newargv[i] = argv[i];
-+    }
-+
-+    /* Now we want to append our newflags list. */
-+    for(; i < argc + newflagsCount; i++) {
-+        newargv[i] = newflags[i - argc];
-+    }
-+
-+    /* And now cap it off... */
-+    newargv[i] = NULL;
-+
-+    return newargv;
-+}
- 
- /**
-  * distcc client entry point.
-@@ -150,6 +229,7 @@
-     int status, sg_level, tweaked_path = 0;
-     char **compiler_args;
-     char *compiler_name;
-+    char **newargv;
-     int ret;
- 
-     dcc_client_catch_signals();
-@@ -183,7 +263,12 @@
-             goto out;
-         }
-         
--        dcc_find_compiler(argv, &compiler_args);
-+        if(!(newargv = getNewArgv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_find_compiler(newargv, &compiler_args);
-+        free(newargv);
-         /* compiler_args is now respectively either "cc -c hello.c" or
-          * "gcc -c hello.c" */
- 
-@@ -200,7 +285,12 @@
-                                           &tweaked_path)) != 0)
-             goto out;
-         
--        dcc_copy_argv(argv, &compiler_args, 0);
-+        if(!(newargv = getNewArgv(argv))) {
-+            ret = EXIT_OUT_OF_MEMORY;
-+            goto out;
-+        }
-+        dcc_copy_argv(newargv, &compiler_args, 0);
-+        free(newargv);
-         compiler_args[0] = compiler_name;
-     }
- 
diff --git a/sys-devel/distcc/files/distcc-march-native.patch b/sys-devel/distcc/files/distcc-march-native.patch
deleted file mode 100644
index a5c9bb2e4da1..000000000000
--- a/sys-devel/distcc/files/distcc-march-native.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ur distcc-2.18.3/src/arg.c distcc-modified/src/arg.c
---- distcc-2.18.3/src/arg.c	2004-11-30 13:13:53.000000000 +0100
-+++ distcc-modified/src/arg.c	2008-02-05 17:56:58.000000000 +0100
-@@ -171,6 +171,12 @@
-                     to distribute it even if we could. */
-                 rs_trace("%s implies -E (maybe) and must be local", a);
-                 return EXIT_DISTCC_FAILED;
-+            } else if (!strcmp(a, "-march=native")) {
-+                rs_trace("-march=native generates code for local machine; must be local");
-+                return EXIT_DISTCC_FAILED;
-+            } else if (!strcmp(a, "-mtune=native")) {
-+                rs_trace("-mtune=native optimizes for local machine; must be local");
-+                return EXIT_DISTCC_FAILED;
-             } else if (str_startswith("-Wa,", a)) {
-                 /* Look for assembler options that would produce output
-                  * files and must be local.