makeing sure this commited right

Package-Manager: portage-2.1.2_rc1-r2

8 files changed, 24 insertions, 1420 deletions

diff --git a/x11-misc/electricsheep/Manifest b/x11-misc/electricsheep/Manifest
index 975d40ab94e4..926f35442041 100644
--- a/x11-misc/electricsheep/Manifest
+++ b/x11-misc/electricsheep/Manifest
@@ -1,15 +1,9 @@
-AUX electricsheep-2.6.3-cflagsfix.patch 16890 RMD160 1217c0a3f671aa99c6ef29f457189135aa89d904 SHA1 ca0c11a47a2cd7d03debe4ffeef5ae77ed80d1b3 SHA256 6bb51aaf6ad3552dc0128e9a551b556bebcdf65bdb5268984a6386f620576ab3
-MD5 8573de509811af15cb08905c91a05864 files/electricsheep-2.6.3-cflagsfix.patch 16890
-RMD160 1217c0a3f671aa99c6ef29f457189135aa89d904 files/electricsheep-2.6.3-cflagsfix.patch 16890
-SHA256 6bb51aaf6ad3552dc0128e9a551b556bebcdf65bdb5268984a6386f620576ab3 files/electricsheep-2.6.3-cflagsfix.patch 16890
-AUX electricsheep-2.6.3-xloadimg.patch 810 RMD160 94a0e1c6407332db19e44b9e653b12c13e47944a SHA1 4350ab457428cbb786c75722968f8123225edadb SHA256 a3bb1d806142cc21f58c267fd8833d694ddae730daaafc21a837081d556a1839
-MD5 022c0e46046b916c0cff67c0be5dc1d3 files/electricsheep-2.6.3-xloadimg.patch 810
-RMD160 94a0e1c6407332db19e44b9e653b12c13e47944a files/electricsheep-2.6.3-xloadimg.patch 810
-SHA256 a3bb1d806142cc21f58c267fd8833d694ddae730daaafc21a837081d556a1839 files/electricsheep-2.6.3-xloadimg.patch 810
-AUX electricsheep-2.6.4-cflagsfix.patch 17080 RMD160 d660f4fc283b2ea0985a03243b88762bd626baaf SHA1 86cb3900e2df4f585cecb3fc5ce3940920fe9669 SHA256 28ad317686c3c84bec31970728ca3ad8b0ededd72f54c1a18f72dce13ed6818a
-MD5 188a0eed95226cf2419172bb60d586e0 files/electricsheep-2.6.4-cflagsfix.patch 17080
-RMD160 d660f4fc283b2ea0985a03243b88762bd626baaf files/electricsheep-2.6.4-cflagsfix.patch 17080
-SHA256 28ad317686c3c84bec31970728ca3ad8b0ededd72f54c1a18f72dce13ed6818a files/electricsheep-2.6.4-cflagsfix.patch 17080
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+- -----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX electricsheep-2.6.7-cflagsfix.patch 16890 RMD160 2ee5709fb7bfd2ae5a3fa11f271f5d8b8b9633fd SHA1 00c59e7196f69a066b16acca67350ea550070390 SHA256 b4d6343d1159c5c755d75412548c20ef6b27b18aeee6386e64cc84acc46f9ff0
 MD5 d73734597cf76749bb649d73d7e7f3bb files/electricsheep-2.6.7-cflagsfix.patch 16890
 RMD160 2ee5709fb7bfd2ae5a3fa11f271f5d8b8b9633fd files/electricsheep-2.6.7-cflagsfix.patch 16890
@@ -26,18 +20,8 @@ AUX electricsheep.desktop 3973 RMD160 d765b848da913d773617817612fe4f6ac961c644 S
 MD5 cf3d6d65b467f83063fea471d22e2f37 files/electricsheep.desktop 3973
 RMD160 d765b848da913d773617817612fe4f6ac961c644 files/electricsheep.desktop 3973
 SHA256 56884adb9d05705617f37874b72de83b4d37ef411f3d90d7fb7ca78019045fe1 files/electricsheep.desktop 3973
