author: Chris White <chriswhite@gentoo.org> 2005-11-30 09:38:30 +0000
committer: Chris White <chriswhite@gentoo.org> 2005-11-30 09:38:30 +0000
commit: 67c8b060271109f68d8b0a44de61d297ddfbe2e7 (patch)
tree: 42ce8164da9dd6d55caa82dfe6832b4a2a0a6ad5 /x11-wm
parent: *** empty log message *** (diff)
download: gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.tar.gz
gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.tar.bz2
gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.zip
242 files changed, 1233 insertions, 7745 deletions
diff --git a/x11-wm/aewm++-goodies/ChangeLog b/x11-wm/aewm++-goodies/ChangeLog
index 8ea48bc2058d..952cbdaefbcd 100644
--- a/x11-wm/aewm++-goodies/ChangeLog
+++ b/x11-wm/aewm++-goodies/ChangeLog
@@ -1,21 +1,6 @@
 # ChangeLog for x11-wm/aewm++-goodies
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++-goodies/ChangeLog,v 1.8 2005/06/30 18:16:13 josejx Exp $
-
-  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> aewm++-goodies-1.0.ebuild:
-  Marked ppc stable for bug #97512. Thanks nixnut.
-
-  10 May 2005; David Holm <dholm@gentoo.org> aewm++-goodies-1.0.ebuild:
-  Added to ~ppc.
-
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> aewm++-goodies-1.0.ebuild:
-  Stable on amd64.
-
-  07 May 2004; Brandon Hale <tseng@gentoo.org> aewm++-goodies-1.0.ebuild:
-  Use epatch
-
-  07 Jan 2004; Jon Portnoy <avenj@gentoo.org> aewm++-goodies-1.0.ebuild :
-  AMD64 keywords.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++-goodies/ChangeLog,v 1.1 2002/11/20 20:26:17 mkennedy Exp $
 
 *aewm++-goodies-1.0 (19 Nov 2002)
 
diff --git a/x11-wm/aewm++-goodies/Manifest b/x11-wm/aewm++-goodies/Manifest
index f4cf76cfcffe..e69de29bb2d1 100644
--- a/x11-wm/aewm++-goodies/Manifest
+++ b/x11-wm/aewm++-goodies/Manifest
@@ -1,5 +0,0 @@
-MD5 576c986697da27f27ec0363f57c34660 ChangeLog 933
-MD5 1b1b80021822585d8dbfbbe2cdbde62e metadata.xml 395
-MD5 4863dd2ac63dfe1f12436eb3b1fc9794 aewm++-goodies-1.0.ebuild 932
-MD5 e9d990dafb164f214da2cad9563f5579 files/digest-aewm++-goodies-1.0 70
-MD5 c72a6ef4c8e075663a670c412947b7c7 files/aewm++-goodies-gcc3-gentoo.patch 2878
diff --git a/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild b/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild
index b9c9d4cc4a3d..b997ad92b292 100644
--- a/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild
+++ b/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild
@@ -1,18 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild,v 1.10 2005/06/30 18:16:13 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++-goodies/aewm++-goodies-1.0.ebuild,v 1.1 2002/11/20 20:26:17 mkennedy Exp $
 
-inherit eutils
+IUSE=""
 
-DESCRIPTION="Goodies for aewm++"
+DESCRIPTION="Goodies for aewm++."
 HOMEPAGE="http://sapphire.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sapphire/${P/-/_}.tar.bz2"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
+KEYWORDS="x86"
 DEPEND="virtual/x11"
 
 S="${WORKDIR}/${PN/-/_}"
@@ -22,12 +19,11 @@ GOODIES="ae_fspanel-1.0 appbar-1.0 setrootimage-1.0"
 src_unpack() {
 	unpack ${A}
 	# compatibility with ANSI C++ and GCC3.2
-	cd ${S}
-	epatch ${FILESDIR}/aewm++-goodies-gcc3-gentoo.patch
+	cd ${S} && patch -p1 <${FILESDIR}/aewm++-goodies-gcc3-gentoo.patch || die
 }
 
 src_compile() {
-	for i in ${GOODIES}
+	for i in ${GOODIES} 
 	do
 		make CFLAGS="${CFLAGS}" -C $i || die
 	done
@@ -35,7 +31,7 @@ src_compile() {
 
 src_install() {
 	dodir /usr/bin
-	for i in ${GOODIES}
+	for i in ${GOODIES} 
 	do
 		make DESTDIR=${D} -C $i install || die
 		docinto $i
diff --git a/x11-wm/aewm++/ChangeLog b/x11-wm/aewm++/ChangeLog
index 77662290ff64..ee6ae928cbe2 100644
--- a/x11-wm/aewm++/ChangeLog
+++ b/x11-wm/aewm++/ChangeLog
@@ -1,27 +1,6 @@
 # ChangeLog for x11-wm/aewm++
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/ChangeLog,v 1.9 2005/06/30 18:00:27 josejx Exp $
-
-  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> aewm++-1.0.24.ebuild:
-  Marked ppc stable for bug #97511.  Thanks nixnut.
-
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> aewm++-1.0.24.ebuild:
-  Stable on amd64.
-
-  07 Jan 2005; Joseph Jezak <josejx@gentoo.org> +files/gcc-3.4.patch,
-  aewm++-1.0.24.ebuild:
-  Marked ~ppc for bug #76860 and added patch to fix compilation on gcc 3.4.
-
-  07 May 2004; Brandon Hale <tseng@gentoo.org> aewm++-1.0.24.ebuild:
-  Add IUSE=
-
-  07 Jan 2004; Jon Portnoy <avenj@gentoo.org> aewm++-1.0.24.ebuild :
-  AMD64 keywords.
-
-*aewm++-1.0.24 (20 Nov 2003)
-
-  20 Nov 2003; <mkennedy@gentoo.org> aewm++-1.0.24.ebuild:
-  minor version update
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/ChangeLog,v 1.1 2002/11/20 17:22:11 mkennedy Exp $
 
 *aewm++-1.0.22 (19 Nov 2002)
 
diff --git a/x11-wm/aewm++/Manifest b/x11-wm/aewm++/Manifest
index 79648a732c94..e69de29bb2d1 100644
--- a/x11-wm/aewm++/Manifest
+++ b/x11-wm/aewm++/Manifest
@@ -1,7 +0,0 @@
-MD5 399567a46940cbe5793a01380c4cba5c ChangeLog 1033
-MD5 e6947c959196876d1192553a30343522 metadata.xml 378
-MD5 95435e3570ffe12188b57fa25792ff6b aewm++-1.0.22.ebuild 641
-MD5 6d83ca08a6ff6e200067c410af53dcdb aewm++-1.0.24.ebuild 721
-MD5 a0b78e5966e37ff6486a378446e92602 files/digest-aewm++-1.0.22 65
-MD5 946a878c80fa1dcb5179316f2777de7b files/gcc-3.4.patch 329
-MD5 22ae4dfeaf792eeab219e40b773e7bf8 files/digest-aewm++-1.0.24 65
diff --git a/x11-wm/aewm++/aewm++-1.0.22.ebuild b/x11-wm/aewm++/aewm++-1.0.22.ebuild
index cd2b7ccb5e54..56b24c43f2ec 100644
--- a/x11-wm/aewm++/aewm++-1.0.22.ebuild
+++ b/x11-wm/aewm++/aewm++-1.0.22.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/aewm++-1.0.22.ebuild,v 1.9 2005/01/07 04:56:40 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/aewm++-1.0.22.ebuild,v 1.1 2002/11/20 17:22:11 mkennedy Exp $
 
 IUSE=""
 
@@ -12,11 +12,17 @@ SLOT="0"
 KEYWORDS="x86"
 DEPEND="virtual/x11"
 
+S="${WORKDIR}/${P}"
+
 src_compile() {
-	make CFLAGS="${CXXFLAGS}" || die
+    make CFLAGS="${CXXFLAGS}" || die
 }
 
 src_install() {
 	make DESTDIR=${D} XROOT=usr/ install || die
 	dodoc ChangeLog INSTALL README LICENSE
+
+	einfo "Edit your ~/.xinitrc and add: exec aewm++"
+	einfo ""
+	einfo "The goodies are now in x11-wm/aem"
 }
diff --git a/x11-wm/aewm++/aewm++-1.0.24.ebuild b/x11-wm/aewm++/aewm++-1.0.24.ebuild
index ca237f1e33f4..065121349c00 100644
--- a/x11-wm/aewm++/aewm++-1.0.24.ebuild
+++ b/x11-wm/aewm++/aewm++-1.0.24.ebuild
@@ -1,23 +1,14 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/aewm++-1.0.24.ebuild,v 1.8 2005/06/30 18:00:27 josejx Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm++/aewm++-1.0.24.ebuild,v 1.1 2003/11/21 02:54:03 mkennedy Exp $
 
 DESCRIPTION="A window manager with more modern features than aewm but with the same look and feel."
 HOMEPAGE="http://sapphire.sourceforge.net/"
 SRC_URI="mirror://sourceforge/sapphire/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="x86"
 DEPEND="virtual/x11"
-IUSE=""
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/gcc-3.4.patch
-}
 
 src_compile() {
 	make CFLAGS="${CXXFLAGS}" || die
diff --git a/x11-wm/aewm/ChangeLog b/x11-wm/aewm/ChangeLog
index 5251aec473c9..a0c78286ed65 100644
--- a/x11-wm/aewm/ChangeLog
+++ b/x11-wm/aewm/ChangeLog
@@ -1,34 +1,6 @@
 # ChangeLog for x11-wm/aewm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/ChangeLog,v 1.11 2005/06/30 17:50:47 josejx Exp $
-
-  30 Jun 2005; Joseph Jezak <josejx@gentoo.org> aewm-1.2.3.ebuild:
-  Marked ppc stable for bug #97510. Thanks nixnut.
-
-  07 Jan 2005; Joseph Jezak <josejx@gentoo.org> aewm-1.2.3.ebuild:
-  Marked ~ppc for bug #76860.
-
-  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> aewm-1.2.3.ebuild:
-  add sed-4 dep
-
-  07 May 2004; Brandon Hale <tseng@gentoo.org> aewm-1.2.3.ebuild:
-  Remove S=
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> aewm-1.2.3.ebuild:
-  Add inherit eutils
-
-  07 Mar 2004; Markus Nigbur <pyrania@gentoo.org> aewm-1.2.0.ebuild:
-  Removed stale ebuild.
-
-  04 Dec 2003; Brandon Hale <tseng@gentoo.org> aewm-1.2.3.ebuild:
-  fixing bad DEPEND
-
-*aewm-1.2.3 (20 Nov 2003)
-
-  20 Nov 2003; <mkennedy@gentoo.org> aewm-1.2.3.ebuild,
-  files/1.2.3-freetype-gentoo.diff:
-  minor version update and support for XFT/GTK thanks to Doug Weimer
-  <dweimer@socal.rr.com> of bug 32573
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/ChangeLog,v 1.1 2002/11/20 17:51:20 mkennedy Exp $
 
 *aewm-1.2.0 (19 Nov 2002)
 
diff --git a/x11-wm/aewm/Manifest b/x11-wm/aewm/Manifest
index 17c9a77c077e..e69de29bb2d1 100644
--- a/x11-wm/aewm/Manifest
+++ b/x11-wm/aewm/Manifest
@@ -1,5 +0,0 @@
-MD5 2266a4cec9050d4e37123cae4bbde0c7 ChangeLog 1234
-MD5 f4c8ddf72369c97fe2fb9d7402c1ad59 metadata.xml 515
-MD5 70468a428adbfdb93d4fc987d545fe43 aewm-1.2.3.ebuild 1134
-MD5 52660acc39a0a4a82726306491187095 files/digest-aewm-1.2.3 61
-MD5 bd90884deb5fb95c1176228d13ffdbb8 files/1.2.3-freetype-gentoo.diff 565
diff --git a/x11-wm/aewm/aewm-1.2.3.ebuild b/x11-wm/aewm/aewm-1.2.3.ebuild
index 8a5d35fa762c..710b234b5769 100644
--- a/x11-wm/aewm/aewm-1.2.3.ebuild
+++ b/x11-wm/aewm/aewm-1.2.3.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/aewm-1.2.3.ebuild,v 1.8 2005/06/30 17:50:47 josejx Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/aewm/aewm-1.2.3.ebuild,v 1.1 2003/11/21 02:53:15 mkennedy Exp $
 
 IUSE="gtk2"
 
@@ -11,10 +9,11 @@ HOMEPAGE="http://www.red-bean.com/%7Edecklin/aewm/"
 SRC_URI="http://www.red-bean.com/%7Edecklin/aewm/${P}.tar.gz"
 LICENSE="aewm"
 SLOT="0"
-KEYWORDS="ppc x86"
+KEYWORDS="x86"
 DEPEND="virtual/x11
-	gtk2? ( >=x11-libs/gtk+-2.0.0 ) !gtk2? ( =x11-libs/gtk+-1.2* )
-	>=sys-apps/sed-4"
+	gtk2? ( >=x11-libs/gtk+-2.0.0 ) : ( =x11-libs/gtk+-1.2* )"
+
+S="${WORKDIR}/${P}"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index f699fac642d2..e04899c678f9 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,206 +1,6 @@
 # ChangeLog for x11-wm/afterstep
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.48 2005/11/11 23:10:25 hansmi Exp $
-
-  11 Nov 2005; Michael Hanselmann <hansmi@gentoo.org>
-  afterstep-2.1.2.ebuild:
-  Stable on ppc.
-
-  28 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  afterstep-2.1.2.ebuild:
-  Stable on sparc
-
-  27 Oct 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
-  -afterstep-2.00.04.ebuild, -afterstep-2.1.1.ebuild,
-  afterstep-2.1.2.ebuild:
-  Marked 2.1.2 stable on x86; tidy old ebuilds.
-
-  23 Aug 2005; Aaron Walker <ka0ttic@gentoo.org> afterstep-1.8.11-r2.ebuild,
-  afterstep-2.00.04.ebuild, afterstep-2.00.05.ebuild,
-  afterstep-2.1.1.ebuild, afterstep-2.1.2.ebuild:
-  Use cp -pPR and not cp -a,  bug 103487.
-
-  31 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> afterstep-2.1.2.ebuild:
-  Added ~amd64.
-
-*afterstep-2.1.2 (22 Jul 2005)
-
-  22 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> -afterstep-2.1.0.ebuild,
-  +afterstep-2.1.2.ebuild:
-  Version bump.
-
-  13 Jul 2005; bret curtis <psi29a@gentoo.org> afterstep-2.1.1.ebuild:
-  added to mips testing
-
-  18 Jun 2005; Markus Rothe <corsair@gentoo.org> afterstep-2.1.1.ebuild:
-  added ~ppc64
-
-  17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
-  afterstep-2.00.05.ebuild:
-  Stable on ppc.
-
-  14 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml:
-  Added afterstep herd.
-
-*afterstep-2.1.1 (12 Jun 2005)
-
-  12 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> -files/as2-gnome.diff,
-  -files/afterstep-2.00.01-fix-makefile.diff, -files/as2-gnome-r1.diff,
-  -afterstep-2.00.01.ebuild, -afterstep-2.00.02.ebuild,
-  +afterstep-2.1.1.ebuild:
-  Version bump; tidy'd old ebuilds/patches.
-
-  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  afterstep-2.00.05.ebuild:
-  Stable on sparc
-
-  09 Jun 2005; Aaron Walker <ka0ttic@gentoo.org> afterstep-2.00.05.ebuild:
-  Stable on x86.
-
-*afterstep-2.1.0 (18 May 2005)
-
-  18 May 2005; Aaron Walker <ka0ttic@gentoo.org> +afterstep-2.1.0.ebuild:
-  Version bump.
-
-  06 May 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  afterstep-2.00.04.ebuild:
-  Stable on sparc
-
-*afterstep-2.00.05 (06 May 2005)
-
-  06 May 2005; Aaron Walker <ka0ttic@gentoo.org> afterstep-2.00.04.ebuild,
-  +afterstep-2.00.05.ebuild:
-  Version bump; 2.00.04 stable on x86.
-
-  31 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> afterstep-2.00.04.ebuild:
-  unset DISPLAY so the build will not try to check display resolution causing
-  access violations bug 87326. Also cleaned up src_compile quite a bit. As
-  usual thanks to Nathan.
-
-  30 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  afterstep-2.00.02.ebuild:
-  Stable on sparc
-
-*afterstep-2.00.04 (30 Mar 2005)
-
-  30 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> afterstep-2.00.02.ebuild,
-  +afterstep-2.00.04.ebuild:
-  Version bump; marked 2.00.02 stable on x86.
-
-  15 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  afterstep-2.00.01.ebuild:
-  Stable on sparc
-
-  14 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
-  afterstep-2.00.01.ebuild:
-  Stable on x86.
-
-  31 Jan 2005; Aaron Walker <ka0ttic@gentoo.org>
-  -afterstep-2.0_beta3.ebuild, -afterstep-2.0_beta4.ebuild:
-  Tidy 2.0 beta ebuilds
-
-*afterstep-2.00.02 (20 Jan 2005)
-
-  20 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> +afterstep-2.00.02.ebuild:
-  Version bump.
-
-*afterstep-2.00.01 (17 Jan 2005)
-
-  17 Jan 2005; Aaron Walker <ka0ttic@gentoo.org> metadata.xml,
-  +files/afterstep-2.00.01-fix-makefile.diff, +afterstep-2.00.01.ebuild:
-  Version bump, thanks to Nathan Mahon.
-
-  24 Sep 2004; Armando Di Cianno <fafhrd@gentoo.org>
-  afterstep-1.8.11-r2.ebuild:
-  Removed needless DEPEND on gnustep-base/gnustep-env.
-
-  23 Jul 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  afterstep-1.8.11-r2.ebuild:
-  x11-wm/gnustep-env -> gnustep-base/gnustep-env
-
-  07 Jul 2004; Hardave Riar <hardave@gentoo.org> afterstep-1.8.11-r2.ebuild:
-  Added ~mips KEYWORD
-
-  03 Jul 2004; Jason Wever <weeve@gentoo.org> afterstep-2.0_beta4.ebuild:
-  Added ~sparc keyword.
-
-  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> afterstep-1.8.11-r2.ebuild,
-  afterstep-2.0_beta3.ebuild, afterstep-2.0_beta4.ebuild:
-  sync IUSE (+nls), glibc -> libc
-
-  23 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org>
-  afterstep-2.0_beta3.ebuild, afterstep-2.0_beta4.ebuild:
-  dev-util/efence is no more
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> afterstep-2.0_beta3.ebuild,
-  afterstep-2.0_beta4.ebuild:
-  Add inherit eutils
-
-*afterstep-2.0_beta4 (18 Mar 2004)
-
-  18 Mar 2004; Nick Hadaway <raker@gentoo.org> afterstep-2.0_beta4.ebuild,
-  files/as2-gnome-r1.diff:
-  Another version bump.  Updated the gnome patch.
-
-*afterstep-2.0_beta3 (25 Feb 2004)
-
-  25 Feb 2004; Nick Hadaway <raker@gentoo.org> afterstep-2.0_beta3.ebuild:
-  Version bump.  Stability changes.  No significant ebuild changes.
-  See bug #42029.
-
-  21 Oct 2003; Nick Hadaway <raker@gentoo.org> afterstep-2.0_beta2.ebuild:
-  See bug #31541.  Thanks to Doug Weimer and Mike Gardiner for providing
-  quick answers to a pesky little problem.
-
-*afterstep-2.0_beta2 (18 Oct 2003)
-
-  18 Oct 2003; Nick Hadaway <raker@gentoo.org> afterstep-2.0_beta2.ebuild:
-  Afterstep is almost 2.00 revisions old! :)
-
-  12 Jun 2003; <msterret@gentoo.org> afterstep-1.8.11-r1.ebuild,
-  afterstep-1.8.11-r2.ebuild:
-  add Header
-
-  12 Jun 2003; Seemant Kulleen <seemant@gentoo.org>
-  afterstep-1.8.11-r1.ebuild:
-  xfree provides xpm
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*afterstep-1.8.11-r2 (18 Apr 2002)
-
-  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> afterstep-1.8.11-r2.ebuild :
-  Added IUSE.
-
-  18 Apr 2002; Spider <spider@gentoo.org> ChangeLog afterstep-1.8.11-r2.ebuild :
-  Fix changelog syntax
-  remove dependency on xpm, that version is in XFree
-
-*afterstep-1.8.11-r2 (12 Apr 2002)
-  12 Apr 2002; Seemant Kulleen <seemant@gentoo.org> afterstep-1.8.11-r2.ebuild :
-  Recompile against libpng-1.2.1 and optional USE dependent tiff support
-
-*afterstep-1.8.11-r1 (16 Mar 2002)
-
-  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> afterstep-1.8.11-r1.ebuild :
-  Added IUSE.
-
-  16 Mar 2002; Seemant Kulleen <seemant@gentoo.org> afterstep-1.8.11-r1.ebuild :
-  Added libXPM support to AfterStep.
-
-*afterstep-1.8.11 (15 Mar 2002)
-  15 Mar 2002; Seemant Kulleen <seemant@gentoo.org> afterstep-1.8.11.ebuild :
-  Version upgrade -- recycled patch from the previous release. This was 
-  basically copying the old ebuild to the new filename and the old patch
-  to correspond.
-
-*afterstep-1.8.10-r1 (14 Feb 2002)
-
-  14 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
-  
-  Added /etc/X11/Sessions/afterstep. This adds afterstep to the auto-generated
-  menu of session types in kdm and gdm.
-  Fixed sandbox compile.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
 *afterstep-1.8.10 (1 Feb 2002)
 
@@ -211,4 +11,3 @@
   comments should well explained and written in clean English. The details about
   writing correct changelogs are explained in the skel.ChangeLog file which you
   can find in the root directory of the portage repository.
-
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index c8885f1637f6..fadbcd82c09a 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,10 +1,8 @@
-MD5 6fd947c221ba6a4256e1485bcdb9cf5a ChangeLog 7197
-MD5 f4c51fea71475ebe46a82e096640fdd9 afterstep-1.8.11-r2.ebuild 1547
-MD5 7036af2d5fa6c9837c13df9e041d7e34 afterstep-2.00.05.ebuild 3359
-MD5 1aa60edd851ae919c3bac98c0bc0b8c2 afterstep-2.1.2.ebuild 3376
+MD5 7fdd2f0d75a8399b1adcad6600635563 ChangeLog 2001
+MD5 9dcab15a952830d40827c16e7b7dceeb afterstep-1.8.11-r1.ebuild 1351
+MD5 9313447325a20f10f1d5b21cd9aa9f5d afterstep-1.8.11-r2.ebuild 1461
 MD5 720723e9a9846b9d6a7e64a25b1adbbc files/afterstep 29
+MD5 7d3868b85f7325c35e5165a8c10ce77d files/afterstep-1.8.10-gentoo.diff 1321
 MD5 7d3868b85f7325c35e5165a8c10ce77d files/afterstep-1.8.11-gentoo.diff 1321
+MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r1 70
 MD5 9735d9a9bce29bcbd35792c0c4064ea0 files/digest-afterstep-1.8.11-r2 70
-MD5 aa6dd1f671415f2083b1161571752859 files/digest-afterstep-2.00.05 71
-MD5 f92576044c379b6c3b3240972a1be536 files/digest-afterstep-2.1.2 69
-MD5 bb0cd3dcc1a371b3fba19147868d7c5c metadata.xml 350
diff --git a/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild b/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild
index 5894a288964f..2e3c0088c90d 100644
--- a/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild
+++ b/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild
@@ -1,66 +1,65 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-1.8.11-r2.ebuild,v 1.23 2005/08/23 18:55:31 ka0ttic Exp $
+# Copyright 1999-2000 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Peter Gavin <pete@gentoo.org>
 
 S=${WORKDIR}/AfterStep-${PV}
 DESCRIPTION="A window manager based on the NeXTStep interface."
 SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
 HOMEPAGE="http://www.afterstep.org/"
-LICENSE="AFTERSTEP"
-SLOT="0"
-KEYWORDS="x86 sparc ppc ~mips"
-IUSE="nls"
 
-DEPEND="virtual/libc virtual/x11
+DEPEND="virtual/glibc virtual/x11
 	>=media-libs/jpeg-6b
-	>=media-libs/libpng-1.2.1"
-## >=media-libs/xpm-3.4k
+	>=media-libs/libpng-1.2.1
+	>=media-libs/xpm-3.4k
+	x11-wm/gnustep-env"
 
 RDEPEND="${DEPEND}
 	 >=media-sound/sox-12.17.1"
 
 
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+
+    unpack ${A}
+    cd ${S}
+    patch -p0 < ${FILESDIR}/${P}-gentoo.diff
+
 }
 
 src_compile() {
 	local myconf
 	use nls && myconf="${myconf} --enable-i18n"
 
-	./configure \
-		--host=${CHOST} \
-		--prefix=/usr \
-		--libdir=/usr/lib \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--sysconfdir=/etc/X11 \
-		--with-helpcommand="xterm -e man" \
-		--disable-availability \
-		--disable-staticlibs \
-		--with-xpm \
+	./configure	\
+		--host=${CHOST}	\
+		--prefix=/usr	\
+		--libdir=/usr/lib	\
+		--mandir=/usr/share/man	\
+		--infodir=/usr/share/info	\
+		--sysconfdir=/etc/X11	\
+		--with-helpcommand="xterm -e man"	\
+		--disable-availability	\
+		--disable-staticlibs	\
+		--with-xpm	\
 		${myconf} || die
-
+		    
 	emake || die
 }
 
 src_install() {
 
-	make DESTDIR=${D} \
-	     GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT} \
+	make DESTDIR=${D}						\
+	     GNUSTEP_LOCAL_ROOT=${D}${GNUSTEP_LOCAL_ROOT}		\
 	     install || die
-
+	     
 	rm -f ${D}/usr/bin/sessreg
 
 	dodoc COPYRIGHT ChangeLog INSTALL NEW README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
+	cp -a ${S}/TODO ${D}/usr/share/doc/${PF}/
 	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
+	cp -a ${S}/doc/* ${D}/usr/share/doc/${PF}/html
 	rm ${D}/usr/share/doc/${PF}/html/Makefile*
-
+	
 	exeinto /etc/X11/Sessions
 	doexe ${FILESDIR}/afterstep
-
+	
 }
diff --git a/x11-wm/afterstep/afterstep-2.00.05.ebuild b/x11-wm/afterstep/afterstep-2.00.05.ebuild
index c65524d5f179..298921bfea45 100644
--- a/x11-wm/afterstep/afterstep-2.00.05.ebuild
+++ b/x11-wm/afterstep/afterstep-2.00.05.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.05.ebuild,v 1.6 2005/08/23 18:55:31 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.00.05.ebuild,v 1.1 2005/05/06 12:40:30 ka0ttic Exp $
 
 inherit flag-o-matic
 
@@ -10,8 +10,8 @@ SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
 
 LICENSE="AFTERSTEP"
 SLOT="0"
-KEYWORDS="ppc sparc x86"
-IUSE="debug gif jpeg mmx nls png tiff xinerama"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="debug gif jpeg mmx nls png tiff truetype xinerama"
 
 DEPEND="virtual/libc
 	virtual/x11
@@ -76,10 +76,10 @@ src_install() {
 
 	# This fixes a bug with shared libraries
 	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
+	cp -a ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
+	cp -a ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
+	cp -a ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
+	cp -a ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
 
 	# Create a symlink from MonitorWharf to Wharf
 	rm ${D}/usr/bin/MonitorWharf
@@ -87,9 +87,9 @@ src_install() {
 
 	# Handle the documentation
 	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
+	cp -a ${S}/TODO ${D}/usr/share/doc/${PF}/
 	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
+	cp -a ${S}/doc/* ${D}/usr/share/doc/${PF}/html
 	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
 
 	dodir /usr/share/xsessions
diff --git a/x11-wm/afterstep/afterstep-2.1.2.ebuild b/x11-wm/afterstep/afterstep-2.1.2.ebuild
index cc5a348990d7..e9971b554402 100644
--- a/x11-wm/afterstep/afterstep-2.1.2.ebuild
+++ b/x11-wm/afterstep/afterstep-2.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.1.2.ebuild,v 1.6 2005/11/11 23:10:26 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.1.2.ebuild,v 1.1 2005/07/22 08:42:29 ka0ttic Exp $
 
 inherit flag-o-matic
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
 
 LICENSE="AFTERSTEP"
 SLOT="0"
-KEYWORDS="~amd64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="debug gif jpeg mmx nls png tiff xinerama"
 
 DEPEND="virtual/libc
@@ -76,10 +76,10 @@ src_install() {
 
 	# This fixes a bug with shared libraries
 	rm ${D}/usr/lib/{libAfterImage.a,libAfterBase.a}
-	cp -pPR ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
-	cp -pPR ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
+	cp -a ${S}/libAfterImage/libAfterImage.so* ${D}/usr/lib
+	cp -a ${S}/libAfterBase/libAfterBase.so* ${D}/usr/lib
+	cp -a ${S}/libAfterConf/libAfterConf.so* ${D}/usr/lib
+	cp -a ${S}/libAfterStep/libAfterStep.so* ${D}/usr/lib
 
 	# Create a symlink from MonitorWharf to Wharf
 	rm ${D}/usr/bin/MonitorWharf
@@ -87,9 +87,9 @@ src_install() {
 
 	# Handle the documentation
 	dodoc COPYRIGHT ChangeLog INSTALL NEW* README* TEAM UPGRADE
-	cp -pPR ${S}/TODO ${D}/usr/share/doc/${PF}/
+	cp -a ${S}/TODO ${D}/usr/share/doc/${PF}/
 	dodir /usr/share/doc/${PF}/html
-	cp -pPR ${S}/doc/* ${D}/usr/share/doc/${PF}/html
+	cp -a ${S}/doc/* ${D}/usr/share/doc/${PF}/html
 	rm ${D}/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
 
 	dodir /usr/share/xsessions
diff --git a/x11-wm/afterstep/files/afterstep b/x11-wm/afterstep/files/afterstep
index 22bc4441ea42..d903fedd32a5 100755
--- a/x11-wm/afterstep/files/afterstep
+++ b/x11-wm/afterstep/files/afterstep
@@ -1,2 +1,3 @@
 #!/bin/sh
-/usr/bin/afterstep
+
+exec /usr/X11R6/bin/afterstep
diff --git a/x11-wm/afterstep/metadata.xml b/x11-wm/afterstep/metadata.xml
index bb5dbc652bc7..194b369637e4 100644
--- a/x11-wm/afterstep/metadata.xml
+++ b/x11-wm/afterstep/metadata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>afterstep</herd>
-	<maintainer>
-		<email>gentoo.org@vaevictus.net</email>
-		<name>Nathan Mahon</name>
-		<description>Upstream developer; afterstep herd maintains on his behalf</description>
-	</maintainer>
+<herd>no-herd</herd>
+<maintainer>
+  <email>raker@gentoo.org</email>
+</maintainer>
 </pkgmetadata>
diff --git a/x11-wm/amiwm/ChangeLog b/x11-wm/amiwm/ChangeLog
index b7e88f8c7394..2dff5e724aeb 100644
--- a/x11-wm/amiwm/ChangeLog
+++ b/x11-wm/amiwm/ChangeLog
@@ -1,13 +1,6 @@
 # ChangeLog for x11-wm/amiwm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.4 2005/05/10 09:06:04 dholm Exp $
-
-  10 May 2005; David Holm <dholm@gentoo.org> amiwm-0.20_p48.ebuild:
-  Added to ~ppc.
-
-  24 Sep 2003; <paul@gentoo.org> amiwm-0.20_p48.ebuild:
-  Change the (R) character into (R) to disallow confusion. (The character was
-  not in UTF-8)
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/ChangeLog,v 1.1 2003/09/06 17:17:40 karltk Exp $
 
 *amiwm-0.20_p48 (06 Sep 2003)
 
diff --git a/x11-wm/amiwm/Manifest b/x11-wm/amiwm/Manifest
index c79113d3e6b2..162024b9aebd 100644
--- a/x11-wm/amiwm/Manifest
+++ b/x11-wm/amiwm/Manifest
@@ -1,4 +1,3 @@
-MD5 31aecbd736b335ec3aa401969f79e5c9 ChangeLog 639
-MD5 f172622d352fc6ae045af14628db239c amiwm-0.20_p48.ebuild 939
-MD5 db4c42351dc265cd9668e40667cfe9e9 metadata.xml 420
+MD5 1813433c1f3150a1316e59ec8a931b03 amiwm-0.20_p48.ebuild 826
+MD5 f7f51e631dc8caa5191cbf97f56b08b0 ChangeLog 312
 MD5 3fb87d8b6cf877ea7926258b01f708dd files/digest-amiwm-0.20_p48 65
diff --git a/x11-wm/amiwm/amiwm-0.20_p48.ebuild b/x11-wm/amiwm/amiwm-0.20_p48.ebuild
index f471ca86064c..3d87da0fb52e 100644
--- a/x11-wm/amiwm/amiwm-0.20_p48.ebuild
+++ b/x11-wm/amiwm/amiwm-0.20_p48.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.5 2005/05/10 09:06:04 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/amiwm/amiwm-0.20_p48.ebuild,v 1.1 2003/09/06 17:17:40 karltk Exp $
 
 MY_P="${PN}${PV/_p/pl}"
-DESCRIPTION="Windowmanager ala Amiga(R) Workbench(R)"
+DESCRIPTION="Windowmanager ala Amiga� Workbenh"
 HOMEPAGE="http://www.lysator.liu.se/~marcus/amiwm.html"
 SRC_URI="ftp://ftp.lysator.liu.se/pub/X11/wm/amiwm/${MY_P}.tar.gz"
 
 LICENSE="amiwm"
 SLOT="0"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="~x86"
 IUSE=""
 
 DEPEND="virtual/x11"
diff --git a/x11-wm/blackbox/ChangeLog b/x11-wm/blackbox/ChangeLog
index 8bee07a42bdd..a339d20fc3c7 100644
--- a/x11-wm/blackbox/ChangeLog
+++ b/x11-wm/blackbox/ChangeLog
@@ -1,193 +1,11 @@
 # ChangeLog for x11-wm/blackbox
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.47 2005/06/06 16:44:47 corsair Exp $
-
-  06 Jun 2005; Markus Rothe <corsair@gentoo.org> blackbox-0.70.0.ebuild:
-  Stable on ppc64
-
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> blackbox-0.70.0.ebuild:
-  Stable on amd64.
-
-  01 May 2005; Michael Hanselmann <hansmi@gentoo.org>
-  blackbox-0.70.0.ebuild:
-  Stable on ppc.
-
-  01 May 2005; Guy Martin <gmsoft@gentoo.org> blackbox-0.70.0.ebuild:
-  Stable on hppa.
-
-  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> blackbox-0.70.0.ebuild:
-  Stable on ia64.
-
-  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> blackbox-0.70.0.ebuild:
-  Stable on alpha.
-
-  26 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  blackbox-0.70.0.ebuild:
-  Stable on sparc
-
-  23 Apr 2005; Aaron Walker <ka0ttic@gentoo.org> blackbox-0.70.0.ebuild:
-  Marked stable on x86.
-
-*blackbox-0.70.0 (10 Mar 2005)
-
-  10 Mar 2005; Aaron Walker <ka0ttic@gentoo.org> -files/blackbox,
-  +files/blackbox.desktop, +blackbox-0.70.0.ebuild:
-  Version bump for bug 84399. New ebuild rewritten and no longer uses
-  commonbox.eclass.
-
-  06 Feb 2005; Markus Rothe <corsair@gentoo.org> blackbox-0.65.0-r4.ebuild:
-  Stable on ppc64
-
-*blackbox-0.65.0-r4 (31 Dec 2004)
-
-  31 Dec 2004; Markus Rothe <corsair@gentoo.org>
-  +files/blackbox-0.65.0-gcc34.patch, +blackbox-0.65.0-r4.ebuild:
-  Added gcc34 patch from bug #64747 and marked new revision as ~ppc64
-
-  06 May 2004; Brandon Hale <tseng@gentoo.org> blackbox-0.65.0-r3.ebuild:
-  Remove explicit S= and remove NLS from IUSE.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> blackbox-0.65.0-r3.ebuild:
-  Add inherit eutils
-
-  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> blackbox-0.65.0-r3.ebuild:
-  stable on alpha and ia64
-
-  17 Feb 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  blackbox-0.65.0-r3.ebuild:
-  stable on hppa
-
-  26 Dec 2003; Jason Wever <weeve@gentoo.org> blackbox-0.65.0-r3.ebuild:
-  Marked stable on sparc.
-
-  19 Dec 2003; Brandon Hale <tseng@gentoo.org> blackbox-0.65.0-r3.ebuild:
-  Fixing lisense (as-is).
-
-  14 Dec 2003; Lars Weiler <pylon@gentoo.org> blackbox-0.65.0-r3.ebuild:
-  Masked stable on ppc
-
-*blackbox-0.65.0-r3 (07 Dec 2003)
-
-  07 Dec 2003; Brandon Hale <tseng@gentoo.org> blackbox-0.62.1-r3.ebuild,
-  blackbox-0.65.0-r2.ebuild, blackbox-0.65.0-r3.ebuild,
-  files/disable_rootcommand.patch:
-  Disabling RootCommand in styles, a glaring security hole, and imo less than
-  useful.
-
-  11 Nov 2003; Brandon Hale <tseng@gentoo.org> blackbox-0.65.0-r2.ebuild:
-  Disabling NLS until it becomes slightly less than horribly broken upstream.
-
-  11 Oct 2003; Joel Hill <hillster@gentoo.org> blackbox-0.65.0-r2.ebuild:
-  typo, closes #30890
-
-*blackbox-0.65.0-r2 (09 Oct 2003)
-
-  09 Oct 2003; Brandon Hale <tseng@gentoo.org> blackbox-0.65.0-r1.ebuild,
-  blackbox-0.65.0-r2.ebuild, blackbox-0.65.0.ebuild, files/blackbox-gcc.patch:
-  Cleanup and fix for gcc 3.3, closes #29633
-
-  26 Sep 2003; Martin Holzer <mholzer@gentoo.org> blackbox-0.65.0-r1.ebuild:
-  added more docs. Closes #29560.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
-
-*blackbox-0.65.0-r1 (26 Oct 2002)
-
-  5 Nov 2002; Matt Keadle <mkeadle@gentoo.org> blackbox-0.65.0-r1
-  Added some ewarn statements allerting users to the mousewheel patch.
-
-  26 Oct 2002; Matt Keadle <mkeadle@gentoo.org> blackbox-0.65.0-r1
-  files/digest-blackbox-0.65.0-r1
-
-  Added mouse wheel patch. You can either change window focus or change
-  workspaces with this one and you can use the configuration menu to set
-  it or reverse the scroll direction. Window shading included.
-
-  Patch created by Michael Langley (ownx).
-
-*blackbox-0.65.0 (19 Sep 2002)
-
-  19 Sep 2002; Spider <spider@gentoo.org> blackbox-0.65.0.ebuild : bump version
-  this is it, the final one
-
-*blackbox-0.65.0_beta7 (05 Sep 2002)
-  05 Sep 2002; Spider <spider@gentoo.org> blackbox-0.65.0_beta7.ebuild :
-  version bump, sorry for the delay
-
-*blackbox-0.65.0_beta5 (09 aug 2002)
-  09 Aug 2002 ; Spider <spider@gentoo.org> blackbox-0.65.0_beta5.ebuild :
-  version bump
-
-*blackbox-0.65.0_beta3-r1 (18 Jul 2002)
-    18 Jul 2002; Spider <spider@gentoo.org> blackbox-0.65.0_beta3-r1.ebuild :
-    and the eclass version
-
-
-*blackbox-0.65.0_beta3 (18 Jul 2002)
-  18 Jul 2002; Spider <spider@gentoo.org> blackbox-0.65.0_beta3.ebuild :
-  new version
-  repomaned
-
-*blackbox-0.62.1-r3 (14 Jul 2002)
-
-  24 Jul 2002; Mark Guertin <gerk@gentoo.org> :
-  Added ppc to keywords
-
-  14 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
-  blackbox-0.62.1-r3.ebuild files/digest-blackbox-0.62.1-r3 :
-
-  eclassed.
-
-*blackbox-0.65.0_alpha8 (17 Jun 2002)
-  17 Jun 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha8.ebuild:
-  new version. forgot to add this about a week ago ;)
-
-*blackbox-0.65.0_alpha7 (02 Jun 2002)
-  02 May 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha7.ebuild:
-   bump said the alpha and version updated
-
-
-*blackbox-0.65.0_alpha6 (22 May 2002)
-  22 May 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha6.ebuild:
-  latest, greatest, better than ever, and compiles on gcc 3.x
-
-
-*blackbox-0.65.0_alpha4 (19 May 2002)
-  19 May 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha4.ebuild:
-  just a version bump
-
-*blackbox-0.65.0_alpha2-r1 (27 Apr 2002)
-  27 Apr 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha2-r1.ebuild:
-  fix $P Mangling to use MY_P and be nice to portage
-
-*blackbox-0.65.0_alpha2 (26 Apr 2002)
-  26 Apr 2002; Spider <spider@gentoo.org> blackbox-0.65.0_alpha2.ebuild:
-  New alpha, removed unnecessary info/comments
-  lintool check and remove bad space/blankspace
-  new homepage, mangling P due to package names
-
-*blackbox-0.62.1-r2 (15 Mar 2002)
-
-  15 Mar 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog :
-  Made this package provide virtual/blackbox to allow for blackbox applications
-  to run with fluxbox (which is compatible with blackbox).
-
-*blackbox-0.62.1-r1 (14 Feb 2002)
-
-  14 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
-  Added /etc/X11/Sessions/blackbox, which adds blackbox to the auto-updated session
-  list in kdm and gdm.
-
-*blackbox-0.62.1 (2 Feb 2002)
-
-  2 Feb 2002; Leo Lipelis <aeoo@gentoo.org> ChangeLog :
-
-  Blackbox ebuild update.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
 *blackbox-0.61.1-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-
+  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/x11-wm/blackbox/Manifest b/x11-wm/blackbox/Manifest
index 9995224772e4..e69de29bb2d1 100644
--- a/x11-wm/blackbox/Manifest
+++ b/x11-wm/blackbox/Manifest
@@ -1,13 +0,0 @@
-MD5 4ddfb00eebc8e777bd71c5cb379267f0 ChangeLog 6754
-MD5 5102f22f6b5846e5cbfd3e2310c5e5be blackbox-0.65.0-r3.ebuild 1041
-MD5 287288130d5926f4a5d4e9b455056e0e blackbox-0.65.0-r4.ebuild 1089
-MD5 72bfbeadade743369a8c877d31d15041 blackbox-0.70.0.ebuild 1172
-MD5 f08ee46f534b31a6aeb54f5a129e3842 metadata.xml 409
-MD5 35f17799af496f27b77f504b08cd9b21 files/blackbox-0.65.0-gcc34.patch 670
-MD5 7dc8c76692461cd5acad10bef25ed108 files/blackbox-0.65.0-mousewheel_focus-workspace.patch 12929
-MD5 d3a006919ef6641fd6e9326d741acb49 files/blackbox-gcc.patch 1115
-MD5 144d82741971ed0b95a2bbb6c8f11dd5 files/blackbox.desktop 143
-MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0-r3 67
-MD5 366397f56a481c78e646748c12bda976 files/digest-blackbox-0.65.0-r4 67
-MD5 c57a8dbbd253deec063d772021065169 files/digest-blackbox-0.70.0 68
-MD5 099195818052833a934a42dd8f434453 files/disable_rootcommand.patch 395
diff --git a/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild b/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild
index 03d0751388ec..8249ad64230b 100644
--- a/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild
+++ b/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild,v 1.12 2005/02/06 18:50:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0-r3.ebuild,v 1.1 2003/12/08 01:22:39 tseng Exp $
 
-IUSE=""
+IUSE="nls"
 
-inherit commonbox eutils
+inherit commonbox
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A small, fast, full-featured window manager for X - with mousewheel patch"
 SRC_URI="mirror://sourceforge/blackboxwm/${P}.tar.gz"
 HOMEPAGE="http://blackboxwm.sf.net/"
 
-LICENSE="as-is"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc hppa alpha ia64 ~amd64"
+KEYWORDS="x86 ~ppc ~sparc"
 MYCONF="--disable-nls"
 
 mydoc="AUTHORS LICENSE README ChangeLog* TODO* data/README*"
diff --git a/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild b/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild
index 3d048ee92d0e..d093f2d05aa5 100644
--- a/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild
+++ b/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild,v 1.2 2005/02/06 18:50:49 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.65.0-r4.ebuild,v 1.1 2004/12/31 10:24:11 corsair Exp $
 
 IUSE=""
 
@@ -12,7 +12,7 @@ HOMEPAGE="http://blackboxwm.sf.net/"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 MYCONF="--disable-nls"
 
 mydoc="AUTHORS LICENSE README ChangeLog* TODO* data/README*"
diff --git a/x11-wm/blackbox/blackbox-0.70.0.ebuild b/x11-wm/blackbox/blackbox-0.70.0.ebuild
index df0cec8ffd5f..4a247031c53c 100644
--- a/x11-wm/blackbox/blackbox-0.70.0.ebuild
+++ b/x11-wm/blackbox/blackbox-0.70.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.70.0.ebuild,v 1.9 2005/06/06 16:44:47 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blackbox/blackbox-0.70.0.ebuild,v 1.1 2005/03/10 14:53:44 ka0ttic Exp $
 
 DESCRIPTION="A small, fast, full-featured window manager for X"
 HOMEPAGE="http://blackboxwm.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/${PN}wm/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="nls truetype debug"
 
 RDEPEND="virtual/x11
diff --git a/x11-wm/blackbox/metadata.xml b/x11-wm/blackbox/metadata.xml
index ecae593b7906..682bce3394bf 100644
--- a/x11-wm/blackbox/metadata.xml
+++ b/x11-wm/blackbox/metadata.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>commonbox</herd>
-	<longdescription>
-	 Blackbox is that fast, light window manager you have been looking for 
-	 without all those annoying library dependancies. If you have a C++ 
-	 compiler and the X Window System you can compile and use it.
-	 </longdescription>
+<herd>commonbox</herd>
 </pkgmetadata>
diff --git a/x11-wm/blwm/ChangeLog b/x11-wm/blwm/ChangeLog
index a18b44aa7a0e..61a3fdb2d26b 100644
--- a/x11-wm/blwm/ChangeLog
+++ b/x11-wm/blwm/ChangeLog
@@ -1,16 +1,6 @@
 # ChangeLog for x11-wm/blwm
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blwm/ChangeLog,v 1.4 2005/08/07 13:30:06 hansmi Exp $
-
-  07 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> blwm-1.0.4.ebuild:
-  Stable on ppc.
-
-  03 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> blwm-1.0.4.ebuild:
-  Removed "|| die" from automake; bug #71479 comment #9
-
-  28 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> blwm-1.0.4.ebuild:
-  Fixed compilation error; bug #71479. Thanks to Francisco José Cañizares
-  Santofimia <telefrancisco@lycos.es> for the patch.
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blwm/ChangeLog,v 1.1 2004/11/07 13:14:04 usata Exp $
 
 *blwm-1.0.4 (07 Nov 2004)
 
diff --git a/x11-wm/blwm/Manifest b/x11-wm/blwm/Manifest
index ede2aa6b610c..c6fa5d4c7384 100644
--- a/x11-wm/blwm/Manifest
+++ b/x11-wm/blwm/Manifest
@@ -1,4 +1,2 @@
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 82866417b4e3b7ea7f2f3f6ac3f3e09c ChangeLog 824
-MD5 04dd0f8d40c46b7f3202dfbcea25ba28 blwm-1.0.4.ebuild 1081
+MD5 68936cde53e6b6f3541bb4c449bdd54e blwm-1.0.4.ebuild 944
 MD5 3636649a1d2bc2acc79b52149356033d files/digest-blwm-1.0.4 63
diff --git a/x11-wm/blwm/blwm-1.0.4.ebuild b/x11-wm/blwm/blwm-1.0.4.ebuild
index 42f52c2e7225..86861adb7e5e 100644
--- a/x11-wm/blwm/blwm-1.0.4.ebuild
+++ b/x11-wm/blwm/blwm-1.0.4.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/blwm/blwm-1.0.4.ebuild,v 1.4 2005/08/07 13:30:06 hansmi Exp $
-
-inherit gnuconfig
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/blwm/blwm-1.0.4.ebuild,v 1.1 2004/11/07 13:14:04 usata Exp $
 
 DESCRIPTION="BLWM is a Windows 2000 like window manager localized for Brazil."
 HOMEPAGE="http://www.blanes.com.br"
@@ -10,26 +8,22 @@ SRC_URI="http://labdid.if.usp.br/~blanes/arquivos/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="ppc x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="virtual/x11"
 
 DEPEND="${RDEPEND}
-	=sys-devel/autoconf-2.13*
-	=sys-devel/automake-1.4*
+	sys-devel/autoconf
+	sys-devel/automake
 	sys-devel/flex
 	sys-devel/bison"
 
 src_compile(){
-	export WANT_AUTOCONF=2.1
-	export WANT_AUTOMAKE=1.4
 	aclocal || die
 	autoheader || die
 	autoconf || die
-	# automake fails on some systems, but harmless to build
-	automake
-
+	automake || die
 	econf --with-blwmdir=/usr/share/blwm --with-confdir=/etc/blwm || die
 	emake || die
 }
diff --git a/x11-wm/ctwm/ChangeLog b/x11-wm/ctwm/ChangeLog
index 68ae857b8b51..4cba27afc218 100644
--- a/x11-wm/ctwm/ChangeLog
+++ b/x11-wm/ctwm/ChangeLog
@@ -1,55 +1,6 @@
 # ChangeLog for x11-wm/ctwm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.12 2005/09/02 00:04:27 dang Exp $
-
-  02 Sep 2005; <dang@gentoo.org> ctwm-3.7.ebuild:
-  Marked ~amd64
-
-*ctwm-3.7 (31 Jul 2005)
-
-  31 Jul 2005; Mamoru KOMACHI <usata@gentoo.org>
-  -files/ctwm-3.7_alpha4-gentoo.diff, -ctwm-3.7_alpha4-r1.ebuild,
-  +ctwm-3.7.ebuild:
-  Version bumped. Thanks to J. O. Aho <hanssen_dk@hotmail.com>; bug #99980.
-
-*ctwm-3.7_alpha5 (14 Nov 2004)
-
-  14 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> -files/ctwm-3.6-gentoo.diff,
-  +files/ctwm-3.7_alpha5-gentoo.diff, +ctwm-3.7_alpha5.ebuild:
-  Version bumped.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ctwm-3.6-r1.ebuild,
-  ctwm-3.7_alpha4-r1.ebuild:
-  Add inherit eutils
-
-  07 Feb 2004; Mamoru KOMACHI <usata@gentoo.org>
-  files/ctwm-3.6-r1-gentoo.diff, files/ctwm-3.7_alpha4-gentoo.diff:
-  Fixed compile error when >=sys-devel/bison-1.875, closing bug #40599
-
-  07 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> 
-  files/ctwm-3.6-r1-gentoo.diff, files/ctwm-3.7_alpha4-gentoo.diff:
-  Fixed compile error when >=sys-devel/bison-1.875, closing bug #40599
-
-  06 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> ctwm-3.6-r1.ebuild:
-  Marked as stable
-
-*ctwm-3.7_alpha4-r1 (16 Jan 2004)
-*ctwm-3.6-r1 (16 Jan 2004)
-
-  16 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> ctwm-3.6-r1.ebuild,
-  ctwm-3.7_alpha4-r1.ebuild:
-  Included images and chaged image directory from /usr/share/${PF} to
-  /usr/share/${PN}. Closing bug #38329
-
-*ctwm-3.7_alpha4 (02 Dec 2003)
-
-  02 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> ctwm-3.7_alpha4.ebuild,
-  files/ctwm-3.7_alpha4-gentoo.diff:
-  New unstable release.
-
-  08 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> ctwm-3.6.ebuild,
-  metadata.xml:
-  Marked as stable
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.1 2003/10/02 23:32:12 usata Exp $
 
   03 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> files/ctwm-3.6-gentoo.diff:
   Initial import. Ebuild submitted by Tobias Anderberg <tba@softhome.net>
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 0155fde0b2af..b30889d23ee7 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -1,20 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b8ceb2808cc44be5b0aabed5bd33e94f ctwm-3.7.ebuild 1145
-MD5 9eb6b4113435f6163acecde9097ff65a ctwm-3.7_alpha5.ebuild 1105
-MD5 a5862e814db26ea9ff512243932b291b ctwm-3.6-r1.ebuild 1048
-MD5 747878503a61d5211b74f6c72377f098 ChangeLog 1995
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 ac93af67c3e0962fa6e53f59e290b6c0 files/digest-ctwm-3.6-r1 123
-MD5 ac24a199346d0958f4fb50d81e213cb3 files/digest-ctwm-3.7 61
-MD5 11e5c7ab948805ff25230a38e9bb828f files/ctwm-3.7_alpha5-gentoo.diff 827
-MD5 6752682809aa0c15d7e76cd6013da292 files/ctwm-3.6-r1-gentoo.diff 1329
-MD5 b2328b3b7f7a512f0631c753fb185170 files/digest-ctwm-3.7_alpha5 67
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDF5ccomPajV0RnrERAg/5AJ47l6/rDIuAk1SDxlHq23VDa5HNTgCfU/f5
-w0nksALQghaCNVWtz/pB9Xk=
-=7t9/
------END PGP SIGNATURE-----
+MD5 dd746733410e199ac777df49278955a6 ctwm-3.6.ebuild 766
+MD5 f1cb976f1a64837f5e8b7ec456b3a4aa files/digest-ctwm-3.6 60
diff --git a/x11-wm/ctwm/ctwm-3.6-r1.ebuild b/x11-wm/ctwm/ctwm-3.6-r1.ebuild
index aeb8fd08a99b..71d318c9e153 100644
--- a/x11-wm/ctwm/ctwm-3.6-r1.ebuild
+++ b/x11-wm/ctwm/ctwm-3.6-r1.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.6-r1.ebuild,v 1.5 2004/06/24 23:40:17 agriffis Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.6-r1.ebuild,v 1.1 2004/01/15 22:57:51 usata Exp $
 
 IUSE=""
 
@@ -13,7 +11,7 @@ SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz
 HOMEPAGE="http://ctwm.free.lp.se/"
 
 SLOT="0"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86"
 LICENSE="MIT"
 
 DEPEND="virtual/x11"
diff --git a/x11-wm/ctwm/ctwm-3.7.ebuild b/x11-wm/ctwm/ctwm-3.7.ebuild
index 72aa342f5676..2af123832f05 100644
--- a/x11-wm/ctwm/ctwm-3.7.ebuild
+++ b/x11-wm/ctwm/ctwm-3.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7.ebuild,v 1.2 2005/09/02 00:04:27 dang Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7.ebuild,v 1.1 2005/07/31 07:59:10 usata Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="http://ctwm.free.lp.se/dist/${MY_P}.tar.gz"
 HOMEPAGE="http://ctwm.free.lp.se/"
 
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~x86 ~ppc"
 LICENSE="MIT"
 
 DEPEND="virtual/x11
diff --git a/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff b/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
index d6f9e5cee3dd..b58c09d1f77b 100644
--- a/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
+++ b/x11-wm/ctwm/files/ctwm-3.6-r1-gentoo.diff
@@ -1,23 +1,14 @@
-diff -urN ctwm-3.6.ORIG/gram.y ctwm-3.6/gram.y
---- ctwm-3.6.ORIG/gram.y	2001-12-12 00:38:52.000000000 +0900
-+++ ctwm-3.6/gram.y	2004-02-07 06:43:37.067787401 +0900
-@@ -419,14 +419,13 @@
- 		| WINDOW_RING		{ list = &Scr->WindowRingL; }
- 		  win_list
- 		| WINDOW_RING           { Scr->WindowRingAll = TRUE; }
--		;
- 		| WINDOW_RING_EXCLUDE    { if (!Scr->WindowRingL)
- 		                              Scr->WindowRingAll = TRUE;
- 		                          list = &Scr->WindowRingExcludeL; }
-                   win_list
--
+--- gram.y-orig	2001-12-11 16:38:52.000000000 +0100
++++ gram.y	2003-05-08 13:11:55.000000000 +0200
+@@ -427,6 +427,7 @@
+ 
  		| WINDOW_GEOMETRIES 	 {  }
  		  wingeom_list
 +		;
  
  noarg		: KEYWORD		{ if (!do_single_keyword ($1)) {
  					    twmrc_error_prefix();
-@@ -683,8 +682,8 @@
+@@ -683,8 +684,8 @@
  		| wingeom_entries wingeom_entry
  		;
  
@@ -28,7 +19,7 @@ diff -urN ctwm-3.6.ORIG/gram.y ctwm-3.6/gram.y
  
  
  squeeze		: SQUEEZE_TITLE { 
-@@ -835,6 +834,7 @@
+@@ -835,6 +836,7 @@
  				AddToClientsList ($1, client);
  			  }
  
@@ -36,7 +27,7 @@ diff -urN ctwm-3.6.ORIG/gram.y ctwm-3.6/gram.y
  occupy_window_list	: LB occupy_window_entries RB {}
  			;
  
-@@ -845,7 +845,7 @@
+@@ -845,7 +847,7 @@
  occupy_window_entry	: string {
  				AddToClientsList (workspace, $1);
  			  }
@@ -45,11 +36,10 @@ diff -urN ctwm-3.6.ORIG/gram.y ctwm-3.6/gram.y
  icon_list	: LB icon_entries RB {}
  		;
  
-@@ -962,6 +962,7 @@
+@@ -962,6 +964,7 @@
  					  RemoveDQuote(ptr);
  					  $$ = (unsigned char*)ptr;
  					}
 +		;
  number		: NUMBER		{ $$ = $1; }
  		;
- 
diff --git a/x11-wm/ctwm/metadata.xml b/x11-wm/ctwm/metadata.xml
index 3f6c9f82a007..d458318e80ba 100644
--- a/x11-wm/ctwm/metadata.xml
+++ b/x11-wm/ctwm/metadata.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-wm</herd>
+<herd>xfree</herd>
 </pkgmetadata>
diff --git a/x11-wm/e/ChangeLog b/x11-wm/e/ChangeLog
index f57eead24124..1d8bee85e4ce 100644
--- a/x11-wm/e/ChangeLog
+++ b/x11-wm/e/ChangeLog
@@ -1,8 +1,8 @@
 # ChangeLog for x11-wm/e
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/e/ChangeLog,v 1.10 2004/12/11 23:22:49 vapier Exp $
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/e/ChangeLog,v 1.1 2003/02/20 12:41:28 vapier Exp $
 
-*e-* (11 Dec 2004)
+*e-0.17.20030220_pre0 (20 Feb 2003)
 
-  11 Dec 2004; Mike Frysinger <vapier@gentoo.org> :
+  20 Feb 2003; Mike Frysinger <vapier@gentoo.org> :
   Initial import.  Ebuild submitted by me.
diff --git a/x11-wm/e/Manifest b/x11-wm/e/Manifest
index 0782f0dc3e7d..e69de29bb2d1 100644
--- a/x11-wm/e/Manifest
+++ b/x11-wm/e/Manifest
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 1fb0cef8c20e31d8fee121ebb2205588 metadata.xml 221
-MD5 acd2ae572746c4c09760801f94220c44 ChangeLog 305
-MD5 3465a6a7d78b0c6ce2b5982d78a019cd e-9999.ebuild 823
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-e-9999 0
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDNkm4gIKl8Uu19MoRAhWxAJ9/3FIiOvD+aFcESDJw1ii68YIXTwCbBZgy
-q5Jv2MeD0WIrCYn1FFVE5V8=
-=DYHB
------END PGP SIGNATURE-----
diff --git a/x11-wm/e/e-9999.ebuild b/x11-wm/e/e-9999.ebuild
index 8ed0c8f5d23e..b6bb173f0c3b 100644
--- a/x11-wm/e/e-9999.ebuild
+++ b/x11-wm/e/e-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/e/e-9999.ebuild,v 1.3 2005/09/25 06:53:57 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/e/e-9999.ebuild,v 1.1 2004/12/11 23:22:49 vapier Exp $
 
 ECVS_MODULE="e17/apps/e"
 inherit enlightenment
@@ -8,28 +8,9 @@ inherit enlightenment
 DESCRIPTION="the e17 window manager"
 
 DEPEND="sys-devel/libtool
-	x11-libs/evas
-	x11-libs/ecore
-	media-libs/edje
-	dev-libs/eet
-	dev-libs/embryo
-	x11-libs/evas"
-
-pkg_setup() {
-	if ! built_with_use media-libs/edje png ; then
-		eerror "Re-emerge edje with USE=png"
-		die "Re-emerge edje with USE=png"
-	fi
-	enlightenment_pkg_setup
-}
-
-src_install() {
-	enlightenment_src_install
-	mv "${D}"/usr/bin/enlightenment{,-0.17}
-}
-
-pkg_postinst() {
-	ewarn "This version has been installed as"
-	ewarn "'enlightenment-0.17' to avoid conflict"
-	ewarn "with enlightenment 0.16 versions."
-}
+	>=x11-libs/evas-9999
+	>=x11-libs/ecore-9999
+	>=media-libs/edje-9999
+	>=dev-libs/eet-9999
+	>=dev-libs/embryo-9999
+	>=x11-libs/evas-9999"
diff --git a/x11-wm/enlightenment/ChangeLog b/x11-wm/enlightenment/ChangeLog
index c354007e9791..75e5aabf4a23 100644
--- a/x11-wm/enlightenment/ChangeLog
+++ b/x11-wm/enlightenment/ChangeLog
@@ -1,167 +1,6 @@
 # ChangeLog for x11-wm/enlightenment
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.39 2005/03/30 16:46:50 hansmi Exp $
-
-  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
-  enlightenment-0.16.7.2.ebuild:
-  Stable on ppc.
-
-  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org>
-  enlightenment-0.16.7.2.ebuild:
-  Stable on alpha.
-
-  30 Dec 2004; Guy Martin <gmsoft@gentoo.org> enlightenment-0.16.7.1.ebuild:
-  Stable on hppa.
-
-  22 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  enlightenment-0.16.7.1.ebuild:
-  Stable on sparc
-
-*enlightenment-0.16.7.2 (18 Dec 2004)
-
-  18 Dec 2004; Mike Frysinger <vapier@gentoo.org>
-  enlightenment-0.16.7.1.ebuild, +enlightenment-0.16.7.2.ebuild:
-  Version bump #74779.
-
-*enlightenment-0.16.7.1 (24 Aug 2004)
-
-  24 Aug 2004; Mike Frysinger <vapier@gentoo.org>
-  +enlightenment-0.16.7.1.ebuild:
-  Version bump.
-
-*enlightenment-0.16.7 (25 Jul 2004)
-
-  25 Jul 2004; Mike Frysinger <vapier@gentoo.org>
-  +enlightenment-0.16.7.ebuild:
-  Version bump.
-
-  23 Jul 2004; Tom Gall <tgall@gentoo.org> enlightenment-0.16.7_pre5.ebuild:
-  stable on ppc64, bug #57624
-
-*enlightenment-0.16.7_pre6 (21 Jul 2004)
-
-  21 Jul 2004; Mike Frysinger <vapier@gentoo.org>
-  +enlightenment-0.16.7_pre6.ebuild:
-  Version bump.
-
-  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> enlightenment-0.16.6.ebuild,
-  enlightenment-0.16.7_pre3.ebuild, enlightenment-0.16.7_pre4.ebuild,
-  enlightenment-0.16.9999.ebuild:
-  sync IUSE (-doc, -gnome, -kde, -nothemes, -xrandr), add sed-4 dep
-
-*enlightenment-0.16.7_pre5 (05 Jul 2004)
-
-  05 Jul 2004; Mike Frysinger <vapier@gentoo.org>
-  enlightenment-0.16.7_pre3.ebuild, +enlightenment-0.16.7_pre5.ebuild:
-  Version bump.
-
-*enlightenment-0.16.7_pre4 (22 Jun 2004)
-
-  22 Jun 2004; Mike Frysinger <vapier@gentoo.org>
-  +enlightenment-0.16.7_pre4.ebuild:
-  Version bump.
-
-*enlightenment-0.16.7_pre3 (31 May 2004)
-
-  31 May 2004; Mike Frysinger <vapier@gentoo.org>
-  +enlightenment-0.16.7_pre3.ebuild:
-  Version bump.
-
-*enlightenment-0.16.7_pre2 (13 May 2004)
-
-  13 May 2004; Mike Frysinger <vapier@gentoo.org>
-  -enlightenment-0.16.7_pre1.ebuild, +enlightenment-0.16.7_pre2.ebuild:
-  Version bump.
-
-*enlightenment-0.16.7_pre1 (11 May 2004)
-
-  11 May 2004; Mike Frysinger <vapier@gentoo.org> :
-  Version bump #49999 by cyrix12@cox.net + lamekain.
-  Introduces a lot more USE flags to trim down DEPEND.
-
-*enlightenment-0.16.9999 (09 Mar 2004)
-
-  09 Mar 2004; Mike Frysinger <vapier@gentoo.org> :
-  Added cvs ebuild to help out developers
-
-*enlightenment-0.16.6 (06 Nov 2003)
-
-  08 Jan 2004; <agriffis@gentoo.org> enlightenment-0.16.6.ebuild:
-  stable on alpha and ia64
-
-  15 Dec 2003; Jon Portnoy <avenj@gentoo.org> enlightenment-0.16.6.ebuild :
-  AMD64 keywords.
-
-  12 Nov 2003; Daniel Robbins <drobbins@gentoo.org>: Simple "export USER=root"
-  fix to allow GRP compilation to work. Explanation added as comment to
-  ebuilds.
-
-  11 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
-  Add patch to support kde menus in /usr/kde #33273.
-
-  06 Nov 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump #32866.
-
-*enlightenment-0.16.6_pre8 (05 Oct 2003)
-
-  05 Oct 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump.
-
-*enlightenment-0.16.6_pre7 (07 Sep 2003)
-
-  07 Sep 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump.
-
-*enlightenment-0.16.6_pre6 (24 Aug 2003)
-
-  24 Aug 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump.
-
-*enlightenment-0.16.6_pre5 (25 Jul 2003)
-
-  25 Jul 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump.
-
-*enlightenment-0.16.6_pre4 (22 Jun 2003)
-
-  22 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump ... more fixes upstream #23261
-
-*enlightenment-0.16.6_pre3-r1 (20 Jun 2003)
-
-  20 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump to fix install bug ... they removed scripts/ from the
-  install process by accident so we `dobin scripts/*` in the meantime (#23108)
-
-*enlightenment-0.16.6_pre3 (19 Jun 2003)
-
-  19 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
-  Version bump to address #18865 and #22056 ... and the fact
-  that 0.16.5 is so outdated anyways ;)
-
-*enlightenment-0.16.5-r4 (19 Mar 2002)
-
-  08 Mar 2003; Mike Frysinger <vapier@gentoo.org> :
-  Updated package to make sound support (esd) optional #17074.
-
-  14 Oct 2002; Mike Frysinger <vapier@gentoo.org> enlightenment-0.16.5-r4.ebuild :
-  Removed duplicate install of man pages (1 into ${D}) #9083
-
-  12 Aug 2002; Mark Guertin <gerk@gentoo.org> enlightenment-0.16.5-r4.ebuild :
-  Added ppc to keywords
-
-  19 Mar 2002; Seemant Kulleen <seemant@gentoo.org> enlightenment-0.16.5-r4.ebuild :
-  There was an issue where the path to the enlightenment binary was not being 
-  put into englightenment.install script.  The Makefile in scripts/ should have
-  done that, but it didn't resolve the name correctly.  So, this has been
-  adjusted to make the script work.
-
-*enlightenment-0.16.5-r3 (14 Feb 2002)
-
-  14 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
-  
-  Added /etc/X11/Sessions/enlightenment, which adds enlightenment
-  to the auto-generated session list in kdm and gdm.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
 *enlightenment-0.16.5-r2 (1 Feb 2002)
 
diff --git a/x11-wm/enlightenment/Manifest b/x11-wm/enlightenment/Manifest
index 032193794a81..e69de29bb2d1 100644
--- a/x11-wm/enlightenment/Manifest
+++ b/x11-wm/enlightenment/Manifest
@@ -1,24 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 01f03287317f38152e719341daf701bf ChangeLog 5629
-MD5 e58a523f218b83377e26940d3b59d4c7 enlightenment-0.16.5-r4.ebuild 1602
-MD5 242498d15c9802751483069071de9743 enlightenment-0.16.6.ebuild 1850
-MD5 7774718467ad2029d12b611ecb1860ee enlightenment-0.16.7.2.ebuild 1460
-MD5 bcbe682de1218f677021b43c86046049 enlightenment-0.16.9999.ebuild 1824
-MD5 fbe59612181a2fb8c213b815a2f45ebd files/0.16.6-edox.patch 2775
-MD5 c0e73afcafa0fbb90610eef266a75c82 files/0.16.6-kde-menu.patch 454
-MD5 de50be73f3493d4787a6533b08077d06 files/cursors.cfg 686
-MD5 d819ee46c7b2aa186f90e4bd21ae9ec9 files/digest-enlightenment-0.16.5-r4 74
-MD5 24c537c993ea9c463f993b24a872183c files/digest-enlightenment-0.16.6 74
-MD5 01290d54c8d28735c2fe344796bfa7ba files/digest-enlightenment-0.16.7.2 75
-MD5 d41d8cd98f00b204e9800998ecf8427e files/digest-enlightenment-0.16.9999 0
-MD5 943d1947d4bd7b7ee6387ba5827166a4 files/enlightenment 33
-MD5 7ed1cbab645402fbf7666ed95588542d metadata.xml 1572
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDifQbgIKl8Uu19MoRAs8SAJ9AvwUo884MdRGvblig6Kbuz5qaHQCfYwOx
-qAvbMsK0dya23YoS+bb/LGQ=
-=wr0i
------END PGP SIGNATURE-----
diff --git a/x11-wm/enlightenment/enlightenment-0.16.5-r4.ebuild b/x11-wm/enlightenment/enlightenment-0.16.5-r4.ebuild
index 8f959cfcfb4e..ff13d91e444e 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.5-r4.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.5-r4.ebuild
@@ -1,53 +1,55 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.5-r4.ebuild,v 1.21 2005/02/09 00:20:22 kloeri Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Daniel Robbins <drobbins@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.5-r4.ebuild,v 1.1 2002/03/20 02:34:19 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Enlightenment Window Manager"
-SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz"
+SRC_URI="ftp://ftp.enlightenment.org/enlightenment/enlightenment/${P}.tar.gz"
 HOMEPAGE="http://www.enlightenment.org/"
 
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="nls esd"
-
 DEPEND=">=media-libs/fnlib-0.5
-	esd? ( >=media-sound/esound-0.2.19 )
+	>=media-sound/esound-0.2.19
 	~media-libs/freetype-1.3.1
-	>=gnome-base/libghttp-1.0.9-r1"
-RDEPEND="nls? ( sys-devel/gettext )"
+	>=gnome-base/libghttp-1.0.9-r1
+	nls? ( sys-devel/gettext )"
+
 
 src_compile() {
+
 	local myconf
-	use esd \
-		&& soundconf="--enable-sound=yes" \
-		|| soundconf="--enable-sound=no"
-	econf \
-		`use_enable nls` \
-		--enable-fsstd \
-		${soundconf} || die
-	#enlightenment's makefile uses the $USER env var (bad), which may not be
-	#set correctly if you did a "su" to get root before emerging. Normally,
-	#your $USER will still exist when you su (unless you enter a chroot,) but
-	#will cause perms to be wrong. This fixes this:
-	export USER=root
+	use nls || myconf="${myconf} --disable-nls"
+  
+	./configure --host=${CHOST} 			\
+		    --enable-fsstd					\
+		    --prefix=/usr					\
+		    --mandir=/usr/share/man			\
+		    --infodir=/usr/share/info		\
+			${myconf} || die
 	emake || die
 }
 
 src_install() {
-	# this fixes an issue where enlightenment.install has an incomplete
-	# path to the englightenment binary
-	mv scripts/${PN}.install.in scripts/${PN}.install.in.orig
-	sed 's:\(^EBIN=\).*:\1@prefix@/bin:' \
-		scripts/${PN}.install.in.orig > scripts/${PN}.install.in
-
-	export USER=root
-	make install DESTDIR=${D} || die
-
-	dodoc ABOUT-NLS AUTHORS ChangeLog FAQ INSTALL NEWS README
+	mv man/Makefile man/Makefile_orig
+	sed -e "s:\(DESTDIR\ =\):\1\ ${D}:" man/Makefile_orig > man/Makefile
+	mv scripts/${PN}.install scripts/${PN}.install.orig
+	sed 's:\(EBIN=\).*:\1\"/usr/bin\":' \
+		scripts/${PN}.install.orig > scripts/${PN}.install
+	
+	make prefix=${D}/usr 					\
+		localedir=${D}/usr/share/locale		\
+		gnulocaledir=${D}/usr/share/locale	\
+		mandir=${D}/usr/share/man			\
+		infodir=${D}/usr/share/info			\
+		install || die
+  
+	doman man/enlightenment.1
+	dodoc ABOUT-NLS AUTHORS ChangeLog COPYING FAQ INSTALL NEWS README
 	docinto sample-scripts
 	dodoc sample-scripts/*
-
+	
 	exeinto /etc/X11/Sessions
 	doexe $FILESDIR/enlightenment
+	
 }
+
diff --git a/x11-wm/enlightenment/enlightenment-0.16.6.ebuild b/x11-wm/enlightenment/enlightenment-0.16.6.ebuild
index 19cea93e6cd1..c3c891ab2350 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.6.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.6.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.6.ebuild,v 1.14 2005/02/09 00:20:22 kloeri Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.6.ebuild,v 1.1 2003/11/06 15:35:31 vapier Exp $
 
 DESCRIPTION="Enlightenment Window Manager"
 HOMEPAGE="http://www.enlightenment.org/"
 SRC_URI="mirror://sourceforge/enlightenment/${P/_/-}.tar.gz"
 
-LICENSE="BSD"
+LICENSE="as-is"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa ia64 amd64"
-IUSE="esd nls"
+KEYWORDS="~x86 ~ppc"
+IUSE="nls esd gnome kde"
 
 DEPEND=">=media-libs/fnlib-0.5
 	esd? ( >=media-sound/esound-0.2.19 )
@@ -22,36 +20,22 @@ RDEPEND="nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/${PN}-${PV/_pre?/}
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-kde-menu.patch
-	epatch ${FILESDIR}/${PV}-edox.patch
-}
-
 src_compile() {
-#		`use_enable gnome hints-gnome` \
-#		`use_enable kde hints-kde` \
 	econf \
 		`use_enable nls` \
 		`use_enable esd sound` \
 		--enable-upgrade \
 		--enable-hints-ewmh \
+		`use_enable gnome hints-gnome` \
+		`use_enable kde hints-kde` \
 		--enable-fsstd \
 		--enable-zoom \
 		|| die
-	#enlightenment's makefile uses the $USER env var (bad), which may not be
-	#set correctly if you did a "su" to get root before emerging. Normally,
-	#your $USER will still exist when you su (unless you enter a chroot,) but
-	#will cause perms to be wrong. This fixes this:
-	export USER=root
 	emake || die
 }
 
 src_install() {
-	export USER=root
 	emake install DESTDIR=${D} || die
-	mv ${D}/usr/bin/{,e}dox
 	exeinto /etc/X11/Sessions
 	doexe ${FILESDIR}/enlightenment
 
diff --git a/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild b/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild
index 026b3c1f7f30..065d2b031709 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild,v 1.8 2005/11/27 17:45:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.7.2.ebuild,v 1.1 2004/12/19 03:22:52 vapier Exp $
 
 DESCRIPTION="Enlightenment Window Manager"
 HOMEPAGE="http://www.enlightenment.org/"
@@ -8,29 +8,14 @@ SRC_URI="mirror://sourceforge/enlightenment/enlightenment-${PV/_/-}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86"
-IUSE="doc esd nls nothemes xinerama xrandr"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc esd nls nothemes xrandr"
 
-RDEPEND="esd? ( >=media-sound/esound-0.2.19 )
+DEPEND="esd? ( >=media-sound/esound-0.2.19 )
 	=media-libs/freetype-2*
 	media-libs/imlib2
-	|| ( (
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXxf86vm
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-		x11-misc/xbitmaps
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-libs/libXinerama x11-proto/xineramaproto )
-		x11-proto/xproto
-		) virtual/x11 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
+	virtual/x11"
+RDEPEND="nls? ( sys-devel/gettext )"
 PDEPEND="!nothemes? ( x11-themes/ethemes )
 	doc? ( app-doc/edox-data )"
 
@@ -49,8 +34,8 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die
+	emake install DESTDIR=${D} || die
 	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/enlightenment
-	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README*
+	doexe ${FILESDIR}/enlightenment
+	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README
 }
diff --git a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
index 93738b144442..f4387dc33e1f 100644
--- a/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
+++ b/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild
@@ -1,77 +1,72 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild,v 1.14 2005/11/27 17:57:44 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/enlightenment/enlightenment-0.16.9999.ebuild,v 1.1 2004/03/09 23:43:15 vapier Exp $
 
 ECVS_SERVER="cvs.sourceforge.net:/cvsroot/enlightenment"
 ECVS_MODULE="e16/e"
-inherit cvs
+inherit eutils cvs
 
 DESCRIPTION="Enlightenment Window Manager"
 HOMEPAGE="http://www.enlightenment.org/"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="-*"
-IUSE="esd nls xinerama xrandr doc"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64"
+IUSE="nls esd gnome kde"
 
-RDEPEND="esd? ( >=media-sound/esound-0.2.19 )
-	=media-libs/freetype-2*
-	media-libs/imlib2
-	|| ( (
-		x11-libs/libSM
-		x11-libs/libICE
-		x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXfixes
-		x11-libs/libXxf86vm
-		xrandr? ( x11-libs/libXrandr )
-		x11-libs/libXrender
-		x11-misc/xbitmaps
-		x11-proto/xextproto
-		x11-proto/xf86vidmodeproto
-		xinerama? ( x11-libs/libXinerama x11-proto/xineramaproto )
-		x11-proto/xproto
-		) virtual/x11 )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-PDEPEND="doc? ( app-doc/edox-data )"
+DEPEND=">=media-libs/fnlib-0.5
+	esd? ( >=media-sound/esound-0.2.19 )
+	=media-libs/freetype-1*
+	>=gnome-base/libghttp-1.0.9-r1
+	>=media-libs/imlib-1.9.8"
+RDEPEND="nls? ( sys-devel/gettext )"
 
 S=${WORKDIR}/e16/e
 
 src_unpack() {
 	cvs_src_unpack
-	cd "${S}"
-	NOCONFIGURE=blah ./autogen.sh
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-kde-menu.patch
+	epatch ${FILESDIR}/${PV}-edox.patch
+	sed -i 's:$srcdir/configure.*::' autogen.sh
+	./autogen.sh
 }
 
 src_compile() {
+#		`use_enable gnome hints-gnome` \
+#		`use_enable kde hints-kde` \
 	econf \
-		$(use_enable nls) \
-		$(use_enable esd sound) \
-		$(use_enable xinerama) \
-		$(use_enable xrandr) \
+		`use_enable nls` \
+		`use_enable esd sound` \
 		--enable-upgrade \
 		--enable-hints-ewmh \
 		--enable-fsstd \
 		--enable-zoom \
 		--with-imlib2 \
 		|| die
+	#enlightenment's makefile uses the $USER env var (bad), which may not be
+	#set correctly if you did a "su" to get root before emerging. Normally,
+	#your $USER will still exist when you su (unless you enter a chroot,) but
+	#will cause perms to be wrong. This fixes this:
+	export USER=root
 	emake || die
 }
 
 src_install() {
-	make install DESTDIR="${D}" || die
+	export USER=root
+	emake install DESTDIR=${D} || die
+	mv ${D}/usr/bin/{,e}dox
 	exeinto /etc/X11/Sessions
-	doexe "${FILESDIR}"/enlightenment
+	doexe ${FILESDIR}/enlightenment
 
-	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README* docs/README*
+	dodoc AUTHORS ChangeLog FAQ INSTALL NEWS README
 
 	# fix default xcursor support
-	cd "${D}"/usr/share/enlightenment/themes
+	cd ${D}/usr/share/enlightenment/themes
 	local deftheme=`readlink DEFAULT`
 	cp -rf ${deftheme} ${deftheme}-xcursors
 	rm DEFAULT
 	ln -s ${deftheme}-xcursors DEFAULT
 	rm -rf ${deftheme}-xcursors/cursors*
-	cp "${FILESDIR}"/cursors.cfg ${deftheme}-xcursors/
+	cp ${FILESDIR}/cursors.cfg ${deftheme}-xcursors/
 }
diff --git a/x11-wm/enlightenment/files/enlightenment b/x11-wm/enlightenment/files/enlightenment
index 594f3adb1fbf..7be70796db51 100755
--- a/x11-wm/enlightenment/files/enlightenment
+++ b/x11-wm/enlightenment/files/enlightenment
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/bin/enlightenment
+/usr/X11R6/enlightenment/bin/enlightenment
diff --git a/x11-wm/evilwm/ChangeLog b/x11-wm/evilwm/ChangeLog
index bb2f8f615933..2eeaa6e5defa 100644
--- a/x11-wm/evilwm/ChangeLog
+++ b/x11-wm/evilwm/ChangeLog
@@ -1,105 +1,7 @@
-# ChangeLog for x11-wm/evilwm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/ChangeLog,v 1.28 2005/07/13 18:48:21 kito Exp $
+# ChangeLog for net-irc/dircproxy
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/ChangeLog,v 1.1 2002/04/13 23:04:52 verwilst Exp $
 
-  13 Jul 2005; Kito <kito@gentoo.org> evilwm-0.99.18.ebuild:
-  ~ppc-macos keywords, fix motif includes closes 58845
-
-*evilwm-0.99.18 (18 Jun 2005)
-
-  18 Jun 2005; Mamoru KOMACHI <usata@gentoo.org> +evilwm-0.99.18.ebuild:
-  Version bumped. This closes bug #95302.
-
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> evilwm-0.99.17.ebuild:
-  Stable on amd64.
-
-  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  06 Sep 2004; Rob Holland <tigger@gentoo.org> evilwm-0.99.17.ebuild:
-  Provide a more sensible default font.
-
-  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> evilwm-0.99.17.ebuild:
-  Stable on alpha.
-
-  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> evilwm-0.99.4.ebuild:
-  glibc -> libc
-
-  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> evilwm-0.99.14.ebuild,
-  evilwm-0.99.17.ebuild:
-  QA - fix use invocation
-
-  26 Jun 2004; Danny van Dyk <kugelfang@gentoo.org> evilwm-0.99.17.ebuild:
-  Marked ~amd64.
-
-  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> evilwm-0.99.17.ebuild:
-  Stable on sparc!
-
-  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> evilwm-0.99.14.ebuild,
-  evilwm-0.99.17.ebuild:
-  fixed motif dep
-
-  09 Jan 2004; Jason A Mobarak <aether@gentoo.org> evilwm-0.99.16.ebuild,
-  evilwm-0.99.17.ebuild:
-  Removed 0.99.16, moved 0.99.17 to x86.
-
-  05 Jan 2004; Jason Wever <weeve@gentoo.org> evilwm-0.99.14.ebuild:
-  Marked stable on sparc.
-
-  28 Nov 2003; Mike Gardiner <obz@gentoo.org> evilwm-0.99.14.ebuild,
-  evilwm-0.99.16.ebuild, evilwm-0.99.17.ebuild, evilwm-0.99.4.ebuild:
-  IUSE added to all ebuilds (motif or '' as appropriate)
-
-*evilwm-0.99.17 (04 Nov 2003)
-
-  04 Nov 2003; Brandon Hale <tseng@gentoo.org> evilwm-0.99.17.ebuild,
-  metadata.xml:
-  Version bump, adding metadata.xml
-
-*evilwm-0.99.16 (18 Sep 2003)
-
-  18 Sep 2003; Seemant Kulleen <seemant@gentoo.org> evilwm-0.99.16.ebuild:
-  version bump
-
-  09 Feb 2003; Aron Griffis <agriffis@gentoo.org> evilwm-0.99.14.ebuild :
-  Add ~alpha to KEYWORDS
-
-*evilwm-0.99.14 (09 Feb 2003)
-
-  09 Mar 2003; Aron Griffis <agriffis@gentoo.org> evilwm-0.99.14.ebuild:
-  Mark stable on alpha
-
-  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> evilwm-0.99.14.ebuild
-  files/digest-evilwm-0.99.14 :
-
-  Version bump.
-
-*evilwm-0.99.11 (23 Nov 2002)
-
-  09 Feb 2003; Seemant Kulleen <seemant@gentoo.org> evilwm-0.99.11.ebuild :
-
-  Made virtual/motif a USE flag based DEPEND, and did sed-fu to make it
-  optional in the makefile.  Closes bug #15356 by: Pierre-Olivier Bouchard
-  <petecoolrulez@hotmail.com>. Moved to x86 profile
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  23 Nov 2002; Sascha Schwabbauer <cybersystem@gentoo.org> evilwm-0.99.11.ebuild :
-
-  Added ~ppc to keywords.
-
-*evilwm-0.99.11 (12 Nov 2002)
-
-  12 Nov 2002; Brad Cowan <bcowan@gentoo.org> evilwm-0.99.11.ebuild,
-  files/digest-evilwm-0.99.11 :
-
-  Version bump.
-
-*evilwm-0.99.4 (28 Jul 2002)
-
-  28 Jul 2002; Daniel Ahlberg <aliz@gentoo.org> evilwm-0.99.4.ebuild :
-
-  Version bump.
 
 *evilwm-0.3.11 (14 April 2002)
 
diff --git a/x11-wm/evilwm/Manifest b/x11-wm/evilwm/Manifest
index bee8c139ac57..e69de29bb2d1 100644
--- a/x11-wm/evilwm/Manifest
+++ b/x11-wm/evilwm/Manifest
@@ -1,20 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 243275325d21d425faf787cbf1380c31 evilwm-0.99.17.ebuild 949
-MD5 f4a3f615c0ebf96b2c71df418cded1e9 evilwm-0.99.14.ebuild 859
-MD5 6acba9a88caec6e09a76c8e70ff5ec95 evilwm-0.99.4.ebuild 642
-MD5 eea87a47aa00c1f0e548129a807e4198 evilwm-0.99.18.ebuild 932
-MD5 0c5312530a372e559864fcdaf8242c7a ChangeLog 3363
-MD5 ab5c7d15679acb15af8d4f8ba3ae2084 metadata.xml 360
-MD5 f1c3baa65c3f9d38f66da5acd242f087 files/digest-evilwm-0.99.4 66
-MD5 87249d20528e6e0f7ed6fa59fb73ebfa files/digest-evilwm-0.99.14 70
-MD5 1e8b24dfa1f73166710560f5c0b56751 files/digest-evilwm-0.99.17 70
-MD5 9e2d8ad64be70e4805d96ce330be3bbf files/digest-evilwm-0.99.18 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1ricV3J2n04EauwRAjUCAJ4stVSvm2DTeQDs2+MjvNWK3qzaqwCfWKbC
-smtDiLTWiVVJItlaFfYQsHA=
-=UxKG
------END PGP SIGNATURE-----
diff --git a/x11-wm/evilwm/evilwm-0.99.14.ebuild b/x11-wm/evilwm/evilwm-0.99.14.ebuild
index b1fe6b21fe8e..84370229113e 100644
--- a/x11-wm/evilwm/evilwm-0.99.14.ebuild
+++ b/x11-wm/evilwm/evilwm-0.99.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.14.ebuild,v 1.14 2004/07/15 01:11:43 agriffis Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.14.ebuild,v 1.1 2003/02/10 02:08:15 seemant Exp $
 
 MY_P="${PN}_${PV}.orig"
 S=${WORKDIR}/${MY_P/_/-}
@@ -9,19 +9,18 @@ DESCRIPTION="A minimalist, no frills window manager for X."
 SRC_URI="http://download.sourceforge.net/evilwm/${MY_P}.tar.gz"
 HOMEPAGE="http://evilwm.sourceforge.net"
 
-IUSE="motif"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha"
+KEYWORDS="~x86 ~ppc ~sparc"
 
 DEPEND="virtual/x11
-	motif? ( x11-libs/openmotif )"
+	motif? ( virtual/motif )"
 
 src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	if ! use motif
+	if [ -z "`use motif`" ]
 	then
 		cp Makefile ${T}
 		sed "s:DEFINES += -DMWM_HINTS::" \
@@ -40,3 +39,4 @@ src_install () {
 	doman evilwm.1
 	dodoc ChangeLog README* INSTALL TODO
 }
+
diff --git a/x11-wm/evilwm/evilwm-0.99.17.ebuild b/x11-wm/evilwm/evilwm-0.99.17.ebuild
index dc8422429416..10db871845d7 100644
--- a/x11-wm/evilwm/evilwm-0.99.17.ebuild
+++ b/x11-wm/evilwm/evilwm-0.99.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.17.ebuild,v 1.13 2005/05/08 15:13:02 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.17.ebuild,v 1.1 2003/11/04 14:48:16 tseng Exp $
 
 MY_P="${PN}_${PV}.orig"
 S=${WORKDIR}/${MY_P/_/-}
@@ -9,21 +9,18 @@ DESCRIPTION="A minimalist, no frills window manager for X."
 SRC_URI="http://download.sourceforge.net/evilwm/${MY_P}.tar.gz"
 HOMEPAGE="http://evilwm.sourceforge.net"
 
-IUSE="motif"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 ppc sparc alpha amd64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
 
 DEPEND="virtual/x11
-	sys-apps/coreutils
-	motif? ( x11-libs/openmotif )"
+	motif? ( virtual/motif )"
 
 src_unpack() {
 
 	unpack ${A}
 	cd ${S}
-	sed -i 's/^#define DEF_FONT.*/#define DEF_FONT "fixed"/' evilwm.h
-	if ! use motif
+	if [ -z "`use motif`" ]
 	then
 		cp Makefile ${T}
 		sed "s:DEFINES += -DMWM_HINTS::" \
@@ -42,3 +39,4 @@ src_install () {
 	doman evilwm.1
 	dodoc ChangeLog README* INSTALL TODO
 }
+
diff --git a/x11-wm/evilwm/evilwm-0.99.18.ebuild b/x11-wm/evilwm/evilwm-0.99.18.ebuild
index e5bfde599c2b..f31e35ce82d6 100644
--- a/x11-wm/evilwm/evilwm-0.99.18.ebuild
+++ b/x11-wm/evilwm/evilwm-0.99.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.18.ebuild,v 1.2 2005/07/13 18:48:21 kito Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.18.ebuild,v 1.1 2005/06/18 18:23:16 usata Exp $
 
 DESCRIPTION="A minimalist, no frills window manager for X."
 SRC_URI="http://www.6809.org.uk/evilwm/${P}.tar.gz"
@@ -9,7 +9,7 @@ HOMEPAGE="http://evilwm.sourceforge.net"
 IUSE="motif"
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc-macos ~sparc ~x86"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
 
 DEPEND="virtual/x11
 	motif? ( virtual/motif )"
@@ -28,7 +28,6 @@ src_unpack() {
 }
 
 src_compile() {
-	use ppc-macos && use motif && CFLAGS="${CFLAGS} -I/usr/include/openmotif-2.2"
 	emake || die
 }
 
diff --git a/x11-wm/evilwm/evilwm-0.99.4.ebuild b/x11-wm/evilwm/evilwm-0.99.4.ebuild
index 07c594fd1fb7..c0702d1454fd 100644
--- a/x11-wm/evilwm/evilwm-0.99.4.ebuild
+++ b/x11-wm/evilwm/evilwm-0.99.4.ebuild
@@ -1,18 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.4.ebuild,v 1.11 2004/07/15 01:11:43 agriffis Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2 
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/evilwm/evilwm-0.99.4.ebuild,v 1.1 2002/07/28 12:36:14 aliz Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A minimalist, no frills window manager for X."
 SRC_URI="http://download.sourceforge.net/evilwm/${PN}_${PV}-1.tar.gz"
 HOMEPAGE="http://evilwm.sourceforge.net"
-
-IUSE=""
 SLOT="0"
 LICENSE="as-is"
-KEYWORDS="x86 sparc ppc"
+KEYWORDS="x86"
 
 DEPEND="virtual/x11
-	virtual/libc"
+	virtual/glibc"
 
 RDEPEND="$DEPEND"
 
@@ -28,3 +27,4 @@ src_install () {
 
 	doman evilwm.1
 }
+
diff --git a/x11-wm/evilwm/metadata.xml b/x11-wm/evilwm/metadata.xml
index 914f6023f88c..3f6c9f82a007 100644
--- a/x11-wm/evilwm/metadata.xml
+++ b/x11-wm/evilwm/metadata.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>desktop-wm</herd>
-	<longdescription>
-	A minimalist window manager for the X Window System. It maximises screen 
-	real estate and provides good keyboard control. It is currently based on 
-	aewm.
-	</longdescription>
+<herd>desktop-wm</herd>
 </pkgmetadata>
diff --git a/x11-wm/fluxbox/ChangeLog b/x11-wm/fluxbox/ChangeLog
index fd9eaf77072b..7f0e50498630 100644
--- a/x11-wm/fluxbox/ChangeLog
+++ b/x11-wm/fluxbox/ChangeLog
@@ -1,888 +1,6 @@
 # ChangeLog for x11-wm/fluxbox
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.173 2005/11/05 14:50:09 metalgod Exp $
-
-  05 Nov 2005; Luis Medinas <metalgod@gentoo.org> fluxbox-0.9.14-r1.ebuild:
-  Marked Stable on amd64.
-
-  29 Oct 2005; Bryan Østergaard <kloeri@gentoo.org>
-  fluxbox-0.9.14-r1.ebuild:
-  Stable on alpha.
-
-  27 Oct 2005; Petteri Räty <betelgeuse@gentoo.org>
-  fluxbox-0.9.14-r1.ebuild:
-  Marked stable on x86.
-
-  19 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  fluxbox-0.9.14-r1.ebuild:
-  Stable on sparc
-
-  19 Oct 2005; Stephen P. Becker <geoman@gentoo.org>
-  fluxbox-0.9.14-r1.ebuild:
-  stable on mips
-
-  18 Oct 2005; Michael Hanselmann <hansmi@gentoo.org>
-  fluxbox-0.9.14-r1.ebuild:
-  Stable on hppa, ppc.
-
-*fluxbox-0.9.14-r1 (23 Sep 2005)
-
-  23 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> -fluxbox-0.9.14.ebuild,
-  +fluxbox-0.9.14-r1.ebuild:
-  Fix style file backgrounds, bug #106074
-
-*fluxbox-0.9.14 (15 Sep 2005)
-
-  15 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> +fluxbox-0.9.14.ebuild:
-  New version.
-
-  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> fluxbox-0.9.13-r1.ebuild:
-  stable on ia64
-
-  19 Jul 2005; Bryan Østergaard <kloeri@gentoo.org>
-  fluxbox-0.9.13-r1.ebuild:
-  Stable on alpha.
-
-  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
-  fluxbox-0.9.13-r1.ebuild:
-  stable on mips
-
-  11 Jul 2005; Simon Stelling <blubb@gentoo.org> fluxbox-0.9.13-r1.ebuild:
-  stable on amd64
-
-  09 Jul 2005; Rene Nussbaumer <killerfox@gentoo.org>
-  fluxbox-0.9.13-r1.ebuild:
-  Stable on hppa.
-
-  09 Jul 2005; Joseph Jezak <josejx@gentoo.org> fluxbox-0.9.13-r1.ebuild:
-  Marked ppc stable.
-
-  08 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  fluxbox-0.9.13-r1.ebuild:
-  Stable on sparc
-
-  08 Jul 2005; Markus Rothe <corsair@gentoo.org> fluxbox-0.9.13-r1.ebuild:
-  Stable on ppc64
-
-  08 Jul 2005; Aaron Walker <ka0ttic@gentoo.org> fluxbox-0.9.13-r1.ebuild:
-  Stable on x86.
-
-*fluxbox-0.9.13-r1 (23 May 2005)
-
-  23 May 2005; Ciaran McCreesh <ciaranm@gentoo.org>
-  +files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch,
-  +fluxbox-0.9.13-r1.ebuild:
-  Add upstream r4023 to fix systray icon problems, bug #92915
-
-  16 May 2005; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.13.ebuild:
-  Tidy up post install messages
-
-  14 May 2005; Ciaran McCreesh <ciaranm@gentoo.org>
-  -fluxbox-0.9.8-r1.ebuild, -fluxbox-0.9.10-r3.ebuild,
-  -fluxbox-0.9.10-r4.ebuild:
-  Tidy up
-
-*fluxbox-0.9.13 (14 May 2005)
-
-  14 May 2005; Ciaran McCreesh <ciaranm@gentoo.org>
-  +files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch,
-  +fluxbox-0.9.13.ebuild:
-  Version bump.
-
-  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org>
-  fluxbox-0.9.12-r1.ebuild:
-  Stable on ia64.
-
-  27 Mar 2005; Guy Martin <gmsoft@gentoo.org> fluxbox-0.9.12-r1.ebuild:
-  Stable on hppa.
-
-  19 Mar 2005; Bryan Østergaard <kloeri@gentoo.org>
-  fluxbox-0.9.12-r1.ebuild:
-  Stable on alpha.
-
-  17 Mar 2005; Michael Hanselmann <hansmi@gentoo.org>
-  fluxbox-0.9.12-r1.ebuild:
-  Stable on ppc.
-
-  06 Mar 2005; Heinrich Wendel <lanius@gentoo.org> fluxbox-0.9.12-r1.ebuild:
-  stable on amd64
-
-  26 Feb 2005; Ciaran McCreesh <ciaranm@gentoo.org>
-  -files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch,
-  -fluxbox-0.9.12-r2.ebuild:
-  Erm, no.
-
-*fluxbox-0.9.12-r2 (26 Feb 2005)
-
-  26 Feb 2005; Robin H. Johnson <robbat2@gentoo.org>
-  +files/0.9.12/fluxbox-0.9.12-make-FbTk-available-as-la.patch,
-  +fluxbox-0.9.12-r2.ebuild:
-  Patch to build libFbTk.{a,la,so}, and install it properly - this allows
-  other applicationss to link against it.
-
-  19 Feb 2005; Markus Rothe <corsair@gentoo.org> fluxbox-0.9.12-r1.ebuild:
-  Stable on ppc64
-
-  18 Feb 2005; Ciaran McCreesh <ciaranm@gentoo.org>
-  fluxbox-0.9.12-r1.ebuild:
-  x86, sparc stable
-
-  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> fluxbox-0.9.11.ebuild:
-  Stable on alpha.
-
-*fluxbox-0.9.12-r1 (24 Jan 2005)
-
-  24 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org>
-  +files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch,
-  +files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch,
-  +files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch,
-  +files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch,
-  +files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch,
-  +files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch,
-  +files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch,
-  +files/0.9.12/fluxbox-0.9.12-you-got-mail.patch,
-  +fluxbox-0.9.12-r1.ebuild, -fluxbox-0.9.12.ebuild:
-  Killed 0.9.12, added a 0.9.12-r1 which hopefully doesn't have nasty
-  vanishing window bugs. Patches: vanishing window on untab fix (upstream),
-  64-bit fixes (upstream), fix menu backups (upstream), menu locations
-  (Gentoo), icon locations (Gentoo), extra menu contents (Gentoo).
-
-  19 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.12.ebuild:
-  Fix imlib2 option
-
-*fluxbox-0.9.12 (18 Jan 2005)
-
-  18 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org>
-  +files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch,
-  +fluxbox-0.9.12.ebuild:
-  New version, now with imlib goodness
-
-  11 Jan 2005; Guy Martin <gmsoft@gentoo.org> fluxbox-0.9.11.ebuild:
-  Stable on hppa.
-
-  11 Jan 2005; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.11.ebuild:
-  Fix nasty subshell usage
-
-  02 Jan 2005; Michael Hanselmann <hansmi@gentoo.org> fluxbox-0.9.11.ebuild:
-  Stable on ppc.
-
-  28 Dec 2004; Dylan Carlson <absinthe@gentoo.org> fluxbox-0.9.11.ebuild:
-  Stable on amd64.
-
-  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org>
-  -fluxbox-0.9.10-r1.ebuild, -fluxbox-0.9.10-r2.ebuild,
-  fluxbox-0.9.11.ebuild:
-  x86, sparc, mips stable 0.9.11, clean out old versions
-
-  19 Dec 2004; Markus Rothe <corsair@gentoo.org> fluxbox-0.9.11.ebuild:
-  Stable on ppc64
-
-  07 Dec 2004; Tom Martin <slarti@gentoo.org> fluxbox-0.9.11.ebuild:
-  Fix my own stupidness with disablexmb.
-
-  07 Dec 2004; Tom Martin <slarti@gentoo.org> fluxbox-0.9.11.ebuild:
-  Added disablexmb local USE flag at the request of Ciaran
-  <ciaranm@gentoo.org>. This flag acts as a workaround for bug 65186. Thanks
-  to ak|ra in #fluxbox for the way out.
-
-  07 Dec 2004; Aaron Walker <ka0ttic@gentoo.org> fluxbox-0.9.11.ebuild:
-  Install ChangeLog/NEWS.
-
-*fluxbox-0.9.11 (06 Dec 2004)
-
-  06 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> +fluxbox-0.9.11.ebuild:
-  New upstream version
-
-  02 Nov 2004; Markus Rothe <corsair@gentoo.org> fluxbox-0.9.10-r4.ebuild:
-  Stable on ppc64
-
-  31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
-  fluxbox-0.9.10-r3.ebuild:
-  Stable on alpha.
-
-  17 Oct 2004; Dylan Carlson <absinthe@gentoo.org> fluxbox-0.9.10-r3.ebuild:
-  stable on amd64.
-
-  08 Oct 2004; Guy Martin <gmsoft@gentoo.org> fluxbox-0.9.10-r3.ebuild:
-  Marked stable on hppa.
-
-  07 Oct 2004; Ciaran McCreesh <ciaranm@gentoo.org>
-  +files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch,
-  fluxbox-0.9.10-r4.ebuild:
-  Really fix locale stuff this time. Honest...
-
-*fluxbox-0.9.10-r4 (04 Oct 2004)
-
-  04 Oct 2004; Ciaran McCreesh <ciaranm@gentoo.org>
-  +fluxbox-0.9.10-r4.ebuild:
-  Bump. Pull in pretty much everything from upstream -cvs to date. This should
-  fix any remaining locale / font problems. Experimental XComposite support is
-  also available.
-
-  25 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.10-r3.ebuild:
-  Stable on x86, sparc after discussion with upstream. There may be an -r4
-  shortly with some experimental extra xcomposite options, reduced CPU patches
-  and font changes.
-
-*fluxbox-0.9.10-r3 (15 Sep 2004)
-
-  15 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
-  +files/0.9.10/fluxbox-0.9.10-all-about-me.patch,
-  +files/0.9.10/fluxbox-0.9.10-editor-thingies.patch,
-  +files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch,
-  +files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch,
-  +files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch,
-  +files/0.9.10/fluxbox-0.9.10-misc-updates.patch,
-  +files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch,
-  +files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch,
-  +files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch,
-  +files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch,
-  +files/0.9.10/styles-menu-commonbox, +files/0.9.10/styles-menu-fluxbox,
-  +files/0.9.10/styles-menu-user, +fluxbox-0.9.10-r3.ebuild:
-  New revision bump. Includes the xcomposite workaround from upstream (fixes bug
-  #63689), the X error reduction patches from upstream, POSIX-style head for
-  fluxbox-generate_menu (bug #63591), fluxbox-generate_menu for several extra
-  editors and terminals, more detailed fluxbox -version, an About entry in the
-  fluxbox menu, support for including directories in menus and a new improved
-  styles directory system.
-
-  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  Stable on ppc
-
-*fluxbox-0.9.10-r2 (07 Sep 2004)
-
-  07 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
-  +files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch,
-  +files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch,
-  +fluxbox-0.9.10-r2.ebuild:
-  Backport a couple of crash fixes from upstream -cvs
-
-  07 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org>
-  -files/fluxbox-0.9.10.amd64_fix.patch,
-  +files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch, fluxbox-0.9.10-r1.ebuild:
-  Move the patches around, since we're going to end up with lots of them...
-
-  05 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.10-r1.ebuild,
-  -fluxbox-0.9.10.ebuild:
-  Apply the crash fix patch on every arch, since upstream like it. Remove the
-  possibly flaky unpatched version.
-
-*fluxbox-0.9.10-r1 (03 Sep 2004)
-
-  03 Sep 2004; <blubb@gentoo.org> +files/fluxbox-0.9.10.amd64_fix.patch,
-  +fluxbox-0.9.10-r1.ebuild:
-  Fixed crash on amd64. See bug #62722.
-
-*fluxbox-0.9.10 (01 Sep 2004)
-
-  01 Sep 2004; Ciaran McCreesh <ciaranm@gentoo.org> +fluxbox-0.9.10.ebuild:
-  Version bump, bug #62495
-
-  10 Aug 2004; Tom Gall <tgall@gentoo.org> fluxbox-0.9.9.ebuild:
-  stable on ppc64
-
-  26 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> fluxbox-0.9.9.ebuild:
-  Fixed truetype USE flag on macos.
-
-  23 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> fluxbox-0.9.9.ebuild:
-  Added to macos. This closes bug #57883
-
-  01 Jul 2004; Tom Gall <tgall@gentoo.org> fluxbox-0.9.9.ebuild:
-  add ~ppc64, bug #55012
-
-  20 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> fluxbox-0.9.9.ebuild:
-  Stable on alpha.
-
-  24 May 2004; Guy Martin <gmsoft@gentoo.org> fluxbox-0.9.9.ebuild:
-  Marked stable on hppa.
-
-  21 May 2004; <coxj@gentoo.org> fluxbox-0.9.9.ebuild:
-  Stable on x86
-
-  21 May 2004; Travis Tilley <lv@gentoo.org> fluxbox-0.9.9.ebuild:
-  stable on amd64
-
-  21 May 2004; Stephen P. Becker <geoman@gentoo.org> fluxbox-0.9.9.ebuild:
-  Stable on mips.
-
-  09 May 2004; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.9.ebuild:
-  Stable on sparc
-
-  06 May 2004; Ciaran McCreesh <ciaranm@gentoo.org>
-  -files/fluxbox-0.1.13-Xft2.patch, -files/fluxbox-0.1.13-aa2.patch,
-  -files/fluxbox-0.1.13-menukey.patch, -files/fluxbox-0.1.13-nls.patch,
-  -files/fluxbox-0.1.13-openoffice.patch,
-  -files/fluxbox-0.1.13-remember.patch, -files/fluxbox-0.1.14-gcc33.patch,
-  -files/fluxbox-0.1.14-ja.patch, -files/fluxbox-0.1.14-menukey.patch,
-  -files/fluxbox-0.1.14-remember.patch,
-  -files/fluxbox-0.1.14-toggledecor.patch, -files/fluxbox-vano-gentoo.patch,
-  -files/0.9.7/01_cache-bugfix.patch, -files/0.9.7/02_iconbar-bugfix.patch,
-  -fluxbox-0.1.14-r2.ebuild, -fluxbox-0.9.8.ebuild:
-  Tidy up old versions, clean up unneeded patches
-
-  06 May 2004; Stephen P. Becker <geoman@gentoo.org> fluxbox-0.9.8-r1.ebuild:
-  Stable on mips.
-
-  01 May 2004; Aron Griffis <agriffis@gentoo.org> fluxbox-0.9.9.ebuild:
-  Add inherit eutils
-
-  29 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org>
-  +files/fluxbox-0.9.9-gcc3.4.patch, fluxbox-0.1.14-r2.ebuild,
-  fluxbox-0.9.8-r1.ebuild, fluxbox-0.9.8.ebuild, fluxbox-0.9.9.ebuild:
-  Added in gcc 3.4 patch from upstream, changed LICENCE to MIT
-
-*fluxbox-0.9.9 (26 Apr 2004)
-
-  26 Apr 2004; Ciaran McCreesh <ciaranm@gentoo.org> +fluxbox-0.9.9.ebuild:
-  Version bump
-
-  15 Mar 2004; Ciaran McCreesh <ciaranm@gentoo.org> files/fluxbox.desktop:
-  Fixing the desktop entry to use startfluxbox rather than fluxbox
-
-*fluxbox-0.9.8-r1 (07 Mar 2004)
-
-  07 Mar 2004; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.8-r1.ebuild,
-  files/fluxbox.desktop:
-  Add .desktop file in preperation for new GDM, bug #40711
-
-  07 Mar 2004; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6.ebuild,
-  fluxbox-0.9.7-r1.ebuild:
-  Out with the old...
-
-  01 Mar 2004; Ilya Volynets <ilya@total-knowledge.com> fluxbox-0.9.8.ebuild:
-  ~mips fluxbox-0.9.8, as it works stably according to geoman
-
-  24 Feb 2004; Aron Griffis <agriffis@gentoo.org> fluxbox-0.9.8.ebuild:
-  stable on alpha and ia64
-
-  06 Feb 2004; <gustavoz@gentoo.org> fluxbox-0.9.8.ebuild:
-  stable on hppa
-
-  06 Feb 2004; Lars Weiler <pylon@gentoo.org> fluxbox-0.9.8.ebuild:
-  Also stable on ppc.
-
-  06 Feb 2004; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.8.ebuild:
-  Stable on x86 and sparc
-
-  27 Jan 2004; Tavis Ormandy <taviso@gentoo.org> fluxbox-0.9.8.ebuild:
-  marking ~alpha, #39477
-
-*fluxbox-0.9.8 (15 Jan 2004)
- 
-  15 Jan 2004; Sascha Schwabbauer <cybersystem@gentoo.org> fluxbox-0.9.8.ebuild:                                               
-  Added ~ppc
-
-  15 Jan 2004; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.8.ebuild:
-  Version bump.
-
-*fluxbox-0.9.8_pre2 (14 Jan 2004)
-
-  14 Jan 2004; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.8_pre2.ebuild:
-  New pre version. This includes the memory leak and iconbar fixes. The ebuild
-  will now create an /etc/X11/Sessions entry as well.
-
-*fluxbox-0.9.7-r1 (11 Jan 2004)
-
-  11 Jan 2004; Markus Nigbur <pyrania@gentoo.org> fluxbox-0.9.7-r1.ebuild,
-  files/0.9.7/01_cache-bugfix.patch, files/0.9.7/02_iconbar-bugfix.patch:
-  Applied two important memory leak patches.
-
-  08 Jan 2004; <gustavoz@gentoo.org> fluxbox-0.9.7.ebuild:
-  marked stable on hppa
-
-  06 Jan 2004; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.7.ebuild:
-  Marked stable on x86 in preperation for 2004.0 release.
-
-*fluxbox-0.9.7 (03 Jan 2004)
-
-  03 Jan 2004; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.7.ebuild:
-  Version bump. This version has an all new ebuild that removes commonbox.eclass
-  functionality, and now installs data files in /usr/share/fluxbox (YAY!).
-
-  19 Dec 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.1.14-r2.ebuild,
-  fluxbox-0.9.6.ebuild, fluxbox-0.9.6_pre9.ebuild:
-  Fixed license (as-is).
-
-  14 Dec 2003; Lars Weiler <pylon@gentoo.org> fluxbox-0.9.6.ebuild:
-  Masked stable on ppc
-
-  06 Dec 2003; Markus Nigbur <pyrania@gentoo.org> fluxbox-0.1.14-r3.ebuild:
-  Fixed bug #34747. Thanks Spider.
-
-  05 Dec 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6.ebuild:
-  Adding ~amd64, thanks to Jan Schubert for testing.
-
-  20 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fluxbox-0.1.14-r2.ebuild:
-  stable on alpha
-
-  17 Nov 2003; Ciaran McCreesh <ciaranm@gentoo.org> fluxbox-0.9.6.ebuild:
-  Moved to ~sparc
-
-*fluxbox-0.9.6 (16 Nov 2003)
-
-  16 Nov 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6.ebuild:
-  Version bump, final 0.9.6 release. Unmasked and marked ~arch, lots of testing
-  on all archs please ;)
-
-*fluxbox-0.9.6_pre9 (25 Sep 2003)
-
-  04 Nov 2003; Joshua Kinard <kumba@gentoo.org> fluxbox-0.9.6_pre9.ebuild:
-  Added ~mips to KEYWORDS
-
-  28 Oct 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.1.14-r2.ebuild:
-  Marking 0.1.14 stable on ppc
-
-  14 Oct 2003; Markus Nigbur <pyrania@gentoo.org> fluxbox-0.1.14-r2.ebuild:
-  Added PROVIDE="virtual/blacbox"
-
-  28 Sep 2003; Markus Nigbur <pyrania@gentoo.org> fluxbox-0.1.14-r2.ebuild:
-  Added ~amd64 keyword. request by brad@mainstreetsoftworks.com in bug #29806.
-
-
-  25 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.0.ebuild,
-  fluxbox-0.9.3.ebuild, fluxbox-0.9.4.ebuild, fluxbox-0.9.5.ebuild,
-  fluxbox-0.9.6_pre5.ebuild, fluxbox-0.9.6_pre6.ebuild,
-  fluxbox-0.9.6_pre7.ebuild, fluxbox-0.9.6_pre9.ebuild:
-  Version bump + cleanups
-
-*fluxbox-0.9.0 (24 Sep 2003)
-
-  24 Sep 2003; Jason Wever <weeve@gentoo.org> fluxbox-0.9.0.ebuild,
-  fluxbox-0.9.3.ebuild, fluxbox-0.9.4.ebuild, fluxbox-0.9.5.ebuild,
-  fluxbox-0.9.6_pre5.ebuild, fluxbox-0.9.6_pre6.ebuild,
-  fluxbox-0.9.6_pre7.ebuild, fluxbox-0.9.6_pre8.ebuild:
-  Added ~sparc keyword.
-
-*fluxbox-0.9.6_pre8 (16 Sep 2003)
-
-  16 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6_pre8.ebuild:
-  version bump.
-
-*fluxbox-0.1.14-r2 (14 Sep 2003)
-
-  14 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.1.14-r2.ebuild:
-  Add gcc33 fixes.
-
-*fluxbox-0.9.6_pre7 (14 Sep 2003)
-
-  14 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6_pre7.ebuild:
-  Bumpage.
-
-*fluxbox-0.9.6_pre1 (13 Sep 2003)
-
-  13 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6_pre1.ebuild,
-  fluxbox-0.9.6_pre4.ebuild:
-  Small cleanups.
-
-*fluxbox-0.9.6_pre6 (13 Sep 2003)
-
-  13 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6_pre6.ebuild:
-  Version bump, props yet again to d0minik, my secret Fluxbox informant.
-
-*fluxbox-0.9.6_pre5 (11 Sep 2003)
-
-  11 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6_pre5.ebuild:
-  Version bump, thanks once again to d0minik with the quickness!
-
-*fluxbox-0.9.6_pre4 (09 Sep 2003)
-
-  09 Sep 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6_pre4.ebuild:
-  Version bump, thanks to d0minik for the tip!
-
-*fluxbox-0.9.6pre1 (30 Aug 2003)
-
-  30 Aug 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.6pre1.ebuild:
-  New dev release with some bugfixes.
-
-*fluxbox-0.9.5 (28 Aug 2003)
-
-  28 Aug 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.5.ebuild:
-  Version bump.
-
-*fluxbox-0.9.4 (22 Aug 2003)
-
-  22 Aug 2003; Brandon Hale <tseng@gentoo.org> fluxbox-0.9.4.ebuild:
-  New dev release by popular request!
-
-*fluxbox-0.9.3 (11 Jun 2003)
-
-  11 Jun 2003; mkeadle <mkeadle@gentoo.org> fluxbox-0.9.3.ebuild:
-  Bumping devel release to 0.9.3. This release is considerably more stable
-  then 0.9.0, but remember it's still a dev release. This ebuild contains
-  the Blueflux theme.
-
-*fluxbox (20 May 2003)
-
-  03 Jun 2003; mkeadle <mkeadle@gentoo.org>:
-  Moving --enable-xft to USE test in commonbox.eclass.
-
-  20 May 2003; mkeadle <mkeadle@gentoo.org>:
-  Moving --enable-xinerama to USE test in commonbox.eclass.
-
-*fluxbox (12 Apr 2003)
-
-  12 Apr 2003; Sascha Schwabbauer <cybersystem@gentoo.org>:
-  Fluxbox was never based on pwm, so I changed the Description of all ebuilds.
-
-*fluxbox-0.1.14-r1 (10 Dec 2002)
-
-  18 Aug 2003; Joshua Kinard <kumba@gentoo.org> fluxbox-0.1.14-r1.ebuild:
-  Added ~mips to KEYWORDS
-  Added use flag check for mips; If true, runs gnuconfig_update
-
-  24 Jun 2003; Masatomo Nakano <nakano@gentoo.org> fluxbox-0.1.14-r1.ebuild,
-  files/fluxbox-0.1.14-ja.patch:
-  Added Japanese support.
-
-  18 Apr 2003; Guy Martin <gmsoft@gentoo.org> fluxbox-0.1.14-r1.ebuild :
-  Added hppa to KEYWORDS.
-
-  06 Mar 2003; Jason Wever <weeve@gentoo.org> fluxbox-0.1.14-r1.ebuild:
-  Changed ~sparc keyword to sparc.
-
-  10 Dec 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.14-r1.ebuild
-  files/digest-fluxbox-0.1.14-r1
-
-  Menukey, vano, (menudestroy), and a toggledecor patch are now applied.
-  Should still be working fine with Xft1 or Xft2.
-
-*fluxbox-0.1.14 (09 Dec 2002)
-
-  09 Dec 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.14.ebuild
-  files/digest-fluxbox-0.1.14
-
-  Bump to latest stable. Unpatch release tarball.
-
-*fluxbox-0.1.13-r8 (09 Dec 2002)
-
-  09 Dec 2002; B.Lauwers <blauwers@gentoo.org> fluxbox-0.1.13-r8.ebuild
-
-  Changed from ~sparc to sparc, (tested + bug 11846)
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*fluxbox-0.1.13-r6 (07 Dec 2002)
-
-  07 Dec 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r8.ebuild
-  files/digest-fluxbox-0.1.13-r8
-
-  Update to build against Xft2. Remember patch release.
-
-*fluxbox-0.1.13-r7 (07 Dec 2002)
-
-  07 Dec 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r7.ebuild
-  files/digest-fluxbox-0.1.13-r7
-
-  Update to build against Xft2. No remember patch release.
-	      
-
-*fluxbox-0.1.13-r6 (06 Dec 2002)
-
-  06 Dec 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r5.ebui
-  ld
-  files/digest-fluxbox-0.1.13-r6
-
-  Update to build against Xft2. Remember patch release.
-
-*fluxbox-0.1.13-r5 (06 Dec 2002)
-
-  06 Dec 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r5.ebuild
-  files/digest-fluxbox-0.1.13-r5
-
-  Update to build against Xft2. No remember patch release.
-
-*fluxbox-0.1.13-r4 (26 Nov 2002)
-
-  26 Nov 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r4.ebuild
-  files/digest-fluxbox-0.1.13-r4
-
-  Cleaned up. Remember patch is applied to this latest testing release.      
-
-*fluxbox-0.1.13-r3 (26 Nov 2002)
-
-  26 Nov 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r3.ebuild
-  files/digest-fluxbox-0.1.13-r3
-
-  Cleaned up and removed remember patch for a stable release.
-
-*fluxbox-0.1.13-r2 (24 Nov 2002)
-
-  24 Nov 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r1.ebuild
-  files/digest-fluxbox-0.1.13-r2 files/fluxbox-0.1.13-*.patch
-
-  This is a somewhat major collection of updates. Fluxbox initialy had some
-  issues with menu/taskbar fonts being screwy when a session was first
-  started. OpenOffice was crashing, which was previously being solved by
-  configuring with --disable-newwmspec. NLS files were not getting installed.
-  All of the above have been patched/fixed.
-
-  The menukey patch is still applied. The remember patch has also been
-  applied to this release. Unlike the previous remember patch, this one
-  builds fine if -nls is in your USE.
-
-*fluxbox-0.1.13-r1 (21 Nov 2002)
-
-  21 Nov 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13-r1.ebuild
-  files/digest-fluxbox-0.1.13-r1 files/fluxbox-0.1.13-menukey.patch
-
-  Patch applied to allow manipulation of the root applications menu with
-  standard keybindings. In your ~/.fluxbox/keys files you can now make
-  use of: WindowMenu, NextMenuItem, PrevMenuItem, SelectMenuItem,
-  OpenSubmenu, and CloseMenu. For instance:
-
-  Control Right :OpenSubmenu
-
-  No found issues with any flags or build types associated with fluxbox
-  
-
-*fluxbox-0.1.13 (19 Nov 2002)
-
-  19 Nov 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.13.ebuild
-  files/digest-fluxbox-0.1.13 ChangeLog
-
-  Version bump to latest stable. Fluxbox now has Xft support! Also, build
-  was edited to grab the .bz2 instead of the .gz, and the new menu
-  generation script was yanked and scheduled to be adapted to commonbox.
-
-*fluxbox-0.1.12-r2 (26 Oct 2002)
-
-  4 Nov 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.12-r2.ebuild
-
-  Minor edit to ebuild to test for absence of nls in USE (remember
-  patched version will not build without it. Furthering the effort
-  to deal with bug #9909
-
-  26 Oct 2002; Matt Keadle <mkeadle@gentoo.org> fluxbox-0.1.12-r2.ebuild
-  files/digest-fluxbox-0.1.12-r2 :
-
-  Added the remember patch. This patch adds an extra submenu to the WindowMenu
-  that allows you store each windows workspace, deminsions, position, shaded
-  state, tab state, decoration state, and sticky state and also to save the
-  settings on application close. It also enabled the use of a Startup submenu
-  in your applications menu. Any items in this submenu will be automatically
-  started when you start fluxbox.
-
-  There are scant warnings about crashes with this patch, but neither I nor
-  anyone I have spoken with have experienced any issues. As allways, report
-  any problems to http://bugs.gentoo.org/.
-
-  Fluxbox with the remember patch will not install with "-nls" in your USE.
-			
-
-*fluxbox-0.1.12-r1 (17 Sep 2002)
-
-  05 Oct 2002; Seemant Kulleen <seemant@gentoo.org> ChangeLog:
-
-  To give credit where credit is due, the RootMenu patch was in fact
-  created by Junichiro Kita <kita@kitaj.no-ip.com> and is maintained on his
-  website: http://kitaj.no-ip.com/files/fluxbox/
-
-  17 Sep 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.12-r1.ebuild
-  files/digest-fluxbox-0.1.12-r1 :
-
-  Update: few hours later: Rach refined the patch a little and added a
-  subtle blurb in the fluxbox manpage as well.  Mucho thanks :)
-
-  This revision bump incorporates two patches.  The first is the Vano patch
-  from bug #5005 which makes the root menu disappear on left click anywhere.
-  The second is the rootmenu patch which was posted many months ago on the
-  fluxbox mailing lists against an older version of fluxbox.  The patch was
-  recently foreported to this version of flux by Rach Holmes.  The
-  original patch was BSD licensed, as is Rach's version of it.  Basically,
-  it allows the rootmenu to be bound to a key. So, for instance, in
-  ~/.fluxbox/keys:
-
-  Mod4 :RootMenu
-
-  will cause the fluxbox menu to open when the "windows logo" key is pressed
-  (x86 machine).  Use xmodmap etc to flavour as you like it.  Seemant is on
-  an x86 and has these entries in his local keys file (the left windows key
-  opens the root menu, the right side windows key closes it).  The windows
-  menu key (right click menu in windows) opens up flux's window menu
-
-  None Super_L :RootMenu
-  None Super_R :CloseMenu
-  None Menu :WindowMenu
-  Shift Right :OpenSubMenu
-  Shift Return :SelectMenuItem
-  Shift Up :PrevMenuItem
-  Shift Down :NextMenuItem
-
-*fluxbox-0.1.12 (13 Sep 2002)
-
-  13 Sep 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.12.ebuild
-  files/digest-fluxbox-0.1.12 :
-
-  Upstream version bump, which is really just identical to 0.1.11-r3.
-  Thanks to matt@oddprocess.org (Matthew Daubenspeck) in bug #7842.
-
-*fluxbox-0.1.11-r3 (11 Sep 2002)
-
-  11 Sep 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.11-r3.ebuild
-  files/digest-fluxbox-0.1.11-r3 :
-
-  New bugfix2 patch which fixes all the bugs from bugfix1, and the deadlock
-  bug introduced by bugfix1.  Thanks to: gentoobug@tobij.de (Tobias) in bug
-  #7772
-
-*fluxbox-0.1.11-r2 (10 Sep 2002)
-
-  10 Sep 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.11-r2.ebuild
-  files/digest-fluxbox-0.1.11-r2 :
-
-  upstream bugfix1 patch.  Thanks to: matt@oddprocess.org (Matthew
-  Daubenspeck) in bug #7717
-
-*fluxbox-0.1.11-r1 (04 Sep 2002)
-
-  04 Sep 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.11-r1.ebuild
-  files/digest-fluxbox-0.1.11-r1 :
-
-  menu is now back in /usr/share/commonbox/menu and translation files in
-  /usr/share/locale
-
-  04 Sep 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.11.ebuild
-  files/digest-fluxbox-0.1.11 :
-
-  Version bump.  Thanks to: cycloon@linux-de.org (christian gut) in bug
-  #7422.
-
-*fluxbox-0.1.10 (14 Jul 2002)
-
-  27 Aug 2002; Michael Nazaroff <naz@gentoo.org> fluxbox-0.1.10.ebuild :
-  
-  Added the fluxbox default keys file into the ebuild. This takes care of bug
-  #6274. Thanx to: scottro@despammed.com (Scott Robbins) for the report.
-  
-  16 Aug 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.10.ebuild :
-
-  Added Vano's patch to make the menu disappear on left click anywhere.
-  Thanks to: vano-gentoo@europeansoftware.com (Vania Dolukhanian) in bug
-  #5005
-
-  04 Aug 2002; Spider <spider@gentoo.org> fluxbox-0.1.10.ebuild :
-  filtering out -fno-exceptions
-  
-  15 Jul 2002; Mark Guertin <gerk@gentoo.org>
-  Added ppc to keywords
-
-  14 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.10.ebuild
-  files/digest-fluxbox-0.1.10 :
-
-  Version bump, and now uses the commonbox eclass.
-
-*fluxbox-0.1.9-r5 (10 Jul 2002)
-
-  10 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.9-r5.ebuild
-  files/fluxbox-0.1.9-gentoo.diff files/digest-fluxbox-0.1.9-r5 :
-
-  Added transient window patch to avoid xine hardlocking things up.  Patch
-  from some fluxbox developer through: matt@oddprocess.org (Matthew
-  Daubenspeck) in bug #4837
-
-*fluxbox-0.1.9-r4 (7 Jul 2002)
-  
-  7 Jul 2002; Daniel Robbins <drobbins@gentoo.org> : xinerama (multi-monitor
-  support) is now enabled by default.  This closes bug #4514.
-
-*fluxbox-0.1.9-r3 (1 Jul 2002)
-  
-  1 Jul 2002; Owen Stampflee <owen@gentoo.org> fluxbox-0.1.9-r3.ebuild
-  Fixed a slight syntax error in the -r2 ebuild.
-
-*fluxbox-0.1.9-r2 (1 Jul 2002)
-
-  1 Jul 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.9-r2.ebuild
-  files/digest-fluxbox-0.1.9-r2 :
-
-  Added Oly's antialiasing patch, as suggested in bug #4376 by:
-  depairet@gmx.de (dominik) who also submitted a patched ebuild for it.
-
-*fluxbox-0.1.9-r1 (1.9 Jun 2002)
-
-  19 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> fluxbox-0.1.9-r1.ebuild
-  
-  Upstream bugfix patch (#2) applied. Also closes (#3864).
-  
-*fluxbox-0.1.9 (24 May 2002)
-
-  24 May 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.9.ebuild
-  files/digest-fluxbox-0.1.9 :
-
-  Version bump.
-
-*fluxbox-0.1.8-r2 (14 May 2002)
-
-  14 May 2002; Grant Goodyear <g2boojum@gentoo.org> :
-
-  Upstream bugfix patch (#2) applied.  Old 0.1.8 versions removed.
-
-*fluxbox-0.1.8-r1 (29 Apr 2002)
-
-  29 Apr 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.8-r1.ebuild.
-  files/fluxbox-0.1.8-bugfix1.patch, files/diges-fluxbox-0.1.8-r1 :
-
-  Upstream bugfix patch applied.
-
-*fluxbox-0.1.8 (1.9 Apr 2002)
-
-  19 Apr 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.8.ebuild, files/digest-fluxbox-0.1.8 :
-
-  Version bump to newest stable
-
-*fluxbox-0.1.7-r3 (20 Mar 200)
-
-  20 Mar 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.7-r3.ebuild :
-
-  Removed gnome and kde from the deps, because they are NOT required in order
-  to compile support for them.  The KDE support is meaningless without KDE 
-  installed, but it is harmless and leads to less bloat if KDE wasn't intended
-  to be installed in the first place.
-
-*fluxbox-0.1.7-r3 (15 Mar 2002)
-
-  16 Mar 2002; Karl Trygve Kalleberg <karltk@gentoo.org> fluxbox-0.1.7-r3.ebuild :
-
-  Added /etc/X11/Sessions/fluxbox pointer. Didn't bother updating revision 
-  as the fix is so small.
-
-  Removed old revisions.
-
-*fluxbox-0.1.7-r3 (15 Mar 2002)
-
-  15 Mar 2002; Seemant Kulleen <seemant@gentoo.org> fluxbox-0.1.7-r3.ebuild :
-
-  This package now provides virtual/fluxbox, so as to allow blackbox
-  applications (which are completely compatible with fluxbox) to run without
-  having to emerge blackbox as well.
-
-*fluxbox-0.1.7-r2 (9 Mar 2002)
-
-  9 Mar 2002; Karl Trygve Kalleberg <karltk@gentoo.org> fluxbox-0.1.7-r2.ebuild :
-
-  Added upstream patch.
-
-  Removed old revisions.
-
-*fluxbox-0.1.7-r1 (9 Mar 2002)
-
-  9 Mar 2002; Karl Trygve Kalleberg <karltk@gentoo.org> fluxbox-0.1.7-r1.ebuild :
-
-  Added proper GNOME dependencies (#943). Thanks to Daniel Mettler 
-  <mettlerd@icu.unizh.ch>.
-
-*fluxbox-0.1.7 (2 Mar 2002)
-
-  2 Mar 2002; Bruce A. Locke <blocke@shivan.org> fluxbox-0.1.7.ebuild :
-
-  Update to 0.1.7
-
-*fluxbox-0.1.6-r1 (14 Feb 2002)
-
-  14 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
-  
-  Added /etc/X11/Sessions/fluxbox, which adds fluxbox to the auto-generated
-  session list in kdm and gdm.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
 *fluxbox-0.1.6 (1 Feb 2002)
 
diff --git a/x11-wm/fluxbox/Manifest b/x11-wm/fluxbox/Manifest
index f1734bd07e83..b4737163a895 100644
--- a/x11-wm/fluxbox/Manifest
+++ b/x11-wm/fluxbox/Manifest
@@ -1,54 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d33490b8700137f7d53b9552cd7aaa37 ChangeLog 31090
-MD5 97574b9984c119ced3c259bd8c314588 files/0.9.10/fluxbox-0.9.10-all-about-me.patch 674
-MD5 ee36523cd5cf3281d0261244260840c9 files/0.9.10/fluxbox-0.9.10-amd64-font-fix.patch 774
-MD5 6c400d01c4fe9bea1d751ea6cbc718b5 files/0.9.10/fluxbox-0.9.10-eat-this-setlocale.patch 1295
-MD5 8b288a50d112b48b73c791893dac61f9 files/0.9.10/fluxbox-0.9.10-editor-thingies.patch 804
-MD5 05e049a3f92497ddb1cf615abfdc5f35 files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch 946
-MD5 b5f651453c6bbf6089cf65ec5cd83722 files/0.9.10/fluxbox-0.9.10-make-pretty-eye-candy-work.patch 563
-MD5 7295edfc76f1cca87164e419e2d3b637 files/0.9.10/fluxbox-0.9.10-menu-include-directories.patch 1948
-MD5 61d8fb7f72eb34b75cbf5c2e9b291fa3 files/0.9.10/fluxbox-0.9.10-misc-updates.patch 13915
-MD5 1c0b2aaf218be67efc82bcb455e713ec files/0.9.10/fluxbox-0.9.10-my-term-is-better-than-your-term.patch 968
-MD5 b285687968580fa55ffcf5e586426ee7 files/0.9.10/fluxbox-0.9.10-posix-on-toast.patch 889
-MD5 48b051c794986e9acb73631e0642e2d9 files/0.9.10/fluxbox-0.9.10-super-x-voodoo-two.patch 3203
-MD5 a39d5b26fb1695fd9264cca078ad0d58 files/0.9.10/fluxbox-0.9.10-super-x-voodoo.patch 7008
-MD5 71a4dfce6e2832c47b9191caab6e3d35 files/0.9.10/fluxbox-0.9.10-windowmenu-crash.patch 2510
-MD5 33fa4c925ae4fe1b5797673a4508c548 files/0.9.10/fluxbox-0.9.10-workspacemenu-crash.patch 2616
-MD5 9f6f105cbf9396f450e77dbf885b0a02 files/0.9.10/styles-menu-commonbox 127
-MD5 4db83b69b94628dc9f05c797bd01c95b files/0.9.10/styles-menu-fluxbox 117
-MD5 9ae40c5c7aebae1c5919adbd888710b4 files/0.9.10/styles-menu-user 93
-MD5 7e577aae2f600bf4ae3ff8d85f044a58 files/0.9.12/fluxbox-0.9.12-3853-zero-is-not-null.patch 623
-MD5 b73dd2d75c728d03e9ab973946a6c7fd files/0.9.12/fluxbox-0.9.12-3853-zero-is-still-not-null.patch 394
-MD5 6e4f5d9486b1919b3c0fb7356b737966 files/0.9.12/fluxbox-0.9.12-3856-hide-and-seek-is-bad.patch 647
-MD5 08670463836eec1499fd48f6cad6a6c9 files/0.9.12/fluxbox-0.9.12-3860-menu-backups.patch 432
-MD5 59bfbdb0d951c09db8897948a9796cb9 files/0.9.12/fluxbox-0.9.12-our-styles-go-over-here.patch 741
-MD5 c5dd91e4b4519e3c7363dc76f2cc5f61 files/0.9.12/fluxbox-0.9.12-pretty-eye-candy.patch 1893
-MD5 7a34186b1b83746dbc71f0415d5f5a52 files/0.9.12/fluxbox-0.9.12-sweet-sweet-music.patch 650
-MD5 7b8327fc8b73757e8fb506b565d989ea files/0.9.12/fluxbox-0.9.12-vi-sucks-use-vim.patch 1008
-MD5 e56d5d9ab0af15229ed139b1e1f5b3be files/0.9.12/fluxbox-0.9.12-you-got-mail.patch 516
-MD5 36db5c88337dd805a65f485604e321d6 files/0.9.13/fluxbox-0.9.13-4023-overlapping-icons-are-bad-92915.patch 829
-MD5 17110f6fe071a751aaa29832e92832fd files/0.9.13/fluxbox-0.9.13-our-styles-go-over-here.patch 653
-MD5 d4702d1ea0037c658b15b9a4af27cf4a files/digest-fluxbox-0.9.11 67
-MD5 e5c69e225b86ee6f1491b9970d22153f files/digest-fluxbox-0.9.12-r1 67
-MD5 477fd294ad2a81438ea97da4a48cbd41 files/digest-fluxbox-0.9.13 67
-MD5 477fd294ad2a81438ea97da4a48cbd41 files/digest-fluxbox-0.9.13-r1 67
-MD5 dfa28a0b7c21fa818670b20865976738 files/digest-fluxbox-0.9.14-r1 67
-MD5 cde8982304ad765c60a68874325d66fb files/digest-fluxbox-0.9.9 65
-MD5 4bafaa2a6712efa9f0c040b6072c8169 files/fluxbox-0.9.9-gcc3.4.patch 527
-MD5 133c9b57600834dedcdbca2ed789327d files/fluxbox.desktop 202
-MD5 66b6f17a72007858528df08e2f9ae678 fluxbox-0.9.11.ebuild 4783
-MD5 335240c333191381fae47a37c9f9f0e8 fluxbox-0.9.12-r1.ebuild 5120
-MD5 b75091771835d3197ea941ceed0efcf4 fluxbox-0.9.13-r1.ebuild 4160
-MD5 dd94d6b0f9297b6fd140373fd7652cd5 fluxbox-0.9.13.ebuild 4022
-MD5 ac3547e667e86d91ca126c5d2c80b31a fluxbox-0.9.14-r1.ebuild 4464
-MD5 ba3c40b11884514f9fa692fd8e9788b4 fluxbox-0.9.9.ebuild 1700
-MD5 fb91a86bbf58cb4d7e40f9536c319766 metadata.xml 437
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDbMZLwUpWvClEHQoRAh6UAJ9UglwyoItzPoLu21mTxYgefpLJegCeKGl4
-sRNlB+geKzf0q6eochYZVyk=
-=s+73
------END PGP SIGNATURE-----
+MD5 e909c718c0b6c0fd905eaaf16c9894a8 fluxbox-0.1.14-r1.ebuild 1266
+MD5 fa1160817d962da442cd5bcdb64a44aa ChangeLog 12719
+MD5 80cc4118dd4bb43532e9a0a8dbe145a2 fluxbox-0.1.12-r1.ebuild 1031
+MD5 f0a0494829d2f32f6c17073ebb87f60a files/fluxbox-0.1.13-nls.patch 581
+MD5 694282fdac35963635b8cfec5179172d files/fluxbox-0.1.14-remember.patch 39371
+MD5 c28b191f95d32d2ab4d6c4f353faa070 files/fluxbox 27
+MD5 1613a723da70c8ef3f16df1f5639990b files/fluxbox-0.1.13-Xft2.patch 1408
+MD5 7b7044a97f3d2f84897e7fddf925b309 files/fluxbox-0.1.14-toggledecor.patch 823
+MD5 3661fa0f4811d5de5119163ee43ac690 files/digest-fluxbox-0.1.12-r1 132
+MD5 1c3ae2ce22f7f2a778a8ad5a5631df28 files/digest-fluxbox-0.1.14-r1 67
+MD5 86549bc3a5561ad2a0400a3b405003f4 files/fluxbox-0.1.13-menukey.patch 6269
+MD5 5ad4a28ef73318001e9526c5f2915355 files/fluxbox-0.1.13-remember.patch 38913
+MD5 9a521a2ef9c0942ec02b714c3637e789 files/fluxbox-0.1.13-aa2.patch 1365
+MD5 96957d6246f0287f85531f6447a077c7 files/fluxbox-0.1.14-menukey.patch 6267
+MD5 5f1cedd6893799695fbbc3a19f5c5cff files/fluxbox-0.1.13-openoffice.patch 525
+MD5 ddf99954256a3dc12763651bbf63bf3a files/fluxbox-vano-gentoo.patch 1092
diff --git a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch
index 2dd70d86e467..d07451610a8a 100644
--- a/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch
+++ b/x11-wm/fluxbox/files/0.9.10/fluxbox-0.9.10-fancy-gentoo-styledirs.patch
@@ -16,7 +16,7 @@ diff -u -r1.29 fluxbox-generate_menu.in
 -
 -    append_menu "[submenu] (${USERSTYLES}) {${STYLEMENUTITLE}}"
 -        append "[stylesdir] (~/.fluxbox/styles)"
-+    append_menu "[submenu] (Styles) {Select a Style}"
++    append_menu "[submenu] (Styles) (Select a Style)"
 +	append "[include] (/usr/share/fluxbox/menu.d/styles/)"
      append_menu_end
  
diff --git a/x11-wm/fluxbox/files/fluxbox.desktop b/x11-wm/fluxbox/files/fluxbox.desktop
index 1d7cd86cbc53..a8ed51a75abc 100644
--- a/x11-wm/fluxbox/files/fluxbox.desktop
+++ b/x11-wm/fluxbox/files/fluxbox.desktop
@@ -2,8 +2,8 @@
 Encoding=UTF-8
 Name=Fluxbox
 Comment=This session logs you into Fluxbox
-Exec=startfluxbox
-TryExec=startfluxbox
+Exec=fluxbox
+TryExec=fluxbox
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application
diff --git a/x11-wm/fluxbox/fluxbox-0.9.11.ebuild b/x11-wm/fluxbox/fluxbox-0.9.11.ebuild
index 76319cbfd22f..9fce0daf6724 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.11.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.11.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.11.ebuild,v 1.13 2005/07/09 17:08:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.11.ebuild,v 1.1 2004/12/06 22:20:17 ciaranm Exp $
 
 inherit eutils
 
-IUSE="nls xinerama truetype kde gnome bigger-fonts disablexmb"
+IUSE="nls xinerama truetype kde gnome bigger-fonts"
 
 DESCRIPTION="Fluxbox is an X11 window manager featuring tabs and an iconbar"
 SRC_URI="mirror://sourceforge/fluxbox/${P}.tar.bz2"
@@ -25,7 +25,7 @@ PROVIDE="virtual/blackbox"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="x86 ppc sparc amd64 alpha hppa ~ia64 mips ppc64 ~ppc-macos"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips ~ppc64 ~ppc-macos"
 
 src_unpack() {
 	unpack ${A}
@@ -43,13 +43,8 @@ src_unpack() {
 	epatch ${FILESDIR}/0.9.10/${PN}-0.9.10-fancy-gentoo-styledirs.patch
 
 	# Add in the Gentoo -r number to fluxbox -version output.
-	if [[ "${PR}" == "r0" ]] ; then
-		suffix="gentoo"
-	else
-		suffix="gentoo-${PR}"
-	fi
 	sed -i \
-		-e "s~\(__fluxbox_version .@VERSION@\)~\1-${suffix}~" \
+		-e "s~\(__fluxbox_version .@VERSION@\)~\1-gentoo${PR:+-${PR}}~" \
 		version.h.in || die "version sed failed"
 
 	# Use a less fugly default theme
@@ -67,11 +62,9 @@ src_unpack() {
 		[[ -f "${style}" ]] || die "waah! ${style} doesn't exist"
 
 		# Make fonts more readable if we use bigger-fonts
-		if use bigger-fonts 1>/dev/null ; then
-			sed -i \
-				-e 's~\([fF]ont:[ \t]\+[a-zA-Z]\+-\)[789]~\110~' \
-				${style} || die "sed voodoo failed (insufficient goats?)"
-		fi
+		use bigger-fonts 1>/dev/null && ( sed -i \
+			-e 's~\([fF]ont:[ \t]\+[a-zA-Z]\+-\)[789]~\110~' \
+			${style} || die "sed voodoo failed (insufficient goats?)" )
 
 		# We don't have a reliable sans font alias, change it to lucidasans.
 		# That might not work either, but it's more likely...
@@ -86,12 +79,11 @@ src_compile() {
 	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
 
 	econf \
-		$(use_enable nls) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
-		$(use_enable kde) \
-		$(use_enable gnome) \
-		$(use_enable !disablexmb xmb) \
+		`use_enable nls` \
+		`use_enable xinerama` \
+		`use_enable truetype xft` \
+		`use_enable kde` \
+		`use_enable gnome` \
 		--sysconfdir=/etc/X11/${PN} \
 		${myconf} || die "configure failed"
 
@@ -101,7 +93,7 @@ src_compile() {
 src_install() {
 	dodir /usr/share/fluxbox
 	make DESTDIR=${D} install || die "make install failed"
-	dodoc README* AUTHORS TODO* COPYING ChangeLog NEWS
+	dodoc README* AUTHORS TODO* COPYING
 
 	dodir /usr/share/xsessions
 	insinto /usr/share/xsessions
@@ -125,22 +117,22 @@ pkg_postinst() {
 	einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
 	einfo "handling styles in the menu. To take advantage of this, use"
 	einfo "the following for your menu styles section:"
-	einfo
+	einfo " "
 	einfo "    [submenu] (Styles) {Select a Style}"
 	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
 	einfo "    [end]"
-	einfo
+	einfo " "
 	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
 	einfo "menu file, this will already be present."
-	einfo
+	einfo " "
 	if has_version '<x11-wm/fluxbox-0.9.10-r3' ; then
 		ewarn "You must restart fluxbox before using the [include] /directory/"
 		ewarn "feature if you are upgrading from an older fluxbox!"
-		ewarn
+		ewarn " "
 	fi
-	ewarn "Be warned that anything involving XComposite is extremely"
-	ewarn "experimental. Please don't report bugs unless they also occur"
+	ewarn "Be warned that anything involving XComposite is extremely "
+	ewarn "experimental. Please don't report bugs unless they also occur "
 	ewarn "with XComposite disabled."
-	ewarn
+	ewarn " "
 	epause
 }
diff --git a/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild
index 917fc445d555..dc2ec80f34ed 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild,v 1.9 2005/07/09 17:08:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.12-r1.ebuild,v 1.1 2005/01/24 18:50:37 ciaranm Exp $
 
 inherit eutils
 
@@ -28,7 +28,7 @@ PROVIDE="virtual/blackbox"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="x86 ppc sparc amd64 alpha hppa ia64 ~mips ppc64 ~ppc-macos"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips ~ppc64 ~ppc-macos"
 
 src_unpack() {
 	unpack ${A}
@@ -135,18 +135,18 @@ pkg_postinst() {
 	einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
 	einfo "handling styles in the menu. To take advantage of this, use"
 	einfo "the following for your menu styles section:"
-	einfo
+	einfo " "
 	einfo "    [submenu] (Styles) {Select a Style}"
 	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
 	einfo "    [end]"
-	einfo
+	einfo " "
 	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
 	einfo "menu file, this will already be present."
-	einfo
+	einfo " "
 	if has_version '<x11-wm/fluxbox-0.9.10-r3' ; then
 		ewarn "You must restart fluxbox before using the [include] /directory/"
 		ewarn "feature if you are upgrading from an older fluxbox!"
-		ewarn
+		ewarn " "
 	fi
 	einfo "If you experience font problems, or if fluxbox takes a very"
 	einfo "long time to start up, please try the 'disablexmb' USE flag."
diff --git a/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild
index fd10e8c03a63..aede2eeac61d 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild,v 1.11 2005/08/23 22:01:55 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.13-r1.ebuild,v 1.1 2005/05/23 09:32:19 ciaranm Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ PROVIDE="virtual/blackbox"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 hppa ia64 mips ppc ~ppc-macos ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 
 src_unpack() {
 	unpack ${A}
@@ -109,17 +109,17 @@ pkg_postinst() {
 	einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
 	einfo "handling styles in the menu. To take advantage of this, use"
 	einfo "the following for your menu styles section:"
-	einfo
+	einfo " "
 	einfo "    [submenu] (Styles) {Select a Style}"
 	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
 	einfo "    [end]"
-	einfo
+	einfo " "
 	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
 	einfo "menu file, this will already be present."
-	einfo
+	einfo " "
 	ewarn "Note that menumaker and similar utilities do *not* support"
 	ewarn "this out of the box."
-	einfo
+	einfo " "
 	einfo "If you experience font problems, or if fluxbox takes a very"
 	einfo "long time to start up, please try the 'disablexmb' USE flag."
 	einfo "If that fails, please report bugs upstream."
diff --git a/x11-wm/fluxbox/fluxbox-0.9.13.ebuild b/x11-wm/fluxbox/fluxbox-0.9.13.ebuild
index 251cc78cbfac..dd31b9ee56d1 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.13.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.13.ebuild,v 1.3 2005/07/09 17:08:12 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.13.ebuild,v 1.1 2005/05/14 02:30:26 ciaranm Exp $
 
 inherit eutils
 
@@ -106,17 +106,19 @@ pkg_postinst() {
 	einfo "As of fluxbox 0.9.10-r3, we are using an improved system for"
 	einfo "handling styles in the menu. To take advantage of this, use"
 	einfo "the following for your menu styles section:"
-	einfo
+	einfo " "
 	einfo "    [submenu] (Styles) {Select a Style}"
 	einfo "        [include] (/usr/share/fluxbox/menu.d/styles/)"
 	einfo "    [end]"
-	einfo
+	einfo " "
 	einfo "If you use fluxbox-generate_menu or the default global fluxbox"
 	einfo "menu file, this will already be present."
-	einfo
-	ewarn "Note that menumaker and similar utilities do *not* support"
-	ewarn "this out of the box."
-	einfo
+	einfo " "
+	if has_version '<x11-wm/fluxbox-0.9.10-r3' ; then
+		ewarn "You must restart fluxbox before using the [include] /directory/"
+		ewarn "feature if you are upgrading from an older fluxbox!"
+		ewarn " "
+	fi
 	einfo "If you experience font problems, or if fluxbox takes a very"
 	einfo "long time to start up, please try the 'disablexmb' USE flag."
 	einfo "If that fails, please report bugs upstream."
diff --git a/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild b/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild
index bd8d7dc30c11..d52d35e7e037 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild,v 1.7 2005/11/05 14:50:09 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.14-r1.ebuild,v 1.1 2005/09/23 01:40:02 ciaranm Exp $
 
 inherit eutils
 
@@ -26,7 +26,7 @@ PROVIDE="virtual/blackbox"
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="alpha amd64 hppa ~ia64 mips ppc ~ppc-macos ~ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-wm/fluxbox/fluxbox-0.9.9.ebuild b/x11-wm/fluxbox/fluxbox-0.9.9.ebuild
index 833f8d0f7b55..f810017d3599 100644
--- a/x11-wm/fluxbox/fluxbox-0.9.9.ebuild
+++ b/x11-wm/fluxbox/fluxbox-0.9.9.ebuild
@@ -1,8 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.9.ebuild,v 1.18 2005/01/02 18:21:50 hansmi Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fluxbox/fluxbox-0.9.9.ebuild,v 1.1 2004/04/26 11:05:52 ciaranm Exp $
 
 IUSE="nls xinerama truetype kde gnome"
 
@@ -12,27 +10,18 @@ HOMEPAGE="http://www.fluxbox.org"
 
 # Please note that USE="kde gnome" simply adds support for
 # the respective protocols, and does not depend on external libraries.
+DEPEND=">=sys-devel/autoconf-2.52
+		${RDEPEND}"
 RDEPEND="virtual/x11
 	truetype? ( media-libs/freetype )
 	nls? ( sys-devel/gettext )"
-DEPEND=">=sys-devel/autoconf-2.52
-		${RDEPEND}"
 PROVIDE="virtual/blackbox"
 
 SLOT="0"
-LICENSE="MIT"
-KEYWORDS="x86 ppc sparc amd64 alpha hppa ~ia64 mips ppc64 ppc-macos"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	# upstream tell us we probably want to apply this if there's any chance
-	# anyone will ever try to compile using gcc 3.4.
-	epatch ${FILESDIR}/${PN}-0.9.9-gcc3.4.patch
-}
+LICENSE="as-is"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64 ~alpha ~hppa ~ia64 ~mips"
 
 src_compile() {
-	export PKG_CONFIG_PATH=/usr/X11R6/lib/pkgconfig:/usr/lib/pkgconfig
 	econf \
 		`use_enable nls` \
 		`use_enable xinerama` \
diff --git a/x11-wm/fluxbox/metadata.xml b/x11-wm/fluxbox/metadata.xml
index df03d1f3fcba..682bce3394bf 100644
--- a/x11-wm/fluxbox/metadata.xml
+++ b/x11-wm/fluxbox/metadata.xml
@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>commonbox</herd>
-	<longdescription>
-	Fluxbox is yet another windowmanager for X.
-	It's based on the Blackbox 0.61.1 code. Fluxbox looks like blackbox and 
-	handles styles, colors, window placement and similar thing exactly like 
-	blackbox (100% theme/style compability).
-	</longdescription>
+<herd>commonbox</herd>
 </pkgmetadata>
diff --git a/x11-wm/flwm/ChangeLog b/x11-wm/flwm/ChangeLog
index 39918c86a532..8374bbf38715 100644
--- a/x11-wm/flwm/ChangeLog
+++ b/x11-wm/flwm/ChangeLog
@@ -1,36 +1,6 @@
 # ChangeLog for x11-wm/flwm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.10 2005/05/10 09:32:47 dholm Exp $
-
-  10 May 2005; David Holm <dholm@gentoo.org> flwm-1.00-r4.ebuild:
-  Added to ~ppc.
-
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> flwm-1.00-r4.ebuild:
-  Stable on amd64.
-
-  24 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> -flwm-1.00-r2.ebuild,
-  -flwm-1.00-r3.ebuild, flwm-1.00-r4.ebuild:
-  Changed x11-base/xfree to virtual/x11; bug #60787. Integrated into
-  one ebuild.
-
-  07 May 2004; Brandon Hale <tseng@gentoo.org> flwm-1.00-r2.ebuild,
-  flwm-1.00-r3.ebuild, flwm-1.00-r4.ebuild:
-  Remove S=
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> flwm-1.00-r4.ebuild:
-  Add inherit eutils
-
-*flwm-1.00-r4 (15 Jul 2003)
-
-  15 Jul 2003; Heinrich Wendel <lanius@gentoo.org> flwm-1.00-r4.ebuild,
-  files/fltk1.1.patch:
-  patch for fltk 1.1
-
-*flwm-1.00-r3 (12 Aug 2002)
-
-  12 Aug 2002; Seemant Kulleen <seemant@gentoo.org> flwm-1.00-r3.ebuild :
-
-  Made it depend explicitly on fltk-1.0
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
 *flwm-1.00-r2 (1 Feb 2002)
 
diff --git a/x11-wm/flwm/Manifest b/x11-wm/flwm/Manifest
index 0f3364ca5415..e69de29bb2d1 100644
--- a/x11-wm/flwm/Manifest
+++ b/x11-wm/flwm/Manifest
@@ -1,5 +0,0 @@
-MD5 c1a03bc77b5227cf1769fe650b8dcad7 ChangeLog 1538
-MD5 30933394c20b0f292a72e514a1ad763a flwm-1.00-r4.ebuild 1783
-MD5 70b93a47cb23b5eec6774b7dbc9ad702 metadata.xml 330
-MD5 bcffe93a535c096964afbd7e789560d5 files/digest-flwm-1.00-r4 57
-MD5 153d0f044aec18fbaa1ea5a6ca417551 files/fltk1.1.patch 376
diff --git a/x11-wm/flwm/flwm-1.00-r4.ebuild b/x11-wm/flwm/flwm-1.00-r4.ebuild
index f6a78cdb315c..fff9da605609 100644
--- a/x11-wm/flwm/flwm-1.00-r4.ebuild
+++ b/x11-wm/flwm/flwm-1.00-r4.ebuild
@@ -1,27 +1,26 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.00-r4.ebuild,v 1.9 2005/05/10 09:32:47 dholm Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/flwm/flwm-1.00-r4.ebuild,v 1.1 2003/07/15 14:50:40 lanius Exp $
 
 IUSE="opengl"
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A lightweight window manager based on fltk"
 SRC_URI="http://flwm.sourceforge.net/${P}.tgz"
 HOMEPAGE="http://flwm.sourceforge.net"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc amd64"
+KEYWORDS="~x86 -ppc"
 
 
-DEPEND="virtual/x11
-	>=x11-libs/fltk-1.0
+DEPEND=">=x11-base/xfree-4.0.1
+	>=x11-libs/fltk-1.1*
 	opengl? ( virtual/opengl )"
 
 	#Configuration of the appearance and behavior of flwm
-	#must be done at compile time, i.e. there is
-	#no .flwmrc file or interactive configuring while
+	#must be done at compile time, i.e. there is 
+	#no .flwmrc file or interactive configuring while 
 	#running. To quote the man page, "gcc is your friend,"
 	#so this type of configuration must be done at compile
 	#time by editing the config.h file.  I can't see any
@@ -30,28 +29,23 @@ DEPEND="virtual/x11
 	#and edit the config.h to their liking.
 
 src_compile() {
-
+    
 	use opengl && export X_EXTRA_LIBS=-lGL
+	
+	export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.1"
+	export LIBS="-L/usr/lib/fltk-1.1"
 
-	if has_version '>=x11-libs/fltk-1.1' ; then
-		export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.1"
-		export LIBS="-L/usr/lib/fltk-1.1"
-
-		epatch ${FILESDIR}/fltk1.1.patch
-	else	# fltk-1.0
-		export CXXFLAGS="${CXXFLAGS} -I/usr/include/fltk-1.0"
-		export LIBS="-L/usr/lib/fltk-1.0"
-	fi
-
+	epatch ${FILESDIR}/fltk1.1.patch
+	
 	econf || die
 	make || die
 }
 
 src_install() {
-
+    
 	doman flwm.1
 	dodoc README flwm_wmconfig
-
+    
 	into /usr
 	dobin flwm
 }
diff --git a/x11-wm/fvwm/ChangeLog b/x11-wm/fvwm/ChangeLog
index c8e2ec103b14..850388fed779 100644
--- a/x11-wm/fvwm/ChangeLog
+++ b/x11-wm/fvwm/ChangeLog
@@ -1,486 +1,6 @@
 # ChangeLog for x11-wm/fvwm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.101 2005/09/21 08:28:01 taviso Exp $
-
-*fvwm-2.5.14 (21 Sep 2005)
-
-  21 Sep 2005; Tavis Ormandy <taviso@gentoo.org> +fvwm-2.5.14-r1.ebuild,
-  -fvwm-2.5.14.ebuild:
-  remove gtk2 flag #106560
-
-  28 Aug 2005; Tavis Ormandy <taviso@gentoo.org> :
-  bump, use -fno-strict-aliasing as recommended by upstream.
-
-  19 Jul 2005; Tavis Ormandy <taviso@gentoo.org>
-  -files/fvwm-2.5.10-FvwmCommand.diff, -files/fvwm-2.5.10-Test-update.diff,
-  -files/fvwm-2.5.10-mips-compat.diff, -files/fvwm-2.5.10-post-release.diff,
-  -files/fvwm-iconman.diff, -files/fvwmtabs-2.8-insecure-tmp-handling.diff,
-  -files/iconfile-2.5.10.diff, -fvwm-2.5.13.ebuild:
-  remove stale patches
-
-*fvwm-2.5.13-r1 (19 Jul 2005)
-
-  19 Jul 2005; Tavis Ormandy <taviso@gentoo.org>
-  +files/fvwm-64bit-fixes.diff.gz, +files/fvwm-noxbell-grab-fail.diff,
-  +fvwm-2.5.13-r1.ebuild:
-  include 64bit cleanliness patch.
-  disable XBell() on grab fail.
-
-*fvwm-2.5.13 (17 Jul 2005)
-
-  17 Jul 2005; Tavis Ormandy <taviso@gentoo.org> +fvwm-2.5.13.ebuild:
-  bump
-
-  07 Jul 2005; Tavis Ormandy <taviso@gentoo.org> :
-  remove stale ebuilds
-
-  06 Jun 2005; Markus Rothe <corsair@gentoo.org> fvwm-2.5.12.ebuild:
-  Stable on ppc64
-
-  30 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> fvwm-2.5.12.ebuild:
-  Stable on ia64.
-
-  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> fvwm-2.5.12.ebuild:
-  Stable on ppc.
-
-  17 Feb 2005; Karol Wojtaszek <sekretarz@gentoo.org> fvwm-2.5.12.ebuild:
-  Stable on amd64
-
-  13 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> fvwm-2.5.12.ebuild:
-  Stable on alpha.
-
-  09 Feb 2005; Bryan Østergaard <kloeri@gentoo.org> fvwm-2.5.12.ebuild:
-  ~alpha keyword.
-
-  03 Jan 2005; Gustavo Zacarias <gustavoz@gentoo.org> fvwm-2.5.12.ebuild:
-  Stable on sparc
-
-  31 Dec 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.12.ebuild:
-  2.5.12 stable on x86
-
-  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  11 Dec 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.12.ebuild:
-  minor updates
-
-  07 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> fvwm-2.5.10-r5.ebuild:
-  -fPIC is no longer needed on alpha.
-
-  19 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> fvwm-2.4.18.ebuild,
-  fvwm-2.5.10-r3.ebuild, fvwm-2.5.10-r5.ebuild, fvwm-2.5.10-r6.ebuild,
-  fvwm-2.5.12.ebuild:
-  Block x11-wm/metisse; bug #66374.
-
-  16 Oct 2004; Mike Frysinger <vapier@gentoo.org> fvwm-2.4.18.ebuild,
-  fvwm-2.5.10-r3.ebuild, fvwm-2.5.10-r5.ebuild, fvwm-2.5.10-r6.ebuild,
-  fvwm-2.5.12.ebuild:
-  Fix stupid dependency on sys-libs/libtermcap-compat (i.e. remove it) #64212.
-
-*fvwm-2.5.12 (06 Oct 2004)
-
-  06 Oct 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.11.ebuild,
-  +fvwm-2.5.12.ebuild:
-  new (mainly bugfix) release, replaces 2.5.11.
-
-  05 Oct 2004; Jason Wever <weeve@gentoo.org> fvwm-2.5.11.ebuild:
-  Added ~sparc keyword.
-
-*fvwm-2.5.11 (30 Sep 2004)
-
-  30 Sep 2004; Tavis Ormandy <taviso@gentoo.org> +fvwm-2.5.11.ebuild:
-  new version of fvwm, and FvwmTabs.
-
-*fvwm-2.5.10-r7 (08 Sep 2004)
-
-  08 Sep 2004; Tavis Ormandy <taviso@gentoo.org> -files/acinclude.m4,
-  -files/fvwm-2.5.10-fvwmbuttonshover.diff,
-  +files/fvwm-2.5.10-fvwmbuttonshover.diff.gz,
-  +files/fvwm-2.5.10-long-data-elements.diff, fvwm-2.5.10-r6.ebuild,
-  +fvwm-2.5.10-r7.ebuild, -fvwm-2.5.7-r5.ebuild:
-  64bit fix, remove outdated ebuild.
-
-  31 Jul 2004; Tom Gall <tgall@gentoo.org>  fvwm-2.5.10-r6.ebuild:
-  stable on ppc64, bug #57040
-
-*fvwm-2.5.10-r6 (10 Jul 2004)
-
-  10 Jul 2004; Tavis Ormandy <taviso@gentoo.org>
-  +files/fvwm-2.5.10-fvwmbuttonshover.diff, +fvwm-2.5.10-r6.ebuild:
-  adding fvwmbuttons patch from cvs
-
-  07 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> fvwm-2.5.10-r3.ebuild:
-  Stable on alpha.
-
-*fvwm-2.5.10-r4 (28 Jun 2004)
-
-  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> fvwm-2.5.10-r3.ebuild,
-  fvwm-2.5.10-r4.ebuild, fvwm-2.5.10-r5.ebuild, fvwm-2.5.7-r5.ebuild,
-  fvwm-2.5.8-r6.ebuild:
-  sync IUSE (+nosm, +noxpm, -cjk)
-
-*fvwm-2.5.10-r5 (20 Jun 2004)
-
-  20 Jun 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10-r5.ebuild:
-  new FvwmTabs release, two patches from cvs
-
-  06 Jun 2004; Jason Wever <weeve@gentoo.org> fvwm-2.5.10-r3.ebuild:
-  Stable on sparc.
-
-  29 May 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10-r3.ebuild:
-  marking -r3 stable on x86, added -r4 which adds two patches from cvs, 
-  a bugfix for FvwmCommand, and an update to the Test () Syntax.
-
-  28 May 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10-r1.ebuild,
-  fvwm-2.5.10-r2.ebuild:
-  remove old ebuilds
-
-*fvwm-2.5.10-r3 (24 May 2004)
-
-  24 May 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10-r3.ebuild:
-  fvwm-menu-xlock incorrectly called xlock.
-
-*fvwm-2.5.10-r2 (20 Apr 2004)
-
-  20 Apr 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10-r2.ebuild,
-  files/fvwm-2.5.10-mips-compat.diff:
-  new release of FvwmTabs, patch for mips compatability.
-
-  30 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.17.ebuild,
-  fvwm-2.4.18.ebuild, fvwm-2.5.10.ebuild, fvwm-2.5.8-r4.ebuild,
-  fvwm-2.5.8-r6.ebuild, fvwm-2.5.9.ebuild:
-  removing stale ebuilds
-  mark 2.4.18 stable for those who prefer the 2.4.x branch
-
-*fvwm-2.5.10-r1 (30 Mar 2004)
-
-  30 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10-r1.ebuild,
-  files/fvwm-2.5.10-post-release.diff:
-  new release of FvwmTabs, which fixes the tmp file handling problem.
-  extracted some patches from cvs which fix issues reported since the
-  release, including a problem with FvwmTaskBar and multiple rows
-  , inconsistencies in variable names in the FvwmButtons man page,
-  and a problem with the BackingStore style.
-
-*fvwm-2.5.8-r6 (20 Mar 2004)
-
-  20 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10.ebuild,
-  fvwm-2.5.8-r5.ebuild, fvwm-2.5.8-r6.ebuild,
-  files/fvwm-2.5.8-fvwm-bug-security.diff:
-  adding fvwm-bug security fix to stable fvwm.
-
-*fvwm-2.5.10 (19 Mar 2004)
-*fvwm-2.4.18 (19 Mar 2004)
-
-  19 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.10.ebuild,
-  fvwm-2.4.18.ebuild:
-  new releases from both development branches.
-
-  minor security related problems have been fixed in these
-  release, (predicatble (pid based) temp files used in fvwm-bug)
-
-  16 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.9.ebuild:
-  ensure FvwmGtk gets a man page.
-  clean up some old ebuilds.
-
-*fvwm-2.5.9 (02 Mar 2004)
-
-  02 Mar 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.9.ebuild,
-  files/fvwm-2.5.9-translucent-menus.diff.gz:
-  new fvwm and FvwmTabs release, some patches have been reworked to apply.
-  no longer depend on netpbm.
-  iconv support is optional, so disable it with -nls.
-
-  28 Feb 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r5.ebuild:
-  stable on alpha and x86
-
-  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> fvwm-2.5.8-r5.ebuild:
-  Stable on sparc!
-
-  17 Feb 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r5.ebuild,
-  files/fvwm-2.5.8-flickeringmoveworkaround.diff:
-  patch from cvs.
-
-*fvwm-2.5.8-r5 (16 Feb 2004)
-
-  16 Feb 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r5.ebuild,
-  files/fvwm-2.5.8-iconfile.diff:
-  patch from cvs
-
-*fvwm-2.5.8-r4 (08 Feb 2004)
-
-  08 Feb 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r3.ebuild,
-  fvwm-2.5.8-r4.ebuild:
-  marking 2.5.8-r3 stable on x86 and alpha, adding -r4 minor 
-  update to FvwmTabs.
-
-  01 Feb 2004; Jon Portnoy <avenj@gentoo.org> fvwm-2.5.8-r3.ebuild :
-  AMD64 keywords.
-
-  13 Jan 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.17.ebuild,
-  fvwm-2.5.7-r5.ebuild, fvwm-2.5.8-r2.ebuild, fvwm-2.5.8-r3.ebuild,
-  files/fvwm-2.5.8-FvwmScript-Quit-reboot.diff:
-  typo
-
-*fvwm-2.5.8-r3 (12 Jan 2004)
-
-  12 Jan 2004; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r3.ebuild,
-  files/fvwm-2.5.8-taskbar-margins.diff, files/fvwm-2.5.8-undermouse.diff,
-  files/fvwm-iconman.diff:
-  adding two new patches from #37079
-  adding a patch from cvs to fix taskbar margins
-  revision bump
-
-  11 Dec 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r2.ebuild,
-  files/fvwm-2.5.8-fvwm-menu-directory-security.diff:
-  minor patch for fvwm-menu-directory, newlines confuse it.
-
-  11 Dec 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r2.ebuild:
-  stable
-
-  28 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r2.ebuild:
-  remove icc, clean DEPEND.
-
-*fvwm-2.5.8-r2 (27 Nov 2003)
-
-  27 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r1.ebuild,
-  fvwm-2.5.8-r2.ebuild, fvwm-2.5.8.ebuild:
-  new FvwmTabs released, version bump.
-  removing some stale ebuilds.
-
-*fvwm-2.5.8-r1 (13 Nov 2003)
-
-  13 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8-r1.ebuild,
-  files/mini.happy.xpm:
-  new release of FvwmTabs, including a default dnd icon.
-  version bump.
-
-  11 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8.ebuild:
-  --enable-multibyte is no longer optional, removed cjk from IUSE.
-
-  11 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8.ebuild,
-  files/fvwmtabs-insecure-tmp-handling.diff:
-  make fvwmtabs save state files to home directory, rather than /tmp.
-  see ebuild comments.
-
-  07 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8.ebuild:
-  append-flags -fPIC on alpha.
-
-  03 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8.ebuild:
-  set FVWM_BUGADDR.
-
-  03 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8.ebuild:
-  gnome libraries are not much use without FvwmGtk.
-
-  02 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8.ebuild:
-  inherit eutils, gnuconfig no longer required.
-
-*fvwm-2.5.8 (01 Nov 2003)
-
-  01 Nov 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.8.ebuild,
-  files/disable-debug-statements.diff, files/fvwm-translucent-menus.diff.gz:
-  new fvwm development release 2.5.8, and new FvwmTabs 2.4.
-  i've included two patches, one enables fast translucent menus, the other
-  disables some noisy debug statements.
-
-  31 Oct 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r5.ebuild:
-  stable.
-
-*fvwm-2.5.7-r5 (20 Oct 2003)
-
-  20 Oct 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r5.ebuild:
-  new release of FvwmTabs, with some new configuration options.
-
-*fvwm-2.5.7-r4 (18 Oct 2003)
-
-  18 Oct 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r4.ebuild:
-  new FvwmTabs released which fixes a focus race condition. FvwmTabs now
-  includes a man page.
-
-  13 Oct 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.16-r1.ebuild,
-  fvwm-2.4.16.ebuild, fvwm-2.4.17.ebuild, fvwm-2.4.8.ebuild,
-  fvwm-2.5.7-r2.ebuild, fvwm-2.5.7-r3.ebuild:
-  
-  marking 2.5.7-r3 stable, it is a release from the development branch, but has
-  proven stable in practice and has some important internationalisation 
-  features (among other things) missing from the stable branch.
-
-  2.4.17 is also stable, and will be maintained in portage for those who 
-  prefer it.
-
-  removing stale ebuilds.
-
-*fvwm-2.5.7-r3 (11 Oct 2003)
-*fvwm-2.4.17 (11 Oct 2003)
-
-  11 Oct 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.17.ebuild,
-  fvwm-2.5.7-r3.ebuild:
-  new release from stable branch
-  New release of FvwmTabs, requiring X11-Protocol-0.51-r1
-
-  07 Oct 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r2.ebuild,
-  metadata.xml:
-  update metadata longdescription from fvwm.lsm
-
-  adding some extra documentation, examples and scripts from
-  utils directory.
-
-  apparently it annoys some developers if KEYWORDS is not in order,
-  so they are now in order, as dictated by arch.list :)
-
-  17 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r2.ebuild:
-  apparently noxpm and nosm are confusing, removing them from IUSE.
-  only fix Xft detection if USE="truetype"
-  changin some of the informational messages to use ebegin/eend.
-  print out a message indicatind imlib/gtk errors are normal if USE="-gtk -imlib"
-
-  15 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r1.ebuild,
-  fvwm-2.5.7.ebuild:
-  cleaning up old ebuilds.
-
-  14 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r2.ebuild:
-  tweaking postinst messages.
-
-  03 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r2.ebuild:
-  fvwm-convert-2.6 is a script to updated .fvwm2rc files, but is currently 
-  just a stub, as the format has not yet been finalised. This update
-  removes the script and manpage.
-  fvwm-convert-2.2 was used to update from the old 1.x format, it is no longer
-  distributed, but still has a manpage, ive removed it.
-
-  02 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r2.ebuild:
-  Packaged FvwmTabs into a tarball with version information, as FvwmTabs author
-  just overwrites existing URL with updated version.
-
-  01 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r2.ebuild:
-  changed the postinst blurb.
-
-*fvwm-2.5.7-r2 (01 Sep 2003)
-
-  01 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r2.ebuild:
-  Three new USE flags, 
-  	noxpm - Disable support for XPM Images, for people who 
-  		only use png images, or prefer solid colour/gradiant/etc.
-  	nosm - Disable session management support, for users who 
-  		never use session managers (xsm, for example)
-  	truetype - Allows users to toggle Xft support.
-  Adding /usr/share/icons/fvwm to the default ImagePath.
-  Some minor tweaks to the toolkit options, so that -gtk also removes gtk2
-  support, as reccommended.
-  
-  The new USE flags mean only XRender, SHM and Shaped Windows are left to 
-  the configure script to decide, which i suspect everybody will want unless
-  support isnt available, which the configure script will deduce automatically.
-
-  01 Sep 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r1.ebuild:
-  gtk2 wasnt in IUSE.
-
-*fvwm-2.5.7-r1 (05 Aug 2003)
-
-  05 Aug 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7-r1.ebuild, files/fvwm2:
-  Adding fvwm-2.5.7-r1, which fixes:
-  	bad xpmroot manpage (fixed with a call to prepallman)
-	dependencies missing for perllib toolkit bindings (gtk2/tcltk/gtk)
-	Remove useless fvwm-perllib script of perllib isnt installed
-  And adds:
-  	Including some developer documentation with USE="doc"
-	If tcltk and perl USE flags are set, install the 3rd Party FvwmTabs module
-	USE="debug" turns on debug mesages, and command logging.
- 
-  Currently masked.
-
-  04 Aug 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7.ebuild:
-  reported working on sparc.
-
-  03 Aug 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.16-r1.ebuild:
-  marking stable.
-
-  31 Jul 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7.ebuild:
-  imlib USE flag
-
-  31 Jul 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7.ebuild:
-  Re-written ebuild to take full advantage of all the optional features
-  available. As this is a dramatic change to how the gentoo FVWM ebuilds work,
-  I've added warning messages to the pkg_postinst().
-
-  Adding ncurses USE flag, if USE="readline ncurses" FvwmConsole links with
-  ncurses, with USE="readline -ncurses" it links with and depends on 
-  libtermcap.
-  
-*fvwm-2.5.7 (30 Jul 2003)
-
-  30 Jul 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.5.7.ebuild:
-  Imported fvwm-2.5.7 from the Unstable branch, available to unstable users.
-  Some Excellent new features available (Xft, Alpha blending, etc)
-
-*fvwm-2.4.16-r1 (31 Jul 2003)
-
-  31 Jul 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.16-r1:
-  Backporting the new ebuild to 2.4.x
-
-*fvwm-2.4.16 (06 Jul 2003)
-
-  06 Jul 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.16.ebuild:
-  build bombs out if a comma is in CFLAGS, replaced with !'s.
-
-  03 Jul 2003; Tavis Ormandy <taviso@gentoo.org> fvwm-2.4.7-r1.ebuild:
-  new release, now includes rplay support.
-
-*fvwm-2.4.15 (13 Feb 2003)
-
-  13 Feb 2003; Aron Griffis <agriffis@gentoo.org> fvwm-2.4.15.ebuild :
-  Update to 2.4.15 (bug #14529) and add ~alpha
-
-  19 Dec 2002; Dean Bailey <alron@gentoo.org> : removed sparc64 keyword
-
-*fvwm-2.4.14 (10 Dec 2002)
-
-  10 Dec 2002; Matt Keadle <mkeadle@gentoo.org> fvwm-2.4.14.ebuild
-  files/digest-fvwm-2.4.14 :
-
-  Bump to latest stable. Thanks to Thomas Preissler for providing the ebuild
-  in bug #11768
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*fvwm-2.4.8 (12 Aug 2002)
-
-  12 Aug 2002; Seemant Kulleen <seemant@gentoo.org> fvwm-2.4.8.ebuild
-  files/digest-fvwm-2.4.8 files/fvwm2 :
-
-  Moved the fvwm2 script into a dynamic thing within the ebuild.  Made a big
-  bz2ball of the patches to be applied to the source.  Version bump and
-  patches from: matt@zigg.com (Matt Behrens) in bug #5886
-
-*fvwm-2.4.7-r1 (26 May 2002)
-
-  26 May 2002; Seemant Kulleen <seemant@gentoo.org> fvwm-2.4.7-r1.ebuild
-  files/digest-fvwm-2.4.7-r1 :
-
-  Tristan pointed me to a patch which prettifies the window dressings.  The
-  code is already in fvwm's developmental (2.5.x) branch, but a patch has
-  been made for this release as well.
-
-*fvwm-2.4.7 (26 May 2002)
-
-  26 May 2002; Seemant Kulleen <seemant@gentoo.org> fvwm-2.4.7.ebuild
-  files/digest-fvwm-2.4.7 :
-
-  Version bump thanks to T.Henderson@cs.ucl.ac.uk (Tristan Henderson) in bug
-  #2951
-
-*fvwm-2.4.3-r1 (14 Apr 2002)
-
-  14 Apr 2002; Seemant Kulleen <seemant@gentoo.org> fvwm-2.4.3-r1.ebuild :
-
-  Cleaned up a little.
-
-*fvwm-2.4.3-r1 (14 Feb 2002)
-
-  14 Feb 2002; Dan Armak <danarmak@gentoo.org> ChangeLog :
-  
-  Added /etc/X11/Sessions/fvwm, which adds fvwm to the auto-generated session
-  list in kdm and gdm.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
 *fvwm-2.4.3 (1 Feb 2002)
 
diff --git a/x11-wm/fvwm/Manifest b/x11-wm/fvwm/Manifest
index 1d62a88e52b6..e69de29bb2d1 100644
--- a/x11-wm/fvwm/Manifest
+++ b/x11-wm/fvwm/Manifest
@@ -1,18 +0,0 @@
-MD5 cfc37d7eb6be1a5a71178973ca1a2e3f fvwm-2.5.13-r1.ebuild 7864
-MD5 d4ad99d2edb49ee23de8acb401f8ba0c fvwm-2.5.12.ebuild 8960
-MD5 0dcc3be54b816d4ff673d76643c45034 fvwm-2.5.14-r1.ebuild 7555
-MD5 0419a9580abd2c13c81c889161d02fea ChangeLog 17683
-MD5 4833e4d0685ef48988c0c5c4f9c6b377 metadata.xml 527
-MD5 ba8d61baf42b7f21be2488b3581ff51d fvwm-2.4.18.ebuild 2956
-MD5 d91fb7d2af57653fc93a70e6e1c0a0ea files/fvwm-menu-xlock-xlockmore-compat.diff 550
-MD5 e2ceb5d855c5406a09d82442196efad8 files/README.transluceny.gz 5788
-MD5 7d84c8175928d331e6d7b253679f5654 files/digest-fvwm-2.4.18 65
-MD5 c8fa1c05cdae43bd53f68942d684f23a files/digest-fvwm-2.5.12 209
-MD5 a580b9f394262307f85eae492bbd68d9 files/centerplacement-2.5.10.diff 2431
-MD5 38cb0131791d07053b5d90bf21d1993f files/fvwm-translucent-menus.diff.gz 3582
-MD5 0dc5ddac8cf6767f4a753feef77e6c65 files/fvwm-noxbell-grab-fail.diff 360
-MD5 20d3c9bb419ce71c80fd25fd85364a45 files/fvwm-64bit-fixes.diff.gz 12220
-MD5 326a3b450dd43ec75b78fd0058026a3b files/digest-fvwm-2.5.13-r1 209
-MD5 f3538419cf078abb6adb941ee864fbd2 files/digest-fvwm-2.5.14-r1 209
-MD5 e9263b93f666293d0a1220ea3457efcd files/mini.happy.xpm 425
-MD5 df03a10a40a620ce8f1fab75f9758884 files/disable-debug-statements.diff 419
diff --git a/x11-wm/fvwm/fvwm-2.4.18.ebuild b/x11-wm/fvwm/fvwm-2.4.18.ebuild
index d826eba404a8..5cd95fdc03e7 100644
--- a/x11-wm/fvwm/fvwm-2.4.18.ebuild
+++ b/x11-wm/fvwm/fvwm-2.4.18.ebuild
@@ -1,20 +1,23 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.18.ebuild,v 1.9 2005/07/07 03:04:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.4.18.ebuild,v 1.1 2004/03/19 18:44:23 taviso Exp $
 
 inherit gnuconfig
 
-IUSE="cjk gnome gtk imlib readline rplay stroke xinerama"
+IUSE="readline ncurses gtk stroke gnome rplay xinerama cjk imlib"
 
+S=${WORKDIR}/${P}
 DESCRIPTION="an extremely powerful ICCCM-compliant multiple virtual desktop window manager"
 SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2"
 HOMEPAGE="http://www.fvwm.org/"
 
 SLOT="0"
-KEYWORDS="x86 alpha ppc sparc"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
 LICENSE="GPL-2 FVWM"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
+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 ) )
@@ -22,15 +25,13 @@ RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
 		rplay? ( >=media-sound/rplay-3.3.2 )
 		stroke? ( >=dev-libs/libstroke-0.4 )
 		>=dev-lang/perl-5.8.0
-		sys-apps/debianutils
 		virtual/x11"
 DEPEND="${RDEPEND}
-	>=sys-apps/sed-4
-	!x11-wm/metisse"
+	>=sys-apps/sed-4"
 
 src_unpack() {
 	unpack ${A}
-	gnuconfig_update
+	use alpha && gnuconfig_update
 
 	# CFLAGS containing comma will break this, so change it for !
 	sed -i 's#\x27s,xCFLAGSx,$(CFLAGS),\x27#\x27s!xCFLAGSx!$(CFLAGS)!\x27#' ${S}/utils/Makefile.am
@@ -45,7 +46,12 @@ src_compile() {
 	else
 		myconf="${myconf} --with-readline-library"
 
-		myconf="${myconf} --without-termcap-library"
+		# choose ncurses or termcap.
+		if use ncurses; then
+			myconf="${myconf} --without-termcap-library"
+		else
+			myconf="${myconf} --without-ncurses-library"
+		fi
 	fi
 
 	# fvwm configure doesnt provide a way to disable gtk support if the
@@ -107,3 +113,23 @@ src_install() {
 	docs/DEVELOPERS docs/FAQ docs/error_codes docs/color_combos docs/TODO \
 	docs/fvwm.lsm
 }
+
+pkg_postinst() {
+	ewarn
+	ewarn "The following features that you did not request are now"
+	ewarn "controlled via USE flags:"
+	use readline	|| ewarn "	Readline support in FvwmConsole [readline]"
+	use ncurses		|| ewarn "	Ncurses support in FvwmConsole [ncurses]"
+	use stroke		|| ewarn "	Mouse Gestures [stroke]"
+	use xinerama	|| ewarn "	Xinerama Support [xinerama]"
+	use cjk			|| ewarn "	Multibyte Character Support [cjk]"
+	use rplay		|| ewarn "	RPlay Support in FvwmEvent [rplay]"
+	use gtk			|| ewarn "	FvwmGTK (gtk+ support) [gtk]"
+	use imlib		|| ewarn "	FvwmGTK (GDK image support) [imlib]"
+	ewarn
+	ewarn "If you require any of the features listed above, you should remerge"
+	ewarn "FVWM with the appropriate USE flags. Use this command to see the flags"
+	ewarn "available:"
+	ewarn "	$ emerge -pv fvwm"
+	ewarn
+}
diff --git a/x11-wm/fvwm/fvwm-2.5.12.ebuild b/x11-wm/fvwm/fvwm-2.5.12.ebuild
index 93a4e00be61c..cb8e72774a6b 100644
--- a/x11-wm/fvwm/fvwm-2.5.12.ebuild
+++ b/x11-wm/fvwm/fvwm-2.5.12.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2005 Gentoo Foundation
+# 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.12.ebuild,v 1.14 2005/06/06 16:45:59 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/fvwm/fvwm-2.5.12.ebuild,v 1.1 2004/10/06 15:50:11 taviso 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"
-HOMEPAGE="http://www.fvwm.org/"
 SRC_URI="ftp://ftp.fvwm.org/pub/fvwm/version-2/${P}.tar.bz2
-	mirror://gentoo/fvwm-2.5.11-translucent-menus.diff.gz
-	perl? ( http://users.tpg.com.au/users/scottie7/FvwmTabs-v3.3.tar.gz	)"
+		mirror://gentoo/fvwm-2.5.11-translucent-menus.diff.gz
+		perl? ( http://users.tpg.com.au/users/scottie7/FvwmTabs-v3.3.tar.gz	)"
+HOMEPAGE="http://www.fvwm.org/"
 
-LICENSE="GPL-2 FVWM"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86"
-IUSE="bidi debug gtk gtk2 imlib nls perl png readline rplay stroke tcltk truetype xinerama"
+KEYWORDS="~x86 ~ppc64 ~ppc ~amd64 ~sparc"
+LICENSE="GPL-2 FVWM"
 
-RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
+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 ) )
+						>=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 )
@@ -34,7 +38,7 @@ RDEPEND="readline? ( >=sys-libs/readline-4.1 >=sys-libs/ncurses-5.3-r1 )
 # 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} dev-util/pkgconfig !x11-wm/metisse"
+DEPEND="${RDEPEND} dev-util/pkgconfig"
 
 SFT=${WORKDIR}/FvwmTabs-v3.3
 
@@ -49,7 +53,6 @@ src_unpack() {
 	# 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.
-	# XXX: incvs
 	cd ${S}; epatch ${FILESDIR}/disable-debug-statements.diff
 
 	if use perl; then
@@ -65,6 +68,9 @@ src_unpack() {
 	# fixing #51287, the fvwm-menu-xlock script is not compatible
 	# with the xlockmore implementation in portage.
 	cd ${S}; epatch ${FILESDIR}/fvwm-menu-xlock-xlockmore-compat.diff
+
+	# build fails on alpha with certain options without this.
+	use alpha && append-flags -fPIC
 }
 
 src_compile() {
@@ -80,7 +86,14 @@ src_compile() {
 	if ! use readline; then
 		myconf="${myconf} --without-readline-library"
 	else
-		myconf="${myconf} --with-readline-library --without-termcap-library"
+		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
@@ -94,7 +107,11 @@ src_compile() {
 			einfo "ATTN: You can safely ignore any imlib related configure errors."
 			myconf="${myconf} --with-imlib-prefix=${T}"
 		fi
-		myconf="${myconf} --without-gnome"
+		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
@@ -144,6 +161,7 @@ src_compile() {
 	# 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
@@ -153,6 +171,18 @@ src_compile() {
 		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"
 
@@ -259,7 +289,7 @@ pkg_postinst() {
 	fi
 	echo
 	einfo "If you have been using the 'ShowOnlyIcons never' syntax in"
-	einfo "FvwmIconMan, please update your configuration to use the new"
+	einfo "FvwmIconMan, please update your configuration to use the new "
 	einfo "officially supported 'ShowNoIcons' option."
 	echo
 	einfo "The FvwmButtons 'HoverIcon', 'HoverTitle' and 'HoverColorset'"
diff --git a/x11-wm/fvwm/metadata.xml b/x11-wm/fvwm/metadata.xml
index 0069c1df419e..44daac2bbd50 100644
--- a/x11-wm/fvwm/metadata.xml
+++ b/x11-wm/fvwm/metadata.xml
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-wm</herd>
+<herd>no-herd</herd>
 <maintainer>
   <email>taviso@gentoo.org</email>
   <name>Tavis Ormandy</name>
 </maintainer>
 <longdescription>
-fvwm is an ICCCM-compliant X window manager providing a 3D look for window decorations, multiple discontiguous virtual desktops, a high degree of configurability, and an external module interface for implementing functional extensions.
+FVWM 2 is an extremely powerful, fully ICCCM-1.1 compliant window manager requiring relatively little memory and providing an awesomely configurable environment.
 </longdescription>
 </pkgmetadata>
diff --git a/x11-wm/golem/ChangeLog b/x11-wm/golem/ChangeLog
index 73f1388721b0..7227a9ae5f32 100644
--- a/x11-wm/golem/ChangeLog
+++ b/x11-wm/golem/ChangeLog
@@ -1,30 +1,8 @@
-# ChangeLog for x11-wm/golem
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/golem/ChangeLog,v 1.11 2005/05/08 15:44:47 herbs Exp $
+# ChangeLog for x11-wm/lwm
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/golem/ChangeLog,v 1.1 2003/01/07 15:46:35 mholzer Exp $
 
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> golem-0.0.5-r1.ebuild:
-  Build shared libs with -fPIC, stable on amd64.
-
-  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> golem-0.0.5-r1.ebuild:
-  glibc -> libc
-
-  18 Jun 2004; Jason Wever <weeve@gentoo.org> golem-0.0.5-r1.ebuild:
-  Stable on sparc.
-
-  04 Nov 2003; Brandon Hale <tseng@gentoo.org> golem-0.0.5-r1.ebuild,
-  metadata.xml:
-  Marking 0.0.5-r1 stable on x86, adding metadata.xml
-
-*golem-0.0.5-r1 (27 Aug 2003)
-
-  27 Aug 2003; MATSUU Takuto <matsuu@gentoo.org> golem-0.0.5-r1.ebuild:
-  Added xinerama and esd to IUSE.
-  Added golem to /etc/X11/Sessions.
-
-*golem-0.0.5 (07 Jan 2003)
-
-  31 Jul 2003; MATSUU Takuto <matsuu@gentoo.org> golem-0.0.5.ebuild:
-  Added ~sparc to KEYWORDS.
+*golem-0.0.5.ebuild (07 Jan 2003)
 
   07 Jan 2003; Martin Holzer <mholzer@gentoo.org> golem-0.0.5.ebuild files/digest-golem-0.0.5 ChangeLog :
 
diff --git a/x11-wm/golem/Manifest b/x11-wm/golem/Manifest
index a66788924f6e..e69de29bb2d1 100644
--- a/x11-wm/golem/Manifest
+++ b/x11-wm/golem/Manifest
@@ -1,14 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 e11be624d65aebc9d1c69aee28008bc3 golem-0.0.5-r1.ebuild 1185
-MD5 ef77f03b2da33398f33506d829e1ee58 ChangeLog 1104
-MD5 fc01253d21f66b8a5ccb873905008690 metadata.xml 332
-MD5 80636ca2aa66f5a777f9f1c0c404b3ca files/digest-golem-0.0.5-r1 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfjQj2G5bA0cA/ScRAr7LAKDiCS0wWM3DoSMn0b3SAMPtileStQCeLglQ
-3uu52Z+eB8qi7/n1vIpInjA=
-=+8Y7
------END PGP SIGNATURE-----
diff --git a/x11-wm/golem/golem-0.0.5-r1.ebuild b/x11-wm/golem/golem-0.0.5-r1.ebuild
index 6d23a188ab65..0dc6c0f746a7 100644
--- a/x11-wm/golem/golem-0.0.5-r1.ebuild
+++ b/x11-wm/golem/golem-0.0.5-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/golem/golem-0.0.5-r1.ebuild,v 1.9 2005/05/08 15:44:47 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/golem/golem-0.0.5-r1.ebuild,v 1.1 2003/08/26 17:56:39 matsuu Exp $
 
 DESCRIPTION="Small window manager with themes and plugins"
 HOMEPAGE="http://golem.sourceforge.net/"
@@ -8,19 +8,14 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="x86 sparc amd64 ppc"
+KEYWORDS="~x86 ~sparc"
 IUSE="nls xinerama esd"
 
-DEPEND="virtual/libc
+DEPEND="virtual/glibc
 	virtual/x11
 	esd? ( media-sound/esound )"
 
-src_unpack() {
-	unpack ${A}
-	# Build shared libraries (plugins) with -fPIC
-	sed -i -e "s/^CFLAGS=.*/& -fPIC/" \
-		${S}/plugins/Makefile.plugin.in || die "sed failed"
-}
+S="${WORKDIR}/${P}"
 
 src_compile() {
 	econf \
@@ -46,3 +41,4 @@ pkg_postinst() {
 	einfo "The user you intend to use golem as (not root!!),"
 	einfo "just type golem.install"
 }
+
diff --git a/x11-wm/icewm/ChangeLog b/x11-wm/icewm/ChangeLog
index 81f4331160f3..b02f663ef336 100644
--- a/x11-wm/icewm/ChangeLog
+++ b/x11-wm/icewm/ChangeLog
@@ -1,485 +1,6 @@
 # ChangeLog for x11-wm/icewm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.106 2005/10/24 17:29:02 gustavoz Exp $
-
-  24 Oct 2005; Gustavo Zacarias <gustavoz@gentoo.org> icewm-1.2.23.ebuild:
-  Stable on sparc
-
-  22 Oct 2005; Daniel Goller <morfic@gentoo.org> icewm-1.2.23.ebuild:
-  Stable on amd64 and ppc
-
-  22 Oct 2005; Mark Loeser <halcy0n@gentoo.org> icewm-1.2.23.ebuild:
-  Stable on x86; bug #109529
-
-  22 Sep 2005; Daniel Goller <morfic@gentoo.org> ChangeLog:
-  Signing manifest
-
-*icewm-1.2.23 (22 Sep 2005)
-
-  22 Sep 2005; Daniel Goller <morfic@gentoo.org>
-  +files/icewm-1.2.23.ybutton.cc.patch, icewm-1.2.22.ebuild,
-  +icewm-1.2.23.ebuild:
-  Stabelizing 1.2.22 where applicable and adding 1.2.23 ~arch
-
-  13 Aug 2005; Luis Medinas <metalgod@gentoo.org> icewm-1.2.21.ebuild:
-  Stable on AMD64.
-
-  27 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org> icewm-1.2.21.ebuild:
-  Stable on sparc
-
-  27 Jul 2005; Daniel Goller <morfic@gentoo.org> ChangeLog:
-  Manifest failed again when committing remotely, adding it now
-
-*icewm-1.2.22 (27 Jul 2005)
-
-  27 Jul 2005; Daniel Goller <morfic@gentoo.org> +files/icewm-1.2.22.ybutton.cc.patch,
-  icewm-1.2.21.ebuild, +icewm-1.2.22.ebuild:
-  Adding 1.2.22 and 1.2.21 goes stable
-
-*icewm-1.2.21 (04 Jun 2005)
-
-  04 Jun 2005; Daniel Goller <morfic@gentoo.org>
-  +files/icewm-1.2.21.testmap.patch, +files/icewm-1.2.21.ybutton.cc.patch,
-  +icewm-1.2.21.ebuild:
-  Version Bump
-
-  21 May 2005; Daniel Goller <morfic@gentoo.org>
-  +files/icewm-1.2.20.iceicon.patch, +files/icewm-1.2.20.testmap.patch,
-  icewm-1.2.20.ebuild:
-  applied patches to fix FEATURES=test
-
-  23 Apr 2005; Daniel Goller <morfic@gentoo.org>
-  -files/icewm-1.2.19.ybutton.cc.patch, -icewm-1.2.19.ebuild,
-  icewm-1.2.20.ebuild:
-  cleaned up old version, fixed giflib dependency
-
-  07 Apr 2005; Simon Stelling <blubb@gentoo.org> icewm-1.2.20.ebuild:
-  stable on amd64
-
-  22 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> icewm-1.2.20.ebuild:
-  Stable on sparc
-
-  18 Mar 2005; Daniel Goller <morfic@gentoo.org>
-  -files/icewm-1.2.17.ybutton.cc.patch, -icewm-1.2.16-r1.ebuild,
-  -icewm-1.2.17.ebuild, icewm-1.2.19.ebuild, icewm-1.2.20.ebuild:
-  Purge old ebuilds
-
-  18 Mar 2005; Daniel Goller <morfic@gentoo.org> icewm-1.2.19.ebuild,
-  icewm-1.2.20.ebuild:
-  Change dependency from linungif to giflib
-
-  18 Mar 2005; Daniel Goller <morfic@gentoo.org> icewm-1.2.20.ebuild:
-  minor description change, stable on ppc and x86
-
-  06 Mar 2005; Heinrich Wendel <lanius@gentoo.org> icewm-1.2.19.ebuild:
-  stable on amd64
-
-  21 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> icewm-1.2.19.ebuild:
-  Stable on sparc
-
-  19 Feb 2005; morfic,,, <morfic@gentoo.org> icewm-1.2.19.ebuild:
-  1.2.19 now stable
-
-  19 Feb 2005; morfic,,, <morfic@gentoo.org> :
-  Signature wasn't done
-
-*icewm-1.2.20 (19 Feb 2005)
-
-  19 Feb 2005; morfic,,, <morfic@gentoo.org>
-  +files/icewm-1.2.20.ybutton.cc.patch, +icewm-1.2.20.ebuild:
-  Bump to 1.2.20 at last
-
-*icewm-1.2.19 (28 Dec 2004)
-
-  28 Dec 2004; Daniel Goller <morfic@gentoo.org>
-  +files/icewm-1.2.19.ybutton.cc.patch, +icewm-1.2.19.ebuild:
-  Initial bump to 1.2.19
-
-  20 Dec 2004; Dylan Carlson <absinthe@gentoo.org> icewm-1.2.17.ebuild:
-  Stable on amd64.
-
-  24 Nov 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.16-r1.ebuild,
-  icewm-1.2.17.ebuild:
-  Putting Maintainer's arch first in accordance with law.
-
-  23 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> icewm-1.2.17.ebuild:
-  Stable on sparc
-
-  22 Nov 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.17.ebuild:
-  Gotta use ${P/_} for patch
-
-  21 Nov 2004; Daniel Goller <morfic@gentoo.org>
-  -files/icewm-1.2.17_pre1.wmtaskbar.cc.patch:
-  kill off orphan patch
-
-  20 Nov 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.17.ebuild,
-  -icewm-1.2.17_pre1.ebuild, -icewm-1.2.17_pre2.ebuild:
-  1.2.17 stable on x86 ppc, and clean up of the pre version to .17
-
-*icewm-1.2.17 (07 Nov 2004)
-
-  07 Nov 2004; Daniel Goller <morfic@gentoo.org>
-  +files/icewm-1.2.17.ybutton.cc.patch, +icewm-1.2.17.ebuild:
-  Bump to 1.2.17 final, adjusting offsets of ybutton.cc.patch for silverxp theme
-
-  06 Nov 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.17_pre2.ebuild:
-  Small change in ebuild and testing signing
-
-*icewm-1.2.17_pre2 (03 Nov 2004)
-
-  03 Nov 2004; Daniel Goller <morfic@gentoo.org> +icewm-1.2.17_pre2.ebuild:
-  Bump to 1.2.17-pre2
-
-  24 Oct 2004; Daniel Goller <morfic@gentoo.org> -icewm-1.2.15-r1.ebuild,
-  icewm-1.2.16-r1.ebuild, -icewm-1.2.16.ebuild, icewm-1.2.17_pre1.ebuild:
-  remove old ebuilds + fix small typo in ebuilds
-
-  24 Oct 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.17_pre1.ebuild:
-  Cleanup econf
-
-*icewm-1.2.17_pre1 (24 Oct 2004)
-
-  24 Oct 2004; Daniel Goller <morfic@gentoo.org>
-  +files/icewm-1.2.17_pre1.wmtaskbar.cc.patch, +icewm-1.2.17_pre1.ebuild:
-  Rev Bump to 1.2.17_pre1, this should fix composite for xorg 6.8.0
-
-  20 Oct 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.16-r1.ebuild:
-  Added libungif dep, closing bug#65929
-
-  29 Sep 2004; Robert Coie <rac@gentoo.org> icewm-1.2.16-r1.ebuild:
-  Typo fix missing trailing whitespace in DEPEND
-
-  29 Sep 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.16-r1.ebuild:
-  adding depend to close bug #65706
-  thanks Aniruddha for reporting
-
-  27 Sep 2004; Danny van Dyk <kugelfang@gentoo.org> icewm-1.2.16-r1.ebuild:
-  Marked stable on amd64.
-
-  22 Sep 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.16-r1.ebuild:
-  And some more small cleanups
-
-  22 Sep 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.16-r1.ebuild:
-  removed 3 lines in there for debugging only
-
-  22 Sep 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.16-r1.ebuild:
-  Nothing but a major ebuild cleanup
-
-*icewm-1.2.15-r1 (15 Sep 2004)
-
-  15 Sep 2004; Daniel Goller <morfic@gentoo.org> +icewm-1.2.15-r1.ebuild:
-  readding 1.2.15-r1 for its keywords
-
-  15 Sep 2004; Daniel Goller <morfic@gentoo.org> -icewm-1.2.13.ebuild,
-  -icewm-1.2.14-r1.ebuild, -icewm-1.2.15-r1.ebuild:
-  clean up all old versions
-
-  12 Sep 2004; Malcolm Lashley <malc@gentoo.org> icewm-1.2.16-r1.ebuild:
-  ~amd64, needed for gcc3.4 compilation
-
-  06 Sep 2004; Gustavo Zacarias <gustavoz@gentoo.org> icewm-1.2.16-r1.ebuild:
-  Stable on sparc
-
-  02 Sep 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.16-r1.ebuild:
-  stable on x86
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  icewm-1.2.14-r1.ebuild, icewm-1.2.15-r1.ebuild:
-  Masked icewm-1.2.15-r1.ebuild stable for ppc
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  icewm-1.2.14-r1.ebuild:
-  Masked icewm-1.2.14-r1.ebuild stable for ppc
-
-*icewm-1.2.16-r1 (22 Aug 2004)
-
-  22 Aug 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.15-r1.ebuild,
-  +icewm-1.2.16-r1.ebuild:
-  changed dep to newer version of theme, fixing rollover issue
-
-  19 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> icewm-1.2.15-r1.ebuild:
-  Stable on sparc
-
-  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> icewm-1.2.16-r1.ebuild:
-  Stable on ppc
-
-*icewm-1.2.16 (16 Aug 2004)
-
-  16 Aug 2004; Daniel Goller <morfic@gentoo.org> -icewm-1.2.14.ebuild,
-  icewm-1.2.15-r1.ebuild, -icewm-1.2.15.ebuild, +icewm-1.2.16.ebuild:
-  Marked  Stable, cleaned up old ebuilds, added new version
-
-  16 Aug 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.15.ebuild:
-  Stable on x86
-
-*icewm-1.2.14-r1 (15 Aug 2004)
-
-  15 Aug 2004; Daniel Goller <morfic@gentoo.org> +files/IceWM.desktop,
-  +icewm-1.2.14-r1.ebuild, +icewm-1.2.15-r1.ebuild:
-  added IceWM.desktop for newer DMs
-
-*icewm-1.2.15_pre1 (15 Aug 2004)
-
-  15 Aug 2004; Daniel Goller <morfic@gentoo.org> -icewm-1.2.15_pre1.ebuild,
-  -icewm-1.2.15_pre2.ebuild, -icewm-1.2.15_pre4.ebuild:
-  Removed old 1.2.15_pre* versions
-
-*icewm-1.2.15 (10 Aug 2004)
-
-  10 Aug 2004; Daniel Goller <morfic@gentoo.org> +icewm-1.2.15.ebuild:
-  Bump to 1.2.15 Release
-
-  06 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> icewm-1.2.14.ebuild:
-  Stable on sparc
-
-*icewm-1.2.15_pre4 (05 Aug 2004)
-
-  05 Aug 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.14.ebuild,
-  +icewm-1.2.15_pre4.ebuild:
-  Bump to 1.2.15_pre4
-  Marked 1.2.14 stable on x86
-
-*icewm-1.2.15_pre2 (21 Jul 2004)
-
-  21 Jul 2004; Daniel Goller <morfic@gentoo.org> icewm-1.2.15_pre2.ebuild:
-  Bumped Version, closing bug #57866
-
-  09 Jul 2004; Daniel Goller <morfic@gentoo.org> :
-  this version has varios bug fixes and upstream merged our gcc 3.4 patches
-  (yes, they actually never made it into portage before upstream merged them)
-
-  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> icewm-1.2.13.ebuild,
-  icewm-1.2.14.ebuild:
-  add sed-4 dep
-
-*icewm-1.2.14 (15 Jun 2004)
-
-  15 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> icewm-1.2.13.ebuild,
-  +icewm-1.2.14.ebuild, -icewm-1.2.14_pre1.ebuild, -icewm-1.2.14_pre2.ebuild,
-  -icewm-1.2.14_pre7.ebuild, -icewm-1.2.14_pre9.ebuild:
-  Version bumped. Fixed configure error when truetype is disabled. Added
-  silverxp IUSE flag. Thanks to Daniel Goller <dgoller@satx.rr.com>.
-  This closes bug #40148 and #53685. Cleaned out _pre* ebuilds.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> icewm-1.2.13.ebuild:
-  Add inherit eutils
-
-  25 Mar 2004; Jason Huebel,,, <jhuebel@gentoo.org> icewm-1.2.13.ebuild,
-  files/icewm-1.2.13-gentoo.patch:
-  added patch for configure.in, contributed by Ryan C. Gordon
-
-*icewm-1.2.14_pre9 (03 Feb 2004)
-
-  03 Feb 2004; Hanno Boeck <hanno@gentoo.org> icewm-1.2.14_pre9.ebuild:
-  Version bump.
-
-  02 Feb 2004; Brad Cowan <bcowan@gentoo.org> icewm-1.2.14_pre7.ebuild:
-  Added support for xinerama flag. Thanks to James Le Cuirot <chewi@ffaura.com>.
-  Closes bug #39479.
-
-*icewm-1.2.14_pre7 (04 Jan 2004)
-
-  04 Jan 2004; Hanno Boeck <hanno@gentoo.org> icewm-1.2.14_pre7.ebuild:
-  Version bump.
-
-*icewm-1.2.14_pre2 (21 Dec 2003)
-
-  21 Dec 2003; Hanno Boeck <hanno@gentoo.org> icewm-1.2.14_pre2.ebuild:
-  Version bump.
-
-  05 Nov 2003; Jason Wever <weeve@gentoo.org> icewm-1.2.13.ebuild:
-  Marked stable on sparc.
-
-*icewm-1.2.14_pre1 (02 Nov 2003)
-
-  02 Nov 2003; Hanno Boeck <hanno@gentoo.org> icewm-1.2.14_pre1.ebuild:
-  Version bump.
-
-  30 Sep 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.13.ebuild:
-  Added session support from bug 29753 thanks to Daniel Goller.
-
-*icewm-1.2.13 (27 Sep 2003)
-
-  27 Sep 2003; Hanno Boeck <hanno@gentoo.org> icewm-1.2.13.ebuild:
-  Version bump.
-
-*icewm-1.2.13_pre2 (08 Sep 2003)
-
-  08 Sep 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.13_pre2.ebuild:
-  Version bump.
-
-*icewm-1.2.13_pre1 (06 Sep 2003)
-
-  06 Sep 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.13_pre1.ebuild:
-  Version bump.
-
-  21 Aug 2003; Heinrich Wendel <lanius@gentoo.org> icewm-1.2.10.ebuild,
-  icewm-1.2.7.ebuild, icewm-1.2.8.ebuild, files/icewm,
-  files/icewm-1.2.7-gentoo.patch:
-  - cleaned out old versions
-  - fixed bug #25739 (artwiz-fonts)
-  - fixed bug #27030 (gnome-desktop dep)
-
-  20 Aug 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.11.ebuild:
-  Removed sessions support as upstream says its a buggy hack for PDAs only not
-  desktop. Thanks to morfic.
-
-*icewm-1.2.11 (20 Aug 2003)
-
-  20 Aug 2003; Hanno Boeck <hanno@gentoo.org> icewm-1.2.11.ebuild:
-  Version bump.
-  Fixed several bugs (#23346, #25744, #26722, #26959).
-
-  20 Aug 2003; Hanno Boeck <hanno@gentoo.org> icewm-1.2.9.ebuild:
-  Moved to stable x86.
-
-*icewm-1.2.10 (15 Aug 2003)
-
-  15 Aug 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.10.ebuild:
-  Version bump and fixes thanks to morfic from irc.
-
-  16 Jul 2003; Hanno Boeck <hanno@gentoo.org> icewm-1.2.9.ebuild:
-  Fixed Gnome support (see bug #24306).
-
-*icewm-1.2.9 (22 Jun 2003)
-
-  22 Jun 2003; Hanno Boeck <hanno@gentoo.org> icewm-1.2.9.ebuild:
-  Version bump.
-
-  15 Jun 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.0-r1.ebuild,
-  icewm-1.2.2-r1.ebuild, icewm-1.2.3.ebuild, icewm-1.2.5.ebuild,
-  icewm-1.2.6.ebuild, files/icewm-1.2.3-gentoo.patch,
-  files/icewm-1.2.5-gentoo.patch, files/icewm-1.2.6-gentoo.patch,
-  files/icewm-gcc31-gentoo.patch:
-  Cleanup.
-
-*icewm-1.2.8 (15 Jun 2003)
-
-  15 Jun 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.8.ebuild:
-  Version bump.
-
-*icewm-1.2.7 (24 Mar 2003)
-
-  24 Mar 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.7.ebuild,
-  files/digest-icewm-1.2.7, files/icewm-1.2.7-gentoo.patch: 
-  Version bump.
-
-*icewm-1.2.6 (26 Jan 2003)
-
-  26 Jan 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.6.ebuild,
-  files/digest-icewm-1.2.6, files/icewm-1.2.6-gentoo.patch: 
-  Version bump.
-
-*icewm-1.2.5 (08 Jan 2003)
-
-  08 Jan 2003; Brad Cowan <bcowan@gentoo.org> icewm-1.2.5.ebuild,
-  files/digest-icewm-1.2.5, files/icewm-1.2.5-gentoo.patch: 
-  Version bump.
-
-*icewm-1.2.3 (28 Dec 2002)
-
-  28 Dec 2002; Daniel Robbins <drobbins@gentoo.org>: New 1.2.3 icewm ebuild with
-  updated patch; moved "libdir" to /usr/share/icewm.
-  
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*icewm-1.2.3_pre1-r1 icewm-1.2.2-r1 (02 Nov 2002)
-
-  02 Nov 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.3_pre1-r1.ebuild
-  icewm-1.2.2-r1.ebuild files/digest-icewm-1.2.3_pre1-r1
-  files/digest-icewm-1.2.2-r1 files/icewm-1.2.3_pre1-gentoo.patch :
-
-  Later on: unified the gcc31, aapm.c patches and ssed lines into one patch.
-
-  pez@apocalyptech.com (CJ Kucera) in bug #10057 pointed out that an extra
-  sed was needed for icewm to know its doc directory.
-
-*icewm-1.2.3_pre1 (01 Nov 2002)
-
-  01 Nov 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.3_pre1.ebuild
-  files/icewm-1.2.3_pre1-gcc31-gentoo.patch
-  files/icewm-1.2.3_pre1-aapm-gentoo.patch ChangeLog
-  files/digest-icewm-1.2.3_pre1 :
-
-  Version bump, thanks to: craig@mosquitonet.com (Craig Callender) in bug
-  #9920
-
-*icewm-1.2.2-r1 (16 Oct 2002)
-
-  22 Apr 2003; Brandon Low <lostlogic@gentoo.org> icewm-1.2.2-r1.ebuild:
-  Change supersed dependencies
-
-*icewm-1.2.2 (16 Oct 2002)
-
-  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> icewm-1.2.2.ebuild :
-  Added IUSE.
-
-  16 Oct 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.2.ebuild
-  files/digest-icewm-1.2.2 :
-
-  Version bump thanks to: craig@mosquitonet.com (Craig Callender) in bug
-  #7970.
-
-*icewm-1.2.0-r1 (16 Aug 2002)
-
-  20 Sep 2002; Olivier Reisch <doctomoe@gentoo.org> icewm-1.2.0-r1.ebuild:
-  Added ppc keyword
-
-  16 Aug 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.0-r1.ebuild
-  files/digest-icewm-1.2.0-r1 :
-
-  Now, the help browser knows where the help files are.  Closes bug #6405 by
-  Klaus.Kusche@inode.at (Klaus Kusche)
-
-*icewm-1.2.0 (06 Jul 2002)
-
-  06 Jul 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.0.ebuild
-  files/icewm-1.2.0-gcc31-gentoo.patch files/digest-icewm-1.2.0 :
-
-  Version bump, thanks to: craig@mosquitonet.com (Craig Callender) in bug #
-  4539. And NLS translation files are now installed properly, thanks to:
-  arkmch@priv4.onet.pl (Arkadiusz Mucha) in bug #4532.
-
-*icewm-1.2.0_pre3-r1 (02 Jul 2002)
-
-  02 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
-  icewm-1.2.0_pre3-r1.ebuild files/digest-icewm-1.2.0_pre3-r1 :
-
-  icewm binary in /etc/X11/Sessions was not being created properly.  Fixed.
-  Reported in bug #4410 by charles_hood@yahoo.com (Charles Hood)
-
-*icewm-1.2.0_pre3 (01 Jul 2002)
-
-  01 Jul 2002; Seemant Kulleen <seemant@gentoo.org> icewm-1.2.0_pre3.ebuild
-  files/digest-icewm-1.2.0_pre3 files/icewm-1.2.0_pre3-gcc31-gentoo.patch :
-
-  Version bump to newest testing.  The patch is the same as Matt's patch,
-  just renamed and edited to reflect the new version number.
-
-*icewm-1.0.9.2-r4 (26 May 2002)
-
-  26 May 2002; Matthew Kennedy <mkennedy@gentoo.org> ChangeLog,
-  icewm-1.0.9.2-r4.ebuild, files/digest-icewm-1.0.9.2-r4,
-  files/icewm-1.0.9.2-gcc31-gentoo.patch :
-
-  Code patch to support gcc3.1 (thanks to yasea@gmx.net (Thomas
-  Weidner) and http://bugs.gentoo.org/show_bug.cgi?id=2969).
-
-*icewm-1.0.9.2-r3 (19 Feb 2002)
-
-  19 Feb 2002; Chris Houser <chouser@gentoo.org>: added support for 'nls' and
-  'imlib' in USE.  Moved some install paths out of X11 sub-directories into
-  FHS-compliant locations.  Fixed the 'help' menu item. This closes bug #521.
-
-*icewm-1.0.9.2-r2 (14 Feb 2002)
-
-  14 Feb 2002; Dan Armak <danarmak@gentoo.org>: added /etc/X11/Sessions/icewm,
-  which adds icewm to the auto-generated session list of kdm and gdm.
-  
-*icewm-1.0.9.2-r1 (8 Feb 2002)
-
-  8 Feb 2002; Daniel Robbins <drobbins@gentoo.org>: Added support for imlib,
-  fixed sysconfdir path.  This closes bug #610.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
 *icewm-1.0.9.2 (1 Feb 2002)
 
diff --git a/x11-wm/icewm/Manifest b/x11-wm/icewm/Manifest
index f5a1406aaf25..78c21610af1c 100644
--- a/x11-wm/icewm/Manifest
+++ b/x11-wm/icewm/Manifest
@@ -1,28 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4943d7b36636e6253d576db607c2d0d9 icewm-1.2.23.ebuild 2228
-MD5 e74fd3f8b677b9a200feacf2fdc7f244 icewm-1.2.20.ebuild 2310
-MD5 1179ec44ecc2f0198fb5ef3de42a108d icewm-1.2.22.ebuild 2228
-MD5 7420579866830e8f55c5131fa8e558d5 ChangeLog 16762
-MD5 646a3a2aa9a92246bec0db5211f16133 icewm-1.2.21.ebuild 2270
-MD5 a26b94d92c1e03083b7020e2f4c1afe9 metadata.xml 630
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.22.ybutton.cc.patch 591
-MD5 1ba6fc06d92e0a7d0d4357d83db74493 files/digest-icewm-1.2.20 64
-MD5 ab0c279c830a4148e8c4bba52df974b0 files/digest-icewm-1.2.21 64
-MD5 a644431b77f0f8026d82b40033a46d3e files/digest-icewm-1.2.22 64
-MD5 39a926bf34be3c704ff71518f13a175b files/digest-icewm-1.2.23 65
-MD5 9028fc0d1b794c88e4a2db9cf28f66f0 files/IceWM.desktop 200
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.20.ybutton.cc.patch 591
-MD5 b3bb2875e9f96c7fbd5620a7388626b0 files/icewm-1.2.20.testmap.patch 529
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.23.ybutton.cc.patch 591
-MD5 b3bb2875e9f96c7fbd5620a7388626b0 files/icewm-1.2.21.testmap.patch 529
-MD5 0adfec296f9e1a9eb08a326c0690c28e files/icewm-1.2.21.ybutton.cc.patch 591
-MD5 cea1a375dba2fc5a6d9675d7255229aa files/icewm-1.2.20.iceicon.patch 394
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDXRn+KRy60XGEcJIRAsbZAJ96r2VCWr1KLmajf7riK09sBcXQ+wCeLLSq
-NIjQ7TkzIATqsUaNIM3Unso=
-=B/Lr
------END PGP SIGNATURE-----
+MD5 30726bc1550287bb594f304fd0a845ca icewm-1.2.3.ebuild 2057
+MD5 3895a0e0cf386484404582c5c8b75622 icewm-1.2.5.ebuild 2058
+MD5 6691ae802a2358c3ef35f3d9c66a7190 icewm-1.2.0-r1.ebuild 2407
+MD5 21e6046fa6ce0973feae10f5014d3fcb icewm-1.2.7.ebuild 2090
+MD5 cde0543f51506ad8dc1d573280620149 icewm-1.2.6.ebuild 2079
+MD5 b03272ff4807db3b7bb3a030f4c4d4a9 icewm-1.2.2-r1.ebuild 2300
+MD5 4e17bd55b5eb230b079030d877000174 ChangeLog 4926
+MD5 3decb45e7b318067b9c3d68c6ef11e2f files/icewm 25
+MD5 caaf61ec560c01b8e920e5606eb61aa2 files/digest-icewm-1.2.0-r1 63
+MD5 0750e4d376075e5973eac5648820961a files/digest-icewm-1.2.2-r1 63
+MD5 0dc5e896c5f794e256450c88fcc8c0f7 files/icewm-gcc31-gentoo.patch 446
+MD5 1f8f857ae1c221d3633ae1752cdaa51a files/icewm-1.2.7-gentoo.patch 3886
+MD5 7197157fbefaf4d7a5c986f3daefbb14 files/icewm-1.2.3-gentoo.patch 3886
+MD5 6a1991631b8e5381a037ea72942b03a9 files/digest-icewm-1.2.3 63
+MD5 850b3fcfb5994b199b7edcec59b74722 files/digest-icewm-1.2.5 63
+MD5 85d0ba06f6fe7f1cd47f656d875aa2d8 files/digest-icewm-1.2.6 63
+MD5 ede49197766f08023cc5f56114783e61 files/digest-icewm-1.2.7 63
+MD5 1f8f857ae1c221d3633ae1752cdaa51a files/icewm-1.2.6-gentoo.patch 3886
+MD5 913ab5de078ca4f34bd9c19f8c22eaed files/icewm-1.2.5-gentoo.patch 3886
diff --git a/x11-wm/icewm/icewm-1.2.20.ebuild b/x11-wm/icewm/icewm-1.2.20.ebuild
index 24b41eca91d8..0850f38ca33e 100644
--- a/x11-wm/icewm/icewm-1.2.20.ebuild
+++ b/x11-wm/icewm/icewm-1.2.20.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.20.ebuild,v 1.7 2005/05/21 06:21:57 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.20.ebuild,v 1.1 2005/02/20 05:23:32 morfic Exp $
 
 inherit eutils
 
-DESCRIPTION="Ice Window Manager with Themes"
+DESCRIPTION="Ice Window Manager"
 
 HOMEPAGE="http://www.icewm.org/
 	http://sourceforge.net/projects/icewmsilverxp/"
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="ppc x86 sparc amd64"
+KEYWORDS="~ppc ~x86 ~sparc ~amd64"
 
 IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
 
@@ -28,7 +28,7 @@ RDEPEND="virtual/x11
 	nls? ( sys-devel/gettext )
 	truetype? ( >=media-libs/freetype-2.0.9 )
 	media-fonts/artwiz-fonts
-	media-libs/giflib"
+	media-libs/libungif"
 
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
@@ -39,8 +39,6 @@ src_unpack() {
 	if use silverxp ; then
 		epatch ${FILESDIR}/${P/_}.ybutton.cc.patch
 	fi
-		epatch ${FILESDIR}/${P/_}.testmap.patch
-		epatch ${FILESDIR}/${P/_}.iceicon.patch
 
 	echo "#!/bin/sh" > $T/icewm
 	echo "/usr/bin/icewm-session" >> $T/icewm
@@ -72,7 +70,6 @@ src_compile(){
 		${myconf} || die "configure failed"
 
 	sed -i "s:/icewm-\$(VERSION)::" src/Makefile || die "patch failed"
-	sed -i "s:ungif:gif:" src/Makefile || die "libungif fix failed"
 
 	emake || die "emake failed"
 }
diff --git a/x11-wm/icewm/icewm-1.2.21.ebuild b/x11-wm/icewm/icewm-1.2.21.ebuild
index 12bde3105144..ee34e3bb98f4 100644
--- a/x11-wm/icewm/icewm-1.2.21.ebuild
+++ b/x11-wm/icewm/icewm-1.2.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.21.ebuild,v 1.4 2005/08/13 11:24:16 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.21.ebuild,v 1.1 2005/06/04 06:29:27 morfic Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~ppc ~x86 ~sparc ~amd64"
 
 IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
 
diff --git a/x11-wm/icewm/icewm-1.2.22.ebuild b/x11-wm/icewm/icewm-1.2.22.ebuild
index 274f73ca6207..156132a4f52c 100644
--- a/x11-wm/icewm/icewm-1.2.22.ebuild
+++ b/x11-wm/icewm/icewm-1.2.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.22.ebuild,v 1.2 2005/09/22 22:41:14 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.22.ebuild,v 1.1 2005/07/27 02:12:04 morfic Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ppc ~sparc ~x86"
+KEYWORDS="~ppc ~x86 ~sparc ~amd64"
 
 IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
 
diff --git a/x11-wm/icewm/icewm-1.2.23.ebuild b/x11-wm/icewm/icewm-1.2.23.ebuild
index 3e5a4d5a7f5a..a2049f47ef78 100644
--- a/x11-wm/icewm/icewm-1.2.23.ebuild
+++ b/x11-wm/icewm/icewm-1.2.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.23.ebuild,v 1.4 2005/10/24 17:29:02 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/icewm/icewm-1.2.23.ebuild,v 1.1 2005/09/22 22:41:14 morfic Exp $
 
 inherit eutils
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P/_}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 
-KEYWORDS="amd64 ppc sparc x86"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 
 IUSE="esd gnome imlib nls spell truetype xinerama silverxp"
 
diff --git a/x11-wm/icewm/metadata.xml b/x11-wm/icewm/metadata.xml
index c33b7b4acc66..765abc45b715 100644
--- a/x11-wm/icewm/metadata.xml
+++ b/x11-wm/icewm/metadata.xml
@@ -1,11 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>desktop-wm</herd>
-<maintainer>
- <email>morfic@gentoo.org</email>
- <name>Daniel Goller</name>
-</maintainer>
+<herd>no-herd</herd>
 <maintainer>
  <email>bcowan@gentoo.org</email>
  <name>Brad Cowan</name>
@@ -13,9 +9,4 @@
 <maintainer>
  <email>hanno@gentoo.org</email>
 </maintainer>
-<longdescription>
-IceWM is a window manager designed for speed, usability, and consistency. 
-It is able to emulate the looks of Motif, OS/2, and Windows, and allows you 
-to have a customizable look using pixmaps.
-</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/integrity/ChangeLog b/x11-wm/integrity/ChangeLog
index 85ab56f4cf4c..b6ba6323ea05 100644
--- a/x11-wm/integrity/ChangeLog
+++ b/x11-wm/integrity/ChangeLog
@@ -1,15 +1,6 @@
 # ChangeLog for x11-wm/integrity
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/ChangeLog,v 1.4 2005/10/02 13:53:05 metalgod Exp $
-
-  02 Oct 2005; Luis Medinas <metalgod@gentoo.org> integrity-1.0.ebuild:
-  Added ~amd64 keyword.
-
-  28 Jul 2005; Caleb Tennis <caleb@gentoo.org> integrity-1.0.ebuild:
-  Fix qt dep per bug #100235
-
-  15 Oct 2004; David Holm <dholm@gentoo.org> integrity-1.0.ebuild:
-  Added to ~ppc.
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/ChangeLog,v 1.1 2004/09/07 14:06:24 usata Exp $
 
 *integrity-1.0 (07 Sep 2004)
 
diff --git a/x11-wm/integrity/Manifest b/x11-wm/integrity/Manifest
index 78afc586121d..772eaa8104e1 100644
--- a/x11-wm/integrity/Manifest
+++ b/x11-wm/integrity/Manifest
@@ -1,14 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 be9f763d988da70e9dcbea064d52cc72 ChangeLog 703
-MD5 6b441a2f00d68ceb0e6e30f7fe9da5c5 integrity-1.0.ebuild 1243
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
+MD5 15b741dd8f015ea461b9686dc68ecfc5 integrity-1.0.ebuild 1071
 MD5 b08c2b54f880cc4ef78a0fafafbb3626 files/digest-integrity-1.0 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDP/RuwUpWvClEHQoRAqEmAJ9mbJPL0YtPUvBURwuS9v5AH5IDBgCdGxIx
-0QWwihGJGhBFUJysJzCqHqU=
-=j1Hj
------END PGP SIGNATURE-----
diff --git a/x11-wm/integrity/integrity-1.0.ebuild b/x11-wm/integrity/integrity-1.0.ebuild
index 87a738939f06..50b782156fbf 100644
--- a/x11-wm/integrity/integrity-1.0.ebuild
+++ b/x11-wm/integrity/integrity-1.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/integrity-1.0.ebuild,v 1.4 2005/10/02 13:53:05 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/integrity/integrity-1.0.ebuild,v 1.1 2004/09/07 14:06:24 usata Exp $
 
 IUSE=""
 
@@ -12,10 +12,10 @@ S=${WORKDIR}/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~x86"
 
 DEPEND="virtual/x11
-	=x11-libs/qt-3*"
+	>=x11-libs/qt-3.2.3"
 
 src_compile() {
 	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" || die
diff --git a/x11-wm/ion/ChangeLog b/x11-wm/ion/ChangeLog
index dd298580effb..bcb992870742 100644
--- a/x11-wm/ion/ChangeLog
+++ b/x11-wm/ion/ChangeLog
@@ -1,43 +1,6 @@
 # ChangeLog for x11-wm/ion
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion/ChangeLog,v 1.13 2005/07/10 15:19:56 twp Exp $
-
-  10 Jul 2005; Tom Payne <twp@gentoo.org> -ion-20020207.ebuild,
-  ion-20020207-r1.ebuild:
-  Remove -pedantic-errors compiler flag. Bug # 86457. Remove old version.
-
-  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> ion-20020207.ebuild:
-  sync IUSE (missing), glibc -> libc
-
-  07 May 2004; Brandon Hale <tseng@gentoo.org> ion-20020207-r1.ebuild:
-  Remove S=, use epatch
-
-  12 Jun 2003; <msterret@gentoo.org> ion-20020207.ebuild:
-  add Header
-
-  24 May 2003; Hanno Boeck <hanno@gentoo.org> ion-20020207-r1.ebuild:
-  Fixed license var.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*ion-20020207-r1 (23 Nov 2002)
-
-  23 Nov 2002; Sascha Schwabbauer <cybersystem@gentoo.org> ion-20020207-r1.ebuild :
-
-  Added ~ppc to keywords.
-
-*ion-20020207-r1 (11 Sep 2002)
-
-  11 Sep 2002; Seemant Kulleen <seemant@gentoo.org> ion-20020207-r1.ebuild
-  files/ion-20020207-gentoo.diff files/digest-ion-20020207-r1 :
-
-  Patch by: sascha-gentoo-bugzilla@silbe.org (Sascha Silbe) in bug #7783 to
-  fix the quote_next() function.
-
-*ion-20020207 (8 Feb 2002)
-
-  8 Feb 2002; Daniel Robbins <drobbins@gentoo.org> Added a new ion ebuild from
-  Doug Miller.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
 *ion-20011109-r1 (1 Feb 2002)
 
diff --git a/x11-wm/ion/Manifest b/x11-wm/ion/Manifest
index 700ed8ff295d..e6d19821ce45 100644
--- a/x11-wm/ion/Manifest
+++ b/x11-wm/ion/Manifest
@@ -1,5 +1,6 @@
-MD5 533e6fc50c28fbaf47adf485e88a2fbe ion-20020207-r1.ebuild 1426
-MD5 19f6197c6f16bf0449e676bda279d889 ChangeLog 1818
-MD5 f6555db271f0c723017c417e06c2acf1 metadata.xml 541
+MD5 67ee8d9b33aeee6727724312f05f05ac ChangeLog 1386
+MD5 c9585bcdc7a62995aefd0902437015de ion-20020207-r1.ebuild 1415
+MD5 0070deb8befa12c9877c46b235ff2bb5 ion-20020207.ebuild 1238
+MD5 1859f463f0b88ba4a73c5051923c6095 files/digest-ion-20020207 64
 MD5 1859f463f0b88ba4a73c5051923c6095 files/digest-ion-20020207-r1 64
 MD5 6487fe95ece5d2b01629c2735b2b6e1a files/ion-20020207-gentoo.diff 391
diff --git a/x11-wm/ion/ion-20020207-r1.ebuild b/x11-wm/ion/ion-20020207-r1.ebuild
index 17a91fc4b3b5..6fcaad55ac44 100644
--- a/x11-wm/ion/ion-20020207-r1.ebuild
+++ b/x11-wm/ion/ion-20020207-r1.ebuild
@@ -1,25 +1,24 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion/ion-20020207-r1.ebuild,v 1.11 2005/07/10 15:19:56 twp Exp $
-
-inherit eutils
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion/ion-20020207-r1.ebuild,v 1.1 2002/09/11 14:29:55 seemant Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="A keyboard-based window manager"
-HOMEPAGE="http://www.students.tut.fi/~tuomov/ion/"
 SRC_URI="http://www.students.tut.fi/~tuomov/dl/${P}.tar.gz"
+HOMEPAGE="http://www.students.tut.fi/~tuomov/ion/"
 
-LICENSE="Clarified-Artistic"
 SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
+LICENSE="Artistic"
+KEYWORDS="x86 sparc sparc64"
 
 DEPEND="virtual/x11"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
+	patch -p1 < ${FILESDIR}/${P}-gentoo.diff || die
 }
+	
 
 src_compile() {
 	# Edit system.mk
@@ -31,12 +30,10 @@ src_compile() {
 		-e 's:#HAS_SYSTEM_ASPRINTF=1:HAS_SYSTEM_ASPRINTF=1:' \
 		-e 's:#INSTALL=install -c:INSTALL=install -c:' \
 		-e 's:INSTALL=install *$:#INSTALL=install:' \
-		-e 's:-pedantic-errors ::g' \
 		system.mk.new > system.mk
 
 	cp Makefile Makefile.new
-	sed -e 's:$(DOCDIR)/ion:$(DOCDIR)/${P}:g' \
-		Makefile.new > Makefile
+	sed -e 's:$(DOCDIR)/ion:$(DOCDIR)/${P}:g' Makefile.new > Makefile
 
 	make depend || die
 	emake || die
diff --git a/x11-wm/ion2/ChangeLog b/x11-wm/ion2/ChangeLog
index f4bec6c45e3e..3547ef30b743 100644
--- a/x11-wm/ion2/ChangeLog
+++ b/x11-wm/ion2/ChangeLog
@@ -1,93 +1,6 @@
 # ChangeLog for x11-wm/ion2
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.26 2005/09/17 10:24:18 agriffis Exp $
-
-  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> ion2-20040729.ebuild:
-  Mark 20040729 stable on alpha
-
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> ion2-20040729.ebuild:
-  Stable on amd64.
-
-  03 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> ion2-20040729.ebuild:
-  Stable on sparc
-
-  07 Oct 2004; Tom Payne <twp@gentoo.org> -files/ion2-20040207-20040211.patch,
-  -files/ion2-20040207-rename.patch, -files/ion2-20040407-rename.patch,
-  -files/xftde-20040207.patch:
-  Removed old files.
-
-  07 Oct 2004; Tom Payne <twp@gentoo.org> -ion2-20040407.ebuild,
-  -ion2-20040601.ebuild:
-  Removed old versions.
-
-  23 Sep 2004; <blubb@gentoo.org> ion2-20040729.ebuild:
-  added ~amd64 and fixed sandbox issues
-
-  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> ion2-20040729.ebuild:
-  Fixed and marked stable on hppa.
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  ion2-20040729.ebuild:
-  Masked ion2-20040729.ebuild stable for ppc
-
-  29 Aug 2004; <twp@gentoo.org> ion2-20040601.ebuild, ion2-20040729.ebuild:
-  Stable on x86
-
-*ion2-20040729 (31 Jul 2004)
-
-  31 Jul 2004; <twp@gentoo.org> -ion2-20040211-r2.ebuild,
-  -ion2-20040211-r3.ebuild, +ion2-20040729.ebuild:
-  Version bump. Removed old versions.
-
-  28 Jun 2004; Aron Griffis <agriffis@gentoo.org> ion2-20040211-r2.ebuild,
-  ion2-20040211-r3.ebuild:
-  add sed-4 dep
-
-  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> ion2-20040211-r2.ebuild,
-  ion2-20040211-r3.ebuild:
-  QA - fix use invocation
-
-*ion2-20040601 (01 Jun 2004)
-
-  01 Jun 2004; <twp@gentoo.org> +ion2-20040601.ebuild:
-  Version bump
-
-  10 Apr 2004; Tom Payne <twp@gentoo.org> ion2-20040407.ebuild :
-  Stable on x86.
-
-*ion2-20040407 (07 Apr 2004)
-
-  07 Apr 2004; Tom Payne <twp@gentoo.org> ion2-20040407.ebuild :
-  Version bump.
-
-*ion2-20040211-r3 (31 Mar 2004)
-
-  31 Mar 2004; Tom Payne <twp@gentoo.oth> ion2-20040211-r3.ebuild :
-  Rename binaries so it can co-exist with x11-wm/ion. Bug # 46225.
-
-  31 Mar 2004; Tom Payne <twp@gentoo.oth> ion2-20040211-r2.ebuild :
-  Added sys-devel/libtool-1.4.3 dependency. Bug # 46156.
-
-  26 Mar 2004; Tom Payne <twp@gentoo.org> ion2-20040211-r2.ebuild, ion2-20040211-r1.ebuild :
-  Marked stable on x86. Bug # 45739. Removed old version.
-
-  19 Mar 2004; Tom Payne <twp@gentoo.org> ion2-20040211-r2.ebuild, ion2-20040211-r2.ebuild :
-  Remove hppa until it gets a more recent lua.
-
-*ion2-20040211-r2 (14 Mar 2004)
-
-  14 Mar 2004; Tom Payne <twp@gentoo.org> ion2-20040211-r2.ebuild, ion2-20040207.ebuild, ion2-20040211.ebuild :
-  Install ion2.desktop for gdm, remove old versions.
-
-*ion2-20040211-r1 (28 Feb 2004)
-
-  28 Feb 2004; Tom Payne <twp@gentoo.org> ion2-20040211-r1.ebuild :
-  Minor ebuild fixes.
-
-*ion2-20040211 (11 Feb 2004)
-
-  11 Feb 2004; Tom Payne <twp@gentoo.org> ion2-20040211.ebuild :
-  Added patch from mailing list.
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ChangeLog,v 1.1 2004/02/10 23:27:38 twp Exp $
 
 *ion2-20040207 (10 Feb 2004)
 
diff --git a/x11-wm/ion2/Manifest b/x11-wm/ion2/Manifest
index 12f5246357dc..0a518c0b5f01 100644
--- a/x11-wm/ion2/Manifest
+++ b/x11-wm/ion2/Manifest
@@ -1,7 +1,5 @@
+MD5 c5c0ae0e173f3740b3498172ca3982e3 ion2-20040207.ebuild 1714
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
-MD5 97ad42b3da4397f4faaae63b2cf98dca ChangeLog 3159
-MD5 b5d59197edcbfc5b059667c2b08d8c32 ion2-20040729.ebuild 2051
-MD5 fece066216c6fcfa1936d068bd6ca998 files/pwm2.desktop 170
-MD5 7057ed0ec950ad5f77b47a32dbcb4fb4 files/ion2-20040601-rename.patch 1720
-MD5 59a0157884665387039b7de882e85f1c files/digest-ion2-20040729 66
-MD5 fba46fa26a6acc7159f6eb942abc002d files/ion2.desktop 217
+MD5 967d7e5049e07f5dd3b5ac78ab53fdf9 ChangeLog 286
+MD5 16c6e0f00bd204d2f612b781d7b73f54 files/xftde-20040207.patch 18552
+MD5 91e9228c6c714b8031f826c8523a2274 files/digest-ion2-20040207 66
diff --git a/x11-wm/ion2/files/ion2.desktop b/x11-wm/ion2/files/ion2.desktop
index 1b5b44e6de62..95f54aadbe4b 100644
--- a/x11-wm/ion2/files/ion2.desktop
+++ b/x11-wm/ion2/files/ion2.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Ion2
+Name=Ion
 Comment=A tiling tabbed window manager designed with keyboard users in mind.
-Exec=ion2
-TryExec=ion2
+Exec=ion
+TryExec=ion
 # no icon yet, only the top three are currently used
 Icon=
 Type=Application
diff --git a/x11-wm/ion2/ion2-20040729.ebuild b/x11-wm/ion2/ion2-20040729.ebuild
index 786e8cedc00d..3b7228c9384c 100644
--- a/x11-wm/ion2/ion2-20040729.ebuild
+++ b/x11-wm/ion2/ion2-20040729.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040729.ebuild,v 1.8 2005/09/17 10:24:18 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion2/ion2-20040729.ebuild,v 1.1 2004/07/31 12:21:10 twp Exp $
 
 inherit eutils
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.iki.fi/tuomov/ion/"
 SRC_URI="http://modeemi.fi/~tuomov/ion/dl/ion-2-${PV}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="2"
-KEYWORDS="alpha amd64 hppa ~mips ppc sparc x86"
+KEYWORDS="~alpha ~mips ~ppc ~sparc ~x86"
 IUSE="xinerama"
 DEPEND="virtual/x11
 	app-misc/run-mailcap
@@ -38,8 +38,6 @@ src_compile() {
 
 	autoreconf
 
-	use hppa && myconf="${myconf} --disable-shared"
-
 	econf \
 		--sysconfdir=/etc/X11 \
 		`use_enable xinerama` \
@@ -53,8 +51,6 @@ src_compile() {
 src_install() {
 
 	make \
-		MODULEDIR=${D}/usr/$(get_libdir)/ion2 \
-		LCDIR=${D}/usr/$(get_libdir)/ion2/lc \
 		prefix=${D}/usr \
 		ETCDIR=${D}/etc/X11/ion2 \
 		SHAREDIR=${D}/usr/share/ion2 \
diff --git a/x11-wm/ion3/ChangeLog b/x11-wm/ion3/ChangeLog
index 126ced1e3a52..3611b532b5bc 100644
--- a/x11-wm/ion3/ChangeLog
+++ b/x11-wm/ion3/ChangeLog
@@ -1,128 +1,6 @@
 # ChangeLog for x11-wm/ion3
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.28 2005/11/01 23:04:29 twp Exp $
-
-  01 Nov 2005; Tom Payne <twp@gentoo.org>
-  +files/ion3-20051029-statusd-locale.patch, ion3-20051029.ebuild:
-  Add patch for amd64. Bug # 110860.
-
-*ion3-20051029 (29 Oct 2005)
-
-  29 Oct 2005; Tom Payne <twp@gentoo.org> +ion3-20051029.ebuild:
-  Version bump.
-
-*ion3-20051023-r1 (26 Oct 2005)
-
-  26 Oct 2005; Tom Payne <twp@gentoo.org> +files/ion3-20051023-r1.patch,
-  -ion3-20051023.ebuild, +ion3-20051023-r1.ebuild:
-  Apply patch to fix status bar issue. Bug # 110417. Thanks Frank Zschockelt
-
-*ion3-20051023 (24 Oct 2005)
-
-  24 Oct 2005; Tom Payne <twp@gentoo.org> -ion3-20050728.ebuild,
-  +ion3-20051023.ebuild:
-  Version bump. Remove old version.
-
-*ion3-20050820 (16 Sep 2005)
-
-  16 Sep 2005; Tom Payne <twp@gentoo.org> -ion3-20050625.ebuild,
-  +ion3-20050820.ebuild:
-  Version bump. Remove old version.
-
-*ion3-20050728 (19 Aug 2005)
-
-  19 Aug 2005; Tom Payne <twp@gentoo.org> -ion3-20050502.ebuild,
-  +ion3-20050728.ebuild:
-  Version bump. Remove old version.
-
-*ion3-20050625 (10 Jul 2005)
-
-  10 Jul 2005; Tom Payne <twp@gentoo.org> -ion3-20050322.ebuild,
-  +ion3-20050625.ebuild:
-  Version bump. Removed old version.
-
-  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> ion3-20050116.ebuild:
-  Marked ppc stable for bug #97635.
-
-*ion3-20050505 (10 May 2005)
-
-  10 May 2005: Joshua Charles Campbell <warpzero@gentoo.org> ion3-20050505.ebuild,
-  Version bump.
-
-  21 Apr 2005; Aron Griffis <agriffis@gentoo.org> ion3-20050116.ebuild,
-  ion3-20050322.ebuild:
-  Add ia64 keywords
-
-  04 Apr 2005; Aron Griffis <agriffis@gentoo.org> ion3-20050116.ebuild:
-  stable on amd64
-
-*ion3-20050322 (26 Mar 2005)
-
-  26 Mar 2005; Tom Payne <twp@gentoo.org> -files/ion.desktop,
-  -ion3-20041104.ebuild, -ion3-20050102.ebuild, ion3-20050116.ebuild,
-  +ion3-20050322.ebuild:
-  Version bump. Remove references to ion3-svn. Remove old version.
-
-  03 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> ion3-20050116.ebuild:
-  Stable on sparc
-
-  28 Jan 2005; Aron Griffis <agriffis@gentoo.org> ion3-20050116.ebuild:
-  stable on alpha and x86
-
-*ion3-20050116 (25 Jan 2005)
-
-  25 Jan 2005; Tom Payne <twp@gentoo.org> +ion3-20050116.ebuild:
-  Version bump. Bug # 79516. Removed old version.
-
-*ion3-20050102 (02 Jan 2005)
-
-  02 Jan 2005; Tom Payne <twp@gentoo.org> +ion3-20050102.ebuild:
-  Version bump.
-
-  01 Jan 2005; Tom Payne <twp@gentoo.org> ion3-20041005.ebuild,
-  ion3-20041104.ebuild:
-  Stable on x86.
-
-  20 Dec 2004; Tom Payne <twp@gentoo.org> -ion3-20040906.ebuild:
-  Removed old version.
-
-  19 Dec 2004; Tom Payne <twp@gentoo.org>
-  -files/ion3-20040316-libtu-I.patch, -files/ion3-20040316_p1-rename.patch:
-  Remove unused patches.
-
-*ion3-20041104 (19 Dec 2004)
-
-  19 Dec 2004; Tom Payne <twp@gentoo.org> ion3-20040906.ebuild,
-  ion3-20041005.ebuild, +ion3-20041104.ebuild:
-  Prevent sandbox violation. Bug # 73672. Version bump. Bug # 74203.
-
-*ion3-20041005 (05 Oct 2004)
-
-  05 Oct 2004; Tom Payne <twp@gentoo.org> -ion3-20040316_p1-r1.ebuild,
-  -ion3-20040316_p1.ebuild, +ion3-20041005.ebuild:
-  Version bump, remove old versions.
-
-*ion3-20040906 (06 Sep 2004)
-
-  06 Sep 2004; Tom Payne <twp@gentoo.org> +ion3-20040906.ebuild:
-  Version bump.
-
-  05 Sep 2004; Guy Martin <gmsoft@gentoo.org> ion3-20040316_p1-r1.ebuild:
-  Fixed for hppa. Marked ~hppa.
-
-*ion3-20040316_p1-r1 (09 May 2004)
-
-  09 May 2004; <twp@gentoo.org> +files/ion3-20040316_p1-rename.patch,
-  +files/ion3.desktop, +files/pwm3.desktop, +ion3-20040316_p1-r1.ebuild:
-  Rename binaries, directories, etc. from ion to ion3.
-
-  07 Apr 2004; Travis Tilley <lv@gentoo.org> ion3-20040316_p1.ebuild:
-  added ~amd64 keyword
-
-*ion3-20040316_p1 (23 Mar 2004)
-
-  23 Mar 2004; Tom Payne <twp@gentoo.org> ion3-20040316_p1.ebuild :
-  Version bump.
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ChangeLog,v 1.1 2004/03/16 20:09:06 twp Exp $
 
 *ion3-20040316 (16 Mar 2004)
 
diff --git a/x11-wm/ion3/Manifest b/x11-wm/ion3/Manifest
index 3c07074eaaa2..28bb1ecd42e1 100644
--- a/x11-wm/ion3/Manifest
+++ b/x11-wm/ion3/Manifest
@@ -1,14 +1,6 @@
-MD5 c3f9466ce4cdb0fa653dbc9ba64e64ac ChangeLog 3987
-MD5 f5a4c637813405c5a7b6a5fa8c68c748 files/digest-ion3-20050116 68
-MD5 d2e9b37a47d3fc3cbb27f5da794f4eb2 files/digest-ion3-20050820 68
-MD5 6cad8bd6cf9ed6738c455bf359ce1201 files/digest-ion3-20051023-r1 68
-MD5 776df82659ec1f00d3e91d59968d7d01 files/digest-ion3-20051029 68
-MD5 09ea5f50bc26d0e5aaf4d81172771233 files/ion3-20051023-r1.patch 7554
-MD5 b5d7e3f2f5b68f51a4bcde5048e1a76c files/ion3-20051029-statusd-locale.patch 684
-MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217
-MD5 e5e408ab1f83116c2138a26b20c86653 files/pwm3.desktop 170
-MD5 15e7cfd3c18e353dd36647b6e5b2023d ion3-20050116.ebuild 1588
-MD5 b3f87a9c4eed784ced6d47f947de5527 ion3-20050820.ebuild 1593
-MD5 0cbbd360ffac763e4de376e723f18bab ion3-20051023-r1.ebuild 1629
-MD5 671494f27e3af1f41523e37a2bb394f1 ion3-20051029.ebuild 1640
+MD5 a489908cc8c9da87e712a8ab7bbcbab6 ion3-20040316.ebuild 1822
+MD5 6128e350a64f9a45ed08c98cbf019093 ChangeLog 233
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
+MD5 efa8a8a6cc7967afcdebd064a8090c2d files/digest-ion3-20040316 68
+MD5 00450ed1292b72e2be71b9860c4db6ee files/ion3.desktop 217
+MD5 16c6e0f00bd204d2f612b781d7b73f54 files/xftde-20040207.patch 18552
diff --git a/x11-wm/ion3/ion3-20050116.ebuild b/x11-wm/ion3/ion3-20050116.ebuild
index b130bc41c804..5228ea6ba993 100644
--- a/x11-wm/ion3/ion3-20050116.ebuild
+++ b/x11-wm/ion3/ion3-20050116.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20050116.ebuild,v 1.7 2005/07/01 21:55:21 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20050116.ebuild,v 1.1 2005/01/25 22:48:56 twp Exp $
 
 inherit eutils
 
@@ -11,11 +11,12 @@ HOMEPAGE="http://www.iki.fi/tuomov/ion/"
 SRC_URI="http://modeemi.cs.tut.fi/~tuomov/ion/dl/${MY_PN}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ppc sparc x86"
+KEYWORDS="~alpha ~ppc ~sparc ~x86 ~amd64 ~hppa"
 IUSE="xinerama"
 DEPEND="virtual/x11
 	app-misc/run-mailcap
-	>=dev-lang/lua-5.0.2"
+	>=dev-lang/lua-5.0.2
+	!x11-wm/ion3-svn"
 S=${WORKDIR}/${MY_PN}
 
 src_compile() {
diff --git a/x11-wm/ion3/ion3-20051029.ebuild b/x11-wm/ion3/ion3-20051029.ebuild
index c76b61d85c87..5c886c22e3b5 100644
--- a/x11-wm/ion3/ion3-20051029.ebuild
+++ b/x11-wm/ion3/ion3-20051029.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20051029.ebuild,v 1.2 2005/11/01 23:04:29 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion3/ion3-20051029.ebuild,v 1.1 2005/10/29 20:35:42 twp Exp $
 
 inherit eutils
 
@@ -20,8 +20,6 @@ S=${WORKDIR}/${MY_PN}
 
 src_compile() {
 
-	epatch ${FILESDIR}/${P}-statusd-locale.patch
-
 	autoreconf -i
 
 	local myconf=""
diff --git a/x11-wm/jwm/ChangeLog b/x11-wm/jwm/ChangeLog
index 14f895275aa6..8e47dd1edbc0 100644
--- a/x11-wm/jwm/ChangeLog
+++ b/x11-wm/jwm/ChangeLog
@@ -1,23 +1,6 @@
 # ChangeLog for x11-wm/jwm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.5 2005/07/01 21:57:27 josejx Exp $
-
-  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> jwm-0.21.ebuild:
-  Marked ppc stable for bug #96737.
-
-*jwm-0.23 (28 May 2005)
-
-  28 May 2005; Mamoru KOMACHI <usata@gentoo.org> +jwm-0.23.ebuild:
-  Version bumped.
-
-*jwm-0.22 (20 May 2005)
-
-  20 May 2005; Mamoru KOMACHI <usata@gentoo.org> jwm-0.21.ebuild,
-  +jwm-0.22.ebuild:
-  Version bumped; bug #92384.
-
-  10 May 2005; David Holm <dholm@gentoo.org> jwm-0.21.ebuild:
-  Added to ~ppc.
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/ChangeLog,v 1.1 2005/03/05 14:07:13 usata Exp $
 
 *jwm-0.21 (05 Mar 2005)
 
diff --git a/x11-wm/jwm/Manifest b/x11-wm/jwm/Manifest
index 38b39ab179c5..c3af48f15dcd 100644
--- a/x11-wm/jwm/Manifest
+++ b/x11-wm/jwm/Manifest
@@ -1,8 +1,2 @@
-MD5 9e2fece728c4486e02ea42fbdac92a0a ChangeLog 825
-MD5 b5f16fd538b52a385dd621f8d6fadc19 jwm-0.22.ebuild 669
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 4c24127514ae1ce44ab55550d782589e jwm-0.21.ebuild 668
-MD5 40a6f144c69fa6dcea69b1dcb7fb2f0a jwm-0.23.ebuild 669
-MD5 4ed8bd13fb6d5b6e6e1fe3a6bcfc1204 files/digest-jwm-0.22 60
-MD5 a1971d6326611a5a995197cebfc19b97 files/digest-jwm-0.23 60
+MD5 e397f565a15cbf97f3dc15017c6f1497 jwm-0.21.ebuild 577
 MD5 e28ad4b7ab93eeda40b88009cde115be files/digest-jwm-0.21 61
diff --git a/x11-wm/jwm/jwm-0.21.ebuild b/x11-wm/jwm/jwm-0.21.ebuild
index 3ccdb9859b42..462573536f41 100644
--- a/x11-wm/jwm/jwm-0.21.ebuild
+++ b/x11-wm/jwm/jwm-0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.21.ebuild,v 1.4 2005/07/01 21:57:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/jwm/jwm-0.21.ebuild,v 1.1 2005/03/05 14:07:13 usata Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://joewing.net/programs/jwm/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc x86"
+KEYWORDS="~x86"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-wm/kahakai/ChangeLog b/x11-wm/kahakai/ChangeLog
index 0d4e179cf832..df9464879bc0 100644
--- a/x11-wm/kahakai/ChangeLog
+++ b/x11-wm/kahakai/ChangeLog
@@ -1,104 +1,6 @@
 # ChangeLog for x11-wm/kahakai
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.22 2005/11/09 12:58:43 gustavoz Exp $
-
-  09 Nov 2005; Gustavo Zacarias <gustavoz@gentoo.org> kahakai-0.6.2.ebuild,
-  kahakai-0.6.2_p20040306.ebuild:
-  Keyworded ~sparc as it should be
-
-  01 Jul 2005; Joseph Jezak <josejx@gentoo.org>
-  kahakai-0.6.2_p20040306.ebuild:
-  Marked ppc stable for bug #97642.
-
-  20 Feb 2005; Mamoru KOMACHI <usata@gentoo.org>
-  kahakai-0.6.2_p20040306.ebuild:
-  Fixed bug #77576 and bug #78933. Thanks to TGL <degrenier@easyconnect.fr>
-  for providing a patch.
-
-  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> kahakai-0.6.1.ebuild,
-  kahakai-0.6.2.ebuild, kahakai-0.6.2_p20040306.ebuild:
-  Stable on x86.
-
-*kahakai-0.6.2_p20040306 (10 May 2004)
-
-  10 May 2004; Mamoru KOMACHI <usata@gentoo.org> kahakai-0.2.1.ebuild,
-  kahakai-0.2.ebuild, kahakai-0.3.ebuild, kahakai-0.4.1.ebuild,
-  kahakai-0.4.ebuild, kahakai-0.5.1.ebuild, kahakai-0.5.ebuild,
-  kahakai-0.6.1.ebuild, kahakai-0.6.2.ebuild, kahakai-0.6.2_p20040306.ebuild,
-  files/kahakai-0.6.2_p20040306-rubyscript-gentoo.diff:
-  Added CVS snapshot. Cleaned out old versions. Removed ruby USE flag
-  from 0.6.2. Don't assign default to S.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> kahakai-0.5.1.ebuild:
-  Add inherit eutils
-
-  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> kahakai-0.2.1.ebuild,
-  kahakai-0.2.ebuild:
-  Add die following econf for bug 48950
-
-  12 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> kahakai-0.6.2.ebuild:
-  virtual/ruby fix
-
-  24 Mar 2004; Jason Wever <weeve@gentoo.org> kahakai-0.6.1.ebuild:
-  Changed -sparc keyword to ~sparc.
-
-*kahakai-0.6.2 (11 Feb 2004)
-
-  11 Feb 2004; Brad Cowan <bcowan@gentoo.org> kahakai-0.6.1.ebuild,
-  kahakai-0.6.2.ebuild:
-  Version bump and clean up.
-
-*kahakai-0.6.1 (09 Feb 2004)
-  09 Feb 2004; Thomas Raschbacher <lordvan@gentoo.org> kahakai-0.6.1.ebuild:
-  new version; 0.6 bugs fixed
-  depends now on dev-libs/boost 
-  -alpha and -sparc because of dev-libs/boost
-	
-*kahakai-0.5.1 (07 Nov 2003)
-
-  09 Jan 2004; Karl Trygve Kalleberg <karltk@gentoo.org> kahakai-0.6.ebuild:
-  Dropped 0.6 altogether, waiting for a better release.
-  
-*kahakai-0.6 (16 Dec 2003)
-
-  16 Dec 2003; Karl Trygve Kalleberg <karltk@gentoo.org> kahakai-0.6.ebuild:
-  New upstream version. Adds a lot more bugs, so it's not even marked 
-  unstable.
-
-  11 Nov 2003; Brad Cowan <bcowan@gentoo.org> kahakai-0.5.1.ebuild:
-  Added pkgconfig dep.
-
-*kahakai-0.5.1 (07 Nov 2003)
-
-  07 Nov 2003; Brad Cowan <bcowan@gentoo.org> kahakai-0.5.1.ebuild,
-  files/kahakai-0.5.1-fix-xinerama.patch:
-  Version bump and xinerama patch thanks to Michael Leuchtenburg
-  <michael@slashome.org>.
-
-*kahakai-0.5 (29 Sep 2003)
-
-  29 Sep 2003; Brad Cowan <bcowan@gentoo.org> kahakai-0.5.ebuild:
-  Version bump.
-
-*kahakai-0.4.1 (06 Sep 2003)
-
-  06 Sep 2003; Brad Cowan <bcowan@gentoo.org> kahakai-0.4.1.ebuild:
-  Version bump.
-
-*kahakai-0.4 (03 Sep 2003)
-
-  03 Sep 2003; Brad Cowan <bcowan@gentoo.org> kahakai-0.4.ebuild:
-  Version bump.
-
-*kahakai-0.3 (29 Jul 2003)
-
-  29 Jul 2003; Brad Cowan <bcowan@gentoo.org> kahakai-0.3.ebuild:
-  Version bump.
-
-*kahakai-0.2.1 (08 Jul 2003)
-
-  08 Jul 2003; Brad Cowan <bcowan@gentoo.org> kahakai-0.2.1.ebuild:
-  Version bump.
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/ChangeLog,v 1.1 2003/06/24 15:05:47 bcowan Exp $
 
 *kahakai-0.2 (24 Jun 2003)
 
diff --git a/x11-wm/kahakai/Manifest b/x11-wm/kahakai/Manifest
index 43f8cdf1620b..d10d082e9699 100644
--- a/x11-wm/kahakai/Manifest
+++ b/x11-wm/kahakai/Manifest
@@ -1,20 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 792e82456e408b35d5c5e4c1b356b285 kahakai-0.6.2.ebuild 922
-MD5 457ec946aee3a372a2cfb95510c25827 kahakai-0.6.2_p20040306.ebuild 1394
-MD5 699fabc1c2c244d84340f335922e775f kahakai-0.6.1.ebuild 911
-MD5 d44c54204fcd3653a3adb368c969d66e ChangeLog 3433
-MD5 e4b5d6602d355a5e9e4ef0ce55b85d78 metadata.xml 313
-MD5 05643c680d338ffa309acf593c757288 files/digest-kahakai-0.6.2_p20040306 75
-MD5 8ab0d5129e5a4405451162db4ec765c1 files/kahakai-0.6.2_p20040306-compilation_fix.patch 248
-MD5 a6f928a370849148c784071b429d2322 files/digest-kahakai-0.6.1 66
-MD5 389f67e9f9e4c3b7c0d97fa260bc7f0a files/digest-kahakai-0.6.2 66
-MD5 1a798baa62c1a3dcacefef7bdcc1af79 files/kahakai-0.6.2_p20040306-rubyscript-gentoo.diff 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDcfKTKRy60XGEcJIRAoZKAJ4x7navtI8DkD4VI5SKYxMCwsyeYwCgtAKZ
-wy1gceTx7U/kEBQQUHWpqQg=
-=iRfw
------END PGP SIGNATURE-----
+MD5 c5d5ff235e470398e55d661e7508ab29 kahakai-0.2.ebuild 657
+MD5 7c0f5c5956238183d7e4f9d0cf71f430 files/digest-kahakai-0.2 63
diff --git a/x11-wm/kahakai/kahakai-0.6.1.ebuild b/x11-wm/kahakai/kahakai-0.6.1.ebuild
index 8aa1e5aeeb62..7e6da852b86c 100644
--- a/x11-wm/kahakai/kahakai-0.6.1.ebuild
+++ b/x11-wm/kahakai/kahakai-0.6.1.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.1.ebuild,v 1.7 2005/02/20 10:46:29 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.1.ebuild,v 1.1 2004/02/09 18:07:47 lordvan Exp $
 
 IUSE="truetype xinerama"
+S=${WORKDIR}/${P}
 
 DESCRIPTION="A language agnostic scriptable window manager based on Waimea."
 HOMEPAGE="http://kahakai.sf.net/"
@@ -10,17 +11,25 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc -alpha ~sparc"
+KEYWORDS="~x86 ~ppc -alpha -sparc"
 
 DEPEND="virtual/x11
 	truetype? ( virtual/xft )
-	>=dev-lang/swig-1.3.20
+	<dev-lang/swig-1.3.18
 	media-libs/imlib2
 	dev-util/pkgconfig
 	media-fonts/artwiz-fonts
 	dev-libs/boost"
 
+#PROVIDE="virtual/blackbox"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
 src_compile() {
+	#./autogen.sh
 	econf \
 		`use_enable xinerama` \
 		`use_enable truetype xft` || die
diff --git a/x11-wm/kahakai/kahakai-0.6.2.ebuild b/x11-wm/kahakai/kahakai-0.6.2.ebuild
index 175a3172b5b8..b26cc2c83a4a 100644
--- a/x11-wm/kahakai/kahakai-0.6.2.ebuild
+++ b/x11-wm/kahakai/kahakai-0.6.2.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2.ebuild,v 1.7 2005/11/09 12:58:43 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2.ebuild,v 1.1 2004/02/11 05:36:16 bcowan Exp $
 
-IUSE="truetype xinerama"
+IUSE="truetype xinerama ruby"
+S=${WORKDIR}/${P}
 
 DESCRIPTION="A language agnostic scriptable window manager based on Waimea."
 HOMEPAGE="http://kahakai.sf.net/"
@@ -10,18 +11,20 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc -alpha ~sparc"
+KEYWORDS="~x86 ~ppc -alpha -sparc"
 
 DEPEND="virtual/x11
 	truetype? ( virtual/xft )
+	ruby? ( dev-lang/ruby )
 	>=dev-lang/swig-1.3.20
-	>=media-libs/imlib2-1.1.0
+	media-libs/imlib2
 	dev-util/pkgconfig
 	media-fonts/artwiz-fonts
 	dev-libs/boost"
 
 src_compile() {
 	econf \
+		`use_enable ruby` \
 		`use_enable xinerama` \
 		`use_enable truetype xft` || die
 	emake || die
diff --git a/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild b/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild
index 24bec77dddbc..5bf480517126 100644
--- a/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild
+++ b/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild,v 1.6 2005/11/09 12:58:43 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/kahakai/kahakai-0.6.2_p20040306.ebuild,v 1.1 2004/05/09 16:29:15 usata Exp $
 
 inherit eutils
 
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P/_p/-}.tar.bz2"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="-alpha ppc ~sparc x86"
+KEYWORDS="~x86 ~ppc -alpha -sparc"
 
 RDEPEND="virtual/x11
 	truetype? ( virtual/xft )
@@ -25,8 +25,7 @@ RDEPEND="virtual/x11
 	dev-libs/boost"
 DEPEND="${RDEPEND}
 	>=sys-devel/autoconf-2.57-r1
-	>=sys-devel/automake-1.7.2
-	sys-devel/libtool"
+	>=sys-devel/automake-1.7.2"
 
 S="${WORKDIR}/${PN}"
 
@@ -34,16 +33,14 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}/src
 	epatch ${FILESDIR}/${P}-rubyscript-gentoo.diff
-	epatch ${FILESDIR}/${P}-compilation_fix.patch
 }
 
 src_compile() {
-	libtoolize --copy --force || die
 	./autogen.sh || die
 	econf \
-		$(use_enable ruby) \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) || die
+		`use_enable ruby` \
+		`use_enable xinerama` \
+		`use_enable truetype xft` || die
 	emake || die
 }
 
diff --git a/x11-wm/larswm/ChangeLog b/x11-wm/larswm/ChangeLog
index 0974491886ac..1b5266958094 100644
--- a/x11-wm/larswm/ChangeLog
+++ b/x11-wm/larswm/ChangeLog
@@ -1,64 +1,9 @@
 # ChangeLog for x11-wm/larswm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/ChangeLog,v 1.15 2005/09/07 03:27:46 metalgod Exp $
-
-  07 Sep 2005; Luis Medinas <metalgod@gentoo.org> larswm-7.5.3.ebuild:
-  Added ~amd64 keyword.
-
-  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> larswm-7.5.2.ebuild,
-  larswm-7.5.3.ebuild:
-  Stable on x86 and alpha.
-
-  05 Oct 2004; Jason Wever <weeve@gentoo.org> larswm-7.5.3.ebuild:
-  Added ~sparc keyword.
-
-  04 Oct 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  larswm-7.5.3.ebuild:
-  Masked larswm-7.5.2.ebuild stable on ppc
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  larswm-7.5.2.ebuild, larswm-7.5.3.ebuild:
-  Masked larswm-7.5.3.ebuild testing for ppc
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  larswm-7.5.2.ebuild:
-  Masked larswm-7.5.2.ebuild testing for ppc
-
-  22 Aug 2004; Tom Gall <tgall@gentoo.org> larswm-7.5.3.ebuild:
-  stable on ppc64, bug #58556
-
-*larswm-7.5.3 (17 Jul 2004)
-
-  17 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> -larswm-7.5.0.ebuild,
-  -larswm-7.5.1.ebuild, larswm-7.5.2.ebuild, +larswm-7.5.3.ebuild:
-  Version bumped, closing bug #57216
-
-*larswm-7.5.2 (30 Jun 2004)
-
-  30 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> +larswm-7.5.2.ebuild:
-  Version bumped. Added to ~alpha. Closing bug #55495
-
-*larswm-7.5.1 (23 Jun 2004)
-
-  23 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> +larswm-7.5.1.ebuild:
-  Version bumped, thanks to Lars Bernhardsson <lab@fnurt.net> in bug #54247
-
-*larswm-7.5.0 (20 Jun 2004)
-
-  20 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> larswm-7.5.0.ebuild,
-  files/larswm.desktop:
-  Version bumped. Ebuild contributed by Lars Bernhardsson <lab@fnurt.net>,
-  closing bug #54247
-
-  07 Mar 2004; Markus Nigbur <pyrania@gentoo.org> larswm-7.2.10.ebuild:
-  SRC_URI fixup.
-
-  04 Nov 2003; Brandon Hale <tseng@gentoo.org> larswm-7.2.10.ebuild,
-  metadata.xml:
-  Bumped 7.2.10 to x86, added metadata
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/ChangeLog,v 1.1 2003/06/13 09:27:48 robh Exp $
 
 *larswm-7.2.10 (13 Jun 2003)
 
   13 Jun 2003; robh <robh@gentoo.org> larswm-7.2.10.ebuild:
-  Initial version. Submitted by Bjorn Lindstrom, closes #19630
+  Initial version. Submitted by Tobias Anderberg, closes #20628
 
diff --git a/x11-wm/larswm/Manifest b/x11-wm/larswm/Manifest
index ceb8346e8ae3..0b9b046237af 100644
--- a/x11-wm/larswm/Manifest
+++ b/x11-wm/larswm/Manifest
@@ -1,19 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 41447050965ff017b2f3625a64681a47 ChangeLog 2135
-MD5 2d167648537163c673984e9ed47a4753 larswm-7.2.10.ebuild 727
-MD5 43c6efb28a54cb0368ea2f25c99d0539 larswm-7.5.2.ebuild 873
-MD5 c9450f1120cda813944727400bd2a7cb larswm-7.5.3.ebuild 896
-MD5 4b470e3e833fafd59c0a36e3290ea44d metadata.xml 604
+MD5 62f9d4b7cd0907d433e44e5e0ac4fb7e larswm-7.2.10.ebuild 676
 MD5 149f89980efd02462740c16d93dfb871 files/digest-larswm-7.2.10 64
-MD5 4b53a7489368e57db5a58ac1a4961212 files/digest-larswm-7.5.2 63
-MD5 6f120345b5bf7816c3efcf73fe74266d files/digest-larswm-7.5.3 63
-MD5 503a5e0afa8702fb702b3a67648576e0 files/larswm.desktop 128
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDHmuAwUpWvClEHQoRAkZCAJ9+wJydKCHZY/8UbMNh00+Sdpy9MACfTdp6
-yWmvrQYydZwZbd9ihN+gMcY=
-=VYp1
------END PGP SIGNATURE-----
diff --git a/x11-wm/larswm/larswm-7.2.10.ebuild b/x11-wm/larswm/larswm-7.2.10.ebuild
index 544f406cbab8..4f67685e7be8 100644
--- a/x11-wm/larswm/larswm-7.2.10.ebuild
+++ b/x11-wm/larswm/larswm-7.2.10.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/larswm-7.2.10.ebuild,v 1.6 2004/07/15 01:13:30 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/larswm-7.2.10.ebuild,v 1.1 2003/06/13 09:27:48 robh Exp $
 
 DESCRIPTION="larswm is a hack for 9wm, adding for instance automatic window tiling and virtual desktops"
-HOMEPAGE="http://www.fnurt.net/larswm/"
-SRC_URI="http://www.fnurt.net/larswm/${P}.tar.gz"
+HOMEPAGE="http://www-personal.umich.edu/~larsb/larswm/"
+SRC_URI="http://www-personal.umich.edu/~larsb/larswm/${P}.tar.gz"
 LICENSE="9wm"
 
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc"
+KEYWORDS="~x86"
 IUSE=""
 DEPEND="virtual/x11"
+S=${WORKDIR}/${P}
 
 src_compile() {
 	xmkmf -a
diff --git a/x11-wm/larswm/larswm-7.5.2.ebuild b/x11-wm/larswm/larswm-7.5.2.ebuild
index f40933f38fc0..6624ce2773d9 100644
--- a/x11-wm/larswm/larswm-7.5.2.ebuild
+++ b/x11-wm/larswm/larswm-7.5.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/larswm-7.5.2.ebuild,v 1.5 2004/10/09 19:22:07 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/larswm-7.5.2.ebuild,v 1.1 2004/06/29 15:21:47 usata Exp $
 
 DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan."
 HOMEPAGE="http://larswm.fnurt.net/"
@@ -8,7 +8,7 @@ SRC_URI="http://larswm.fnurt.net/${P}.tar.gz"
 LICENSE="9wm"
 
 SLOT="0"
-KEYWORDS="x86 alpha ppc"
+KEYWORDS="~x86 ~alpha"
 IUSE=""
 DEPEND="virtual/x11"
 
diff --git a/x11-wm/larswm/larswm-7.5.3.ebuild b/x11-wm/larswm/larswm-7.5.3.ebuild
index 4c3a1211c422..8a0cbf2e4a59 100644
--- a/x11-wm/larswm/larswm-7.5.3.ebuild
+++ b/x11-wm/larswm/larswm-7.5.3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/larswm-7.5.3.ebuild,v 1.7 2005/09/07 03:27:46 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/larswm/larswm-7.5.3.ebuild,v 1.1 2004/07/17 11:12:35 usata Exp $
 
 DESCRIPTION="Tiling window manager for X11, based on 9wm by David Hogan."
 HOMEPAGE="http://larswm.fnurt.net/"
@@ -8,7 +8,7 @@ SRC_URI="http://larswm.fnurt.net/${P}.tar.gz"
 LICENSE="9wm"
 
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc ppc64 ~sparc x86"
+KEYWORDS="~x86 ~alpha"
 IUSE=""
 DEPEND="virtual/x11"
 
diff --git a/x11-wm/lwm/ChangeLog b/x11-wm/lwm/ChangeLog
index 94f92fc3bcc4..3997d7c9acbd 100644
--- a/x11-wm/lwm/ChangeLog
+++ b/x11-wm/lwm/ChangeLog
@@ -1,50 +1,7 @@
 # ChangeLog for x11-wm/lwm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/ChangeLog,v 1.15 2005/07/06 21:07:31 herbs Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/ChangeLog,v 1.1 2002/05/22 14:55:09 seemant Exp $
 
-  06 Jul 2005; Herbie Hopkins <herbs@gentoo.org> lwm-1.2.1.ebuild:
-  Marked ~amd64 wrt bug #97951.
-
-  07 Nov 2004; Jason Wever <weeve@gentoo.org> lwm-1.2.1.ebuild:
-  Stable on sparc.
-
-  04 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> lwm-1.2.1.ebuild:
-  Stable on x86 and ppc.
-
-*lwm-1.2.1 (10 Oct 2004)
-
-  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -lwm-1.1.5.ebuild,
-  lwm-1.2.0.ebuild, +lwm-1.2.1.ebuild:
-  Version bumped. Removed motif IUSE flag which is not relevant anymore.
-
-  18 Jun 2004; Jason Wever <weeve@gentoo.org> lwm-1.2.0.ebuild:
-  Stable on sparc.
-
-*lwm-1.2.0 (21 Feb 2004)
-
-  21 Feb 2004; Mamoru KOMACHI <usata@gentoo.org> lwm-1.2.0.ebuild:
-  Version bumped. Included a manpage. This closes bug #41842
-
-  11 Jan 2004; Heinrich Wendel <lanius@gentoo.org> lwm-1.1.5.ebuild,
-  lwm-1.1.6.ebuild:
-  fixed motif dep
-
-*lwm-1.1.6 (06 Dec 2003)
-
-  06 Dec 2003; Brandon Hale <tseng@gentoo.org> lwm-1.1.6.ebuild:
-  Version bump, closes 34908
-
-  17 Sep 2003; Seemant Kulleen <seemant@gentoo.org> lwm-1.1.5.ebuild:
-  added virtual/motif to DEPEND. Really, that should have been in there in the
-  first place. Thanks to: Marius Mauch <genone@genone.de> in bug #28952
-
-*lwm-1.1.5 (21 Aug 2003)
-
-  21 Aug 2003; Seemant Kulleen <seemant@gentoo.org> lwm-1.1.5.ebuild:
-  version bump thanks to Jim Nutt <jim@nuttz.org> in bug #24553
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *lwm-1.01 (22 May 2002)
 
   22 May 2002; Seemant Kulleen <seemant@gentoo.org> lwm-1.01.ebuild
diff --git a/x11-wm/lwm/Manifest b/x11-wm/lwm/Manifest
index c2730d76e358..e69de29bb2d1 100644
--- a/x11-wm/lwm/Manifest
+++ b/x11-wm/lwm/Manifest
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 589a270b33690e4f0f4b0e720e9c2774 lwm-1.2.0.ebuild 764
-MD5 a3783d5186dc388a6141cf199548dd87 ChangeLog 1785
-MD5 43ffdc0b5650323a5dec031ec725778e metadata.xml 354
-MD5 eb9fd69fa62a957b186182ec8600a8ac lwm-1.2.1.ebuild 612
-MD5 de38fd3c30f149e3e00c125c4275111d files/digest-lwm-1.2.0 60
-MD5 4a569bb24ca62249459bd4b56c224b56 files/digest-lwm-1.2.1 60
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCzEg42G5bA0cA/ScRAnLjAJ92RuESuQxw6zEhLXX8UAAe17XlXgCfdG6s
-xered6Z85DOPUz78LW5AD+Q=
-=2cuw
------END PGP SIGNATURE-----
diff --git a/x11-wm/lwm/lwm-1.2.0.ebuild b/x11-wm/lwm/lwm-1.2.0.ebuild
index 9efd32c53d72..2f9ec3146571 100644
--- a/x11-wm/lwm/lwm-1.2.0.ebuild
+++ b/x11-wm/lwm/lwm-1.2.0.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.2.0.ebuild,v 1.6 2004/10/09 19:35:34 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.2.0.ebuild,v 1.1 2004/02/20 20:05:51 usata Exp $
 
 IUSE="motif"
 
+S=${WORKDIR}/${P}
 DESCRIPTION="The ultimate lightweight window manager"
 SRC_URI="ftp://ftp.cs.york.ac.uk/pub/james/${P}.tar.gz"
 HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
+KEYWORDS="~x86 ~sparc ~ppc"
 
 DEPEND="motif? ( x11-libs/openmotif >=sys-apps/sed-4 )
 	virtual/x11"
diff --git a/x11-wm/lwm/lwm-1.2.1.ebuild b/x11-wm/lwm/lwm-1.2.1.ebuild
index bad424ddf70c..73e38dc34e07 100644
--- a/x11-wm/lwm/lwm-1.2.1.ebuild
+++ b/x11-wm/lwm/lwm-1.2.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.2.1.ebuild,v 1.4 2005/07/06 21:07:31 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/lwm/lwm-1.2.1.ebuild,v 1.1 2004/10/09 19:35:34 usata Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.jfc.org.uk/software/lwm.html"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~amd64 ppc sparc x86"
+KEYWORDS="~x86 ~sparc ~ppc"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-wm/matchbox/ChangeLog b/x11-wm/matchbox/ChangeLog
index 3b94232d51cb..b109e1df630f 100644
--- a/x11-wm/matchbox/ChangeLog
+++ b/x11-wm/matchbox/ChangeLog
@@ -1,22 +1,6 @@
 # ChangeLog for x11-wm/matchbox
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/ChangeLog,v 1.7 2005/10/31 16:21:55 nelchael Exp $
-
-  31 Oct 2005; Krzysiek Pawlik <nelchael@gentoo.org> matchbox-0.7.1.ebuild:
-  Fixed dodoc not to install COPYING and INSTALL.
-
-  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> matchbox-0.7.1.ebuild:
-  Marked ppc stable for bug #97644.
-
-  12 Jun 2005; Michael Sterrett <mr_bones_@gentoo.org>
-  matchbox-0.7.1.ebuild:
-  fix HOMEPAGE (bug #92701)
-
-  10 May 2005; David Holm <dholm@gentoo.org> matchbox-0.7.1.ebuild:
-  Added to ~ppc.
-
-  11 Apr 2004; Markus Nigbur <pyrania@gentoo.org> matchbox-0.7.1.ebuild:
-  Marked stable.
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/ChangeLog,v 1.1 2003/12/16 01:37:17 port001 Exp $
 
 *matchbox-0.7.1 (16 Dec 2003)
 
diff --git a/x11-wm/matchbox/Manifest b/x11-wm/matchbox/Manifest
index 555c68b5ca2c..9aeeac3171f9 100644
--- a/x11-wm/matchbox/Manifest
+++ b/x11-wm/matchbox/Manifest
@@ -1,4 +1,2 @@
-MD5 43f123c6e2ec3885765bbe78a9bb8271 ChangeLog 892
+MD5 8115968b5bd76406b1c2e285b95e4bc0 matchbox-0.7.1.ebuild 1226
 MD5 e4c7a462aef6e5d90a2210cfe9797a60 files/digest-matchbox-0.7.1 66
-MD5 a14bea7adc41daffada01d54e6b27100 matchbox-0.7.1.ebuild 1255
-MD5 fe402b096905cae8dcb4a503d3a838ac metadata.xml 173
diff --git a/x11-wm/matchbox/matchbox-0.7.1.ebuild b/x11-wm/matchbox/matchbox-0.7.1.ebuild
index ef060381b12d..2c5f4739ecf2 100644
--- a/x11-wm/matchbox/matchbox-0.7.1.ebuild
+++ b/x11-wm/matchbox/matchbox-0.7.1.ebuild
@@ -1,16 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/matchbox-0.7.1.ebuild,v 1.7 2005/10/31 16:21:55 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/matchbox/matchbox-0.7.1.ebuild,v 1.1 2003/12/16 01:37:17 port001 Exp $
 
 IUSE="jpeg png nls debug"
 
 DESCRIPTION="Light weight WM designed for use on PDA computers"
-HOMEPAGE="http://projects.o-hand.com/matchbox/"
+HOMEPAGE="http://handhelds.org/~mallum/matchbox/"
 SRC_URI="http://handhelds.org/~mallum/downloadables/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="ppc x86"
+KEYWORDS="~x86"
 
 RDEPEND="virtual/x11
 	dev-libs/expat
@@ -41,6 +41,6 @@ src_compile() {
 
 src_install() {
 	einstall || die "Install failed"
-	dodoc AUTHORS ChangeLog NEWS \
+	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS \
 	      README RELEASE-NOTES-0.7 TODO
 }
diff --git a/x11-wm/metacity/ChangeLog b/x11-wm/metacity/ChangeLog
index 1aa257d2c717..83bb1824ef70 100644
--- a/x11-wm/metacity/ChangeLog
+++ b/x11-wm/metacity/ChangeLog
@@ -1,494 +1,7 @@
 # ChangeLog for x11-wm/metacity
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.136 2005/11/29 07:23:49 leonardop Exp $
-
-*metacity-2.12.2 (29 Nov 2005)
-
-  29 Nov 2005; Leonardo Boshell <leonardop@gentoo.org>
-  +metacity-2.12.2.ebuild:
-  New version.
-
-  10 Oct 2005; Hardave Riar <hardave@gentoo.org> metacity-2.10.3.ebuild:
-  Stable on mips.
-
-*metacity-2.12.1 (04 Oct 2005)
-
-  04 Oct 2005; Leonardo Boshell <leonardop@gentoo.org>
-  -metacity-2.12.0.ebuild, +metacity-2.12.1.ebuild:
-  New version.
-
-  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> metacity-2.10.3.ebuild:
-  Mark 2.10.3 stable on alpha
-
-  11 Sep 2005; Guy Martin <gmsoft@gentoo.org> metacity-2.10.3.ebuild:
-  Stable on hppa.
-
-  08 Sep 2005; Aron Griffis <agriffis@gentoo.org> metacity-2.10.3.ebuild:
-  Mark 2.10.3 stable on ia64
-
-*metacity-2.12.0 (06 Sep 2005)
-
-  06 Sep 2005; Leonardo Boshell <leonardop@gentoo.org>
-  -metacity-2.11.3.ebuild, +metacity-2.12.0.ebuild:
-  New version.
-
-  03 Sep 2005; Markus Rothe <corsair@gentoo.org> metacity-2.10.3.ebuild:
-  Stable on ppc64
-
-  03 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
-  metacity-2.10.3.ebuild:
-  Stable on ppc.
-
-  02 Sep 2005; <dang@gentoo.org> ChangeLog:
-  Marked stable on amd64
-
-  31 Aug 2005; Herbie Hopkins <herbs@gentoo.org> metacity-2.10.3.ebuild:
-  Stable on amd64.
-
-*metacity-2.11.3 (30 Aug 2005)
-
-  30 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
-  -metacity-2.11.2.ebuild, +metacity-2.11.3.ebuild:
-  New version. Updated dependencies.
-
-  29 Aug 2005; Guy Martin <gmsoft@gentoo.org> metacity-2.10.2.ebuild:
-  Stable on hppa.
-
-  29 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  metacity-2.10.3.ebuild:
-  Stable on sparc
-
-  29 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
-  metacity-2.10.3.ebuild:
-  Stable on x86.
-
-  26 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  metacity-2.10.2.ebuild:
-  Stable on sparc
-
-  25 Aug 2005; Aron Griffis <agriffis@gentoo.org> metacity-2.10.2.ebuild:
-  stable on ia64
-
-  25 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
-  metacity-2.10.2.ebuild:
-  Stable on x86.
-
-  23 Aug 2005; Aron Griffis <agriffis@gentoo.org> metacity-2.10.1.ebuild:
-  stable on ia64
-
-*metacity-2.11.2 (19 Aug 2005)
-
-  19 Aug 2005; Leonardo Boshell <leonardop@gentoo.org>
-  +metacity-2.11.2.ebuild:
-  New version.
-
-  08 Aug 2005; Markus Rothe <corsair@gentoo.org> metacity-2.10.1.ebuild:
-  Stable on ppc64
-
-  02 Aug 2005; Simon Stelling <blubb@gentoo.org> metacity-2.10.1.ebuild:
-  stable on amd64
-
-  31 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
-  metacity-2.10.1.ebuild:
-  ppc stable
-
-*metacity-2.10.3 (28 Jul 2005)
-
-  28 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> metacity-2.10.3.ebuild:
-  New version.
-
-  27 Jul 2005; Guy Martin <gmsoft@gentoo.org> metacity-2.10.1.ebuild:
-  Stable on hppa.
-
-  27 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  metacity-2.10.1.ebuild:
-  Stable on sparc
-
-  26 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> metacity-2.10.1.ebuild:
-  Stable on x86.
-
-*metacity-2.10.2 (18 Jul 2005)
-
-  18 Jul 2005; Leonardo Boshell <leonardop@gentoo.org> metacity-2.10.2.ebuild:
-  New version. Added the 'static' USE flag.
-
-  11 Jul 2005; Stephen P. Becker <geoman@gentoo.org> metacity-2.10.0.ebuild:
-  stable on mips
-
-  26 Jun 2005; Guy Martin <gmsoft@gentoo.org> metacity-2.10.0.ebuild:
-  Stable on hppa.
-
-  12 Jun 2005; Olivier Crête <tester@gentoo.org> metacity-2.10.0.ebuild:
-  Stable on amd64
-
-  12 Jun 2005; Tobias Scherbaum <dertobi123@gentoo.org>
-  metacity-2.10.0.ebuild:
-  Stable on ppc.
-
-  12 Jun 2005; Bryan Østergaard <kloeri@gentoo.org> metacity-2.10.0.ebuild:
-  Stable on alpha.
-
-  09 Jun 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  metacity-2.10.0.ebuild:
-  Stable on sparc
-
-  09 Jun 2005; Markus Rothe <corsair@gentoo.org> metacity-2.10.0.ebuild:
-  Stable on ppc64
-
-  18 May 2005; Jason Wever <weeve@gentoo.org> metacity-2.8.13.ebuild:
-  Stable on SPARC.
-
-  11 May 2005; Guy Martin <gmsoft@gentoo.org> metacity-2.8.13.ebuild:
-  Stable on hppa.
-
-  07 May 2005; Herbie Hopkins <herbs@gentoo.org> metacity-2.8.13.ebuild:
-  Stable on amd64.
-
-  27 Apr 2005; Bryan Østergaard <kloeri@gentoo.org> metacity-2.8.13.ebuild:
-  Stable on alpha + ia64.
-
-  25 Apr 2005; Mike Gardiner <obz@gentoo.org> metacity-2.8.13.ebuild:
-  Keyworded ppc x86
-
-*metacity-2.10.1 (17 Apr 2005)
-
-  17 Apr 2005; Joe McCann <joem@gentoo.org> +metacity-2.10.1.ebuild:
-  bugfix release
-
-  07 Apr 2005; Simon Stelling <blubb@gentoo.org> metacity-2.8.8.ebuild:
-  stable on amd64
-
-  02 Apr 2005; Stephen P. Becker <geoman@gentoo.org> metacity-2.8.8.ebuild:
-  stable on mips
-
-  20 Mar 2005; Bryan Østergaard <kloeri@gentoo.org> metacity-2.8.8.ebuild:
-  Stable on alpha.
-
-  09 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> metacity-2.8.8.ebuild:
-  Stable on sparc
-
-*metacity-2.10.0 (09 Mar 2005)
-
-  09 Mar 2005; Joe McCann <joem@gentoo.org> +metacity-2.10.0.ebuild:
-  gnome-2.10 release
-
-  09 Mar 2005; Mike Gardiner <obz@gentoo.org> metacity-2.8.8.ebuild:
-  Keyworded x86 ppc
-
-*metacity-2.8.13 (23 Feb 2005)
-
-  23 Feb 2005; Mike Gardiner <obz@gentoo.org> +metacity-2.8.13.ebuild:
-  New version
-
-  08 Jan 2005; Tom Martin <slarti@gentoo.org> metacity-2.8.6-r1.ebuild:
-  Stable on amd64.
-
-  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  24 Dec 2004; Bryan Østergaard <kloeri@gentoo.org> :
-  Stable on alpha.
-
-  23 Dec 2004; Guy Martin <gmsoft@gentoo.org> metacity-2.8.6-r1.ebuild:
-  Stable on hppa.
-
-  21 Dec 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  metacity-2.8.6-r1.ebuild:
-  Stable on sparc
-
-  19 Dec 2004; Bryan Østergaard <kloeri@gentoo.org>
-  metacity-2.8.6-r1.ebuild:
-  Stable on alpha.
-
-  19 Dec 2004; Mike Gardiner <obz@gentoo.org> metacity-2.8.6-r1.ebuild,
-  -metacity-2.8.6.ebuild:
-  Keyworded x86 and ppc for GNOME 2.8.1
-
-*metacity-2.8.8 (11 Dec 2004)
-
-  11 Dec 2004; Mike Gardiner <obz@gentoo.org> +metacity-2.8.8.ebuild:
-  New version
-
-*metacity-2.8.6-r1 (08 Dec 2004)
-
-  08 Dec 2004; Mike Gardiner <obz@gentoo.org> +metacity-2.8.6-r1.ebuild:
-  Patch to move the logout keybinding into metacity, from control-center -
-  goes with patch in control-center-2.8.1-r1
-
-  22 Nov 2004; Bryan Østergaard <kloeri@gentoo.org> metacity-2.8.5.ebuild:
-  Stable on alpha.
-
-  12 Nov 2004; Mike Gardiner <obz@gentoo.org> metacity-2.8.5.ebuild:
-  Keyworded ppc for GNOME 2.8
-
-  12 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org> metacity-2.8.5.ebuild:
-  Stable on sparc
-
-  05 Nov 2004; Mike Gardiner <obz@gentoo.org> metacity-2.6.3.ebuild,
-  metacity-2.6.5.ebuild, metacity-2.8.0.ebuild:
-  Using the toolchain-funcs eclass for handling the detection of CC version,
-  rather than doing it ourselves, see bug #70119
-
-*metacity-2.8.6 (04 Nov 2004)
-
-  04 Nov 2004; Mike Gardiner <obz@gentoo.org> +metacity-2.8.6.ebuild:
-  New version, as requested in bug #69711
-
-  01 Oct 2004; Stephen P. Becker <geoman@gentoo.org> metacity-2.8.1.ebuild:
-  stable on mips
-
-*metacity-2.8.5 (14 Sep 2004)
-
-  14 Sep 2004; foser <foser@gentoo.org> metacity-2.8.5.ebuild :
-  Gnome 2.8 release
-
-  07 Aug 2004; Bryan Østergaard <kloeri@gentoo.org> metacity-2.8.1.ebuild:
-  Stable on alpha.
-
-  05 Aug 2004; Gustavo Zacarias <gustavoz@gentoo.org> metacity-2.8.1.ebuild:
-  Stable on sparc
-
-  05 Aug 2004; Guy Martin <gmsoft@gentoo.org> metacity-2.8.1.ebuild:
-  Stable on hppa.
-
-  31 Jul 2004; <spider@gentoo.org> metacity-2.8.1.ebuild:
-  stable on x86 for gnome 2.6.2
-
-  28 Jul 2004; Tom Gall <tgall@gentoo.org> metacity-2.8.1.ebuild:
-  stable on ppc64, bug #58191
-
-  04 Jul 2004; Bryan Østergaard <kloeri@gentoo.org> metacity-2.8.0.ebuild:
-  Stable on alpha.
-
-  30 Jun 2004; Aron Griffis <agriffis@gentoo.org> metacity-2.6.3.ebuild,
-  metacity-2.6.5.ebuild:
-  fix broken subshells
-
-  04 Jun 2004; Stephen P. Becker <geoman@gentoo.org> metacity-2.8.0.ebuild:
-  Stable on mips.
-
-  26 May 2004; Guy Martin <gmsoft@gentoo.org> metacity-2.8.0.ebuild:
-  Marked stable on hppa.
-
-  13 May 2004; Stephen P. Becker <geoman@gentoo.org> metacity-2.6.5.ebuild,
-  metacity-2.8.0.ebuild:
-  Stable on mips.
-
-*metacity-2.8.1 (05 May 2004)
-
-  31 Mar 2004; foser <foser@gentoo.org> metacity-2.8.0.ebuild :
-  Add patch to fix xinerama configure switch (#46291)
-
-  30 Mar 2004; Luca Barbato <lu_zero@gentoo.org> :
-  Removed an unnecessary patch
-
-*metacity-2.8.0 (23 Mar 2004)
-
-  23 Mar 2004; foser <foser@gentoo.org> metacity-2.8.0.ebuild :
-  Gnome 2.6 final
-
-  19 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> metacity-2.6.5.ebuild:
-  stable on sparc
-
-*metacity-2.7.1 (19 Mar 2004)
-
-  19 Mar 2004; foser <foser@gentoo.org> metacity-2.7.1.ebuild :
-  Gnome 2.6 RC1 commit, added xinerama USE
-
-  16 Mar 2004; Stephen P. Becker <geoman@gentoo.org> metacity-2.6.5.ebuild:
-  Added ~mips keyword.
-
-*metacity-2.6.5 (17 Feb 2004)
-
-  17 Feb 2004; foser <foser@gentoo.org> metacity-2.6.5.ebuild :
-  New release
-
-  10 Feb 2004; Bartosch Pixa <darkspecter@gentoo.org> metacity-2.6.3.ebuild:
-  set ppc in keywords
-
-  29 Jan 2004; Aron Griffis <agriffis@gentoo.org> metacity-2.6.3.ebuild:
-  stable on alpha and ia64
-
-  18 Jan 2004; <gustavoz@gentoo.org> metacity-2.6.3.ebuild:
-  stable on hppa and sparc
-
-  14 Jan 2004; Mike Gardiner <obz@gentoo.org> metacity-2.6.3.ebuild:
-  Stable on x86 as part of GNOME-2.4.1
-
-  14 Nov 2003; Aron Griffis <agriffis@gentoo.org> metacity-2.6.2.ebuild:
-  Stable on ia64
-
-  13 Nov 2003; Brad House <brad_mssw@gentoo.org> metacity-2.6.3.ebuild:
-  fixes -fPIC bug it appears, marking stable on amd64
-
-  12 Nov 2003; Todd Sunderlin <todd@gentoo.org> metacity-2.6.2.ebuild:
-  marked stable on sparc
-
-  08 Nov 2003; Todd Sunderlin <todd@gentoo.org> metacity-2.6.1.ebuild:
-  added sparc keyword
-
-*metacity-2.6.3 (29 Oct 2003)
-
-  29 Oct 2003; foser <foser@gentoo.org> metacity-2.6.3.ebuild :
-  New version
-
-  22 Oct 2003; Bartosch Pixa <darkspecter@gentoo.org> metacity-2.6.1.ebuild:
-  set ppc in keywords
-
-  17 Oct 2003; Aron Griffis <agriffis@gentoo.org> metacity-2.6.2.ebuild:
-  Stable on alpha
-
-  05 Oct 2003; Mike Gardiner <obz@gentoo.org> metacity-2.6.1.ebuild:
-  Marked stable on x86
-
-*metacity-2.6.2 (04 Oct 2003)
-
-  13 Dec 2003; Guy Martin <gmsoft@gentoo.org> metacity-2.6.2.ebuild :
-  Marked stable on hppa.
-
-  04 Oct 2003; foser <foser@gentoo.org> metacity-2.6.2.ebuild :
-  New version
-
-  23 Sep 2003; Bartosch Pixa <darkspecter@gentoo.org> metacity-2.4.55.ebuild:
-  set ppc in keywords
-
-  12 Sep 2003; foser <foser@gentoo.org> metacity-*.ebuild :
-  Corrected all SLOT to be 0 and fixed HOMEPAGE in 2.6.1
-
-*metacity-2.6.1 (12 Sep 2003)
-
-  12 Sep 2003; <spider@gentoo.org> metacity-2.6.1.ebuild:
-  Versionbump
-
-*metacity-2.6.0 (10 Sep 2003)
-
-  10 Sep 2003; Mike Gardiner <obz@gentoo.org> metacity-2.6.0.ebuild:
-  New version
-
-*metacity-2.5.5 (07 Sep 2003)
-
-  07 Sep 2003; foser <foser@gentoo.org> metacity-2.5.5.ebuild :
-  Gnome 2.4 rc1
-
-  25 Aug 2003; Mike Gardiner <obz@gentoo.org> metacity-2.4.55.ebuild:
-  Moved to stable on x86
-
-  29 May 2003; Luca Barbato <lu_zero@gentoo.org> metacity-2.4.34.ebuild :
-  Add ppc to KEYWORDS
-
-*metacity-2.4.55 (22 May 2003)
-
-  01 Jul 2003; Guy Martin <gmsoft@gentoo.org> metacity-2.4.55.ebuild :
-  Added ~hppa to KEYWORDS.
-
-  22 May 2003; foser <foser@gentoo.org> metacity-2.4.55.ebuild :
-  New version, removed libglade dep, added IUSE 
-  changed HOMEPAGE into something less incorrect
-
-  07 Feb 2003; Aron Griffis <agriffis@gentoo.org> metacity-2.4.34.ebuild :
-  Add ~alpha to KEYWORDS
-
-*metacity-2.4.34 (05 Feb 2003)
-
-  01 Jul 2003; Guy Martin <gmsoft@gentoo.org> metacity-2.4.34.ebuild :
-  Added hppa to KEYWORDS.
-
-  09 Apr 2003; Todd Sunderlin <todd@gentoo.org> metacity-2.4.34.ebuild:
-  Marked stable for sparc.
-
-  01 Mar 2003; Jason Wever <weeve@gentoo.org> metacity-2.4.34.ebuild:
-  Added ~sparc to keywords.
-
-  22 Feb 2003; Aron Griffis <agriffis@gentoo.org> metacity-2.4.34.ebuild :
-  Don't build in parallel; closes bug #14405
-
-  21 Feb 2003; Aron Griffis <agriffis@gentoo.org> metacity-2.4.34.ebuild :
-  Mark stable on Alpha
-  
-  05 Feb 2003; Spider <spider@gentoo.org> metacity-2.4.34.ebuild :
-  Gnome 2.2 final version
-  
-  
-*metacity-2.4.21 (30 Jan 2003)
-
-  30 Jan 2003; foser <foser@gentoo.org> metacity-2.4.21.ebuild :
-  GNOME 2.2 RC2 commit
-
-*metacity-2.4.8 (04 Jan 2003)
-
-  04 Jan 2003; foser <foser@gentoo.org> metacity-2.4.8.ebuild :
-  New version
-
-  17 Dec 2002; Aron Griffis <agriffis@gentoo.org> metacity-2.4.1.ebuild :
-  Added ~alpha to KEYWORDS
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*metacity-2.4.3 (03 Nov 2002)
-
-  03 Nov 2002; Jon Nall <nall@gentoo.org> metacity-2.4.3.ebuild :
-  Fixed gcc 3.2 patch for PPC version.
-
-  03 Nov 2002; foser <foser@gentoo.org> metacity-2.4.3.ebuild :
-  New version. Fixed deps, added startup-notification.
-
-*metactiy-2.4.2 (27 Oct 2002)
-
-  31 oct 2002; Mark Guertin <gerk@gentoo.org> metacity-2.4.2.ebuild :
-  set as -ppc (It doesn't ork at all on ppc).  please make sure to set
-  as ~arch in future for testing.
-
-  27 Oct 2002; foser <foser@gentoo.org> metacity-2.4.2.ebuild :
-  gnome 2.1 commit
-
-*metacity-2.4.1 (20 Sep 2002)
-  25 Sep 2002; Mark Guertin <gerk@gentoo.org> metacity-2.4.1.ebuild : 
-  updated ppc patch and re-insterted (still needed).  Patch is being
-  re-submitted upstream.
-
-  20 Sep 2002; Spider <spider@gentoo.org> metacity-2.4.1.ebuild : version bump,
-  removed the ppc patch
-
-  
-*metacity-2.4.0 (07 Aug 2002)
-  15 Aug 2002; Mark Guertin <gerk@gentoo.org> metacity-2.4.0.ebuild :
-  Added ppc gcc 3.2 patch
-
-  13 Aug 2002; Pieter Van den Abeele <pvdabeel@gentoo.org> metacity-2.4.0.ebuild :
-  Added ppc keyword
-
-  07 Aug 2002; Gabriele Giorgetti <stroke@gentoo.org> metacity-2.4.0.ebuild :
-  Version bump.
-
-*metacity-2.3.987-r2 (27 Jun 2002)
-  02 Aug 2002; Mark Guertin <gerk@gentoo.org>:
-  Added ppc to keywords
-
-  27 Jun 2002; Spider <spider@gentoo.org> metacity-2.3.987-r2.ebuild :
-  a quick update to depend on libglade as supposed, and also moving to gnome2.eclass
-  
-* metacity-2.3.987-r1.ebuild (24 Jun 2002)
-
-  24 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Move /usr/libexec/* to /usr/lib/.
-
-* metacity-2.3.987.ebuild (10 Jun 2002)
-  10 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
-  New version.
-
-* metacity-2.3.610-r1.ebuild (10 Jun 2002)
-  10 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
-  Updated dependencies.
-
-* metacity-2.3.610 (4 Jun 2002)
-  4 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> ChangeLog :
-  Here we go bumpin' again. ( new version ).
-
-* metacity-2.3.377 (23 May 2002)
-  23 May 2002; Spider <spider@gentoo.org>  metacity-2.3.377.ebuild :
-  Version bump
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/ChangeLog,v 1.1 2002/05/22 22:56:03 spider Exp $
 
 * metacity-2.3.233 (22 May 2002)
   22 May 2002; Spider <spider@gentoo.org>  metacity-2.3.233.ebuild :
   a gtk+ 2.0 windowmanager thats gnome compliant
-
diff --git a/x11-wm/metacity/Manifest b/x11-wm/metacity/Manifest
index 71b17e88cf6a..0bee95a4091c 100644
--- a/x11-wm/metacity/Manifest
+++ b/x11-wm/metacity/Manifest
@@ -1,9 +1,16 @@
-MD5 d3f4d206745ea3684b4365e86ef62846 ChangeLog 14759
-MD5 8085853ac850bbbd443d6f4c030f39bf files/digest-metacity-2.10.3 69
-MD5 16961ede777e7728d18f802db072e251 files/digest-metacity-2.12.1 69
-MD5 52d6f3845641e5004a00cb8fffc1d8a8 files/digest-metacity-2.12.2 69
-MD5 98f6fd8a6545a37a2ddf9b0e11ce54f7 files/metacity-2-logout.patch 7363
-MD5 32bfb0fc7521103b5b5a4f5c6f32ce3a metacity-2.10.3.ebuild 1257
-MD5 7c3acd3b4aaeab17a989e45166252589 metacity-2.12.1.ebuild 1282
-MD5 d169214716cd8bd7f80caf504373e1b9 metacity-2.12.2.ebuild 1284
-MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+MD5 5c81809203d4969fd95b37f2f4ed9f9a metacity-2.4.1.ebuild 1073
+MD5 41ec0363c84c4f571a0a9af9bb4b5a0c metacity-2.4.21.ebuild 978
+MD5 054fa844f30f6e7906c97f71f1af0e6b metacity-2.4.8.ebuild 925
+MD5 e10f53067be46d2818a52124b23fa463 metacity-2.4.55.ebuild 1039
+MD5 dd4602bf3b056f5c867d3889fce2278f metacity-2.4.0.ebuild 1077
+MD5 e10f53067be46d2818a52124b23fa463 metacity-2.4.34.ebuild 1039
+MD5 f5d2cb28bd79c195d6814d7b9ae3b377 ChangeLog 3526
+MD5 888edb091b2a7f1feebf5ad86907048f files/metacity-2.4.3-ppc-gcc3.2.diff 1062
+MD5 be03404ddfeb13e12276ec1037a5ea42 files/metacity-2.4.0-ppc-gcc3.2.diff 1211
+MD5 a72a1bec809aa05fb1b9002b934f7bca files/metacity-2.4.1-ppc-gcc3.2.diff 1211
+MD5 ce1a348b82224b28a6d0550299e16db5 files/digest-metacity-2.4.21 69
+MD5 4b8d31e149958238c018a4464a5f354f files/digest-metacity-2.4.34 69
+MD5 e5a49c7190b101c113e02491301f77fe files/digest-metacity-2.4.55 69
+MD5 7ac184656985fb8fc03f30bc35a641cf files/digest-metacity-2.4.0 67
+MD5 532afda9465b65441cfce76596155801 files/digest-metacity-2.4.1 67
+MD5 15c118d1ecea21cba60d8000c7c3a6cd files/digest-metacity-2.4.8 67
diff --git a/x11-wm/metacity/files/digest-metacity-2.10.0 b/x11-wm/metacity/files/digest-metacity-2.10.0
new file mode 100644
index 000000000000..2beaa2d303d8
--- /dev/null
+++ b/x11-wm/metacity/files/digest-metacity-2.10.0
@@ -0,0 +1 @@
+MD5 fed363d8ce6ae33d6dd4850c8e48fbbc metacity-2.10.0.tar.bz2 1581003
diff --git a/x11-wm/metacity/files/digest-metacity-2.12.2 b/x11-wm/metacity/files/digest-metacity-2.12.2
deleted file mode 100644
index 6a85b56a6d3a..000000000000
--- a/x11-wm/metacity/files/digest-metacity-2.12.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4caabbd7a3ae14ec5ccf6ada2d466049 metacity-2.12.2.tar.bz2 1671369
diff --git a/x11-wm/metacity/metacity-2.12.2.ebuild b/x11-wm/metacity/metacity-2.10.0.ebuild
index 1931a688108c..c507785502f9 100644
--- a/x11-wm/metacity/metacity-2.12.2.ebuild
+++ b/x11-wm/metacity/metacity-2.10.0.ebuild
@@ -1,55 +1,51 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.12.2.ebuild,v 1.1 2005/11/29 07:23:49 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.10.0.ebuild,v 1.1 2005/03/09 07:58:34 joem Exp $
 
-inherit eutils gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="Gnome default windowmanager"
 HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~x86 ~ppc ~alpha ~sparc ~hppa ~amd64 ~ia64 ~mips ~ppc64 ~arm"
 IUSE="xinerama"
 
 # not parallel-safe; see bug #14405
 MAKEOPTS="${MAKEOPTS} -j1"
 
 RDEPEND="virtual/x11
-	>=x11-libs/gtk+-2.6
 	>=x11-libs/pango-1.2
+	>=x11-libs/gtk+-2.2.0-r1
 	>=gnome-base/gconf-2
-	>=dev-libs/glib-2.6
 	>=x11-libs/startup-notification-0.7
 	!x11-misc/expocity"
 
 DEPEND="${RDEPEND}
 	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.28"
+	>=dev-util/pkgconfig-0.12.0
+	>=dev-util/intltool-0.29"
 
-USE_DESTDIR="1"
-DOCS="AUTHORS ChangeLog HACKING NEWS README *.txt doc/*.txt"
+# Compositor is too unreliable
+G2CONF="${G2CONF} $(use_enable xinerama) --disable-compositor"
 
-
-pkg_setup() {
-	# Compositor is too unreliable
-	G2CONF="$(use_enable xinerama) \
-		--disable-compositor"
-}
+DOCS="AUTHORS ChangeLog HACKING NEWS README *txt"
 
 src_unpack() {
-	unpack "${A}"
-	cd "${S}"
 
+	unpack ${A}
+	cd ${S}
 	# Fix the logout shortcut problems, by moving the keybindings
 	# into here, from control-center, fixes bug #52034
-	epatch "${FILESDIR}"/${PN}-2-logout.patch
+	epatch ${FILESDIR}/metacity-2-logout.patch
+
 }
 
 pkg_postinst() {
+
 	gnome2_pkg_postinst
 
-	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted"
-	einfo "border effects"
+	einfo "Metacity & Xorg X11 with composite enabled may cause unwanted border effects"
+
 }
diff --git a/x11-wm/metacity/metacity-2.10.3.ebuild b/x11-wm/metacity/metacity-2.10.3.ebuild
index f5a61a8f77f2..4473bcbd3529 100644
--- a/x11-wm/metacity/metacity-2.10.3.ebuild
+++ b/x11-wm/metacity/metacity-2.10.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.10.3.ebuild,v 1.11 2005/10/10 21:07:50 hardave Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metacity/metacity-2.10.3.ebuild,v 1.1 2005/07/28 23:32:29 leonardop Exp $
 
 inherit eutils gnome2
 
@@ -9,7 +9,7 @@ HOMEPAGE="http://www.gnome.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 IUSE="static xinerama"
 
 # not parallel-safe; see bug #14405
diff --git a/x11-wm/metadata.xml b/x11-wm/metadata.xml
index 18fc26320d94..9ca199514e47 100644
--- a/x11-wm/metadata.xml
+++ b/x11-wm/metadata.xml
@@ -4,26 +4,5 @@
 	<longdescription lang="en">
 		The x11-wm category contains X11 window managers.
 	</longdescription>
-	<longdescription lang="de">
-		Die Kategorie x11-wm enthält verschiedene Window Manager für X11.
-	</longdescription>
-	<longdescription lang="es">
-		La categoría x11-wm contiene manejadores de ventanas para X11.
-	</longdescription>
-	<longdescription lang="ja">
-		x11-wmカテゴリーにはX11のウィンドゥ・マネージャーが含まれています。
-	</longdescription>
-	<longdescription lang="nl">
-		De x11-wm categorie bevat verschillende window managers voor X11.
-	</longdescription>
-	<longdescription lang="sk">
-		Kategória x11-wm obsahuje správcov okien (window managers) pre X11.
-	</longdescription>
-	<longdescription lang="vi">
-		Nhóm x11-wm chứa các trình quản lý cửa sổ X11.
-	</longdescription>
-	<longdescription lang="it">
-		La categoria x11-wm contiene dei gestori di finestre per X11.
-	</longdescription>
 </catmetadata>
 
diff --git a/x11-wm/metisse/ChangeLog b/x11-wm/metisse/ChangeLog
index 02dad546c3b6..91a13d0da76e 100644
--- a/x11-wm/metisse/ChangeLog
+++ b/x11-wm/metisse/ChangeLog
@@ -1,52 +1,6 @@
 # ChangeLog for x11-wm/metisse
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/ChangeLog,v 1.11 2005/07/12 04:53:26 josejx Exp $
-
-  12 Jul 2005; Joseph Jezak <josejx@gentoo.org>
-  +files/metisse-0.3.5-mmx-config.patch, metisse-0.3.5.ebuild:
-  Added wormo's fix for mmx, see bug #98050.
-
-  23 Apr 2005; Michael Hanselmann <hansmi@gentoo.org> metisse-0.3.5.ebuild:
-  Stable on ppc.
-
-  16 Apr 2005; Mamoru KOMACHI <usata@gentoo.org>
-  -files/metisse-0.3.1-FvwmGtk.1-DESTDIR.diff, -metisse-0.3.3.ebuild,
-  metisse-0.3.5.ebuild:
-  Stable on x86.
-
-  05 Mar 2005; Simon Stelling <blubb@gentoo.org> metisse-0.3.5.ebuild:
-  won't work until somebody provides a patch for the assembler-parts, see bug
-  #83473
-
-*metisse-0.3.5 (20 Feb 2005)
-
-  20 Feb 2005; Mamoru KOMACHI <usata@gentoo.org> metisse-0.3.4.ebuild,
-  +metisse-0.3.5.ebuild:
-  Version bumped. Changed freetype USE flag to truetype. (bug #74873)
-
-*metisse-0.3.4 (03 Dec 2004)
-
-  03 Dec 2004; Mamoru KOMACHI <usata@gentoo.org> -metisse-0.3.2.ebuild,
-  +metisse-0.3.4.ebuild:
-  Version bumped.
-
-  03 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> metisse-0.3.3.ebuild:
-  Marked as stable.
-
-*metisse-0.3.3 (03 Sep 2004)
-
-  03 Sep 2004; Mamoru KOMACHI <usata@gentoo.org>
-  -files/metisse-0.3.1-gcc-3.4.diff, -metisse-0.3.1.ebuild,
-  metisse-0.3.2.ebuild, +metisse-0.3.3.ebuild:
-  Version bumped; bug #62657. Marked 0.3.2 stable and removed 0.3.1.
-
-  04 Aug 2004; David Holm <dholm@gentoo.org> metisse-0.3.2.ebuild:
-  Added to ~ppc.
-
-*metisse-0.3.2 (04 Aug 2004)
-
-  04 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> +metisse-0.3.2.ebuild:
-  Version bumped.
+# Copyright 1999-2004 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/ChangeLog,v 1.1 2004/07/26 08:02:46 usata Exp $
 
 *metisse-0.3.1 (26 Jul 2004)
 
diff --git a/x11-wm/metisse/Manifest b/x11-wm/metisse/Manifest
index ba77c71c55ae..4a7f1abbee21 100644
--- a/x11-wm/metisse/Manifest
+++ b/x11-wm/metisse/Manifest
@@ -1,7 +1,2 @@
-MD5 349cec38fdb4f27b3b0a231d5cb2d828 ChangeLog 2044
-MD5 bd188a43cc088ca73161889614be3035 metisse-0.3.4.ebuild 1112
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 072de6949a16bf1ce0d0a93bc644dbac metisse-0.3.5.ebuild 1316
-MD5 9b064fb7563ea3a27b17c5c02871eba9 files/digest-metisse-0.3.5 67
-MD5 417e224f0ecd4c48bc9f5cffdeaa7787 files/digest-metisse-0.3.4 67
-MD5 ba83f501db0ce112a985289ca34a7bb4 files/metisse-0.3.5-mmx-config.patch 2038
+MD5 026ac198d58605d937ef1d72d3ccf2bb metisse-0.3.1.ebuild 791
+MD5 4cf49b0a64c86d0ec1fc6a3c7ba660c9 files/digest-metisse-0.3.1 67
diff --git a/x11-wm/metisse/metisse-0.3.4.ebuild b/x11-wm/metisse/metisse-0.3.4.ebuild
index 57e114d83f00..9b737c37d57e 100644
--- a/x11-wm/metisse/metisse-0.3.4.ebuild
+++ b/x11-wm/metisse/metisse-0.3.4.ebuild
@@ -1,38 +1,27 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/metisse-0.3.4.ebuild,v 1.2 2005/02/20 10:55:13 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/metisse-0.3.4.ebuild,v 1.1 2004/12/03 04:12:47 usata Exp $
 
 # fc is broken
-IUSE="truetype xv opengl"
+IUSE="freetype xv"
 
 DESCRIPTION="Experimental X desktop with some OpenGL capacity."
 SRC_URI="http://insitu.lri.fr/~chapuis/software/metisse/${P}.tar.bz2"
 HOMEPAGE="http://insitu.lri.fr/~chapuis/metisse"
 
 DEPEND="virtual/x11
-	>=x11-libs/nucleo-0.1_p20041130
-	truetype? ( media-libs/freetype )"
+	>=x11-libs/nucleo-0.1_p20041130"
 RDEPEND="${DEPEND}
 	!x11-wm/fvwm"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc"
 
 src_compile() {
-	local myconf
-	if use opengl && use x86 ; then
-		myconf="${myconf} --enable-glx-x86"
-	elif use opengl ; then
-		myconf="${myconf} --enable-glx --disable-glx-x86"
-	else
-		myconf="${myconf} --disable-glx --disable-glx-x86"
-	fi
-
 	econf \
 		$(use_enable xv) \
-		$(use_enable truetype freetype) \
-		${myconf} \
+		$(use_enable freetype) \
 		|| die "configure failed"
 	emake -j1 || die "make failed"
 }
diff --git a/x11-wm/metisse/metisse-0.3.5.ebuild b/x11-wm/metisse/metisse-0.3.5.ebuild
index 79b705a025ac..d6087b3e0e8f 100644
--- a/x11-wm/metisse/metisse-0.3.5.ebuild
+++ b/x11-wm/metisse/metisse-0.3.5.ebuild
@@ -1,11 +1,9 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/metisse-0.3.5.ebuild,v 1.5 2005/07/12 04:53:26 josejx Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/metisse/metisse-0.3.5.ebuild,v 1.1 2005/02/20 10:55:13 usata Exp $
 
 # fc is broken
-IUSE="truetype xv opengl mmx"
+IUSE="truetype xv opengl"
 
 DESCRIPTION="Experimental X desktop with some OpenGL capacity."
 SRC_URI="http://insitu.lri.fr/~chapuis/software/metisse/${P}.tar.bz2"
@@ -19,14 +17,7 @@ RDEPEND="${DEPEND}
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc -amd64"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/metisse-0.3.5-mmx-config.patch
-	libtoolize --copy --force
-}
+KEYWORDS="~x86 ~ppc"
 
 src_compile() {
 	local myconf
@@ -38,10 +29,6 @@ src_compile() {
 		myconf="${myconf} --disable-glx --disable-glx-x86"
 	fi
 
-	if use mmx ; then
-		myconf="${myconf} --enable-mmx"
-	fi
-
 	econf \
 		$(use_enable xv) \
 		$(use_enable truetype freetype) \
diff --git a/x11-wm/openbox/ChangeLog b/x11-wm/openbox/ChangeLog
index 678b90772d16..a44093f8bc34 100644
--- a/x11-wm/openbox/ChangeLog
+++ b/x11-wm/openbox/ChangeLog
@@ -1,549 +1,6 @@
 # ChangeLog for x11-wm/openbox
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.104 2005/11/26 18:58:48 gothgirl Exp $
-
-*openbox-3.3_rc2-r1 (26 Nov 2005)
-
-  26 Nov 2005; <gothgirl@gentoo.org>
-  +files/openbox-3.3_rc2-64bit-property.patch, +openbox-3.3_rc2-r1.ebuild:
-  64bit property patch added
-
-  29 Oct 2005; <gothgirl@gentoo.org> openbox-3.3_rc2.ebuild:
-  pango support corrected wrt bug#106131
-
-  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> openbox-3.2-r2.ebuild:
-  Mark 3.2-r2 stable on alpha
-
-*openbox-3.3_rc2 (13 Sep 2005)
-
-  13 Sep 2005; Brandon Low <lostlogic@gentoo.org> +openbox-3.3_rc2.ebuild:
-  Long awaited bump, I hope that doins instead of cp doesn't break the
-  below fix.
-
-  24 Aug 2005; Diego Pettenò <flameeyes@gentoo.org>
-  openbox-3.3_rc1-r2.ebuild:
-  FreeBSD fixes: cp -a -> cp -pPR.
-
-  01 May 2005; Guy Martin <gmsoft@gentoo.org> openbox-3.2-r2.ebuild:
-  Stable on hppa.
-
-  07 Apr 2005; Simon Stelling <blubb@gentoo.org> openbox-3.2-r2.ebuild:
-  stable on amd64
-
-*openbox-3.3_rc1-r2 (05 Apr 2005)
-
-  05 Apr 2005; Brandon Low <lostlogic@gentoo.org> openbox-3.3_rc1-r1.ebuild,
-  +openbox-3.3_rc1-r2.ebuild:
-  Fix bug 87160
-
-  30 Mar 2005; Michael Hanselmann <hansmi@gentoo.org> openbox-3.2-r2.ebuild:
-  Stable on ppc.
-
-  29 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> openbox-3.2-r2.ebuild:
-  Stable on sparc
-
-*openbox-3.3_rc1-r1 (29 Mar 2005)
-
-  29 Mar 2005; Brandon Low <lostlogic@gentoo.org> -openbox-3.3_rc1.ebuild,
-  +openbox-3.3_rc1-r1.ebuild:
-  use enable pango in 3.3_rc1
-
-*openbox-3.3_rc1 (28 Mar 2005)
-
-  28 Mar 2005; Brandon Low <lostlogic@gentoo.org> openbox-3.2-r2.ebuild,
-  +openbox-3.3_rc1.ebuild:
-  Bump for new _rc release (yay), and mark the previous ebuild stable
-
-  06 Feb 2005; Aaron Kulbe <superlag@gentoo.org> openbox-3.2-r2.ebuild:
-  Keyworded on all arches for -r2
-
-*openbox-3.2-r2 (06 Feb 2005)
-
-  06 Feb 2005; Aaron Kulbe <superlag@gentoo.org> +openbox-3.2-r2.ebuild:
-  Adding startup notification support.  Bug # 79023
-
-  05 Feb 2005; Aaron Kulbe <superlag@gentoo.org> metadata.xml:
-  Changing maintainer from commonbox herd to SuperLag (Aaron Kulbe)
-
-  28 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
-  Change encoding to UTF-8 for GLEP 31 compliance
-
-  18 Jul 2004; Brandon Hale <tseng@gentoo.org> -openbox-3.0-r1.ebuild,
-  -openbox-3.0.ebuild, -openbox-3.1-r1.ebuild, -openbox-3.1.ebuild,
-  -openbox-3.2.ebuild:
-  Big cleanup.
-
-  08 Jun 2004; Travis Tilley <lv@gentoo.org> openbox-3.2-r1.ebuild,
-  openbox-3.2.ebuild:
-  stable on amd64
-
-  10 May 2004; Travis Tilley <lv@gentoo.org> openbox-3.2-r1.ebuild:
-  added ~amd64 keyword
-
-  09 May 2004; <SeJo@gentoo.org> openbox-3.2-r1.ebuild:
-  added ~ppc keyword
-
-  09 May 2004; Bryan Østergaard <kloeri@gentoo.org> openbox-3.2-r1.ebuild:
-  Keyword ~alpha.
-
-  07 May 2004; Gustavo Zacarias <gustavoz@gentoo.org> openbox-3.2-r1.ebuild:
-  Stable on sparc
-
-  06 May 2004; Brandon Hale <tseng@gentoo.org> -openbox-2.3.0.ebuild,
-  -openbox-2.3.1.ebuild:
-  Clear out old 2.x series.
-
-*openbox-3.2-r1 (06 May 2004)
-
-  06 May 2004; Brandon Hale <tseng@gentoo.org>
-  +files/openbox-3.2-makefile.patch, +openbox-3.2-r1.ebuild:
-  Apply Makefile fix from bug #50190.
-
-  27 Apr 2004; Gustavo Zacarias <gustavoz@gentoo.org> openbox-3.2.ebuild:
-  Keyworded sparc
-
-  25 Apr 2004; Brandon Hale <tseng@gentoo.org> openbox-3.2.ebuild:
-  Stable on x86.
-
-*openbox-3.2 (17 Apr 2004)
-
-  17 Apr 2004; Brandon Hale <tseng@gentoo.org> +openbox-3.2.ebuild:
-  Version bump, the bounty goes again to Aaron Kulbe (SuperLag)
-
-  24 Mar 2004; Chris Aniszczyk <zx@gentoo.org> openbox-3.1-r1.ebuild:
-  Marking unstable on hppa ;)
-
-  12 Mar 2004; Brandon Hale <tseng@gentoo.org> openbox-3.0-r1.ebuild,
-  openbox-3.0.ebuild, openbox-3.1-r1.ebuild, openbox-3.1.ebuild:
-  Cleaned up {R,}DEPEND, closes bug #44508
-
-  07 Mar 2004; Brandon Hale <tseng@gentoo.org> openbox-1.2.4.ebuild,
-  openbox-2.1.3-r4.ebuild:
-  Out with the old...
-
-*openbox-3.1-r1 (07 Mar 2004)
-
-  07 Mar 2004; Brandon Hale <tseng@gentoo.org> openbox-3.1-r1.ebuild,
-  files/openbox.desktop:
-  Add .desktop file in preperation for new GDM, bug #40711
-
-  03 Mar 2004; Gustavo Zacarias <gustavoz@gentoo.org> openbox-3.1.ebuild:
-  stable on sparc
-
-  29 Feb 2004; Brandon Hale <tseng@gentoo.org> openbox-3.1.ebuild:
-  Keyword x86 for real this time.
-
-  05 Jan 2004; Jason Wever <weeve@gentoo.org> openbox-3.0-r1.ebuild:
-  Marked stable on sparc.
-
-*openbox-3.1 (22 Dec 2003)
-
-  22 Dec 2003; Brandon Hale <tseng@gentoo.org> openbox-3.1.ebuild:
-  Version bump, thanks to SuperLag on freenode for his lightening fast report.
-
-  14 Dec 2003; Lars Weiler <pylon@gentoo.org> openbox-3.0-r1.ebuild:
-  Masked stable on ppc
-
-  09 Dec 2003; Brandon Low <lostlogic@gentoo.org> openbox-3.0-r1.ebuild:
-  ewan != ewarn
-
-*openbox-3.0-r1 (07 Dec 2003)
-
-  07 Dec 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0-r1.ebuild:
-  Removing 3 suffix from binary and session files.
-
-  06 Dec 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0.ebuild:
-  Marking stable on x86.
-
-  07 Nov 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0.ebuild:
-  Added some more usable themes for users with limited vision.
-
-  06 Nov 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0.ebuild:
-  Bump and cleanup.
-
-*openbox-3.0_rc4 (13 Oct 2003)
-
-  13 Oct 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_rc2.ebuild,
-  openbox-3.0_rc4.ebuild:
-  Version bump.
-
-*openbox-3.0_rc3 (09 Oct 2003)
-
-  09 Oct 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta6.ebuild,
-  openbox-3.0_rc1.ebuild, openbox-3.0_rc3.ebuild:
-  Cleanup and bump.
-
-*openbox-3.0_rc2 (03 Oct 2003)
-
-  03 Oct 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_rc2.ebuild:
-  Vesion bump.
-
-*openbox-3.0_rc1 (29 Sep 2003)
-
-  29 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta5.ebuild,
-  openbox-3.0_rc1.ebuild:
-  Version bump.
-
-  26 Sep 2003; Jason Wever <weeve@gentoo.org> openbox-3.0_beta5.ebuild,
-  openbox-3.0_beta6.ebuild:
-  Added ~sparc keyword.
-
-*openbox-3.0_beta6 (26 Sep 2003)
-
-  26 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta3.ebuild,
-  openbox-3.0_beta4.ebuild, openbox-3.0_beta6.ebuild:
-  Version bump.
-
-*openbox-3.0_beta5 (25 Sep 2003)
-
-  25 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta5.ebuild:
-  New release to fix some bugs, nothing fun :(
-
-*openbox-3.0_beta4 (22 Sep 2003)
-
-  22 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta4.ebuild:
-  version bump, some config files + themes have moved once again, see
-  openbox.org for details.
-
-  20 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta1.ebuild,
-  openbox-3.0_beta2.ebuild, openbox-3.0_beta3.ebuild:
-  add missing dependency on libxml2, closes #29104
-
-*openbox-3.0_beta3 (15 Sep 2003)
-
-  15 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_alpha6.ebuild,
-  openbox-3.0_alpha7.ebuild, openbox-3.0_alpha8.ebuild,
-  openbox-3.0_beta3.ebuild:
-  Version bump + cleanup.
-
-*openbox-3.0_beta2 (15 Sep 2003)
-
-  11 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta2.ebuild:
-  Added dependency on >=fontconfig-2
-
-*openbox-3.0_beta2 (09 Sep 2003)
-
-  09 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta2.ebuild:
-  Version bump, again with the theme format changes =/
-
-  05 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta1.ebuild:
-  Small tweak to install a session file under /etc/X11/Sessions
-
-*openbox-3.0_beta1 (03 Sep 2003)
-
-  03 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_beta1.ebuild:
-  Version bump.
-
-  03 Sep 2003; Brandon Hale <tseng@gentoo.org> metadata.xml:
-  Added metadata.xml
-
-*openbox-3.0_alpha8 (03 Sep 2003)
-
-  03 Sep 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_alpha4.ebuild,
-  openbox-3.0_alpha5.ebuild, openbox-3.0_alpha8.ebuild:
-  Version bump + cleanup old builds
-
-*openbox-3.0_alpha7 (31 Aug 2003)
-
-  31 Aug 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_alpha7.ebuild:
-  Version bump!
-
-  29 Aug 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_alpha6.ebuild:
-  Fixed dependencies to include glib and gtk+2 (for obconf)
-
-*openbox-3.0_alpha6 (24 Aug 2003)
-
-  24 Aug 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_alpha6.ebuild:
-  Version bump.
-
-*openbox-3.0_alpha5 (20 Aug 2003)
-
-  20 Aug 2003; Brandon Hale <tseng@gentoo.org> openbox-3.0_alpha5.ebuild:
-  Version Bump, menu now split to its own file
-
-*openbox-3.0_alpha4 (02 Aug 2003)
-
-  02 Aug 2003; Seemant Kulleen <seemant@gentoo.org> openbox-3.0_alpha4.ebuild:
-  Brandon Hale <brandon@inclusivetech.net> fixed up the ebuild that mkeadle
-  wrote up for this alpha version of ob3
-
-  18 Jul 2003; Seemant Kulleen <seemant@gentoo.org> openbox-2.3.0.ebuild:
-  hacky fix to disable NLS being built in this version -- use the MYCONF to
-  override. commonbox.eclass adjusted to accept this variable
-
-  24 Jun 2003; Tavis Ormandy <taviso@gentoo.org> openbox-2.3.1.ebuild:
-  marking ~alpha
-
-  19 Jun 2003; mkeadle <mkeadle@gentoo.org> openbox-2.3.0.ebuild,
-  openbox-2.3.1.ebuild, files/openbox-gcc.patch:
-  adding minor patch to help with potential compiles against gcc3.3
-
-  12 Jun 2003; <msterret@gentoo.org> openbox-2.1.3-r4.ebuild:
-  fix Header
-
-*openbox (20 May 2003)
-
-  03 Jun 2003; mkeadle <mkeadle@gentoo.org> openbox*.ebuild :
-  Moved xft usage to USE="truetype" test in commonbox.eclass
-
-  20 May 2003; mkeadle <mkeadle@gentoo.org> openbox*.ebuild :
-  Removed local --enable-xinerama flags and move to a USE test
-  in commonbox.eclass.
-
-*openbox-2.3.1 (07 May 2003)
-
-  19 Jun 2003; mkeadle <mkeadle@gentoo.org> openbox-2.3.1.ebuild :
-  2.3.1 goes back into ~unstable land. Font and NLS issues seem to
-  be unresolvable. Program authors are focused on name major
-  release.
-
-  20 May 2003; mkeadle <mkeadle@gentoo.org> openbox-2.3.1.ebuild :
-  Moving into stable x86 land.
-
-  07 May 2003; mkeadle <mkeadle@gentoo.org> openbox-2.3.1.ebuild :
-  New release (royal city). Was a slight issue with non-compile on
-  gcc 2.95x but that's been fixed now. Cheers.
-
-*openbox-2.3.0 (07 Feb 2003)
-
-  18 Apr 2003; foser <foser@gentoo.org> openbox*.ebuild :
-  Fixed xft dep to be virtual
-
-  21 Mar 2003; Jason Wever <weeve@gentoo.org> openbox-2.3.0.ebuild:
-  Added sparc to keywords.
-
-  13 Feb 2003; Mark Guertin <gerk@gentoo.org> openbox-2.2.0-r1.ebuild 
-  openbox-2.2.0.ebuild openbox-2.2.1-r1.ebuild openbox-2.2.1-r2.ebuild 
-  openbox-2.2.1.ebuild openbox-2.2.2-r1.ebuild openbox-2.2.2-r2.ebuild 
-  openbox-2.2.2.ebuild openbox-2.2.3.ebuild openbox-2.3.0.ebuild :
-  set ppc in keywords
-
-  07 Feb 2003; Matt Keadle <mkeadle@gentoo.org> openbox-2.3.0.ebuild
-  files/digest-openbox-2.3.0
-
-  Bump to latest version. Even though this is considered stable by the
-  ob team, it is marked ~x86 as it will not build without Xft2 (which
-  is ~x86 itself).
-
-*openbox-2.2.3 (02 Jan 2003)
-
-  02 Jan 2003; Matt Keadle <mkeadle@gentoo.org> openbox-2.2.3.ebuild
-  files/digest-openbox-2.2.3
-
-  Bump to latest version. 2.2.3 takes the 2.2.x series out of testing
-  to make room for the 3.x branch. This release has officially been
-  declared stable, and has been moved into unmasked x86 territory.
-
-*openbox-2.1.3-r4 (10 Dec 2002)
-
-  10 Dec 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.1.3-r4
-  files/digest-openbox-2.1.3-r4
-
-  Left out the fix for xftlsfonts on non-Xft2 systems.
-
-*openbox-2.2.2-r2 (09 Dec 2002)
-
-  09 Dec 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.2.2-r2.ebuild
-  files/digest-openbox-2.2.2-r2
-
-  Openbox 2.2.2 now depends on x11-libs/xft for Xft2.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*openbox-2.2.2 (08 Dec 2002)
-
-  08 Dec 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.2.2.ebuild
-  files/digest-openbox-2.2.2
-
-  Bumped to latest devel release
-
-  08 Dec 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.2.2-r1.ebuild
-  files/digest-openbox-2.2.2-r1
-
-  Once again repaired to enable xftlsfonts.
-
-*openbox-2.1.3-r2 (08 Dec 2002)
-
-  08 Dec 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.1.3-r2.ebuild
-  files/digest-openbox-2.1.3-r2
-
-  Repared so xftlsfonts gets built instead of being stripped out.
-
-  08 Dec 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.1.3-r3.ebuild
-  files/digest-openbox-2.1.3-r3
-
-  Once again repaired to enable xftlsfonts.
-
-*openbox-2.2.1-r2 (08 Dec 2002)
-
-  08 Dec 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.2.1-r2.ebuild
-  files/digest-openbox-2.2.1-r2
-
-  Fixed so that you don't lose antialiase text if you have Xft2 installed.
-
-*openbox-2.2.1-r1 (25 Nov 2002)
-
-  25 Nov 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.2.1-r1.ebuild
-  files/digest-openbox-2.2.1-r1
-
-  Cleaned out some unneeded empty directories and fixed so the button
-  .xbm files were actually installed. At the moment, Openbox is the
-  only *box that can use pixmaps as buttons, and the styles contained
-  in commonbox-styles are not setup to use those pixmaps. New
-  commonbox-styles release is forthcoming.
-
-*openbox-2.1.3-r1 (25 Nov 2002)
-
-  25 Nov 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.1.3-r1.ebuild
-  files/digest-openbox-2.1.3-r1
-
-  Fixes so NLS catalogs actually get installed to /usr/share/locale.
-  They were not being installed at all before. A default epistrc file
-  is now placed as /usr/share/commonbox/epistrc.default
-
-  Removed installation of the xftlsfonts man page, since the xftlsfonts
-  program is not currently being installed due to Xft2 issues.
-
-*openbox-2.2.1 (20 Nov 2002)
-
-  20 Nov 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.2.1.ebuild
-  files/digest-openbox-2.2.1
-
-  Version bump to latest development release. It starting to get interesting
-  with Xft1/2. Fluxbox is now making use of Xft for antialiased text.
-  However, fluxbox and openbox and using opposing versions of Xft.
-  Currently our xft (2.x) ebuild is masked, which openbox needs/want. I can
-  do some sedding to remove the compilation to utils/xftlsfonts but that
-  can't become even a semi-permanent fix.
-
-*openbox-2.1.3 (4 Nov 2002)
-
-  4 Nov 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.1.3.ebuild
-  files/digest-openbox-2.1.3 :
-
-  version bump to latest stable release.
-
-*openbox-2.2.0-r1 (25 Oct 2002)
-
-  22 Apr 2003; Brandon Low <lostlogic@gentoo.org> openbox-2.1.2-r1.ebuild,
-  openbox-2.1.3-r1.ebuild, openbox-2.1.3-r2.ebuild, openbox-2.1.3-r3.ebuild,
-  openbox-2.1.3-r4.ebuild, openbox-2.1.3.ebuild, openbox-2.2.0-r1.ebuild,
-  openbox-2.2.1-r1.ebuild, openbox-2.2.1-r2.ebuild, openbox-2.2.1.ebuild,
-  openbox-2.2.2-r1.ebuild, openbox-2.2.2.ebuild:
-  Change supersed dependencies
-
-  25 Oct 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.2.0-r1.ebuild
-  files/digest-openbox-2.2.0-r1 :
-
-  Fix bug 9541, issues with xfree 4.2.1
-
-*openbox-2.1.2-r1 (25 Oct 2002)
-
-  05 Oct 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.1.2-r1.ebuild
-  files/digest-openbox-2.1.2-r1 :
-
-  Fix bug 9541, issues with xfree 4.2.1
-    
-*openbox-2.2.0 (23 Oct 2002)
-
-  23 Oct 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.2.0.ebuild
-  files/digest-openbox-2.2.0 :
-
-  version bump to newest devel release
-
-*openbox-2.1.2 (07 Oct 2002)
-
-  07 Oct 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.1.2.ebuild
-  files/digest-openbox-2.1.2 :
-
-  version bump
-
-*openbox-2.1.1 (25 Sep 2002)
-
-  25 Sep 2002; Matt Keadle <mkeadle@gentoo.org> openbox-2.1.1.ebuild
-  files/digest-openbox-2.1.1 :
-
-  version bump, placed in slot "1" as this is the stable version now, also 
-  removed the -dev from the binary. Thanks for the ebuild Brad. New
-  fieron theme has been merged into commonbox-styles.
-
-*openbox-2.0.0-r2 (04 Sep 2002)
-
-  04 Sep 2002; Seemant Kulleen <seemant@gentoo.org> openbox-2.0.0-r2.ebuild
-  files/digest-openbox-2.0.0-r2 :
-
-  menu is now again in /usr/share/commonbox/menu and nls stuff in
-  /usr/share/locale.
-
-  04 Sep 2002; Seemant Kulleen <seemant@gentoo.org> openbox-2.0.0-r1.ebuild
-  files/digest-openbox-2.0.0-r1 :
-
-  epist and xftlsfonts were not being installed.  This corrects that.
-  Thanks to xOr and gentoo users reporting to him about him (hint:
-  bugs.gentoo.org people!).
-
-*openbox-2.0.0 (16 Aug 2002)
-
-  16 Aug 2002; Seemant Kulleen <seemant@gentoo.org> openbox-2.0.0.ebuild
-  files/digest-openbox-2.0.0 :
-
-  Version bump for newest development openbox.  This one has xinerama
-  support as well.
-
-*openbox-1.2.5_beta20020714-r1 (18 jul 2002)
-  24 Jul 2002; Mark Guertin <gerk@gentoo.org> :
-  Added ppc to keywords
-
-  18 Jul 2002; Spider <spider@gentoo.org> openbox-1.2.5_beta20020714-r1.ebuild :
-  updated, now with AA
-  make sure your ~/.openbox/rc has something like this in it to force AA on if you dont have a AA style :
-  window.xft.font:        arial
-  window.xft.size:        10
-  menu.title.xft.font:    arial
-  menu.title.xft.size:    11
-  menu.title.xft.flags:   bold
-  menu.frame.xft.font:    arial
-  menu.frame.xft.size:    11
-  toolbar.xft.font:       arial
-  toolbar.xft.size:       11
-
-  
-
-*openbox-0.99.3-r1 (14 Jul 2002)
-
-  14 Jul 2002; Seemant Kulleen <seemant@gentoo.org> openbox-0.99.3-r1.ebuild
-  files/digest-openbox-0.99.3-r1 :
-
-  Using the commonbox eclass now.
-
-*openbox-1.2.4 (14 Jul 2002)
-
-  14 Jul 2002; Seemant Kulleen <seemant@gentoo.org> openbox-1.2.4.ebuild
-  files/digest-openbox-1.2.4 : 
-
-  Version bump for newest stable.  No xft/antialiasing.
-
-*openbox-1.2.5_beta20020714 (14 Jul 2002)
-
-  14 Jul 2002; Seemant Kulleen <seemant@gentoo.org>
-  openbox-1.2.5_beta20020714.ebuild files/digest-openbox-1.2.5_beta20020714 :
-
-  cvs snapshot of openbox.  has Xft/antialiasing built-in.
-
-*openbox-1.2.3 (21 Jun 2002)
-
-  21 Jun 2002; Seemant Kulleen <seemant@gentoo.org> openbox-1.2.3.ebuild
-  files/digest-openbox-1.2.3 :
-
-  Version bump to newest development, which upstream reports as being quite
-  stable and of which they encourage the use.
-
-*openbox-0.99.3 (25 May 2002)
-
-  25 May 2002; Seemant Kulleen <seemant@gentoo.org> openbox-0.99.3.ebuild
-  files/digest-openbox-0.99.3 :
-
-  Version bump.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/ChangeLog,v 1.1 2002/04/29 11:16:22 seemant Exp $
 
 *openbox-0.99.1 (29 Apr 2002)
 
diff --git a/x11-wm/openbox/Manifest b/x11-wm/openbox/Manifest
index 5efdc51b4671..9f57cc4fc8d5 100644
--- a/x11-wm/openbox/Manifest
+++ b/x11-wm/openbox/Manifest
@@ -1,20 +1,41 @@
-MD5 9c8245e542e468332f14349d53f93b9a ChangeLog 18098
-MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2-r1 134
-MD5 90beb2a0e34f8958dd4c1f3312856d09 files/digest-openbox-3.2-r2 134
-MD5 519483ed863bad15ab1a51dc3a9d8e07 files/digest-openbox-3.3_rc1-r1 138
-MD5 519483ed863bad15ab1a51dc3a9d8e07 files/digest-openbox-3.3_rc1-r2 138
-MD5 122fd8de469e2b587a061d7228b2581e files/digest-openbox-3.3_rc2 138
-MD5 122fd8de469e2b587a061d7228b2581e files/digest-openbox-3.3_rc2-r1 138
-MD5 df0043ec05d0e257c30a0c1b7b28a78e files/openbox-2.3.1-epist.patch 318
-MD5 0b79bdcff70f29cdaf7980382b34dee4 files/openbox-2.3.1-nls-codeset.patch 306
-MD5 9cf0208bdd9705c3aa2ec4a2be62c138 files/openbox-3.2-makefile.patch 413
-MD5 f628d964589ac827c70bca569312d813 files/openbox-3.3_rc2-64bit-property.patch 6458
-MD5 056f24d600f8f7ad2c02642ecd41ebfa files/openbox-gcc.patch 276
-MD5 87a0450483a263221557f426bd7b0d60 files/openbox.desktop 192
-MD5 d87e96216b91be365fcbc08521298824 metadata.xml 251
-MD5 79cff5950461065f7c400f64e3ff2c92 openbox-3.2-r1.ebuild 1504
-MD5 51397ff312937bcbf2bfdb88761a0784 openbox-3.2-r2.ebuild 1580
-MD5 8fc6220800cdabdff66278338255b2d2 openbox-3.3_rc1-r1.ebuild 1732
-MD5 e798f2ca4ac6aea747d905d99447ed86 openbox-3.3_rc1-r2.ebuild 1734
-MD5 dbdaf44c7f626b42a784d2160e4385d2 openbox-3.3_rc2-r1.ebuild 1663
-MD5 7713c362072065b5b6ab5548884aee91 openbox-3.3_rc2.ebuild 1644
+MD5 9189bc2f5d469198a3b0e3cf985b20b8 openbox-2.2.1-r1.ebuild 1041
+MD5 91d9e3353f8b64f94a0857798564de57 openbox-2.1.3-r4.ebuild 735
+MD5 e9948666a1b8b3271ead14ee1127f2cd openbox-2.2.2.ebuild 1097
+MD5 a0654cd71441b8f77644e8499d1e217a openbox-2.3.0.ebuild 1091
+MD5 f830e9eb17ef1a81673fbd38176370f8 openbox-1.2.4.ebuild 618
+MD5 79fd032df642e7b4d1783866761e78e9 openbox-2.1.1.ebuild 502
+MD5 2c9ddbdd26f8b6c4bc362bc4a738c27e openbox-2.1.3-r1.ebuild 753
+MD5 46d9f24d194baa3c35d7dd78fa3d52ab openbox-2.2.0-r1.ebuild 659
+MD5 9e1b6da9e8cf6512d48cbe52264a1fd4 openbox-2.2.2-r2.ebuild 925
+MD5 6e1638b8c1417d2938e5fd5fe5d33f13 openbox-2.0.0-r2.ebuild 611
+MD5 279498f56808321016bb7de9e39e4df4 openbox-2.1.3.ebuild 535
+MD5 1908f64276506c7e4036d55d78a58792 openbox-2.1.3-r3.ebuild 647
+MD5 95fc161b4b55ca9d20ae901ae86cca60 openbox-2.2.1.ebuild 711
+MD5 0084ef06893f9221e6de1843a54a62fe openbox-2.1.2-r1.ebuild 540
+MD5 62f4a0c1342bbbe38cac5d48fa383448 openbox-2.2.1-r2.ebuild 1003
+MD5 595a06aff86d5cad4958d58a6c20de42 openbox-2.2.3.ebuild 1085
+MD5 304cbcb72f46ca24b1aecf60597a5c64 openbox-2.2.2-r1.ebuild 1001
+MD5 0c5c34b84e2c3b0796882ba2a0af7008 ChangeLog 8363
+MD5 b6ca1ed4e1696583a94c1d51776885db openbox-2.1.2.ebuild 490
+MD5 6ab64ac1a256d3338e7f12f7c1a05b0d openbox-2.1.3-r2.ebuild 748
+MD5 c6236d94e9d502cbc56a38650e5ee4f8 openbox-2.2.0.ebuild 610
+MD5 f0b52d0f48a8b10c418a6d6558c4198c files/digest-openbox-1.2.4 65
+MD5 10c8a17a08bd609cb789d77379d0d677 files/digest-openbox-2.1.1 65
+MD5 162882a530504c4719df268bdfacb0bd files/digest-openbox-2.1.2 65
+MD5 14ea1589afa8d9807619faebdd1468b5 files/digest-openbox-2.1.3 65
+MD5 b1d8eae43e221318303fbf4cf7a1898f files/digest-openbox-2.2.0 65
+MD5 eba705f1fbc8be9f92580963fc6c0fcf files/digest-openbox-2.2.1 65
+MD5 6cd0a4363fba7d72650f7ff05feeccc3 files/digest-openbox-2.2.2 65
+MD5 e8589341225f245da1c161354af49738 files/digest-openbox-2.2.3 65
+MD5 e8173797964d97d9293eee8faa1a95aa files/digest-openbox-2.3.0 65
+MD5 365ae590165658c15ba268e25262b8cb files/digest-openbox-2.0.0-r2 65
+MD5 162882a530504c4719df268bdfacb0bd files/digest-openbox-2.1.2-r1 65
+MD5 14ea1589afa8d9807619faebdd1468b5 files/digest-openbox-2.1.3-r1 65
+MD5 14ea1589afa8d9807619faebdd1468b5 files/digest-openbox-2.1.3-r2 65
+MD5 14ea1589afa8d9807619faebdd1468b5 files/digest-openbox-2.1.3-r3 65
+MD5 14ea1589afa8d9807619faebdd1468b5 files/digest-openbox-2.1.3-r4 65
+MD5 b1d8eae43e221318303fbf4cf7a1898f files/digest-openbox-2.2.0-r1 65
+MD5 eba705f1fbc8be9f92580963fc6c0fcf files/digest-openbox-2.2.1-r1 65
+MD5 eba705f1fbc8be9f92580963fc6c0fcf files/digest-openbox-2.2.1-r2 65
+MD5 6cd0a4363fba7d72650f7ff05feeccc3 files/digest-openbox-2.2.2-r1 65
+MD5 6cd0a4363fba7d72650f7ff05feeccc3 files/digest-openbox-2.2.2-r2 65
diff --git a/x11-wm/openbox/files/digest-openbox-3.3_rc2 b/x11-wm/openbox/files/digest-openbox-3.3_rc2
index 63bf9cec59ef..5ce86541bd10 100644
--- a/x11-wm/openbox/files/digest-openbox-3.3_rc2
+++ b/x11-wm/openbox/files/digest-openbox-3.3_rc2
@@ -1,2 +1,2 @@
-MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
 MD5 1ff100d27cc1f47dadebb884a696dac3 openbox-3.3-rc2.tar.gz 585486
+MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
diff --git a/x11-wm/openbox/files/digest-openbox-3.3_rc2-r1 b/x11-wm/openbox/files/digest-openbox-3.3_rc2-r1
deleted file mode 100644
index 63bf9cec59ef..000000000000
--- a/x11-wm/openbox/files/digest-openbox-3.3_rc2-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 3d69bb394dae0994461172fccedc602a ob-themes-usability.tar.bz2 19204
-MD5 1ff100d27cc1f47dadebb884a696dac3 openbox-3.3-rc2.tar.gz 585486
diff --git a/x11-wm/openbox/files/openbox-3.3_rc2-64bit-property.patch b/x11-wm/openbox/files/openbox-3.3_rc2-64bit-property.patch
deleted file mode 100644
index 4d763ff16c28..000000000000
--- a/x11-wm/openbox/files/openbox-3.3_rc2-64bit-property.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-diff -ruN openbox-3.3-rc2.bak/openbox/client.c openbox-3.3-rc2/openbox/client.c
---- openbox-3.3-rc2.bak/openbox/client.c	2005-08-11 15:23:59.000000000 +0200
-+++ openbox-3.3-rc2/openbox/client.c	2005-10-07 16:34:21.000000000 +0200
-@@ -126,7 +126,7 @@
-         windows = NULL;
- 
-     PROP_SETA32(RootWindow(ob_display, ob_screen),
--                net_client_list, window, (guint32*)windows, size);
-+                net_client_list, window, (gulong*)windows, size);
- 
-     if (windows)
-         g_free(windows);
-@@ -1297,7 +1297,7 @@
- 
- static void client_change_allowed_actions(ObClient *self)
- {
--    guint32 actions[9];
-+    gulong actions[9];
-     gint num = 0;
- 
-     /* desktop windows are kept on all desktops */
-@@ -1712,8 +1712,8 @@
- 
- static void client_change_state(ObClient *self)
- {
--    guint32 state[2];
--    guint32 netstate[11];
-+    gulong state[2];
-+    gulong netstate[11];
-     guint num;
- 
-     state[0] = self->wmstate;
-diff -ruN openbox-3.3-rc2.bak/openbox/frame.c openbox-3.3-rc2/openbox/frame.c
---- openbox-3.3-rc2.bak/openbox/frame.c	2005-07-14 15:44:33.000000000 +0200
-+++ openbox-3.3-rc2/openbox/frame.c	2005-10-07 16:06:50.000000000 +0200
-@@ -422,7 +422,7 @@
-         }
- 
-         if (!STRUT_EQUAL(self->size, oldsize)) {
--            guint32 vals[4];
-+            gulong vals[4];
-             vals[0] = self->size.left;
-             vals[1] = self->size.right;
-             vals[2] = self->size.top;
-Files openbox-3.3-rc2.bak/openbox/.libs/lt-openbox and openbox-3.3-rc2/openbox/.libs/lt-openbox differ
-Files openbox-3.3-rc2.bak/openbox/.libs/openbox and openbox-3.3-rc2/openbox/.libs/openbox differ
-diff -ruN openbox-3.3-rc2.bak/openbox/prop.c openbox-3.3-rc2/openbox/prop.c
---- openbox-3.3-rc2.bak/openbox/prop.c	2004-03-21 02:03:00.000000000 +0100
-+++ openbox-3.3-rc2/openbox/prop.c	2005-10-07 16:58:45.000000000 +0200
-@@ -206,7 +206,7 @@
-                     data[i] = xdata[i];
-                     break;
-                 case 16:
--                    ((guint16*)data)[i] = ((guint16*)xdata)[i];
-+                    ((gushort*)data)[i] = ((gushort*)xdata)[i];
-                     break;
-                 case 32:
-                     ((guint32*)data)[i] = ((gulong*)xdata)[i];
-@@ -245,7 +245,7 @@
-                     (*data)[i] = xdata[i];
-                     break;
-                 case 16:
--                    ((guint16*)*data)[i] = ((guint16*)xdata)[i];
-+                    ((gushort*)*data)[i] = ((gushort*)xdata)[i];
-                     break;
-                 case 32:
-                     ((guint32*)*data)[i] = ((gulong*)xdata)[i];
-@@ -383,13 +383,13 @@
-     return FALSE;
- }
- 
--void prop_set32(Window win, Atom prop, Atom type, guint32 val)
-+void prop_set32(Window win, Atom prop, Atom type, gulong val)
- {
-     XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace,
-                     (guchar*)&val, 1);
- }
- 
--void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val,
-+void prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
-                       guint num)
- {
-     XChangeProperty(ob_display, win, prop, type, 32, PropModeReplace,
-diff -ruN openbox-3.3-rc2.bak/openbox/prop.h openbox-3.3-rc2/openbox/prop.h
---- openbox-3.3-rc2.bak/openbox/prop.h	2004-03-21 02:03:00.000000000 +0100
-+++ openbox-3.3-rc2/openbox/prop.h	2005-10-07 16:15:38.000000000 +0200
-@@ -177,8 +177,8 @@
- gboolean prop_get_strings_locale(Window win, Atom prop, gchar ***ret);
- gboolean prop_get_strings_utf8(Window win, Atom prop, gchar ***ret);
- 
--void prop_set32(Window win, Atom prop, Atom type, guint32 val);
--void prop_set_array32(Window win, Atom prop, Atom type, guint32 *val,
-+void prop_set32(Window win, Atom prop, Atom type, gulong val);
-+void prop_set_array32(Window win, Atom prop, Atom type, gulong *val,
-                       guint num);
- void prop_set_string_utf8(Window win, Atom prop, gchar *val);
- void prop_set_strings_utf8(Window win, Atom prop, gchar **strs);
-diff -ruN openbox-3.3-rc2.bak/openbox/screen.c openbox-3.3-rc2/openbox/screen.c
---- openbox-3.3-rc2.bak/openbox/screen.c	2005-10-03 17:47:53.000000000 +0200
-+++ openbox-3.3-rc2/openbox/screen.c	2005-10-07 16:29:58.000000000 +0200
-@@ -156,7 +156,7 @@
-     XSetWindowAttributes attrib;
-     pid_t pid;
-     gint i, num_support;
--    guint32 *supported;
-+    gulong *supported;
- 
-     /* create the netwm support window */
-     attrib.override_redirect = TRUE;
-@@ -206,7 +206,7 @@
-     /* set the _NET_SUPPORTED_ATOMS hint */
-     num_support = 51;
-     i = 0;
--    supported = g_new(guint32, num_support);
-+    supported = g_new(gulong, num_support);
-     supported[i++] = prop_atoms.net_current_desktop;
-     supported[i++] = prop_atoms.net_number_of_desktops;
-     supported[i++] = prop_atoms.net_desktop_geometry;
-@@ -340,7 +340,7 @@
-     static gint oldw = 0, oldh = 0;
-     gint w, h;
-     GList *it;
--    guint32 geometry[2];
-+    gulong geometry[2];
- 
-     w = WidthOfScreen(ScreenOfDisplay(ob_display, ob_screen));
-     h = HeightOfScreen(ScreenOfDisplay(ob_display, ob_screen));
-@@ -368,7 +368,7 @@
- void screen_set_num_desktops(guint num)
- {
-     guint i, old;
--    guint32 *viewport;
-+    gulong *viewport;
-     GList *it;
- 
-     g_assert(num > 0);
-@@ -381,7 +381,7 @@
-                net_number_of_desktops, cardinal, num);
- 
-     /* set the viewport hint */
--    viewport = g_new0(guint32, num * 2);
-+    viewport = g_new0(gulong, num * 2);
-     PROP_SETA32(RootWindow(ob_display, ob_screen),
-                 net_desktop_viewport, cardinal, viewport, num * 2);
-     g_free(viewport);
-@@ -969,7 +969,7 @@
- void screen_update_areas()
- {
-     guint i, x;
--    guint32 *dims;
-+    long *dims;
-     GList *it;
-     gint o;
- 
-@@ -987,7 +987,7 @@
-         area[i] = g_new0(Rect, screen_num_monitors + 1);
-     area[i] = NULL;
-      
--    dims = g_new(guint32, 4 * screen_num_desktops);
-+    dims = g_new(gulong, 4 * screen_num_desktops);
- 
-     for (i = 0; i < screen_num_desktops + 1; ++i) {
-         Strut *struts;
-
-diff -ruN openbox-3.3-rc2.bak/openbox/stacking.c openbox-3.3-rc2/openbox/stacking.c
---- openbox-3.3-rc2.bak/openbox/stacking.c	2005-02-08 05:33:54.000000000 +0100
-+++ openbox-3.3-rc2/openbox/stacking.c	2005-10-07 16:21:27.000000000 +0200
-@@ -49,7 +49,7 @@
-     }
- 
-     PROP_SETA32(RootWindow(ob_display, ob_screen),
--                net_client_list_stacking, window, (guint32*)windows, i);
-+                net_client_list_stacking, window, (gulong*)windows, i);
- 
-     g_free(windows);
- }
diff --git a/x11-wm/openbox/metadata.xml b/x11-wm/openbox/metadata.xml
index 96f08b30cb43..682bce3394bf 100644
--- a/x11-wm/openbox/metadata.xml
+++ b/x11-wm/openbox/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>commonbox</herd>
-<maintainer>
-	<email>superlag@gentoo.org</email>
-	<name>Aaron Kulbe</name>
-</maintainer>
 </pkgmetadata>
diff --git a/x11-wm/openbox/openbox-3.2-r1.ebuild b/x11-wm/openbox/openbox-3.2-r1.ebuild
index ea2680ef2b22..8ba99271d1d6 100644
--- a/x11-wm/openbox/openbox-3.2-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.2-r1.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.2-r1.ebuild,v 1.10 2005/02/05 23:30:46 superlag Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.2-r1.ebuild,v 1.1 2004/05/06 16:20:41 tseng Exp $
 
+S=${WORKDIR}/${P/_/-}
 DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
-HOMEPAGE="http://icculus.org/openbox/"
+
 SRC_URI="http://icculus.org/openbox/releases/${P/_/-}.tar.gz
-	mirror://gentoo/ob-themes-usability.tar.bz2"
+		mirror://gentoo/ob-themes-usability.tar.bz2"
 
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="x86 ppc sparc ~alpha hppa amd64"
+HOMEPAGE="http://icculus.org/openbox/"
 IUSE="nls"
+SLOT="3"
 
 RDEPEND="virtual/xft
 	virtual/x11
@@ -22,7 +20,8 @@ RDEPEND="virtual/xft
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig"
 
-S=${WORKDIR}/${P/_/-}
+LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 	unpack ${A}
@@ -31,11 +30,14 @@ src_unpack() {
 }
 
 src_compile() {
-	econf `use_enable nls` || die
+
+	econf \
+		`use_enable nls` || die
 	emake || die
 }
 
-src_install() {
+src_install () {
+
 	dodir /etc/X11/Sessions
 	echo "/usr/bin/openbox" > ${D}/etc/X11/Sessions/openbox
 	fperms a+x /etc/X11/Sessions/openbox
diff --git a/x11-wm/openbox/openbox-3.2-r2.ebuild b/x11-wm/openbox/openbox-3.2-r2.ebuild
index 43effaa1ffca..7afe22d07a69 100644
--- a/x11-wm/openbox/openbox-3.2-r2.ebuild
+++ b/x11-wm/openbox/openbox-3.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.2-r2.ebuild,v 1.8 2005/09/17 10:25:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.2-r2.ebuild,v 1.1 2005/02/06 06:52:13 superlag Exp $
 
 inherit eutils
 
@@ -11,7 +11,7 @@ SRC_URI="http://icculus.org/openbox/releases/${P/_/-}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="3"
-KEYWORDS="alpha amd64 hppa ppc sparc x86"
+KEYWORDS="x86 ppc sparc ~alpha hppa amd64"
 IUSE="nls startup-notification"
 
 RDEPEND="virtual/xft
diff --git a/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild b/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild
index 94135d73074c..cd8efe324d68 100644
--- a/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild
+++ b/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild,v 1.2 2005/04/05 22:36:59 lostlogic Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc1-r1.ebuild,v 1.1 2005/03/29 13:46:27 lostlogic Exp $
 
 inherit eutils
 
@@ -33,12 +33,8 @@ src_unpack() {
 }
 
 src_compile() {
-	if use pango ; then
-		myconf="--enable-pango"
-	else
-		myconf=""
-	fi
-	econf `use_enable nls` ${myconf} || die
+	econf `use_enable nls` \
+	      `use_enable pango` || die
 	emake || die
 }
 
diff --git a/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild b/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild
index ee05e44de1d4..049c7c1f28ac 100644
--- a/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild
+++ b/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild,v 1.2 2005/08/24 14:33:11 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc1-r2.ebuild,v 1.1 2005/04/05 22:36:59 lostlogic Exp $
 
 inherit eutils
 
@@ -60,5 +60,5 @@ src_install() {
 	# Gorilla and Industrial themes for Metacity.
 
 	dodir /usr/share/themes
-	cp -pPR ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes
+	cp -a ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes
 }
diff --git a/x11-wm/openbox/openbox-3.3_rc2-r1.ebuild b/x11-wm/openbox/openbox-3.3_rc2-r1.ebuild
deleted file mode 100644
index d6a02e699b1a..000000000000
--- a/x11-wm/openbox/openbox-3.3_rc2-r1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc2-r1.ebuild,v 1.1 2005/11/26 18:58:48 gothgirl Exp $
-
-inherit eutils
-
-DESCRIPTION="Openbox is a standards compliant, fast, light-weight, extensible window manager."
-HOMEPAGE="http://icculus.org/openbox/"
-SRC_URI="http://icculus.org/openbox/releases/${P/_/-}.tar.gz
-	mirror://gentoo/ob-themes-usability.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE="pango nls startup-notification"
-
-RDEPEND="virtual/xft
-	virtual/x11
-	>=dev-libs/glib-2
-	>=media-libs/fontconfig-2
-	>=dev-libs/libxml2-2.0"
-DEPEND="${RDEPEND}
-	pango? ( x11-libs/pango )
-	startup-notification? ( x11-libs/startup-notification )
-	dev-util/pkgconfig"
-
-S=${WORKDIR}/${P/_/-}
-
-src_unpack() {
-	unpack ${A}
-	epatch ${FILESDIR}/${P}-64bit-property.patch
-}
-
-src_compile() {
-	econf `use_enable nls` `use_enable pango` ${myconf} || die
-	emake || die
-}
-
-src_install() {
-	dodir /etc/X11/Sessions
-	echo "/usr/bin/openbox" > ${D}/etc/X11/Sessions/openbox
-	fperms a+x /etc/X11/Sessions/openbox
-
-	insinto /usr/share/xsessions
-	doins ${FILESDIR}/${PN}.desktop
-
-	make DESTDIR=${D} install || die
-	dodoc ABOUT-NLS AUTHORS CHANGELOG COMPLIANCE COPYING README
-
-	# Extra styles from http://home.clara.co.uk/dpb/openbox.htm
-	# These are included due to the poor usability of the default themes
-	# for users with limited vision. These are based on Jimmac's
-	# Gorilla and Industrial themes for Metacity.
-
-	insinto /usr/share/themes
-	#cp -pPR ${WORKDIR}/ob-themes-usability/* ${D}/usr/share/themes
-	doins -r ${WORKDIR}/ob-themes-usability/*
-}
diff --git a/x11-wm/openbox/openbox-3.3_rc2.ebuild b/x11-wm/openbox/openbox-3.3_rc2.ebuild
index 23efaccb3a46..315710fa019b 100644
--- a/x11-wm/openbox/openbox-3.3_rc2.ebuild
+++ b/x11-wm/openbox/openbox-3.3_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc2.ebuild,v 1.2 2005/10/29 04:15:45 gothgirl Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/openbox/openbox-3.3_rc2.ebuild,v 1.1 2005/09/13 15:49:31 lostlogic Exp $
 
 inherit eutils
 
@@ -31,7 +31,12 @@ src_unpack() {
 }
 
 src_compile() {
-	econf `use_enable nls` `use_enable pango` ${myconf} || die
+	if use pango ; then
+		myconf="--enable-pango"
+	else
+		myconf=""
+	fi
+	econf `use_enable nls` ${myconf} || die
 	emake || die
 }
 
diff --git a/x11-wm/oroborus-extras/ChangeLog b/x11-wm/oroborus-extras/ChangeLog
index c58af8ea4124..21ac807b2364 100644
--- a/x11-wm/oroborus-extras/ChangeLog
+++ b/x11-wm/oroborus-extras/ChangeLog
@@ -1,47 +1,7 @@
 # ChangeLog for x11-wm/oroborus-extras
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus-extras/ChangeLog,v 1.14 2005/05/08 14:45:43 herbs Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus-extras/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org>
-  oroborus-extras-2.0.13.ebuild:
-  Stable on amd64.
-
-  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  oroborus-extras-2.0.13.ebuild:
-  Stable on sparc
-
-  03 Jul 2004; Tom Martin <slarti@gentoo.org> oroborus-extras-2.0.13.ebuild:
-  Added to ~amd64.
-
-  07 May 2004; Brandon Hale <tseng@gentoo.org>
-  oroborus-extras-2.0.1-r1.ebuild:
-  Add IUSE=
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
-  oroborus-extras-2.0.13.ebuild:
-  Add inherit eutils
-
-  08 Dec 2003; Mike Gardiner <obz@gentoo.org> oroborus-extras-2.0.13.ebuild,
-  files/deskmenu-1.4.0-string.patch:
-  Patched for multi-line string (help function), see bug #35030. Reported
-  upstream via email
-
-*oroborus-extras-2.0.13 (09 Jul 2003)
-
-  09 Jul 2003; Martin Holzer <mholzer@gentoo.org>
-  oroborus-extras-2.0.13.ebuild:
-  Version bumped. ebuild submitted by Soren Harward <soren@byu.edu> in #23780.
-
-  12 Jun 2003; <msterret@gentoo.org> oroborus-extras-2.0.1-r1.ebuild:
-  add Header
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*oroborus-extras-2.0.1-r1 (09 Apr 2002)
-  9 Apr 2002; Spider <spider@gentoo.org>
-  Add an update to depend on  =x11-libs/gtk+-1.2*
-  No need in upping the -r for an dependency
-  
 *oroborus-extras-2.0.1-r1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
diff --git a/x11-wm/oroborus-extras/Manifest b/x11-wm/oroborus-extras/Manifest
index 99343ec9d837..e69de29bb2d1 100644
--- a/x11-wm/oroborus-extras/Manifest
+++ b/x11-wm/oroborus-extras/Manifest
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5454b5918c85484a389ade19888f684d oroborus-extras-2.0.13.ebuild 1862
-MD5 23672c1689fd38b8cf22c477b63ef9e7 ChangeLog 1950
-MD5 5de8629cd1384223e1488866817fd3e7 oroborus-extras-2.0.1-r1.ebuild 1555
-MD5 854214750cff48f735632b86e10d0d1a metadata.xml 246
-MD5 879a225be542f6afcf35e4c0fcd33083 files/digest-oroborus-extras-2.0.13 204
-MD5 0b46f8d494534927c52ccd8066b42190 files/digest-oroborus-extras-2.0.1-r1 197
-MD5 558cdeffe81f3bde49f1db05cface261 files/deskmenu-1.4.0-string.patch 527
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfiZL2G5bA0cA/ScRAqAVAKCVtqtfwm2yaSl9nOiNzKR3l4OOeACg7pKb
-+Tr77BNyD04CsXYYwZdZYyA=
-=19vm
------END PGP SIGNATURE-----
diff --git a/x11-wm/oroborus-extras/files/digest-oroborus-extras-2.0.1-r1 b/x11-wm/oroborus-extras/files/digest-oroborus-extras-2.0.1-r1
index ba43fcc991d3..2066229f3c41 100644
--- a/x11-wm/oroborus-extras/files/digest-oroborus-extras-2.0.1-r1
+++ b/x11-wm/oroborus-extras/files/digest-oroborus-extras-2.0.1-r1
@@ -1,3 +1,3 @@
-MD5 8ac3d4dfbf1f5c35ea6544be9bcc96a5 deskmenu-1.3.0.tar.gz 12227
-MD5 f4f7e73d84a635b5aa2fb1738a3f965f keylaunch-1.3.0.tar.gz 9559
-MD5 17beeaa3295e28d99ca80b926b05c96a desklaunch-1.1.0.tar.gz 11020
+MD5 17beeaa3295e28d99ca80b926b05c96a desklaunch-1.1.0.tar.gz
+MD5 8ac3d4dfbf1f5c35ea6544be9bcc96a5 deskmenu-1.3.0.tar.gz
+MD5 f4f7e73d84a635b5aa2fb1738a3f965f keylaunch-1.3.0.tar.gz
diff --git a/x11-wm/oroborus-extras/oroborus-extras-2.0.1-r1.ebuild b/x11-wm/oroborus-extras/oroborus-extras-2.0.1-r1.ebuild
index c5541c5db2ed..a4d68599fb63 100644
--- a/x11-wm/oroborus-extras/oroborus-extras-2.0.1-r1.ebuild
+++ b/x11-wm/oroborus-extras/oroborus-extras-2.0.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus-extras/oroborus-extras-2.0.1-r1.ebuild,v 1.17 2005/03/07 15:21:24 gustavoz Exp $
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Ben Lutgens <lamer@gentoo.org>
 
 S=${WORKDIR}
 DESCRIPTION="Other stuff for oroborus"
@@ -8,13 +8,8 @@ SRC_URI="http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/deskmenu-1.3.0.t
 	 http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/keylaunch-1.3.0.tar.gz
 	 http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/desklaunch-1.1.0.tar.gz"
 HOMEPAGE="http://www.kensden.pwp.blueyonder.co.uk/Oroborus/"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE=""
 
-DEPEND="x11-wm/oroborus
-		=x11-libs/gtk+-1.2*"
+DEPEND="x11-wm/oroborus"
 
 
 src_unpack() {
@@ -43,20 +38,20 @@ src_compile() {
 src_install () {
 
 	dodir /usr/bin
-
+	
 # Deskmenu first
 	cd ${S}/deskmenu-1.3.0
 	make PREFIX=${D}/usr install || die
-
+	
 	newdoc README README.deskmenu
 	newdoc CHANGES CHANGES.deskmenu
 	newdoc example_rc example_rc.deskmenu
 	dodoc LICENSE
 
-# Keylaunch next
+# Keylaunch next 
 	cd ${S}/keylaunch
 	make PREFIX=${D}/usr install || die
-
+	
 	newdoc README README.keylaunch
 	newdoc LICENSE LICENSE.keylaunch
 	newdoc example_rc example_rc.keylaunch
@@ -64,6 +59,7 @@ src_install () {
 # Desklaunch last
 	cd ${S}/desklaunch
 	make PREFIX=${D}/usr install || die
-
+	
 	newdoc README README.desklaunch
 }
+
diff --git a/x11-wm/oroborus-extras/oroborus-extras-2.0.13.ebuild b/x11-wm/oroborus-extras/oroborus-extras-2.0.13.ebuild
index c75e7e6e46a5..45af125bfd3d 100644
--- a/x11-wm/oroborus-extras/oroborus-extras-2.0.13.ebuild
+++ b/x11-wm/oroborus-extras/oroborus-extras-2.0.13.ebuild
@@ -1,21 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus-extras/oroborus-extras-2.0.13.ebuild,v 1.9 2005/05/08 14:45:43 herbs Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus-extras/oroborus-extras-2.0.13.ebuild,v 1.1 2003/07/09 18:24:58 mholzer Exp $
 
 S=${WORKDIR}
-
 DESCRIPTION="Other stuff for oroborus"
 SRC_URI="http://www.oroborus.org/debian/dists/sid/main/source/x11/keylaunch_1.3.0-6.tar.gz
 	http://www.oroborus.org/debian/dists/sid/main/source/x11/deskmenu_1.4.0-2.tar.gz
 	http://www.oroborus.org/debian/dists/sid/main/source/x11/desklaunch_1.1.3-1.tar.gz"
 HOMEPAGE="http://www.oroborus.org/"
 LICENSE="GPL-2"
-
-IUSE=""
 SLOT="0"
-KEYWORDS="~x86 sparc ppc amd64"
+KEYWORDS="~x86 ~sparc ~ppc"
 
 DEPEND="x11-wm/oroborus
 	=x11-libs/gtk+-1.2*
@@ -23,8 +18,6 @@ DEPEND="x11-wm/oroborus
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}/deskmenu-1.4.0
-	epatch ${FILESDIR}/deskmenu-1.4.0-string.patch
 	cd ${S}/keylaunch-1.3.0
 }
 
@@ -48,19 +41,19 @@ src_compile() {
 
 src_install () {
 	dodir /usr/bin
-
+	
 # Deskmenu first
 	cd ${S}/deskmenu-1.4.0
 	make prefix=${D}/usr sysconfdir=${D}/etc/X11/oroborus infodir=${D}/usr/share/info mandir=${D}/usr/share/man install || die
-
+	
 	newdoc README README.deskmenu
 	newdoc CHANGES.deskmenu
 	newdoc example_rc example_rc.deskmenu
 
-# Keylaunch next
+# Keylaunch next 
 	cd ${S}/keylaunch-1.3.0
 	make PREFIX=${D}/usr install || die
-
+	
 	newdoc README README.keylaunch
 	newdoc LICENSE LICENSE.keylaunch
 	newdoc example_rc example_rc.keylaunch
@@ -68,6 +61,6 @@ src_install () {
 # Desklaunch last
 	cd ${S}/desklaunch-1.1.3
 	make PREFIX=${D}/usr install || die
-
+	
 	newdoc README README.desklaunch
 }
diff --git a/x11-wm/oroborus/ChangeLog b/x11-wm/oroborus/ChangeLog
index de3d5609fa74..9f4d8529c779 100644
--- a/x11-wm/oroborus/ChangeLog
+++ b/x11-wm/oroborus/ChangeLog
@@ -1,70 +1,10 @@
 # ChangeLog for x11-wm/oroborus
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/ChangeLog,v 1.21 2005/05/08 14:44:51 herbs Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> oroborus-2.0.13.ebuild:
-  Stable on amd64.
+*oroborus-2.0.4-r1 (1 Feb 2002)
 
-  07 Mar 2005; Gustavo Zacarias <gustavoz@gentoo.org> oroborus-2.0.13.ebuild:
-  Stable on sparc
-
-  03 Feb 2005; Gustavo Zacarias <gustavoz@gentoo.org> oroborus-2.0.13.ebuild:
-  To ~sparc
-
-  03 Jul 2004; Tom Martin <slarti@gentoo.org> oroborus-2.0.13.ebuild:
-  Added to ~amd64.
-
-  03 Jul 2004; Tom Martin <slarti@gentoo.org> oroborus-2.0.13.ebuild:
-  Fixed HOMEPAGE to point to http://www.oroborus.org/ rather than
-  http://oroborus.org/oroborus.shtml which returns a 404.
-
-  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> oroborus-2.0.13.ebuild,
-  oroborus-2.0.4-r1.ebuild, oroborus-2.0.7.ebuild, oroborus-2.0.9.ebuild:
-  QA - fix use invocation
-
-  07 May 2004; Brandon Hale <tseng@gentoo.org> oroborus-2.0.13.ebuild,
-  oroborus-2.0.7.ebuild, oroborus-2.0.9.ebuild:
-  Remove S=
-
-  22 Mar 2004; Brandon Hale <tseng@gentoo.org> oroborus-2.0.13.ebuild,
-  oroborus-2.0.7.ebuild, oroborus-2.0.9.ebuild:
-  Fix DEPEND-ness, bug #45343
-
-  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> oroborus-2.0.9.ebuild:
-  KEYWORDS got sparced.
-
-*oroborus-2.0.13 (09 Jul 2003)
-
-  09 Jul 2003; Martin Holzer <mholzer@gentoo.org> oroborus-2.0.13.ebuild:
-  Version bumped. ebuild submitted by Soren Harward <soren@byu.edu> in #233780
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  21 Oct 2002; Maik Schreiber <blizzy@gentoo.org> oroborus-2.0.7.ebuild:
-  Changed KEYWORDS back to "x86" as it seems the package mask has been
-  removed already.
-
-*oroborus-2.0.9 (21 Oct 2002)
-
-  21 Oct 2002; Maik Schreiber <blizzy@gentoo.org> : New version.
-
-  21 Oct 2002; Maik Schreiber <blizzy@gentoo.org> oroborus-2.0.7.ebuild:
-  Changed "x86" to "~x86" in KEYWORDS.
-
-*oroborus-2.0.7 (19 Aug 2002)
-
-  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> oroborus-2.0.7.ebuild :
-  Added IUSE.
-
-  19 Aug 2002; Maik Schreiber <blizzy@gentoo.org> : New version, closes bug
-  #5776.
-
-*oroborus-2.0.4-r1 (01 Feb 2002)
-
-  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> oroborus-2.0.4-r1.ebuild :
-  Added IUSE.
-
-  01 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
+  1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
diff --git a/x11-wm/oroborus/Manifest b/x11-wm/oroborus/Manifest
index 8c7c0e712ea6..e69de29bb2d1 100644
--- a/x11-wm/oroborus/Manifest
+++ b/x11-wm/oroborus/Manifest
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 617de7c2d459639a6e20528fb8c0a2bc oroborus-2.0.9.ebuild 1046
-MD5 13e24714087a1ef30da95b4fc5644cd7 oroborus-2.0.4-r1.ebuild 1048
-MD5 cfe80314ff96eb45746cd7444ac5b2a8 oroborus-2.0.7.ebuild 1038
-MD5 069e08733e54d051690f41ff139f4a1f oroborus-2.0.13.ebuild 1084
-MD5 7cc329c3dd4e6a400f9af7be3dc11daa ChangeLog 2727
-MD5 6f678fec0c073bdd194cc247a444ae0e metadata.xml 492
-MD5 a6eaa4a58b9b8d1ca30c9dad6b738e08 files/oroborus.desktop 100
-MD5 bcdeedeb1449ba297399d6ca934f174c files/digest-oroborus-2.0.7 68
-MD5 76979c6dea7bc0482c31850c6c22e2d7 files/digest-oroborus-2.0.9 68
-MD5 7fcf6981c9d6d5af5b4e0c30558dbd08 files/digest-oroborus-2.0.4-r1 66
-MD5 917859f4dd075888e0c2ffe0cac12f50 files/digest-oroborus-2.0.13 69
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfiYW2G5bA0cA/ScRAhgfAKDk/3db5G8X8slKdiJoD2vHYyVOxwCgsXrY
-HBcNXaU5uqFcFld7xKxTdKg=
-=6lrU
------END PGP SIGNATURE-----
diff --git a/x11-wm/oroborus/files/digest-oroborus-2.0.4-r1 b/x11-wm/oroborus/files/digest-oroborus-2.0.4-r1
index e27ef817783f..951aa1c6c211 100644
--- a/x11-wm/oroborus/files/digest-oroborus-2.0.4-r1
+++ b/x11-wm/oroborus/files/digest-oroborus-2.0.4-r1
@@ -1 +1 @@
-MD5 39a92cbc2e9f0a1fea601a05e96ddf38 oroborus-2.0.4.tar.gz 116972
+MD5 39a92cbc2e9f0a1fea601a05e96ddf38 oroborus-2.0.4.tar.gz
diff --git a/x11-wm/oroborus/oroborus-2.0.13.ebuild b/x11-wm/oroborus/oroborus-2.0.13.ebuild
index 0b638b4fa731..fe5efbf7e5b3 100644
--- a/x11-wm/oroborus/oroborus-2.0.13.ebuild
+++ b/x11-wm/oroborus/oroborus-2.0.13.ebuild
@@ -1,19 +1,22 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/oroborus-2.0.13.ebuild,v 1.12 2005/05/08 14:44:51 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/oroborus-2.0.13.ebuild,v 1.1 2003/07/09 18:19:44 mholzer Exp $
 
 DESCRIPTION="Small and fast window manager."
-HOMEPAGE="http://www.oroborus.org/"
+HOMEPAGE="http://www.oroborus.org/oroborus.shtml"
 SRC_URI="http://www.oroborus.org/debian/dists/sid/main/source/x11/${P/-/_}-1.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc amd64 sparc"
+KEYWORDS="~x86 ~ppc"
 IUSE="gnome"
 
-DEPEND="virtual/x11"
+RDEPEND="virtual/x11"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
 
 src_compile() {
-	aclocal
+    aclocal
 	autoheader
 	automake --add-missing
 	autoconf
@@ -33,7 +36,7 @@ src_install () {
 	     mandir=${D}/usr/share/man \
 	     install || die
 
-	if use gnome ; then
+	if [ "`use gnome`" ] ; then
 		insinto /usr/share/gnome/wm-properties
 		doins ${FILESDIR}/oroborus.desktop
 	fi
diff --git a/x11-wm/oroborus/oroborus-2.0.4-r1.ebuild b/x11-wm/oroborus/oroborus-2.0.4-r1.ebuild
index 51d2bc5348fd..c3fd627420d3 100644
--- a/x11-wm/oroborus/oroborus-2.0.4-r1.ebuild
+++ b/x11-wm/oroborus/oroborus-2.0.4-r1.ebuild
@@ -1,42 +1,34 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/oroborus-2.0.4-r1.ebuild,v 1.17 2005/02/03 12:49:04 gustavoz Exp $
+# Copyright 1999-2001 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Author Ben Lutgens <lamer@gentoo.org>
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/oroborus-2.0.4-r1.ebuild,v 1.1 2001/10/12 00:41:24 hallski Exp $
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Yet another window manager"
 SRC_URI="http://www.kensden.pwp.blueyonder.co.uk/Oroborus/files/${P}.tar.gz"
 HOMEPAGE="http://www.kensden.pwp.blueyonder.co.uk/Oroborus"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE="gnome"
-DEPEND="virtual/x11"
-
 
-src_compile() {
 
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --sysconfdir=/etc/X11/oroborus \
-	 	    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
-		    || die
+DEPEND="virtual/x11"
 
+src_compile() {
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --sysconfdir=/etc/X11/oroborus			\
+	 	    --infodir=/usr/share/info				\
+		    --mandir=/usr/share/man
+	assert
+	
 	emake || die
 }
 
 src_install () {
-
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc/X11/oroborus \
-	     infodir=${D}/usr/share/info \
-	     mandir=${D}/usr/share/man \
+	make prefix=${D}/usr						\
+	     sysconfdir=${D}/etc/X11/oroborus				\
+	     infodir=${D}/usr/share/info				\
+	     mandir=${D}/usr/share/man					\
 	     install || die
 
-	if use gnome ; then
-
-		insinto /usr/share/gnome/wm-properties
-		doins ${FILESDIR}/oroborus.desktop
-	fi
-
 	dodoc README INSTALL ChangeLog TODO NEWS AUTHORS example.oroborusrc
 }
+
diff --git a/x11-wm/oroborus/oroborus-2.0.7.ebuild b/x11-wm/oroborus/oroborus-2.0.7.ebuild
index e5dc30ec3c9e..c85d94264648 100644
--- a/x11-wm/oroborus/oroborus-2.0.7.ebuild
+++ b/x11-wm/oroborus/oroborus-2.0.7.ebuild
@@ -1,37 +1,40 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/oroborus-2.0.7.ebuild,v 1.13 2005/02/03 12:49:04 gustavoz Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/oroborus-2.0.7.ebuild,v 1.1 2002/08/19 18:44:23 blizzy Exp $
 
 DESCRIPTION="Small and fast window manager."
 HOMEPAGE="http://www.dreamind.de/oroborus.shtml"
 SRC_URI="http://www.dreamind.de/debian/dists/sid/main/source/x11/${P/-/_}-1.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="gnome"
-DEPEND="virtual/x11"
+KEYWORDS="x86"
+
+RDEPEND="virtual/x11"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
 
 src_compile() {
 
-	./configure --host=${CHOST} \
-		    --prefix=/usr \
-		    --sysconfdir=/etc/X11/oroborus \
-	 	    --infodir=/usr/share/info \
-		    --mandir=/usr/share/man \
+	./configure --host=${CHOST}					\
+		    --prefix=/usr					\
+		    --sysconfdir=/etc/X11/oroborus			\
+	 	    --infodir=/usr/share/info				\
+		    --mandir=/usr/share/man				\
 		    || die
-
+	
 	emake || die
 }
 
 src_install () {
 
-	make prefix=${D}/usr \
-	     sysconfdir=${D}/etc/X11/oroborus \
-	     infodir=${D}/usr/share/info \
-	     mandir=${D}/usr/share/man \
+	make prefix=${D}/usr						\
+	     sysconfdir=${D}/etc/X11/oroborus				\
+	     infodir=${D}/usr/share/info				\
+	     mandir=${D}/usr/share/man					\
 	     install || die
 
-	if use gnome ; then
+	if [ "`use gnome`" ] ; then
 
 		insinto /usr/share/gnome/wm-properties
 		doins ${FILESDIR}/oroborus.desktop
diff --git a/x11-wm/oroborus/oroborus-2.0.9.ebuild b/x11-wm/oroborus/oroborus-2.0.9.ebuild
index a805004b5b23..1831d959885e 100644
--- a/x11-wm/oroborus/oroborus-2.0.9.ebuild
+++ b/x11-wm/oroborus/oroborus-2.0.9.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/oroborus-2.0.9.ebuild,v 1.11 2005/02/03 12:49:04 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/oroborus/oroborus-2.0.9.ebuild,v 1.1 2002/10/21 17:06:45 blizzy Exp $
 
 DESCRIPTION="Small and fast window manager."
 HOMEPAGE="http://www.dreamind.de/oroborus.shtml"
 SRC_URI="http://www.dreamind.de/debian/dists/sid/main/source/x11/${P/-/_}-1.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc sparc"
+KEYWORDS="~x86"
 IUSE="gnome"
 
-DEPEND="virtual/x11"
+RDEPEND="virtual/x11"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${P}"
 
 src_compile() {
 
@@ -20,7 +23,7 @@ src_compile() {
 	 	    --infodir=/usr/share/info \
 		    --mandir=/usr/share/man \
 		    || die
-
+	
 	emake || die
 }
 
@@ -32,7 +35,7 @@ src_install () {
 	     mandir=${D}/usr/share/man \
 	     install || die
 
-	if use gnome ; then
+	if [ "`use gnome`" ] ; then
 
 		insinto /usr/share/gnome/wm-properties
 		doins ${FILESDIR}/oroborus.desktop
diff --git a/x11-wm/papuawm/ChangeLog b/x11-wm/papuawm/ChangeLog
index e356fe0bb2a3..7133ece23196 100644
--- a/x11-wm/papuawm/ChangeLog
+++ b/x11-wm/papuawm/ChangeLog
@@ -1,22 +1,6 @@
 # ChangeLog for x11-wm/papuawm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/papuawm/ChangeLog,v 1.7 2005/03/28 11:07:24 usata Exp $
-
-  28 Mar 2005; Mamoru KOMACHI <usata@gentoo.org> papuawm-0.4.ebuild:
-  Fixed compilation error (papuawm doesn't find X libs); bug #86594. Thanks to
-  Francisco José Cañizares Santofimia <telefrancisco@lycos.es> for the patch.
-
-*papuawm-0.4 (27 Apr 2004)
-
-  04 Nov 2003; Brandon Hale <tseng@gentoo.org> metadata.xml,
-  papuawm-0.3.1.ebuild:
-  Moving 0.3.1 to stable on x86, added metadata
-
-*papuawm-0.3.1 (22 Apr 2003)
-
-  22 Apr 2003; Martin Holzer <mholzer@gentoo.org> Manifest,
-  papuawm-0.3.1.ebuild:
-  Version bumped. Closes #19377.
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/papuawm/ChangeLog,v 1.1 2003/04/15 19:16:37 phoenix Exp $
 
 *papuawm-0.3 (15 Apr 2003)
 
diff --git a/x11-wm/papuawm/Manifest b/x11-wm/papuawm/Manifest
index 87e5ce8a67b8..24d1526efb80 100644
--- a/x11-wm/papuawm/Manifest
+++ b/x11-wm/papuawm/Manifest
@@ -1,16 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 53a46ffad85688d50a4e0e244de2578e papuawm-0.4.ebuild 668
-MD5 99c2abec34720dd82bb26c80b3f8b6d4 ChangeLog 980
-MD5 8fff5ff00cd78505a8930b3fdf44dc53 metadata.xml 437
-MD5 a95966c8fb47256dcba2062909a07562 papuawm-0.3.1.ebuild 580
-MD5 247dc3ed14d4404a32630a36e59aa37f files/digest-papuawm-0.4 63
+MD5 e3d7b054dcb42fce71fb2d83eaaaa01a ChangeLog 452
+MD5 64cab07c555c2570fd54346d649cc753 papuawm-0.3.ebuild 581
+MD5 64cab07c555c2570fd54346d649cc753 papuawm-0.3.1.ebuild 581
+MD5 e71f3fa9a5116dab57119d2ec9e5d63e files/digest-papuawm-0.3 62
 MD5 bf982c31c064f94b2d0ba1b3a102e757 files/digest-papuawm-0.3.1 64
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFCR+WDVWNWqTUmv+0RArh+AKCEAYBXAqoryiLqf0w/aNO/1S9uNgCfQP3H
-jQxpmvBZiOre+9/a3DEc9SY=
-=lci8
------END PGP SIGNATURE-----
diff --git a/x11-wm/papuawm/papuawm-0.3.1.ebuild b/x11-wm/papuawm/papuawm-0.3.1.ebuild
index 348636632f01..33ce6e32917e 100644
--- a/x11-wm/papuawm/papuawm-0.3.1.ebuild
+++ b/x11-wm/papuawm/papuawm-0.3.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/papuawm/papuawm-0.3.1.ebuild,v 1.7 2005/03/28 11:07:24 usata Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/papuawm/papuawm-0.3.1.ebuild,v 1.1 2003/04/21 23:36:36 mholzer Exp $
 
 DESCRIPTION="PapuaWM, a minimalistic, though useable window manager"
 MY_P="${P/papuawm/PapuaWM}"
@@ -10,8 +10,7 @@ SRC_URI="http://papuaos.org/files/${MY_P}.tar.gz"
 HOMEPAGE="http://papuaos.org/papuawm"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc ~sparc"
-IUSE=""
+KEYWORDS="~x86"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-wm/papuawm/papuawm-0.4.ebuild b/x11-wm/papuawm/papuawm-0.4.ebuild
index 921e6eed0c8d..b4b1c6edc978 100644
--- a/x11-wm/papuawm/papuawm-0.4.ebuild
+++ b/x11-wm/papuawm/papuawm-0.4.ebuild
@@ -1,25 +1,19 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/papuawm/papuawm-0.4.ebuild,v 1.4 2005/03/28 11:07:24 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/papuawm/papuawm-0.4.ebuild,v 1.1 2004/04/27 17:38:58 pvdabeel Exp $
 
 DESCRIPTION="PapuaWM, a minimalistic, though useable window manager"
 MY_P="${P/papuawm/PapuaWM}"
-S=${WORKDIR}/${MY_P}
+S=$WORKDIR/$MY_P
 SRC_URI="http://www.daimi.au.dk/~pg/papuawm/${MY_P}.tar.gz"
 
 HOMEPAGE="http://papuaos.org/papuawm"
 SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="x86 ppc ~sparc"
-IUSE=""
 
 DEPEND="virtual/x11"
 
-src_compile() {
-	econf --x-libraries=/usr/X11R6/lib || die
-	emake || die
-}
-
 src_install () {
 	einstall
 	dodoc README STATUS TODO papuawm.conf ChangeLog
diff --git a/x11-wm/pawm/ChangeLog b/x11-wm/pawm/ChangeLog
index 3146f9385b65..d2a42b7d01a7 100644
--- a/x11-wm/pawm/ChangeLog
+++ b/x11-wm/pawm/ChangeLog
@@ -1,12 +1,6 @@
 # ChangeLog for x11-wm/pawm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pawm/ChangeLog,v 1.3 2005/09/07 11:19:17 slarti Exp $
-
-  07 Sep 2005; Tom Martin <slarti@gentoo.org> pawm-2.0.3.ebuild:
-  Marked ~amd64 for bug 105103.
-
-  03 Jul 2005; David Holm <dholm@gentoo.org> pawm-2.0.3.ebuild:
-  Added to ~ppc.
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pawm/ChangeLog,v 1.1 2005/07/02 10:36:10 usata Exp $
 
 *pawm-2.0.3 (02 Jul 2005)
 
diff --git a/x11-wm/pawm/Manifest b/x11-wm/pawm/Manifest
index 39a3376ffa3d..5e6d6b9d099f 100644
--- a/x11-wm/pawm/Manifest
+++ b/x11-wm/pawm/Manifest
@@ -1,14 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a85597c817d889f957bfc5655e271de0 ChangeLog 582
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 721975024e26f15d01c49ceca53151c8 pawm-2.0.3.ebuild 936
+MD5 7ec9ef41c3368c91261f5ebbf21a5c44 pawm-2.0.3.ebuild 838
 MD5 d667caf5f78bff0d85594d57f4fde358 files/digest-pawm-2.0.3 63
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDHszXCHk4+ZoBpvsRAuf6AKCstxaBwOywUzV3qrwSGtDyosrC4wCePov2
-9E19CSFeHt2emmZcw/Rt5Qk=
-=MjzL
------END PGP SIGNATURE-----
diff --git a/x11-wm/pawm/pawm-2.0.3.ebuild b/x11-wm/pawm/pawm-2.0.3.ebuild
index f2bbc844cd4e..d7d205629f37 100644
--- a/x11-wm/pawm/pawm-2.0.3.ebuild
+++ b/x11-wm/pawm/pawm-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pawm/pawm-2.0.3.ebuild,v 1.3 2005/09/07 11:19:17 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pawm/pawm-2.0.3.ebuild,v 1.1 2005/07/02 10:36:10 usata Exp $
 
 DESCRIPTION="A window manager for the X Window system, simple, small and functional"
 HOMEPAGE="http://www.pleyades.net/pawm"
@@ -8,7 +8,7 @@ SRC_URI="http://www.pleyades.net/pawm/files/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~x86"
 IUSE=""
 
 RDEPEND="virtual/x11"
diff --git a/x11-wm/pekwm/ChangeLog b/x11-wm/pekwm/ChangeLog
index 7522f932a542..433569ab73a0 100644
--- a/x11-wm/pekwm/ChangeLog
+++ b/x11-wm/pekwm/ChangeLog
@@ -1,83 +1,9 @@
 # ChangeLog for x11-wm/pekwm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.20 2005/05/22 00:43:16 fserb Exp $
-
-*pekwm-0.1.4_pre2 (22 May 2005)
-
-  22 May 2005; Fernando Serboncini <fserb@gentoo.org>
-  -files/pekwm-20050227-dialog_fix.patch, metadata.xml,
-  +pekwm-0.1.4_pre2.ebuild, -pekwm-20050129.2.ebuild,
-  -pekwm-20050227.ebuild, -pekwm-20050227-r1.ebuild:
-  Version bump.
-  Removed old development versions, to keep a more sane version numbering
-
-*pekwm-20050227-r1 (09 Apr 2005)
-
-  09 Apr 2005; Fernando Serboncini <fserb@gentoo.org>
-  +files/pekwm-20050227-dialog_fix.patch, +pekwm-20050227-r1.ebuild:
-  Added patch to fix decorations. Closes #86970.
-
-*pekwm-20050227 (01 Mar 2005)
-
-  01 Mar 2005; Fernando Serboncini <fserb@gentoo.org>
-  pekwm-20050129.2.ebuild, +pekwm-20050227.ebuild:
-  Version bump. Change theme pack filename.
-
-  08 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
-  pekwm-20050129.2.ebuild:
-  ebuild cleanup
-
-  02 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
-  pekwm-20050129.2.ebuild:
-  Forced imlib2 and themes
-
-*pekwm-20050129.2 (01 Feb 2005)
-
-  01 Feb 2005; Fernando Serboncini <fserb@gentoo.org>
-  +pekwm-20050129.2.ebuild:
-  DEV Version bump. Added themes and imlib2 support
-
-  06 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> -pekwm-0.1.2.ebuild,
-  -pekwm-0.1.3-r1.ebuild, -pekwm-0.1.3.ebuild:
-  Removed old ebuilds.
-
-  07 May 2004; Brandon Hale <tseng@gentoo.org> pekwm-0.1.3-r2.ebuild:
-  Remove S=
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> pekwm-0.1.3-r2.ebuild:
-  Add inherit eutils
-
-  10 Dec 2003; Jon Portnoy <avenj@gentoo.org> pekwm-0.1.3-r2.ebuild :
-  AMD64 keyworded.
-
-  04 Nov 2003; Brandon Hale <tseng@gentoo.org> metadata.xml,
-  pekwm-0.1.3-r2.ebuild:
-  Marked 0.1.3-r2 stable on x86, added metadata
-
-*pekwm-0.1.3-r2 (30 Jul 2003)
-
-  13 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> pekwm-0.1.3-r2.ebuild,
-  files/pekwm-manpath-gentoo.diff:
-  Fixed man location and html docoment. Added truetype, xinerama and
-  perl IUSE flag.
-
-  30 Jul 2003; Brad Cowan <bcowan@gentoo.org> pekwm-0.1.3-r2.ebuild:
-  Moved config files to /etc per upstream request.
-
-*pekwm-0.1.3-r1 (27 Jul 2003)
-
-  27 Jul 2003; Brad Cowan <bcowan@gentoo.org> pekwm-0.1.3-r1.ebuild:
-  Fixes.
-
-  08 Jun 2003; Seemant Kulleen <seemant@gentoo.org> :
-  version bump
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/ChangeLog,v 1.1 2002/11/19 09:50:29 bcowan Exp $
 
 *pekwm-0.1.2 (19 Nov 2002)
 
-  16 Feb 2002; Brad Cowan <bcowan@gentoo.org>:
-  
-  added pkgconfig dependency to check for xft bug# 14664.
-  
   19 Nov 2002; Brad Cowan <bcowan@gentoo.org> pekwm-0.1.2.ebuild,
   ChangeLog, files/digest-pekwm-0.1.2 :
 
diff --git a/x11-wm/pekwm/Manifest b/x11-wm/pekwm/Manifest
index 4fafb10aa8c6..e69de29bb2d1 100644
--- a/x11-wm/pekwm/Manifest
+++ b/x11-wm/pekwm/Manifest
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 d64510f23c940f374f3494fab2633a3d ChangeLog 2638
-MD5 2a4c0e75ae56991a9c6b53b27c16ccf3 metadata.xml 666
-MD5 a2e45e5f38ce959b3e309193b7abc4b6 pekwm-0.1.3-r2.ebuild 1006
-MD5 0d196ab888bf1ddce88bdcc00c623807 pekwm-0.1.4_pre2.ebuild 1260
-MD5 feb34a062104c0c28685fa05192dc7be files/digest-pekwm-0.1.3-r2 64
-MD5 4eb560893fc98dbaba9b461b71a9df98 files/pekwm-manpath-gentoo.diff 455
-MD5 ecda2eccfb00e25051892b04e9b73efe files/digest-pekwm-0.1.4_pre2 133
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCj9W2xtZcznfol0URAnegAJ0YSHTMGsIipv1ZsunAodEg730eegCg/cVm
-C4T1I15plzMRK6+wNLepU8c=
-=3rCY
------END PGP SIGNATURE-----
diff --git a/x11-wm/pekwm/metadata.xml b/x11-wm/pekwm/metadata.xml
index 4b44a8ec64c8..5eb5bb96f844 100644
--- a/x11-wm/pekwm/metadata.xml
+++ b/x11-wm/pekwm/metadata.xml
@@ -2,7 +2,6 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 	<herd>desktop-wm</herd>
-	<maintainer><email>fserb@gentoo.org</email></maintainer>
 	<longdescription>
 		Pekwm is a window manager based on aewm++, but it no longer resembles 
 		it. It is highly configurable, rather fast, and aimed towards being 
diff --git a/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild b/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild
index 9c85ac6e4b9b..c6029bdcd158 100644
--- a/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild
+++ b/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild,v 1.10 2005/02/01 23:28:38 fserb Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pekwm/pekwm-0.1.3-r2.ebuild,v 1.1 2003/07/30 13:58:56 bcowan Exp $
 
-inherit eutils
+IUSE=""
 
-IUSE="truetype perl xinerama"
+S="${WORKDIR}/${P}"
 
 DESCRIPTION="A small window mananger based on aewm++"
 HOMEPAGE="http://pekwm.pekdon.net/"
@@ -13,32 +13,32 @@ SRC_URI="http://pekwm.pekdon.net/files/source/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc ~sparc amd64"
+KEYWORDS="~x86"
 
-DEPEND="virtual/x11
-	truetype? ( virtual/xft )
-	perl? ( dev-libs/libpcre )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PN}-manpath-gentoo.diff
-}
+DEPEND="dev-util/pkgconfig
+	virtual/x11
+	perl? dev-libs/libpcre"
 
 src_compile() {
+	if pkg-config xft
+	    then
+		myconf="${myconf} --disable-xft"
+	    else
+		myconf="${myconf} --enable-xft"	
+	fi
+	use perl \
+		&& myconf="${myconf} --enable-pcre" \
+		|| myconf="${myconf} --disable-pcre"
 	econf \
-		`use_enable truetype xft` \
-		`use_enable xinerama` \
-		`use_enable perl pcre` \
-		--enable-harbour \
-		${myconf} || die
+	    --enable-xinerama \
+	    --enable-harbour \
+	    ${myconf} || die	
 	emake || die
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
+	make DESTDIR=${D} install
 
 	cd ${S}
-	dodoc docs/pekwmdocs.txt AUTHORS ChangeLog* INSTALL LICENSE README* NEWS ROADMAP TODO
-	dohtml docs/pekwmdocs.html
+	dodoc docs/pekwmdocs.txt AUTHORS ChangeLog* INSTALL LICENSE README* NEWS ROADMAP TODO	
 }
diff --git a/x11-wm/plwm/ChangeLog b/x11-wm/plwm/ChangeLog
index 7b5699053509..54c48caaa73d 100644
--- a/x11-wm/plwm/ChangeLog
+++ b/x11-wm/plwm/ChangeLog
@@ -1,26 +1,8 @@
 # ChangeLog for x11-wm/plwm
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/ChangeLog,v 1.6 2004/06/24 23:44:12 agriffis Exp $
-
-  04 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org>
-  +files/plwm-2.6_alpha.patch, plwm-2.6_alpha.ebuild:
-  added patch(upstream) for utils/inspect_plwm.py and utils/wmm.py so they work
-  again
-
-*plwm-2.6_alpha (03 Jun 2004)
-
-  03 Jun 2004; Thomas Raschbacher <lordvan@gentoo.org> +plwm-2.6_alpha.ebuild:
-  version bump
-  now using distutils
-  installing all docs now (with subdirectories)
-
-  04 Nov 2003; Brandon Hale <tseng@gentoo.org> metadata.xml, plwm-2.5.ebuild:
-  Mark as stable on x86, add metadata
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/ChangeLog,v 1.1 2003/04/03 18:09:14 chouser Exp $
 
 *plwm-2.5 (03 Apr 2003)
 
-  07 May 2003; Martin Holzer <mholzer@gentoo.org> plwm-2.5.ebuild :
-  Added x86 to Keywords. Closes #20368.
-
   03 Apr 2003; Chris Houser <chouser@gentoo.com> plwm-2.5.ebuild,
   files/digest-plwm-2.5 : Initial import.
diff --git a/x11-wm/plwm/Manifest b/x11-wm/plwm/Manifest
index 41bc88b4c472..468624a2bb70 100644
--- a/x11-wm/plwm/Manifest
+++ b/x11-wm/plwm/Manifest
@@ -1,7 +1,3 @@
-MD5 51f1555b9e5db0b1c5ad7931ec9d0240 plwm-2.5.ebuild 967
-MD5 cec0406d23311ae74f4a820b0b67c84d plwm-2.6_alpha.ebuild 1238
-MD5 25bdd18cd22b06044b40051581c31282 ChangeLog 950
-MD5 5f29a1d40e647d7d78f8c53d4cb6445f metadata.xml 359
-MD5 1b7730df5d5f1471f91ee894ce80661a files/digest-plwm-2.6_alpha 61
+MD5 236a493a3ba857470db557be72236ebc ChangeLog 338
+MD5 235c266065e9cdcdaff1fbf1fb551c3d plwm-2.5.ebuild 973
 MD5 a81a5fe3ecf5e5f81cb18ba34947aeb2 files/digest-plwm-2.5 60
-MD5 503ec2d8bf0ff6a0e1c88a8f453fbdcc files/plwm-2.6_alpha.patch 651
diff --git a/x11-wm/plwm/files/digest-plwm-2.5 b/x11-wm/plwm/files/digest-plwm-2.5
index 339f0f1637d6..8db3914e8046 100644
--- a/x11-wm/plwm/files/digest-plwm-2.5
+++ b/x11-wm/plwm/files/digest-plwm-2.5
@@ -1 +1 @@
-MD5 a8615ddbc746e93d5c396ee8f3a87d48 plwm-2.5.tar.gz 127248
+MD5 a8615ddbc746e93d5c396ee8f3a87d48 plwm-2.5.tar.gz 12724
diff --git a/x11-wm/plwm/plwm-2.5.ebuild b/x11-wm/plwm/plwm-2.5.ebuild
index d9586e3fe7ba..19fd83e90ae1 100644
--- a/x11-wm/plwm/plwm-2.5.ebuild
+++ b/x11-wm/plwm/plwm-2.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.5.ebuild,v 1.6 2004/06/24 23:44:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.5.ebuild,v 1.1 2003/04/03 18:09:14 chouser Exp $
 
 DESCRIPTION="Python classes for, and an implementation of, a window manager."
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/plwm/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
-KEYWORDS="x86 alpha ppc"
+KEYWORDS="alpha"
 IUSE=""
 DEPEND=">=dev-lang/python-2.2.2"
 RDEPEND=">=dev-lang/python-2.2.2
@@ -26,7 +26,7 @@ src_install() {
 		prefix="${D}/usr" \
 		PLWM_PATH="${D}"'$(PYTHON_SITE_PATH)/plwm' \
 		install \
-			|| die "make install failed for ${P}"
+    || die "make install failed for ${P}"
 
 	# info page
 	make -C doc || die "make info docs failed for ${P}"
diff --git a/x11-wm/plwm/plwm-2.6_alpha.ebuild b/x11-wm/plwm/plwm-2.6_alpha.ebuild
index 550f2c534ef8..fcd7d21188ab 100644
--- a/x11-wm/plwm/plwm-2.6_alpha.ebuild
+++ b/x11-wm/plwm/plwm-2.6_alpha.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.6_alpha.ebuild,v 1.5 2004/06/24 23:44:12 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/plwm/plwm-2.6_alpha.ebuild,v 1.1 2004/06/03 20:25:32 lordvan Exp $
 
-inherit distutils eutils
+inherit distutils
 
 MY_P="PLWM-${PV/_alpha/a}"
 DESCRIPTION="Python classes for, and an implementation of, a window manager."
@@ -18,14 +18,6 @@ RDEPEND=">=dev-lang/python-2.2.2
 
 S=${WORKDIR}/${MY_P}
 
-src_unpack() {
-	unpack ${A}
-
-	# patch from upstream to make utils useable again
-	cd ${S}
-	epatch ${FILESDIR}/${P}.patch
-}
-
 src_install() {
 	distutils_src_install
 
diff --git a/x11-wm/pwm/ChangeLog b/x11-wm/pwm/ChangeLog
index 86a7fd252f7e..7319073db3a4 100644
--- a/x11-wm/pwm/ChangeLog
+++ b/x11-wm/pwm/ChangeLog
@@ -1,29 +1,9 @@
 # ChangeLog for x11-wm/pwm
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pwm/ChangeLog,v 1.10 2004/06/28 02:54:34 agriffis Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pwm/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
-  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> pwm-1.0.20010309.ebuild,
-  pwm-1.0.20030617.ebuild:
-  QA - fix use invocation
-
-  18 Jun 2004; Jason Wever <weeve@gentoo.org> pwm-1.0.20030617.ebuild:
-  Stable on sparc.
-
-  06 Mar 2004; Markus Nigbur <pyrania@gentoo.org> pwm-1.0.20010309.ebuild:
-  SRC_URI fixup.
-
-*pwm-1.0.20030617 (25 Sep 2003)
-
-  25 Sep 2003; Martin Holzer <mholzer@gentoo.org> pwm-1.0.20030617.ebuild:
-  Version bumped. closes #25995.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *pwm-1.0.20010309 (1 Feb 2002)
 
-  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> pwm-1.0.20010309.ebuild :
-  Added IUSE.
-
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
   
   Added initial ChangeLog which should be updated whenever the package is
diff --git a/x11-wm/pwm/Manifest b/x11-wm/pwm/Manifest
index 85c562a1e913..e69de29bb2d1 100644
--- a/x11-wm/pwm/Manifest
+++ b/x11-wm/pwm/Manifest
@@ -1,6 +0,0 @@
-MD5 d9461c273df4ad95212c203ea0639b22 ChangeLog 1285
-MD5 554d93b3c45900ce87b05b35ff0f8c9d metadata.xml 400
-MD5 44a608502fd64965e15a1a2f9c84c5bf pwm-1.0.20010309.ebuild 1407
-MD5 0dc86978d6b67ec6d9e3fc73a50ee716 pwm-1.0.20030617.ebuild 1395
-MD5 a445b90b242219cab13a332071404955 files/digest-pwm-1.0.20010309 63
-MD5 dca9f22fbfe6c1b338f1c4704d3962f8 files/digest-pwm-1.0.20030617 64
diff --git a/x11-wm/pwm/files/digest-pwm-1.0.20010309 b/x11-wm/pwm/files/digest-pwm-1.0.20010309
index c15555349667..644345c7f11b 100644
--- a/x11-wm/pwm/files/digest-pwm-1.0.20010309
+++ b/x11-wm/pwm/files/digest-pwm-1.0.20010309
@@ -1 +1 @@
-MD5 2d5e5c33020c97edd85c4e0b47930e00 pwm-20010309.tar.gz 98474
+MD5 2d5e5c33020c97edd85c4e0b47930e00 pwm-20010309.tar.gz 102400
diff --git a/x11-wm/pwm/pwm-1.0.20010309.ebuild b/x11-wm/pwm/pwm-1.0.20010309.ebuild
index ca510d6732eb..023db06f6c54 100644
--- a/x11-wm/pwm/pwm-1.0.20010309.ebuild
+++ b/x11-wm/pwm/pwm-1.0.20010309.ebuild
@@ -1,16 +1,13 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pwm/pwm-1.0.20010309.ebuild,v 1.15 2004/06/28 02:54:34 agriffis Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# Maintainer: Daniel Robbins <drobbins@gentoo.org> 
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/pwm/pwm-1.0.20010309.ebuild,v 1.1 2001/12/18 00:45:55 drobbins Exp $
 
 NPV=20010309
 S=${WORKDIR}/pwm-${NPV}
 DESCRIPTION="A lightweight window manager"
-SRC_URI="http://modeemi.cs.tut.fi/~tuomov/dl/pwm-${NPV}.tar.gz"
+SRC_URI="http://www.students.tut.fi/~tuomov/dl/pwm-${NPV}.tar.gz"
 HOMEPAGE="http://www.students.tut.fi/~tuomov/pwm"
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE="gnome"
 
 DEPEND="virtual/x11"
 
@@ -34,7 +31,7 @@ src_unpack() {
 
 src_compile() {
 	emake PREFIX=/usr \
-	     MANDIR=/usr/share/man \
+	     MANDIR=/usr/share/man/man1 \
 	     DOCDIR=/usr/share/doc \
 	     ETCDIR=/etc/X11 \
 	     || die
@@ -42,12 +39,12 @@ src_compile() {
 
 src_install() {
 	make PREFIX=${D}/usr \
-	     MANDIR=${D}/usr/share/man \
+	     MANDIR=${D}/usr/share/man/man1	\
 	     DOCDIR=${D}/usr/share/doc \
 	     ETCDIR=${D}/etc/X11 \
 	     install || die
 
-	if use gnome
+	if [ "`use gnome`" ]
 	then
 		insinto /usr/share/gnome/wm-properties
 		doins support/PWM.desktop
diff --git a/x11-wm/pwm/pwm-1.0.20030617.ebuild b/x11-wm/pwm/pwm-1.0.20030617.ebuild
index fd1b1d491048..20ae3095165f 100644
--- a/x11-wm/pwm/pwm-1.0.20030617.ebuild
+++ b/x11-wm/pwm/pwm-1.0.20030617.ebuild
@@ -1,21 +1,18 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/pwm/pwm-1.0.20030617.ebuild,v 1.7 2005/04/26 23:36:05 vapier Exp $
 
-MY_P=${PN}-${PV/1.0./}
-DESCRIPTION="A lightweight window manager"
-HOMEPAGE="http://modeemi.fi/~tuomov/pwm/"
-SRC_URI="http://modeemi.fi/~tuomov/dl/${MY_P}.tar.gz"
 
+S=${WORKDIR}/${P}
+DESCRIPTION="A lightweight window manager. It was the first window manager to implement tabbed frames or the back then unique feature allowing multiple client windows can be attached to the same frame or This feature helps keeping windows, especially the numerous xterms, organized. "
+SRC_URI="http://modeemi.fi/~tuomov/dl/${P}.tar.gz"
+HOMEPAGE="http://modeemi.fi/~tuomov/pwm/"
 LICENSE="Artistic"
 SLOT="0"
-KEYWORDS="ppc sparc ~x86"
+KEYWORDS="~x86 ~sparc ~ppc"
 IUSE="gnome"
 
 DEPEND="virtual/x11"
 
-S=${WORKDIR}/${MY_P}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}
@@ -49,7 +46,7 @@ src_install() {
 		ETCDIR=${D}/etc/X11 \
 		install || die "install failed"
 
-	if use gnome
+	if [ "`use gnome`" ]
 	then
 		insinto /usr/share/gnome/wm-properties
 		doins support/PWM.desktop
diff --git a/x11-wm/qvwm/ChangeLog b/x11-wm/qvwm/ChangeLog
index 8e5e29265fe7..969ceaa585d1 100644
--- a/x11-wm/qvwm/ChangeLog
+++ b/x11-wm/qvwm/ChangeLog
@@ -1,20 +1,9 @@
 # ChangeLog for x11-wm/qvwm
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/qvwm/ChangeLog,v 1.5 2004/06/24 23:44:33 agriffis Exp $
-
-  18 Jun 2004; Jason Wever <weeve@gentoo.org> qvwm-1.1.12.ebuild:
-  Stable on sparc.
-
-  24 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> qvwm-1.1.12.ebuild:
-  Removed alsa from IUSE because qvwm doesn't support
-  >=media-libs/alsa-lib-0.9. See bug #39126
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/qvwm/ChangeLog,v 1.1 2003/10/17 22:34:00 usata Exp $
 
 *qvwm-1.1.12 (18 Oct 2003)
 
-  08 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> metadata.xml,
-  qvwm-1.1.12.ebuild:
-  Marked as stable for x86. Added desktop-wm herd.
-
   18 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> qvwm-1.1.12.ebuild:
   Initial import. Ebuild submitted by Bernardo S. A. Silva
   <bsaslinux@globo.com> and MATSUU Takuto <matsuu@gentoo.org>.
diff --git a/x11-wm/qvwm/Manifest b/x11-wm/qvwm/Manifest
index 033ddcaa7357..3e2384cb5d11 100644
--- a/x11-wm/qvwm/Manifest
+++ b/x11-wm/qvwm/Manifest
@@ -1,4 +1,2 @@
-MD5 edc9b2c3117a8955764231e31fff1856 ChangeLog 829
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 90089b2ae9e0c6497e11543608e6f907 qvwm-1.1.12.ebuild 899
+MD5 441c3fa0aa984258b18d274f7ff240a2 qvwm-1.1.12.ebuild 915
 MD5 41d3100378bfa9454e12460b142bac2f files/digest-qvwm-1.1.12 63
diff --git a/x11-wm/qvwm/qvwm-1.1.12.ebuild b/x11-wm/qvwm/qvwm-1.1.12.ebuild
index c26e4183332a..09b57cd951c9 100644
--- a/x11-wm/qvwm/qvwm-1.1.12.ebuild
+++ b/x11-wm/qvwm/qvwm-1.1.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/qvwm/qvwm-1.1.12.ebuild,v 1.7 2004/07/15 01:15:08 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/qvwm/qvwm-1.1.12.ebuild,v 1.1 2003/10/17 22:34:00 usata Exp $
 
 DESCRIPTION="Qvwm is a Windows 9X like window manager for X Window System."
 HOMEPAGE="http://www.qvwm.org/"
@@ -8,21 +8,25 @@ SRC_URI="http://www.qvwm.org/archive/qvwm/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc"
-IUSE="imlib esd"
+KEYWORDS="~x86 ~ppc ~sparc"
+IUSE="imlib alsa esd"
 
 RDEPEND="virtual/x11
 	imlib? ( >=media-libs/imlib-1.8.2 )
+	alsa? ( media-libs/alsa-lib )
 	esd? ( >=media-sound/esound-0.2.6 )"
 
 DEPEND="${RDEPEND}
 	sys-devel/flex
 	sys-devel/bison"
 
+S=${WORKDIR}/${P}
+
 src_compile(){
 
 	econf \
 		`use_with imlib` \
+		`use_with alsa` \
 		`use_with esd` || die
 	emake || die
 }
diff --git a/x11-wm/ratpoison/ChangeLog b/x11-wm/ratpoison/ChangeLog
index 19f066ffd7a7..bf374162e1f1 100644
--- a/x11-wm/ratpoison/ChangeLog
+++ b/x11-wm/ratpoison/ChangeLog
@@ -1,124 +1,9 @@
-# ChangeLog for x11-wm/ratpoison
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.32 2005/11/02 16:54:39 mkennedy Exp $
-
-  02 Nov 2005; Matthew Kennedy <mkennedy@gentoo.org>
-  files/50ratpoison-gentoo.el:
-  Added useful Emacs autoloads.
-
-  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
-  Converted to UTF-8, fixed encoding screwups
-
-*ratpoison-1.4.0_beta4 (21 May 2005)
-
-  21 May 2005; Jason Wever <weeve@gentoo.org> files/ratpoison.xsession,
-  +ratpoison-1.4.0_beta4.ebuild:
-  Version bump, resolves bug #92386.
-
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> ratpoison-1.3.0.ebuild:
-  Stable on amd64.
-
-*ratpoison-1.4.0_beta2 (26 Mar 2005)
-
-  26 Mar 2005; Jason Wever <weeve@gentoo.org> +ratpoison-1.4.0_beta2.ebuild:
-  Bump that sexy version.
-
-  11 Dec 2004; Jason Wever <weeve@gentoo.org> ratpoison-1.3.0.ebuild:
-  Updated HOMEPAGE and SRC_URI to reflect recent move to savannah.nongnu.org.
-
-  13 Oct 2004; Jason Wever <weeve@gentoo.org> -ratpoison-1.2.2-r1.ebuild,
-  ratpoison-1.3.0.ebuild, -ratpoison-1.3.0_rc1.ebuild:
-  Marked 1.3.0 stable for x86 and sparc, and some old version cleanup.
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  ratpoison-1.3.0.ebuild:
-  Masked ratpoison-1.3.0.ebuild stable for ppc
-
-*ratpoison-1.3.0 (20 Jun 2004)
-
-  20 Jun 2004; Jason Wever <weeve@gentoo.org> +files/ratpoison.xsession,
-  +ratpoison-1.3.0.ebuild:
-  Version bumpage.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org> ratpoison-1.3.0_rc1.ebuild:
-  Add inherit eutils
-
-  26 Apr 2004; Aron Griffis <agriffis@gentoo.org> ratpoison-1.2.2-r1.ebuild,
-  ratpoison-1.3.0_rc1.ebuild:
-  Add die following econf for bug 48950
-
-  29 Mar 2004; Jason Wever <weeve@gentoo.org> ratpoison-1.1.1.ebuild,
-  ratpoison-1.2.1.ebuild, ratpoison-1.2.2.ebuild,
-  ratpoison-1.3.0_beta3-r1.ebuild, ratpoison-1.3.0_beta3-r2.ebuild,
-  ratpoison-1.3.0_beta3.ebuild, ratpoison-1.3.0_rc1.ebuild:
-  Old version cleanup, changed x11-base/xfree dependency to virtual/x11.
-
-  14 Mar 2004; Brad Cowan <bcowan@gentoo.org> :
-  Fixed read-only var assignment.
-
-*ratpoison-1.3.0_rc1 (23 Nov 2003)
-
-  23 Nov 2003; Jason Wever <weeve@gentoo.org> ratpoison-1.3.0_rc1.ebuild:
-  version bump.
-
-*ratpoison-1.3.0_beta3-r2 (10 Nov 2003)
-
-  10 Nov 2003; <mkennedy@gentoo.org> ratpoison-1.3.0_beta3-r2.ebuild:
-  added emacs USE flag support
-
-  08 Nov 2003; Brad House <brad_mssw@gentoo.org>
-  ratpoison-1.3.0_beta3-r1.ebuild:
-  add ~amd64 flag
-
-*ratpoison-1.2.2-r1 (15 Oct 2003)
-
-  15 Oct 2003; Jason Wever <weeve@gentoo.org> ratpoison-1.2.2-r1.ebuild,
-  ratpoison-1.3.0_beta3-r1.ebuild:
-  Added XSESSION script so ratpoison is now choosable via xdm/kdm/gdm.
-
-*ratpoison-1.3.0_beta3 (14 Oct 2003)
-
-  14 Oct 2003; Jason Wever <weeve@gentoo.org> ratpoison-1.3.0_beta3.ebuild:
-  Version bump, thanks to Björn Lindström <bkhl@elektrubadur.se> for the ebuild.
-  Closes bug #31133.
-
-  02 Jul 2003; Jason Wever <weeve@gentoo.org> metadata.xml:
-  Added metadata.xml
-
-*ratpoison-1.2.2 (12 Jun 2003)
-
-  12 Jun 2003; Jason Wever <weeve@gentoo.org> ratpoison-1.2.2.ebuild:
-  Another day, another version bump.
-
-*ratpoison-1.2.1 (11 Jun 2003)
-
-  11 Jun 2003; Jason Wever <weeve@gentoo.org> ratpoison-1.2.1.ebuild:
-  version bump.
+# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ChangeLog,v 1.1 2002/10/19 19:03:03 weeve Exp $
 
 *ratpoison-1.1.1 (06 Jun 2002)
 
-  30 Jan 2003; Jason Wever <weeve@gentoo.org> ratpoison-1.1.1.ebuild : 
-  fixed doins like to actually install ratpoisonrc
-
-  30 Jan 2003; Jason Wever <weeve@gentoo.org files/ratpoisonrc : 
-  Added ratpoisonrc as it was needed by the ebuild.
-
-  26 Jan 2003; Jon Nall <nall@gentoo.org> ratpoison-1.1.1.ebuild :
-  added ~ppc
-
-  05 Jan 2003: Jason Wever <weeve@gentoo.org> ratpoison-1.1.1.ebuild :
-
-  Added sparc to KEYWORDS
- 
-  24 Dec 2002; Seemant Kulleen <seemant@gentoo.org> ratpoison-1.1.1.ebuild :
-
-  Ebuild fixed to be an actual ebuild by j2 in #gentoo-dev (Maurizio).
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-  10 Nov 2002; Jon Nall <nall@gentoo.org> ratpoison-1.1.1.ebuild :
-  added ppc to KEYWORDS
-
   19 Oct 2002; Jason Wever <weeve@gentoo.org> ratpoison-1.1.1.ebuild, 
   files/digest-ratpoison-1.1.1: 
   Initial import. Ebuild submitted by Jason Wever <weeve@gentoo.org>.
diff --git a/x11-wm/ratpoison/Manifest b/x11-wm/ratpoison/Manifest
index 0edb60e8a39c..e69de29bb2d1 100644
--- a/x11-wm/ratpoison/Manifest
+++ b/x11-wm/ratpoison/Manifest
@@ -1,22 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 4f5f6e41a8552aebb4e880b3987dbbbc ChangeLog 4240
-MD5 608274a76e39130af139a7a1f12ab564 files/50ratpoison-gentoo.el 524
-MD5 e4205db91428787672e5463c32d4b701 files/digest-ratpoison-1.3.0 67
-MD5 e97b940b1d366b59e727dd7c8f727874 files/digest-ratpoison-1.4.0_beta2 73
-MD5 68d1d603290ff4bc9e9221078e552364 files/digest-ratpoison-1.4.0_beta4 73
-MD5 129f353e076455306b034fd577a6cdd2 files/ratpoison.el-gentoo.patch 273
-MD5 f2ca283925e8bbb408427e4a29c8592d files/ratpoison.xsession 19
-MD5 a7dd337c32ae9d2fe627cf230b77965c files/ratpoisonrc 609
-MD5 0dc401dca3401344d482d660aedf9b3b metadata.xml 829
-MD5 d6dc62049d4af16eb42ce96b3aee90cd ratpoison-1.3.0.ebuild 1443
-MD5 8e71189578c6957a1a66541c432f8b86 ratpoison-1.4.0_beta2.ebuild 1499
-MD5 480301c1bfce20a9a72b7c446c46b356 ratpoison-1.4.0_beta4.ebuild 1499
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDaO9dyiNZaEAZA+ARAvLUAJ9kWmgbsvSWd23qOZxmIpnyXhXiswCeJ345
-Isa0MEkjHDTPtXKrcvo1z1I=
-=mowJ
------END PGP SIGNATURE-----
diff --git a/x11-wm/ratpoison/files/50ratpoison-gentoo.el b/x11-wm/ratpoison/files/50ratpoison-gentoo.el
index b8885bd7adc4..300e548d5013 100644
--- a/x11-wm/ratpoison/files/50ratpoison-gentoo.el
+++ b/x11-wm/ratpoison/files/50ratpoison-gentoo.el
@@ -2,9 +2,3 @@
 ;;; site-lisp configuration for ratpoison
 
 (add-to-list 'load-path "@SITELISP@")
-
-(autoload 'ratpoisonrc-mode "ratpoison" "Mode for ratpoison configuration files." t)
-(autoload 'ratpoison-command "ratpoison" "Run a ratpoison command." t)
-(autoload 'ratpoison-command-on-region "ratpoison" "Run a ratpoison command contained in the region." t)
-(autoload 'ratpoison-info "ratpoison" "Call up the ratpoison info page." t)
-(autoload 'ratpoison-command-info "ratpoison" "Call up the info page listing the ratpoison commands." t)
-\ No newline at end of file
diff --git a/x11-wm/ratpoison/files/ratpoison.xsession b/x11-wm/ratpoison/files/ratpoison.xsession
index 664edf72a543..13162614fa99 100644
--- a/x11-wm/ratpoison/files/ratpoison.xsession
+++ b/x11-wm/ratpoison/files/ratpoison.xsession
@@ -1 +1,2 @@
-/usr/bin/ratpoison
+#!/bin/bash
+exec /usr/bin/ratpoison
diff --git a/x11-wm/ratpoison/ratpoison-1.3.0.ebuild b/x11-wm/ratpoison/ratpoison-1.3.0.ebuild
index 86091f977017..4d58b9ff0233 100644
--- a/x11-wm/ratpoison/ratpoison-1.3.0.ebuild
+++ b/x11-wm/ratpoison/ratpoison-1.3.0.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.3.0.ebuild,v 1.6 2005/05/08 15:07:35 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ratpoison/ratpoison-1.3.0.ebuild,v 1.1 2004/06/20 15:16:33 weeve Exp $
 
 inherit elisp-common eutils
 
 DESCRIPTION="Ratpoison is an extremely light-weight and barebones wm modelled after screen"
-HOMEPAGE="http://www.nongnu.org/ratpoison/"
+HOMEPAGE="http://ratpoison.sourceforge.net/"
 LICENSE="GPL-2"
 
-SRC_URI="http://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 SLOT="0"
-KEYWORDS="x86 sparc ppc amd64"
+KEYWORDS="~x86 ~sparc ~ppc ~amd64"
 IUSE="emacs"
 
 DEPEND="virtual/x11
diff --git a/x11-wm/sawfish/ChangeLog b/x11-wm/sawfish/ChangeLog
index ac4389baab03..2b18d5feab50 100644
--- a/x11-wm/sawfish/ChangeLog
+++ b/x11-wm/sawfish/ChangeLog
@@ -1,260 +1,6 @@
 # ChangeLog for x11-wm/sawfish
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.60 2005/09/19 21:27:30 truedfx Exp $
-
-  19 Sep 2005; Harald van Dĳk <truedfx@gentoo.org> +files/libtool.patch,
-  sawfish-1.3.20050816.ebuild:
-  Fix librep libtool mess instead of continuing to try to work around it
-
-  04 Sep 2005; Harald van Dĳk <truedfx@gentoo.org>
-  sawfish-1.3.20050816.ebuild:
-  No need to install Sawfish.desktop manually anymore
-  Change snapshot detection a bit
-
-  02 Sep 2005; Michael Hanselmann <hansmi@gentoo.org>
-  sawfish-1.3.20040120-r1.ebuild:
-  Stable on ppc.
-
-  22 Aug 2005; Gustavo Zacarias <gustavoz@gentoo.org>
-  sawfish-1.3.20040120-r1.ebuild:
-  Stable on sparc wrt #103251
-
-  21 Aug 2005; Harald van Dĳk <truedfx@gentoo.org> metadata.xml:
-  Marking myself as maintainer
-
-  21 Aug 2005; Aron Griffis <agriffis@gentoo.org>
-  sawfish-1.3.20040120-r1.ebuild:
-  stable alpha amd64 ia64 x86
-
-*sawfish-1.3.20050816 (16 Aug 2005)
-
-  16 Aug 2005; Harald van Dĳk <truedfx@gentoo.org>
-  +sawfish-1.3.20050816.ebuild:
-  new snapshot with xrandr support
-  disable themer check since it wasn't built anyway,
-  and fix nls/LINGUAS handling
-
-  16 Aug 2005; Harald van Dĳk <truedfx@gentoo.org>
-  -files/sawfish-1.2-fullscreen.patch, -files/sawfish-1.2-gtk+-2.2.patch,
-  sawfish-1.3.20040120-r1.ebuild:
-  removed sawfish 1.2 patches
-  partially fixed dependencies for 1.3.20040120-r1 (readline isn't used
-  anymore, esound version was a bit too low, and added an audiofile minimal
-  version)
-
-  23 Jun 2005; Aron Griffis <agriffis@gentoo.org> +sawfish-1.0.1-r6.ebuild,
-  -sawfish-1.2.ebuild:
-  Resurrect sawfish-1.0.1-r6 instead of sawfish-1.2, since gnome-1 depends on
-  <x11-wm/sawfish-1.2
-
-  23 Jun 2005; Aron Griffis <agriffis@gentoo.org> +sawfish-1.2.ebuild:
-  Resurrect sawfish-1.2 for gnome-1
-
-*sawfish-1.3.20040120-r1 (23 Jun 2005)
-
-  23 Jun 2005; Aron Griffis <agriffis@gentoo.org> -sawfish-1.0.1-r6.ebuild,
-  +sawfish-1.3.20040120-r1.ebuild:
-  Reduce DEPEND: remove bogus imlib, respect USE=audiofile #84947
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  sawfish-1.3.20040120.ebuild:
-  Masked sawfish-1.3.20040120.ebuild stable for ppc
-
-  27 Jun 2004; Aron Griffis <agriffis@gentoo.org> sawfish-1.0.1-r6.ebuild:
-  QA - fix use invocation
-
-*sawfish-1.0.1-r6 (13 May 2004)
-
-  13 May 2004; Aron Griffis <agriffis@gentoo.org> +sawfish-1.0.1-r6.ebuild,
-  -sawfish-1.2.ebuild:
-  Restore sawfish-1.0.1 for gnome-1.4
-
-  11 May 2004; Aron Griffis <agriffis@gentoo.org> +sawfish-1.2.ebuild:
-  Restore sawfish-1.2 for gnome-1.4
-
-  10 May 2004; Aron Griffis <agriffis@gentoo.org> -sawfish-1.0.1-r5.ebuild,
-  -sawfish-1.0.1-r6.ebuild, -sawfish-1.2.ebuild, -sawfish-1.3-r1.ebuild,
-  -sawfish-1.3-r2.ebuild, -sawfish-1.3-r3.ebuild, -sawfish-1.3.ebuild:
-  Prune old ebuilds
-
-  28 Apr 2004; David Holm <dholm@gentoo.org> sawfish-1.3.20040120.ebuild:
-  Added to ~ppc.
-
-  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org>
-  sawfish-1.3.20040120.ebuild:
-  KEYWORDS got sparced.
-
-  17 Feb 2004; Aron Griffis <agriffis@gentoo.org> sawfish-1.3-r3.ebuild:
-  Remove deprecated dependency on imlib
-
-  27 Jan 2004; Aron Griffis <agriffis@gentoo.org> sawfish-1.3.20040120.ebuild:
-  stable on x86, alpha, ia64
-
-*sawfish-1.3.20040120 (20 Jan 2004)
-
-  20 Jan 2004; Aron Griffis <agriffis@gentoo.org> sawfish-1.3.20040120.ebuild:
-  Add cvs snapshot of sawfish which fixes numerous problems
-
-  01 Dec 2003; Aron Griffis <agriffis@gentoo.org> sawfish-1.3-r3.ebuild:
-  Fix bad DEPEND which would downgrade librep from 0.17 to 0.16.2
-
-  24 Nov 2003; Aron Griffis <agriffis@gentoo.org> :
-  Note that the two sawfish-1.3 patches in files/ have been submitted upstream
-  and accepted.  Unknown at this point if there will be a maintenance version
-  of sawfish released anytime soon.  See
-  http://bugzilla.gnome.org/show_bug.cgi?id=127865
-
-  24 Nov 2003; Aron Griffis <agriffis@gentoo.org> sawfish-1.3-r3.ebuild:
-  Stable on ia64
-
-  18 Nov 2003; Aron Griffis <agriffis@gentoo.org> metadata.xml:
-  Add myself to metadata.xml
-
-  18 Nov 2003; Aron Griffis <agriffis@gentoo.org>
-  files/sawfish-1.3-state-below.patch:
-  Repair bad sawfish-1.3-state-below.patch which was reversed
-
-*sawfish-1.3-r3 (16 Nov 2003)
-
-  16 Nov 2003; Aron Griffis <agriffis@gentoo.org> sawfish-1.3-r3.ebuild,
-  files/sawfish-1.3-state-below.patch:
-  Fix bug 33609: Correct a typo in the sawfish code that prevents gdesklets (and
-  other programs) from occupying the correct layer. Without this patch, any
-  program using the _NET_WM_STATE_BELOW hint will always stay on top instead of
-  on bottom.
-
-*sawfish-1.3-r2 (27 Oct 2003)
-
-  27 Oct 2003; Aron Griffis <agriffis@gentoo.org> sawfish-1.3-r2.ebuild,
-  files/sawfish-1.3-shading.patch:
-  Include shading patch submitted by David Reid in bug 31660
-
-*sawfish-1.3-r1 (20 Oct 2003)
-
-  20 Oct 2003; Aron Griffis <agriffis@gentoo.org> sawfish-1.3-r1.ebuild:
-  Fix sawfish on alpha, re-enable the themer, pay attention to USE=gnome
-
-  12 Oct 2003; foser <foser@gentoo.org> sawfish-1.3.ebuild :
-  use packaged .desktop instead of our own (#29792)
-
-  01 Apr 2003; Daniel Robbins <drobbins@gentoo.org> sawfish-1.3.ebuild:
-  compile fix for gcc 2.95, closing bug #18294. Unmasking for x86. 
-
-*sawfish-1.3 (25 Mar 2003)
-
-  06 Mat 2003; foser <foser@gentoo.org> sawfish-1.3.ebuild :
-  Include OPTIONS doc (#15405)
-
-  25 Mar 2003; Daniel Robbins <drobbins@gentoo.org> sawfish-1.3.ebuild:
-  New upstream release.
-
-  05 Feb 2003; Aron Griffis <agriffis@gentoo.org> sawfish-1.2.ebuild :
-  Mark stable on alpha
-
-  05 Jan 2003; foser <foser@gentoo.org> sawfish-1.2.ebuild :
-  gtk+-2.2 build fix provided by Andy Dustman (bug #12755)
-
-  31 Dec 2002; Chris Houser <chouser@gentoo.org> sawfish-1.0.1-r6.ebuild :
-  Added alpha to KEYWORDS
-
-  17 Dec 2002; Aron Griffis <agriffis@gentoo.org> sawfish-1.2.ebuild :
-  Added ~alpha to KEYWORDS
-
-  13 Dec 2002; Martin Sclemmer <azarah@gentoo.org> sawfish-1.2.ebuild :
-  Tweak the fix for compile problems with both freetype-1.3.1 and xft-2.0
-  installed.
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org>:
-  Changed sparc ~sparc keywords
- 
-*sawfish-1.2 (17 Nov 2002)
-
-  04 Dec 2002; foser <foser@gentoo.org> sawfish-1.2.ebuild :
-  Removed non working ranging dependency declaration
-
-  21 Nov 2002; Martin Sclemmer <azarah@gentoo.org> sawfish-1.2.ebuild :
-  Fix compile problems with both freetype-1.3.1 and xft-2.0 installed.
-
-  19 Nov 2002; phoen][x <phoenix@gentoo.org> sawfish-1.2.ebuild :
-  Put sawfish-1.2 into the stable profile. 
-
-  19 Nov 2002; phoen][x <phoenix@gentoo.org> sawfish-1.2.ebuild,
-  files/sawfish-1.2-fullscreen.patch :
-  Incorporated the fullscreen patch. This closes bug #10904. 
-  
-  17 Nov 2002; phoen][x <phoenix@gentoo.org> sawfish-1.2.ebuild, 
-  files/digest-sawfish-1.2.ebuild :
-  Version bump. Forcing the ebuild to use the gtk2 version of sawfish-1.2.
-  Maybe i'll add some optional USEflag SRC_URI later.
-
-*sawfish-1.0.1-r6 (15 Oct 2002)
-  
-  20 Oct 2002; Calum Selkirk <cselkirk@gentoo.org> sawfish-1.0.1-r5.ebuild 
-  sawfish-1.0.1-r6.ebuild :
-
-  Added ppc to KEYWORDS.
-
-  15 Oct 2002; foser <foser@gentoo.org> sawfish-1.0.1-r6.ebuild :
-  Added MAKEOPTS="-j1" (see bug #4728)
-
-*sawfish-1.0.1-r5 (4 Aug 2002) 
-  4 Aug 2002; Gabriele Giorgetti <stroke@gentoo.org> sawfish-1.0.1-r5.ebuild:
-  Corrected the rep-gtk dep to match with the correct gnome1 version.
-  Also should fix bug #4728
-  
-*sawfish-2.0 (24 Jun 2002)
-  24 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Version update.  Finally figured out why it moans about the ${S}/src/.libs
-  not existing ... when using "emake", the build gets out of sync.  Also
-  fixed a problem where the lisp modules tries to use gui.gtk-2.gdk-pixbuf ..
-  this is now merged with gui.gtk-2.gtk.
-
-*sawfish-20020612-r1 (19 Jun 2002)
-  19 Jun 2002; Martin Schlemmer <azarah@gentoo.org> :
-  Do not create the .libs directory, even if the build complain it do not
-  exist, as it causes the lisp stuff to fail building.
-
-*sawfish-20020524 (12 Jun 2002)
-  12 Jun 2002; Gabriele Giorgetti <stroke@gentoo.org> sawfish-20020612.ebuild :
-  A newer non-working snapshot.
-
-*sawfish-20020524 (27 May 2002)
-  27 May 2002; Spider <spider@gentoo.org> sawfish-20020524.ebuild :
-  new snapshot. still doesn't work
-  
-*sawfish-20020419 (22 May 2002)
-  22 May 2002; Spider <spider@gentoo.org> sawfish-20020419.ebuild :
-  gnome2 snapshots
-
-*sawfish-1.0.1-r4 (21 May 2002) 
-  21 May 2002; Spider <spider@gentoo.org> sawfish-1.0.1-r4.ebuild ChangeLog :
-  fix broken changelog entry
-  move rep-gtk to x11-libs
-
-sawfish-1.0.1-r3 (9 Apr 2002)
-  9 Apr ; Spider <spider@gentoo.org> :
-  Fix >=x11-lib/gtk+-1.2.nn to =x11-lib/gtk+-1.2*
-
-*sawfish-1.0.1-r3 (2 April 2002)
-
-  2 April 2002; Seemant Kulleen <seemant@gentoo.org> sawfish-1.0.1-r3.ebuild :
-
-  Slight nls fix in the install stage -- removed empty ${D}/usr/share/locale
-  directory.  And returned imlib to being a required dependency, instead of
-  optional.
-
-*sawfish-1.0.1-r3 (28 Mar 2002)
-
-  28 Mar 2002; Seemant Kulleen <seemant@gentoo.org> sawfish-1.0.1-r3.ebuild :
-
-  Separate gnome from gtk/gdk-pixbuf stuff, and from sawfish in general, unless
-  user has gnome in the USE list.
-
-*sawfish-1.0.1-r2 (16 Mar 2002)
-
-  16 Mar 2002; M.Schlemmer <azarah@gentoo.org> :
-
-  Fix build errors with libtool-1.4 or later.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/ChangeLog,v 1.1 2002/02/01 21:53:39 gbevin Exp $
 
 *sawfish-1.0.1-r1 (1 Feb 2002)
 
diff --git a/x11-wm/sawfish/Manifest b/x11-wm/sawfish/Manifest
index 80120b74f0fa..e69de29bb2d1 100644
--- a/x11-wm/sawfish/Manifest
+++ b/x11-wm/sawfish/Manifest
@@ -1,26 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 683a44340139387ede0f0a8ec990f6af metadata.xml 252
-MD5 eb5d859670c6ea8a0904662860c180b0 sawfish-1.0.1-r6.ebuild 2017
-MD5 38a41c33b244c5704ca3dec0a903ba61 sawfish-1.3.20040120-r1.ebuild 2560
-MD5 2dfef4a3fc9332df431ea0b2b06c5ee8 sawfish-1.3.20040120.ebuild 2700
-MD5 348d700931fbea63760cc0b0a6efa744 sawfish-1.3.20050816.ebuild 2808
-MD5 78baadecf42f0ea46231f6cdca62d1fb ChangeLog 9801
-MD5 e1a647c4cdb92365506d533ac36c7f57 files/libtool.patch 798
-MD5 caeb1eaaf77305901f5c3bc19f3637d5 files/Sawfish.desktop 449
-MD5 1ae747636b3422e00ef41cc07fc37ab4 files/capplet-crash.patch 556
-MD5 a7d051180bc14a630027439f0d385dcd files/digest-sawfish-1.0.1-r6 66
-MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120 74
-MD5 8f4a1113e4c5925196748ccb9a9702fb files/digest-sawfish-1.3.20040120-r1 74
-MD5 cd8e05ea2ee9e1ff63339dd0b0f021f6 files/sawfish-1.0.1-exec.patch 451
-MD5 1e1b4b3609f8e62666856d07e393068f files/sawfish-1.3-shading.patch 1198
-MD5 280d364bfd0878351ebbbcbc62ac19c4 files/sawfish-1.3-state-below.patch 403
-MD5 228430d4af4d182eca480e98af059875 files/digest-sawfish-1.3.20050816 74
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD4DBQFDLy0cwnQyISwouHwRAh9UAKDE584QOCxn4YFuR5V6FEXjDNvKaQCY1hsQ
-0QBWmdF9GJlyWkhp7G/hIA==
-=xhVl
------END PGP SIGNATURE-----
diff --git a/x11-wm/sawfish/files/sawfish-1.3-state-below.patch b/x11-wm/sawfish/files/sawfish-1.3-state-below.patch
index 77bfabcaf523..78e8e29f1df4 100644
--- a/x11-wm/sawfish/files/sawfish-1.3-state-below.patch
+++ b/x11-wm/sawfish/files/sawfish-1.3-state-below.patch
@@ -1,11 +1,11 @@
---- sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl	2003-11-16 16:13:33.000000000 +0100
+--- /var/tmp/portage/sawfish-1.3-r2/work/sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl	2003-11-16 16:13:33.000000000 +0100
 +++ sawfish-1.3/lisp/sawfish/wm/state/wm-spec.jl	2003-03-16 21:56:48.000000000 +0100
 @@ -125,7 +125,7 @@
       _NET_WM_WINDOW_TYPE_UTILITY
       _NET_WM_WINDOW_TYPE_SPLASH])
    
--  (defvar wm-spec-below-depth +2)
-+  (defvar wm-spec-below-depth -2)
+-  (defvar wm-spec-below-depth -2)
++  (defvar wm-spec-below-depth +2)
    (defvar wm-spec-above-depth +2)
  
    (define supported-states '())
diff --git a/x11-wm/sawfish/metadata.xml b/x11-wm/sawfish/metadata.xml
index c58d490d90e2..da6fd63d0085 100644
--- a/x11-wm/sawfish/metadata.xml
+++ b/x11-wm/sawfish/metadata.xml
@@ -2,8 +2,4 @@
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
 <herd>gnome</herd>
-<maintainer>
-  <email>truedfx@gentoo.org</email>
-  <name>Harald van Dĳk</name>
-</maintainer>
 </pkgmetadata>
diff --git a/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild b/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild
index 40dba39e0db3..18a872be2f8d 100644
--- a/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild
+++ b/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild,v 1.16 2005/06/23 13:14:46 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.0.1-r6.ebuild,v 1.1 2002/10/15 16:32:05 foser Exp $
 
 IUSE="gtk nls esd gnome"
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
 HOMEPAGE="http://sawmill.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc -ppc alpha"
+KEYWORDS="x86 sparc sparc64"
 
 DEPEND="=x11-libs/rep-gtk-0.15*
 	>=dev-libs/librep-0.14
@@ -39,23 +40,23 @@ src_unpack() {
 
 src_compile() {
 
-	local myconf
-
-	use esd \
-		&& myconf="--with-esd" \
+  	local myconf
+	
+	use esd	\
+		&& myconf="--with-esd"	\
 		|| myconf="--without-esd"
-
-	use gnome \
-		&& myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet" \
+	
+	use gnome	\
+		&& myconf="${myconf} --with-gnome-prefix=/usr --enable-gnome-widgets --enable-capplet"	\
 		|| myconf="${myconf} --disable-gnome-widgets --disable-capplet"
-
+	
 	use nls || myconf="${myconf} --disable-linguas"
 
-	use gtk || use gnome \
-		&& myconf="${myconf} --with-gdk-pixbuf" \
+	use gtk || use gnome 	\
+		&& myconf="${myconf} --with-gdk-pixbuf"	\
 		|| myconf="${myconf} --without-gdk-pixbuf"
 
-	./configure \
+	./configure	\
 		--host=${CHOST} \
 		--prefix=/usr \
 		--infodir=/usr/share/info \
@@ -73,12 +74,12 @@ src_install() {
 		install || die
 
 	use nls || rmdir ${D}/usr/share/locale
-
+		
 	dodoc AUTHORS BUGS COPYING ChangeLog
 	dodoc DOC FAQ NEWS README THANKS TODO
 
 	# Add to Gnome CC's Window Manager list
-	if use gnome
+	if [ "`use gnome`" ]
 	then
 		insinto /usr/share/gnome/wm-properties
 		doins ${FILESDIR}/Sawfish.desktop
diff --git a/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild b/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild
index c7d4d476e5d7..a86e15e75534 100644
--- a/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild
+++ b/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild,v 1.5 2005/09/02 19:16:53 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20040120-r1.ebuild,v 1.1 2005/06/23 02:06:44 agriffis Exp $
 
 inherit eutils gnuconfig
 
-IUSE="gnome esd nls audiofile"
+IUSE="gnome readline esd nls audiofile"
 
 # detect cvs snapshots; fex. 1.3.20040120
 if [[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]; then
@@ -17,7 +17,7 @@ DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="http://sawmill.sourceforge.net/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ia64 ppc sparc x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 if $sawfishsnapshot; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	S=${WORKDIR}/${PN}
@@ -30,8 +30,9 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=x11-libs/rep-gtk-0.17
 	>=dev-libs/librep-0.16
 	>=x11-libs/gtk+-2.0.8
-	audiofile? ( >=media-libs/audiofile-0.2.3 )
-	esd? ( >=media-sound/esound-0.2.23 )
+	audiofile? ( media-libs/audiofile )
+	esd? ( >=media-sound/esound-0.2.22 )
+	readline? ( >=sys-libs/readline-4.1 )
 	nls? ( sys-devel/gettext )"
 
 # cvs snapshots require automake/autoconf
@@ -73,6 +74,7 @@ src_compile() {
 		$(useq nls || echo --disable-linguas) \
 		$(use_with audiofile) \
 		$(use_with esd) \
+		$(use_with readline) \
 		${myconf} || die
 
 	# The following two lines allow sawfish to compile with gcc 2.95
diff --git a/x11-wm/sawfish/sawfish-1.3.20040120.ebuild b/x11-wm/sawfish/sawfish-1.3.20040120.ebuild
index caed00b613ab..f9bb34a9dab2 100644
--- a/x11-wm/sawfish/sawfish-1.3.20040120.ebuild
+++ b/x11-wm/sawfish/sawfish-1.3.20040120.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20040120.ebuild,v 1.9 2004/08/30 19:19:31 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20040120.ebuild,v 1.1 2004/01/20 21:42:45 agriffis Exp $
 
 inherit eutils gnuconfig
 
@@ -17,7 +17,7 @@ DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="http://sawmill.sourceforge.net/"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 alpha ia64 amd64 sparc ppc"
+KEYWORDS="~x86 ~alpha ~ia64"
 if $sawfishsnapshot; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
 	S=${WORKDIR}/${PN}
diff --git a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild b/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
index 75ddd4c85cda..ff99ee364c3a 100644
--- a/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
+++ b/x11-wm/sawfish/sawfish-1.3.20050816.ebuild
@@ -1,26 +1,31 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20050816.ebuild,v 1.5 2005/09/19 21:27:30 truedfx Exp $
-
-# detect cvs snapshots; fex. 1.3.20040120
-[[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]
-(( snapshot = !$? ))
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/sawfish/sawfish-1.3.20050816.ebuild,v 1.1 2005/08/16 22:57:43 truedfx Exp $
 
 inherit eutils gnuconfig
 
+IUSE="gnome esd nls audiofile"
+
+# detect cvs snapshots; fex. 1.3.20040120
+if [[ $PV == *.[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9] ]]; then
+	sawfishsnapshot=true
+else
+	sawfishsnapshot=false
+fi
+
 DESCRIPTION="Extensible window manager using a Lisp-based scripting language"
 HOMEPAGE="http://sawmill.sourceforge.net/"
-if (( snapshot )); then
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
+if $sawfishsnapshot; then
 	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	S=${WORKDIR}/${PN}
 else
 	SRC_URI="mirror://sourceforge/sawmill/${P}.tar.gz"
+	S=${WORKDIR}/${P}
 fi
 
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="gnome esd nls audiofile"
-
 DEPEND=">=dev-util/pkgconfig-0.12.0
 	>=x11-libs/rep-gtk-0.17
 	>=dev-libs/librep-0.16
@@ -28,19 +33,16 @@ DEPEND=">=dev-util/pkgconfig-0.12.0
 	audiofile? ( >=media-libs/audiofile-0.2.3 )
 	esd? ( >=media-sound/esound-0.2.23 )
 	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}"
 
-if (( snapshot )); then
-	DEPEND="${DEPEND}
-		sys-devel/automake
-		sys-devel/autoconf"
-	S="${WORKDIR}/${PN}"
+# cvs snapshots require automake/autoconf
+if $sawfishsnapshot; then
+	DEPEND="${DEPEND} sys-devel/automake sys-devel/autoconf"
 fi
 
 src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}/libtool.patch"
+	unpack ${A} || die "unpack failed"
+	cd ${S} || die "cd failed"
+
 	# This is for alpha, but there's no reason to restrict it
 	gnuconfig_update
 }
@@ -52,7 +54,7 @@ src_compile() {
 	export CPLUS_INCLUDE_PATH="${CPLUS_INCLUDE_PATH}:/usr/include/freetype2"
 
 	# If this is a snapshot then we need to create the autoconf stuff
-	if (( snapshot )); then
+	if $sawfishsnapshot; then
 		aclocal || die "aclocal failed"
 		autoconf || die "autoconf failed"
 	fi
@@ -84,7 +86,7 @@ src_compile() {
 		strip-linguas -i po
 		set -- "$@" --enable-linguas=" ${LINGUAS} "
 	else
-		set -- "$@" --enable-linguas=""
+		set -- "$@" --enable-linguas
 	fi
 
 	econf "$@" || die "configure failed"
@@ -98,6 +100,12 @@ src_compile() {
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
+	make DESTDIR=${D} install || die "make install failed"
 	dodoc AUTHORS BUGS ChangeLog DOC FAQ NEWS README THANKS TODO OPTIONS
+
+	# Add to Gnome CC's Window Manager list
+	if use gnome; then
+		insinto /usr/share/gnome/wm-properties
+		doins ${S}/Sawfish.desktop
+	fi
 }
diff --git a/x11-wm/selectwm/ChangeLog b/x11-wm/selectwm/ChangeLog
index c85e2ec930f3..3f42b2cb0870 100644
--- a/x11-wm/selectwm/ChangeLog
+++ b/x11-wm/selectwm/ChangeLog
@@ -1,46 +1,6 @@
-# ChangeLog for x11-wm/selectwm
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/ChangeLog,v 1.17 2005/05/08 15:00:43 herbs Exp $
-
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> selectwm-0.4.1.ebuild:
-  Stable on amd64.
-
-  12 Feb 2005; Jan Brinkmann <luckyduck@gentoo.org> selectwm-0.4.1.ebuild:
-  added ~amd64 to KEYWORDS. fixes #81447
-
-  07 Nov 2004; Jason Wever <weeve@gentoo.org> selectwm-0.4.1.ebuild:
-  Stable on sparc.
-
-  06 Nov 2004; <pyrania@gentoo.org> selectwm-0.4.1.ebuild:
-  Marked stable on x86.
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  selectwm-0.4.1.ebuild:
-  Masked selectwm-0.4.1.ebuild stable for ppc
-
-*selectwm-0.4.1 (17 Jul 2004)
-
-  17 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> +selectwm-0.4.1.ebuild:
-  Version bumped, closing bug #56837
-
-  30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> selectwm-0.3-r1.ebuild,
-  selectwm-0.4.ebuild:
-  don't assign default to S
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
-*selectwm-0.3-r1 (01 Sep 2002)
-*selectwm-0.4 (01 Sep 2002)
-
-  17 Oct 2002; Daniel Ahlberg <aliz@gentoo.org> selectvm-0.3-r1.ebuild, selectwm-0.4.ebuild :
-  Added IUSE.
-
-  01 Sep 2002; Seemant Kulleen <seemant@gentoo.org> selectwm-0.3-r1.ebuild 
-  selectwm-0.4.ebuild :
-
-  USE dependednt NLS checking and ebuild cleanup.  Also, added new version
-  for GTK2 and SLOTified.  Thanks to: christian-neumair@web.de (Christian -
-  Manny Calavera - Neumair) in bug #5638.
+# ChangeLog for <CATEGORY>/<PACKAGE_NAME>
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/ChangeLog,v 1.1 2002/07/08 12:54:33 aliz Exp $
 
 *selectwm-0.3 (08 Jul 2002)
 
diff --git a/x11-wm/selectwm/Manifest b/x11-wm/selectwm/Manifest
index eb6c7ee25fc3..e69de29bb2d1 100644
--- a/x11-wm/selectwm/Manifest
+++ b/x11-wm/selectwm/Manifest
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 ae72ec6118916ff0ace210f6c7e80598 selectwm-0.4.1.ebuild 669
-MD5 14c75dbe4d203b600fbc1b324a7e7cea selectwm-0.4.ebuild 689
-MD5 85dfd891f1217371e8301849fbd04a12 ChangeLog 1648
-MD5 22a92aa03f7869cec53a6b9362a4ea57 selectwm-0.3-r1.ebuild 661
-MD5 6315bbb263ca7f8c9ae1edd8abbb8c22 files/digest-selectwm-0.3-r1 64
-MD5 23df09d920f180bf1663aa02426bd19c files/digest-selectwm-0.4.1 67
-MD5 b193344baf56453336881050b77a025e files/digest-selectwm-0.4 65
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfinP2G5bA0cA/ScRAp2zAKCdB5PRlxWdiviR0pW6lBa4LzZTOgCgqwRe
-SYh3xnwuVVn90MJdOPVXle4=
-=AfDo
------END PGP SIGNATURE-----
diff --git a/x11-wm/selectwm/selectwm-0.3-r1.ebuild b/x11-wm/selectwm/selectwm-0.3-r1.ebuild
index e3a8e111f699..0964c44513a6 100644
--- a/x11-wm/selectwm/selectwm-0.3-r1.ebuild
+++ b/x11-wm/selectwm/selectwm-0.3-r1.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/selectwm-0.3-r1.ebuild,v 1.9 2005/02/12 11:43:20 luckyduck Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/selectwm-0.3-r1.ebuild,v 1.1 2002/09/01 15:25:18 seemant Exp $
 
+S="${WORKDIR}/${P}"
 DESCRIPTION="window manager selector tool"
 HOMEPAGE="http://ordiluc.net/selectwm"
 SRC_URI="http://ordiluc.net/selectwm/${P}.tar.bz2"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE="nls"
+LICENSE="GPL-2"
+KEYWORDS="x86 sparc sparc64"
 
 DEPEND="=x11-libs/gtk+-1.2*
 	>=dev-libs/glib-1.2.0"
diff --git a/x11-wm/selectwm/selectwm-0.4.1.ebuild b/x11-wm/selectwm/selectwm-0.4.1.ebuild
index d0ba224a96b8..266b73423608 100644
--- a/x11-wm/selectwm/selectwm-0.4.1.ebuild
+++ b/x11-wm/selectwm/selectwm-0.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/selectwm-0.4.1.ebuild,v 1.6 2005/05/08 15:00:43 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/selectwm-0.4.1.ebuild,v 1.1 2004/07/17 11:24:24 usata Exp $
 
 DESCRIPTION="window manager selector tool"
 HOMEPAGE="http://ordiluc.net/selectwm"
@@ -8,7 +8,7 @@ SRC_URI="http://ordiluc.net/selectwm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="x86 sparc ppc amd64"
+KEYWORDS="~x86 ~sparc ~ppc"
 IUSE="nls"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
diff --git a/x11-wm/selectwm/selectwm-0.4.ebuild b/x11-wm/selectwm/selectwm-0.4.ebuild
index 7b3930977895..3f2be1ae9ffc 100644
--- a/x11-wm/selectwm/selectwm-0.4.ebuild
+++ b/x11-wm/selectwm/selectwm-0.4.ebuild
@@ -1,15 +1,15 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/selectwm-0.4.ebuild,v 1.10 2005/02/12 11:43:21 luckyduck Exp $
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/selectwm/selectwm-0.4.ebuild,v 1.1 2002/09/01 15:25:18 seemant Exp $
 
+S="${WORKDIR}/${P}"
 DESCRIPTION="window manager selector tool"
 HOMEPAGE="http://ordiluc.net/selectwm"
 SRC_URI="http://ordiluc.net/selectwm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="x86 sparc ppc"
-IUSE="nls"
+KEYWORDS="x86 sparc sparc64"
 
 DEPEND=">=x11-libs/gtk+-2.0.0
 	>=dev-libs/glib-2.0.0"
diff --git a/x11-wm/treewm/ChangeLog b/x11-wm/treewm/ChangeLog
index a1355de93d0c..7a7197434475 100644
--- a/x11-wm/treewm/ChangeLog
+++ b/x11-wm/treewm/ChangeLog
@@ -1,47 +1,9 @@
 # ChangeLog for x11-wm/treewm
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/treewm/ChangeLog,v 1.14 2004/07/01 21:52:18 eradicator Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/treewm/ChangeLog,v 1.1 2002/08/13 09:26:23 styx Exp $
 
-  01 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> treewm-0.4.4.ebuild,
-  treewm-0.4.5.ebuild:
-  virtual/glibc -> virtual/libc
-
-  26 Feb 2004; Sven Blumenstein <bazik@gentoo.org> treewm-0.4.5.ebuild:
-  Stable on sparc.
-
-*treewm-0.4.5 (16 Sep 2003)
-
-  16 Sep 2003; <chuck@gentoo.org> treewm-0.4.5.ebuild:
-  Version bump, thanks to Rudolf Polzer <gentoo-oe@durchnull.de>.
-  Closes bug #28812.
-  18 Feb 2004; Thomas Raschbacher <lordvan@gentoo.org> treewm-0.4.5.ebuild:
-  0.4.5: Marked stable on x86
-  0.4.4: added sys-apps/chpax dep; Thanks to James Lund <vax@ufreeze.com>
-  Bug #39542 
-
-*treewm-0.4.4 (14 Sep 2003)
-  14 Sep 2003; Thomas Raschbacher <lordvan@gentoo.org> treewm-0.4.4.ebuild:
-  version bump(finally- after mailing the author :)
-	
-*treewm-0.4.3 (10 Sep 2003)
-  12 Sep 2003; Thomas Raschbacher <lordvan@gentoo.org> treewm-0.4.3 - digest:
-  wrong digest
-  10 Sep 2003; Brandon Hale <tseng@gentoo.org> treewm-0.4.3.ebuild:
-  Version bump, thanks to Rudolf Polzer.
-
-*treewm-0.4.2 (09 Sep 2003)
-  09 Sep 2003; Thomas Raschbacher <lordvan@gentoo.org>: added metadata.xml
-
-  06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
- 
 *treewm-0.4.2 (12 Aug 2002)
 
-  04 Sep 2002; Matthew Kennedy <mkennedy@gentoo.org>
-  treewm-0.4.2.ebuild, files/treewm-0.4.2-gcc3-gentoo.patch, ChangeLog :
-
-  Resolves bug #7443. Big patch for GCC3.2 support. Definitely an
-  upstreamer.
-
   12 Aug 2002; Joachim Blaabjerg <styx@gentoo.org> treewm-0.4.2.ebuild:
 
   Initial import. Ebuild submitted by Thomas Raschbacher (LordVan,
diff --git a/x11-wm/treewm/Manifest b/x11-wm/treewm/Manifest
index cf7fff692291..e69de29bb2d1 100644
--- a/x11-wm/treewm/Manifest
+++ b/x11-wm/treewm/Manifest
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a6f41018c750f65a61ebefd06c02a521 ChangeLog 1773
-MD5 18cde1faa2834be4486edcdfe64a447a files/digest-treewm-0.4.4 64
-MD5 0ff668f3a047f8841efdfc9cbfc96639 files/digest-treewm-0.4.5 64
-MD5 d8597b1d818d8453c86336611b0bff71 metadata.xml 355
-MD5 588e45f0fbf9aedbb19d629a60183a35 treewm-0.4.4.ebuild 681
-MD5 9e5aaaa10190f4fbfdc661de7c615f05 treewm-0.4.5.ebuild 776
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC1TFGI1lqEGTUzyQRAkoIAJ9E2gUPXxa1fL33U8MhG92KgF/uAQCfScBS
-pkeK19KIaDzociXecrk+KsY=
-=D2aq
------END PGP SIGNATURE-----
diff --git a/x11-wm/treewm/metadata.xml b/x11-wm/treewm/metadata.xml
index ec1cb1d2010a..307ee6b9292f 100644
--- a/x11-wm/treewm/metadata.xml
+++ b/x11-wm/treewm/metadata.xml
@@ -5,6 +5,7 @@
 <maintainer>
   <email>lordvan@gentoo.org</email>
   <name>Thomas Raschbacher</name> 
+<!--  <description>Description of the maintainership</description> -->
 </maintainer>
  <longdescription>WindowManager that arranges the windows in a tree not a list</longdescription>
 </pkgmetadata>
diff --git a/x11-wm/treewm/treewm-0.4.4.ebuild b/x11-wm/treewm/treewm-0.4.4.ebuild
index fe0f789564a7..8eefa8466b36 100644
--- a/x11-wm/treewm/treewm-0.4.4.ebuild
+++ b/x11-wm/treewm/treewm-0.4.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/treewm/treewm-0.4.4.ebuild,v 1.7 2005/07/13 15:20:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/treewm/treewm-0.4.4.ebuild,v 1.1 2003/09/14 15:39:03 lordvan Exp $
 
 DESCRIPTION="WindowManager that arranges the windows in a tree not a list"
 SRC_URI="mirror://sourceforge/treewm/${P}.tar.bz2"
@@ -8,12 +8,12 @@ HOMEPAGE="http://treewm.sourceforge.net/"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
-IUSE=""
+KEYWORDS="x86 sparc ~ppc"
+
+DEPEND="virtual/glibc
+	virtual/x11"
+
 
-DEPEND="virtual/libc
-	virtual/x11
-	sys-apps/chpax"
 
 src_compile() {
 	make PREFIX=/usr || die
diff --git a/x11-wm/treewm/treewm-0.4.5.ebuild b/x11-wm/treewm/treewm-0.4.5.ebuild
index 7a856affd112..606e612ef246 100644
--- a/x11-wm/treewm/treewm-0.4.5.ebuild
+++ b/x11-wm/treewm/treewm-0.4.5.ebuild
@@ -1,21 +1,27 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/treewm/treewm-0.4.5.ebuild,v 1.8 2005/07/13 15:20:13 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/treewm/treewm-0.4.5.ebuild,v 1.1 2003/09/17 02:24:04 zul Exp $
 
 DESCRIPTION="WindowManager that arranges the windows in a tree (not in a list)"
 SRC_URI="mirror://sourceforge/treewm/${PN}-${PV}.tar.bz2"
 HOMEPAGE="http://treewm.sourceforge.net/"
+S="${WORKDIR}/${PN}-${PV}"
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 sparc ppc"
+KEYWORDS="~x86 ~sparc ~ppc"
 IUSE=""
 
-DEPEND="virtual/libc
+DEPEND="virtual/glibc 
 		virtual/x11"
 
-RDEPEND="virtual/libc
+RDEPEND="virtual/glibc 
 		 virtual/x11"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+}
+
 src_compile() {
 	emake PREFIX="/usr" ROOT="${D}" || die
 }
diff --git a/x11-wm/trswm/ChangeLog b/x11-wm/trswm/ChangeLog
index b519e34b39e3..c6db48f7460f 100644
--- a/x11-wm/trswm/ChangeLog
+++ b/x11-wm/trswm/ChangeLog
@@ -1,34 +1,6 @@
 # ChangeLog for x11-wm/trswm
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/trswm/ChangeLog,v 1.8 2005/09/17 10:25:33 agriffis Exp $
-
-  17 Sep 2005; Aron Griffis <agriffis@gentoo.org> trswm-0.4.9.ebuild:
-  Mark 0.4.9 stable on alpha
-
-  05 Apr 2004; Chris Aniszczyk <zx@gentoo.org> trswm-0.4.9.ebuild:
-  Marking stable on hppa
-
-  07 Mar 2004; David Holm <dholm@gentoo.org> trswm-0.5.2.ebuild:
-  Added to ~ppc.
-
-*trswm-0.5.2 (06 Mar 2004)
-
-  06 Mar 2004; Markus Nigbur <pyrania@gentoo.org> trswm-0.3.ebuild,
-  trswm-0.5.2.ebuild:
-  Version bump.
-
-  31 Dec 2003; Mike Gardiner <obz@gentoo.org> trswm-0.3.ebuild:
-  Removed ~alpha ~arm ~hppa ~mips from trswm-0.3, as lua4 isnt available on 
-  those archs
-
-*trswm-0.4.9 (05 Nov 2003)
-
-  05 Nov 2003; Mike Gardiner <obz@gentoo.org> trswm-0.4.9.ebuild, files/trswm:
-  New version, 0.4.9, with re-written ebuild. Includes a wrapper script to
-  handle per user configuration, in place of the trswm binary which is now
-  trswm.bin. trswm --help should give more information on it's usage, and it is
-  a complete launcher, so adding exec trswm to ~/.xinitrc is all that's 
-  required to launch trswm.
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/trswm/ChangeLog,v 1.1 2003/06/17 20:02:33 twp Exp $
 
 *trswm-0.3 (17 Jun 2003)
 
diff --git a/x11-wm/trswm/Manifest b/x11-wm/trswm/Manifest
index f9171c802da7..66ead9fc65db 100644
--- a/x11-wm/trswm/Manifest
+++ b/x11-wm/trswm/Manifest
@@ -1,7 +1,3 @@
-MD5 00f618afc4367aadb0a550067f93fa61 trswm-0.4.9.ebuild 1339
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 15e08d020204088cec4e89c33174985b ChangeLog 1311
-MD5 ad2d60438e0b2efa7228467368766640 trswm-0.5.2.ebuild 1346
-MD5 9d8bd952a5bf147197c4828a8ec5c7c3 files/digest-trswm-0.5.2 63
-MD5 72d307e32c81a38a097d38268f82bc63 files/trswm 2817
-MD5 3b077cf8b663647f78eaafdbf42b8aec files/digest-trswm-0.4.9 63
+MD5 30f0e15b913f7719fe8e61538444f4e9 trswm-0.3.ebuild 669
+MD5 e1813c16dd9ef15bc77037e2810f9aa5 ChangeLog 227
+MD5 5e8a957f2d35d3e74e2f5fa7ce9c3c34 files/digest-trswm-0.3 122
diff --git a/x11-wm/trswm/files/digest-trswm-0.4.9 b/x11-wm/trswm/files/digest-trswm-0.4.9
index 1a5b8755559b..78c7926e9804 100644
--- a/x11-wm/trswm/files/digest-trswm-0.4.9
+++ b/x11-wm/trswm/files/digest-trswm-0.4.9
@@ -1 +1,2 @@
 MD5 5da8e4233b659e29fccd8bc298d558d7 trswm-0.4.9.tar.gz 286229
+MD5 db53378f91d78fbccca2d05278348161 trswm-config.tar.gz 4582
diff --git a/x11-wm/trswm/trswm-0.4.9.ebuild b/x11-wm/trswm/trswm-0.4.9.ebuild
index af76fdfcb871..4109b10a7f2c 100644
--- a/x11-wm/trswm/trswm-0.4.9.ebuild
+++ b/x11-wm/trswm/trswm-0.4.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/trswm/trswm-0.4.9.ebuild,v 1.5 2005/09/17 10:25:33 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/trswm/trswm-0.4.9.ebuild,v 1.1 2003/11/05 12:03:03 obz Exp $
 
 DESCRIPTION="An ion-based window manager that aims to provide a desktop environment based on the keyboard, making the mouse optional"
 HOMEPAGE="http://www.relex.ru/~yarick/trswm/"
@@ -9,7 +9,7 @@ LICENSE="as-is"
 
 IUSE="debug"
 SLOT="0"
-KEYWORDS="alpha hppa ~mips ~sparc ~x86"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~sparc ~x86"
 
 DEPEND="virtual/x11
 	>=dev-lang/lua-5"
diff --git a/x11-wm/trswm/trswm-0.5.2.ebuild b/x11-wm/trswm/trswm-0.5.2.ebuild
index a6f48899b74c..aa9c00735bdd 100644
--- a/x11-wm/trswm/trswm-0.5.2.ebuild
+++ b/x11-wm/trswm/trswm-0.5.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/trswm/trswm-0.5.2.ebuild,v 1.3 2004/06/24 23:45:28 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/trswm/trswm-0.5.2.ebuild,v 1.1 2004/03/06 14:22:10 pyrania Exp $
 
 DESCRIPTION="An ion-based window manager that aims to provide a desktop environment based on the keyboard, making the mouse optional"
 HOMEPAGE="http://www.relex.ru/~yarick/trswm/"
@@ -9,7 +9,7 @@ LICENSE="as-is"
 
 IUSE="debug"
 SLOT="0"
-KEYWORDS="~alpha ~hppa ~mips ~sparc ~x86 ~ppc"
+KEYWORDS="~alpha ~hppa ~mips ~sparc ~x86"
 
 DEPEND="virtual/x11
 	>=dev-lang/lua-5"
diff --git a/x11-wm/twm/ChangeLog b/x11-wm/twm/ChangeLog
index 722bc53f15ca..cdd30ec92161 100644
--- a/x11-wm/twm/ChangeLog
+++ b/x11-wm/twm/ChangeLog
@@ -1,21 +1,6 @@
-# ChangeLog for x11-wm/twm
+# ChangeLog for x11-apps/twm
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/twm/ChangeLog,v 1.6 2005/11/11 16:20:17 spyderous Exp $
-
-  11 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>; -twm-0.99.0.ebuild:
-  Remove old version.
-
-  07 Nov 2005; Doug Goldstein <cardoe@gentoo.org> twm-0.99.0.ebuild,
-  twm-0.99.1.ebuild:
-  adding ~ppc keyword
-
-  30 Oct 2005; <dang@gentoo.org> twm-0.99.1.ebuild:
-  Marked ~amd64
-
-*twm-0.99.1 (20 Oct 2005)
-
-  20 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +twm-0.99.1.ebuild:
-  Bump for 7.0 RC1.
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/twm/ChangeLog,v 1.1 2005/10/19 22:51:00 spyderous Exp $
 
   19 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>; +metadata.xml,
   +twm-0.99.0.ebuild:
diff --git a/x11-wm/twm/Manifest b/x11-wm/twm/Manifest
index 7f226d642c1a..498bb00bf303 100644
--- a/x11-wm/twm/Manifest
+++ b/x11-wm/twm/Manifest
@@ -1,4 +1,4 @@
-MD5 482420ddf86ba2665f1e0a79733946a1 ChangeLog 1050
-MD5 2f12e0ba0736b09cb87017002ac29156 files/digest-twm-0.99.1 63
+MD5 fb3c28760e63e78520deebf63c71ecfc ChangeLog 625
+MD5 3156d15ead919b9a87c84bfb1e614cf3 files/digest-twm-0.99.0 63
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 f27439ce39febf92e882ba157de7f6c6 twm-0.99.1.ebuild 461
+MD5 6eabbd7fa7bdd943892aaf2f12d4b8b5 twm-0.99.0.ebuild 451
diff --git a/x11-wm/twm/twm-0.99.1.ebuild b/x11-wm/twm/twm-0.99.1.ebuild
index 89764e58917e..18b12bc27988 100644
--- a/x11-wm/twm/twm-0.99.1.ebuild
+++ b/x11-wm/twm/twm-0.99.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/twm/twm-0.99.1.ebuild,v 1.3 2005/11/07 05:20:33 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/twm/twm-0.99.1.ebuild,v 1.1 2005/10/20 06:38:46 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 #SNAPSHOT="yes"
@@ -8,7 +8,7 @@
 inherit x-modular
 
 DESCRIPTION="X.Org twm application"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~s390 ~sparc ~x86"
+KEYWORDS="~arm ~mips ~s390 ~sparc ~x86"
 RDEPEND="x11-libs/libX11
 	x11-libs/libXt
 	x11-libs/libXmu"
diff --git a/x11-wm/vtwm/ChangeLog b/x11-wm/vtwm/ChangeLog
index 7f50b8ef4e23..4e39ade3a574 100644
--- a/x11-wm/vtwm/ChangeLog
+++ b/x11-wm/vtwm/ChangeLog
@@ -1,25 +1,9 @@
 # ChangeLog for x11-wm/vtwm
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/ChangeLog,v 1.7 2004/08/30 19:19:31 pvdabeel Exp $
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> vtwm-5.4.6a.ebuild:
-  Masked vtwm-5.4.6a.ebuild stable for ppc
-
-  18 Jun 2004; Jason Wever <weeve@gentoo.org> vtwm-5.4.6a.ebuild:
-  Stable on sparc.
-
-  05 May 2004; Mamoru KOMACHI <usata@gentoo.org> vtwm-5.4.6a.ebuild:
-  Stable on alpha. Don't assign default to S
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/ChangeLog,v 1.1 2003/08/24 19:04:39 usata Exp $
 
 *vtwm-5.4.6a (25 Aug 2003)
 
-  08 Nov 2003; Mamoru KOMACHI <usata@gentoo.org> metadata.xml,
-  vtwm-5.4.6a.ebuild:
-  Marked as stable for x86. Added desktop-wm herd.
-
-  26 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> vtwm-5.4.6a.ebuild:
-  Xsession entry for vtwm should refer to /usr/bin/vtwm
-
   25 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> vtwm-5.4.6a.ebuild:
   Initial import.  Ebuild submitted by Andrew Casey <drewbian@tsn.cc>
   This closes Bug #24025
diff --git a/x11-wm/vtwm/Manifest b/x11-wm/vtwm/Manifest
index ac8f81de8b54..71eaca196e44 100644
--- a/x11-wm/vtwm/Manifest
+++ b/x11-wm/vtwm/Manifest
@@ -1,4 +1,2 @@
-MD5 e506be409927be6922ed86b1e18d2a39 ChangeLog 977
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 e0c3507016c8bec89f7b7cdeda14f0d8 vtwm-5.4.6a.ebuild 904
+MD5 c3a2c79b90a37faa8a72913696a0d752 vtwm-5.4.6a.ebuild 1085
 MD5 22085f6992c405f7b73a4f422ac4a76a files/digest-vtwm-5.4.6a 63
diff --git a/x11-wm/vtwm/vtwm-5.4.6a.ebuild b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
index 246b6a2736e9..238873b5bf0b 100644
--- a/x11-wm/vtwm/vtwm-5.4.6a.ebuild
+++ b/x11-wm/vtwm/vtwm-5.4.6a.ebuild
@@ -1,24 +1,26 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/vtwm-5.4.6a.ebuild,v 1.9 2004/08/30 19:19:31 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/vtwm/vtwm-5.4.6a.ebuild,v 1.1 2003/08/24 19:04:40 usata Exp $
 
 IUSE=""
 
-DESCRIPTION="VTWM, one of many TWM descendants and implements a Virtual Desktop"
+DESCRIPTION="VTWM, one of many TWM descendants and implements a Virtual Desktop. VTWM is lightweight and fast, feature-rich and versatile, mature, and yes, it can look nice, too"
 HOMEPAGE="http://www.visi.com/~hawkeyd/vtwm.html"
 SRC_URI="ftp://ftp.visi.com/users/hawkeyd/X/${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="x86 alpha ppc sparc"
+KEYWORDS="~x86"
 DEPEND="virtual/x11"
+	
+S="${WORKDIR}/${P}"
 
 src_compile() {
 	xmkmf || die
-	make || die
+	make || die 
 }
 
 src_install() {
-	cp ${FILESDIR}/vtwmrc system.vtwmrc
+	cp ${FILESDIR}/vtwmrc system.vtwmrc	
 	make BINDIR=/usr/bin \
 		LIBDIR=/etc/X11 \
 		MANPATH=/usr/share/man \
@@ -26,9 +28,14 @@ src_install() {
 
 	echo "#!/bin/sh" > vtwm
 	echo "xsetroot -cursor_name left_ptr &" >> vtwm
-	echo "/usr/bin/vtwm" >> vtwm
+	echo "/usr/X11R6/bin/vtwm" >> vtwm
 	exeinto /etc/X11/Sessions
 	doexe vtwm
-	cd doc
-	dodoc 4.6.* CHANGELOG BUGS DEVELOPERS HISTORY SOUND WISHLIST
+	dodoc doc/4.6.*
+	dodoc doc/CHANGELOG
+	dodoc doc/BUGS
+	dodoc doc/DEVELOPERS
+	dodoc doc/HISTORY
+	dodoc doc/SOUND
+	dodoc doc/WISHLIST
 }
diff --git a/x11-wm/waimea/ChangeLog b/x11-wm/waimea/ChangeLog
index a6e6481bc468..a409be17073e 100644
--- a/x11-wm/waimea/ChangeLog
+++ b/x11-wm/waimea/ChangeLog
@@ -1,105 +1,7 @@
 # ChangeLog for x11-wm/waimea
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/ChangeLog,v 1.27 2005/05/08 14:49:51 herbs Exp $
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/ChangeLog,v 1.1 2002/05/09 11:53:19 spider Exp $
 
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> waimea-0.4.0-r1.ebuild:
-  Stable on amd64.
-
-  06 Apr 2005; Mamoru KOMACHI <usata@gentoo.org>
-  +files/waimea-0.5.0-includes.patch, waimea-0.5.0_pre040506.ebuild:
-  Fixed when compiled with cairo-3. Thanks to Francisco José Cañizares
-  Santofimia <telefrancisco@lycos.es>; bug #80977.
-
-  06 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> waimea-0.4.0-r1.ebuild:
-  Checks if imlib2 is built with X USE flag enabled. This closes bug #86496.
-
-  08 Jun 2004; David Holm <dholm@gentoo.org> +files/waimea-0.5.0-font.patch,
-  waimea-0.5.0_pre040506.ebuild:
-  Added patch from ikezoe <ikezoe at users dot sourceforge dot jp> that fixes a
-  crash related to localisation (bug #52860).
-
-  07 Jun 2004; Jason Wever <weeve@gentoo.org> waimea-0.4.0-r1.ebuild:
-  Stable on sparc.
-
-  06 Jun 2004; Mamoru KOMACHI <usata@gentoo.org>
-  waimea-0.5.0_pre040506.ebuild:
-  Added svg IUSE flag and removed version hardcoding.
-
-  05 Jun 2004; David Holm <dholm@gentoo.org> waimea-0.5.0_pre040506.ebuild:
-  Updated cairo dependency to require version 0.1.22 or newer, pointed out by
-  pjp@gentoo.org.
-
-  04 Jun 2004; Jason Wever <weeve@gentoo.org> waimea-0.5.0_pre040506.ebuild:
-  Added ~sparc keyword to resolve bug #52861.
-
-  04 Jun 2004; Danny van Dyk <kugelfang@gentoo.org>
-  +files/waimea-0.5.0-64bit-clean.patch, waimea-0.5.0_pre040506.ebuild:
-  Added 64bit cleaning patch.
-
-*waimea-0.5.0_pre040506 (03 Jun 2004)
-
-  03 Jun 2004; David Holm <dholm@gentoo.org> +waimea-0.5.0_pre040506.ebuild:
-  Version bump.
-
-  06 Mar 2004; Markus Nigbur <pyrania@gentoo.org> waimea-0.4.0-r1.ebuild,
-  waimea-0.4.0.ebuild:
-  SRC_URI fixup.
-
-  18 Dec 2003; Mamoru KOMACHI <usata@gentoo.org> waimea-0.4.0-r1.ebuild:
-  Fixed Japanese patch finename typo
-
-  27 Jun 2003; Patrick Kursawe <phosphan@gentoo.org> waimea-0.4.0-r1.ebuild:
-  Corrected wrong URL reported in bug #23573
-
-*waimea-0.4.0-r1 (22 Jun 2003)
-
-  22 Jun 2003; Mike Frysinger <vapier@gentoo.org> :
-  Added cjk patch #23233.
-
-*waimea-0.4.0 (06 Nov 2002)
-
-  18 Apr 2003; foser <foser@gentoo.org> waimea-0.4.0.ebuild :
-  Fixed xft dep to be virtual
-
-  21 Mar 2003; Jason Wever <weeve@gentoo.org> waimea-0.4.0.ebuild:
-  Added ~sparc to keywords.
-
-  06 Nov 2002; Brad Cowan <bcowan@gentoo.org> waimea-0.4.0.ebuild,
-  files/digest-waimea-0.4.0 :
-  Version bump, ebuild cleanup.
-
-*waimea-0.3.5 (14 Oct 2002)
-
-  14 Oct 2002; Mike Frysinger <vapier@gentoo.org> waimea-0.3.5.ebuild :
-  Updated to latest version and removed a few install lines since files
-  no longer exist (example rc script for instance)
-
-*waimea-0.3.3 (07 Jun 2002)
-
-  07 Jun 2002; Michael Nazaroff <naz@gentoo.org> waimea-0.3.3.ebuild :
-  Updated to latest version
-
-*waimea-0.3.2 (22 May 2002)
-
-  22 May 2002; Spider <spider@gentoo.org> waimea-0.3.2.ebuild :
-  Updated to latest version
-
-*waimea-0.3.1-r1 (13 May 2002)
-
-  13 May 2002; Spider <spider@gentoo.org> waimea-0.3.1-r1.ebuild :
-  update dependency
-  
-*waimea-0.3.1 (12 May 2002)
-
-  12 May 2002; Spider <spider@gentoo.org> waimea-0.3.1.ebuild : 
-  cleaned out /etc/skel thing, latest and greatest
-
-*waimea-0.3.0-r1 (9 May 2002)
-
-  9 May 2002; Spider <spider@gentoo.org> :
-  LICENSE, add an action link for /etc/skel, add einfo
-  
 *waimea-0.3.0 (08 May 2002)
-
   08 May 2002; Spider <spider@gentoo.org> waimea-0.3.0.ebuild ChangeLog :
   initial package release
diff --git a/x11-wm/waimea/Manifest b/x11-wm/waimea/Manifest
index 98dae10a27ed..e69de29bb2d1 100644
--- a/x11-wm/waimea/Manifest
+++ b/x11-wm/waimea/Manifest
@@ -1,21 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9fce0206f901711e9be3dc5976ea01a7 waimea-0.3.5.ebuild 1091
-MD5 d221529816942aa8a8a06985d2a26a55 waimea-0.4.0-r1.ebuild 1421
-MD5 2bababce3cfd608b02cec6e50a9756e4 waimea-0.5.0_pre040506.ebuild 1458
-MD5 58ac289f9fdb06f45cfca422d5e1bfb8 ChangeLog 3548
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 0758305291041d80fbe400709b949105 files/digest-waimea-0.5.0_pre040506 71
-MD5 82e8f766a7716339198e54c6f799964e files/waimea-0.5.0-64bit-clean.patch 420
-MD5 5be07af92d4d63686b6950ce357c89f7 files/digest-waimea-0.4.0-r1 135
-MD5 c5470d472bc8e9202a34e0ba037cb21c files/waimea-0.5.0-includes.patch 1340
-MD5 99a5f21810e1a4df6ae645f27a60203a files/digest-waimea-0.3.5 64
-MD5 c6c8d4b24a44c45b680bf1c1190de166 files/waimea-0.5.0-font.patch 489
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfidC2G5bA0cA/ScRApKLAKCezaGA/VnzEkumg7Ujexlh1iGx8gCgjoWb
-fnQVELG5vGxECwT1QuE1sk4=
-=8fpF
------END PGP SIGNATURE-----
diff --git a/x11-wm/waimea/files/digest-waimea-0.4.0-r1 b/x11-wm/waimea/files/digest-waimea-0.4.0-r1
index 93569169172b..803815fb1334 100644
--- a/x11-wm/waimea/files/digest-waimea-0.4.0-r1
+++ b/x11-wm/waimea/files/digest-waimea-0.4.0-r1
@@ -1,2 +1,2 @@
 MD5 0ce2ce92451e4e757a75c958b6acb87a waimea-0.4.0.tar.bz2 206805
-MD5 b3ba8ee8a945422ed332662bc0e98e25 waimea-0.4.0-japanese.patch 4414
+MD5 6270da6d89c6ad6fdfd3387777fac643 waimea-0.4.0-ja.patch 5108
diff --git a/x11-wm/waimea/waimea-0.3.5.ebuild b/x11-wm/waimea/waimea-0.3.5.ebuild
index 94f10e836aa4..8981da9850c9 100644
--- a/x11-wm/waimea/waimea-0.3.5.ebuild
+++ b/x11-wm/waimea/waimea-0.3.5.ebuild
@@ -1,18 +1,19 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.3.5.ebuild,v 1.11 2004/07/15 01:16:51 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.3.5.ebuild,v 1.1 2002/10/15 03:49:56 vapier Exp $
+ 
+S=${WORKDIR}/${P}
 DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+http://130.239.134.83/waimea/files/unstable/source/${P}.tar.gz"
 HOMEPAGE="http://waimea.sf.net/"
-
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE=""
+KEYWORDS="~x86 ~sparc ~sparc64"
 
-DEPEND="virtual/x11
-	media-libs/imlib2"
+DEPEND="virtual/x11 media-libs/imlib2"
+	
+RDEPEND="${DEPEND}"
 PROVIDE="virtual/blackbox"
 
 src_compile() {
@@ -21,13 +22,19 @@ src_compile() {
 }
 
 src_install() {
-	einstall sysconfdir=${D}/etc/X11/waimea || die
+	make \
+		prefix=${D}/usr \
+		sysconfdir=${D}/etc/X11/waimea \
+		mandir=${D}/usr/share/man \
+		infodir=${D}/usr/share/info \
+		datadir=${D}/usr/share \
+		install || die "make install died"
 
 	dodoc ChangeLog AUTHORS COPYING INSTALL README TODO NEWS
 
-	exeinto /etc/X11/Sessions
-	echo "/usr/bin/waimea" > waimea
-	doexe waimea
+	dodir /etc/X11/Sessions
+	echo "/usr/bin/waimea" > ${D}/etc/X11/Sessions/waimea
+	chmod +x ${D}/etc/X11/Sessions/waimea
 }
 
 pkg_postinst() {
@@ -35,5 +42,5 @@ pkg_postinst() {
 	einfo "/etc/skel/.waimearc and made it a directory, please remove"
 	einfo "this if you want the package to install perfectly"
 	einfo "copy /etc/skel/.waimearc to your homedir:"
-	einfo "  cp -a /etc/skel/.waimearc ${HOME}/"
+	einfo "  cp -a /etc/skel/.waimearc $HOME"
 }
diff --git a/x11-wm/waimea/waimea-0.4.0-r1.ebuild b/x11-wm/waimea/waimea-0.4.0-r1.ebuild
index 2646525943a1..24e53cb3ee4e 100644
--- a/x11-wm/waimea/waimea-0.4.0-r1.ebuild
+++ b/x11-wm/waimea/waimea-0.4.0-r1.ebuild
@@ -1,43 +1,35 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.4.0-r1.ebuild,v 1.16 2005/05/08 14:49:51 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.4.0-r1.ebuild,v 1.1 2003/06/22 23:23:50 vapier Exp $
 
 inherit eutils
-
+ 
 DESCRIPTION="Window manager based on BlackBox"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2
-	cjk? ( http://poincare.ikezoe.net/patch/${P}-japanese.patch )"
+SRC_URI="http://www.waimea.org/files/stable/source/${P}.tar.bz2
+	cjk? ( http://www.kasumi.sakura.ne.jp/~zoe/tdiary/patch/${P}-ja.patch )"
 HOMEPAGE="http://www.waimea.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc amd64"
+KEYWORDS="x86 ~sparc ~ppc"
 IUSE="truetype xinerama cjk"
 
-DEPEND="virtual/x11
+DEPEND="virtual/x11 
 	media-libs/imlib2
 	virtual/xft"
 
 PROVIDE="virtual/blackbox"
 
-pkg_setup() {
-	if ! built_with_use 'media-libs/imlib2' X ; then
-		# bug #86496
-		eerror "imlib2 must be compiled with X USE flag enabled."
-		die "Please remerge imlib2 with X USE flag and try again."
-	fi
-}
-
 src_unpack() {
-	unpack ${P}.tar.bz2
+	unpack ${A}
 	cd ${S}
-	use cjk && epatch ${DISTDIR}/${P}-japanese.patch
+	use cjk && epatch ${DISTDIR}/${P}-ja.patch
 }
 
 src_compile() {
 	econf \
-		$(use_enable xinerama) \
-		$(use_enable truetype xft) \
+		`use_enable xinerama` \
+		`use_enable truetype xft` \
 		--enable-shape \
 		--enable-render \
 		--enable-randr \
diff --git a/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild b/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild
index 9c50700611bb..ea1c6bc73a76 100644
--- a/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild
+++ b/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild
@@ -1,43 +1,31 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild,v 1.9 2005/05/05 02:47:10 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/waimea/waimea-0.5.0_pre040506.ebuild,v 1.1 2004/06/03 09:53:35 dholm Exp $
 
 inherit eutils
 
-MY_P="${P%_pre*}"	# 0.5.0_pre040506 -> 0.5.0
-
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/${PN}-0.5.0"
 DESCRIPTION="Window manager based on BlackBox"
 # Temporary URL until SF's CVS is back online
-SRC_URI="http://www.cs.umu.se/~c99drn/waimea/${P/_pre/-}.tar.gz"
+SRC_URI="http://www.cs.umu.se/~c99drn/waimea/waimea-0.5.0-040506.tar.gz"
 HOMEPAGE="http://www.waimea.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="truetype xinerama svg"
+KEYWORDS="~x86 ~ppc ~amd64"
+IUSE="truetype xinerama"
 
 DEPEND="virtual/x11
-	>=x11-libs/cairo-0.1.22
-	svg? ( x11-libs/libsvg-cairo )"
+	x11-libs/cairo
+	x11-libs/libsvg-cairo"
 
 PROVIDE="virtual/blackbox"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${MY_P}-64bit-clean.patch
-	epatch ${FILESDIR}/${MY_P}-font.patch
-	if has_version '>=x11-libs/cairo-0.3' ; then
-		epatch ${FILESDIR}/${MY_P}-includes.patch
-	fi
-}
-
 src_compile() {
 	econf \
 		`use_enable xinerama` \
 		`use_enable truetype xft` \
-		`use_enable svg ` \
+		--enable-svg \
 		--enable-shape \
 		--enable-render \
 		--enable-randr \
diff --git a/x11-wm/windowlab/ChangeLog b/x11-wm/windowlab/ChangeLog
index 4f98f358bb86..7d41f85d7a6f 100644
--- a/x11-wm/windowlab/ChangeLog
+++ b/x11-wm/windowlab/ChangeLog
@@ -1,82 +1,6 @@
 # ChangeLog for x11-wm/windowlab
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/ChangeLog,v 1.18 2005/08/15 03:00:18 metalgod Exp $
-
-  15 Aug 2005; Luis Medinas <metalgod@gentoo.org> windowlab-1.31.ebuild:
-  Marked Stable on AMD64.
-
-  14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org> windowlab-1.31.ebuild:
-  Stable on ppc.
-
-*windowlab-1.32 (31 Jul 2005)
-
-  31 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> -windowlab-1.24.ebuild,
-  windowlab-1.31.ebuild, +windowlab-1.32.ebuild:
-  Version bumped; bug #99932.
-
-  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> windowlab-1.30.ebuild:
-  Stable on amd64.
-
-  17 Jul 2005; Tobias Scherbaum <dertobi123@gentoo.org>
-  windowlab-1.30.ebuild:
-  ppc stable
-
-*windowlab-1.31 (02 Jul 2005)
-
-  02 Jul 2005; Mamoru KOMACHI <usata@gentoo.org> windowlab-1.30.ebuild,
-  +windowlab-1.31.ebuild:
-  Version bumped; bug #96891.
-
-*windowlab-1.30 (28 May 2005)
-
-  28 May 2005; Mamoru KOMACHI <usata@gentoo.org> -windowlab-1.23.ebuild,
-  -windowlab-1.29.ebuild, +windowlab-1.30.ebuild:
-  Version bumped; bug #93650.
-
-*windowlab-1.29 (22 May 2005)
-
-  22 May 2005; Mamoru KOMACHI <usata@gentoo.org> +windowlab-1.29.ebuild:
-  Version bumped. This fixes bug #91188.
-
-  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> -windowlab-1.17.ebuild,
-  -windowlab-1.20.ebuild, windowlab-1.24.ebuild:
-  Stable on x86 and ppc.
-
-  13 Aug 2004; Tom Martin <slarti@gentoo.org> windowlab-1.24.ebuild:
-  Marked ~amd64.
-
-*windowlab-1.24 (24 Jun 2004)
-
-  24 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> metadata.xml,
-  windowlab-1.23.ebuild, +windowlab-1.24.ebuild:
-  Version bumped. Marked 0.23 as stable.
-
-*windowlab-1.23 (23 May 2004)
-
-  23 May 2004; <usata@gentoo.org> windowlab-1.07.ebuild,
-  windowlab-1.12.ebuild, windowlab-1.17.ebuild, windowlab-1.20.ebuild,
-  windowlab-1.23.ebuild:
-  Version bumped. Don't assign default to S. Marked 1.17 and 1.20 stable on
-  x86. Added ~ppc to 1.23. Removed old ebuilds. Closing bug #48964
-
-*windowlab-1.20 (21 Jan 2004)
-
-  21 Jan 2004; Nick Hadaway <raker@gentoo.org> windowlab-1.20.ebuild:
-  Just a version bump.  I love this window manager.
-
-  04 Nov 2003; Brandon Hale <tseng@gentoo.org> windowlab-1.12.ebuild:
-  Marking 1.12 stable on x86
-
-*windowlab-1.17 (03 Nov 2003)
-
-  03 Nov 2003; Brandon Hale <tseng@gentoo.org> windowlab-1.17.ebuild:
-  Version bump.
-
-*windowlab-1.12 (20 Jul 2003)
-
-  20 Jul 2003; Nick Hadaway <raker@gentoo.org> windowlab-1.12.ebuild:
-  Version bump.  Bug fixes and feature enhancements.  (Even though the
-  author has said there will be no more new features) :)  
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/ChangeLog,v 1.1 2003/06/20 18:14:43 mkeadle Exp $
 
 *windowlab-1.07 (20 Jun 2003)
 
diff --git a/x11-wm/windowlab/Manifest b/x11-wm/windowlab/Manifest
index 049256fe0919..b02e30ec49e9 100644
--- a/x11-wm/windowlab/Manifest
+++ b/x11-wm/windowlab/Manifest
@@ -1,8 +1,3 @@
-MD5 f64da405d46278825fe0c2045665213e ChangeLog 2829
-MD5 631a87a06351ea5153017bd01ef1a90a metadata.xml 744
-MD5 9e7d0ba949b27c0a6499dc090936e6a4 windowlab-1.30.ebuild 830
-MD5 1c93b8a57da65e415473fa90933d79ab windowlab-1.32.ebuild 833
-MD5 e91358a7e322f22efce5d2ab811c083d windowlab-1.31.ebuild 833
-MD5 4e0ae4fc74cdb9ef64f7728a866f5de3 files/digest-windowlab-1.30 63
-MD5 551da740ce3ac4670d224ff312df9d39 files/digest-windowlab-1.31 63
-MD5 8d1a7b384efd740b64d20ecbff7d8ce3 files/digest-windowlab-1.32 63
+MD5 20e368684026216b76a908618c61fdc6 windowlab-1.07.ebuild 890
+MD5 0c58752e6ffdc724a1551515933e690f ChangeLog 422
+MD5 245138776c56287bd5fc7bd29adfdbc2 files/digest-windowlab-1.07 63
diff --git a/x11-wm/windowlab/metadata.xml b/x11-wm/windowlab/metadata.xml
index a8e760a1b83f..1adfe42d41d4 100644
--- a/x11-wm/windowlab/metadata.xml
+++ b/x11-wm/windowlab/metadata.xml
@@ -3,15 +3,8 @@
 <pkgmetadata>
 	<herd>desktop-wm</herd>
 	<longdescription>
-	WindowLab is a small and simple window manager of novel design.
-
-	It has a click-to-focus but not raise-on-focus policy, a
-	window resizing mechanism that allows one or many edges of a
-	window to be changed in one action, and an innovative menubar
-	that shares the same part of the screen as the taskbar. Window
-	titlebars are prevented from going off the edge of the screen
-	by constraining the mouse pointer, and when appropriate the
-	pointer is also constrained to the taskbar/menubar in order to
-	make target menu items easier to hit.
+	WindowLab is a small and simple window manager of novel design. It is 
+	click-to-focus, shares its window depth policy with the Amiga, and has 
+	a window resizing/reshaping method similar to that of 8-1/2 from Plan 9.
 	</longdescription>	
 </pkgmetadata>
diff --git a/x11-wm/windowlab/windowlab-1.30.ebuild b/x11-wm/windowlab/windowlab-1.30.ebuild
index 1e506d79afec..0f4dcb687474 100644
--- a/x11-wm/windowlab/windowlab-1.30.ebuild
+++ b/x11-wm/windowlab/windowlab-1.30.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/windowlab-1.30.ebuild,v 1.4 2005/07/20 21:20:20 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/windowlab-1.30.ebuild,v 1.1 2005/05/28 18:43:03 usata Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-wm/windowlab/windowlab-1.31.ebuild b/x11-wm/windowlab/windowlab-1.31.ebuild
index bb271c9ba0fe..404f80a345a3 100644
--- a/x11-wm/windowlab/windowlab-1.31.ebuild
+++ b/x11-wm/windowlab/windowlab-1.31.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/windowlab-1.31.ebuild,v 1.4 2005/08/15 03:00:18 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowlab/windowlab-1.31.ebuild,v 1.1 2005/07/02 06:50:35 usata Exp $
 
 IUSE=""
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.nickgravgaard.com/${PN}/${P}.tar"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~x86 ~ppc ~amd64"
 
 DEPEND="virtual/x11"
 
diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 286e13b57080..429ffce0a4b6 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,289 +1,6 @@
 # ChangeLog for x11-wm/windowmaker
-# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.58 2005/09/17 00:56:33 ciaranm Exp $
-
-  17 Sep 2005; Ciaran McCreesh <ciaranm@gentoo.org> ChangeLog:
-  Converted to UTF-8, fixed encoding screwups
-
-  12 Jul 2005; Stephen P. Becker <geoman@gentoo.org>
-  windowmaker-0.91.0-r1.ebuild:
-  stable on mips
-
-*windowmaker-0.92.0-r1 (06 Jul 2005)
-
-  06 Jul 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  -windowmaker-0.92.0.ebuild, +windowmaker-0.92.0-r1.ebuild:
-  Fixes for bug 97960 and bug 97961
-
-  05 Jul 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.92.0.ebuild:
-  Fixes for bug 97959
-
-  05 Jul 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.92.0.ebuild:
-  amd64/mmx fixes for bug 97963 ; more changes
-
-  05 Jul 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.92.0.ebuild:
-  amd64/mmx fixes for bug 97963
-
-*windowmaker-0.92.0 (04 Jul 2005)
-
-  04 Jul 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  +windowmaker-0.92.0.ebuild:
-  Version bump
-
-  24 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.80.2-r2.ebuild, windowmaker-0.80.2-r4.ebuild,
-  windowmaker-0.91.0-r1.ebuild, windowmaker-0.91.0-r7.ebuild:
-  Fixes for RDEPEND not drawing in correct binary packages if emerge -K; bug
-  39777
-
-  23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  -files/singleclick-shadeormaxopts-0.9x.patch,
-  +files/0.80.2/gtk2flickerfix.patch, -files/wlist-0.9x.patch,
-  +files/0.80.2/xinerama.patch.bz2,
-  +files/0.91.0/64bit+endian-fixes-0.9x.patch,
-  +files/0.91.0/maximize-fix-0.9x.patch, +files/0.91.0/wlist-0.9x.patch,
-  -files/singleclick-shadeormaxopts-0.9x.patch2,
-  +files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch,
-  +files/0.80.2/wlist.patch, +files/0.91.0/menufocus.patch,
-  -files/20_endian+64bit.diff,
-  +files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2,
-  -files/windowmaker-0.80.2-r1-gentoo.patch,
-  +files/0.80.2/trance.patch.WM-0.80.2.diff, +files/0.80.2/wmfpo.patch,
-  -files/gtk2flickerfix.patch, -files/64bit+endian-fixes-0.9x.patch,
-  -files/maximize-fix-0.9x.patch, -files/trance.patch.WM-0.80.2.diff,
-  -files/menufocus.patch, -files/wlist.patch, -files/wmfpo.patch,
-  -files/xinerama.patch.bz2, windowmaker-0.80.2-r2.ebuild,
-  windowmaker-0.80.2-r4.ebuild, windowmaker-0.91.0-r1.ebuild,
-  windowmaker-0.91.0-r7.ebuild:
-  Cleanup of windowmaker ebuild files, patches, etc
-
-  23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  -windowmaker-0.80.2-r3.ebuild, -windowmaker-0.91.0-r6.ebuild:
-  Pruned old windowmaker ebuilds
-
-*windowmaker-0.91.0-r7 (23 Jun 2005)
-
-  23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  +files/maximize-fix-0.9x.patch, +windowmaker-0.91.0-r7.ebuild:
-  Fixes for bug 71301 (regarding maximize/unmaximize issues)
-
-  23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  -windowmaker-0.91.0-r4.ebuild, -windowmaker-0.91.0-r5.ebuild:
-  Pruned old revisions
-
-*windowmaker-0.91.0-r6 (23 Jun 2005)
-
-  23 Jun 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  +files/singleclick-shadeormaxopts-0.9x.patch2,
-  -windowmaker-0.91.0-r2.ebuild, -windowmaker-0.91.0-r3.ebuild,
-  +windowmaker-0.91.0-r6.ebuild:
-  Fixes for earlier fixes to fix bug 90119 (can't move dock)
-
-*windowmaker-0.91.0-r5 (23 Jun 2005)
-
-  23 Jun 2005; Jonathan Smith <smithj@gentoo.org>
-  +windowmaker-0.91.0-r5.ebuild:
-  #47074: made windowmaker show up in gdm options
-
-  07 Apr 2005; Simon Stelling <blubb@gentoo.org>
-  windowmaker-0.91.0-r1.ebuild:
-  stable on amd64
-
-  24 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.91.0-r4.ebuild:
-  Yet again, more changes per bug 85993
-
-  22 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.91.0-r4.ebuild:
-  argh...forgot to remove a change
-
-  21 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.91.0-r4.ebuild:
-  fixes for giflib changes that caused bug 85993
-
-  20 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org> metadata.xml,
-  windowmaker-0.91.0-r4.ebuild:
-  libtoolize fixes for bug 85993
-
-  20 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.91.0-r1.ebuild, windowmaker-0.91.0-r2.ebuild,
-  windowmaker-0.91.0-r3.ebuild, windowmaker-0.91.0-r4.ebuild:
-  Removed useless USE flag
-
-*windowmaker-0.91.0-r4 (18 Mar 2005)
-
-  18 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  +windowmaker-0.91.0-r4.ebuild:
-  giflib fixes; bug 85720
-
-*windowmaker-0.91.0-r3 (17 Mar 2005)
-
-  17 Mar 2005; Armando Di Cianno <fafhrd@gentoo.org> -files/xinerama.patch,
-  +files/xinerama.patch.bz2, -windowmaker-0.80.2-r1.ebuild,
-  windowmaker-0.80.2-r2.ebuild, windowmaker-0.80.2-r3.ebuild,
-  windowmaker-0.80.2-r4.ebuild, -windowmaker-0.90.0.ebuild,
-  windowmaker-0.91.0-r3.ebuild, -windowmaker-0.91.0.ebuild:
-  bzipped xinerama.patch for older windowmaker ebuilds, as it crossed 20k;
-  removed old windowmaker ebuilds; re-added ~mips keyworded to latest
-  windowmaker rev, as gnustep use flag is now masked for mips, removing the
-  breakage
-
-  10 Jan 2005; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.91.0-r1.ebuild, windowmaker-0.91.0-r2.ebuild,
-  windowmaker-0.91.0.ebuild:
-  Syntactical changes for bug 69872; grammer fixes, too
-
-  09 Jan 2005; <augustus@gentoo.org> :
-  windowmaker-0.91.0-r2.ebuild:
-  Added fix to crash on app launch in windowmaker-0.91.0-r2.ebuild.
-
-  30 Nov 2004; Bryan Østergaard <kloeri@gentoo.org>
-  windowmaker-0.91.0-r1.ebuild:
-  Stable on alpha, bug 68857.
-
-  26 Nov 2004; Jason Wever <weeve@gentoo.org> windowmaker-0.91.0-r1.ebuild:
-  Stable on sparc wrt securit bug #68857.
-
-  26 Nov 2004; Joseph Jezak <josejx@gentoo.org>
-  windowmaker-0.91.0-r1.ebuild:
-  Marked ppc stable for bug #68857.
-
-  24 Nov 2004; Olivier Crete <tester@gentoo.org> windowmaker-0.91.0-r1.ebuild:
-  Marking stable on x86 per security bug #68857
-
-  23 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
-  +files/wmaker.desktop, windowmaker-0.91.0-r1.ebuild:
-  Stable amd64... bug #68857.
-
-  14 Nov 2004; Hardave Riar <hardave@gentoo.org> windowmaker-0.90.0.ebuild,
-  windowmaker-0.91.0-r1.ebuild:
-  Added ~mips, bug #68857.
-
-*windowmaker-0.91.0-r1 (11 Nov 2004)
-
-  11 Nov 2004; Armando Di Cianno <fafhrd@gentoo.org>
-  +windowmaker-0.91.0-r1.ebuild:
-  Mass Update: gnustep.eclass revamped to allow configurable root install;
-  gnustep-base/libs/apps updated to utilize new gnustep.eclass (only versions
-  bumped where files would change); some KEYWORDS were accidentally dropped
-  between version bumps of packages -- this has been resolved; windowmaker
-  correctly supports gnustep now
-
-  07 Nov 2004; Simon Stelling <blubb@gentoo.org> windowmaker-0.91.0.ebuild:
-  added ~amd64
-
-  05 Nov 2004; Simon Stelling <blubb@gentoo.org> windowmaker-0.90.0.ebuild:
-  added ~amd64
-
-  01 Nov 2004; Gustavo Zacarias <gustavoz@gentoo.org>
-  windowmaker-0.91.0.ebuild:
-  Keyworded ~sparc
-
-  31 Oct 2004; Bryan Østergaard <kloeri@gentoo.org>
-  windowmaker-0.90.0.ebuild:
-  ~alpha keyword.
-
-  30 Oct 2004; Michele Noberasco <s4t4n@gentoo.org> windowmaker-0.91.0.ebuild:
-  Added ~x86 keyword...
-
-*windowmaker-0.91.0 (29 Oct 2004)
-
-  29 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.90.0.ebuild, +windowmaker-0.91.0.ebuild:
-  Version bump; new version for upstream changes for better NETWM support;
-  keyworded for ~ppc
-
-  29 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org> :
-  Added depend for media-libs/fontconfig to 0.90.0
-
-  28 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org>
-  windowmaker-0.90.0.ebuild:
-  Fixed einfo typo about location of WPrefs.app
-
-  26 Oct 2004; Michele Noberasco <s4t4n@gentoo.org> windowmaker-0.90.0.ebuild:
-  Added ~x86 keyword...
-
-  24 Oct 2004; Jason Wever <weeve@gentoo.org> windowmaker-0.90.0.ebuild:
-  Added ~sparc keyword wrt bug #68729.
-
-*windowmaker-0.90.0 (24 Oct 2004)
-
-  24 Oct 2004; Armando Di Cianno <fafhrd@gentoo.org>
-  +windowmaker-0.90.0.ebuild:
-  Version bump; keyworded for ~ppc; new version supports anti-aliased fonts --
-  finally ;-) -- as well as NETWM support for better GNOME 2 and KDE 3 use.
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  windowmaker-0.80.2-r3.ebuild, windowmaker-0.80.2-r4.ebuild:
-  Masked windowmaker-0.80.2-r4.ebuild stable for ppc
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org>
-  windowmaker-0.80.2-r3.ebuild:
-  Masked windowmaker-0.80.2-r3.ebuild stable for ppc
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> :
-  Masked windowmaker-0.80.2-r2.ebuild stable for ppc
-
-  25 Jul 2004; Michele Noberasco <s4t4n@gentoo.org> windowmaker-0.80.2-r4.ebuild:
-  Fixed non existing dodoc entry BUGFORUM to BUGFORM.
-
-  23 Jul 2004; Tom Gall <tgall@gentoo.org> windowmaker-0.80.2-r4.ebuild:
-  stable on ppc64
-
-*windowmaker-0.80.2-r4 (07 Jun 2004)
-
-  17 Jun 2004; Armando Di Cianno <fafhrd@gentoo.org>
-  metadata.xml, windowmaker-0.80.2-r4.ebuild:
-  Added windowmaker to gnustep herd.  Added ~ARCH for ppc64.
-  
-  07 Jun 2004; Nick Hadaway <raker@gentoo.org> 
-  windowmaker-0.80.2-r4.ebuild, files/wmfpo.patch, 
-  files/gtk2flickerfix.patch:
-  A new release of WindowMaker coming from upstream cvs will be real 
-  soon now but these two updates are very nice.  Pretty soon
-  windowmaker will be more popular than gnome and kde combined! muhaha!
-  GTK+2 applications should no longer fight for focus and the wmfpo patch
-  adds options in WPrefs.app for single-click window raising and window 
-  maximizing instead of shading.  Thanks to bug submitters and testers 
-  on #38481 and #49804.
-
-  27 Apr 2004; Aron Griffis <agriffis@gentoo.org>
-  windowmaker-0.80.2-r1.ebuild, windowmaker-0.80.2-r2.ebuild:
-  Add inherit eutils
-
-  22 Jul 2003; Daniel Ahlberg <aliz@gentoo.org> windowmaker-0.80.3-r3.ebuild :
-  Changed flags alteration.
-
-  19 Jul 2003; Nick Hadaway <raker@gentoo.org> windowmaker-0.80.2-r3.ebuild:
-  Added a xinerama patch.
-
-*windowmaker-0.80.2-r3 (10 Jul 2003)
-
-  10 Jul 2003; Nick Hadaway <raker@gentoo.org> windowmaker-0.80.2-r3.ebuild,
-  file/wlist.patch, files/trance.patch.WM-0.80.2.diff:
-  Scroll with arrow keys and a menu transparency patch. :)
-
-  19 Jun 2003; Joshua Kinard <kumba@gentoo.org> windowmaker-0.80.2-r2.ebuild:
-  Added ~mips to KEYWORDS.
-
-  12 Jun 2003; Seemant Kulleen <seemant@gentoo.org>
-  windowmaker-0.80.2-r1.ebuild, windowmaker-0.80.2-r2.ebuild:
-  xpm is provided by xfree
-
-*windowmaker-0.80.2-r2 (06 Jun 2003)
-
-  06 Jun 2003; robh <robh@gentoo.org> windowmaker-0.80.2-r2.ebuild:
-  fixed the path for WPrefs. Thanks to Eric Shattow <shadow@ilpornostar.com>
-
-*windowmaker-0.80.2-r1
-
-  05 Jun 2003; robh <robh@gentoo.org> windowmaker-0.80.1-r2.ebuild,
-  windowmaker-0.80.2.ebuild, files/windowmaker-0.80.1-gentoo.patch:
-  moved /usr/share/GNUstep sillyness to /usr/lib/GNUstep. closes #10870.
-  removed old versions.
+# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.1 2003/06/04 13:49:57 joker Exp $
 
   06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
  
@@ -350,11 +67,11 @@
  Version bump.  Removed Taiwanese translations installation.
 
 *windowmaker-0.80.0-r3 (10 May 2002)
-  10 May 2002; José Alberto Suárez López <bass@gentoo.org> windowmaker-0.80.0-r3.ebuild :
+  10 May 2002; Jos� Alberto Su�rez L�pez <bass@gentoo.org> windowmaker-0.80.0-r3.ebuild :
   added a comment about the libxpm.
 
 *windowmaker-0.80.0-r3 (8 May 2002)
-  8 May 2002; José Alberto Suárez López <bass@gentoo.org> windowmaker-0.80.0-r3.ebuild :
+  8 May 2002; Jos� Alberto Su�rez L�pez <bass@gentoo.org> windowmaker-0.80.0-r3.ebuild :
   fix a error in the url of the WindowMaker-extra.
 
 *windowmaker-0.80.0-r3 (18 Apr 2002)
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 7f77a524b036..06029a2e7076 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,34 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 f2a0c01891e0932bb55aa936f807d7c0 windowmaker-0.92.0-r1.ebuild 5302
-MD5 056f320591b95b4adaec5b906ae25035 windowmaker-0.80.2-r4.ebuild 4094
-MD5 ab7e156ee5beb8245f93e81b16ab93c3 windowmaker-0.91.0-r1.ebuild 5920
-MD5 350d1c8fc3f110fa9bbd0f7a681ec880 windowmaker-0.80.2-r2.ebuild 3463
-MD5 6dfb07e767918268038ad952d0e38029 windowmaker-0.91.0-r7.ebuild 6800
-MD5 641b83c6027dc91a4ac14e1749a58b41 metadata.xml 222
-MD5 81c39137d9aca12681c0b49c93cc226e ChangeLog 14517
-MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r2 144
-MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
-MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r1 144
-MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r4 144
-MD5 4c748a4dd9d3e57dfe5c1d01ccac4b54 files/digest-windowmaker-0.91.0-r7 227
-MD5 56fa606e28d04ba426e4d4cacc8d0b2d files/digest-windowmaker-0.92.0-r1 144
-MD5 c53a14e14931247288ba66cb017a9f42 files/0.91.0/64bit+endian-fixes-0.9x.patch 4831
-MD5 3a5eaebd5ccf7d3384c042e13f52bef1 files/0.91.0/wlist-0.9x.patch 2980
-MD5 84bc0e347cd23ca347219959362afa91 files/0.91.0/singleclick-shadeormaxopts-0.9x.patch2 7788
-MD5 c41215f830e33a636a440ce389db01eb files/0.91.0/menufocus.patch 1554
-MD5 0b1eb289596c8aa934b6c17362b0201c files/0.91.0/maximize-fix-0.9x.patch 1245
-MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/0.80.2/windowmaker-0.80.2-r1-gentoo.patch 4331
-MD5 37aefa1e6f793583e8fa7890231d1721 files/0.80.2/wmfpo.patch 7696
-MD5 a062e261bd5aaca39bc17be01f07f1b6 files/0.80.2/wlist.patch 2776
-MD5 c8eb68627dc7b53b10143626018ff597 files/0.80.2/gtk2flickerfix.patch 1969
-MD5 e451189d91551534b18988709274b73b files/0.80.2/xinerama.patch.bz2 5908
-MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/0.80.2/trance.patch.WM-0.80.2.diff 9738
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFDK2n1LLFUmVNQ7rkRAiI6AKC7lqQFVLmNEwmMHQj6BBaqr2ru5gCggvmR
-9+mUI3Z3q2s6Gsbz+twM4Pc=
-=XeE6
------END PGP SIGNATURE-----
+MD5 c46c9acadbdcb03d10511391b14a477a windowmaker-0.80.1-r2.ebuild 3113
+MD5 9760d2c26cb372a34351aac6927018c1 ChangeLog 3908
+MD5 5f0693f73b9ceee2463ad5a262e59338 windowmaker-0.80.2.ebuild 3087
+MD5 dda192d90a51a83abae0c5e7c953e53a files/digest-windowmaker-0.80.1-r2 144
+MD5 ea778106abbddc560e19120d5b7547bd files/windowmaker-0.80.1-gentoo.patch 4333
+MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2 144
diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
index 9243b4ee062a..194b369637e4 100644
--- a/x11-wm/windowmaker/metadata.xml
+++ b/x11-wm/windowmaker/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnustep</herd>
+<herd>no-herd</herd>
 <maintainer>
-  <email>fafhrd@gentoo.org</email>
+  <email>raker@gentoo.org</email>
 </maintainer>
 </pkgmetadata>
diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
index d6342458ce6f..44be70c5278b 100644
--- a/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild,v 1.11 2005/06/24 00:32:26 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r2.ebuild,v 1.1 2003/06/06 15:16:31 robh Exp $
 
-inherit eutils
-
-IUSE="alsa esd gif gnome jpeg kde nls oss png"
+IUSE="gif nls png kde oss jpeg gnome"
 
 MY_P=${P/windowm/WindowM}
 S=${WORKDIR}/${MY_P}
@@ -16,22 +14,21 @@ HOMEPAGE="http://www.windowmaker.org/"
 DEPEND="virtual/x11
 	media-libs/hermes
 	>=media-libs/tiff-3.5.5
-	gif? ( >=media-libs/giflib-4.1.0-r3
+	gif? ( >=media-libs/giflib-4.1.0-r3 
 		>=media-libs/libungif-4.1.0 )
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )"
 
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="x86 ppc sparc alpha ~mips"
+KEYWORDS="x86 ppc sparc alpha"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}/${PN}-0.80.2-r1-gentoo.patch
+	patch -p1 < ${FILESDIR}/${PN}-0.80.2-r1-gentoo.patch
 }
 
 src_compile() {
@@ -41,18 +38,18 @@ src_compile() {
 	use gnome \
 		&& myconf="${myconf} --enable-gnome" \
 		|| myconf="${myconf} --disable-gnome"
-
+	
 	use kde \
 		&& myconf="${myconf} --enable-kde" \
 		&& export KDEDIR=/usr/kde/2 \
 		|| myconf="${myconf} --disable-kde"
-
+	
 	if [ "$WITH_MODELOCK" ] ; then
 		myconf="${myconf} --enable-modelock"
 	else
 		myconf="${myconf} --disable-modelock"
 	fi
-
+	
 	use nls \
 		&& export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`" \
 		|| myconf="${myconf} --disable-nls --disable-locale"
@@ -62,10 +59,10 @@ src_compile() {
 
 	use jpeg \
 		|| myconf="${myconf} --disable-jpeg"
-
+	
 	use png \
 		|| myconf="${myconf} --disable-png"
-
+		
 
 	use esd || use alsa || use oss \
 		&& myconf="${myconf} --enable-sound" \
@@ -80,7 +77,7 @@ src_compile() {
 		--with-appspath=/usr/lib/GNUstep/Apps \
 		--with-pixmapdir=/usr/share/pixmaps \
 		${myconf} || die
-
+	
 	cd ${S}/po
 	cp Makefile Makefile.orig
 	sed 's:zh_TW.*::' \
@@ -93,23 +90,23 @@ src_compile() {
 
 	cd ${S}
 	for file in ${S}/WindowMaker/*menu*; do
-		if [ -r $file ]; then
-				sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;
-						s/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
-				mv $file.tmp $file;
-		fi;
+        	if [ -r $file ]; then
+                	sed -e 's/\/usr\/local\/GNUstep/\/usr\/lib\/GNUstep/g;
+                        	s/\/usr\/local\/share\/WindowMaker/\/usr\/share\/WindowMaker/g;' < $file > $file.tmp;
+                	mv $file.tmp $file;
+        	fi;
 	done;
-
+	
 	cd ${S}
 	#0.80.1-r2 did not work with make -j4 (drobbins, 15 Jul 2002)
 	#with future Portage, this should become "emake -j1"
-	emake -j1 || die
-
-	# WindowMaker Extra
+	make || die
+  
+  	# WindowMaker Extra
 	cd ../WindowMaker-extra-0.1
 	econf || die
-
-	emake -j1 || die
+		    
+	make || die
 }
 
 src_install() {
@@ -128,7 +125,7 @@ src_install() {
 	# WindowMaker Extra
 	cd ../WindowMaker-extra-0.1
 	einstall || die
-
+	
 	newdoc README README.extra
 
 	echo "#!/bin/bash" > wmaker
@@ -139,6 +136,9 @@ src_install() {
 }
 
 pkg_postinst() {
+	einfo "You need to emerge media-libs/xpm to get transparent globes or"
+	einfo "other transparent elements."
+	einfo
 	einfo "/usr/share/GNUstep/ has moved to /usr/lib/GNUstep/"
 	einfo "this means the WPrefs app has moved. If you have"
 	einfo "entries for this in your menus, please correct them"
diff --git a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
index ba03cc98708f..3609d3db9ed2 100644
--- a/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.11 2005/06/24 00:32:26 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.80.2-r4.ebuild,v 1.1 2004/06/07 13:38:27 raker Exp $
 
 inherit eutils flag-o-matic
 filter-mfpmath "sse" "387"
 
-IUSE="alsa esd gif gnome jpeg kde nls oss png xinerama"
+IUSE="gif nls png kde oss jpeg gnome xinerama"
 
 MY_P=${P/windowm/WindowM}
 S=${WORKDIR}/${MY_P}
@@ -23,36 +23,35 @@ DEPEND="virtual/x11
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )"
 
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )"
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~sparc ~alpha ~mips amd64 ppc64"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips amd64"
 
 src_unpack() {
 	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${PV}/${PN}-0.80.2-r1-gentoo.patch
+	epatch ${FILESDIR}/${PN}-0.80.2-r1-gentoo.patch
 
 	# scroll with the arrow keys
 	cd ${S}/WINGs
-	epatch ${FILESDIR}/${PV}/wlist.patch
+	epatch ${FILESDIR}/wlist.patch
 
 	# transparency/translucency
 	cd ${S}
-	epatch ${FILESDIR}/${PV}/trance.patch.WM-0.80.2.diff
+	epatch ${FILESDIR}/trance.patch.WM-0.80.2.diff
 
 	# Add some BETTER xinerama support
-	use xinerama && epatch ${FILESDIR}/${PV}/xinerama.patch.bz2
+	use xinerama && epatch ${FILESDIR}/xinerama.patch
 
 	# Fix GTK2 window flickering bug
-	epatch ${FILESDIR}/${PV}/gtk2flickerfix.patch
+	epatch ${FILESDIR}/gtk2flickerfix.patch
 
 	# Add options to WPrefs for single-click launching of windows
 	# and maximize vs. shading when double-click on titlebars
 	# http://orbita.starmedia.com/~neofpo/home.html
-	epatch ${FILESDIR}/${PV}/wmfpo.patch
+	epatch ${FILESDIR}/wmfpo.patch
 }
 
 src_compile() {
@@ -124,13 +123,13 @@ src_compile() {
 	cd ${S}
 	#0.80.1-r2 did not work with make -j4 (drobbins, 15 Jul 2002)
 	#with future Portage, this should become "emake -j1"
-	emake -j1 || die
+	make || die
 
 	# WindowMaker Extra
 	cd ../WindowMaker-extra-0.1
 	econf || die
 
-	emake -j1 || die
+	make || die
 }
 
 src_install() {
@@ -143,7 +142,7 @@ src_install() {
 
 	cp -f WindowMaker/plmenu ${D}/etc/X11/WindowMaker/WMRootMenu
 
-	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
+	dodoc AUTHORS BUGFORUM BUGS ChangeLog COPYING* INSTALL* FAQ* \
 	      MIRRORS README* NEWS TODO
 
 	# WindowMaker Extra
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
index 883d62c4eb3b..1b9097fcdce7 100644
--- a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.16 2005/07/12 04:21:11 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.1 2004/11/12 03:58:52 fafhrd Exp $
 
 inherit eutils gnustep-funcs
 
@@ -11,32 +11,25 @@ SRC_URI="ftp://ftp.windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.g
 	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
 HOMEPAGE="http://www.windowmaker.org/"
 
-IUSE="gif gnustep jpeg nls png tiff modelock xinerama"
+IUSE="gif gnustep jpeg nls png tiff modelock vdesktop xinerama"
 DEPEND="x11-base/xorg-x11
 	media-libs/fontconfig
 	gif? ( || ( >=media-libs/libungif-4.1.0
-			>=media-libs/giflib-4.1.0-r3 ) )
+			>=media-libs/giflib-4.1.0-r3))
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.6.1-r2 )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )
 	gnustep? ( gnustep-base/gnustep-env )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="alpha amd64 mips ppc sparc x86"
+KEYWORDS="~x86 ~ppc ~sparc ~amd64"
 
 if use gnustep; then
 	egnustep_install_domain "System"
 fi
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/${PV}/menufocus.patch || die "menu focus patch failed"
-}
-
 src_compile() {
 	local myconf
 	local gs_user_postfix
@@ -46,7 +39,7 @@ src_compile() {
 	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
 
 	# non required X capabilities
-	myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)"
+	myconf="${myconf} $(use_enable modelock) $(use_enable vdesktop) $(use_enable xinerama)"
 
 	# integrate with GNUstep environment, or not
 	if use gnustep ; then
@@ -138,9 +131,6 @@ src_install() {
 	echo "/usr/bin/wmaker" >> wmaker
 	exeinto /etc/X11/Sessions/
 	doexe wmaker
-
-	insinto /etc/X11/dm/Sessions
-	doins ${FILESDIR}/wmaker.desktop
 }
 
 pkg_postinst() {
@@ -168,13 +158,20 @@ pkg_postinst() {
 		ewarn ""
 	else
 		einfo "Even though you are not using the GNUstep environment, wmaker.inst will"
-		einfo "  create a 'GNUstep' directory in your home -- it uses this directory"
+		einfo "  create a 'GNUstep' directory in your home -- it uses this dirctory"
 		einfo "  to store your WindowMaker configuration files."
 		einfo "WPrefs.app can be launched at /usr/lib/GNUstep/Applications/WPrefs.app/WPrefs"
 		einfo "  or by simply **clicking on it in the WindowMaker default dock.**"
 		einfo ""
 	fi
 
+	if use vdesktop ; then
+		ewarn "Note that enabling support for NETWM virtual desktops will make"
+		ewarn "  menus that should be autoscrolling seem to not scroll, as they"
+		ewarn "  are not off the screen, but rather in another virtual desktop."
+		ewarn ""
+	fi
+
 	ewarn "This package provides libwraster.so.3.  Packages depending on"
 	ewarn "  libwraster.so.2 will have to be rebuilt, i.e. 'revdep-rebuild'"
 
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
index 4a5b5d39dcb2..0064b4878ca0 100644
--- a/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild,v 1.3 2005/06/24 00:32:26 fafhrd Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r7.ebuild,v 1.1 2005/06/23 22:01:34 fafhrd Exp $
 
 inherit eutils gnustep-funcs flag-o-matic
 
@@ -19,8 +19,7 @@ DEPEND="x11-base/xorg-x11
 	png? ( >=media-libs/libpng-1.2.1 )
 	jpeg? ( >=media-libs/jpeg-6b-r2 )
 	tiff? ( >=media-libs/tiff-3.6.1-r2 )"
-RDEPEND="${DEPEND}
-	nls? ( >=sys-devel/gettext-0.10.39 )
+RDEPEND="nls? ( >=sys-devel/gettext-0.10.39 )
 	gnustep? ( gnustep-base/gnustep-env )"
 
 SLOT="0"
@@ -37,11 +36,11 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 	epatch ${WORKDIR}/windowmaker-0.9X-use-giflib.patch3 || die "giflib patch failed"
-	epatch ${FILESDIR}/${PV}/menufocus.patch || die "menu focus patch failed"
-	epatch ${FILESDIR}/${PV}/singleclick-shadeormaxopts-0.9x.patch2 || die "single click and shade-or-maximize-options patch failed"
-	epatch ${FILESDIR}/${PV}/wlist-0.9x.patch || die "window list patch failed"
-	epatch ${FILESDIR}/${PV}/64bit+endian-fixes-0.9x.patch || die "64-bit + endian fix patch failed"
-	epatch ${FILESDIR}/${PV}/maximize-fix-0.9x.patch || die "maximize fix patch failed"
+	epatch ${FILESDIR}/menufocus.patch || die "menu focus patch failed"
+	epatch ${FILESDIR}/singleclick-shadeormaxopts-0.9x.patch2 || die "single click and shade-or-maximize-options patch failed"
+	epatch ${FILESDIR}/wlist-0.9x.patch || die "window list patch failed"
+	epatch ${FILESDIR}/64bit+endian-fixes-0.9x.patch || die "64-bit + endian fix patch failed"
+	epatch ${FILESDIR}/maximize-fix-0.9x.patch || die "64-bit + endian fix patch failed"
 }
 
 src_compile() {
diff --git a/x11-wm/wm2/ChangeLog b/x11-wm/wm2/ChangeLog
index a80bc70744a6..4303cb3132b1 100644
--- a/x11-wm/wm2/ChangeLog
+++ b/x11-wm/wm2/ChangeLog
@@ -1,21 +1,6 @@
 # ChangeLog for x11-wm/wm2
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/ChangeLog,v 1.7 2005/07/20 21:23:34 herbs Exp $
-
-  20 Jul 2005; Herbie Hopkins <herbs@gentoo.org> wm2-4.ebuild:
-  Stable on amd64.
-
-  01 Jul 2005; Joseph Jezak <josejx@gentoo.org> wm2-4.ebuild:
-  Marked ppc stable for bug #97646.
-
-  21 Jun 2005; Danny van Dyk <kugelfang@gentoo.org> wm2-4.ebuild:
-  Marked ~amd64.
-
-  10 May 2005; David Holm <dholm@gentoo.org> wm2-4.ebuild:
-  Added to ~ppc.
-
-  26 Apr 2004; Mamoru KOMACHI <usata@gentoo.org> wm2-4.ebuild:
-  Marked stable on x86. Don't assign default to S. inherit eutils for epatch.
+# Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/ChangeLog,v 1.1 2003/10/20 12:24:43 usata Exp $
 
 *wm2-4 (20 Oct 2003)
 
diff --git a/x11-wm/wm2/Manifest b/x11-wm/wm2/Manifest
index b7ee92ac041b..bc01b3f9e79b 100644
--- a/x11-wm/wm2/Manifest
+++ b/x11-wm/wm2/Manifest
@@ -1,15 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9dc902b53d7e6fa21f917ae099167fc2 wm2-4.ebuild 1325
-MD5 4bc79404907d4fb259c08b6861392161 ChangeLog 891
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
+MD5 8664035449a021c3334452d2f0514e20 wm2-4.ebuild 857
 MD5 9e0ac0452d3a84e7f4837c7f0f08ff37 files/wm2-4-gentoo.patch 3430
 MD5 b06be8523fb665cee575914e6b788265 files/digest-wm2-4 56
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFC3sDl2G5bA0cA/ScRAsACAJ9uM6/IECPdYzejWDb5ZZeLAy8ysQCgtEug
-qIAu+wj7TK+fj22wzGxkpME=
-=mVZp
------END PGP SIGNATURE-----
diff --git a/x11-wm/wm2/wm2-4.ebuild b/x11-wm/wm2/wm2-4.ebuild
index 1b8443aed692..62d2e844402a 100644
--- a/x11-wm/wm2/wm2-4.ebuild
+++ b/x11-wm/wm2/wm2-4.ebuild
@@ -1,11 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/wm2-4.ebuild,v 1.7 2005/07/20 21:23:34 herbs Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wm2/wm2-4.ebuild,v 1.1 2003/10/20 12:24:43 usata Exp $
 
 IUSE=""
 
+S=${WORKDIR}/${P}
 DESCRIPTION="Small, unconfigurable window manager"
 HOMEPAGE="http://www.all-day-breakfast.com/wm2/"
 SRC_URI="http://www.all-day-breakfast.com/wm2/${P}.tar.gz"
@@ -14,7 +13,7 @@ DEPEND="virtual/x11"
 
 SLOT="0"
 LICENSE="freedist"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~x86"
 
 src_unpack() {
 	unpack ${A}
diff --git a/x11-wm/wmi/ChangeLog b/x11-wm/wmi/ChangeLog
index 71798dae1941..29d7df28e8d7 100644
--- a/x11-wm/wmi/ChangeLog
+++ b/x11-wm/wmi/ChangeLog
@@ -1,62 +1,6 @@
 # ChangeLog for x11-wm/wmi
-# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmi/ChangeLog,v 1.14 2005/05/08 14:40:55 herbs Exp $
-
-  08 May 2005; Herbie Hopkins <herbs@gentoo.org> wmi-10.ebuild:
-  Stable on amd64.
-
-  16 Apr 2005; Mamoru KOMACHI <usata@gentoo.org> wmi-10.ebuild:
-  Do not try to install directory with dodoc; bug #89120.
-
-  20 Feb 2005; Tom Martin <slarti@gentoo.org> wmi-10.ebuild:
-  Marked ~amd64, resolves bug 82454.
-
-  05 Nov 2004; Mamoru KOMACHI <usata@gentoo.org> wmi-10.ebuild:
-  Stable on x86 and ppc.
-
-  23 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> wmi-10.ebuild,
-  -wmi-7.ebuild, -wmi-8.ebuild:
-  Added to ~ppc-macos.
-
-*wmi-10 (08 Oct 2004)
-
-  08 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> +wmi-10.ebuild:
-  Version bumped. This closes bug #66443.
-
-  27 Sep 2004; Mamoru KOMACHI <usata@gentoo.org> wmi-7.ebuild, wmi-8.ebuild,
-  wmi-9.ebuild:
-  Removed STLport of DEPEND. This closes bug #65111.
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmi-7.ebuild,
-  wmi-8.ebuild, wmi-9.ebuild:
-  Masked wmi-9.ebuild stable for ppc
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmi-7.ebuild,
-  wmi-8.ebuild:
-  Masked wmi-8.ebuild stable for ppc
-
-  30 Aug 2004; Pieter Van den Abeele <pvdabeel@gentoo.org> wmi-7.ebuild:
-  Masked wmi-7.ebuild stable for ppc
-
-*wmi-9 (10 Aug 2004)
-
-  10 Aug 2004; Mamoru KOMACHI <usata@gentoo.org> wmi-7.ebuild,
-  wmi-8.ebuild, +wmi-9.ebuild:
-  Version bumped. Marked previous versions stable on x86.
-  This closes bug #59116.
-
-*wmi-8 (01 Jul 2004)
-
-  01 Jul 2004; Mamoru KOMACHI <usata@gentoo.org> +files/wmi.desktop,
-  +wmi-8.ebuild:
-  Version bumped. xsession file is added. Thanks to John Nilsson
-  <john@milsson.nu>, closing bug #55640
-
-  22 Jun 2004; Michael Sterrett <mr_bones_@gentoo.org> wmi-7.ebuild:
-  Add IUSE
-
-  08 Jun 2004; David Holm <dholm@gentoo.org> wmi-7.ebuild:
-  Added to ~ppc.
+# Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmi/ChangeLog,v 1.1 2004/06/05 19:36:17 usata Exp $
 
 *wmi-7 (06 Jun 2004)
 
diff --git a/x11-wm/wmi/Manifest b/x11-wm/wmi/Manifest
index 6d49c078629b..07c2f5d8519c 100644
--- a/x11-wm/wmi/Manifest
+++ b/x11-wm/wmi/Manifest
@@ -1,17 +1,2 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 276c8a86034d064720d9196a9fe4201d wmi-9.ebuild 1046
-MD5 65061256ce24b9ad0322a9e657805917 wmi-10.ebuild 1069
-MD5 14542bcab32f2ee3c25aeb3fecfa81cd ChangeLog 2148
-MD5 3113eb62900633d059d2bcbad0ef8f7e metadata.xml 343
-MD5 607f0418f6681898ac8da1fbe4e8b6e7 files/wmi.desktop 112
-MD5 f7f19525d1f04d7c2f698e824bca26b8 files/digest-wmi-9 57
-MD5 1bc69f6a689f8553a641ce0309ac1311 files/digest-wmi-10 58
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCfiUr2G5bA0cA/ScRAo4tAJwIVTmbu0juTAAlwzdI47pUFfKsrgCbBBD4
-4P4sZwc/5REAu2/xeBs4Rjs=
-=vRm+
------END PGP SIGNATURE-----
+MD5 a967cfc3374f4bb71cf261a54d3dca37 wmi-7.ebuild 896
+MD5 7e7e0f0cf7b852e02aad5dfe5dbc5946 files/digest-wmi-7 57
diff --git a/x11-wm/wmi/metadata.xml b/x11-wm/wmi/metadata.xml
index 6c6bde048f75..4627b33b9737 100644
--- a/x11-wm/wmi/metadata.xml
+++ b/x11-wm/wmi/metadata.xml
@@ -5,5 +5,5 @@
   <email>john@milsson.nu</email>
   <description>John Nilsson isn't Gentoo official developer but will help us maintain x11-wm/wmi ebuilds.</description>
 </maintainer>
-<herd>desktop-wm</herd>
+<herd>desptop-wm</herd>
 </pkgmetadata>
diff --git a/x11-wm/wmi/wmi-10.ebuild b/x11-wm/wmi/wmi-10.ebuild
index 66bb9ef519d7..716f635b922a 100644
--- a/x11-wm/wmi/wmi-10.ebuild
+++ b/x11-wm/wmi/wmi-10.ebuild
@@ -1,18 +1,16 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmi/wmi-10.ebuild,v 1.6 2005/05/08 14:40:55 herbs Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmi/wmi-10.ebuild,v 1.1 2004/10/07 17:49:35 usata Exp $
 
 DESCRIPTION="WMI is a new window manager for X11, which combines the best features of larswm, ion, evilwm and ratpoison into one window manager."
 SRC_URI="http://download.berlios.de/wmi/${P}.tar.gz"
 HOMEPAGE="http://wmi.modprobe.de/"
-
 LICENSE="as-is"
 DEPEND="virtual/x11
 	dev-libs/expat
 	media-libs/fontconfig
 	media-libs/freetype"
-
-KEYWORDS="x86 ppc ~ppc-macos amd64"
+KEYWORDS="~x86 ~ppc"
 SLOT="0"
 IUSE=""
 
@@ -28,7 +26,7 @@ src_install () {
 		  NEWS README TODO
 
 	docinto examples
-	dodoc examples/*.sh
+	dodoc examples/*
 
 	docinto examples/themes
 	dodoc examples/themes/*
diff --git a/x11-wm/wmi/wmi-9.ebuild b/x11-wm/wmi/wmi-9.ebuild
index c5f5c3d9ae95..fe193a1f8d9d 100644
--- a/x11-wm/wmi/wmi-9.ebuild
+++ b/x11-wm/wmi/wmi-9.ebuild
@@ -1,16 +1,17 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmi/wmi-9.ebuild,v 1.4 2005/02/20 20:00:29 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmi/wmi-9.ebuild,v 1.1 2004/08/17 22:46:07 usata Exp $
 
 DESCRIPTION="WMI is a new window manager for X11, which combines the best features of larswm, ion, evilwm and ratpoison into one window manager."
 SRC_URI="http://download.berlios.de/wmi/${P}.tar.gz"
 HOMEPAGE="http://wmi.berlios.de/"
 LICENSE="as-is"
 DEPEND="virtual/x11
+	dev-libs/STLport
 	dev-libs/expat
 	media-libs/fontconfig
 	media-libs/freetype"
-KEYWORDS="x86 ppc"
+KEYWORDS="~x86 ~ppc"
 SLOT="0"
 IUSE=""
 
diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index d257f1f973b2..5eb637fb3d03 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,49 +1,6 @@
 # ChangeLog for x11-wm/wmii
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.9 2005/08/12 15:36:22 tove Exp $
-
-*wmii-2 (12 Aug 2005)
-
-  12 Aug 2005; Torsten Veller <tove@gentoo.org> +files/wmii-2_050802.patch,
-  +wmii-2.ebuild:
-  New release.
-
-*wmii-1.1 (13 Jun 2005)
-
-  13 Jun 2005; Torsten Veller <tove@gentoo.org> -wmii-1.ebuild,
-  +wmii-1.1.ebuild:
-  Version bump.  Thanks to Yann Lamontagne (bug #95973).
-
-  04 Jun 2005; Olivier Crête <tester@gentoo.org> wmii-1.ebuild:
-  Add ~amd64 keyword per bug #94998
-
-*wmii-1 (01 Jun 2005)
-
-  01 Jun 2005; Torsten Veller <tove@gentoo.org> -wmii-0.20050510.ebuild,
-  +wmii-1.ebuild:
-  First Relese. Removed cairo support because it's really broken.
-
-  14 May 2005; Rene Nussbaumer <killerfox@gentoo.org>
-  wmii-0.20050510.ebuild:
-  added ~hppa
-
-*wmii-0.20050510 (11 May 2005)
-
-  11 May 2005; Torsten Veller <tove@gentoo.org> -wmii-0.20050506.ebuild,
-  +wmii-0.20050510.ebuild:
-  New snapshot.
-
-*wmii-0.20050506 (06 May 2005)
-
-  06 May 2005; Torsten Veller <tove@gentoo.org> metadata.xml,
-  -wmii-0.20050504.ebuild, +wmii-0.20050506.ebuild:
-  New snap.
-
-*wmii-0.20050504 (04 May 2005)
-
-  04 May 2005; Torsten Veller <tove@gentoo.org> -wmii-0.20050420.ebuild,
-  +wmii-0.20050504.ebuild:
-  New snapshot.
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.1 2005/04/21 10:25:52 tove Exp $
 
 *wmii-0.20050420 (21 Apr 2005)
 
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index f3d2a5ea4752..f4ac252fbba6 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 e9b2543eae6cd285b417bc03913b05dc wmii-2.ebuild 1834
-MD5 c906c78fa9d92ca9ec155771808c81e7 wmii-1.1.ebuild 2014
-MD5 1ea7b6c1aa6c71f82cca43f16880f9d0 ChangeLog 1602
-MD5 f5ba35e50e57b9e6df75d700acc82da8 metadata.xml 700
-MD5 ee68e1c5bc21e7124f02324bda993263 files/wmii-2_050802.patch 1015
-MD5 080701816705482fee573518bbe73bec files/digest-wmii-1.1 60
+MD5 79c8e05ea14b47f256525609e972b7bb wmii-0.20050420.ebuild 1810
+MD5 b7b17e829993de1efdcf82ab28e32d76 ChangeLog 386
+MD5 9dfc07930dff89a3773796c3296c9d39 metadata.xml 505
 MD5 48b2aadadc04fa539467a05f3afa031e files/wmii.desktop 174
-MD5 6a5eddc0d9589e3314ac6414d7f9e018 files/digest-wmii-2 58
+MD5 bd57e7e27c47a0e7574ca22a31f04a5b files/digest-wmii-0.20050420 67
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
+Version: GnuPG v1.4.1 (GNU/Linux)
 
-iD8DBQFC/MIQV3J2n04EauwRAiraAJ0RwW8SnlhjG33Skd3JggYur2cQdACgl3Hq
-NeY+RMzYhXPqvder57Kcq+w=
-=VjPO
+iD8DBQFCZ395V3J2n04EauwRAlcsAJ4uVfGn5WnQMdk3VDAm43kNcURIJgCgiVIo
+mDLpQW2LiCWlewIwySkq1Ko=
+=hjeJ
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/wmii/metadata.xml b/x11-wm/wmii/metadata.xml
index 656eca82f6b3..790860336065 100644
--- a/x11-wm/wmii/metadata.xml
+++ b/x11-wm/wmii/metadata.xml
@@ -7,12 +7,9 @@
 		<name>Torsten Veller</name>
 	</maintainer>
 	<longdescription lang="en">
-		wmii is a highly customizable keyboard- and mouse-driven X11 window
-		manager which supports conventional, tabbed and tiled window management
-		with low memory usage and a vi-alike user interaction. Due to a complete
-		rewrite it is highly modularized and uses a new configuration and
-		inter-process communication interface which is oriented on the 9p
-		protocol of the plan9 operating system.
+		wmii is a lightweight window manager, highly modularized and uses a new
+		configuration and inter-process communication interface which is
+		oriented on the 9p protocol of the plan9 operating system.
 	</longdescription>
 </pkgmetadata>
 
diff --git a/x11-wm/xpde/ChangeLog b/x11-wm/xpde/ChangeLog
index d696b7d3740f..d7514e23afb3 100644
--- a/x11-wm/xpde/ChangeLog
+++ b/x11-wm/xpde/ChangeLog
@@ -1,49 +1,12 @@
 # ChangeLog for x11-wm/xpde
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpde/ChangeLog,v 1.10 2004/10/09 19:44:42 usata Exp $
-
-  10 Oct 2004; Mamoru KOMACHI <usata@gentoo.org> xpde-0.3.5.ebuild,
-  xpde-0.4.0.ebuild, xpde-0.5.1.ebuild:
-  Stable on x86. Masked for other arches since it is distributed as a
-  binary tarball.
-
-*xpde-0.5.1 (31 Aug 2004)
-
-  31 Aug 2004; Mamoru KOMACHI <usata@gentoo.org>
-  +files/xpde-0.5.1-gentoo.diff, +xpde-0.5.1.ebuild:
-  Version bumped. Thanks to Boris Wachtmeister <sirro@nurfuerspam.de>,
-  closing bug #45638.
-
-  27 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> xpde-0.3.5.ebuild,
-  xpde-0.4.0.ebuild:
-  don't assign default to S; tidy
-
-*xpde-0.4.0 (15 Aug 2003)
-
-  15 Aug 2003; Seemant Kulleen <seemant@gentoo.org> xpde-0.1.1.ebuild,
-  xpde-0.2.0.ebuild, xpde-0.3.0.ebuild, xpde-0.4.0.ebuild:
-  version bump
-
-*xpde-0.3.5 (23 Jun 2003)
-
-  23 Jun 2003; Seemant Kulleen <seemant@gentoo.org> xpde-0.3.5.ebuild:
-  version bump
-
-*xpde-0.3.0 (19 Mar 2003)
-
-  19 Mar 2003; Martin Schlemmer <azarah@gentoo.org> xpde-0.2.0.ebuild :
-  New version.
-
-*xpde-0.2.0 (17 Feb 2003)
-
-  17 Feb 2003; Nick Hadaway <raker@gentoo.org> xpde-0.2.0.ebuild,
-  files/digest-xpde-0.2.0 :
-  Version bump.  Lots of little changes.
+# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpde/ChangeLog,v 1.1 2002/12/07 09:21:30 seemant Exp $
 
 *xpde-0.1.1 (07 Dec 2002)
 
   07 Dec 2002; Seemant Kulleen <seemant@gentoo.org> xpde-0.1.1.ebuild
   ChangeLog files/digest-xpde-0.1.1 :
+
   New desktop environment designed to look and feel like WindowsXP.  Since
   they now have designed their own window manager instead of dressing up
   metacity, it is added into portage.  Be warned that the functionality is
diff --git a/x11-wm/xpde/Manifest b/x11-wm/xpde/Manifest
index c0fb0a22bf5f..e69de29bb2d1 100644
--- a/x11-wm/xpde/Manifest
+++ b/x11-wm/xpde/Manifest
@@ -1,11 +0,0 @@
-MD5 6e263a850c8a53be7057be2cd18b840d ChangeLog 1687
-MD5 eb1963eb86613a19463bf97c0ca6e1a3 xpde-0.3.5.ebuild 1654
-MD5 2b50ce708a61ddd0a13c9bdc5c38ad0d xpde-0.4.0.ebuild 1654
-MD5 d6b5a801e5d2a573cca86f69c8c2d999 xpde-0.5.1.ebuild 962
-MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
-MD5 97e6c2dc937af7b7d66566cc25a8d558 files/digest-xpde-0.3.5 72
-MD5 7d9936062181818ce6a8d0f2bccee241 files/digest-xpde-0.4.0 73
-MD5 db1a32cc23b76d0feb1ff8c3790bb543 files/install-config.sh 220
-MD5 974815ed8d41ed47a88ecc145c156d87 files/xpde 149
-MD5 f564d18dae82d810d1b58ec1a2ef7050 files/digest-xpde-0.5.1 63
-MD5 bff5a4d143be6617f29157b266614bc9 files/xpde-0.5.1-gentoo.diff 394
diff --git a/x11-wm/xpde/xpde-0.3.5.ebuild b/x11-wm/xpde/xpde-0.3.5.ebuild
index bf12f8c3214b..781d6e269290 100644
--- a/x11-wm/xpde/xpde-0.3.5.ebuild
+++ b/x11-wm/xpde/xpde-0.3.5.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpde/xpde-0.3.5.ebuild,v 1.4 2004/10/09 19:44:42 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpde/xpde-0.3.5.ebuild,v 1.1 2003/06/23 11:56:46 seemant Exp $
 
+IUSE=""
+S="${WORKDIR}/${P}"
 DESCRIPTION="A Desktop Environment modelled after the O/S from Redmond, WA"
 HOMEPAGE="http://www.xpde.com/"
 SRC_URI="http://www.xpde.com/releases/${P}-20030426.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="~x86 -ppc -sparc -alpha"
 
 DEPEND="virtual/x11"
 
 src_compile() {
-	einfo
+	einfo ""
 	einfo "This is a binary-only package (sadly)"
 	einfo "No files to compile."
-	einfo
+	einfo ""
 }
 
 src_install() {
@@ -57,10 +58,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
+	einfo ""
 	einfo "sh /opt/xpde/bin/install-config.sh"
-	einfo
+	einfo ""
 	einfo "This will install a default configuration into your"
 	einfo "home directory"
-	einfo
+	einfo ""
 }
diff --git a/x11-wm/xpde/xpde-0.4.0.ebuild b/x11-wm/xpde/xpde-0.4.0.ebuild
index 09f4fc5576c3..dab72a7ca9f0 100644
--- a/x11-wm/xpde/xpde-0.4.0.ebuild
+++ b/x11-wm/xpde/xpde-0.4.0.ebuild
@@ -1,23 +1,24 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpde/xpde-0.4.0.ebuild,v 1.4 2004/10/09 19:44:42 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpde/xpde-0.4.0.ebuild,v 1.1 2003/08/15 08:06:02 seemant Exp $
 
+IUSE=""
+S="${WORKDIR}/${P}"
 DESCRIPTION="A Desktop Environment modelled after the O/S from Redmond, WA"
 HOMEPAGE="http://www.xpde.com/"
 SRC_URI="http://www.xpde.com/releases/${P}-20030730.tar.gz"
 
-LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86"
-IUSE=""
+LICENSE="GPL-2"
+KEYWORDS="~x86 -ppc -sparc -alpha"
 
 DEPEND="virtual/x11"
 
 src_compile() {
-	einfo
+	einfo ""
 	einfo "This is a binary-only package (sadly)"
 	einfo "No files to compile."
-	einfo
+	einfo ""
 }
 
 src_install() {
@@ -57,10 +58,10 @@ src_install() {
 }
 
 pkg_postinst() {
-	einfo
+	einfo ""
 	einfo "sh /opt/xpde/bin/install-config.sh"
-	einfo
+	einfo ""
 	einfo "This will install a default configuration into your"
 	einfo "home directory"
-	einfo
+	einfo ""
 }
diff --git a/x11-wm/xpde/xpde-0.5.1.ebuild b/x11-wm/xpde/xpde-0.5.1.ebuild
index bac53e003842..b43d0f8c09b4 100644
--- a/x11-wm/xpde/xpde-0.5.1.ebuild
+++ b/x11-wm/xpde/xpde-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpde/xpde-0.5.1.ebuild,v 1.2 2004/10/09 19:44:43 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/xpde/xpde-0.5.1.ebuild,v 1.1 2004/08/30 16:33:48 usata Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="http://www.xpde.com/releases/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="-* x86"
+KEYWORDS="~x86 -*"
 IUSE=""
 
 DEPEND="virtual/x11"
author	Chris White <chriswhite@gentoo.org>	2005-11-30 09:38:30 +0000
committer	Chris White <chriswhite@gentoo.org>	2005-11-30 09:38:30 +0000
commit	67c8b060271109f68d8b0a44de61d297ddfbe2e7 (patch)
tree	42ce8164da9dd6d55caa82dfe6832b4a2a0a6ad5 /x11-wm
parent	* empty log message * (diff)
download	gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.tar.gz gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.tar.bz2 gentoo-2-67c8b060271109f68d8b0a44de61d297ddfbe2e7.zip