gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

dev-db/pgpool2: Fix QA notices by pkgcheck

Browse Source 
Unnecessary slash strip, and nonexistent blocker.

Signed-off-by: Aaron W. Swenson <titanofold@gentoo.org>
This commit is contained in:
Aaron W. Swenson
2020-12-16 23:08:38 -05:00
parent 55cb29cdce
commit d55b2687cb
3 changed files with 40 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
dev-db/pgpool2/files/pgpool-4.2.0-run_paths.patch
View File

@@ -1,6 +1,6 @@
diff -Naruw pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h pgpool-II-4.2.0/src/include/parser/pg_config_manual.h
--- pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/include/parser/pg_config_manual.h 2020-12-16 21:39:27.178596628 -0500
diff -Naruw a/src/include/parser/pg_config_manual.h b/src/include/parser/pg_config_manual.h
--- a/src/include/parser/pg_config_manual.h
+++ b/src/include/parser/pg_config_manual.h
@@ -228,7 +228,7 @@
* support them yet.
*/
@@ -10,9 +10,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/include/parser/pg_config_manual.h pgpool-II
#else
#define DEFAULT_PGSOCKET_DIR ""
#endif
diff -Naruw pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h pgpool-II-4.2.0/src/include/pcp/pcp_stream.h
--- pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/include/pcp/pcp_stream.h 2020-12-16 21:40:46.051752707 -0500
diff -Naruw a/src/include/pcp/pcp_stream.h b/src/include/pcp/pcp_stream.h
--- 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);
@@ -21,9 +21,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/include/pcp/pcp_stream.h pgpool-II-4.2.0/sr
+#define UNIX_DOMAIN_PATH "/run/pgpool"
#endif /* PCP_STREAM_H */
diff -Naruw pgpool-II-4.2.0.orig/src/include/pool.h pgpool-II-4.2.0/src/include/pool.h
--- pgpool-II-4.2.0.orig/src/include/pool.h 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/include/pool.h 2020-12-16 21:42:50.054807364 -0500
diff -Naruw a/src/include/pool.h b/src/include/pool.h
--- a/src/include/pool.h
+++ b/src/include/pool.h
@@ -69,16 +69,16 @@
#define HBA_CONF_FILE_NAME "pool_hba.conf"
@@ -45,9 +45,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/include/pool.h pgpool-II-4.2.0/src/include/
/* status file name */
#define STATUS_FILE_NAME "pgpool_status"
diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample pgpool-II-4.2.0/src/sample/pgpool.conf.sample
--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample 2020-12-16 21:57:56.776102951 -0500
diff -Naruw a/src/sample/pgpool.conf.sample b/src/sample/pgpool.conf.sample
--- a/src/sample/pgpool.conf.sample
+++ b/src/sample/pgpool.conf.sample
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -100,9 +100,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample pgpool-II-4.2.0/s
# (change requires restart)
diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical pgpool-II-4.2.0/src/sample/pgpool.conf.sample-logical
--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-logical 2020-12-16 21:57:56.776102951 -0500
diff -Naruw a/src/sample/pgpool.conf.sample-logical b/src/sample/pgpool.conf.sample-logical
--- a/src/sample/pgpool.conf.sample-logical
+++ b/src/sample/pgpool.conf.sample-logical
@@ -38,10 +38,8 @@
port = 9999
# Port number
@@ -155,9 +155,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-logical pgpool-II
# (change requires restart)
diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw pgpool-II-4.2.0/src/sample/pgpool.conf.sample-raw
--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-raw 2020-12-16 21:57:56.776102951 -0500
diff -Naruw a/src/sample/pgpool.conf.sample-raw b/src/sample/pgpool.conf.sample-raw
--- a/src/sample/pgpool.conf.sample-raw
+++ b/src/sample/pgpool.conf.sample-raw
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -210,9 +210,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-raw pgpool-II-4.2
# (change requires restart)
# - Virtual IP control Setting -
diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-replication pgpool-II-4.2.0/src/sample/pgpool.conf.sample-replication
--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-replication 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-replication 2020-12-16 21:57:56.776102951 -0500
diff -Naruw a/src/sample/pgpool.conf.sample-replication b/src/sample/pgpool.conf.sample-replication
--- a/src/sample/pgpool.conf.sample-replication
+++ b/src/sample/pgpool.conf.sample-replication
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -265,9 +265,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-replication pgpoo
# (change requires restart)
diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-slony pgpool-II-4.2.0/src/sample/pgpool.conf.sample-slony
--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-slony 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-slony 2020-12-16 21:57:56.776102951 -0500
diff -Naruw a/src/sample/pgpool.conf.sample-slony b/src/sample/pgpool.conf.sample-slony
--- a/src/sample/pgpool.conf.sample-slony
+++ b/src/sample/pgpool.conf.sample-slony
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -320,9 +320,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-slony pgpool-II-4
# (change requires restart)
# - Virtual IP control Setting -
diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-snapshot pgpool-II-4.2.0/src/sample/pgpool.conf.sample-snapshot
--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-snapshot 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-snapshot 2020-12-16 21:57:56.779436277 -0500
diff -Naruw a/src/sample/pgpool.conf.sample-snapshot b/src/sample/pgpool.conf.sample-snapshot
--- a/src/sample/pgpool.conf.sample-snapshot
+++ b/src/sample/pgpool.conf.sample-snapshot
@@ -39,10 +39,8 @@
port = 9999
# Port number
@@ -375,9 +375,9 @@ diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-snapshot pgpool-I
# (change requires restart)
diff -Naruw pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-stream pgpool-II-4.2.0/src/sample/pgpool.conf.sample-stream
--- pgpool-II-4.2.0.orig/src/sample/pgpool.conf.sample-stream 2020-11-25 20:25:31.000000000 -0500
+++ pgpool-II-4.2.0/src/sample/pgpool.conf.sample-stream 2020-12-16 21:57:56.779436277 -0500
diff -Naruw a/src/sample/pgpool.conf.sample-stream b/src/sample/pgpool.conf.sample-stream
--- a/src/sample/pgpool.conf.sample-stream
+++ b/src/sample/pgpool.conf.sample-stream
@@ -39,10 +39,8 @@
port = 9999
# Port number

