diff options
| author |   David Seifert <soap@gentoo.org> | 2020-02-08 17:21:07 +0100 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2020-02-08 17:21:07 +0100 |
| commit | b0890289f729e199c8c3a0050a84a4d1ca5b956f (patch) | |
| tree | 75b529f4f0736d3ac0e63a3e8f3461abe03308ff | |
| parent | dev-db/mysql-connector-c++: [QA] Fix UnnecessarySlashStrip (diff) | |
| download | gentoo-b0890289f729e199c8c3a0050a84a4d1ca5b956f.tar.gz gentoo-b0890289f729e199c8c3a0050a84a4d1ca5b956f.tar.bz2 gentoo-b0890289f729e199c8c3a0050a84a4d1ca5b956f.zip | |
dev-db/postgresql: [QA] Fix UnnecessarySlashStrip
Signed-off-by: David Seifert <soap@gentoo.org>
21 files changed, 308 insertions, 308 deletions
diff --git a/dev-db/postgresql/postgresql-10.10.ebuild b/dev-db/postgresql/postgresql-10.10.ebuild index 4c21bf2c2fd8..85088dae2645 100644 --- a/dev-db/postgresql/postgresql-10.10.ebuild +++ b/dev-db/postgresql/postgresql-10.10.ebuild @@ -132,7 +132,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -281,7 +281,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -292,11 +292,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -330,15 +330,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -347,7 +347,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -359,7 +359,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -399,9 +399,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -444,7 +444,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-10.11.ebuild b/dev-db/postgresql/postgresql-10.11.ebuild index 4db1706faa4c..1070f1654e7e 100644 --- a/dev-db/postgresql/postgresql-10.11.ebuild +++ b/dev-db/postgresql/postgresql-10.11.ebuild @@ -132,7 +132,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -281,7 +281,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -292,11 +292,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -330,15 +330,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -347,7 +347,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -359,7 +359,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -399,9 +399,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -444,7 +444,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-10.9.ebuild b/dev-db/postgresql/postgresql-10.9.ebuild index dfd737bb1a58..0171a97ac859 100644 --- a/dev-db/postgresql/postgresql-10.9.ebuild +++ b/dev-db/postgresql/postgresql-10.9.ebuild @@ -132,7 +132,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -281,7 +281,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -292,11 +292,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -330,15 +330,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -347,7 +347,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -359,7 +359,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -399,9 +399,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -444,7 +444,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-11.4.ebuild b/dev-db/postgresql/postgresql-11.4.ebuild index 2a0a71668e6f..b998144e091e 100644 --- a/dev-db/postgresql/postgresql-11.4.ebuild +++ b/dev-db/postgresql/postgresql-11.4.ebuild @@ -133,7 +133,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -283,7 +283,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -294,11 +294,11 @@ pkg_postinst() { elog "http://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -332,15 +332,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -349,7 +349,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -361,7 +361,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -401,9 +401,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -446,7 +446,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-11.5.ebuild b/dev-db/postgresql/postgresql-11.5.ebuild index 665416e9dcbc..67c77e9b5084 100644 --- a/dev-db/postgresql/postgresql-11.5.ebuild +++ b/dev-db/postgresql/postgresql-11.5.ebuild @@ -133,7 +133,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -283,7 +283,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -294,11 +294,11 @@ pkg_postinst() { elog "http://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -332,15 +332,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -349,7 +349,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -361,7 +361,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -401,9 +401,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -446,7 +446,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-11.6.ebuild b/dev-db/postgresql/postgresql-11.6.ebuild index bd2130f6d42f..d95233353b91 100644 --- a/dev-db/postgresql/postgresql-11.6.ebuild +++ b/dev-db/postgresql/postgresql-11.6.ebuild @@ -133,7 +133,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -283,7 +283,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -294,11 +294,11 @@ pkg_postinst() { elog "http://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -332,15 +332,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -349,7 +349,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -361,7 +361,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -401,9 +401,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -446,7 +446,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-12.0.ebuild b/dev-db/postgresql/postgresql-12.0.ebuild index 5bc6cd4acf10..f0a9f339f7f9 100644 --- a/dev-db/postgresql/postgresql-12.0.ebuild +++ b/dev-db/postgresql/postgresql-12.0.ebuild @@ -133,7 +133,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -283,7 +283,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -294,11 +294,11 @@ pkg_postinst() { elog "http://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -332,15 +332,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -349,7 +349,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -361,7 +361,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -401,9 +401,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -446,7 +446,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-12.1.ebuild b/dev-db/postgresql/postgresql-12.1.ebuild index 1202ea084698..92a7fbe7985f 100644 --- a/dev-db/postgresql/postgresql-12.1.ebuild +++ b/dev-db/postgresql/postgresql-12.1.ebuild @@ -133,7 +133,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -283,7 +283,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -294,11 +294,11 @@ pkg_postinst() { elog "http://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -332,15 +332,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -349,7 +349,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -361,7 +361,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " http://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -401,9 +401,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -446,7 +446,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild index 43043da26219..d7b84d15b9ce 100644 --- a/dev-db/postgresql/postgresql-9.4.22-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.4.22-r1.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -290,7 +290,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -308,7 +308,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -319,11 +319,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -349,15 +349,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -366,7 +366,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -378,7 +378,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -418,9 +418,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -458,7 +458,7 @@ pkg_config() { einfo "Or move the configuration files back:" einfo "mv ${PGDATA}*.conf ${DATA_DIR}" else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.4.23.ebuild b/dev-db/postgresql/postgresql-9.4.23.ebuild index 5d6471258c66..e7826a9966ab 100644 --- a/dev-db/postgresql/postgresql-9.4.23.ebuild +++ b/dev-db/postgresql/postgresql-9.4.23.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -290,7 +290,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -308,7 +308,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -319,11 +319,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -349,15 +349,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -366,7 +366,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -378,7 +378,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -418,9 +418,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -458,7 +458,7 @@ pkg_config() { einfo "Or move the configuration files back:" einfo "mv ${PGDATA}*.conf ${DATA_DIR}" else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.4.24.ebuild b/dev-db/postgresql/postgresql-9.4.24.ebuild index 43043da26219..d7b84d15b9ce 100644 --- a/dev-db/postgresql/postgresql-9.4.24.ebuild +++ b/dev-db/postgresql/postgresql-9.4.24.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -290,7 +290,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -308,7 +308,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -319,11 +319,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -349,15 +349,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -366,7 +366,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -378,7 +378,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -418,9 +418,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -458,7 +458,7 @@ pkg_config() { einfo "Or move the configuration files back:" einfo "mv ${PGDATA}*.conf ${DATA_DIR}" else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.4.25.ebuild b/dev-db/postgresql/postgresql-9.4.25.ebuild index dccd9372c733..4afb351102c4 100644 --- a/dev-db/postgresql/postgresql-9.4.25.ebuild +++ b/dev-db/postgresql/postgresql-9.4.25.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -290,7 +290,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -308,7 +308,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -319,11 +319,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -349,15 +349,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -366,7 +366,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -378,7 +378,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -418,9 +418,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -458,7 +458,7 @@ pkg_config() { einfo "Or move the configuration files back:" einfo "mv ${PGDATA}*.conf ${DATA_DIR}" else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild index 1b7912c6d02b..e92d7bb0834d 100644 --- a/dev-db/postgresql/postgresql-9.5.17-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.5.17-r1.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -291,7 +291,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -314,7 +314,7 @@ pkg_postinst() { fi elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -325,11 +325,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -355,15 +355,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -372,7 +372,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -384,7 +384,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -424,9 +424,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -464,7 +464,7 @@ pkg_config() { einfo "Or move the configuration files back:" einfo "mv ${PGDATA}*.conf ${DATA_DIR}" else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.5.18.ebuild b/dev-db/postgresql/postgresql-9.5.18.ebuild index f6e7247b9104..f316af45dac1 100644 --- a/dev-db/postgresql/postgresql-9.5.18.ebuild +++ b/dev-db/postgresql/postgresql-9.5.18.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -291,7 +291,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -314,7 +314,7 @@ pkg_postinst() { fi elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -325,11 +325,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -355,15 +355,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -372,7 +372,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -384,7 +384,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -424,9 +424,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -464,7 +464,7 @@ pkg_config() { einfo "Or move the configuration files back:" einfo "mv ${PGDATA}*.conf ${DATA_DIR}" else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.5.19.ebuild b/dev-db/postgresql/postgresql-9.5.19.ebuild index 1b7912c6d02b..e92d7bb0834d 100644 --- a/dev-db/postgresql/postgresql-9.5.19.ebuild +++ b/dev-db/postgresql/postgresql-9.5.19.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -291,7 +291,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -314,7 +314,7 @@ pkg_postinst() { fi elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -325,11 +325,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -355,15 +355,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -372,7 +372,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -384,7 +384,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -424,9 +424,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -464,7 +464,7 @@ pkg_config() { einfo "Or move the configuration files back:" einfo "mv ${PGDATA}*.conf ${DATA_DIR}" else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.5.20.ebuild b/dev-db/postgresql/postgresql-9.5.20.ebuild index 0631e478db3b..d86d352551bd 100644 --- a/dev-db/postgresql/postgresql-9.5.20.ebuild +++ b/dev-db/postgresql/postgresql-9.5.20.ebuild @@ -127,7 +127,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -291,7 +291,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -314,7 +314,7 @@ pkg_postinst() { fi elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -325,11 +325,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -355,15 +355,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -372,7 +372,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -384,7 +384,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -424,9 +424,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -464,7 +464,7 @@ pkg_config() { einfo "Or move the configuration files back:" einfo "mv ${PGDATA}*.conf ${DATA_DIR}" else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild index 1a2981407228..58e85bd619b0 100644 --- a/dev-db/postgresql/postgresql-9.6.13-r1.ebuild +++ b/dev-db/postgresql/postgresql-9.6.13-r1.ebuild @@ -131,7 +131,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -296,7 +296,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -314,7 +314,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -325,11 +325,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -355,15 +355,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -372,7 +372,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -384,7 +384,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -424,9 +424,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -469,7 +469,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.6.14.ebuild b/dev-db/postgresql/postgresql-9.6.14.ebuild index 2334b0f00b3e..b86aebf664af 100644 --- a/dev-db/postgresql/postgresql-9.6.14.ebuild +++ b/dev-db/postgresql/postgresql-9.6.14.ebuild @@ -131,7 +131,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -296,7 +296,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -314,7 +314,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -325,11 +325,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -355,15 +355,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -372,7 +372,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -384,7 +384,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -424,9 +424,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -469,7 +469,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.6.15.ebuild b/dev-db/postgresql/postgresql-9.6.15.ebuild index 1a2981407228..58e85bd619b0 100644 --- a/dev-db/postgresql/postgresql-9.6.15.ebuild +++ b/dev-db/postgresql/postgresql-9.6.15.ebuild @@ -131,7 +131,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -296,7 +296,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -314,7 +314,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -325,11 +325,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -355,15 +355,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -372,7 +372,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -384,7 +384,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -424,9 +424,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -469,7 +469,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9.6.16.ebuild b/dev-db/postgresql/postgresql-9.6.16.ebuild index f4a28fd7b81c..145faa5a444e 100644 --- a/dev-db/postgresql/postgresql-9.6.16.ebuild +++ b/dev-db/postgresql/postgresql-9.6.16.ebuild @@ -131,7 +131,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -296,7 +296,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do if [[ $(${canonicalise} "${l}") == *postgresql-${SLOT}* ]] ; then rm "${l}" || ewarn "Couldn't remove ${l}" fi @@ -314,7 +314,7 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" if use server ; then elog @@ -325,11 +325,11 @@ pkg_postinst() { elog "https://www.postgresql.org/docs/${SLOT}/static/index.html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -355,15 +355,15 @@ pkg_postrm() { pkg_config() { use server || die "USE flag 'server' not enabled. Nothing to configure." - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -372,7 +372,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -384,7 +384,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -424,9 +424,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -469,7 +469,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild index 7d2460caf77f..803bd0b9076d 100644 --- a/dev-db/postgresql/postgresql-9999.ebuild +++ b/dev-db/postgresql/postgresql-9999.ebuild @@ -158,7 +158,7 @@ src_configure() { export LDFLAGS_SL="${LDFLAGS}" export LDFLAGS_EX="${LDFLAGS}" - local PO="${EPREFIX%/}" + local PO="${EPREFIX}" local i uuid_config="" if use uuid; then @@ -300,7 +300,7 @@ pkg_preinst() { local l # First remove any symlinks in /usr/bin that may have been created # by the old eselect - for l in $(find "${ROOT%/}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do + for l in $(find "${ROOT}/usr/bin" -mindepth 1 -maxdepth 1 -type l) ; do [[ $(${canonicalise} "${l}") == *postgresql-9.7* ]] && rm "${l}" done @@ -316,21 +316,21 @@ pkg_postinst() { postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" - elog " ${EROOT%/}/etc/postgresql-${SLOT}/" + elog " ${EROOT}/etc/postgresql-${SLOT}/" elog elog "Gentoo specific documentation:" elog "https://wiki.gentoo.org/wiki/PostgreSQL" elog elog "Official documentation:" - elog "${EROOT%/}/usr/share/doc/${PF}/html" + elog "${EROOT}/usr/share/doc/${PF}/html" elog elog "The default location of the Unix-domain socket is:" - elog " ${EROOT%/}/run/postgresql/" + elog " ${EROOT}/run/postgresql/" elog elog "Before initializing the database, you may want to edit PG_INITDB_OPTS" elog "so that it contains your preferred locale, and other options, in:" - elog " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + elog " ${EROOT}/etc/conf.d/postgresql-${SLOT}" elog elog "Then, execute the following command to setup the initial database" elog "environment:" @@ -353,15 +353,15 @@ pkg_postrm() { } pkg_config() { - [[ -f "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" ]] \ - && source "${EROOT%/}/etc/conf.d/postgresql-${SLOT}" - [[ -z "${PGDATA}" ]] && PGDATA="${EROOT%/}/etc/postgresql-${SLOT}/" + [[ -f "${EROOT}/etc/conf.d/postgresql-${SLOT}" ]] \ + && source "${EROOT}/etc/conf.d/postgresql-${SLOT}" + [[ -z "${PGDATA}" ]] && PGDATA="${EROOT}/etc/postgresql-${SLOT}/" [[ -z "${DATA_DIR}" ]] \ - && DATA_DIR="${EROOT%/}/var/lib/postgresql/${SLOT}/data" + && DATA_DIR="${EROOT}/var/lib/postgresql/${SLOT}/data" # environment.bz2 may not contain the same locale as the current system # locale. Unset and source from the current system locale. - if [ -f "${EROOT%/}/etc/env.d/02locale" ]; then + if [ -f "${EROOT}/etc/env.d/02locale" ]; then unset LANG unset LC_CTYPE unset LC_NUMERIC @@ -370,7 +370,7 @@ pkg_config() { unset LC_MONETARY unset LC_MESSAGES unset LC_ALL - source "${EROOT%/}/etc/env.d/02locale" + source "${EROOT}/etc/env.d/02locale" [ -n "${LANG}" ] && export LANG [ -n "${LC_CTYPE}" ] && export LC_CTYPE [ -n "${LC_NUMERIC}" ] && export LC_NUMERIC @@ -382,7 +382,7 @@ pkg_config() { fi einfo "You can modify the paths and options passed to initdb by editing:" - einfo " ${EROOT%/}/etc/conf.d/postgresql-${SLOT}" + einfo " ${EROOT}/etc/conf.d/postgresql-${SLOT}" einfo einfo "Information on options that can be passed to initdb are found at:" einfo " https://www.postgresql.org/docs/${SLOT}/static/creating-cluster.html" @@ -422,9 +422,9 @@ pkg_config() { einfo "Initializing the database ..." if [[ ${EUID} == 0 ]] ; then - su postgres -c "${EROOT%/}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" + su postgres -c "${EROOT}/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -D \"${DATA_DIR}\" ${PG_INITDB_OPTS}" else - "${EROOT%/}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} + "${EROOT}"/usr/$(get_libdir)/postgresql-${SLOT}/bin/initdb -U postgres -D "${DATA_DIR}" ${PG_INITDB_OPTS} fi if [[ "${DATA_DIR%/}" != "${PGDATA%/}" ]] ; then @@ -467,7 +467,7 @@ pkg_config() { einfo "You should use the 'postgresql-${SLOT}.service' unit to run PostgreSQL" einfo "instead of 'pg_ctl'." else - einfo "You should use the '${EROOT%/}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" + einfo "You should use the '${EROOT}/etc/init.d/postgresql-${SLOT}' script to run PostgreSQL" einfo "instead of 'pg_ctl'." fi } |