-DIST electricsheep-2.6.3.tar.gz 1438987 RMD160 2732d689843320c48f328defe80891e94f71df7a SHA1 5fec56d65b6b717a13808be8aaeb6e372ce40329 SHA256 771d42106a765942fd6fb6f63e4506a983f067896c8b6f5e8e447e2001dd2abd
-DIST electricsheep-2.6.4.tar.gz 1387634 RMD160 98d328abc5e6856ef7ce07fc73b53cc414e69da7 SHA1 8a83389e00f78e22c25c26334f737e82444f427e SHA256 2941d130365a4a6fc02fe3173b674d9034ef3d8fdd4d00f8e7aa34317b7e945e
 DIST electricsheep-2.6.7.tar.gz 1387836 RMD160 b842ec3761294bb6501127daf9fc377752bd830d SHA1 e666abbad9146ccbe0b20e5ce39ca131770d5512 SHA256 f7b91f7a81a556a213543ab76c9595a738dd931fe2bc2acac6b704b5d09253f0
 DIST electricsheep-2.6.8.tar.gz 1355274 RMD160 96830985e3cf4d2f132ae7a0124c55cd922d49e5 SHA1 0a430a90dd003a3d59248bbf44013e85978c2220 SHA256 c593e4be3fc6674bfd77277e7e3326d48885b8b105f19221398f97a31d6698ba
-EBUILD electricsheep-2.6.3-r2.ebuild 2149 RMD160 f244ff0fd832920bbbf1171bfdfd8e62e712aa16 SHA1 905e526892420c18ba3fe93b024c18981ee1323f SHA256 4c0546d58ba4b5af3517ce958e1b91179b918a7ec6f4291c444555ac33d4a8b6
-MD5 862d6e4165a0f0b5fbd2e6deb02648ed electricsheep-2.6.3-r2.ebuild 2149
-RMD160 f244ff0fd832920bbbf1171bfdfd8e62e712aa16 electricsheep-2.6.3-r2.ebuild 2149
-SHA256 4c0546d58ba4b5af3517ce958e1b91179b918a7ec6f4291c444555ac33d4a8b6 electricsheep-2.6.3-r2.ebuild 2149
-EBUILD electricsheep-2.6.4.ebuild 2107 RMD160 3c2526bd7798dd8c2bcf76ddfc4d70c321279f0b SHA1 397ff963b81932115c6e6bea96112fd5e161928e SHA256 5888a9e267d5624cba21c26feb550905a7fed735ef1b071cf470892d8bd936ae
-MD5 7c76f020fd1c00d3f881200462d83b28 electricsheep-2.6.4.ebuild 2107
-RMD160 3c2526bd7798dd8c2bcf76ddfc4d70c321279f0b electricsheep-2.6.4.ebuild 2107
-SHA256 5888a9e267d5624cba21c26feb550905a7fed735ef1b071cf470892d8bd936ae electricsheep-2.6.4.ebuild 2107
 EBUILD electricsheep-2.6.7-r1.ebuild 2190 RMD160 d045c5210a9bc717011b5b024b206f27c96606c7 SHA1 6ec52a5d1af4685f1d152805fc01c10ffeec584f SHA256 c99d446174bbbd53d077386bd868feb2e63aa78af988aa301a1fd165043045be
 MD5 d3dff77e013363fb3d58332f81594da9 electricsheep-2.6.7-r1.ebuild 2190
 RMD160 d045c5210a9bc717011b5b024b206f27c96606c7 electricsheep-2.6.7-r1.ebuild 2190
@@ -46,23 +30,31 @@ EBUILD electricsheep-2.6.8.ebuild 2165 RMD160 a2e7ae6b721479d897053c81319f761c5a
 MD5 b9e3655b2a9cfd08a0d48c4e6d16c70e electricsheep-2.6.8.ebuild 2165
 RMD160 a2e7ae6b721479d897053c81319f761c5abfafd7 electricsheep-2.6.8.ebuild 2165
 SHA256 3bb44539bf3abeed2625639c385941794641baf0e7f64a8cf23169209df86da0 electricsheep-2.6.8.ebuild 2165
