Move windowmaker-crm to windowmaker, update metadata

svn path=/overlay/; revision=441

43 files changed, 69 insertions, 74 deletions

diff --git a/metadata/cache/gnustep-apps/azbackground-0.4.1 b/metadata/cache/gnustep-apps/azbackground-0.4.1
index 34f3b03..7b3ae78 100644
--- a/metadata/cache/gnustep-apps/azbackground-0.4.1
+++ b/metadata/cache/gnustep-apps/azbackground-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 A background image setter for the Etoile project
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/dictionaryreader-0.4.1 b/metadata/cache/gnustep-apps/dictionaryreader-0.4.1
index e9b6998..fddd52b 100644
--- a/metadata/cache/gnustep-apps/dictionaryreader-0.4.1
+++ b/metadata/cache/gnustep-apps/dictionaryreader-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 MIT
 Dictionary application that queries Dict servers
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/etoile-corner-0.4.1 b/metadata/cache/gnustep-apps/etoile-corner-0.4.1
index 9a87bed..9bc5bda 100644
--- a/metadata/cache/gnustep-apps/etoile-corner-0.4.1
+++ b/metadata/cache/gnustep-apps/etoile-corner-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 A simple 'hot-corners' implementation
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/etoile-idle-0.4.1 b/metadata/cache/gnustep-apps/etoile-idle-0.4.1
index ed8b884..cca894b 100644
--- a/metadata/cache/gnustep-apps/etoile-idle-0.4.1
+++ b/metadata/cache/gnustep-apps/etoile-idle-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 sends user-idle notifications every minute that the user is idle
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/etoile-menuserver-0.4.1 b/metadata/cache/gnustep-apps/etoile-menuserver-0.4.1
index fd5de7d..fa97f3a 100644
--- a/metadata/cache/gnustep-apps/etoile-menuserver-0.4.1
+++ b/metadata/cache/gnustep-apps/etoile-menuserver-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 GPL-2
 Menubar for the Etoile environment
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/fontmanager-0.4.1 b/metadata/cache/gnustep-apps/fontmanager-0.4.1
index 885c6c4..94f39a9 100644
--- a/metadata/cache/gnustep-apps/fontmanager-0.4.1
+++ b/metadata/cache/gnustep-apps/fontmanager-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 Fonts managing application
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/melodie-0.4.1-r1 b/metadata/cache/gnustep-apps/melodie-0.4.1-r1
index 119a476..e97a963 100644
--- a/metadata/cache/gnustep-apps/melodie-0.4.1-r1
+++ b/metadata/cache/gnustep-apps/melodie-0.4.1-r1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 Melodie is a music player for Etoile
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/scriptservices-0.4.1 b/metadata/cache/gnustep-apps/scriptservices-0.4.1
index df5cf3e..7bc17c5 100644
--- a/metadata/cache/gnustep-apps/scriptservices-0.4.1
+++ b/metadata/cache/gnustep-apps/scriptservices-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 MIT
 Gateway between GNUstep system services and Unix scripts
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/sogo-1.1.0-r1 b/metadata/cache/gnustep-apps/sogo-1.1.0-r1
index 3233dd3..ca41410 100644
--- a/metadata/cache/gnustep-apps/sogo-1.1.0-r1
+++ b/metadata/cache/gnustep-apps/sogo-1.1.0-r1
@@ -7,7 +7,7 @@ http://sogo.opengroupware.org/
 GPL-2
 Groupware server built around OpenGroupware.org and the SOPE application server
 ~amd64 ~x86
-eutils flag-o-matic gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-base multilib portability toolchain-funcs user
 postgres mysql logrotate debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/sogo-1.2.0 b/metadata/cache/gnustep-apps/sogo-1.2.0
index 5ac07bb..ab80647 100644
--- a/metadata/cache/gnustep-apps/sogo-1.2.0
+++ b/metadata/cache/gnustep-apps/sogo-1.2.0
@@ -7,7 +7,7 @@ http://sogo.opengroupware.org/
 GPL-2
 Groupware server built around OpenGroupware.org and the SOPE application server
 ~amd64 ~x86
-eutils flag-o-matic gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-base multilib portability toolchain-funcs user
 postgres mysql logrotate debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/sogo-1.2.1 b/metadata/cache/gnustep-apps/sogo-1.2.1
index a86432f..2e13908 100644
--- a/metadata/cache/gnustep-apps/sogo-1.2.1
+++ b/metadata/cache/gnustep-apps/sogo-1.2.1
@@ -7,7 +7,7 @@ http://sogo.opengroupware.org/
 GPL-2
 Groupware server built around OpenGroupware.org and the SOPE application server
 ~amd64 ~x86
