diff --git a/app-benchmarks/expedite/metadata.xml b/app-benchmarks/expedite/metadata.xml
index 5e12619007090..71cdd7256211c 100644
--- a/app-benchmarks/expedite/metadata.xml
+++ b/app-benchmarks/expedite/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
- enlightenment
+enlightenment
diff --git a/app-doc/edox-data/metadata.xml b/app-doc/edox-data/metadata.xml
index a3f922b180c65..c8e8ac178626b 100644
--- a/app-doc/edox-data/metadata.xml
+++ b/app-doc/edox-data/metadata.xml
@@ -1,10 +1,8 @@
-
-
+
+
-
- vapier@gentoo.org
-
-
- enlightenment
-
+enlightenment
+
+ enlightenment
+
diff --git a/dev-games/etrophy/metadata.xml b/dev-games/etrophy/metadata.xml
index 5e12619007090..71cdd7256211c 100644
--- a/dev-games/etrophy/metadata.xml
+++ b/dev-games/etrophy/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
- enlightenment
+enlightenment
diff --git a/dev-libs/e_dbus/metadata.xml b/dev-libs/e_dbus/metadata.xml
index cbc5ba0dda2fe..f4d06d2f03d40 100644
--- a/dev-libs/e_dbus/metadata.xml
+++ b/dev-libs/e_dbus/metadata.xml
@@ -1,10 +1,10 @@
-
-
+
+
enlightenment
diff --git a/dev-libs/ecore/metadata.xml b/dev-libs/ecore/metadata.xml
index 0d3f182ac50c0..8ee6a9d751c18 100644
--- a/dev-libs/ecore/metadata.xml
+++ b/dev-libs/ecore/metadata.xml
@@ -1,16 +1,16 @@
-
-
+
+
enlightenment
Ecore is a clean and tiny event loop library with many modules to do
@@ -62,6 +62,5 @@ Ecore may provide (if enabled) the following libraries:
with different input methods such as virtual keyboards;
* ecore_input, ecore_input_evas: abstraction of input events.
-
diff --git a/dev-libs/eet/metadata.xml b/dev-libs/eet/metadata.xml
index 74563a36db2a3..bbdb2b21219bb 100644
--- a/dev-libs/eet/metadata.xml
+++ b/dev-libs/eet/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
enlightenment
diff --git a/dev-libs/eeze/metadata.xml b/dev-libs/eeze/metadata.xml
index a637b6c96b250..c8506d11acd16 100644
--- a/dev-libs/eeze/metadata.xml
+++ b/dev-libs/eeze/metadata.xml
@@ -1,8 +1,8 @@
-
-
+
+
enlightenment
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index d5d51f0503525..8b04c32ed03b9 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -1,29 +1,29 @@
-
-
+
+
- enlightenment
-
+enlightenment
+
diff --git a/dev-libs/efreet/metadata.xml b/dev-libs/efreet/metadata.xml
index 99165add909fb..71cdd7256211c 100644
--- a/dev-libs/efreet/metadata.xml
+++ b/dev-libs/efreet/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
enlightenment
diff --git a/dev-libs/eina/metadata.xml b/dev-libs/eina/metadata.xml
index 76fbac87e982c..aa9472293ab60 100644
--- a/dev-libs/eina/metadata.xml
+++ b/dev-libs/eina/metadata.xml
@@ -1,15 +1,15 @@
-
-
+
+
enlightenment
Eina is a multi-platform library that provides optimized data types
@@ -46,7 +46,7 @@ As for tools, it provides couple of convenience:
* generic safety-checks system covering NULL pointers and other
incorrect conditions with logging;
- * "magic" type checking that check and logs if expected magic number
+ * 'magic' type checking that check and logs if expected magic number
is incorrect;
* easy to use and extensible memory allocators (mempools);
diff --git a/dev-libs/eio/metadata.xml b/dev-libs/eio/metadata.xml
index 99165add909fb..71cdd7256211c 100644
--- a/dev-libs/eio/metadata.xml
+++ b/dev-libs/eio/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
enlightenment
diff --git a/dev-libs/embryo/metadata.xml b/dev-libs/embryo/metadata.xml
index d75dabcf86ba3..0a1f7375fbe3f 100644
--- a/dev-libs/embryo/metadata.xml
+++ b/dev-libs/embryo/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
enlightenment
diff --git a/media-libs/edje/metadata.xml b/media-libs/edje/metadata.xml
index c360c1c285368..a87f862606e58 100644
--- a/media-libs/edje/metadata.xml
+++ b/media-libs/edje/metadata.xml
@@ -1,14 +1,14 @@
-
-
+
+
enlightenment
Edje is a complex graphical design and layout library.
-It's purpose is to be a sequel to "Ebits" which to date has serviced the needs of
+It's purpose is to be a sequel to 'Ebits' which to date has serviced the needs of
Enlightenment development for version 0.17. The original design paramteres under
which Ebits came about were a lot more restricted than the resulting use of them,
thus Edje was born.
@@ -33,7 +33,7 @@ collection, allowing for the sharing of data betwene display elements). Each par
collection consists of a list of visual parts, as well as a list of programs. A
program is a conditionally run program that if a particular event occurs (a button
is pressed, a mouse enters or leaves a part) will trigger an action that may affect
-other parts. In this way a part collection can be "programmed" via its file as to
+other parts. In this way a part collection can be 'programmed' via its file as to
hilight buttons when the mouse passes over them or show hidden parts when a button
is clicked somewhere etc. The actions performed in changing from one state to
another ar also allowed to transition over a period of time, allowing animation.
diff --git a/media-libs/elementary/metadata.xml b/media-libs/elementary/metadata.xml
index d6388e484588b..a5064e0ec2dec 100644
--- a/media-libs/elementary/metadata.xml
+++ b/media-libs/elementary/metadata.xml
@@ -1,9 +1,9 @@
-
-
+
+
enlightenment
Elementary is a widget set. It is a new-style of widget set much more
@@ -11,9 +11,9 @@ canvas object based than anything else. Why not ETK? Why not EWL? Well
they both tend to veer away from the core of Evas, Ecore and Edje a
lot to build their own worlds. Also I wanted something focused on
embedded devices - specifically small touchscreens. Unlike GTK+ and
-Qt, 75% of the "widget set" is already embodied in a common core -
+Qt, 75% of the 'widget set' is already embodied in a common core -
Ecore, Edje, Evas etc. So this fine-grained library splitting means
-all of this is shared, just a new widget "personality" is on top. And
+all of this is shared, just a new widget 'personality' is on top. And
that is... Elementary, my dear watson. Elementary.
diff --git a/media-libs/emotion/metadata.xml b/media-libs/emotion/metadata.xml
index 282424f678d20..1fd15a03a9782 100644
--- a/media-libs/emotion/metadata.xml
+++ b/media-libs/emotion/metadata.xml
@@ -1,8 +1,8 @@
-
-
+
+
enlightenment
diff --git a/media-libs/ethumb/metadata.xml b/media-libs/ethumb/metadata.xml
index 031abb11daaf9..da9ba6b725d80 100644
--- a/media-libs/ethumb/metadata.xml
+++ b/media-libs/ethumb/metadata.xml
@@ -1,8 +1,8 @@
-
-
+
+
- enlightenment
-
+enlightenment
+
diff --git a/media-libs/evas/metadata.xml b/media-libs/evas/metadata.xml
index c52a0f5963721..338f21ebb5399 100644
--- a/media-libs/evas/metadata.xml
+++ b/media-libs/evas/metadata.xml
@@ -1,16 +1,16 @@
-
-
+
+
enlightenment
Evas is a hardware-accelerated canvas API for X-Windows that can draw
diff --git a/media-libs/fnlib/metadata.xml b/media-libs/fnlib/metadata.xml
index 1ca0b12c411e6..91cf3f1d6b986 100644
--- a/media-libs/fnlib/metadata.xml
+++ b/media-libs/fnlib/metadata.xml
@@ -1,10 +1,10 @@
-
-
+
+
-
- maintainer-needed@gentoo.org
-
-
- enlightenment
-
+
+ maintainer-needed@gentoo.org
+
+
+ enlightenment
+
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 7c38669f7d005..91eab267eafdb 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,8 +1,8 @@
-
+
- enlightenment
-
+enlightenment
+
Imlib 2 is the successor to Imlib. It is not just a newer version - it is a
completely new library. Imlib2 can be installed alongside Imlib 1.x without any
problems since they are effectively different libraries - but they Have very
@@ -44,8 +44,8 @@ Imlib 2 can run without a display, so it can be easily used for background image
processing for web sites or servers - it only requires the X libraries to be
installed - that is all - it does not require an XServer to run unless you wish
to display images.
-
-
- enlightenment
-
+
+
+ enlightenment
+
diff --git a/media-plugins/emotion_generic_players/metadata.xml b/media-plugins/emotion_generic_players/metadata.xml
index 99165add909fb..71cdd7256211c 100644
--- a/media-plugins/emotion_generic_players/metadata.xml
+++ b/media-plugins/emotion_generic_players/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
enlightenment
diff --git a/media-plugins/evas_generic_loaders/metadata.xml b/media-plugins/evas_generic_loaders/metadata.xml
index 99165add909fb..71cdd7256211c 100644
--- a/media-plugins/evas_generic_loaders/metadata.xml
+++ b/media-plugins/evas_generic_loaders/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
enlightenment
diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index efbcc100ad82a..58032d56c272c 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,17 +1,15 @@
-
+
-
- enlightenment@gentoo.org
-
-
-
+enlightenment
+
+
additional image library loaders for imlib2
-
-
- enlightenment
-
+
+
+ enlightenment
+
diff --git a/x11-misc/e16keyedit/metadata.xml b/x11-misc/e16keyedit/metadata.xml
index 9e83ca4cde6d7..222e63a46aaad 100644
--- a/x11-misc/e16keyedit/metadata.xml
+++ b/x11-misc/e16keyedit/metadata.xml
@@ -1,13 +1,11 @@
-
-
+
+
-
- vapier@gentoo.org
-
-
+enlightenment
+
This is a standalone keybindings editor for enlightenment version 0.16.
-
- enlightenment
-
+
+ enlightenment
+
diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml
index a3f922b180c65..c8e8ac178626b 100644
--- a/x11-misc/e16menuedit2/metadata.xml
+++ b/x11-misc/e16menuedit2/metadata.xml
@@ -1,10 +1,8 @@
-
-
+
+
-
- vapier@gentoo.org
-
-
- enlightenment
-
+enlightenment
+
+ enlightenment
+
diff --git a/x11-plugins/echievements/metadata.xml b/x11-plugins/echievements/metadata.xml
index 5e12619007090..71cdd7256211c 100644
--- a/x11-plugins/echievements/metadata.xml
+++ b/x11-plugins/echievements/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
- enlightenment
+enlightenment
diff --git a/x11-plugins/epplets/metadata.xml b/x11-plugins/epplets/metadata.xml
index 3e6098cb01445..487ff7f62cd41 100644
--- a/x11-plugins/epplets/metadata.xml
+++ b/x11-plugins/epplets/metadata.xml
@@ -1,17 +1,15 @@
-
-
+
+
-
- vapier@gentoo.org
-
-
-Epplets are small, handy Enlightenment applets, similar to "dockapps"
-or "applets" for other packages. The epplets package contains the
+enlightenment
+
+Epplets are small, handy Enlightenment applets, similar to 'dockapps'
+or 'applets' for other packages. The epplets package contains the
base epplet API library and header files, as well as the core set of
epplets, including CPU monitors, clocks, a mail checker, mixers, a
slideshow, a URL grabber, a panel-like toolbar, and more.
-
- enlightenment
-
+
+ enlightenment
+
diff --git a/x11-terms/terminology/metadata.xml b/x11-terms/terminology/metadata.xml
index 55d1435ab6eb3..f2069a72fe2c0 100644
--- a/x11-terms/terminology/metadata.xml
+++ b/x11-terms/terminology/metadata.xml
@@ -1,5 +1,5 @@
-
-
+
+
enlightenment
diff --git a/x11-themes/ethemes/metadata.xml b/x11-themes/ethemes/metadata.xml
index a3f922b180c65..c8e8ac178626b 100644
--- a/x11-themes/ethemes/metadata.xml
+++ b/x11-themes/ethemes/metadata.xml
@@ -1,10 +1,8 @@
-
-
+
+
-
- vapier@gentoo.org
-
-
- enlightenment
-
+enlightenment
+
+ enlightenment
+
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index 2ebc72107bbb6..d0447601b2a74 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -1,14 +1,77 @@
-
-
+
+
-
- vapier@gentoo.org
-
-
- enlightenment@gentoo.org
- Maintainer for enlightenment:0.17
-
-
+enlightenment
+
+
Enlightenment is a completely themeable, highly configurable Window Manager for
the X Window System, traditionally used in Unix environments.
@@ -50,76 +113,7 @@ Enlightenment Features:
* Window auto-cleanup support
* Graphical on-line help.
-
-
- enlightenment
-
+
+ enlightenment
+