Current state

diff --git a/make.conf b/make.conf
index a77d66eebf3aff0a67187fc5820020c6e5d8284a..fb5dea1cc68370c9643a88465f15e20289179f96 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -12,7 +12,7 @@ CHOST="x86_64-pc-linux-gnu"
 # These are the USE flags that were used in addition to what is provided by the
 # profile used for building.
 USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi curl cvs \
-     darcs djvu doc examples expat fam fastcgi fontconfig ftp gd gif git gmp \
+     djvu doc examples expat fam fastcgi fontconfig ftp gd gif git gmp \
      gnome-keyring gnutls gpg graphviz gs gsl 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 \

diff --git a/portage b/portage
index 61b7f72a375e4ca93860181342243f4153e63ca5..a2b29d7289d2ddd7532b482d02a2d38fec8831c7 160000 (submodule)
--- a/portage
+++ b/portage
@@ -1 +1 @@
-Subproject commit 61b7f72a375e4ca93860181342243f4153e63ca5
+Subproject commit a2b29d7289d2ddd7532b482d02a2d38fec8831c7