committing changes in /etc after emerge run

Package changes:

diff --git a/.etckeeper b/.etckeeper
index c8f8c2dd1ec777b5d26261f450e85ad037eef4b7..d74eee62d7de59e3e619e3dfd33e13abd6265c25 100755 (executable)
--- a/.etckeeper
+++ b/.etckeeper
@@ -930,8 +930,6 @@ maybe chmod 0644 'eselect/postgresql/active.links'
 maybe chmod 0644 'eselect/postgresql/active.links94'
 maybe chmod 0644 'eselect/postgresql/active.links95'
 maybe chmod 0755 'eselect/postgresql/slots'
-maybe chmod 0755 'eselect/postgresql/slots/9.4'
-maybe chmod 0644 'eselect/postgresql/slots/9.4/base'
 maybe chmod 0755 'eselect/postgresql/slots/9.5'
 maybe chmod 0644 'eselect/postgresql/slots/9.5/base'
 maybe chmod 0644 'etc-update.conf'
@@ -1282,7 +1280,6 @@ maybe chmod 0755 'init.d/pciparm'
 maybe chmod 0755 'init.d/php-fpm'
 maybe chmod 0755 'init.d/policyd-weight'
 maybe chmod 0755 'init.d/postfix'
-maybe chmod 0755 'init.d/postgresql-9.4'
 maybe chmod 0755 'init.d/postgresql-9.5'
 maybe chmod 0755 'init.d/postgrey'
 maybe chmod 0755 'init.d/procfs'
@@ -1623,7 +1620,6 @@ maybe chmod 0644 'pam.d/newusers'
 maybe chmod 0644 'pam.d/other'
 maybe chmod 0644 'pam.d/passwd'
 maybe chmod 0644 'pam.d/pop'
-maybe chmod 0644 'pam.d/postgresql-9.4'
 maybe chmod 0644 'pam.d/postgresql-9.5'
 maybe chmod 0644 'pam.d/samba'
 maybe chmod 0644 'pam.d/saslauthd'

diff --git a/eselect/postgresql/slots/9.4/base b/eselect/postgresql/slots/9.4/base
deleted file mode 100644 (file)
index 8f5ffda..0000000
--- a/eselect/postgresql/slots/9.4/base
+++ /dev/null
@@ -1 +0,0 @@
-postgres_ebuilds="${postgres_ebuilds} postgresql-9.4.5-r2"