-eutils flag-o-matic gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-base multilib portability toolchain-funcs user
 postgres mysql logrotate debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/sogo-9999 b/metadata/cache/gnustep-apps/sogo-9999
index 0badee7..7d88e0f 100644
--- a/metadata/cache/gnustep-apps/sogo-9999
+++ b/metadata/cache/gnustep-apps/sogo-9999
@@ -7,7 +7,7 @@ http://sogo.opengroupware.org/
 GPL-2
 Groupware server built around OpenGroupware.org and the SOPE application server
 
-eutils flag-o-matic gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-base multilib portability toolchain-funcs user
 postgres mysql logrotate debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/stepchat-0.4.1 b/metadata/cache/gnustep-apps/stepchat-0.4.1
index 7af59ee..35f9ec9 100644
--- a/metadata/cache/gnustep-apps/stepchat-0.4.1
+++ b/metadata/cache/gnustep-apps/stepchat-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 Etoilé instant messenger for jabber
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-apps/typewriter-0.4.1 b/metadata/cache/gnustep-apps/typewriter-0.4.1
index 2d7453c..2fbd101 100644
--- a/metadata/cache/gnustep-apps/typewriter-0.4.1
+++ b/metadata/cache/gnustep-apps/typewriter-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 Etoilé general text editor for plain and rich format text
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/addresseskit-0.4.1 b/metadata/cache/gnustep-libs/addresseskit-0.4.1
index 553df0b..b46c4a2 100644
--- a/metadata/cache/gnustep-libs/addresseskit-0.4.1
+++ b/metadata/cache/gnustep-libs/addresseskit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 LGPL-2
 A personal address manager for GNUstep
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/coreobject-0.4.1 b/metadata/cache/gnustep-libs/coreobject-0.4.1
index 3c07003..f4f8aaf 100644
--- a/metadata/cache/gnustep-libs/coreobject-0.4.1
+++ b/metadata/cache/gnustep-libs/coreobject-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 A framework for describing and organizing model objects
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/etoile-foundation-0.4.1 b/metadata/cache/gnustep-libs/etoile-foundation-0.4.1
index ae08f2d..72a3fb2 100644
--- a/metadata/cache/gnustep-libs/etoile-foundation-0.4.1
+++ b/metadata/cache/gnustep-libs/etoile-foundation-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 Foundation framework extensions from the Etoile project
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/etoile-serialize-0.4.1 b/metadata/cache/gnustep-libs/etoile-serialize-0.4.1
index 502e8fb..453668c 100644
--- a/metadata/cache/gnustep-libs/etoile-serialize-0.4.1
+++ b/metadata/cache/gnustep-libs/etoile-serialize-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 Collection of classes that perform serialization and deserialization of arbitrary objects
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/etoile-ui-0.4.1 b/metadata/cache/gnustep-libs/etoile-ui-0.4.1
index a467aaa..f3b6b05 100644
--- a/metadata/cache/gnustep-libs/etoile-ui-0.4.1
+++ b/metadata/cache/gnustep-libs/etoile-ui-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 AppKit framework extensions from the Etoile project
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/etoile-wildmenus-0.4.1 b/metadata/cache/gnustep-libs/etoile-wildmenus-0.4.1
index b008be9..ffb21a8 100644
--- a/metadata/cache/gnustep-libs/etoile-wildmenus-0.4.1
+++ b/metadata/cache/gnustep-libs/etoile-wildmenus-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 provides horizontal menu display to Etoile applications
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/languagekit-0.4.1 b/metadata/cache/gnustep-libs/languagekit-0.4.1
index 647d381..00c35df 100644
--- a/metadata/cache/gnustep-libs/languagekit-0.4.1
+++ b/metadata/cache/gnustep-libs/languagekit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 a compiler kit built on top of LLVM for creating dynamic language implementations using an Objective-C runtime for the object model
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/lucenekit-0.4.1 b/metadata/cache/gnustep-libs/lucenekit-0.4.1
index ef2ea03..b214399 100644
--- a/metadata/cache/gnustep-libs/lucenekit-0.4.1
+++ b/metadata/cache/gnustep-libs/lucenekit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 Apache-2.0
 GNUstep port of Lucene
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/mediakit-0.4.1 b/metadata/cache/gnustep-libs/mediakit-0.4.1
index 4fbe557..6274be8 100644
--- a/metadata/cache/gnustep-libs/mediakit-0.4.1
+++ b/metadata/cache/gnustep-libs/mediakit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 LGPL-2.1
 a common backend engine to play multimedia stream
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/ogrekit-0.4.1 b/metadata/cache/gnustep-libs/ogrekit-0.4.1
index c463c0a..ca15559 100644
--- a/metadata/cache/gnustep-libs/ogrekit-0.4.1
+++ b/metadata/cache/gnustep-libs/ogrekit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 OniGuruma regular expression framework
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/scriptkit-0.4.1 b/metadata/cache/gnustep-libs/scriptkit-0.4.1
index 290d736..c9b79ca 100644
--- a/metadata/cache/gnustep-libs/scriptkit-0.4.1
+++ b/metadata/cache/gnustep-libs/scriptkit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 LGPL-2.1
 lightweight cross-app scripting framework built on top of Distributed Objects
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/smalltalkkit-0.4.1 b/metadata/cache/gnustep-libs/smalltalkkit-0.4.1
index 2c0286d..cf43a31 100644
--- a/metadata/cache/gnustep-libs/smalltalkkit-0.4.1
+++ b/metadata/cache/gnustep-libs/smalltalkkit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 Étoilé's Pragmatic Smalltalk, a Smalltalk JIT compiler which generates code binary-compatible with Objective-C
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/sope-4.9_pre200908051100 b/metadata/cache/gnustep-libs/sope-4.9_pre200908051100
index fe6fe93..b94cba9 100644
--- a/metadata/cache/gnustep-libs/sope-4.9_pre200908051100
+++ b/metadata/cache/gnustep-libs/sope-4.9_pre200908051100
@@ -7,7 +7,7 @@ http://sope.opengroupware.org/en/index.html
 LGPL-2
 An extensive set of frameworks which form a complete Web application server environment
 ~amd64 ~x86
