old ebuilds

12 files changed, 0 insertions, 904 deletions

diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.10-r4 b/x11-wm/fvwm/files/digest-fvwm-2.5.10-r4
deleted file mode 100644
index 620b8bcd87f6..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.5.10-r4
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 b3c86e2af2a4eabe692c9c849ff4b243 fvwm-2.5.10.tar.bz2 1788873
-MD5 cc3c0f7e89a712d266de69c6da340aaf FvwmTabs-3.0.tar.gz 25495
diff --git a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r6 b/x11-wm/fvwm/files/digest-fvwm-2.5.8-r6
deleted file mode 100644
index 2859d3f88dfb..000000000000
--- a/x11-wm/fvwm/files/digest-fvwm-2.5.8-r6
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 c702d873d124a475f95c45432b8bd7d7 fvwm-2.5.8.tar.bz2 1778920
-MD5 972d25e05b71b994436a4804d0db7286 FvwmTabs-2.7.tar.gz 24808
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-FvwmScript-Quit-reboot.diff b/x11-wm/fvwm/files/fvwm-2.5.8-FvwmScript-Quit-reboot.diff
deleted file mode 100644
index cc557d6ee2c1..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.5.8-FvwmScript-Quit-reboot.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- modules/FvwmScript/Scripts/FvwmScript-Quit	2001-10-13 17:18:45.000000000 +0100
-+++ modules/FvwmScript/Scripts/FvwmScript-Quit	2004-01-13 11:56:52.000000000 +0000
-@@ -221,7 +221,7 @@
-    ChangeValue 7 0
-    ChangeValue 8 0
-    ChangeValue 9 0
--   Set $ToDo = Restart
-+   Set $ToDo = Reboot
-   End
- End
- 
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-flickeringmoveworkaround.diff b/x11-wm/fvwm/files/fvwm-2.5.8-flickeringmoveworkaround.diff
deleted file mode 100644
index 007873616f3f..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.5.8-flickeringmoveworkaround.diff
+++ /dev/null
@@ -1,20 +0,0 @@
---- fvwm-2.5.8/fvwm/move_resize.c	2003-09-15 09:31:22.000000000 +0100
-+++ fvwm/fvwm/move_resize.c	2004-02-17 13:15:30.000000000 +0000
-@@ -1159,7 +1159,7 @@
- 				dpy, None, Scr.Root, 0, 0, 0, 0, pointerX,
- 				pointerY);
- 		}
--		if (fw && !IS_SHADED(fw))
-+		if (fw && !IS_SHADED(fw) && !Scr.bo.DisableConfigureNotify)
- 		{
- 			/* send configure notify event for windows that care
- 			 * about their location */
-@@ -2340,7 +2340,7 @@
- 		xl += x_virtual_offset;
- 		yt += y_virtual_offset;
- 		if (do_move_opaque && !IS_ICONIFIED(fw) &&
--		    !IS_SHADED(fw))
-+		    !IS_SHADED(fw) && !Scr.bo.DisableConfigureNotify)
- 		{
- 			/* send configure notify event for windows that care
- 			 * about their location; don't send anything if
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-bug-security.diff b/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-bug-security.diff
deleted file mode 100644
index 84a639a74de3..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-bug-security.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- fvwm-2.5.8/bin/fvwm-bug.in	2002-11-10 23:24:12.000000000 +0000
-+++ fvwm-2.5.10/bin/fvwm-bug.in	2004-03-19 14:45:59.000000000 +0000
-@@ -53,7 +53,7 @@
- 
- : ${EDITOR=emacs}
- 
--TEMP=/tmp/fvwm-bug.$$
-+TEMP=`mktemp -q "/tmp/fvwm-bug.XXXXXX"`
- 
- # Figure out how to echo a string without a trailing newline
- N=`echo 'hi there\c'`
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-menu-directory-security.diff b/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-menu-directory-security.diff
deleted file mode 100644
index 6842a21f25c7..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.5.8-fvwm-menu-directory-security.diff
+++ /dev/null
@@ -1,18 +0,0 @@
---- fvwm-menu-directory.in.old	2003-12-11 11:39:10.000000000 +0000
-+++ fvwm-menu-directory.in	2003-12-11 11:39:55.000000000 +0000
-@@ -259,6 +259,7 @@
- 	$name =~ s/%/%%/g;
- 	$name =~ s/&/&&/g;
- 	$name =~ s/\*/**/g;
-+	$name =~ s/\n/\?/g;
- 	$name;
- }
- 
-@@ -267,6 +268,7 @@
- 	$name =~ s/\\/\\\\/g;
- 	$name =~ s/"/\\"/g;
- 	$name =~ s/\$/\\\$\$/g;
-+	$name =~ s/\n/\"\?\"/g;
- 	$name;
- }
- 
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-iconfile.diff b/x11-wm/fvwm/files/fvwm-2.5.8-iconfile.diff
deleted file mode 100644
index 077b1e835071..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.5.8-iconfile.diff
+++ /dev/null
@@ -1,39 +0,0 @@
---- fvwm-2.5.8/fvwm/expand.c	2003-07-26 17:59:03.000000000 +0100
-+++ fvwm/fvwm/expand.c	2004-02-16 11:00:33.000000000 +0000
-@@ -108,6 +108,8 @@
- 	"w.class",
- 	"w.height",
- 	"w.iconname",
-+	"w.iconfile",
-+	"w.miniiconfile",
- 	"w.id",
- 	"w.name",
- 	"w.resource",
-@@ -174,6 +176,8 @@
- 	VAR_W_CLASS,
- 	VAR_W_HEIGHT,
- 	VAR_W_ICONNAME,
-+	VAR_W_ICONFILE,
-+	VAR_W_MINIICONFILE,
- 	VAR_W_ID,
- 	VAR_W_NAME,
- 	VAR_W_RESOURCE,
-@@ -371,6 +375,18 @@
- 			string = fw->icon_name.name;
- 		}
- 		break;
-+	case VAR_W_ICONFILE:
-+		if (fw && !IS_EWMH_DESKTOP(FW_W(fw)))
-+		{
-+			string = fw->icon_bitmap_file;
-+		}
-+		break;
-+	case VAR_W_MINIICONFILE:
-+		if (fw && !IS_EWMH_DESKTOP(FW_W(fw)))
-+		{
-+			string = fw->mini_pixmap_file;
-+		}
-+		break;
- 	case VAR_W_CLASS:
- 		if (fw && !IS_EWMH_DESKTOP(FW_W(fw)))
- 		{
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-perllib-disconnect.diff b/x11-wm/fvwm/files/fvwm-2.5.8-perllib-disconnect.diff
deleted file mode 100644
index 5fb19176c00e..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.5.8-perllib-disconnect.diff
+++ /dev/null
@@ -1,43 +0,0 @@
---- perllib/FVWM/Module/Tk.pm	2003-11-12 08:55:58.000000000 +0000
-+++ perllib/FVWM/Module/Tk.pm	2003-11-12 04:13:25.000000000 +0000
-@@ -51,6 +51,14 @@
- 	$top->fileevent($self->{istream},
- 		readable => sub {
- 			unless ($self->processPacket($self->readPacket)) {
-+				if ($self->{disconnected}) {
-+					# Seems like something does not want to exit - force it.
-+					# For example, a new Tk window is launched on ON_EXIT.
-+					$top->destroy if defined $top && defined $top->{Configure};
-+					$self->debug("Forced to exit to escape eventLoop, fix the module", 0);
-+					exit 1;
-+				}
-+				$self->eventLoopFinished(@params);
- 				$top->destroy;
- 			} else {
- 				$self->eventLoopPrepared(@params);
-@@ -58,7 +66,6 @@
- 		}
- 	);
- 	MainLoop;
--	$self->eventLoopFinished(@params);
- }
- 
- sub showError ($$;$) {
-@@ -73,7 +80,7 @@
- 		-bitmap => 'error',
- 		-default_button => 'Close',
- 		-text => $error,
--		-buttons => ['Close', 'Close All Errors', 'Exit Module']
-+		-buttons => ['Close', 'Close All Errors', 'Exit Module'],
- 	);
- 	my $btn = $dialog->Show;
- 
-@@ -90,7 +97,7 @@
- 		-icon => 'info',
- 		-type => 'ok',
- 		-title => $title,
--		-message => $msg
-+		-message => $msg,
- 	);
- }
- 
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-taskbar-margins.diff b/x11-wm/fvwm/files/fvwm-2.5.8-taskbar-margins.diff
deleted file mode 100644
index 449ebc446a68..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.5.8-taskbar-margins.diff
+++ /dev/null
@@ -1,55 +0,0 @@
---- fvwm-2.5.8/modules/FvwmTaskBar/Start.c	2003-09-03 14:52:36.000000000 +0100
-+++ fvwm/modules/FvwmTaskBar/Start.c	2004-01-12 09:55:10.000000000 +0000
-@@ -42,6 +42,8 @@
- int WindowButtonsLeftMargin = 4;    /* default value is 4 */
- int WindowButtonsRightMargin = 2;   /* default value is 2 */
- int StartButtonRightMargin = 0;     /* default value is 0 */
-+int has_wb_left_margin = 0;
-+int has_wb_right_margin = 0;
- Bool StartButtonOpensAboveTaskBar = FALSE;
- char *StartName     = NULL,
-      *StartCommand  = NULL,
-@@ -294,12 +296,14 @@
- 		if(atoi(rest)>=0)
- 		{
- 			WindowButtonsLeftMargin = atoi(rest);
-+			has_wb_left_margin = 1;
- 		}
- 		break;
- 	case 7: /* WindowButtonsRightMargin */
- 		if(atoi(rest)>=0)
- 		{
- 			WindowButtonsRightMargin = atoi(rest);
-+			has_wb_right_margin = 1;
- 		}
- 		break;
- 	case 8: /* StartButtonRightMargin */
-@@ -311,7 +315,6 @@
- 	default:
- 		/* unknown option */
- 		return False;
--		break;
- 	} /* switch */
- 
- 	return True;
-@@ -455,10 +458,16 @@
-   }
-   else
-   {
--	  StartAndLaunchButtonsWidth = 0;
--	  StartButtonRightMargin = 0;
--	  WindowButtonsLeftMargin = 0;
--	  WindowButtonsRightMargin = 0;
-+    StartAndLaunchButtonsWidth = 0;
-+    StartButtonRightMargin = 0;
-+    if (has_wb_left_margin == 0)
-+    {
-+      WindowButtonsLeftMargin = 0;
-+    }
-+    if (has_wb_right_margin == 0)
-+    {
-+      WindowButtonsRightMargin = 0;
-+    }
-   }
- }
- 
diff --git a/x11-wm/fvwm/files/fvwm-2.5.8-undermouse.diff b/x11-wm/fvwm/files/fvwm-2.5.8-undermouse.diff
deleted file mode 100644
index be18ea4abda1..000000000000
--- a/x11-wm/fvwm/files/fvwm-2.5.8-undermouse.diff
+++ /dev/null
@@ -1,73 +0,0 @@
-diff -Naur fvwm-2.5.8/fvwm/fvwm.h fvwm/fvwm/fvwm.h
---- fvwm-2.5.8/fvwm/fvwm.h	2003-09-24 11:15:20.000000000 +0200
-+++ fvwm/fvwm/fvwm.h	2003-11-25 00:53:26.000000000 +0100
-@@ -467,8 +467,9 @@
- #define PLACE_TILECASCADE       0x5
- #define PLACE_CASCADE_B         0x6
- #define PLACE_MINOVERLAP        0x7
--#define PLACE_MASK              0x7
--	unsigned placement_mode : 3;
-+#define PLACE_UNDERMOUSE        0x8
-+#define PLACE_MASK              0x8
-+    unsigned placement_mode : 4;
- 	unsigned ewmh_placement_mode : 2; /* see ewmh.h */
- #define WS_CR_MOTION_METHOD_AUTO CR_MOTION_METHOD_AUTO
- #define WS_CR_MOTION_METHOD_USE_GRAV CR_MOTION_METHOD_USE_GRAV
-diff -Naur fvwm-2.5.8/fvwm/placement.c fvwm/fvwm/placement.c
---- fvwm-2.5.8/fvwm/placement.c	2003-07-08 00:22:20.000000000 +0200
-+++ fvwm/fvwm/placement.c	2003-11-25 00:53:26.000000000 +0100
-@@ -1156,7 +1156,35 @@
- 				fw, sflags, &screen_g, &xl, &yt, pdeltax,
- 				pdeltay, 0);
- 			flags.is_smartly_placed = True;
--			break;
-+
-+	    case PLACE_UNDERMOUSE:
-+    	   {
-+	       int mx;
-+           int my;
-+          FQueryPointer(dpy, Scr.Root, &JunkRoot, &JunkChild,
-+            &mx, &my, &JunkX, &JunkY, &JunkMask);
-+          xl = mx - (fw->frame_g.width / 2);
-+          yt = my - (fw->frame_g.height / 2);
-+          if (xl + fw->frame_g.width > screen_g.x + screen_g.width)
-+          {
-+            xl = screen_g.x + screen_g.width - fw->frame_g.width;
-+          }
-+          if (yt + fw->frame_g.height > screen_g.y + screen_g.height)
-+          {
-+            yt = screen_g.y + screen_g.height - fw->frame_g.height;
-+          }
-+          if (xl < screen_g.x)
-+          {
-+            xl = screen_g.x;
-+          }
-+          if (yt < screen_g.y)
-+          {
-+          yt = screen_g.y;
-+          }
-+          attr_g->x = xl;
-+          attr_g->y = yt;
-+        }
-+ 			break;
- 		default:
- 			/* can't happen */
- 			break;
-diff -Naur fvwm-2.5.8/fvwm/style.c fvwm/fvwm/style.c
---- fvwm-2.5.8/fvwm/style.c	2003-08-23 06:27:43.000000000 +0200
-+++ fvwm/fvwm/style.c	2003-11-25 00:53:26.000000000 +0100
-@@ -3738,7 +3738,13 @@
- 		break;
- 
- 	case 'u':
--		if (StrEquals(token, "UsePPosition"))
-+        if (StrEquals(token, "UnderMousePlacement"))
-+        {
-+            ps->flags.placement_mode = PLACE_UNDERMOUSE;
-+            ps->flag_mask.placement_mode = PLACE_MASK;
-+            ps->change_mask.placement_mode = PLACE_MASK;
-+        }
-+        else if (StrEquals(token, "UsePPosition"))
- 		{
- 			ps->flags.use_no_pposition = !on;
- 			ps->flag_mask.use_no_pposition = 1;
diff --git a/x11-wm/fvwm/fvwm-2.5.10-r4.ebuild b/x11-wm/fvwm/fvwm-2.5.10-r4.ebuild
deleted file mode 100644
index 98f2df6fafff..000000000000
--- a/x11-wm/fvwm/fvwm-2.5.10-r4.ebuild
+++ /dev/null
@@ -1,304 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.10-r4.ebuild,v 1.5 2004/08/20 01:56:16 pvdabeel Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="bidi debug gnome gtk gtk2 imlib ncurses nls nosm noxpm perl png readline rplay stroke tcltk truetype xinerama"
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
-		perl? ( mirror://gentoo/FvwmTabs-3.0.tar.gz )"
-HOMEPAGE="http://www.fvwm.org/"
-
-SLOT="0"
-KEYWORDS="~x86 ~alpha ~sparc ppc ~amd64"
-LICENSE="GPL-2 FVWM"
-
-RDEPEND="readline? ( >=sys-libs/readline-4.1
-				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
-				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
-		gtk? ( =x11-libs/gtk+-1.2*
-				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
-						>=media-libs/imlib-1.9.14-r1 )
-				gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) )
-		rplay? ( >=media-sound/rplay-3.3.2 )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		png? ( >=media-libs/libpng-1.0.12-r2 )
-		stroke? ( >=dev-libs/libstroke-0.4 )
-		perl? ( tcltk? ( >=dev-lang/tk-8.3.4
-						>=dev-perl/perl-tk-800.024-r2
-						>=dev-perl/X11-Protocol-0.52 ) )
-		truetype? ( virtual/xft >=media-libs/fontconfig-2.1-r1 )
-		>=dev-lang/perl-5.6.1-r10
-		>=sys-libs/zlib-1.1.4-r1
-		sys-apps/debianutils
-		virtual/x11"
-# XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
-# XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
-# XXX:	netpbm is used by FvwmScript-ScreenDump, worth a dependency?
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	# this patch enables fast translucent menus in fvwm..yummy! this is a
-	# minor tweak of a patch posted to fvwm-user mailing list by Olivier
-	# Chapuis in <20030827135125.GA6370@snoopy.folie>.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.9-translucent-menus.diff.gz
-
-	# according to a post to fvwm-workers mailing list, Mikhael Goikhman
-	# planned on disabling these debug statements before the release, but
-	# never got around to it.
-	cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff
-
-	if use perl; then
-		# I'll supply a default icon for FvwmTabs, this removes the need for
-		# installing an iconset, this one comes from the fvwm_icons package.
-		cd ${WORKDIR}
-		ebegin "	Setting default icon for FvwmTabs"
-			sed -i 's#happyMini.xpm#/usr/share/fvwm/mini-happy.xpm#g' \
-				FvwmTabs FvwmTabs.1 fvwmtabrc
-		eend $?
-	fi
-
-	# this patch adds an 'ShowOnlyIcons Never' option to FvwmIconMan.
-	cd ${S}; epatch ${FILESDIR}/fvwm-iconman.diff
-
-	# fix some issues reported since the 2.5.10 release.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-post-release.diff
-
-	# build fails on alpha with certain options without this.
-	use alpha && append-flags -fPIC
-
-	# just in case anyone on mips want to test.
-	use mips && epatch ${FILESDIR}/fvwm-2.5.10-mips-compat.diff
-
-	# fixing #51287, the fvwm-menu-xlock script is not compatible
-	# with the xlockmore implementation in portage.
-	epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff
-
-	# fix hang when restarting
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-FvwmCommand.diff
-
-	# some useful improvements to Test () Syntax.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.10-Test-update.diff
-}
-
-src_compile() {
-	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs"
-
-	# ImagePath should include /usr/share/icons/fvwm (x11-themes/fvwm_icons)
-	#
-	# Another iconset for fvwm, wm-icons, includes configurations and user
-	# configuration utilities to make them easy to use with fvwm, no need
-	# to put them in the default ImagePath.
-
-	# use readline in FvwmConsole.
-	if ! use readline; then
-		myconf="${myconf} --without-readline-library"
-	else
-		myconf="${myconf} --with-readline-library"
-
-		# choose ncurses or termcap.
-		if use ncurses; then
-			myconf="${myconf} --without-termcap-library"
-		else
-			myconf="${myconf} --without-ncurses-library"
-		fi
-	fi
-
-	# since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously
-	# we had to hide the includes/libs during configure. this is still the case
-	# for GDK image suport _with_ gtk, unfortunately.
-	# FvwmGtk can be built as a gnome application, or a Gtk+ application.
-	if ! use gtk; then
-		myconf="${myconf} --disable-gtk --without-gnome"
-	else
-		if ! use imlib; then
-			einfo "ATTN: You can safely ignore any imlib related configure errors."
-			myconf="${myconf} --with-imlib-prefix=${T}"
-		fi
-		if ! use gnome; then
-			myconf="${myconf} --without-gnome"
-		else
-			myconf="${myconf} --with-gnome"
-		fi
-	fi
-
-	# rplay is a cool, but little used way of playing sounds over a network
-	# Fvwm support is pretty good.
-	if ! use rplay; then
-		myconf="${myconf} --without-rplay-library"
-	fi
-
-	# Install perl bindings.
-	if use perl; then
-		myconf="${myconf} --enable-perllib"
-	else
-		myconf="${myconf} --disable-perllib"
-	fi
-
-	# xinerama support for those who have multi-headed machines.
-	if use xinerama; then
-		myconf="${myconf} --enable-xinerama"
-	else
-		myconf="${myconf} --disable-xinerama"
-	fi
-
-	# bidirectional writing support, eg hebrew
-	if use bidi; then
-		myconf="${myconf} --enable-bidi"
-	else
-		myconf="${myconf} --disable-bidi"
-	fi
-
-	# png image support (very nice in fvwm)
-	if ! use png; then
-		myconf="${myconf} --without-png-library"
-	fi
-
-	# native language support
-	if use nls; then
-		myconf="${myconf} --enable-nls --enable-iconv"
-	else
-		myconf="${myconf} --disable-nls --disable-iconv"
-	fi
-
-	# support for mouse gestures using libstroke (very very cool)
-	if ! use stroke; then
-		myconf="${myconf} --without-stroke-library"
-	fi
-
-	# more verbosity for module developers/hackers/etc.
-	if use debug; then
-		myconf="${myconf} --enable-debug-msgs --enable-command-log"
-		append-flags -DCR_DETECT_MOTION_METHOD_DEBUG
-	fi
-
-	# Xft Anti Aliased text support
-	if use truetype; then
-		myconf="${myconf} --enable-xft"
-	else
-		myconf="${myconf} --disable-xft"
-	fi
-
-	# disable xsm protocol (session management) support?
-	if use nosm; then
-		myconf="${myconf} --disable-sm"
-	else
-		myconf="${myconf} --enable-sm"
-	fi
-
-	# disable xpm support?
-	if use noxpm; then
-		myconf="${myconf} --without-xpm-library"
-	fi
-
-	# set the local maintainer for fvwm-bug.
-	export FVWM_BUGADDR="taviso@gentoo.org"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	if use perl; then
-
-		local toolkits="gtk2 gtk tcltk"
-
-		if use tcltk; then
-			# Install the very cool FvwmTabs module
-			# http://users.tpg.com.au/users/scottie7/FvwmTabs
-			einfo "Installing FvwmTabs module..."
-
-			exeinto /usr/lib/fvwm/${PV}/
-			doexe ${WORKDIR}/FvwmTabs
-			dodoc ${WORKDIR}/fvwmtabrc ${WORKDIR}/README.fvwmtabs
-			doman ${WORKDIR}/FvwmTabs.1
-
-			# install default drag and drop icon.
-			insinto /usr/share/fvwm
-			newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm
-		else
-			# Remove the Tk bindings (requires perl-tk)
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm
-			toolkits=${toolkits/tcltk/}
-		fi
-		if ! use gtk; then
-			# Remove gtk bindings (requires gtk-perl/gtk2-perl)
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \
-				${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-			toolkits=${toolkits/gtk2/}
-			toolkits=${toolkits/gtk/}
-		else
-			if ! use gtk2; then
-				# Just remove the gtk2 bindings (requires gtk2-perl)
-				rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-				toolkits=${toolkits/gtk2/}
-			fi
-		fi
-		toolkits=${toolkits// /}
-		if ! test "${toolkits}"; then
-			# No perl toolkit bindings wanted, remove the unneeded files
-			# and empty directories.
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm
-			find ${D}/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null
-		fi
-	else
-		# Remove useless script if perllib isnt required.
-		rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1
-	fi
-
-	# neat utility for testing fvwm behaviour on applications setting various
-	# hints, creates a simple black window with configurable hints set.
-	if use debug; then
-		dobin ${S}/tests/hints/hints_test
-		newdoc ${S}/tests/hints/README README.hints
-	fi
-
-	# fvwm-convert-2.6 is just a stub, contains no code - remove it for now.
-	# fvwm-convert-2.2 has a man page, but the script is no longer distributed.
-	rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1
-	rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1
-
-	# ive included `exec` to save a few bytes of memory.
-	echo "#!/bin/bash" > fvwm2
-	echo "exec /usr/bin/fvwm2" >> fvwm2
-
-	exeinto /etc/X11/Sessions
-	doexe fvwm2
-
-	dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \
-	docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \
-	docs/fvwm.lsm
-
-	dodoc utils/fvwm_make_directory_menu.sh  utils/fvwm_make_browse_menu.sh \
-	utils/quantize_pixmaps utils/xselection.c
-
-	dodoc ${FILESDIR}/README.transluceny.gz
-
-	# make sure FvwmGtk man page is installed
-	use gtk && doman ${S}/modules/FvwmGtk/FvwmGtk.1
-
-	# fix a couple of symlinks.
-	prepallman
-}
-
-pkg_postinst() {
-	if use perl; then
-		if use tcltk; then
-			einfo "By setting the perl and tcltk USE flags, you have elected to"
-			einfo "install the FvwmTabs module, a configurable tabbing system"
-			einfo "for FVWM. You can read more about FvwmTabs here:"
-			einfo
-			einfo "	http://users.tpg.com.au/users/scottie7/fvwmtabs.html"
-			einfo
-		fi
-	fi
-}
diff --git a/x11-wm/fvwm/fvwm-2.5.8-r6.ebuild b/x11-wm/fvwm/fvwm-2.5.8-r6.ebuild
deleted file mode 100644
index 128de60de778..000000000000
--- a/x11-wm/fvwm/fvwm-2.5.8-r6.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.8-r6.ebuild,v 1.7 2004/07/15 01:12:44 agriffis Exp $
-
-inherit eutils flag-o-matic
-
-IUSE="bidi debug gnome gtk gtk2 imlib ncurses nls nosm noxpm perl png readline rplay stroke tcltk truetype xinerama"
-
-DESCRIPTION="An extremely powerful ICCCM-compliant multiple virtual desktop window manager"
-SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
-		perl? ( mirror://gentoo/FvwmTabs-2.7.tar.gz )"
-HOMEPAGE="http://www.fvwm.org/"
-
-SLOT="0"
-KEYWORDS="x86 alpha sparc amd64 ppc"
-LICENSE="GPL-2 FVWM"
-
-RDEPEND="readline? ( >=sys-libs/readline-4.1
-				ncurses? ( >=sys-libs/ncurses-5.3-r1 )
-				!ncurses? ( >=sys-libs/libtermcap-compat-1.2.3 ) )
-		gtk? ( =x11-libs/gtk+-1.2*
-				imlib? ( >=media-libs/gdk-pixbuf-0.21.0
-						>=media-libs/imlib-1.9.14-r1 )
-				gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 ) )
-		rplay? ( >=media-sound/rplay-3.3.2 )
-		bidi? ( >=dev-libs/fribidi-0.10.4 )
-		png? ( >=media-libs/libpng-1.0.12-r2 )
-		stroke? ( >=dev-libs/libstroke-0.4 )
-		perl? ( tcltk? ( >=dev-lang/tk-8.3.4
-						>=dev-perl/perl-tk-800.024-r2
-						>=dev-perl/X11-Protocol-0.52 ) )
-		truetype? ( virtual/xft
-					>=media-libs/fontconfig-2.1-r1
-					>=dev-libs/expat-1.95.6-r1 )
-		!noxpm? ( >=media-libs/netpbm-9.12-r4 )
-		>=dev-lang/perl-5.6.1-r10
-		>=sys-libs/zlib-1.1.4-r1
-		sys-apps/debianutils
-		virtual/x11"
-# XXX:	gtk2 perl bindings require dev-perl/gtk2-perl, worth a dependency?
-# XXX:	gtk perl bindings require dev-perl/gtk-perl, worth a dependency?
-# XXX:	netpbm is used by FvwmScript-ScreenDump...im assuming anyone with
-# 	`use noxpm` will not want them.
-DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-
-	# this patch enables fast translucent menus in fvwm..yummy! this is a
-	# minor tweak of a patch posted to fvwm-user mailing list by Olivier
-	# Chapuis in <20030827135125.GA6370@snoopy.folie>.
-	cd ${S}; epatch ${FILESDIR}/fvwm-translucent-menus.diff.gz
-
-	# according to a post to fvwm-workers mailing list, Mikhael Goikhman
-	# planned on disabling these debug statements before the release, but
-	# never got around to it.
-	cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff
-
-	# FvwmTabs uses /tmp/.fvwmtabs.state for storing state files by default,
-	# this probably isnt a good idea security wise, allowing someone to do
-	# damage with symlinks. It will also break if multiple users try using
-	# the same location simultaneously...probably should use File::Temp, but
-	# moving it into ~/.fvwmtabs.state will do for now.
-	if use perl; then
-		cd ${WORKDIR}; epatch ${FILESDIR}/fvwmtabs-insecure-tmp-handling.diff
-
-		# I'll supply a default icon for FvwmTabs, this removes the need for
-		# installing an iconset, this one comes from the fvwm_icons package.
-		ebegin "	Setting default icon for FvwmTabs"
-			sed -i 's#/usr/share/icons/mini/mini-happy.xpm#/usr/share/fvwm/mini-happy.xpm#g' \
-				FvwmTabs FvwmTabs.1 fvwmtabrc
-		eend $?
-	fi
-
-	# this patch from cvs, regarding a message sent to the fvwm-workers
-	# mailing list in <20031111234845.A12314@deepblue.milkyway.com.au>,
-	# perllib applications were getting destroyed before the ON_EXIT
-	# handler could be invoked.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-perllib-disconnect.diff
-
-	# files with \n in them make fvwm-menu-directory misbehave.
-	cd ${S}/bin; epatch ${FILESDIR}/fvwm-2.5.8-fvwm-menu-directory-security.diff
-
-	# add a nice new placement policy, UnderMousePlacement.
-	# cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-undermouse.diff
-
-	# this patch adds an 'ShowOnlyIcons Never' option to FvwmIconMan.
-	cd ${S}; epatch ${FILESDIR}/fvwm-iconman.diff
-
-	# if you disable the start button in FvwmTaskBar, margins may get ignored.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-taskbar-margins.diff
-
-	# FvwmScript-Quit wont reboot the computer
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-FvwmScript-Quit-reboot.diff
-
-	# expand variables $[w.iconfile] and $[w.miniiconfile]
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-iconfile.diff
-
-	# FlickeringMoveWorkaround is always ignored, this fix from cvs.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-flickeringmoveworkaround.diff
-
-	# fvwm-bug uses predictable temporary file names (pid based)
-	# this is fixed in >=fvwm-2.5.10.
-	cd ${S}; epatch ${FILESDIR}/fvwm-2.5.8-fvwm-bug-security.diff
-
-	# build fails on alpha with certain options without this.
-	use alpha && append-flags -fPIC
-}
-
-src_compile() {
-	local myconf="--libexecdir=/usr/lib --with-imagepath=/usr/include/X11/bitmaps:/usr/include/X11/pixmaps:/usr/share/icons/fvwm --enable-package-subdirs"
-
-	# ImagePath should include /usr/share/icons/fvwm (x11-themes/fvwm_icons)
-	#
-	# Another iconset for fvwm, wm-icons, includes configurations and user
-	# configuration utilities to make them easy to use with fvwm, no need
-	# to put them in the default ImagePath.
-
-	# use readline in FvwmConsole.
-	if ! use readline; then
-		myconf="${myconf} --without-readline-library"
-	else
-		myconf="${myconf} --with-readline-library"
-
-		# choose ncurses or termcap.
-		if use ncurses; then
-			myconf="${myconf} --without-termcap-library"
-		else
-			myconf="${myconf} --without-ncurses-library"
-		fi
-	fi
-
-	# since fvwm-2.5.8 GTK support can be diabled with --disable-gtk, previously
-	# we had to hide the includes/libs during configure. this is still the case
-	# for GDK image suport _with_ gtk, unfortunately.
-	# FvwmGtk can be built as a gnome application, or a Gtk+ application.
-	if ! use gtk; then
-		myconf="${myconf} --disable-gtk --without-gnome"
-	else
-		if ! use imlib; then
-			einfo "ATTN: You can safely ignore any imlib related configure errors."
-			myconf="${myconf} --with-imlib-prefix=${T}"
-		fi
-		if ! use gnome; then
-			myconf="${myconf} --without-gnome"
-		else
-			myconf="${myconf} --with-gnome"
-		fi
-	fi
-
-	# rplay is a cool, but little used way of playing sounds over a network
-	# Fvwm support is pretty good.
-	if ! use rplay; then
-		myconf="${myconf} --without-rplay-library"
-	fi
-
-	# Install perl bindings.
-	if use perl; then
-		myconf="${myconf} --enable-perllib"
-	else
-		myconf="${myconf} --disable-perllib"
-	fi
-
-	# xinerama support for those who have multi-headed machines.
-	if use xinerama; then
-		myconf="${myconf} --enable-xinerama"
-	else
-		myconf="${myconf} --disable-xinerama"
-	fi
-
-	# bidirectional writing support, eg hebrew
-	if use bidi; then
-		myconf="${myconf} --enable-bidi"
-	else
-		myconf="${myconf} --disable-bidi"
-	fi
-
-	# png image support (very nice in fvwm)
-	if ! use png; then
-		myconf="${myconf} --without-png-library"
-	fi
-
-	# native language support
-	if use nls; then
-		myconf="${myconf} --enable-nls"
-	else
-		myconf="${myconf} --disable-nls"
-	fi
-
-	# support for mouse gestures using libstroke (very very cool)
-	if ! use stroke; then
-		myconf="${myconf} --without-stroke-library"
-	fi
-
-	# more verbosity for module developers/hackers/etc.
-	if use debug; then
-		myconf="${myconf} --enable-debug-msgs --enable-command-log"
-		append-flags -DCR_DETECT_MOTION_METHOD_DEBUG
-	fi
-
-	# Xft Anti Aliased text support (yummy eye candy)
-	if use truetype; then
-		myconf="${myconf} --enable-xft"
-	else
-		myconf="${myconf} --disable-xft"
-	fi
-
-	# disable xsm protocol (session management) support?
-	if use nosm; then
-		myconf="${myconf} --disable-sm"
-	else
-		myconf="${myconf} --enable-sm"
-	fi
-
-	# disable xpm support? (maybe you only use png in your themes, or just solid colour?)
-	if use noxpm; then
-		myconf="${myconf} --without-xpm-library"
-	fi
-
-	# set the local maintainer for fvwm-bug.
-	export FVWM_BUGADDR="taviso@gentoo.org"
-
-	econf ${myconf} || die
-	emake || die
-}
-
-src_install() {
-
-	make DESTDIR=${D} install || die
-
-	if use perl; then
-
-		local toolkits="gtk2 gtk tcltk"
-
-		if use tcltk; then
-			# Install the very cool FvwmTabs module
-			# http://users.tpg.com.au/users/scottie7/FvwmTabs
-			einfo "Installing FvwmTabs module..."
-
-			exeinto /usr/lib/fvwm/${PV}/
-			doexe ${WORKDIR}/FvwmTabs
-			dodoc ${WORKDIR}/fvwmtabrc ${WORKDIR}/README.fvwmtabs
-			doman ${WORKDIR}/FvwmTabs.1
-
-			# install default drag and drop icon.
-			insinto /usr/share/fvwm
-			newins ${FILESDIR}/mini.happy.xpm mini-happy.xpm
-		else
-			# Remove the Tk bindings (requires perl-tk)
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Tk.pm
-			toolkits=${toolkits/tcltk/}
-		fi
-		if ! use gtk; then
-			# Remove gtk bindings (requires gtk-perl/gtk2-perl)
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk.pm \
-				${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-			toolkits=${toolkits/gtk2/}
-			toolkits=${toolkits/gtk/}
-		else
-			if ! use gtk2; then
-				# Just remove the gtk2 bindings (requires gtk2-perl)
-				rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Gtk2.pm
-				toolkits=${toolkits/gtk2/}
-			fi
-		fi
-		toolkits=${toolkits// /}
-		if ! test "${toolkits}"; then
-			# No perl toolkit bindings wanted, remove the unneeded files
-			# and empty directories.
-			rm -f ${D}/usr/share/fvwm/perllib/FVWM/Module/Toolkit.pm
-			find ${D}/usr/share/fvwm/perllib -depth -type d -exec rmdir {} \; 2>/dev/null
-		fi
-	else
-		# Remove useless script if perllib isnt required.
-		rm -rf ${D}/usr/bin/fvwm-perllib ${D}/usr/share/man/man1/fvwm-perllib.1
-	fi
-
-	# neat utility for testing fvwm behaviour on applications setting various
-	# hints, creates a simple black window with configurable hints set.
-	if use debug; then
-		dobin ${S}/tests/hints/hints_test
-		newdoc ${S}/tests/hints/README README.hints
-	fi
-
-	# fvwm-convert-2.6 is just a stub, contains no code - remove it for now.
-	# fvwm-convert-2.2 has a man page, but the script is no longer distributed.
-	rm -f ${D}/usr/bin/fvwm-convert-2.6 ${D}/usr/share/man/man1/fvwm-convert-2.6.1
-	rm -f ${D}/usr/share/man/man1/fvwm-convert-2.2.1
-
-	# ive included `exec` to save a few bytes of memory.
-	echo "#!/bin/bash" > fvwm2
-	echo "exec /usr/bin/fvwm2" >> fvwm2
-
-	exeinto /etc/X11/Sessions
-	doexe fvwm2
-
-	dodoc AUTHORS ChangeLog COPYING README NEWS docs/ANNOUNCE docs/BUGS \
-	docs/COMMANDS docs/DEVELOPERS docs/FAQ docs/error_codes docs/TODO \
-	docs/fvwm.lsm
-
-	dodoc utils/fvwm_make_directory_menu.sh  utils/fvwm_make_browse_menu.sh \
-	utils/quantize_pixmaps utils/xselection.c
-
-	dodoc ${FILESDIR}/README.transluceny.gz
-
-	# make sure FvwmGtk man page is installed
-	use gtk && doman ${S}/modules/FvwmGtk/FvwmGtk.1
-
-	# fix a couple of symlinks.
-	prepallman
-}
-
-pkg_postinst() {
-	if use perl; then
-		if use tcltk; then
-			einfo "By setting the perl and tcltk USE flags, you have elected to"
-			einfo "install the FvwmTabs module, a configurable tabbing system"
-			einfo "for FVWM. You can read more about FvwmTabs here:"
-			einfo
-			einfo "	http://users.tpg.com.au/users/scottie7/fvwmtabs.html"
-			einfo
-		fi
-	fi
-}