diff --git a/acct-group/simplevirt/metadata.xml b/acct-group/simplevirt/metadata.xml
index 50a821d8b2dcd..7a38bb9009641 100644
--- a/acct-group/simplevirt/metadata.xml
+++ b/acct-group/simplevirt/metadata.xml
@@ -1,8 +1,5 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
diff --git a/app-backup/tarsnap/metadata.xml b/app-backup/tarsnap/metadata.xml
index b246aa907c620..43ee2fc0c7a32 100644
--- a/app-backup/tarsnap/metadata.xml
+++ b/app-backup/tarsnap/metadata.xml
@@ -5,8 +5,4 @@
whissi@gentoo.org
Thomas Deutschmann
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
diff --git a/app-emulation/simplevirt/metadata.xml b/app-emulation/simplevirt/metadata.xml
index e45e3daf442e9..37f1f5f77e60f 100644
--- a/app-emulation/simplevirt/metadata.xml
+++ b/app-emulation/simplevirt/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
rafael@rafaelmartins.eng.br
diff --git a/app-portage/distpatch/metadata.xml b/app-portage/distpatch/metadata.xml
index 523e399922959..16241be40ac4a 100644
--- a/app-portage/distpatch/metadata.xml
+++ b/app-portage/distpatch/metadata.xml
@@ -1,10 +1,7 @@
-
+
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
rafaelmartins@gentoo.org
diff --git a/app-portage/g-octave/metadata.xml b/app-portage/g-octave/metadata.xml
index 0ba35678266af..2c8e03f93628c 100644
--- a/app-portage/g-octave/metadata.xml
+++ b/app-portage/g-octave/metadata.xml
@@ -1,10 +1,6 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
sci-mathematics@gentoo.org
Gentoo Mathematics Project
diff --git a/app-text/blogc/metadata.xml b/app-text/blogc/metadata.xml
index 410777d2e89bb..a650b4e025bde 100644
--- a/app-text/blogc/metadata.xml
+++ b/app-text/blogc/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
rafael@rafaelmartins.eng.br
diff --git a/app-text/peg-markdown/metadata.xml b/app-text/peg-markdown/metadata.xml
index e8f120ba50186..e22fa2dfac69b 100644
--- a/app-text/peg-markdown/metadata.xml
+++ b/app-text/peg-markdown/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
jgm/peg-markdown
diff --git a/dev-embedded/cpik/metadata.xml b/dev-embedded/cpik/metadata.xml
index b8d0988614f86..b2223b8bc902a 100644
--- a/dev-embedded/cpik/metadata.xml
+++ b/dev-embedded/cpik/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
CPIK (the C compiler for PIC18 devices) is released under the GPL licence.
CPIK is an easy to use, near ANSI C compiler which is fully integrated with
diff --git a/dev-embedded/nodemcu-uploader/metadata.xml b/dev-embedded/nodemcu-uploader/metadata.xml
index e10bca727d5ed..68bb460bf72d8 100644
--- a/dev-embedded/nodemcu-uploader/metadata.xml
+++ b/dev-embedded/nodemcu-uploader/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
nodemcu-uploader
kmpm/nodemcu-uploader
diff --git a/dev-libs/fcgi/metadata.xml b/dev-libs/fcgi/metadata.xml
index 40684197763ed..4c2500de9aa78 100644
--- a/dev-libs/fcgi/metadata.xml
+++ b/dev-libs/fcgi/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
diff --git a/dev-libs/squareball/metadata.xml b/dev-libs/squareball/metadata.xml
index 4b2e3e78af5b5..e2c84284737bb 100644
--- a/dev-libs/squareball/metadata.xml
+++ b/dev-libs/squareball/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
rafael@rafaelmartins.eng.br
diff --git a/dev-python/falcon/metadata.xml b/dev-python/falcon/metadata.xml
index d7035d2605e03..eaf3015e2fca8 100644
--- a/dev-python/falcon/metadata.xml
+++ b/dev-python/falcon/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
diff --git a/dev-util/cram/metadata.xml b/dev-util/cram/metadata.xml
index 324041586322d..01f9e43464e11 100644
--- a/dev-util/cram/metadata.xml
+++ b/dev-util/cram/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
Cram is a functional testing framework for command line applications.
Cram tests look like snippets of interactive shell sessions. Cram
diff --git a/dev-util/peg/metadata.xml b/dev-util/peg/metadata.xml
index 50a821d8b2dcd..7a38bb9009641 100644
--- a/dev-util/peg/metadata.xml
+++ b/dev-util/peg/metadata.xml
@@ -1,8 +1,5 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
diff --git a/dev-vcs/fossil/metadata.xml b/dev-vcs/fossil/metadata.xml
index b96ecf35bd4d7..d163758371b86 100644
--- a/dev-vcs/fossil/metadata.xml
+++ b/dev-vcs/fossil/metadata.xml
@@ -1,10 +1,6 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
titanofold@gentoo.org
Aaron W. Swenson
diff --git a/dev-vcs/github-pages-publish/metadata.xml b/dev-vcs/github-pages-publish/metadata.xml
index 725d129c2da62..3752822661a56 100644
--- a/dev-vcs/github-pages-publish/metadata.xml
+++ b/dev-vcs/github-pages-publish/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
rafaelmartins@gentoo.org
diff --git a/media-sound/marrie/metadata.xml b/media-sound/marrie/metadata.xml
index 60b6d1b485e47..2e59b5ed0d01f 100644
--- a/media-sound/marrie/metadata.xml
+++ b/media-sound/marrie/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
rafael@rafaelmartins.eng.br
diff --git a/net-libs/balde-markdown/metadata.xml b/net-libs/balde-markdown/metadata.xml
index ff927b8ddd523..9ca744f5f877c 100644
--- a/net-libs/balde-markdown/metadata.xml
+++ b/net-libs/balde-markdown/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
rafaelmartins@gentoo.org
diff --git a/net-libs/balde/metadata.xml b/net-libs/balde/metadata.xml
index 0f38d300d55be..025fb278e9ddf 100644
--- a/net-libs/balde/metadata.xml
+++ b/net-libs/balde/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
rafaelmartins@gentoo.org
diff --git a/www-apps/blohg/metadata.xml b/www-apps/blohg/metadata.xml
index 0c2e5695ad78b..c7137f08c10f9 100644
--- a/www-apps/blohg/metadata.xml
+++ b/www-apps/blohg/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
blohg is a Mercurial (or Git) based blogging engine written in Python,
built with the Flask micro-framework and some of his available extensions.
diff --git a/www-apps/cgisysinfo/metadata.xml b/www-apps/cgisysinfo/metadata.xml
index 44c61e61b12e0..165bafac9afe3 100644
--- a/www-apps/cgisysinfo/metadata.xml
+++ b/www-apps/cgisysinfo/metadata.xml
@@ -1,10 +1,7 @@
-
- rafaelmartins@gentoo.org
- Rafael G. Martins
-
+
cgisysinfo is a small CGI utility to show basic system information on Linux
machines.