-apache-module depend.apache eutils flag-o-matic gnustep-base multilib portability toolchain-funcs
+apache-module depend.apache eutils flag-o-matic gnustep-base multilib portability toolchain-funcs user
 apache2 ldap libFoundation mysql postgres sqlite apache2 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/sope-9999 b/metadata/cache/gnustep-libs/sope-9999
index 76f905b..ccdaafa 100644
--- a/metadata/cache/gnustep-libs/sope-9999
+++ b/metadata/cache/gnustep-libs/sope-9999
@@ -7,7 +7,7 @@ http://sope.opengroupware.org/en/index.html
 LGPL-2
 An extensive set of frameworks which form a complete Web application server environment
 
-apache-module depend.apache eutils flag-o-matic gnustep-base multilib portability subversion toolchain-funcs
+apache-module depend.apache eutils flag-o-matic gnustep-base multilib portability subversion toolchain-funcs user
 apache2 ldap libFoundation mysql postgres sqlite apache2 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/systemconfig-0.4.1 b/metadata/cache/gnustep-libs/systemconfig-0.4.1
index c543476..1402b3f 100644
--- a/metadata/cache/gnustep-libs/systemconfig-0.4.1
+++ b/metadata/cache/gnustep-libs/systemconfig-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 LGPL-2.1
 provides a common way to set system specific preferences
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/unitkit-0.4.1 b/metadata/cache/gnustep-libs/unitkit-0.4.1
index ac8797a..14028dc 100644
--- a/metadata/cache/gnustep-libs/unitkit-0.4.1
+++ b/metadata/cache/gnustep-libs/unitkit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 Apache-2.0
 Test framework for GNUstep
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/xmppkit-0.4.1 b/metadata/cache/gnustep-libs/xmppkit-0.4.1
index baad528..1daed4f 100644
--- a/metadata/cache/gnustep-libs/xmppkit-0.4.1
+++ b/metadata/cache/gnustep-libs/xmppkit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 Objective-C implementation of the XMPP protocol
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/gnustep-libs/xwindowserverkit-0.4.1 b/metadata/cache/gnustep-libs/xwindowserverkit-0.4.1
index f3e879e..d19d3a4 100644
--- a/metadata/cache/gnustep-libs/xwindowserverkit-0.4.1
+++ b/metadata/cache/gnustep-libs/xwindowserverkit-0.4.1
@@ -7,7 +7,7 @@ http://www.etoile-project.org
 BSD
 framework to integrate GNUstep with X window system
 ~amd64 ~ppc ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/sys-devel/llvm-2.5 b/metadata/cache/sys-devel/llvm-2.5
index 1fbc35b..d7dd7e2 100644
--- a/metadata/cache/sys-devel/llvm-2.5
+++ b/metadata/cache/sys-devel/llvm-2.5
@@ -7,7 +7,7 @@ http://llvm.org/
 LLVM
 Low Level Virtual Machine
 ~amd64 ~ppc ~x86