-MISC ChangeLog 6258 RMD160 a6a2b739d285ef8baed60ea155e916971df82291 SHA1 22206396639b9112deb33890ef62b0e76c62ece3 SHA256 aa865500f9b91f7db4608dea52e9430d6810a1c3cb5c0a89c5a0457d3e9744bb
-MD5 45872fd283fd38ad54956a421dea513e ChangeLog 6258
-RMD160 a6a2b739d285ef8baed60ea155e916971df82291 ChangeLog 6258
-SHA256 aa865500f9b91f7db4608dea52e9430d6810a1c3cb5c0a89c5a0457d3e9744bb ChangeLog 6258
+MISC ChangeLog 6541 RMD160 ac8d2e9e96fddc96fe5f266289552c3ac262cea8 SHA1 9f5b9e5d7afef78126db9257b9182c4494c07029 SHA256 71fb5d2b6c57bc906512a60e3d75c7fe3c9563a38ec43ecfc483fe6e65b92523
+MD5 7f58858f62dd034832818e7ea55a0954 ChangeLog 6541
+RMD160 ac8d2e9e96fddc96fe5f266289552c3ac262cea8 ChangeLog 6541
+SHA256 71fb5d2b6c57bc906512a60e3d75c7fe3c9563a38ec43ecfc483fe6e65b92523 ChangeLog 6541
 MISC metadata.xml 319 RMD160 8d2b4fb22841a8e8465a2cd5b6ebe73524b34a7a SHA1 eef4c6d4f7d83fecca5844d10e6efd0b9566a5e3 SHA256 ff313e851d928bdcbd4d7a4ee641ac93aef523b1524ff5bd72acb60ddfc2d2ed
 MD5 f84d0865990260d30b1b5180364dd6a8 metadata.xml 319
 RMD160 8d2b4fb22841a8e8465a2cd5b6ebe73524b34a7a metadata.xml 319
 SHA256 ff313e851d928bdcbd4d7a4ee641ac93aef523b1524ff5bd72acb60ddfc2d2ed metadata.xml 319
-MD5 fea1d43d815ea2c8a39728b80367a286 files/digest-electricsheep-2.6.3-r2 262
-RMD160 26795c02d5dc15499d841897349c03b3b1c12a1a files/digest-electricsheep-2.6.3-r2 262
-SHA256 6b8b32c40065c22fa4fd8c766d3316f6a190d7e970c61d9ca94b6cfb4af8a420 files/digest-electricsheep-2.6.3-r2 262
-MD5 8126271c36c1ac1a8ebb5741794d652e files/digest-electricsheep-2.6.4 262
-RMD160 58d3d72485b43fbb2473697700089c7d4136e13c files/digest-electricsheep-2.6.4 262
-SHA256 30d7ca195b124a61702061d005f46acb1958a0621d73ee5149b55d38c2ef40a8 files/digest-electricsheep-2.6.4 262
 MD5 c2de50fded303fac66eadc4d38c6869b files/digest-electricsheep-2.6.7-r1 262
 RMD160 199d17c30d2f9340c91fb02399fafa8c9d53595c files/digest-electricsheep-2.6.7-r1 262
 SHA256 4bd8a14d43ec63eb5f662cec2cb62c5a5a8690ea2617259954ea12c3c67edd5a files/digest-electricsheep-2.6.7-r1 262
 MD5 db9f89b7c6b03c0af3820cb0c020c11d files/digest-electricsheep-2.6.8 262
 RMD160 8c555173937f8a5266c40837aa66cde3096a7ece files/digest-electricsheep-2.6.8 262
 SHA256 1e502fef1ab43c6d3ffba747278f3d432b802607dbde2fbeeab0071c8e44d01d files/digest-electricsheep-2.6.8 262
