Current state

diff --git a/cups/subscriptions.conf b/cups/subscriptions.conf
index c522b590d16fb3263aa53efbe2df38974a2121a2..464b88ff3eb3a94187f49eee19c00c95da906a96 100644 (file)
--- a/cups/subscriptions.conf
+++ b/cups/subscriptions.conf
@@ -1,11 +1,3 @@
 # Subscription configuration file for CUPS v1.5.2
-# Written by cupsd on 2013-03-17 23:49
+# Written by cupsd on 2013-03-18 22:01
 NextSubscriptionId 144
-<Subscription 143>
-Events printer-state-changed printer-restarted printer-shutdown printer-stopped printer-added printer-deleted job-state-changed job-created job-completed job-stopped job-progress
-Owner frank
-LeaseDuration 86400
-Interval 0
-ExpirationTime 1363640480
-NextEventId 11
-</Subscription>

diff --git a/portage/package.keywords b/portage/package.keywords
index cc77f7a9740231511423a2301c6619bbdbed8e62..014aa69cce69fdd5e4d84b99b081d7750190c9e3 100644 (file)
--- a/portage/package.keywords
+++ b/portage/package.keywords
@@ -1,9 +1,9 @@
 
-#~app-accessibility/at-spi2-core-2.6.3
-#~app-accessibility/caribou-0.4.7
+# ~app-accessibility/at-spi2-core-2.6.3
+# ~app-accessibility/caribou-0.4.7
 
-#~app-admin/gnome-system-log-3.6.1
-#~app-admin/openrc-settingsd-1.0.1
+# ~app-admin/gnome-system-log-3.6.1
+# ~app-admin/openrc-settingsd-1.0.1
 
 ~app-emulation/emul-linux-x86-baselibs-20120520
 ~app-emulation/emul-linux-x86-db-20120520
@@ -18,7 +18,7 @@ app-emulation/virtualbox-additions
 app-emulation/virtualbox-extpack-oracle
 app-emulation/virtualbox-modules
 
-#~app-i18n/ibus-1.5.1
+# ~app-i18n/ibus-1.5.1
 
 ~app-misc/g15stats-1.9.7
 ~app-misc/g15mpd-1.0.0
@@ -35,9 +35,9 @@ app-emulation/virtualbox-modules
 ~dev-java/sun-jdk-1.6.0.30
 ~dev-java/sun-jre-bin-1.6.0.30
 
-#~dev-libs/folks-0.8.0
-#~dev-libs/gjs-1.34.0
-#~dev-libs/libzeitgeist-0.3.18
+# ~dev-libs/folks-0.8.0
+# ~dev-libs/gjs-1.34.0
+# ~dev-libs/libzeitgeist-0.3.18
 ~dev-libs/nspr-4.9.1
 ~dev-libs/nss-3.13.5
 
@@ -45,60 +45,63 @@ app-emulation/virtualbox-modules
 
 dev-python/fbrehm-libs
 ~dev-python/iniparse-0.4
-#~dev-python/isodate-0.4.9
+# ~dev-python/isodate-0.4.9
+~dev-python/stevedore-0.8
+~dev-python/virtualenv-clone-0.2.4
+~dev-python/virtualenvwrapper-3.6
 
 ~dev-ruby/dnsruby-1.53
 ~dev-ruby/zonecheck-3.0.4
 
-#~dev-util/gdbus-codegen-2.34.3
+# ~dev-util/gdbus-codegen-2.34.3
 ~dev-util/kbuild-0.1.9998_pre20120806
 
 dev-vcs/rcs-fast-export                **
 
