Current state

diff --git a/make.conf b/make.conf
index 036157e7fddfec3d15994ab65e0002327bc8fcb1..95e210b0adfd29091f44bd4a1dc3f9bb82164124 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -13,13 +13,13 @@ CHOST="x86_64-pc-linux-gnu"
 # profile used for building.
 USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi curl cvs \
      djvu doc examples expat fam fastcgi fontconfig ftp gd gif git gmp \
-     gnome-keyring gnutls gpg graphviz gs gsl gtk guile hscolour html i18n \
+     gnome-keyring gnutls gpg graphviz gs gsl gsm gtk guile hscolour html i18n \
      icu idn imagemagick imap ipv6 ithreads jadetex java javascript jbig jpeg \
      jpeg2k kerberos lasi ldap libwww lua lzma lzo maildir mailwrapper \
      mercurial mmx mmxext mod modperl modplug motif mp3 mysql \
      nis odbc ogg openexr openldap pam pch pcre pdf perl php pic png postgres \
      postscript python rar samba sasl session smtp snmp soap spamassassin \
-     spell sqlite sqlite3 sse sse2 ssh subversion svg syslog theora tiff tk \
+     speex spell sqlite sqlite3 sse sse2 ssh subversion svg syslog theora tiff tk \
      truetype unicode vhosts vim-syntax vorbis wmf x264 xattr xml xmlrpc xpm \
      xsl xvid zlib"
 #USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl \

diff --git a/portage b/portage
index 5911c54252b9b93a36b25ba584f09199e7056061..99a6e1eb9bd817e9c637739f2f6910de2bab2afe 160000 (submodule)
--- a/portage
+++ b/portage
@@ -1 +1 @@
-Subproject commit 5911c54252b9b93a36b25ba584f09199e7056061
+Subproject commit 99a6e1eb9bd817e9c637739f2f6910de2bab2afe