Checked in.

diff --git a/package.keywords.mirror/amarok-2 b/package.keywords.mirror/amarok-2
index 28da581a6c73bb3a3e43ee0905e59fdf268c71ac..c0a7725460fc78a92347be5e311960f7ed10a057 100644 (file)
--- a/package.keywords.mirror/amarok-2
+++ b/package.keywords.mirror/amarok-2
@@ -4,8 +4,11 @@
 ~dev-db/mysql-5.0.76
 
 ~media-libs/libgpod-0.7.2
+~media-libs/taglib-extras-0.1.4
 
 ~media-sound/amarok-2.0.2
+~media-sound/amarok-2.1.1
+~media-sound/amarok-utils-2.1.1
 
 ~x11-libs/qtscriptgenerator-0.1.0
 

diff --git a/package.keywords.mirror/common b/package.keywords.mirror/common
index 93a3215d80ea5528e911fd6beb8fd20cce62abb1..d048f916ef63045ab173bb160ad42ff60c8b97c1 100644 (file)
--- a/package.keywords.mirror/common
+++ b/package.keywords.mirror/common
@@ -11,6 +11,8 @@ app-admin/keepassx
 
 app-emulation/vmware-esx-console
 
+~app-misc/rlwrap-0.30
+
 =app-paludis/paludis-hooks-update-eix-2.7-r1
 
 ~app-pda/libopensync-0.36
@@ -21,6 +23,8 @@ app-emulation/vmware-esx-console
 
 ~app-text/ebook-tools-0.1.1
 
+~dev-db/phpmyadmin-3.2.0
+
 =dev-dotnet/gtk-sharp-2.10.2
 
 ~dev-libs/libical-0.33
@@ -31,6 +35,7 @@ app-emulation/vmware-esx-console
 ~dev-python/PyQt4-4.4.4
 =dev-python/pygments-0.10
 ~dev-python/sip-4.7.9
+~dev-python/sphinx-0.6.2
 
 =dev-ruby/allison-2.0.3
 
@@ -66,6 +71,8 @@ net-nds/phpldapadmin
 
 ~net-fs/nfs-utils-1.1.4
 
+net-misc/ipv6calc
+
 =net-nds/openldap-2.3.43-r1
 
 =net-libs/libmsn-4.0_beta4

diff --git a/package.keywords/amarok-2 b/package.keywords/amarok-2
index 28da581a6c73bb3a3e43ee0905e59fdf268c71ac..c0a7725460fc78a92347be5e311960f7ed10a057 100644 (file)
--- a/package.keywords/amarok-2
+++ b/package.keywords/amarok-2
@@ -4,8 +4,11 @@
 ~dev-db/mysql-5.0.76
 
 ~media-libs/libgpod-0.7.2
+~media-libs/taglib-extras-0.1.4
 
 ~media-sound/amarok-2.0.2
+~media-sound/amarok-2.1.1
+~media-sound/amarok-utils-2.1.1
 
 ~x11-libs/qtscriptgenerator-0.1.0
 

diff --git a/package.keywords/common b/package.keywords/common
index 93a3215d80ea5528e911fd6beb8fd20cce62abb1..d048f916ef63045ab173bb160ad42ff60c8b97c1 100644 (file)
--- a/package.keywords/common
+++ b/package.keywords/common
@@ -11,6 +11,8 @@ app-admin/keepassx
 
 app-emulation/vmware-esx-console
 
+~app-misc/rlwrap-0.30
+
 =app-paludis/paludis-hooks-update-eix-2.7-r1
 
 ~app-pda/libopensync-0.36
@@ -21,6 +23,8 @@ app-emulation/vmware-esx-console
 
 ~app-text/ebook-tools-0.1.1
 
+~dev-db/phpmyadmin-3.2.0
+
 =dev-dotnet/gtk-sharp-2.10.2
 
 ~dev-libs/libical-0.33
@@ -31,6 +35,7 @@ app-emulation/vmware-esx-console
 ~dev-python/PyQt4-4.4.4
 =dev-python/pygments-0.10
 ~dev-python/sip-4.7.9
+~dev-python/sphinx-0.6.2
 
 =dev-ruby/allison-2.0.3
 
@@ -66,6 +71,8 @@ net-nds/phpldapadmin
 
 ~net-fs/nfs-utils-1.1.4
 
+net-misc/ipv6calc
+
 =net-nds/openldap-2.3.43-r1
 
 =net-libs/libmsn-4.0_beta4

diff --git a/package.use b/package.use
index 98e2f47b9f7e14da0a28d29f09933e8fa3f774ca..26fac759658d6b1f30e001d528e85fc4f8cb2eea 100644 (file)
--- a/package.use
+++ b/package.use
@@ -59,14 +59,16 @@ dev-perl/PDL                                badval
 dev-perl/POE                           -gtk libwww -tk
 dev-perl/Template-Toolkit              latex
 
+dev-python/jinja2                      -doc i18n
 dev-python/PyQt4                       assistant phonon qt3support sql webkit xmlpatterns
 
 dev-ruby/rubygems                      server
 
 dev-scheme/guile                       deprecated discouraged networking regex
 
+dev-util/git                           -subversion
 dev-util/strace                                aio
-dev-util/subversion                    extras -ruby
+dev-util/subversion                    dso extras -ruby
 
 gnome-base/gdm                         remote 
 gnome-base/gnome-volume-manager                consolekit
@@ -151,6 +153,8 @@ net-analyzer/wireshark                      adns gcrypt profile smi
 net-dns/avahi                          autoipd howl-compat mdnsresponder-compat
 net-dns/bind                           resolvconf
 
+net-libs/libssh2                       gcrypt
+
 net-misc/ntp                           -zeroconf
 net-misc/vpnc                          hybrid-auth