--- perl_ldap.orig	2007-10-21 14:09:38.000000000 +0000
+++ perl_ldap	2007-10-21 14:47:28.000000000 +0000
@@ -427,7 +427,26 @@
         } else {
           $userinfo .= '    <pgpkey>'.$_->get_value('gpgkey').'</pgpkey>'."\n";
         }
-        $userinfo .= '    <email role="gentoo">'.$_->get_value('uid').'@gentoo.org'.'</email>'."\n";
+        my @mail = $_->get_value('mail');
+        my $address;
+
+        foreach $address (@mail) {
+          # if $user is still active, his @gentoo.org address is the "gentoo" one
+          if ( ($_->get_value('gentooStatus') eq 'active') && ("$address" =~ "\@gentoo\.org") )
+          {
+            $userinfo .= '    <email role="gentoo">'.$address.'</email>'."\n";
+          }
+          # if $user is still active, his non @gentoo.org is "secondary"
+          if ( ($_->get_value('gentooStatus') eq 'active') && ("$address" !~ "\@gentoo\.org") )
+          {
+            $userinfo .= '    <email role="secondary">'.$address.'</email>'."\n";
+          }
+          # if $user is retired, we simply ignore his @gentoo.org
+          if ( ($_->get_value('gentooStatus') eq 'retired') && ("$address" !~ "\@gentoo\.org") )
+          {
+            $userinfo .= '    <email role="secondary">'.$address.'</email>'."\n";
+          }
+        }
         if(!defined($_->get_value('gentooJoin')) || ($_->get_value('gentooJoin') eq 'undefined'))
         {
           $userinfo .= '    <joined/>'."\n";