--- gtk2-engines-xfce-2.4.2.orig/debian/compat
+++ gtk2-engines-xfce-2.4.2/debian/compat
@@ -0,0 +1 @@
+4
--- gtk2-engines-xfce-2.4.2.orig/debian/copyright
+++ gtk2-engines-xfce-2.4.2/debian/copyright
@@ -0,0 +1,40 @@
+This package was debianized by Martin Loschwitz <madkiss@madkiss.org> on
+Sat, 09 Nov 2002 10:41:34 +0100.
+
+You can fetch this package from from http://www.xfce.org/
+
+Upstream Author is Olivier Fourdan <fourdan@xfce.org>, various code
+portions were taken out of the following projects:
+
+   Work based on Thinice port by Tim Gerla <timg@rrv.net>,
+   Tomas Ögren <stric@ing.umu.se> and Richard Hult.
+   Portions based on Raleigh theme by Owen Taylor
+   Portions based on Notif theme
+   Portions based on Notif2 theme
+   Portions based on original GTK theme
+   Portions based on Smooth theme by Andrew Johnson <ajgenius@ajgenius.us>
+   Portions based on IceGradient theme by  Tim Gerla <timg@means.net>
+       Tomas <C3><96>gren <stric@ing.umu.se>
+       JM Perez <jose.perez@upcnet.es>
+   Portions based on Wonderland theme by Garrett LeSage
+    Alexander Larsson
+    Owen Taylor <otaylor@redhat.com>
+
+gtk2-engines-xfce is (c) 1999-2007 Olivier Fourdan
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 dated June, 1991.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+
+On Debian systems, the complete text of the GNU General Public 
+License can be found in `/usr/share/common-licenses/GPL'.
--- gtk2-engines-xfce-2.4.2.orig/debian/README.Debian
+++ gtk2-engines-xfce-2.4.2/debian/README.Debian
@@ -0,0 +1,16 @@
+README.Debian for gtk2-engines-xfce (added on 2003-04-21)
+---------------------------------------------------------
+
+Please note that the format for gtk2-engines-xfce entries in
+tha ~/.gtkrc-2.0 file has changed between version 2.0.10 and 
+2.1.0. If you notice that many of your Xfce4 applications 
+suddenly start to crash after the update, this is the reason
+for it. There are actually two ways to fix your config file:
+
+1) Edit ~/.gtkrc-2.0 manually; exchange "smooth_edge = TRUE"
+with "smooth_edge = true"
+
+2) Just move ~/.gtkrc-2.0 away and let the Xfce4 settings 
+manager create a new one for you.
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 22 Apr 2003 18:24:00 +0200
--- gtk2-engines-xfce-2.4.2.orig/debian/rules
+++ gtk2-engines-xfce-2.4.2/debian/rules
@@ -0,0 +1,86 @@
+#!/usr/bin/make -f
+
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -O0
+else
+	CFLAGS += -O2
+endif
+
+configure: configure-stamp
+configure-stamp:
+	
+	dh_testdir
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr
+	touch configure-stamp
+
+build: build-stamp
+
+build-stamp:  configure-stamp
+
+	dh_testdir
+	$(MAKE)
+	touch build-stamp
+
+clean:
+	
+	dh_testdir
+	dh_testroot
+	rm -f configure-stamp build-stamp 
+
+	[ ! -f Makefile ] || $(MAKE) distclean
+
+	-test -r /usr/share/misc/config.sub && \
+	  cp -f /usr/share/misc/config.sub config.sub
+	-test -r /usr/share/misc/config.guess && \
+	  cp -f /usr/share/misc/config.guess config.guess
+
+	dh_clean
+
+install: build
+	
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+
+	$(MAKE) install DESTDIR=`pwd`/debian/gtk2-engines-xfce
+
+	# use Rodent stock icons
+	for f in $(CURDIR)/debian/gtk2-engines-xfce/usr/share/themes/*/gtk-2.0/gtkrc; do \
+		echo 'include "/usr/share/icons/Rodent/iconrc-png"' >> $$f; \
+	done
+
+	#Don't ship .la files:
+	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.4.0/engines/libxfce.a
+	rm -f `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.4.0/engines/libxfce.la
+
+	chrpath -d -k `pwd`/debian/gtk2-engines-xfce/usr/lib/gtk-2.0/2.4.0/engines/libxfce.so
+
+binary-indep: build install
+
+binary-arch: build install
+	
+	dh_testdir
+	dh_testroot
+	
+	dh_installdocs
+	dh_installchangelogs ChangeLog
+
+	#dh_gtkmodules
+
+	dh_strip
+	dh_compress
+
+	dh_fixperms
+	dh_installdeb
+	
+	dh_shlibdeps
+	dh_gencontrol
+	
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 
--- gtk2-engines-xfce-2.4.2.orig/debian/changelog
+++ gtk2-engines-xfce-2.4.2/debian/changelog
@@ -0,0 +1,192 @@
+gtk2-engines-xfce (2.4.2-1~bpo40+1) etch-backports; urgency=low
+
+  * rebuild for etch-backports.
+  * debian/copyright converted to utf8.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Fri, 21 Dec 2007 07:57:48 +0100
+
+gtk2-engines-xfce (2.4.2-1) unstable; urgency=low
+
+  [ Mike Massonnet (mmassonnet) ]
+  * Fix typo in the description of the package.
+
+  [ Simon Huggins ]
+  * debian/control: Move fake Homepage field to a real one now dpkg
+    supports it.
+
+  [ Yves-Alexis Perez ]
+  * New upstrean release.
+  * debian/rules: don't ignore all make errors at clean stage.
+
+  [ Simon Huggins ]
+  * Add Vcs-* headers to debian/control
+
+ -- Simon Huggins <huggie@earth.li>  Tue, 27 Nov 2007 16:39:16 +0000
+
+gtk2-engines-xfce (2.4.1-1) unstable; urgency=low
+
+  * New upstream release. 
+  * debian/copyright: updated copyright holders.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sun, 15 Apr 2007 15:28:17 +0100
+
+gtk2-engines-xfce (2.4.0-1) experimental; urgency=low
+
+  * (Yves-Alexis Perez)
+    - New upstream release
+
+  * (Emanuele Rocca)  
+    - Convert the package to the new Gtk modules handling.      closes: #406874
+    - Bump up the libgtk2.0-dev build-dep to >= 2.10.1-1.
+    - Call dh_gtkmodules.
+    - Add ${misc:Depends}.
+    - Use the correct gtk version number in debian/rules.
+    
+    Thanks to Loïc Minier for the patch.
+
+ -- Emanuele Rocca <ema@debian.org>  Wed, 24 Jan 2007 23:43:52 +0100
+
+gtk2-engines-xfce (2.3.99.2-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Thu, 16 Nov 2006 13:30:49 +0100
+
+gtk2-engines-xfce (2.3.99.1-1) unstable; urgency=low
+
+  * New upstream release 
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Sat, 23 Sep 2006 13:46:45 +0100
+
+gtk2-engines-xfce (2.3.90.2-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control: updated standards version to 3.7.2
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Mon, 10 Jul 2006 17:56:11 +0200
+
+gtk2-engines-xfce (2.3.90.1-1) unstable; urgency=low
+
+  * New Upstream Release
+  * Added libx11-dev build dependency
+  * Removed pointless .la files
+ 
+ -- Yves-Alexis Perez <corsac@corsac.net>  Wed, 03 May 2006 18:35:05 +0100
+  
+gtk2-engines-xfce (2.2.8-1) unstable; urgency=low
+
+  * New Upstream Release
+
+ -- Yves-Alexis Perez <corsac@corsac.net>  Tue, 08 Nov 2005 00:07:26 +0100 
+
+gtk2-engines-xfce (2.2.7-1) unstable; urgency=low
+
+  * New Upstream Release
+  * Change suite to unstable
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 18 Jun 2005 09:50:55 +0100
+
+gtk2-engines-xfce (2.2.6-1) experimental; urgency=low
+
+  * ML: New Upstream Release (Xfce 4.2.1)                                      
+  * ML: Upload to experimental to prevents problems with NEW packages          
+  * ML: debian/control: Added/fixed Maintainer/Uploaders fields       
+
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 19 Mar 2005 13:02:00 +0100     
+
+gtk2-engines-xfce (2.2.5-2) experimental; urgency=low
+
+  * Use the Rodent stock icons by default
+  * Add a Homepage: to the description
+
+ -- Simon Huggins <huggie@earth.li>  Sun, 16 Jan 2005 14:20:10 +0000
+
+gtk2-engines-xfce (2.2.5-1) experimental; urgency=low
+
+  * New upstream release
+  * Depend on xfce4-icon-theme
+
+ -- Simon Huggins <huggie@earth.li>  Sat, 15 Jan 2005 14:38:22 +0000
+
+gtk2-engines-xfce (2.2.2-1) experimental; urgency=low
+
+  * New upstream release
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 19 Nov 2004 16:49:00 +0100
+
+gtk2-engines-xfce (2.1.10-1) unstable; urgency=low
+
+   * New upstream release
+   * Remove Norbert (as requested) and add self to Uploaders
+
+ -- Simon Huggins <huggie@earth.li>  Sun, 08 Aug 2004 17:03:33 +0100
+
+gtk2-engines-xfce (2.1.8-1.1) unstable; urgency=low
+
+   * NMU, with maintainer approval, to avoid breakage with new GTK+.
+   * Rebuilt with GTK+ 2.4.
+
+ -- Sebastien Bacher <seb128@debian.org>  Sun, 23 May 2004 17:05:36 +0200
+
+gtk2-engines-xfce (2.1.8-1) unstable; urgency=low
+
+  * New upstream release
+  * Add Daniel Silverstone <dsilvers@debian.org> to Uploaders as approved by
+    madkiss
+  * Thanks to Daniel for checking and uploading these packages
+
+ -- Simon Huggins <huggie@earth.li>  Tue, 24 Feb 2004 22:20:40 +0000
+ 
+gtk2-engines-xfce (2.1.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Martin Loschwitz <madkiss@debian.org>  Fri, 26 Dec 2003 16:31:00 +0100
+ 
+gtk2-engines-xfce (2.1.6-1) unstable; urgency=low
+
+  * New upstream release
+  * New Co-Maintainer: Norbert Tretkowski.
+
+ -- Martin Loschwitz <madkiss@debian.org>  Tue, 29 Sep 2003 18:16:00 +0200
+
+gtk2-engines-xfce (2.1.0+cvs.20030421-1) unstable; urgency=low
+
+  * New CVS Checkout (2003-04-21)
+  * Updated for GTK 2.2 (Closes: #177975)
+ 
+ -- Martin Loschwitz <madkiss@debian.org>  Mon, 21 Apr 2003 21:53:00 +0200
+ 
+gtk2-engines-xfce (2.0.10+cvs.20030301-1) unstable; urgency=low
+
+  * New CVS checkout (Using Xfce CVS, 2003-03-01)
+  * Official release (really this time) (last release was never made public)
+  * debian/control: Changed Maintainer: E-Mail address
+  
+ -- Martin Loschwitz <madkiss@debian.org>  Sat, 01 Mar 2003 16:19:00 +0100
+     
+gtk2-engines-xfce (2.0.10+cvs.20030216-1) unstable; urgency=low
+
+  * New CVS checkout (Using Xfce CVS, 2003-02-16)
+  * Official release (last release was never made public)
+ 
+ -- Martin Loschwitz <madkiss@madkiss.org>  Sun, 16 Feb 2003 14:01:00 +0100
+ 
+gtk2-engines-xfce (2.0.10+cvs.20030119-1) unstable; urgency=low
+
+  * New CVS Checkout (Using Xfce CVS, 2003-01-19)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Sun, 19 Jan 2003 17:00:00 +0100
+ 
+gtk2-engines-xfce (2.0.10+cvs.20021222-1) unstable; urgency=low
+
+  * New CVS Checkout (using Xfce CVS, 2002-12-10)
+  * debian/rules: Moved files into correct directory (Closes: #171484)
+ 
+ -- Martin Loschwitz <madkiss@madkiss.org>  Thu, 10 Dec 2002 19:11:00 +0100
+ 
+gtk2-engines-xfce (2.0.10+cvs.20021127-1) unstable; urgency=low
+
+  * Initial Release. (Closes: #170987)
+
+ -- Martin Loschwitz <madkiss@madkiss.org>  Wed, 27 Nov 2002 18:58:00 +0100
--- gtk2-engines-xfce-2.4.2.orig/debian/control
+++ gtk2-engines-xfce-2.4.2/debian/control
@@ -0,0 +1,19 @@
+Source: gtk2-engines-xfce
+Section: x11
+Priority: optional
+Maintainer: Debian Xfce Maintainers <pkg-xfce-devel@lists.alioth.debian.org>
+Uploaders: Martin Loschwitz <madkiss@debian.org>, Emanuele Rocca <ema@debian.org>, Simon Huggins <huggie@earth.li>, Yves-Alexis Perez <corsac@debian.org>
+Build-Depends: debhelper (>= 4.1.26), libgtk2.0-dev, libx11-dev (> 2:1.0.0-6), chrpath
+Standards-Version: 3.7.2
+Homepage: http://www.xfce.org/
+Vcs-Svn: svn://svn.debian.org/pkg-xfce/desktop/trunk/gtk2-engines-xfce/
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-xfce/desktop/trunk/gtk2-engines-xfce/
+
+Package: gtk2-engines-xfce
+Architecture: any
+Depends: ${misc:Depends}, ${shlibs:Depends}, xfce4-icon-theme
+Suggests: xfce4-panel
+Description: A GTK+-2.0 theme engine for Xfce
+ This package contains an Xfce engine for GTK2.0 which makes you able
+ to use various GTK2.0 themes with Xfce. It also contains some ready
+ themes, but you are of course free to design your own.
--- gtk2-engines-xfce-2.4.2.orig/debian/watch
+++ gtk2-engines-xfce-2.4.2/debian/watch
@@ -0,0 +1,3 @@
+version=3
+http://www.xfce.org/archive/xfce-(.*)/src/ \
+	gtk-xfce-engine-(.*)\.tar\.bz2
--- gtk2-engines-xfce-2.4.2.orig/config.guess
+++ gtk2-engines-xfce-2.4.2/config.guess
@@ -139,23 +139,6 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-if [ "${UNAME_SYSTEM}" = "Linux" ] ; then
-	eval $set_cc_for_build
-	cat << EOF > $dummy.c
-	#include <features.h>
-	#ifdef __UCLIBC__
-	# ifdef __UCLIBC_CONFIG_VERSION__
-	LIBC=uclibc __UCLIBC_CONFIG_VERSION__
-	# else
-	LIBC=uclibc
-	# endif
-	#else
-	LIBC=gnu
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep LIBC= | sed -e 's: ::g'`
-fi
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -850,28 +833,28 @@
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-${LIBC}
+	echo cris-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-${LIBC}
+	echo crisv32-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-${LIBC}
+    	echo frv-unknown-linux-gnu
 	exit ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -894,7 +877,7 @@
 		s: ::g
 		p
 	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -917,16 +900,16 @@
 		s: ::g
 		p
 	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; }
+	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-${LIBC}
+	echo or32-unknown-linux-gnu
 	exit ;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-${LIBC}
+	echo powerpc-unknown-linux-gnu
 	exit ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-${LIBC}
+	echo powerpc64-unknown-linux-gnu
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -939,40 +922,40 @@
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-${LIBC} ;;
-	  PA8*) echo hppa2.0-unknown-linux-${LIBC} ;;
-	  *)    echo hppa-unknown-linux-${LIBC} ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-${LIBC}
+	echo hppa64-unknown-linux-gnu
 	exit ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-${LIBC}
+	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-${LIBC}
+	echo x86_64-unknown-linux-gnu
 	exit ;;
     xtensa:Linux:*:*)
-    	echo xtensa-unknown-linux-${LIBC}
+    	echo xtensa-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -987,22 +970,20 @@
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-${LIBC}"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}aout"
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}coff"
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit ;;
 	  "")
 		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}oldld"
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 		exit ;;
 	esac
-	# This should get integrated into the C code below, but now we hack
-	if [ "$LIBC" != "gnu" ] ; then echo "$TENTATIVE" && exit 0 ; fi
 	# Determine whether the default compiler is a.out or elf
 	eval $set_cc_for_build
 	sed 's/^	//' << EOF >$dummy.c
--- gtk2-engines-xfce-2.4.2.orig/config.sub
+++ gtk2-engines-xfce-2.4.2/config.sub
@@ -244,7 +244,7 @@
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
 	| bfin \
 	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx | dvp \
+	| d10v | d30v | dlx | dsp16xx \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
 	| i370 | i860 | i960 | ia64 \
@@ -277,7 +277,7 @@
 	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
 	| pyramid \
 	| score \
-	| sh | sh[1234] | sh[24]a | sh[24]a*eb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
+	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
@@ -358,7 +358,7 @@
 	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
 	| pyramid-* \
 	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]a*eb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
+	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
@@ -694,24 +694,6 @@
 		basic_machine=m68k-atari
 		os=-mint
 		;;
-	mipsEE* | ee | ps2)
-		basic_machine=mips64r5900el-scei
-		case $os in
-		    -linux*)
-			;;
-		    *)
-			os=-elf
-			;;
-		esac
-		;;
-	iop)
-		basic_machine=mipsel-scei
-		os=-irx
-		;;
-	dvp)
-		basic_machine=dvp-scei
-		os=-elf
-		;;
 	mips3*-*)
 		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
 		;;
@@ -1244,7 +1226,7 @@
 	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
 	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
 	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -irx*)
+	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
 	# Remember, each alternative MUST END IN *, to match a version number.
 		;;
 	-qnx*)
