saving uncommitted changes in /etc prior to emerge run

diff --git a/.etckeeper b/.etckeeper
index ccbd1861297f50815947113396df077875ed60ca..79db5ef3e19026e31104f99d2034017991ac021a 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -231,10 +231,13 @@ maybe chmod 0755 './config-archive/etc/eselect/postgresql'
 maybe chmod 0755 './config-archive/etc/eselect/postgresql/slots'
 maybe chmod 0755 './config-archive/etc/eselect/postgresql/slots/9.1'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/base'
+maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/base.1'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/base.dist'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/docs'
+maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/docs.1'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/docs.dist'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/server'
+maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/server.1'
 maybe chmod 0644 './config-archive/etc/eselect/postgresql/slots/9.1/server.dist'
 maybe chmod 0644 './config-archive/etc/hosts'
 maybe chmod 0644 './config-archive/etc/hosts.dist.new'
@@ -243,6 +246,8 @@ maybe chmod 0755 './config-archive/etc/init.d/bootmisc'
 maybe chmod 0755 './config-archive/etc/init.d/bootmisc.dist'
 maybe chmod 0755 './config-archive/etc/init.d/consolefont'
 maybe chmod 0755 './config-archive/etc/init.d/consolefont.dist'
+maybe chmod 0755 './config-archive/etc/init.d/dbus'
+maybe chmod 0755 './config-archive/etc/init.d/dbus.dist'
 maybe chmod 0755 './config-archive/etc/init.d/fsck'
 maybe chmod 0755 './config-archive/etc/init.d/fsck.dist'
 maybe chmod 0755 './config-archive/etc/init.d/hwclock'
@@ -536,9 +541,6 @@ maybe chmod 0644 './eselect/postgresql/active.links'
 maybe chmod 0644 './eselect/postgresql/active.links91'
 maybe chmod 0755 './eselect/postgresql/slots'
 maybe chmod 0755 './eselect/postgresql/slots/9.1'
-maybe chmod 0644 './eselect/postgresql/slots/9.1/._cfg0000_base'
-maybe chmod 0644 './eselect/postgresql/slots/9.1/._cfg0000_docs'
-maybe chmod 0644 './eselect/postgresql/slots/9.1/._cfg0000_server'
 maybe chmod 0644 './eselect/postgresql/slots/9.1/base'
 maybe chmod 0644 './eselect/postgresql/slots/9.1/docs'
 maybe chmod 0644 './eselect/postgresql/slots/9.1/server'
@@ -671,7 +673,6 @@ maybe chmod 0644 './idn.conf.sample'
 maybe chmod 0644 './idnalias.conf'
 maybe chmod 0644 './idnalias.conf.sample'
 maybe chmod 0755 './init.d'
-maybe chmod 0755 './init.d/._cfg0000_dbus'
 maybe chmod 0755 './init.d/acpid'
 maybe chmod 0755 './init.d/amavisd'
 maybe chmod 0755 './init.d/apache2'

diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/base b/config-archive/etc/eselect/postgresql/slots/9.1/base
index 25e967a517bf27734f4b4193991cd07bc1578050..479bd41dcea03ee4637a4cbce028d821495cd272 100644 (file)
--- a/config-archive/etc/eselect/postgresql/slots/9.1/base
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/base
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.1"
+postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.2"

diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/base.1 b/config-archive/etc/eselect/postgresql/slots/9.1/base.1
new file mode 100644 (file)
index 0000000..25e967a
--- /dev/null
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/base.1
@@ -0,0 +1 @@
+postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.1"

diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/base.dist b/config-archive/etc/eselect/postgresql/slots/9.1/base.dist
index 479bd41dcea03ee4637a4cbce028d821495cd272..34425d9b099e8779c099687321c3944ab1277a69 100644 (file)
--- a/config-archive/etc/eselect/postgresql/slots/9.1/base.dist
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/base.dist
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.3"

diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/docs b/config-archive/etc/eselect/postgresql/slots/9.1/docs
index 133932cf66edaa25e774292a6aaf88440eb075c5..8cec4d405f29249f9df3dfbbd11871e6d0880df9 100644 (file)
--- a/config-archive/etc/eselect/postgresql/slots/9.1/docs
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/docs
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.1"
+postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.2"

diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/docs.1 b/config-archive/etc/eselect/postgresql/slots/9.1/docs.1
new file mode 100644 (file)
index 0000000..133932c
--- /dev/null
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/docs.1
@@ -0,0 +1 @@
+postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.1"

diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/docs.dist b/config-archive/etc/eselect/postgresql/slots/9.1/docs.dist
index 8cec4d405f29249f9df3dfbbd11871e6d0880df9..4b0d9a89b3cc4cae4e183e1c0c60491ab2288b24 100644 (file)
--- a/config-archive/etc/eselect/postgresql/slots/9.1/docs.dist
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/docs.dist
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.3"

diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/server b/config-archive/etc/eselect/postgresql/slots/9.1/server
index cc2c76baca140e6c1da5f57fe2bbcb674dd8871b..7a0a9c0fb2013b88ed776926cf75e83df1a067a5 100644 (file)
--- a/config-archive/etc/eselect/postgresql/slots/9.1/server
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/server
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.1"
+postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.2-r2"

diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/server.1 b/config-archive/etc/eselect/postgresql/slots/9.1/server.1
new file mode 100644 (file)
index 0000000..cc2c76b
--- /dev/null
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/server.1
@@ -0,0 +1 @@
+postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.1"

diff --git a/config-archive/etc/eselect/postgresql/slots/9.1/server.dist b/config-archive/etc/eselect/postgresql/slots/9.1/server.dist
index 7a0a9c0fb2013b88ed776926cf75e83df1a067a5..a02e0871bdbf5ff3f9f3f270e22f43d6b95a4639 100644 (file)
--- a/config-archive/etc/eselect/postgresql/slots/9.1/server.dist
+++ b/config-archive/etc/eselect/postgresql/slots/9.1/server.dist
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.2-r2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.3"