-eutils multilib portability toolchain-funcs
+eutils multilib portability toolchain-funcs user
 debug alltargets pic
 
 
diff --git a/metadata/cache/x11-themes/gnustep-gnometheme-9999 b/metadata/cache/x11-themes/gnustep-gnometheme-9999
index 44cadbe..934b5cf 100644
--- a/metadata/cache/x11-themes/gnustep-gnometheme-9999
+++ b/metadata/cache/x11-themes/gnustep-gnometheme-9999
@@ -7,7 +7,7 @@ http://svn.gna.org/viewcvs/gnustep/plugins/themes/GnomeTheme/
 LGPL-2.1
 a GNUstep theme engine using current Gtk+ theme
 
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability subversion toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability subversion toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/x11-themes/gnustep-silvertheme-2.1 b/metadata/cache/x11-themes/gnustep-silvertheme-2.1
index b990948..68fbd4e 100644
--- a/metadata/cache/x11-themes/gnustep-silvertheme-2.1
+++ b/metadata/cache/x11-themes/gnustep-silvertheme-2.1
@@ -7,7 +7,7 @@ http://wiki.gnustep.org/index.php/Themes
 as-is
 a GNUstep silver theme
 ~amd64 ~x86
-eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs
+eutils flag-o-matic gnustep-2 gnustep-base multilib portability toolchain-funcs user
 debug doc
 
 