+- -----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFS9OEmdTrptrqvGERAlczAJ4q+3S/MBkT79jOO7bcR5ylH8iubACcDynn
+VmUiTQ/MPMEJHJoBejJIdHk=
+=ozxW
+- -----END PGP SIGNATURE-----
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux)
+
+iD8DBQFFS9TTmdTrptrqvGERAnDRAJ9/TsoIjg5yGuNWaEjMruzCgQPzkQCgkFcb
+V+TarZBAEt9Wg6f4GBhv3Lg=
+=Rd3/
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/electricsheep/electricsheep-2.6.3-r2.ebuild b/x11-misc/electricsheep/electricsheep-2.6.3-r2.ebuild
deleted file mode 100644
index fb9c206b5487..000000000000
--- a/x11-misc/electricsheep/electricsheep-2.6.3-r2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.3-r2.ebuild,v 1.1 2006/01/04 22:29:39 dragonheart Exp $
-
-inherit eutils flag-o-matic kde-functions
-
-DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
-HOMEPAGE="http://electricsheep.org/"
-SRC_URI="http://electricsheep.org/${P}.tar.gz"
-IUSE="kde"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc x86"
-
-RDEPEND="|| ( ( x11-libs/libXv
-			x11-libs/libICE
-			x11-libs/libSM
-		)
-		virtual/x11
-	)
-	dev-libs/expat
-	net-misc/curl
-	media-libs/jpeg
-	media-libs/libpng
-	media-libs/libsdl
-	virtual/libc
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)
-	sys-apps/groff
-	dev-lang/perl
-	>=sys-apps/sed-4
-	media-libs/libmpeg2
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-	# Detect PIC requirement from direct from compiler instead of
-	# macro PIC.
-	sed -i -e 's/def PIC/def __PIC__/' ${S}/mpeg2dec/src/cpu_accel.c
-	epatch ${FILESDIR}/${P}-cflagsfix.patch
-	epatch ${FILESDIR}/${P}-xloadimg.patch
-}
-
-# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas
-# if they exist on the user machine although these aren't deps.
-
-src_install() {
-
-
-	# prevent writing for xscreensaver
-	sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \
-		Makefile || die "sed Makefile failed"
-
-	# install the xscreensaver config file
-	insinto /usr/share/xscreensaver/config
-	doins electricsheep.xml
-
-	make install DESTDIR=${D} || die "make install failed"
-
-	dodir /usr/share/electricsheep
-	if [ ! -f ${ROOT}/usr/share/electricsheep/electricsheep-uniqueid ]
-	then
-		${D}/usr/bin/uniqueid > ${D}/usr/share/electricsheep/electricsheep-uniqueid
-	fi
-
-	if use kde;
-	then
-		set-kdedir
-		insinto /usr/share/applications
-		doins ${FILESDIR}/${PN}.desktop
-		insinto ${KDEDIR}//share/applnk/System/ScreenSavers
-		doins ${FILESDIR}/${PN}.desktop
-	fi
-
-	# remove header files that are installed over libmpeg2
-	rm -rf ${D}/usr/include
-}
diff --git a/x11-misc/electricsheep/electricsheep-2.6.4.ebuild b/x11-misc/electricsheep/electricsheep-2.6.4.ebuild
deleted file mode 100644
index d37180faebb8..000000000000
--- a/x11-misc/electricsheep/electricsheep-2.6.4.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/electricsheep/electricsheep-2.6.4.ebuild,v 1.1 2006/01/04 22:29:39 dragonheart Exp $
-
-inherit eutils flag-o-matic kde-functions
-
-DESCRIPTION="realize the collective dream of sleeping computers from all over the internet"
-HOMEPAGE="http://electricsheep.org/"
-SRC_URI="http://electricsheep.org/${P}.tar.gz"
-IUSE="kde"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-
-RDEPEND="|| ( ( x11-libs/libXv
-			x11-libs/libICE
-			x11-libs/libSM
-		)
-		virtual/x11
-	)
-	dev-libs/expat
-	net-misc/curl
-	media-libs/jpeg
-	media-libs/libpng
-	media-libs/libsdl
-	virtual/libc
-	sys-libs/zlib"
-
-DEPEND="${RDEPEND}
-	|| ( ( x11-proto/xextproto
-			x11-libs/libXt
-		)
-		virtual/x11
-	)
-	sys-apps/groff
-	dev-lang/perl
-	>=sys-apps/sed-4
-	media-libs/libmpeg2
-	sys-apps/gawk
-	sys-apps/grep
-	sys-devel/libtool"
-
-src_unpack() {
-	unpack ${A}
-	# Detect PIC requirement from direct from compiler instead of
-	# macro PIC.
-	sed -i -e 's/def PIC/def __PIC__/' ${S}/mpeg2dec/src/cpu_accel.c
-	epatch ${FILESDIR}/${P}-cflagsfix.patch
-}
-
-# Also detects and ties in sys-libs/slang, media-libs/aalib media-libs/svgalib and nas
-# if they exist on the user machine although these aren't deps.
-
-src_install() {
-
-
-	# prevent writing for xscreensaver
-	sed -i "s/^install-data-local:$/install-data-local:\nmy-install-data-local:/" \
-		Makefile || die "sed Makefile failed"
-
-	# install the xscreensaver config file
-	insinto /usr/share/xscreensaver/config
-	doins electricsheep.xml
-
-	make install DESTDIR=${D} || die "make install failed"
-
-	dodir /usr/share/electricsheep
-	if [ ! -f ${ROOT}/usr/share/electricsheep/electricsheep-uniqueid ]
-	then
-		${D}/usr/bin/uniqueid > ${D}/usr/share/electricsheep/electricsheep-uniqueid
-	fi
-
-	if use kde;
-	then
-		set-kdedir
-		insinto /usr/share/applications
-		doins ${FILESDIR}/${PN}.desktop
-		insinto ${KDEDIR}//share/applnk/System/ScreenSavers
-		doins ${FILESDIR}/${PN}.desktop
-	fi
-
-	# remove header files that are installed over libmpeg2
-	rm -rf ${D}/usr/include
-}
diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r2 b/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r2
deleted file mode 100644
index 7ba66b32f61b..000000000000
--- a/x11-misc/electricsheep/files/digest-electricsheep-2.6.3-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ef3eec7b07313928ff253562e1994820 electricsheep-2.6.3.tar.gz 1438987
-RMD160 2732d689843320c48f328defe80891e94f71df7a electricsheep-2.6.3.tar.gz 1438987
-SHA256 771d42106a765942fd6fb6f63e4506a983f067896c8b6f5e8e447e2001dd2abd electricsheep-2.6.3.tar.gz 1438987
diff --git a/x11-misc/electricsheep/files/digest-electricsheep-2.6.4 b/x11-misc/electricsheep/files/digest-electricsheep-2.6.4
deleted file mode 100644
index d2b66d12c8d4..000000000000
--- a/x11-misc/electricsheep/files/digest-electricsheep-2.6.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 59834e2b6a13280e9e6313533c7ff6cf electricsheep-2.6.4.tar.gz 1387634
-RMD160 98d328abc5e6856ef7ce07fc73b53cc414e69da7 electricsheep-2.6.4.tar.gz 1387634
-SHA256 2941d130365a4a6fc02fe3173b674d9034ef3d8fdd4d00f8e7aa34317b7e945e electricsheep-2.6.4.tar.gz 1387634
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.3-cflagsfix.patch b/x11-misc/electricsheep/files/electricsheep-2.6.3-cflagsfix.patch
deleted file mode 100644
index 673783987dbb..000000000000
--- a/x11-misc/electricsheep/files/electricsheep-2.6.3-cflagsfix.patch
+++ /dev/null
@@ -1,591 +0,0 @@
---- electricsheep-2.6.3/mpeg2dec/configure.in.orig	2005-09-11 08:25:16.000000000 +1000
-+++ electricsheep-2.6.3/mpeg2dec/configure.in	2005-09-11 08:26:33.000000000 +1000
-@@ -15,70 +15,6 @@
- AC_PROG_CC
- AC_PROG_GCC_TRADITIONAL
- 
--dnl CC-specific flags
--if test x"$CC" = x"checkergcc"; then
--    enable_sdl=no
--elif test x"$GCC" = x"yes"; then
--
--    dnl GCC-specific flags
--    dnl -Wall -Werror moved to the end to not disturb the configure script
--
--    dnl -O3
--    changequote(<<,>>)
--    OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
--    changequote([,])
--    OPT_CFLAGS="$OPT_CFLAGS -O3"
--    AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
--
--    dnl -fomit-frame-pointer
--    OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
--    AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
--
--    dnl arch-specific flags
--    case "$host_alias" in
--    i?86-* | k?-*)
--	AC_DEFINE([ARCH_X86],,[x86 architecture])
--	case "$host_alias" in
--	i386-*) OPT_CFLAGS="$CFLAGS -march=i386";;
--	i486-*) OPT_CFLAGS="$CFLAGS -march=i486";;
--	i586-*) OPT_CFLAGS="$CFLAGS -march=pentium";;
--	i686-*) OPT_CFLAGS="$CFLAGS -march=pentiumpro";;
--	k6-*)   OPT_CFLAGS="$CFLAGS -march=k6";;
--	esac
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    ppc-* | powerpc-*)
--	OPT_CFLAGS="$CFLAGS -Wa,-m7400"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],
--	    [CFLAGS=$OPT_CFLAGS; AC_DEFINE([ARCH_PPC],,[ppc architecture])]);;
--    sparc-* | sparc64-*)
--	OPT_CFLAGS="$CFLAGS -march=ultrasparc -mvis -Wa,-Av9"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    mips-sgi-irix6.*)	dnl do we need to be that specific ?
--	OPT_CFLAGS="$CFLAGS -mabi=64"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
--elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
--    dnl TenDRA portability checking compiler
--    TENDRA=yes
--    CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
--    enable_mlib=no
--    no_x=yes
--    enable_sdl=no
--elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
--    dnl Intel C++ compiler
--    CFLAGS="-g -O3 -unroll -ip"
--else
--    dnl non-gcc flags - we probably need exact configuration triplets here.
--    case "$host_alias" in
--    mips-sgi-irix6.*)
--	OPT_CFLAGS="$CFLAGS -64"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    sparc-sun-solaris*)
--	OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
--fi
--
- dnl Checks for libtool - this must be done after we set cflags
- AC_DISABLE_SHARED
- AC_LIBTOOL_WIN32_DLL
---- electricsheep-2.6.3/mpeg2dec/configure.orig	2005-09-11 08:25:25.000000000 +1000
-+++ electricsheep-2.6.3/mpeg2dec/configure	2005-09-11 08:28:03.000000000 +1000
-@@ -3245,515 +3245,6 @@
- fi
- 
- 
--if test x"$CC" = x"checkergcc"; then
--    enable_sdl=no
--elif test x"$GCC" = x"yes"; then
--
--
--
--    OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
--
--    OPT_CFLAGS="$OPT_CFLAGS -O3"
--    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi
--
--        OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
--    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi
--
--        case "$host_alias" in
--    i?86-* | k?-*)
--
--cat >>confdefs.h <<\_ACEOF
--#define ARCH_X86
--_ACEOF
--
--	case "$host_alias" in
--	i386-*) OPT_CFLAGS="$CFLAGS -march=i386";;
--	i486-*) OPT_CFLAGS="$CFLAGS -march=i486";;
--	i586-*) OPT_CFLAGS="$CFLAGS -march=pentium";;
--	i686-*) OPT_CFLAGS="$CFLAGS -march=pentiumpro";;
--	k6-*)   OPT_CFLAGS="$CFLAGS -march=k6";;
--	esac
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    ppc-* | powerpc-*)
--	OPT_CFLAGS="$CFLAGS -Wa,-m7400"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS;
--cat >>confdefs.h <<\_ACEOF
--#define ARCH_PPC
--_ACEOF
--
--    else
--	:
--    fi;;
--    sparc-* | sparc64-*)
--	OPT_CFLAGS="$CFLAGS -march=ultrasparc -mvis -Wa,-Av9"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    mips-sgi-irix6.*)		OPT_CFLAGS="$CFLAGS -mabi=64"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    esac
--elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
--        TENDRA=yes
--    CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
--    enable_mlib=no
--    no_x=yes
--    enable_sdl=no
--elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
--        CFLAGS="-g -O3 -unroll -ip"
--else
--        case "$host_alias" in
--    mips-sgi-irix6.*)
--	OPT_CFLAGS="$CFLAGS -64"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    sparc-sun-solaris*)
--	OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    esac
--fi
--
- # Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
-   enableval="$enable_shared"
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.3-xloadimg.patch b/x11-misc/electricsheep/files/electricsheep-2.6.3-xloadimg.patch
deleted file mode 100644
index 3c2230bdead2..000000000000
--- a/x11-misc/electricsheep/files/electricsheep-2.6.3-xloadimg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- electricsheep-2.6.3-orig/electricsheep.c	2005-07-24 17:18:38.000000000 -0600
-+++ electricsheep-2.6.3/electricsheep.c	2005-12-23 13:35:48.000000000 -0700
-@@ -505,11 +505,13 @@
-     else
-       qbuf[0] = 0;
- 
-+    /* Commented out due to critical xloadimage bug
-     sprintf(pbuf, "xsetbg %s "
- 	    "-border black -at 0,0 %s-splash-0.tif " 
- 	    "-merge -center %s-splash-1.tif %s",
- 	    qbuf, splash_prefix, splash_prefix, ob);
-     mysystem2(pbuf, "splash0");
-+    */
- }
- 
- #define max_plays 1000
-@@ -1539,10 +1541,12 @@
-   else
-     qbuf[0] = 0;
-   
-+  /* Commented out due to critical xloadimage bug
-   sprintf(pbuf, "xsetbg %s -at 0,0 %s-splash-1.tif",
- 	  qbuf, splash_prefix);
-   mysystem2(pbuf, "logo");
-   while (1) sleep(60);
-+  */
- }
- 
- /* set the number of threads by reading /proc/cpuinfo */
diff --git a/x11-misc/electricsheep/files/electricsheep-2.6.4-cflagsfix.patch b/x11-misc/electricsheep/files/electricsheep-2.6.4-cflagsfix.patch
deleted file mode 100644
index 16671fa6bcd2..000000000000
--- a/x11-misc/electricsheep/files/electricsheep-2.6.4-cflagsfix.patch
+++ /dev/null
@@ -1,593 +0,0 @@
-diff -ru electricsheep-2.6.4.orig/mpeg2dec/configure electricsheep-2.6.4/mpeg2dec/configure
---- electricsheep-2.6.4.orig/mpeg2dec/configure	2005-07-20 16:24:34.000000000 +1000
-+++ electricsheep-2.6.4/mpeg2dec/configure	2006-01-05 09:19:51.000000000 +1100
-@@ -3245,515 +3245,6 @@
- fi
- 
- 
--if test x"$CC" = x"checkergcc"; then
--    enable_sdl=no
--elif test x"$GCC" = x"yes"; then
--
--
--
--    OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
--
--    OPT_CFLAGS="$OPT_CFLAGS -O3"
--    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi
--
--        OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
--    echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi
--
--        case "$host_alias" in
--    i?86-* | k?-*)
--
--cat >>confdefs.h <<\_ACEOF
--#define ARCH_X86
--_ACEOF
--
--	case "$host_alias" in
--	i386-*) OPT_CFLAGS="$CFLAGS -march=i386";;
--	i486-*) OPT_CFLAGS="$CFLAGS -march=i486";;
--	i586-*) OPT_CFLAGS="$CFLAGS -march=pentium";;
--	i686-*) OPT_CFLAGS="$CFLAGS -march=pentiumpro";;
--	k6-*)   OPT_CFLAGS="$CFLAGS -march=k6";;
--	esac
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    ppc-* | powerpc-*)
--	OPT_CFLAGS="$CFLAGS -Wa,-m7400"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS;
--cat >>confdefs.h <<\_ACEOF
--#define ARCH_PPC
--_ACEOF
--
--    else
--	:
--    fi;;
--    sparc-* | sparc64-*)
--	OPT_CFLAGS="$CFLAGS -march=ultrasparc -mvis -Wa,-Av9"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    mips-sgi-irix6.*)		OPT_CFLAGS="$CFLAGS -mabi=64"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    esac
--elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
--        TENDRA=yes
--    CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
--    enable_mlib=no
--    no_x=yes
--    enable_sdl=no
--elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
--        CFLAGS="-g -O3 -unroll -ip"
--else
--        case "$host_alias" in
--    mips-sgi-irix6.*)
--	OPT_CFLAGS="$CFLAGS -64"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    sparc-sun-solaris*)
--	OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
--	echo "$as_me:$LINENO: checking if $CC supports $OPT_CFLAGS flags" >&5
--echo $ECHO_N "checking if $CC supports $OPT_CFLAGS flags... $ECHO_C" >&6
--    SAVE_CFLAGS="$CFLAGS"
--    CFLAGS="$OPT_CFLAGS"
--    cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
--
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext
--if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
--  (eval $ac_compile) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag"
--			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  ac_cv_try_cflags_ok=yes
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--ac_cv_try_cflags_ok=no
--fi
--rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
--    CFLAGS="$SAVE_CFLAGS"
--    echo "$as_me:$LINENO: result: $ac_cv_try_cflags_ok" >&5
--echo "${ECHO_T}$ac_cv_try_cflags_ok" >&6
--    if test x"$ac_cv_try_cflags_ok" = x"yes"; then
--	CFLAGS=$OPT_CFLAGS
--    else
--	:
--    fi;;
--    esac
--fi
--
- # Check whether --enable-shared or --disable-shared was given.
- if test "${enable_shared+set}" = set; then
-   enableval="$enable_shared"
-diff -ru electricsheep-2.6.4.orig/mpeg2dec/configure.in electricsheep-2.6.4/mpeg2dec/configure.in
---- electricsheep-2.6.4.orig/mpeg2dec/configure.in	2005-07-20 16:19:40.000000000 +1000
-+++ electricsheep-2.6.4/mpeg2dec/configure.in	2006-01-05 09:19:51.000000000 +1100
-@@ -15,70 +15,6 @@
- AC_PROG_CC
- AC_PROG_GCC_TRADITIONAL
- 
--dnl CC-specific flags
--if test x"$CC" = x"checkergcc"; then
--    enable_sdl=no
--elif test x"$GCC" = x"yes"; then
--
--    dnl GCC-specific flags
--    dnl -Wall -Werror moved to the end to not disturb the configure script
--
--    dnl -O3
--    changequote(<<,>>)
--    OPT_CFLAGS=`echo "$CFLAGS"|sed "s/-O[0-9]*//g;"`
--    changequote([,])
--    OPT_CFLAGS="$OPT_CFLAGS -O3"
--    AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
--
--    dnl -fomit-frame-pointer
--    OPT_CFLAGS="$CFLAGS -fomit-frame-pointer"
--    AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS])
--
--    dnl arch-specific flags
--    case "$host_alias" in
--    i?86-* | k?-*)
--	AC_DEFINE([ARCH_X86],,[x86 architecture])
--	case "$host_alias" in
--	i386-*) OPT_CFLAGS="$CFLAGS -march=i386";;
--	i486-*) OPT_CFLAGS="$CFLAGS -march=i486";;
--	i586-*) OPT_CFLAGS="$CFLAGS -march=pentium";;
--	i686-*) OPT_CFLAGS="$CFLAGS -march=pentiumpro";;
--	k6-*)   OPT_CFLAGS="$CFLAGS -march=k6";;
--	esac
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    ppc-* | powerpc-*)
--	OPT_CFLAGS="$CFLAGS -Wa,-m7400"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],
--	    [CFLAGS=$OPT_CFLAGS; AC_DEFINE([ARCH_PPC],,[ppc architecture])]);;
--    sparc-* | sparc64-*)
--	OPT_CFLAGS="$CFLAGS -march=ultrasparc -mvis -Wa,-Av9"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    mips-sgi-irix6.*)	dnl do we need to be that specific ?
--	OPT_CFLAGS="$CFLAGS -mabi=64"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
--elif test x"$CC" = x"tcc" -a x"`$CC -version 2>&1 | grep TenDRA`" != x""; then
--    dnl TenDRA portability checking compiler
--    TENDRA=yes
--    CFLAGS="-Xp -Yansi -f`pwd`/include/tendra.h -DELIDE_CODE"
--    enable_mlib=no
--    no_x=yes
--    enable_sdl=no
--elif test x"$CC" = x"icc" -a x"`$CC -V 2>&1 | grep Intel`" != x""; then
--    dnl Intel C++ compiler
--    CFLAGS="-g -O3 -unroll -ip"
--else
--    dnl non-gcc flags - we probably need exact configuration triplets here.
--    case "$host_alias" in
--    mips-sgi-irix6.*)
--	OPT_CFLAGS="$CFLAGS -64"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    sparc-sun-solaris*)
--	OPT_CFLAGS="$CFLAGS -xCC -fast -xO5"
--	AC_TRY_CFLAGS([$OPT_CFLAGS],[CFLAGS=$OPT_CFLAGS]);;
--    esac
--fi
--
- dnl Checks for libtool - this must be done after we set cflags
- AC_DISABLE_SHARED
- AC_LIBTOOL_WIN32_DLL