diff --git a/config-archive/etc/init.d/dbus b/config-archive/etc/init.d/dbus
new file mode 100755 (executable)
index 0000000..502f40f
--- /dev/null
+++ b/config-archive/etc/init.d/dbus
@@ -0,0 +1,51 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.5 2011/09/23 12:45:03 polynomial-c Exp $
+
+extra_started_commands="reload"
+
+depend() {
+       need localmount
+       after bootmisc
+}
+
+start() {
+       ebegin "Starting D-BUS system messagebus"
+
+       /usr/bin/dbus-uuidgen --ensure
+
+       # We need to test if /var/run/dbus exists, since script will fail if it does not
+       [ ! -e /var/run/dbus ] && mkdir /var/run/dbus 
+
+       start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
+       eend $?
+}
+
+stop() {
+       local retval
+
+       ebegin "Stopping D-BUS system messagebus"
+
+       start-stop-daemon --stop --pidfile /var/run/dbus.pid
+       retval=$?
+
+       eend ${retval}
+
+       [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
+
+       return ${retval}
+}
+
+reload() {
+       local retval
+
+       ebegin "Reloading D-BUS messagebus config"
+       
+       /usr/bin/dbus-send --print-reply --system --type=method_call \
+                       --dest=org.freedesktop.DBus \
+                       / org.freedesktop.DBus.ReloadConfig > /dev/null
+       retval=$?
+       eend ${retval}
+       return ${retval}
+}

diff --git a/config-archive/etc/init.d/dbus.dist b/config-archive/etc/init.d/dbus.dist
new file mode 100755 (executable)
index 0000000..65271f6
--- /dev/null
+++ b/config-archive/etc/init.d/dbus.dist
@@ -0,0 +1,50 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $
+
+extra_started_commands="reload"
+
+depend() {
+       need localmount
+       after bootmisc
+}
+
+start() {
+       ebegin "Starting D-BUS system messagebus"
+       /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
+
+       # We need to test if /var/run/dbus exists, since script will fail if it does not
+       [ ! -e /var/run/dbus ] && mkdir /var/run/dbus 
+
+       start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
+       eend $?
+}
+
+stop() {
+       local retval
+
+       ebegin "Stopping D-BUS system messagebus"
+
+       start-stop-daemon --stop --pidfile /var/run/dbus.pid
+       retval=$?
+
+       eend ${retval}
+
+       [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
+
+       return ${retval}
+}
+
+reload() {
+       local retval
+
+       ebegin "Reloading D-BUS messagebus config"
+       
+       /usr/bin/dbus-send --print-reply --system --type=method_call \
+                       --dest=org.freedesktop.DBus \
+                       / org.freedesktop.DBus.ReloadConfig > /dev/null
+       retval=$?
+       eend ${retval}
+       return ${retval}
+}

diff --git a/eselect/postgresql/slots/9.1/._cfg0000_base b/eselect/postgresql/slots/9.1/._cfg0000_base
deleted file mode 100644 (file)
index 34425d9..0000000
--- a/eselect/postgresql/slots/9.1/._cfg0000_base
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.3"

diff --git a/eselect/postgresql/slots/9.1/._cfg0000_docs b/eselect/postgresql/slots/9.1/._cfg0000_docs
deleted file mode 100644 (file)
index 4b0d9a8..0000000
--- a/eselect/postgresql/slots/9.1/._cfg0000_docs
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.3"

diff --git a/eselect/postgresql/slots/9.1/._cfg0000_server b/eselect/postgresql/slots/9.1/._cfg0000_server
deleted file mode 100644 (file)
index a02e087..0000000
--- a/eselect/postgresql/slots/9.1/._cfg0000_server
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.3"

diff --git a/eselect/postgresql/slots/9.1/base b/eselect/postgresql/slots/9.1/base
index 479bd41dcea03ee4637a4cbce028d821495cd272..34425d9b099e8779c099687321c3944ab1277a69 100644 (file)
--- a/eselect/postgresql/slots/9.1/base
+++ b/eselect/postgresql/slots/9.1/base
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-base-9.1.3"

diff --git a/eselect/postgresql/slots/9.1/docs b/eselect/postgresql/slots/9.1/docs
index 8cec4d405f29249f9df3dfbbd11871e6d0880df9..4b0d9a89b3cc4cae4e183e1c0c60491ab2288b24 100644 (file)
--- a/eselect/postgresql/slots/9.1/docs
+++ b/eselect/postgresql/slots/9.1/docs
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-docs-9.1.3"

diff --git a/eselect/postgresql/slots/9.1/server b/eselect/postgresql/slots/9.1/server
index 7a0a9c0fb2013b88ed776926cf75e83df1a067a5..a02e0871bdbf5ff3f9f3f270e22f43d6b95a4639 100644 (file)
--- a/eselect/postgresql/slots/9.1/server
+++ b/eselect/postgresql/slots/9.1/server
@@ -1 +1 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.2-r2"
+postgres_ebuilds="${postgres_ebuilds} postgresql-server-9.1.3"

diff --git a/init.d/._cfg0000_dbus b/init.d/._cfg0000_dbus
deleted file mode 100755 (executable)
index 65271f6..0000000
--- a/init.d/._cfg0000_dbus
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $
-
-extra_started_commands="reload"
-
-depend() {
-       need localmount
-       after bootmisc
-}
-
-start() {
-       ebegin "Starting D-BUS system messagebus"
-       /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
-
-       # We need to test if /var/run/dbus exists, since script will fail if it does not
-       [ ! -e /var/run/dbus ] && mkdir /var/run/dbus 
-
-       start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
-       eend $?
-}
-
-stop() {
-       local retval
-
-       ebegin "Stopping D-BUS system messagebus"
-
-       start-stop-daemon --stop --pidfile /var/run/dbus.pid
-       retval=$?
-
-       eend ${retval}
-
-       [ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
-
-       return ${retval}
-}
-
-reload() {
-       local retval
-
-       ebegin "Reloading D-BUS messagebus config"
-       
-       /usr/bin/dbus-send --print-reply --system --type=method_call \
-                       --dest=org.freedesktop.DBus \
-                       / org.freedesktop.DBus.ReloadConfig > /dev/null
-       retval=$?
-       eend ${retval}
-       return ${retval}
-}

diff --git a/init.d/dbus b/init.d/dbus
index 502f40fdc608a50473bdaeb95202219b68a91720..65271f69c6b42edcfc7e1c2fa6090b14217fc55c 100755 (executable)
--- a/init.d/dbus
+++ b/init.d/dbus
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.5 2011/09/23 12:45:03 polynomial-c Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $
 
 extra_started_commands="reload"
 
@@ -12,8 +12,7 @@ depend() {
 
 start() {
        ebegin "Starting D-BUS system messagebus"
-
-       /usr/bin/dbus-uuidgen --ensure
+       /usr/bin/dbus-uuidgen --ensure=/etc/machine-id
 
        # We need to test if /var/run/dbus exists, since script will fail if it does not
        [ ! -e /var/run/dbus ] && mkdir /var/run/dbus