enlightenment metadata.xml: standardize

29 files changed, 243 insertions, 262 deletions

diff --git a/app-benchmarks/expedite/metadata.xml b/app-benchmarks/expedite/metadata.xml
index 5e126190070..71cdd725621 100644
--- a/app-benchmarks/expedite/metadata.xml
+++ b/app-benchmarks/expedite/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<herd>enlightenment</herd>
+<herd>enlightenment</herd>
 </pkgmetadata>
diff --git a/app-doc/edox-data/metadata.xml b/app-doc/edox-data/metadata.xml
index a3f922b180c..c8e8ac17862 100644
--- a/app-doc/edox-data/metadata.xml
+++ b/app-doc/edox-data/metadata.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer>
-		<email>vapier@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">enlightenment</remote-id>
-	</upstream>
+<herd>enlightenment</herd>
+<upstream>
+	<remote-id type='sourceforge'>enlightenment</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/dev-games/etrophy/metadata.xml b/dev-games/etrophy/metadata.xml
index 5e126190070..71cdd725621 100644
--- a/dev-games/etrophy/metadata.xml
+++ b/dev-games/etrophy/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<herd>enlightenment</herd>
+<herd>enlightenment</herd>
 </pkgmetadata>
diff --git a/dev-libs/e_dbus/metadata.xml b/dev-libs/e_dbus/metadata.xml
index cbc5ba0dda2..f4d06d2f03d 100644
--- a/dev-libs/e_dbus/metadata.xml
+++ b/dev-libs/e_dbus/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
- <flag name="bluetooth">Enable interfacing with <pkg>net-wireless/bluez</pkg> DBus API.</flag>
- <flag name="ofono">Enable interfacing with <pkg>net-misc/ofono</pkg> DBus API.</flag>
- <flag name="test-binaries">Enable building of test binaries for enabled features</flag>
+	<flag name='bluetooth'>Enable interfacing with <pkg>net-wireless/bluez</pkg> DBus API</flag>
+	<flag name='ofono'>Enable interfacing with <pkg>net-misc/ofono</pkg> DBus API</flag>
+	<flag name='test-binaries'>Enable building of test binaries for enabled features</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/ecore/metadata.xml b/dev-libs/ecore/metadata.xml
index 0d3f182ac50..8ee6a9d751c 100644
--- a/dev-libs/ecore/metadata.xml
+++ b/dev-libs/ecore/metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
- <flag name="ares">Enables support for asynchronous DNS using the <pkg>net-dns/c-ares</pkg> library</flag>
- <flag name="gles">Add gles support to the ecore-evas-wayland module</flag>
- <flag name="glib">Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
- <flag name="xprint">Enable X11 Xprint support</flag>
- <flag name="inotify">Enable support for inotify</flag>
- <flag name="evas">Provides easy to use canvas by gluing <pkg>media-libs/evas</pkg> and various input/output systems.</flag>
- <flag name="tslib">Build with tslib support for touchscreen devices.</flag>
- <flag name="wayland">Add support for <pkg>dev-libs/wayland</pkg></flag>
+	<flag name='ares'>Enables support for asynchronous DNS using the <pkg>net-dns/c-ares</pkg> library</flag>
+	<flag name='gles'>Add gles support to the ecore-evas-wayland module</flag>
+	<flag name='glib'>Enable <pkg>dev-libs/glib</pkg> eventloop support</flag>
+	<flag name='xprint'>Enable X11 Xprint support</flag>
+	<flag name='inotify'>Enable support for inotify</flag>
+	<flag name='evas'>Provides easy to use canvas by gluing <pkg>media-libs/evas</pkg> and various input/output systems</flag>
+	<flag name='tslib'>Build with tslib support for touchscreen devices</flag>
+	<flag name='wayland'>Add support for <pkg>dev-libs/wayland</pkg></flag>
 </use>
 <longdescription>
 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.
-
 </longdescription>
 </pkgmetadata>
