8 files changed, 69 insertions, 26 deletions
diff --git a/net-p2p/amule/metadata.xml b/net-p2p/amule/metadata.xml
index aa0f3664825f..3a6295810631 100644
--- a/net-p2p/amule/metadata.xml
+++ b/net-p2p/amule/metadata.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
+  <herd>net-p2p</herd>
+  <use>
+    <flag name="daemon">Enable amule daemon</flag>
+    <flag name="remote">Enable remote controlling of the client</flag>
+    <flag name="stats">Enable statistic reporting</flag>
+    <flag name="upnp">Enables support for Intel UPnP stack.</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-p2p/btg/metadata.xml b/net-p2p/btg/metadata.xml
index 47aad25f455e..a1c375499a3a 100644
--- a/net-p2p/btg/metadata.xml
+++ b/net-p2p/btg/metadata.xml
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>no-herd</herd>
-	<maintainer>
-		<email>angelos@gentoo.org</email>
-		<name>Christoph Mende</name>
-	</maintainer>
+  <herd>no-herd</herd>
+  <maintainer>
+    <email>angelos@gentoo.org</email>
+    <name>Christoph Mende</name>
+  </maintainer>
+  <use>
+    <flag name="event-callback">Enable calling a script or executable for certain events</flag>
+    <flag name="upnp">Enables support for Intel UPnP stack.</flag>
+    <flag name="webinterface">install webBTG</flag>
+  </use>
 </pkgmetadata>
-
diff --git a/net-p2p/dbhub/metadata.xml b/net-p2p/dbhub/metadata.xml
index aa0f3664825f..e0dc61216c84 100644
--- a/net-p2p/dbhub/metadata.xml
+++ b/net-p2p/dbhub/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
+  <herd>net-p2p</herd>
+  <use>
+    <flag name="switch_user">Enable support for switching user</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-p2p/gift/metadata.xml b/net-p2p/gift/metadata.xml
index c8bafd42f27b..58abf52dc94e 100644
--- a/net-p2p/gift/metadata.xml
+++ b/net-p2p/gift/metadata.xml
@@ -1,8 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
-<maintainer>
-  <email>net-p2p@gentoo.org</email>
-</maintainer>
+  <herd>net-p2p</herd>
+  <maintainer>
+    <email>net-p2p@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="ares">pull in Ares plugin</flag>
+    <flag name="fasttrack">pull in FastTrack plugin</flag>
+    <flag name="gnutella">pull in Gnutella plugin</flag>
+    <flag name="openft">pull in OpenFT plugin</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-p2p/kmldonkey/metadata.xml b/net-p2p/kmldonkey/metadata.xml
index 8d1e86a9cefb..cf4170c12076 100644
--- a/net-p2p/kmldonkey/metadata.xml
+++ b/net-p2p/kmldonkey/metadata.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
+  <herd>kde</herd>
+  <use>
+    <flag name="plasma">Build optional plasma widgets.</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-p2p/ktorrent/metadata.xml b/net-p2p/ktorrent/metadata.xml
index c081196779aa..f20859c2669c 100644
--- a/net-p2p/ktorrent/metadata.xml
+++ b/net-p2p/ktorrent/metadata.xml
@@ -1,10 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>kde</herd>
-<herd>net-p2p</herd>
-<maintainer>
-	<email>deathwing00@gentoo.org</email>
-	<name>deathwing00</name>
-</maintainer>
+  <herd>kde</herd>
+  <herd>net-p2p</herd>
+  <maintainer>
+    <email>deathwing00@gentoo.org</email>
+    <name>deathwing00</name>
+  </maintainer>
+  <use>
+    <flag name="bwscheduler">Enable the bwscheduler plugin</flag>
+    <flag name="infowidget">Enable the infowidget plugin</flag>
+    <flag name="ipfilter">Enable the ipfilter plugin</flag>
+    <flag name="logviewer">Enable the logviewer plugin</flag>
+    <flag name="scanfolder">Enable the scanfolder plugin</flag>
+    <flag name="search">Enable the search plugin</flag>
+    <flag name="stats">Enable the statistics plugin</flag>
+    <flag name="upnp">Enable the uphp plugin</flag>
+    <flag name="webinterface">Enable the webinterface plugin</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-p2p/mldonkey/metadata.xml b/net-p2p/mldonkey/metadata.xml
index fb26f9f9c409..ad6ba14e38ca 100644
--- a/net-p2p/mldonkey/metadata.xml
+++ b/net-p2p/mldonkey/metadata.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
-<longdescription>An ocaml client to access the eDonkey network.</longdescription>
+  <herd>net-p2p</herd>
+  <longdescription>An ocaml client to access the eDonkey network.</longdescription>
+  <use>
+    <flag name="fasttrack">enable fasttrack support</flag>
+    <flag name="gnutella">enable gnutella and gnutella2 support</flag>
+    <flag name="guionly">enable client build only</flag>
+    <flag name="magic">enable use of libmagic</flag>
+  </use>
 </pkgmetadata>
diff --git a/net-p2p/museek+/metadata.xml b/net-p2p/museek+/metadata.xml
index 33cdd7e9857a..9ef7e6361723 100644
--- a/net-p2p/museek+/metadata.xml
+++ b/net-p2p/museek+/metadata.xml
@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>net-p2p</herd>
-<maintainer>
-<email>coldwind@gentoo.org</email>
-<name>Santiago M. Mola</name>
-</maintainer>
+  <herd>net-p2p</herd>
+  <maintainer>
+    <email>coldwind@gentoo.org</email>
+    <name>Santiago M. Mola</name>
+  </maintainer>
+  <use>
+    <flag name="qsa">Enable QSA scripting for museeq</flag>
+    <flag name="trayicon">Enable support for trayicon</flag>
+  </use>
 </pkgmetadata>