6
dev-db/pgpool2/pgpool2-4.2.0.ebuild
View File

@@ -15,7 +15,7 @@ SRC_URI="https://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 x86"
KEYWORDS="~amd64 ~x86"
IUSE="doc libressl memcached pam ssl static-libs"
@@ -57,7 +57,7 @@ src_prepare() {
src_configure() {
postgres-multi_foreach econf \
--disable-rpath \
--sysconfdir="${EROOT%/}/etc/${PN}" \
--sysconfdir="${EROOT}/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) \
@@ -91,7 +91,7 @@ src_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
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 {} +

20
dev-db/pgpool2/pgpool2-9999.ebuild
View File

@@ -1,11 +1,11 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EAPI=7
EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git"
POSTGRES_COMPAT=( 9.{5..6} {10..11} )
POSTGRES_COMPAT=( 9.{5..6} {10..13} )
inherit autotools git-r3 postgres-multi
@@ -30,7 +30,6 @@ RDEPEND="
)
"
DEPEND="${RDEPEND}
!!dev-db/pgpool
sys-devel/bison
virtual/pkgconfig
doc? (
@@ -48,10 +47,10 @@ pkg_setup() {
src_prepare() {
eapply \
"${FILESDIR}/pgpool-configure-memcached.patch" \
"${FILESDIR}/pgpool-4.2.0-configure-memcached.patch" \
"${FILESDIR}/pgpool-configure-pam.patch" \
"${FILESDIR}/pgpool-configure-pthread.patch" \
"${FILESDIR}/pgpool_run_paths-3.7.10.patch"
"${FILESDIR}/pgpool-4.2.0-configure-pthread.patch" \
"${FILESDIR}/pgpool-4.2.0-run_paths.patch"
eautoreconf
@@ -61,7 +60,7 @@ src_prepare() {
src_configure() {
postgres-multi_foreach econf \
--disable-rpath \
--sysconfdir="${EROOT%/}/etc/${PN}" \
--sysconfdir="${EROOT}/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) \
@@ -93,14 +92,9 @@ src_install() {
dodoc NEWS TODO
use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc install
# Examples and extras
# 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
into "/usr/share/${PN}"
dobin src/sample/{pgpool_recovery,pgpool_recovery_pitr,pgpool_remote_start}
insinto "/usr/share/${PN}"
doins src/sample/{{pcp,pgpool,pool_hba}.conf.sample*,pgpool.pam}
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 {} +