diff --git a/dev-libs/eet/metadata.xml b/dev-libs/eet/metadata.xml
index 74563a36db2..bbdb2b21219 100644
--- a/dev-libs/eet/metadata.xml
+++ b/dev-libs/eet/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <longdescription>
diff --git a/dev-libs/eeze/metadata.xml b/dev-libs/eeze/metadata.xml
index a637b6c96b2..c8506d11acd 100644
--- a/dev-libs/eeze/metadata.xml
+++ b/dev-libs/eeze/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
- <flag name="utilities">Install some test utilities for mount/umount support in eeze</flag>
+	<flag name='utilities'>Install some test utilities for mount/umount support in eeze</flag>
 </use>
 </pkgmetadata>
diff --git a/dev-libs/efl/metadata.xml b/dev-libs/efl/metadata.xml
index d5d51f05035..8b04c32ed03 100644
--- a/dev-libs/efl/metadata.xml
+++ b/dev-libs/efl/metadata.xml
@@ -1,29 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<herd>enlightenment</herd>
-	<use>
-		<flag name="bmp">Enable WBMP image loader.</flag>
-		<flag name="drm">Enable DRM engine.</flag>
-		<flag name="eet">Enable Eet image loader.</flag>
-		<flag name="egl">Enable EGL rendering.</flag>
-		<flag name="fribidi">Enable bidirectional text support.</flag>
-		<flag name="gles">Enable the OpenGL ES GL implementation.</flag>
-		<flag name="glib">Enable <pkg>dev-libs/glib</pkg> support.</flag>
-		<flag name="harfbuzz">Enable complex text shaping and layout support.</flag>
-		<flag name="ibus">Enable Intelligent Input Bus.</flag>
-		<flag name="ico">Enable Ico image loader.</flag>
-		<flag name="oldlua">USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
-		<flag name="physics">Enable Bullet physics effects and support.</flag>
-		<flag name="pixman">Enable PixMan for software rendering.</flag>
-		<flag name="ppm">Enable PMAPS image loader.</flag>
-		<flag name="psd">Enable PSD image loader.</flag>
-		<flag name="scim">Enable Smart Common Input Method.</flag>
-		<flag name="tga">Enable Tga image loader.</flag>
-		<flag name="tslib">Enable <pkg>x11-libs/tslib</pkg> for touchscreen events.</flag>
-		<flag name="v4l2">Enable Video4Linux2 support.</flag>
-		<flag name="valgrind">Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
-		<flag name="webp">Enable WebP image loader.</flag>
-		<flag name="xim">Enable X Input Method.</flag>
-	</use>
+<herd>enlightenment</herd>
+<use>
+	<flag name='bmp'>Enable WBMP image loader</flag>
+	<flag name='drm'>Enable DRM engine</flag>
+	<flag name='eet'>Enable Eet image loader</flag>
+	<flag name='egl'>Enable EGL rendering</flag>
+	<flag name='fribidi'>Enable bidirectional text support</flag>
+	<flag name='gles'>Enable the OpenGL ES GL implementation</flag>
+	<flag name='glib'>Enable <pkg>dev-libs/glib</pkg> support</flag>
+	<flag name='harfbuzz'>Enable complex text shaping and layout support</flag>
+	<flag name='ibus'>Enable Intelligent Input Bus</flag>
+	<flag name='ico'>Enable Ico image loader</flag>
+	<flag name='oldlua'>USE <pkg>dev-lang/lua</pkg> instead of <pkg>dev-lang/luajit</pkg></flag>
+	<flag name='physics'>Enable Bullet physics effects and support</flag>
+	<flag name='pixman'>Enable PixMan for software rendering</flag>
+	<flag name='ppm'>Enable PMAPS image loader</flag>
+	<flag name='psd'>Enable PSD image loader</flag>
+	<flag name='scim'>Enable Smart Common Input Method</flag>
+	<flag name='tga'>Enable Tga image loader</flag>
+	<flag name='tslib'>Enable <pkg>x11-libs/tslib</pkg> for touchscreen events</flag>
+	<flag name='v4l2'>Enable Video4Linux2 support</flag>
+	<flag name='valgrind'>Enable usage of <pkg>dev-util/valgrind</pkg> in debug</flag>
+	<flag name='webp'>Enable WebP image loader</flag>
+	<flag name='xim'>Enable X Input Method</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-libs/efreet/metadata.xml b/dev-libs/efreet/metadata.xml
index 99165add909..71cdd725621 100644
--- a/dev-libs/efreet/metadata.xml
+++ b/dev-libs/efreet/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>
diff --git a/dev-libs/eina/metadata.xml b/dev-libs/eina/metadata.xml
index 76fbac87e98..aa9472293ab 100644
--- a/dev-libs/eina/metadata.xml
+++ b/dev-libs/eina/metadata.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
- <flag name="mempool-buddy">Compile "buddy" memory pool allocation.</flag>
- <flag name="mempool-chained-pool">Compile "chained-pool" memory pool allocation.</flag>
- <flag name="mempool-fixed-bitmap">Compile "fixed-bitmap" memory pool allocation.</flag>
- <flag name="mempool-one-big">Compile "one-big" memory pool allocation.</flag>
- <flag name="mempool-pass-through">Compile "pass-through" (system's malloc) memory pool allocation.</flag>
- <flag name="default-mempool">By default use system's allocator (pass-through) instead of custom choice for Eina's own data structures.</flag>
- <flag name="valgrind">Compile in valgrind hints for smoother integration.</flag>
+	<flag name='mempool-buddy'>Compile 'buddy' memory pool allocation</flag>
+	<flag name='mempool-chained-pool'>Compile 'chained-pool' memory pool allocation</flag>
+	<flag name='mempool-fixed-bitmap'>Compile 'fixed-bitmap' memory pool allocation</flag>
+	<flag name='mempool-one-big'>Compile 'one-big' memory pool allocation</flag>
+	<flag name='mempool-pass-through'>Compile 'pass-through' (system's malloc) memory pool allocation</flag>
+	<flag name='default-mempool'>By default use system's allocator (pass-through) instead of custom choice for Eina's own data structures</flag>
+	<flag name='valgrind'>Compile in valgrind hints for smoother integration</flag>
 </use>
 <longdescription>
 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 99165add909..71cdd725621 100644
--- a/dev-libs/eio/metadata.xml
+++ b/dev-libs/eio/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>
diff --git a/dev-libs/embryo/metadata.xml b/dev-libs/embryo/metadata.xml
index d75dabcf86b..0a1f7375fbe 100644
--- a/dev-libs/embryo/metadata.xml
+++ b/dev-libs/embryo/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <longdescription>
diff --git a/media-libs/edje/metadata.xml b/media-libs/edje/metadata.xml
index c360c1c2853..a87f862606e 100644
--- a/media-libs/edje/metadata.xml
+++ b/media-libs/edje/metadata.xml
@@ -1,14 +1,14 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
- <flag name='cache'>Enable caching</flag>
+	<flag name='cache'>Enable caching</flag>
 </use>
 <longdescription>
 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 d6388e48458..a5064e0ec2d 100644
--- a/media-libs/elementary/metadata.xml
+++ b/media-libs/elementary/metadata.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
- <flag name="quicklaunch">Enable quick-launch support</flag>
+	<flag name='quicklaunch'>Enable quick-launch support</flag>
 </use>
 <longdescription>
 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.
 </longdescription>
 </pkgmetadata>
diff --git a/media-libs/emotion/metadata.xml b/media-libs/emotion/metadata.xml
index 282424f678d..1fd15a03a97 100644
--- a/media-libs/emotion/metadata.xml
+++ b/media-libs/emotion/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
- <flag name='vlc'>Enable support for the <pkg>media-video/vlc</pkg> player backend</flag>
+	<flag name='vlc'>Enable support for the <pkg>media-video/vlc</pkg> player backend</flag>
 </use>
 </pkgmetadata>
diff --git a/media-libs/ethumb/metadata.xml b/media-libs/ethumb/metadata.xml
index 031abb11daa..da9ba6b725d 100644
--- a/media-libs/ethumb/metadata.xml
+++ b/media-libs/ethumb/metadata.xml
@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<herd>enlightenment</herd>
-	<use>
-		<flag name='emotion'>Add support for <pkg>media-libs/emotion</pkg></flag>
-	</use>
+<herd>enlightenment</herd>
+<use>
+	<flag name='emotion'>Add support for <pkg>media-libs/emotion</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/media-libs/evas/metadata.xml b/media-libs/evas/metadata.xml
index c52a0f59637..338f21ebb53 100644
--- a/media-libs/evas/metadata.xml
+++ b/media-libs/evas/metadata.xml
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <use>
- <flag name='bmp'>Support windows bitmap (bmp) image loader</flag>
- <flag name='eet'>Support dev-libs/eet</flag>
- <flag name='ico'>Support windows icon (ico) image loader</flag>
- <flag name='gles'>Enable gles flavor of gl instead of standard</flag>
- <flag name='ppm'>Support PPM image loader</flag>
- <flag name='psd'>Support PSD image loader</flag>
- <flag name='tga'>Support tga image loader</flag>
- <flag name='wayland'>Add support for <pkg>dev-libs/wayland</pkg></flag>
+	<flag name='bmp'>Support windows bitmap (bmp) image loader</flag>
+	<flag name='eet'>Support dev-libs/eet</flag>
+	<flag name='ico'>Support windows icon (ico) image loader</flag>
+	<flag name='gles'>Enable gles flavor of gl instead of standard</flag>
+	<flag name='ppm'>Support PPM image loader</flag>
+	<flag name='psd'>Support PSD image loader</flag>
+	<flag name='tga'>Support tga image loader</flag>
+	<flag name='wayland'>Add support for <pkg>dev-libs/wayland</pkg></flag>
 </use>
 <longdescription>
 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 1ca0b12c411..91cf3f1d6b9 100644
--- a/media-libs/fnlib/metadata.xml
+++ b/media-libs/fnlib/metadata.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer>
-		<email>maintainer-needed@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">enlightenment</remote-id>
-	</upstream>
+<maintainer>
+	<email>maintainer-needed@gentoo.org</email>
+</maintainer>
+<upstream>
+	<remote-id type='sourceforge'>enlightenment</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-libs/imlib2/metadata.xml b/media-libs/imlib2/metadata.xml
index 7c38669f7d0..91eab267eaf 100644
--- a/media-libs/imlib2/metadata.xml
+++ b/media-libs/imlib2/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<herd>enlightenment</herd>
-	<longdescription>
+<herd>enlightenment</herd>
+<longdescription>
 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.
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">enlightenment</remote-id>
-	</upstream>
+</longdescription>
+<upstream>
+	<remote-id type='sourceforge'>enlightenment</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/media-plugins/emotion_generic_players/metadata.xml b/media-plugins/emotion_generic_players/metadata.xml
index 99165add909..71cdd725621 100644
--- a/media-plugins/emotion_generic_players/metadata.xml
+++ b/media-plugins/emotion_generic_players/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>
diff --git a/media-plugins/evas_generic_loaders/metadata.xml b/media-plugins/evas_generic_loaders/metadata.xml
index 99165add909..71cdd725621 100644
--- a/media-plugins/evas_generic_loaders/metadata.xml
+++ b/media-plugins/evas_generic_loaders/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 </pkgmetadata>
diff --git a/media-plugins/imlib2_loaders/metadata.xml b/media-plugins/imlib2_loaders/metadata.xml
index efbcc100ad8..58032d56c27 100644
--- a/media-plugins/imlib2_loaders/metadata.xml
+++ b/media-plugins/imlib2_loaders/metadata.xml
@@ -1,17 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer>
-		<email>enlightenment@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="eet">Enable Eet image loader</flag>
-		<flag name="xcf">Enable XCF image loader</flag>
-	</use>
-	<longdescription>
+<herd>enlightenment</herd>
+<use>
+	<flag name='eet'>Enable Eet image loader</flag>
+	<flag name='xcf'>Enable XCF image loader</flag>
+</use>
+<longdescription>
 additional image library loaders for imlib2
-	</longdescription>
-	<upstream>
-		<remote-id type="sourceforge">enlightenment</remote-id>
-	</upstream>
+</longdescription>
+<upstream>
+	<remote-id type='sourceforge'>enlightenment</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-misc/e16keyedit/metadata.xml b/x11-misc/e16keyedit/metadata.xml
index 9e83ca4cde6..222e63a46aa 100644
--- a/x11-misc/e16keyedit/metadata.xml
+++ b/x11-misc/e16keyedit/metadata.xml
@@ -1,13 +1,11 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer>
-		<email>vapier@gentoo.org</email>
-	</maintainer>
-	<longdescription>
+<herd>enlightenment</herd>
+<longdescription>
 This is a standalone keybindings editor for enlightenment version 0.16.
 </longdescription>
-	<upstream>
-		<remote-id type="sourceforge">enlightenment</remote-id>
-	</upstream>
+<upstream>
+	<remote-id type='sourceforge'>enlightenment</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-misc/e16menuedit2/metadata.xml b/x11-misc/e16menuedit2/metadata.xml
index a3f922b180c..c8e8ac17862 100644
--- a/x11-misc/e16menuedit2/metadata.xml
+++ b/x11-misc/e16menuedit2/metadata.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer>
-		<email>vapier@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">enlightenment</remote-id>
-	</upstream>
+<herd>enlightenment</herd>
+<upstream>
+	<remote-id type='sourceforge'>enlightenment</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-plugins/echievements/metadata.xml b/x11-plugins/echievements/metadata.xml
index 5e126190070..71cdd725621 100644
--- a/x11-plugins/echievements/metadata.xml
+++ b/x11-plugins/echievements/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<herd>enlightenment</herd>
+<herd>enlightenment</herd>
 </pkgmetadata>
diff --git a/x11-plugins/epplets/metadata.xml b/x11-plugins/epplets/metadata.xml
index 3e6098cb014..487ff7f62cd 100644
--- a/x11-plugins/epplets/metadata.xml
+++ b/x11-plugins/epplets/metadata.xml
@@ -1,17 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer>
-		<email>vapier@gentoo.org</email>
-	</maintainer>
-	<longdescription>
-Epplets are small, handy Enlightenment applets, similar to "dockapps"
-or "applets" for other packages.  The epplets package contains the
+<herd>enlightenment</herd>
+<longdescription>
+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.
 </longdescription>
-	<upstream>
-		<remote-id type="sourceforge">enlightenment</remote-id>
-	</upstream>
+<upstream>
+	<remote-id type='sourceforge'>enlightenment</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-terms/terminology/metadata.xml b/x11-terms/terminology/metadata.xml
index 55d1435ab6e..f2069a72fe2 100644
--- a/x11-terms/terminology/metadata.xml
+++ b/x11-terms/terminology/metadata.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
 <herd>enlightenment</herd>
 <maintainer>
diff --git a/x11-themes/ethemes/metadata.xml b/x11-themes/ethemes/metadata.xml
index a3f922b180c..c8e8ac17862 100644
--- a/x11-themes/ethemes/metadata.xml
+++ b/x11-themes/ethemes/metadata.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-	<maintainer>
-		<email>vapier@gentoo.org</email>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">enlightenment</remote-id>
-	</upstream>
+<herd>enlightenment</herd>
+<upstream>
+	<remote-id type='sourceforge'>enlightenment</remote-id>
+</upstream>
 </pkgmetadata>
diff --git a/x11-wm/enlightenment/metadata.xml b/x11-wm/enlightenment/metadata.xml
index 2ebc72107bb..d0447601b2a 100644
--- a/x11-wm/enlightenment/metadata.xml
+++ b/x11-wm/enlightenment/metadata.xml
@@ -1,14 +1,77 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-  <maintainer>
-    <email>vapier@gentoo.org</email>
-  </maintainer>
-  <maintainer>
-    <email>enlightenment@gentoo.org</email>
-    <description>Maintainer for enlightenment:0.17</description>
-  </maintainer>
-  <longdescription>
+<herd>enlightenment</herd>
+<use>
+	<flag name='pango'>Enable pango font rendering</flag>
+	<flag name='xrandr'>Enable support for the X xrandr extension</flag>
+	<flag name='udev'>Use sys-fs/udev to determine available devices</flag>
+	<flag name='ukit'>Use upower/udisks to automount devices</flag>
+	<flag name='enlightenment_modules_access'>Accessibility module designed to improve ease of use for the vision impaired and the blind</flag>
+	<flag name='enlightenment_modules_appmenu'>Gadget that hold the toolbar of the foreground application</flag>
+	<flag name='enlightenment_modules_backlight'>Backlight control slider gadget</flag>
+	<flag name='enlightenment_modules_battery'>A gadget to visualize your battery status</flag>
+	<flag name='enlightenment_modules_bluez4'>Configure Bluetooth devices</flag>
+	<flag name='enlightenment_modules_clock'>Nice clock gadget to show current time</flag>
+	<flag name='enlightenment_modules_connman'>Control Wifi and wired networks as a user</flag>
+	<flag name='enlightenment_modules_contact'>Enable the contact module</flag>
+	<flag name='enlightenment_modules_cpufreq'>Gadget to monitor and change the CPU frequency</flag>
+	<flag name='enlightenment_modules_everything'>The run command module provides an application launcher dialog</flag>
+	<flag name='enlightenment_modules_fileman'>Enlightenment's integrated file manager</flag>
+	<flag name='enlightenment_modules_fileman-opinfo'>Can be placed on the desktop or in a shelf</flag>
+	<flag name='enlightenment_modules_gadman'>Module to manage gadgets on the desktop</flag>
+	<flag name='enlightenment_modules_geolocation'>Geolocation</flag>
+	<flag name='enlightenment_modules_ibar'>Iconic application launcher</flag>
+	<flag name='enlightenment_modules_ibox'>A home for your iconified applications</flag>
+	<flag name='enlightenment_modules_illume2'>Illume2 - next generation of illume - special WM mode for embedded devices and set of plugins with same purpose</flag>
+	<flag name='enlightenment_modules_lokker'>Screen locker</flag>
+	<flag name='enlightenment_modules_mixer'>A module to provide a mixer for changing volume</flag>
+	<flag name='enlightenment_modules_msgbus'>DBus Extension</flag>
+	<flag name='enlightenment_modules_music-control'>Control your music in your shelf</flag>
+	<flag name='enlightenment_modules_notification'>notification-daemon alternative. Popup if an event occur</flag>
+	<flag name='enlightenment_modules_packagekit'>Package manager integration</flag>
+	<flag name='enlightenment_modules_pager'>Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
+	<flag name='enlightenment_modules_pager-plain'>A simpler desktop pager</flag>
+	<flag name='enlightenment_modules_policy-mobile'></flag>
+	<flag name='enlightenment_modules_quickaccess'>Enlightenment Quickaccess Launcher</flag>
+	<flag name='enlightenment_modules_shot'>Simple screenshot+save/upload module</flag>
+	<flag name='enlightenment_modules_start'>Enlightenment's 'Start' button equivalent</flag>
+	<flag name='enlightenment_modules_syscon'>This module provides a unified popup dialog for all the system actions in Enlightenment</flag>
+	<flag name='enlightenment_modules_systray'>system tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
+	<flag name='enlightenment_modules_tasks'>Gadget to allow you to switch tasks</flag>
+	<flag name='enlightenment_modules_teamwork'>Enable teamwork module</flag>
+	<flag name='enlightenment_modules_temperature'>Temperature monitor</flag>
+	<flag name='enlightenment_modules_tiling'>Positions/resizes your windows tilingly</flag>
+	<flag name='enlightenment_modules_winlist'>A module to show the list of client applications presently running</flag>
+	<flag name='enlightenment_modules_wizard'>First Run Wizard</flag>
+	<flag name='enlightenment_modules_wl-desktop-shell'>Enlightenment Wayland Desktop Shell</flag>
+	<flag name='enlightenment_modules_wl-drm'>Wayland DRM (Direct Rendering Manager) compositing module</flag>
+	<flag name='enlightenment_modules_wl-screenshot'>Enlightenment Wayland Screenshot module</flag>
+	<flag name='enlightenment_modules_wl-text-input'>Wayland text input support</flag>
+	<flag name='enlightenment_modules_wl-weekeyboard'>Wayland virtual keyboard</flag>
+	<flag name='enlightenment_modules_wl-wl'>Wayland-in-Wayland module</flag>
+	<flag name='enlightenment_modules_wl-x11'>Wayland-in-X11 module</flag>
+	<flag name='enlightenment_modules_xkbswitch'>Keyboard layout configuration and switcher</flag>
+	<flag name='enlightenment_modules_xwayland'>X/Wayland integration</flag>
+	<flag name='enlightenment_modules_conf'>Settings Panel</flag>
+	<flag name='enlightenment_modules_conf-applications'>Allows configuration of Ibar, Restart, and Startup applications</flag>
+	<flag name='enlightenment_modules_conf-bindings'>Input Control Settings</flag>
+	<flag name='enlightenment_modules_conf-comp'>Configure default dialog properties</flag>
+	<flag name='enlightenment_modules_conf-dialogs'>Configure default dialog properties</flag>
+	<flag name='enlightenment_modules_conf-display'>Used to configure your screen</flag>
+	<flag name='enlightenment_modules_conf-interaction'>Configure Mouse and Touch input</flag>
+	<flag name='enlightenment_modules_conf-intl'>Used to select a default language</flag>
+	<flag name='enlightenment_modules_conf-menus'>Configures menu behavior</flag>
+	<flag name='enlightenment_modules_conf-paths'>Specifies the Enlightenment search paths and default directories</flag>
+	<flag name='enlightenment_modules_conf-performance'>Used to configure certain performance related items as frame rates and cache settings</flag>
+	<flag name='enlightenment_modules_conf-randr'>Used to configure your screen's resolution</flag>
+	<flag name='enlightenment_modules_conf-shelves'>Shelf configuration dialog</flag>
+	<flag name='enlightenment_modules_conf-theme'>Used to configure your theme preferences</flag>
+	<flag name='enlightenment_modules_conf-wallpaper2'>Used to configure your theme preferences</flag>
+	<flag name='enlightenment_modules_conf-window-manipulation'>Configures window raise, resistance, and maximize policies</flag>
+	<flag name='enlightenment_modules_conf-window-remembers'>Delete existing window remembers</flag>
+</use>
+<longdescription>
 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.
 </longdescription>
-  <use>
-    <flag name="pango">Enable pango font rendering</flag>
-    <flag name="xrandr">Enable support for the X xrandr extension</flag>
-    <flag name="udev">Use sys-fs/udev to determine available devices</flag>
-    <flag name="ukit">Use upower/udisks to automount devices</flag>
-    <flag name="enlightenment_modules_access">Accessibility module designed to improve ease of use for the vision impaired and the blind</flag>
-    <flag name="enlightenment_modules_appmenu">Gadget that hold the toolbar of the foreground application</flag>
-    <flag name="enlightenment_modules_backlight">Backlight control slider gadget</flag>
-    <flag name="enlightenment_modules_battery">A gadget to visualize your battery status</flag>
-    <flag name="enlightenment_modules_bluez4">Configure Bluetooth devices</flag>
-    <flag name="enlightenment_modules_clock">Nice clock gadget to show current time</flag>
-    <flag name="enlightenment_modules_connman">Control Wifi and wired networks as a user</flag>
-    <flag name="enlightenment_modules_contact">Enable the contact module</flag>
-    <flag name="enlightenment_modules_cpufreq">Gadget to monitor and change the CPU frequency</flag>
-    <flag name="enlightenment_modules_everything">The run command module provides an application launcher dialog</flag>
-    <flag name="enlightenment_modules_fileman">Enlightenment's integrated file manager</flag>
-    <flag name="enlightenment_modules_fileman-opinfo">Can be placed on the desktop or in a shelf</flag>
-    <flag name="enlightenment_modules_gadman">Module to manage gadgets on the desktop</flag>
-    <flag name="enlightenment_modules_geolocation">Geolocation</flag>
-    <flag name="enlightenment_modules_ibar">Iconic application launcher</flag>
-    <flag name="enlightenment_modules_ibox">A home for your iconified applications</flag>
-    <flag name="enlightenment_modules_illume2">Illume2 - next generation of illume - special WM mode for embedded devices and set of plugins with same purpose</flag>
-    <flag name="enlightenment_modules_lokker">Screen locker</flag>
-    <flag name="enlightenment_modules_mixer">A module to provide a mixer for changing volume</flag>
-    <flag name="enlightenment_modules_msgbus">DBus Extension</flag>
-    <flag name="enlightenment_modules_music-control">Control your music in your shelf</flag>
-    <flag name="enlightenment_modules_notification">notification-daemon alternative. Popup if an event occur</flag>
-    <flag name="enlightenment_modules_packagekit">Package manager integration</flag>
-    <flag name="enlightenment_modules_pager">Gadget to allow you to visualize your virtual desktops and the windows they contain</flag>
-    <flag name="enlightenment_modules_pager-plain">A simpler desktop pager</flag>
-    <flag name="enlightenment_modules_policy-mobile"></flag>
-    <flag name="enlightenment_modules_quickaccess">Enlightenment Quickaccess Launcher</flag>
-    <flag name="enlightenment_modules_shot">Simple screenshot+save/upload module</flag>
-    <flag name="enlightenment_modules_start">Enlightenment's "Start" button equivalent</flag>
-    <flag name="enlightenment_modules_syscon">This module provides a unified popup dialog for all the system actions in Enlightenment</flag>
-    <flag name="enlightenment_modules_systray">system tray that hold applications icons like Skype, Pidgin, Kopete and others</flag>
-    <flag name="enlightenment_modules_tasks">Gadget to allow you to switch tasks</flag>
-    <flag name="enlightenment_modules_teamwork">Enable teamwork module</flag>
-    <flag name="enlightenment_modules_temperature">Temperature monitor</flag>
-    <flag name="enlightenment_modules_tiling">Positions/resizes your windows tilingly</flag>
-    <flag name="enlightenment_modules_winlist">A module to show the list of client applications presently running</flag>
-    <flag name="enlightenment_modules_wizard">First Run Wizard</flag>
-    <flag name="enlightenment_modules_wl-desktop-shell">Enlightenment Wayland Desktop Shell</flag>
-    <flag name="enlightenment_modules_wl-drm">Wayland DRM (Direct Rendering Manager) compositing module</flag>
-    <flag name="enlightenment_modules_wl-screenshot">Enlightenment Wayland Screenshot module</flag>
-    <flag name="enlightenment_modules_wl-text-input">Wayland text input support</flag>
-    <flag name="enlightenment_modules_wl-weekeyboard">Wayland virtual keyboard</flag>
-    <flag name="enlightenment_modules_wl-wl">Wayland-in-Wayland module</flag>
-    <flag name="enlightenment_modules_wl-x11">Wayland-in-X11 module</flag>
-    <flag name="enlightenment_modules_xkbswitch">Keyboard layout configuration and switcher</flag>
-    <flag name="enlightenment_modules_xwayland">X/Wayland integration</flag>
-    <flag name="enlightenment_modules_conf">Settings Panel</flag>
-    <flag name="enlightenment_modules_conf-applications">Allows configuration of Ibar, Restart, and Startup applications</flag>
-    <flag name="enlightenment_modules_conf-bindings">Input Control Settings</flag>
-    <flag name="enlightenment_modules_conf-comp">Configure default dialog properties</flag>
-    <flag name="enlightenment_modules_conf-dialogs">Configure default dialog properties</flag>
-    <flag name="enlightenment_modules_conf-display">Used to configure your screen</flag>
-    <flag name="enlightenment_modules_conf-interaction">Configure Mouse and Touch input</flag>
-    <flag name="enlightenment_modules_conf-intl">Used to select a default language</flag>
-    <flag name="enlightenment_modules_conf-menus">Configures menu behavior</flag>
-    <flag name="enlightenment_modules_conf-paths">Specifies the Enlightenment search paths and default directories</flag>
-    <flag name="enlightenment_modules_conf-performance">Used to configure certain performance related items as frame rates and cache settings</flag>
-    <flag name="enlightenment_modules_conf-randr">Used to configure your screen's resolution</flag>
-    <flag name="enlightenment_modules_conf-shelves">Shelf configuration dialog</flag>
-    <flag name="enlightenment_modules_conf-theme">Used to configure your theme preferences</flag>
-    <flag name="enlightenment_modules_conf-wallpaper2">Used to configure your theme preferences</flag>
-    <flag name="enlightenment_modules_conf-window-manipulation">Configures window raise, resistance, and maximize policies</flag>
-    <flag name="enlightenment_modules_conf-window-remembers">Delete existing window remembers</flag>
-  </use>
-  <upstream>
-    <remote-id type="sourceforge">enlightenment</remote-id>
-  </upstream>
+<upstream>
+	<remote-id type='sourceforge'>enlightenment</remote-id>
+</upstream>
 </pkgmetadata>