-#~gnome-base/gdm-3.6.2
-#~gnome-base/gnome-3.6.2
-#~gnome-base/gnome-applets-3.6.0
-#~gnome-base/gnome-core-apps-3.6.2
-#~gnome-base/gnome-core-libs-3.6.2
-#~gnome-base/gnome-desktop-3.6.2
-#~gnome-base/gnome-extra-apps-3.6.2
-#~gnome-base/gnome-fallback-3.6.2
-#~gnome-base/gnome-shell-3.6.3.1
-#~gnome-base/gsettings-desktop-schemas-3.6.1
-#~gnome-base/gvfs-1.14.2
-#~gnome-base/nautilus-3.6.3
-
-#~games-board/aisleriot-3.2.3.2
-
-#~gnome-extra/evolution-data-server-3.6.3
-#~gnome-extra/gnome-games-extra-data-3.2.0
-#~gnome-extra/gnome-power-manager-3.6.0
-#~gnome-extra/gnome-screensaver-3.6.1
-#~gnome-extra/gnome-tweak-tool-3.6.1
-#~gnome-extra/gucharmap-3.6.1
-#~gnome-extra/yelp-3.6.2
+# ~gnome-base/gdm-3.6.2
+# ~gnome-base/gnome-3.6.2
+# ~gnome-base/gnome-applets-3.6.0
+# ~gnome-base/gnome-core-apps-3.6.2
+# ~gnome-base/gnome-core-libs-3.6.2
+# ~gnome-base/gnome-desktop-3.6.2
+# ~gnome-base/gnome-extra-apps-3.6.2
+# ~gnome-base/gnome-fallback-3.6.2
+# ~gnome-base/gnome-shell-3.6.3.1
+# ~gnome-base/gsettings-desktop-schemas-3.6.1
+# ~gnome-base/gvfs-1.14.2
+# ~gnome-base/nautilus-3.6.3
+
+# ~games-board/aisleriot-3.2.3.2
+
+# ~gnome-extra/evolution-data-server-3.6.3
+# ~gnome-extra/gnome-games-extra-data-3.2.0
+# ~gnome-extra/gnome-power-manager-3.6.0
+# ~gnome-extra/gnome-screensaver-3.6.1
+# ~gnome-extra/gnome-tweak-tool-3.6.1
+# ~gnome-extra/gucharmap-3.6.1
+# ~gnome-extra/yelp-3.6.2
 
 mail-client/thunderbird
 
-#~media-gfx/eog-3.6.2
-#~media-gfx/gnome-font-viewer-3.6.2
+# ~media-gfx/eog-3.6.2
+# ~media-gfx/gnome-font-viewer-3.6.2
 ~media-gfx/shotwell-0.13.1
 
-#~media-sound/sound-juicer-3.5.1_pre20121231
+# ~media-sound/sound-juicer-3.5.1_pre20121231
 
-#~media-video/cheese-3.6.2
+# ~media-video/cheese-3.6.2
 ~media-video/lxdvdrip-1.76
 ~media-video/m2vrequantizer-0.0.2_pre20060306
 ~media-video/streamdvd-0.4
 
-#~net-analyzer/gnome-nettool-3.2.0
+# ~net-analyzer/gnome-nettool-3.2.0
 
 net-im/skype
 
 ~net-libs/libvncserver-0.9.9
-#~net-libs/telepathy-farstream-0.6.0
+# ~net-libs/telepathy-farstream-0.6.0
 
-#~net-misc/vinagre-3.6.2
+# ~net-misc/vinagre-3.6.2
 
 # ~perl-core/ExtUtils-CBuilder-0.280.205
 # ~perl-core/Module-Load-Conditional-0.500.0
@@ -120,10 +123,10 @@ www-client/firefox
 ~x11-plugins/wmcalendar-0.5.2
 ~x11-plugins/wmmixer-1.5       **
 
-#~x11-terms/gnome-terminal-3.6.1
+# ~x11-terms/gnome-terminal-3.6.1
 
-#~x11-themes/gnome-backgrounds-3.6.1
-#~x11-themes/gnome-icon-theme-extras-3.6.2
-#~x11-themes/gnome-icon-theme-symbolic-3.6.2
+# ~x11-themes/gnome-backgrounds-3.6.1
+# ~x11-themes/gnome-icon-theme-extras-3.6.2
+# ~x11-themes/gnome-icon-theme-symbolic-3.6.2
 
-#~x11-wm/mutter-3.6.3
+# ~x11-wm/mutter-3.6.3

diff --git a/resolv.conf b/resolv.conf
index 798c010b6dc8b70ce07d53a1c9239551f36605f3..9a19004eeb4283acd8151efac7b1bed74b6488ab 100644 (file)
--- a/resolv.conf
+++ b/resolv.conf
@@ -1,6 +1,4 @@
-# Hand made by Frank Brehm
-domain home.brehm-online.com
-search home.brehm-online.com brehm-online.com hennig-berlin.org uhu-banane.de pb.local dc1.pb.local dc2.pb.local
-#nameserver 10.12.11.1
-nameserver 192.168.178.30
-nameserver 192.168.178.89
+# Generated by net-scripts for interface eth0
+domain brehm-online.com
+search home.brehm-online.com home.hennig-berlin.org brehm-online.com hennig-berlin.org uhu-banane.de
+nameserver 10.12.11.1