diff --git a/init.d/postgresql-9.4 b/init.d/postgresql-9.4
deleted file mode 100755 (executable)
index c6eb749..0000000
--- a/init.d/postgresql-9.4
+++ /dev/null
@@ -1,143 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands="reload"
-
-get_config() {
-    [ -f ${PGDATA%/}/postgresql.conf ] || return 1
-
-    eval echo $(sed -e 's:#.*::' ${PGDATA%/}/postgresql.conf \
-        | awk '$1 == "'$1'" { print ($2 == "=" ? $3 : $2) }')
-}
-
-depend() {
-    use net
-    provide postgresql
-
-    if [ "$(get_config log_destination)" = "syslog" ]; then
-        use logger
-    fi
-}
-
-configured_port=$(get_config port)
-: ${configured_port:=${PGPORT}}
-socket_paths=$(get_config unix_socket_directories)
-: ${socket_paths:=/run/postgresql}
-
-checkconfig() {
-    # Check that DATA_DIR has been set
-    if [ -z ${DATA_DIR} ] ; then
-        eerror "DATA_DIR not set"
-        eerror "HINT: Perhaps you need to update /etc/conf.d/postgresql-9.4"
-        return 1
-    fi
-
-    # Check that DATA_DIR exists
-    if [ ! -d ${DATA_DIR} ] ; then
-        eerror "Directory not found: ${DATA_DIR}"
-        eerror "HINT: Ensure that DATA_DIR points to the right path."
-        eerror "HINT: Or perhaps you need to create the database cluster:"
-        eerror "    emerge --config dev-db/postgresql:9.4"
-        return 1
-    fi
-
-    # Check for the existence of PostgreSQL's config files, and set the
-    # proper mode and ownership.
-    # Only three files should be checked as potentially other files
-    # may be in PGDATA that should not be touched.
-    local file
-    for file in postgresql pg_hba pg_ident ; do
-        file="${PGDATA%/}/${file}.conf"
-        if [ -f ${file} ] ; then
-            checkpath -f -m 0600 -o postgres:postgres ${file}
-        else
-            eerror "${file} not found"
-            eerror "HINT: mv ${DATA_DIR%/}/*.conf ${PGDATA}"
-            return 1
-        fi
-    done
-
-    # Set the proper permission for the socket paths and create it if
-    # it doesn't exist.
-       set -f; IFS=','
-       local s
-       for s in ${socket_paths}; do
-               checkpath -d -m 1775 -o postgres:postgres ${s}
-               if [ -e ${s%/}/.s.PGSQL.${configured_port} ] ; then
-                       eerror "Socket conflict."
-                       eerror "A server is already listening on:"
-                       eerror "    ${s%/}/.s.PGSQL.${configured_port}"
-                       eerror "HINT: Change PGPORT to listen on a different socket."
-                       return 1
-               fi
-       done
-       set +f; unset IFS
-}
-
-start() {
-    checkconfig || return 1
-
-    ebegin "Starting PostgreSQL"
-
-    rm -f ${DATA_DIR%/}/postmaster.pid
-
-    local extraenv
-    local x
-    for x in ${PG_EXTRA_ENV} ; do
-        extraenv="${extraenv} --env ${x}"
-    done
-
-    start-stop-daemon --start \
-        --user postgres \
-        --env "PGPORT=${configured_port}" \
-        ${extraenv} \
-        --pidfile ${DATA_DIR%/}/postmaster.pid \
-        --exec /usr/lib64/postgresql-9.4/bin/pg_ctl \
-        -- start -s -w -t ${START_TIMEOUT} -l ${DATA_DIR%/}/postmaster.log \
-                 -D ${PGDATA} -o "--data-directory=${DATA_DIR} ${PGOPTS}"
-    local retval=$?
-
-    if [ $retval -ne 0 ] ; then
-        eerror "Check the log for a possible explanation of the above error. The log may be"
-        eerror "    ${DATA_DIR%/}/postmaster.log"
-        eerror "Or wherever you configured PostgreSQL 9.4 log messages to be sent."
-        eend $retval
-        return $retval
-    fi
-
-    eend $retval
-}
-
-stop() {
-    local seconds=$(( ${NICE_TIMEOUT} + ${RUDE_TIMEOUT} + ${FORCE_TIMEOUT} ))
-    ebegin "Stopping PostgreSQL (this can take up to ${seconds} seconds)"
-
-    local retval
-    local retries=SIGTERM/${NICE_TIMEOUT}
-
-    if [ "${RUDE_QUIT}" != "NO" ] ; then
-        einfo "RUDE_QUIT enabled."
-        retries="${retries}/SIGINT/${RUDE_TIMEOUT}"
-    fi
-    if [ "${FORCE_QUIT}" = "YES" ] ; then
-        einfo "FORCE_QUIT enabled."
-        ewarn "A recover-run might be executed on next startup."
-        retries="${retries}/SIGQUIT/${FORCE_TIMEOUT}"
-    fi
-
-    # Loops through nice, rude, and force quit in one go.
-    start-stop-daemon --stop \
-        --exec /usr/lib64/postgresql-9.4/bin/postgres \
-        --retry ${retries} \
-        --pidfile ${DATA_DIR%/}/postmaster.pid
-
-    eend
-}
-
-reload() {
-    ebegin "Reloading PostgreSQL configuration"
-    kill -HUP $(head -n1 ${DATA_DIR%/}/postmaster.pid)
-    eend $?
-}

diff --git a/pam.d/postgresql-9.4 b/pam.d/postgresql-9.4
deleted file mode 100644 (file)
index b94d487..0000000
--- a/pam.d/postgresql-9.4
+++ /dev/null
@@ -1,6 +0,0 @@
-# File autogenerated by pamd_mimic in pam eclass
-
-
-auth   include         system-auth
-account        include         system-auth
-session        include         system-auth