Current state

diff --git a/make.conf b/make.conf
index a0a03eacdf6e269e2cf16921088cdfdde074332a..15c8e084b94a11be12b169e09d19c0496b8f3db4 100644 (file)
--- a/make.conf
+++ b/make.conf
@@ -12,16 +12,16 @@ 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 \
-     djvu doc examples expat fam fastcgi fontconfig ftp gd gif git gmp \
-     gnome-keyring gnutls gpg graphviz gs gsl gsm gtk guile hscolour html i18n \
+     djvu doc examples expat fam fastcgi fontconfig ftp gd geoip gif git gmp \
+     gnome-keyring gnutls gpg gpm 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 \
+     jpeg2k json 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 \
+     nis nss odbc ogg openexr openldap openssl pam pch pcre pdf perl php pic png postgres \
      postscript python rar samba sasl session smtp snmp soap spamassassin \
      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
+     xsl xslt xvid zlib
      -development"
 #USE="3dnow X acl apache2 audit bash-completion bazaar bzip2 caps cgi cvs curl \
 #     darcs djvu doc examples expat fam fastcgi fontconfig ftp gd gif git gmp gnome-keyring \
@@ -55,6 +55,8 @@ APACHE2_MPMS="prefork"
 
 VIDEO_CARDS="intel mach64 r128 radeon savage via svga"
 
+PHP_TARGETS="php5-3"
+
 CONFIG_PROTECT="/var/www/ldap/htdocs/config \
                 /var/www/ldap/htdocs/templates \
                 /var/www/bautagebuch/htdocs/wp-config.php \

diff --git a/package.keywords b/package.keywords
index e62a11f17dd8669d4aee97f3a4a7a1cac19eb836..21148d639f9dcb96247c7523b49ba32d3ac99324 100644 (file)
--- a/package.keywords
+++ b/package.keywords
@@ -317,6 +317,8 @@ dev-python/fbrehm-libs
 ~net-analyzer/ndoutils-1.4_beta9
 ~net-analyzer/tcptrace-6.6.7
 
+~net-fs/autofs-5.0.6
+
 ~net-nds/phpldapadmin-1.2.2
 
 ~net-libs/libnetfilter_log-1.0.1

diff --git a/package.mask b/package.mask
index 109d39e1ee524b3119f949eb6c4a504f90330c52..9835b72221a5e180ca297c84256b09524ae88e4c 100644 (file)
--- a/package.mask
+++ b/package.mask
@@ -14,3 +14,4 @@
 
 =dev-perl/Catalyst-Model-DBIC-Plain-0.03
 
+dev-lang/php:5.5

diff --git a/package.use b/package.use
index 14b231aa9ac741ce07d91d459ec4deb390a41582..ad4e21025c14298f7dcbf600d0f3fd096b886fcf 100644 (file)
--- a/package.use
+++ b/package.use
@@ -1,5 +1,6 @@
+app-admin/eselect-php                  fpm
 app-admin/sysstat                       cron
-app-admin/syslog-ng                     spoof-source sql
+app-admin/syslog-ng                     dbi spoof-source sql
 app-admin/ulogd                                -doc
 app-admin/webalizer                     geoip xtended
 
@@ -43,13 +44,14 @@ dev-lang/perl                           perlsuid
 dev-lang/php                            bcmath calendar cgi cli ctype curlwrappers dbase embed enchant exif filter flatfile fpm gd gd-external hash iconv imap inifile intl json ldap-sasl mhash mysqli mysqlnd pcntl pdo posix -recode sharedext sharedmem simplexml sockets spl sqlite2 suhosin sysvipc -threads tidy tokenizer wddx xmlreader xmlwriter -xpm yaz zip
 
 dev-libs/cyrus-sasl                     authdaemond -java
-dev-libs/geoip                         perl-geoipupdate static-libs
+dev-libs/geoip                         city perl-geoipupdate static-libs
 dev-libs/libgcrypt                      idea
 dev-libs/libmemcached                  -doc
 dev-libs/libusb                         -doc
 dev-libs/openssl                       rfc3779
 dev-libs/yaz                            icu
 
+
 dev-perl/Catalyst-Action-REST           php xml config-general data-taxi freezethaw json
 dev-perl/Catalyst-Model-DBIC-Schema     caching catalyst_helper replication
 dev-perl/DBIx-Class                    admin admin_script deploy replicated
@@ -128,6 +130,7 @@ net-firewall/iptables                   extensions
 
 net-fs/samba                            oav quotas syslog
 
+net-ftp/lftp                           -gnutls
 # net-ftp/proftpd                                authfile ifsession rewrite shaper sitemisc softquota vroot
 #net-ftp/proftpd                         authfile ban case ctrls deflate exec ident ifsession -kerberos openssl ratio readme rewrite sftp shaper sitemisc softquota vroot
 net-ftp/proftpd                                authfile ban case copy ctrls deflate diskuse dso exec ident ifsession ifversion -kerberos memcache openssl qos ratio readme rewrite sftp shaper sitemisc softquota vroot