From 67071be387ad62b948ac5f48d883ca3f7b0239c6 Mon Sep 17 00:00:00 2001 From: Theo Anderson Date: Sun, 7 Mar 2021 12:56:14 +0100 Subject: dev-db/postgresql: migrate to tmpfiles.eclass Closes: https://bugs.gentoo.org/740592 Package-Manager: Portage-3.0.16, Repoman-3.0.2 Signed-off-by: Theo Anderson Signed-off-by: David Seifert --- dev-db/postgresql/postgresql-10.16.ebuild | 6 +++--- dev-db/postgresql/postgresql-11.11.ebuild | 6 +++--- dev-db/postgresql/postgresql-12.6.ebuild | 6 +++--- dev-db/postgresql/postgresql-13.2.ebuild | 6 +++--- dev-db/postgresql/postgresql-9.5.25.ebuild | 6 +++--- dev-db/postgresql/postgresql-9.6.21.ebuild | 6 +++--- dev-db/postgresql/postgresql-9999.ebuild | 8 ++++---- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dev-db/postgresql/postgresql-10.16.ebuild b/dev-db/postgresql/postgresql-10.16.ebuild index e82b2d2d08b4..ab16abafe92a 100644 --- a/dev-db/postgresql/postgresql-10.16.ebuild +++ b/dev-db/postgresql/postgresql-10.16.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd +inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris" @@ -259,7 +259,7 @@ src_install() { "${FILESDIR}/${PN}.service-9.6-r1" | \ systemd_newunit - ${PN}-${SLOT}.service newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf fi use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session @@ -272,7 +272,7 @@ src_install() { } pkg_postinst() { - use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf + use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" diff --git a/dev-db/postgresql/postgresql-11.11.ebuild b/dev-db/postgresql/postgresql-11.11.ebuild index cf5cd351c515..76d8f0069f89 100644 --- a/dev-db/postgresql/postgresql-11.11.ebuild +++ b/dev-db/postgresql/postgresql-11.11.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd +inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -256,7 +256,7 @@ src_install() { "${FILESDIR}/${PN}.service-9.6-r1" | \ systemd_newunit - ${PN}-${SLOT}.service newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf fi use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session @@ -269,7 +269,7 @@ src_install() { } pkg_postinst() { - use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf + use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" diff --git a/dev-db/postgresql/postgresql-12.6.ebuild b/dev-db/postgresql/postgresql-12.6.ebuild index 512e4dfc2d3a..07087f076155 100644 --- a/dev-db/postgresql/postgresql-12.6.ebuild +++ b/dev-db/postgresql/postgresql-12.6.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd +inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -256,7 +256,7 @@ src_install() { "${FILESDIR}/${PN}.service-9.6-r1" | \ systemd_newunit - ${PN}-${SLOT}.service newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf fi use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session @@ -269,7 +269,7 @@ src_install() { } pkg_postinst() { - use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf + use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" diff --git a/dev-db/postgresql/postgresql-13.2.ebuild b/dev-db/postgresql/postgresql-13.2.ebuild index 7661f3aed842..577737a80c7c 100644 --- a/dev-db/postgresql/postgresql-13.2.ebuild +++ b/dev-db/postgresql/postgresql-13.2.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd +inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -256,7 +256,7 @@ src_install() { "${FILESDIR}/${PN}.service-9.6-r1" | \ systemd_newunit - ${PN}-${SLOT}.service newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf fi use pam && pamd_mimic system-auth ${PN}-${SLOT} auth account session @@ -269,7 +269,7 @@ src_install() { } pkg_postinst() { - use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf + use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" diff --git a/dev-db/postgresql/postgresql-9.5.25.ebuild b/dev-db/postgresql/postgresql-9.5.25.ebuild index 21b9e356bb31..3c904ec03a9f 100644 --- a/dev-db/postgresql/postgresql-9.5.25.ebuild +++ b/dev-db/postgresql/postgresql-9.5.25.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd +inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~ppc-macos ~x86-solaris" @@ -246,7 +246,7 @@ src_install() { sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ "${FILESDIR}/${PN}.service-9.2" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf fi newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir @@ -295,7 +295,7 @@ pkg_preinst() { } pkg_postinst() { - use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf + use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf postgresql-config update if use alpha && use server ; then diff --git a/dev-db/postgresql/postgresql-9.6.21.ebuild b/dev-db/postgresql/postgresql-9.6.21.ebuild index 974a58975c23..c11c4e214056 100644 --- a/dev-db/postgresql/postgresql-9.6.21.ebuild +++ b/dev-db/postgresql/postgresql-9.6.21.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd +inherit flag-o-matic linux-info multilib pam prefix python-single-r1 systemd tmpfiles KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" @@ -251,7 +251,7 @@ src_install() { sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ "${FILESDIR}/${PN}.service-9.6-r1" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf fi newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir @@ -300,7 +300,7 @@ pkg_preinst() { } pkg_postinst() { - use server && use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf + use server && use systemd && tmpfiles_process ${PN}-${SLOT}.conf postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" diff --git a/dev-db/postgresql/postgresql-9999.ebuild b/dev-db/postgresql/postgresql-9999.ebuild index ea330b58b0bb..c9a4ce82776c 100644 --- a/dev-db/postgresql/postgresql-9999.ebuild +++ b/dev-db/postgresql/postgresql-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -6,7 +6,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) inherit flag-o-matic git-r3 linux-info multilib pam prefix python-single-r1 \ - systemd + systemd tmpfiles KEYWORDS="" @@ -209,7 +209,7 @@ src_install() { sed -e "s|@SLOT@|${SLOT}|g" -e "s|@LIBDIR@|$(get_libdir)|g" \ "${FILESDIR}/${PN}.service-9.6-r1" | \ systemd_newunit - ${PN}-${SLOT}.service - systemd_newtmpfilesd "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf + newtmpfiles "${FILESDIR}"/${PN}.tmpfiles ${PN}-${SLOT}.conf fi newbin "${FILESDIR}"/${PN}-check-db-dir ${PN}-${SLOT}-check-db-dir @@ -293,7 +293,7 @@ pkg_preinst() { } pkg_postinst() { - use systemd && systemd_tmpfiles_create ${PN}-${SLOT}.conf + use systemd && tmpfiles_process ${PN}-${SLOT}.conf postgresql-config update elog "If you need a global psqlrc-file, you can place it in:" -- cgit v1.2.3-65-gdbad