commit: c06582d525ec7ec70ab87a7f3676b6cdc199dda2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sun Jul 27 20:26:26 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Jul 28 21:39:05 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c06582d5
dev-db/pgpool2: drop outdated 9999, out of sync w/ release ebuilds Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> dev-db/pgpool2/files/pgpool-9999-run_paths.patch | 98 ---------------------- dev-db/pgpool2/pgpool2-9999.ebuild | 101 ----------------------- 2 files changed, 199 deletions(-) diff --git a/dev-db/pgpool2/files/pgpool-9999-run_paths.patch b/dev-db/pgpool2/files/pgpool-9999-run_paths.patch deleted file mode 100644 index bca3b213edb9..000000000000 --- a/dev-db/pgpool2/files/pgpool-9999-run_paths.patch +++ /dev/null @@ -1,98 +0,0 @@ ---- a/src/include/parser/pg_config_manual.h -+++ b/src/include/parser/pg_config_manual.h -@@ -244,7 +244,7 @@ - * support them yet. - */ - #ifndef WIN32 --#define DEFAULT_PGSOCKET_DIR "/tmp" -+#define DEFAULT_PGSOCKET_DIR "/run/postgresql" - #else - #define DEFAULT_PGSOCKET_DIR "" - #endif ---- a/src/include/pcp/pcp_stream.h -+++ b/src/include/pcp/pcp_stream.h -@@ -49,6 +49,6 @@ - extern int pcp_write(PCP_CONNECTION * pc, void *buf, int len); - extern int pcp_flush(PCP_CONNECTION * pc); - --#define UNIX_DOMAIN_PATH "/tmp" -+#define UNIX_DOMAIN_PATH "/run/pgpool" - - #endif /* PCP_STREAM_H */ ---- a/src/include/pool.h -+++ b/src/include/pool.h -@@ -69,16 +69,16 @@ - #define HBA_CONF_FILE_NAME "pool_hba.conf" - - /* pid file directory */ --#define DEFAULT_LOGDIR "/tmp" -+#define DEFAULT_LOGDIR "/run/pgpool" - - /* Unix domain socket directory */ --#define DEFAULT_SOCKET_DIR "/tmp" -+#define DEFAULT_SOCKET_DIR "/run/postgresql" - - /* Unix domain socket directory for watchdog IPC */ --#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp" -+#define DEFAULT_WD_IPC_SOCKET_DIR "/run/pgpool" - - /* pid file name */ --#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid" -+#define DEFAULT_PID_FILE_NAME "/run/pgpool/pgpool.pid" - - /* status file name */ - #define STATUS_FILE_NAME "pgpool_status" ---- a/src/sample/pgpool.conf.sample-stream -+++ b/src/sample/pgpool.conf.sample-stream -@@ -39,10 +39,8 @@ - #port = 9999 - # Port number - # (change requires restart) --#unix_socket_directories = '/tmp' -+unix_socket_directories = '/run/postgresql' - # Unix domain socket path(s) -- # The Debian package defaults to -- # /var/run/postgresql - # (change requires restart) - #unix_socket_group = '' - # The Owner group of Unix domain socket(s) -@@ -65,10 +63,8 @@ - #pcp_port = 9898 - # Port number for pcp - # (change requires restart) --#pcp_socket_dir = '/tmp' -+pcp_socket_dir = '/run/pgpool' - # Unix domain socket path for pcp -- # The Debian package defaults to -- # /var/run/postgresql - # (change requires restart) - #listen_backlog_multiplier = 2 - # Set the backlog parameter of listen(2) to -@@ -298,13 +294,13 @@ - # FILE LOCATIONS - #------------------------------------------------------------------------------ - --#pid_file_name = '/var/run/pgpool/pgpool.pid' -+pid_file_name = '/run/pgpool/pgpool.pid' - # PID file name - # Can be specified as relative to the" - # location of pgpool.conf file or - # as an absolute path - # (change requires restart) --#logdir = '/tmp' -+logdir = '/run/pgpool' - # Directory of pgPool status file - # (change requires restart) - -@@ -687,10 +683,8 @@ - # Authentication key for watchdog communication - # (change requires restart) - --#wd_ipc_socket_dir = '/tmp' -+wd_ipc_socket_dir = '/run/postgresql' - # Unix domain socket path for watchdog IPC socket -- # The Debian package defaults to -- # /var/run/postgresql - # (change requires restart) - - diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild deleted file mode 100644 index 786ad47b5026..000000000000 --- a/dev-db/pgpool2/pgpool2-9999.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"; - -POSTGRES_COMPAT=( 9.6 {10..15} ) - -inherit autotools flag-o-matic git-r3 postgres-multi - -DESCRIPTION="Connection pool server for PostgreSQL" -HOMEPAGE="https://www.pgpool.net/"; - -LICENSE="BSD" -SLOT="0" -IUSE="doc memcached pam ssl static-libs" - -RDEPEND=" - ${POSTGRES_DEP} - acct-group/postgres - acct-user/pgpool - net-libs/libnsl:0= - virtual/libcrypt:= - memcached? ( dev-libs/libmemcached ) - pam? ( sys-auth/pambase ) - ssl? ( dev-libs/openssl:= ) -" -DEPEND="${RDEPEND} - sys-devel/bison - virtual/pkgconfig - doc? ( - app-text/openjade - dev-libs/libxml2 - dev-libs/libxslt - ) -" - -pkg_setup() { - postgres-multi_pkg_setup -} - -src_prepare() { - eapply \ - "${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \ - "${FILESDIR}/pgpool-configure-pam.patch" \ - "${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \ - "${FILESDIR}/pgpool-9999-run_paths.patch" - - eautoreconf - - postgres-multi_src_prepare -} - -src_configure() { - # bug #946410 - append-cflags -std=gnu17 - # Usual always_inline problem - filter-flags -fno-semantic-interposition - - postgres-multi_foreach econf \ - --disable-rpath \ - --sysconfdir="${EPREFIX}/etc/${PN}" \ - --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \ - --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \ - $(use_enable static-libs static) \ - $(use_with memcached) \ - $(use_with pam) \ - $(use_with ssl openssl) -} - -src_compile() { - # Even though we're only going to do an install for the best slot - # available, the extension bits in src/sql need some things outside - # of that directory built, too. - postgres-multi_foreach emake - postgres-multi_foreach emake -C src/sql - use doc && postgres-multi_forbest emake -C doc -} - -src_install() { - # We only need the best stuff installed - postgres-multi_forbest emake DESTDIR="${D}" install - - # Except for the extension and .so files that each PostgreSQL slot needs - postgres-multi_foreach emake DESTDIR="${D}" -C src/sql install - - newinitd "${FILESDIR}/${PN}.initd" ${PN} - newconfd "${FILESDIR}/${PN}.confd" ${PN} - - # Documentation! - dodoc NEWS TODO - use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install - - # mv some files that get installed to /usr/share/pgpool-II so that - # they all wind up in the same place - mv "${ED}/usr/share/${PN/2/-II}" "${ED}/usr/share/${PN}" || die - - # One more thing: Evil la files! - find "${ED}" -name '*.la' -exec rm -f {} + -}