diff --git a/metadata/cache/x11-wm/windowmaker-9999 b/metadata/cache/x11-wm/windowmaker-9999
new file mode 100644
index 0000000..08b811a
--- /dev/null
+++ b/metadata/cache/x11-wm/windowmaker-9999
@@ -0,0 +1,22 @@
+media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool dev-vcs/git
+media-libs/fontconfig >=x11-libs/libXft-2.1.0 x11-libs/libXt x11-libs/libXv gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( media-libs/libpng:0 ) jpeg? ( virtual/jpeg ) tiff? ( media-libs/tiff:0 ) xinerama? ( x11-libs/libXinerama ) xrandr? ( x11-libs/libXrandr ) nls? ( >=sys-devel/gettext-0.10.39 )
+0
+http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz
+
+http://www.windowmaker.org/
+GPL-2
+The fast and light GNUstep window manager
+
+autotools eutils git-2 libtool multilib portability toolchain-funcs user
+gif jpeg nls png tiff modelock xinerama +xrandr
+
+
+
+4
+
+compile configure install prepare unpack
+
+
+
+
+
diff --git a/metadata/cache/x11-wm/windowmaker-crm-9999 b/metadata/cache/x11-wm/windowmaker-crm-9999
deleted file mode 100644
index 3675280..0000000
--- a/metadata/cache/x11-wm/windowmaker-crm-9999
+++ /dev/null
@@ -1,22 +0,0 @@
-x11-libs/libXv >=x11-libs/libXft-2.1.0 x11-libs/libXt media-libs/fontconfig gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( >=media-libs/libpng-1.2.1 ) jpeg? ( virtual/jpeg ) tiff? ( >=media-libs/tiff-3.6.1-r2 ) xinerama? ( x11-libs/libXinerama ) || ( =sys-devel/automake-1.11* ) >=sys-devel/autoconf-2.61 sys-devel/libtool >=dev-vcs/git-1.6
-x11-libs/libXv >=x11-libs/libXft-2.1.0 x11-libs/libXt media-libs/fontconfig gif? ( >=media-libs/giflib-4.1.0-r3 ) png? ( >=media-libs/libpng-1.2.1 ) jpeg? ( virtual/jpeg ) tiff? ( >=media-libs/tiff-3.6.1-r2 ) xinerama? ( x11-libs/libXinerama ) !x11-wm/windowmaker nls? ( >=sys-devel/gettext-0.10.39 )
-0
-http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz
-
-http://repo.or.cz/w/wmaker-crm.git
-GPL-2
-Fork from the last available CVS version of Window Maker
-
-autotools eutils git libtool multilib portability toolchain-funcs
-gif jpeg nls png tiff modelock +vdesktop xinerama
-
-
-
-3
-
-compile configure install prepare unpack
-
-
-
-
-
diff --git a/x11-wm/windowmaker-crm/Manifest b/x11-wm/windowmaker-crm/Manifest
deleted file mode 100644
index cf7ecf5..0000000
--- a/x11-wm/windowmaker-crm/Manifest
+++ /dev/null
@@ -1,15 +0,0 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-AUX wmaker.desktop 221 RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d SHA1 acd95a41645fbef358459f8f4753056cb321497e SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84
-DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4
-EBUILD windowmaker-crm-9999.ebuild 2663 RMD160 d4959318023a7fe7454774673f648fe327a82dcc SHA1 9bee977639d84f7852b10738c18c8f236232819e SHA256 894a30be8ab8bc0af0eea493af2a4c34109b408dcb2bbc2a3a7cf0c3a0c0519f
-MISC ChangeLog 653 RMD160 184f87bc0c88cdabae0b68b18300ab383efc21dd SHA1 ee95127055080c52727aff780f207e4b365168c6 SHA256 6e58302d9c937e6bebe53f72cfa2022550139d57de5d5acfa3e610dc2cd986ea
-MISC metadata.xml 394 RMD160 b38936f0ba7b057fb41eeab348514bc1ee5a9b29 SHA1 c6207f10ee5f811733c721277dbe9fabe3d16ead SHA256 1b7d1d11e92f67acd47aa9243ae010ea48f55c631fa6b43b025b368b8c03a9ee
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk81OgkACgkQFYEBGcdFJfKbkQD+J+T4xvjS9NrvUS7YV2z/aJlK
-Rz5HG5fNjzSoYpKdR2cBAJKgg/mdijzVgiusqbk+zU8dDjvo4CvxKFBRZJ1AkuEk
-=l4zZ
------END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker-crm/ChangeLog b/x11-wm/windowmaker/ChangeLog
index f56b995..4f7bb8f 100644
--- a/x11-wm/windowmaker-crm/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,7 +1,13 @@
-# ChangeLog for x11-wm/windowmaker-crm
+# ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*windowmaker-9999 (10 Feb 2012)
+
+  10 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +windowmaker-9999.ebuild, +metadata.xml:
+  Rename crm to windowmaker, as this is the official version now
+
   10 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
   windowmaker-crm-9999.ebuild, metadata.xml:
   Update live ebuild from main tree 0.95.1
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
new file mode 100644
index 0000000..2e6c243
--- /dev/null
+++ b/x11-wm/windowmaker/Manifest
@@ -0,0 +1,5 @@
+AUX wmaker.desktop 221 RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d SHA1 acd95a41645fbef358459f8f4753056cb321497e SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84
+DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4
+EBUILD windowmaker-9999.ebuild 2642 RMD160 634729f5b200aef4c463d5067a091fd61b4585a9 SHA1 b7f5c091893284a349af8a56073f8c7c503e2a43 SHA256 9db6f34b339d1c387e337e344cbaeb7a9e160687949840aa85fccc72159d7f45
+MISC ChangeLog 846 RMD160 a0eb8c69d859ecc8ea6b417d53f577931083025b SHA1 13c33865d24a175a46eee7e7c87ee04a6a19f7b3 SHA256 0183e53dc338a4a1ef3b29e7fece330b217c4302d0ac016e1491f5e31b1dfcb0
+MISC metadata.xml 394 RMD160 b38936f0ba7b057fb41eeab348514bc1ee5a9b29 SHA1 c6207f10ee5f811733c721277dbe9fabe3d16ead SHA256 1b7d1d11e92f67acd47aa9243ae010ea48f55c631fa6b43b025b368b8c03a9ee
diff --git a/x11-wm/windowmaker-crm/files/wmaker.desktop b/x11-wm/windowmaker/files/wmaker.desktop
index 1bda476..1bda476 100644
--- a/x11-wm/windowmaker-crm/files/wmaker.desktop
+++ b/x11-wm/windowmaker/files/wmaker.desktop
diff --git a/x11-wm/windowmaker-crm/metadata.xml b/x11-wm/windowmaker/metadata.xml
index 32a7d08..32a7d08 100644
--- a/x11-wm/windowmaker-crm/metadata.xml
+++ b/x11-wm/windowmaker/metadata.xml
diff --git a/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild b/x11-wm/windowmaker/windowmaker-9999.ebuild
index b77428a..502caff 100644
--- a/x11-wm/windowmaker-crm/windowmaker-crm-9999.ebuild
+++ b/x11-wm/windowmaker/windowmaker-9999.ebuild
@@ -27,7 +27,6 @@ DEPEND="media-libs/fontconfig
 	xinerama? ( x11-libs/libXinerama )
 	xrandr? ( x11-libs/libXrandr )"
 RDEPEND="${DEPEND}
-	!x11-wm/windowmaker
 	nls? ( >=sys-devel/gettext-0.10.39 )"
 
 src_unpack() {