Current state

diff --git a/portage/make.conf b/portage/make.conf
index 0e24158491c6e171a4bfdd5f418b0fb049e922e1..9c96218b47391f4f62cde69dc7b82f4061c522d2 100644 (file)
--- a/portage/make.conf
+++ b/portage/make.conf
@@ -14,17 +14,17 @@ USE="Xaw3d aalib ads aim amr ao archive audiofile avahi bash-completion \
      bazaar bluray calendar caps cddb cdparanoia cgi cpudetection cscope \
      css ctype curl curlwrappers cvs dbase dga djvu dv dvb dvdread \
      examples expat fastcgi ffmpeg fftw fits flatfile fltk fontconfig \
-     foomaticdb ftp fuse gconf gd ggi gimp git git glade glib gmp gnustep \
+     foomaticdb ftp fuse gconf gd geoip ggi gimp git git glade glib gmp gnustep \
      gphoto2 graphviz gsl gsm gtk3 gtkhtml handbook highlight hscolour html icu id3 \
      id3tag idea idn ieee1394 imagemagick imap imlib inifile jabber jack \
-     java java6 javascript jbig jikes jingle jpeg2k json-syck json-xs \
+     java java6 javascript jbig jikes jingle jpeg2k json json-syck json-xs \
      kde kdeenablefinal kerberos keyring kig-scripting kpathsea lame latex \
      libsamplerate libwww live lm_sensors log4j logrotate lua lzma lzo \
      meanwhile mercurial mhash midi mmxext mmx modplug motif mplayer msn mtp \
      musepack musicbrainz mysql mysqli nas networkmanager next nfs nis \
      nsplugin ntlm numpy odbc openal openexr opus par pch pcntl perl plasma \
      plotutils posix postgres postscript projectm python quicktime rdesktop \
-     rle sasl semantic-desktop sharedmem sid simplexml sip slang slp sndfile \
+     rle sasl semantic-desktop sharedmem sid simplexml sip slang slp smtp sndfile \
      soap sockets sox speex sqlite sqlite3 srtp \
      sse sse2 ssh subversion sysvipc tetex theora threads thumbnail tidy \
      timidity tools twolame v4l v4l2 vcd video vim-syntax wav wavpack \

diff --git a/portage/package.keywords/common b/portage/package.keywords/common
index ff23db14bd8d78b20be72cceca162efe5855cfc9..af98ebd8a654d07e54375c8a0df6a4ed8a8a093d 100644 (file)
--- a/portage/package.keywords/common
+++ b/portage/package.keywords/common
@@ -50,10 +50,12 @@ app-text/docbook2odf-xsl-stylesheets
 ~dev-python/crcmod-1.7
 dev-python/fbrehm-libs
 ~dev-python/iniparse-0.4
+~dev-python/jinja-2.7.1
 ~dev-python/netifaces-0.6
 dev-python/pb-base
 dev-python/pb-logging
 ~dev-python/python-debian-0.1.21
+~dev-python/sphinx-1.1.3
 ~dev-python/stevedore-0.8
 ~dev-python/virtualenv-clone-0.2.4
 ~dev-python/virtualenvwrapper-3.2

diff --git a/portage/package.use b/portage/package.use
index b5895f1abbf3b4072718e9cca8750cce672076b8..91cdebd080b9b000646d6285928ba5bbcf6fa465 100644 (file)
--- a/portage/package.use
+++ b/portage/package.use
@@ -1,5 +1,5 @@
 app-admin/gnome-system-tools            nfs
-app-admin/syslog-ng                     spoof-source sql
+app-admin/syslog-ng                    dbi spoof-source sql
 
 app-arch/cabextract                     extra-tools
 app-arch/unzip                         natspec
@@ -60,6 +60,7 @@ dev-lang/python                         berkdb lang tk
 
 dev-libs/boost                          tools
 dev-libs/cyrus-sasl                     openldap sample
+dev-libs/geoip                         city
 dev-libs/libburn                        track-src-odirect
 dev-libs/libgcrypt                      idea static-libs
 dev-libs/libusb                         -doc