root
8 years ago
parent
9fac092ca4
commit
98c25d343f
@ -0,0 +1 @@
|
||||
DIST vim-flake8-1.6.zip 6499 SHA256 c35dc818ef8fee8bb0e8f4519b417be10ff4297322930c27ead75f8e3cb5bf24 SHA512 2cd6427d946d3ab310c9d04441355545065f501d9176b11e90a2df5b8c0fad679f56b77e934f9cf4078a947f8f35d0200411add0da34f33e6cfef4b9b4089c98 WHIRLPOOL 56dacac8e135e3601a9dfb66d4a6d4dee1a5570843eca748c139c84156705ddafd95f4a02a96df3e0d38adcf1f30f19565174c654758c699d62990479e867c8b
|
||||
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>vim@gentoo.org</email>
|
||||
<name>Gentoo Vim Project</name>
|
||||
</maintainer>
|
||||
<maintainer type="person">
|
||||
<email>monsieurp@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,16 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
DESCRIPTION="vim plugin: runs the currently open file through flake8"
|
||||
HOMEPAGE="https://github.com/nvie/vim-flake8"
|
||||
SRC_URI="https://github.com/nvie/${PN}/archive/${PV}.zip -> ${P}.zip"
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
|
||||
DEPEND="app-arch/unzip"
|
||||
RDEPEND="dev-python/flake8"
|
||||
@ -0,0 +1 @@
|
||||
DIST zenburn-2.25.zip 8167 SHA256 bfdae357da421ad9803177904d2a1b5f2323df468357be331fe8cd2b0d1b0515 SHA512 4c448724682cc05ddcc60ed03e0368082ba42031e84960bdb21fd457daca07cfda05a54b68283b4524360bf97e0959fe018a14ea2edc5980d88b7b6b96105ce5 WHIRLPOOL 8b8ae029b089c935da4090ee03bc7bd0672c4b621b636db9be4ecd0ce444a9f52a8d702e8f3f98597d3fdc1409a796229e9d2458019b48cf773f2282e0ce82ad
|
||||
@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="project">
|
||||
<email>vim@gentoo.org</email>
|
||||
<name>Gentoo Vim Project</name>
|
||||
</maintainer>
|
||||
<maintainer type="person">
|
||||
<email>monsieurp@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,19 @@
|
||||
# Copyright 1999-2016 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit vim-plugin
|
||||
|
||||
MY_PN="Zenburn"
|
||||
|
||||
DESCRIPTION="Low-contrast color scheme for Vim"
|
||||
HOMEPAGE="https://github.com/jnurmine/Zenburn"
|
||||
SRC_URI="https://github.com/jnurmine/${MY_PN}/archive/v${PV}.zip -> ${P}.zip"
|
||||
LICENSE="GPL-1"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
|
||||
DEPEND="app-arch/unzip"
|
||||
|
||||
S="${WORKDIR}/${MY_PN}-${PV}"
|
||||
@ -1,4 +1 @@
|
||||
DIST pgpool-II-3.2.5.tar.gz 1643267 SHA256 aecac952fd3d292584c9aa359d72f89b144c29f45c9f848cb030e46215a814f7 SHA512 c6dd033462de7f56724f7416fca3ee3e25835f113604fb03b97deee2e3ab25a07cfd9aea33ec36211aa0ec41c2bcea31ca9befe0cfe8f6389a39c2f6495388b6 WHIRLPOOL 5db077d51c5aa8692ba23c0f5ad3b3291c42448724cf633db13850d9b22df256c2aedc15b95fe74a33e486e09f4cc6a37daed0d39becff38acd40fa52b78ab8d
|
||||
DIST pgpool-II-3.3.6.tar.gz 1812394 SHA256 8e0a9829122ed96793b4c340799d62778eb4176ee0f93288d8d4100fc620ff0e SHA512 64edf6ee96fc18bccaf72e79dc165318587da49f45f7d9748e051a9b87f1938b79eefc020a70f1be31fdf922e6d646710105d97961aef1e0c1538b29cdb0575c WHIRLPOOL a4bfc20115e3a17474e9d57c5abec48ca613568f9e5dcea171a39a114dc5ef3ad59ecd7fba4f0cad703bf6f3dcf7fb1d9dea7b30faa818403bf450f8df10a7c3
|
||||
DIST pgpool-II-3.3.7.tar.gz 1808677 SHA256 b1bfc8c48be252f6c4e54521d24a0e28e86d0027b18aa4ccf6b8405508319032 SHA512 814f8a59ed8488a3ab049cc31ee4579ec954672f4cbca9102d8aa4d18dd2c169fd16518461cbcab24c28394c629234c54d9799d6df9f3ffdf0c57c56dfb2d094 WHIRLPOOL b8ca5e6689d1ac947b2da45c601c3206653b9ae5a181bd63f667a3df6ceecc012621ba4349671caa2e0d1ad371409e046b278e9a6b558786aa7ceed6583ccd9f
|
||||
DIST pgpool-II-3.3.8.tar.gz 1809180 SHA256 660c8b0c6e8be3d0f1120f2a648d08d4f9de1635dba9734d08ab912347675a4b SHA512 afaf4a74da3dc65cff9dedfcdd4f73e13b45f956e5252e6c2e930956bc9308f6a7c0e40d8b1fc0952a87a015c1bd1c7933f3a11cc366a20f3465537d47d24c32 WHIRLPOOL e359290e4beff0cb5ba45ade6ec4361c44182eeb8aae73116f97a07b10ecd06c3e237a15a6d917cddac22ebb7beacd5e1e59645f682016a5ca2f21c9793ac37e
|
||||
DIST pgpool-II-3.5.2.tar.gz 2227075 SHA256 5d29fd9c30141bfdaf15b51c7878766178e5df42fa5e160d0f7df2824d26104f SHA512 dd7268bce0019de30dfad01a8600af798127a4c2cc818e6f85ba30289e97c253d6faa392734d85ccbc97be3f04458c12af1bba541e5b8f3d2ee8268432e01d1a WHIRLPOOL 22939c855919b8399c1129ff4622eae159141e9bf05cc36aca456bfd582c7ab0dc7ec87df5ea96d7101f438e89bf4e06f46a5f63cfde22e505d0a3965c0496fc
|
||||
|
||||
@ -0,0 +1,184 @@
|
||||
diff -aruw pgpool-II-3.5.0.orig/src/include/pool.h pgpool-II-3.5.0/src/include/pool.h
|
||||
--- pgpool-II-3.5.0.orig/src/include/pool.h 2016-02-10 03:53:31.000000000 -0500
|
||||
+++ pgpool-II-3.5.0/src/include/pool.h 2016-03-12 06:47:15.297966248 -0500
|
||||
@@ -72,16 +72,16 @@
|
||||
#define HBA_CONF_FILE_NAME "pool_hba.conf"
|
||||
|
||||
/* pid file directory */
|
||||
-#define DEFAULT_LOGDIR "/tmp"
|
||||
+#define DEFAULT_LOGDIR "@PGPOOL_SOCKETDIR@"
|
||||
|
||||
/* Unix domain socket directory */
|
||||
-#define DEFAULT_SOCKET_DIR "/tmp"
|
||||
+#define DEFAULT_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
|
||||
|
||||
/* Unix domain socket directory for watchdog IPC */
|
||||
-#define DEFAULT_WD_IPC_SOCKET_DIR "/tmp"
|
||||
+#define DEFAULT_WD_IPC_SOCKET_DIR "@PGPOOL_SOCKETDIR@"
|
||||
|
||||
/* pid file name */
|
||||
-#define DEFAULT_PID_FILE_NAME "/var/run/pgpool/pgpool.pid"
|
||||
+#define DEFAULT_PID_FILE_NAME "@PGPOOL_SOCKETDIR@/pgpool.pid"
|
||||
|
||||
/* status file name */
|
||||
#define STATUS_FILE_NAME "pgpool_status"
|
||||
diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample pgpool-II-3.5.0/src/sample/pgpool.conf.sample
|
||||
--- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample 2016-02-10 03:53:31.000000000 -0500
|
||||
+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample 2016-03-12 08:55:22.318087007 -0500
|
||||
@@ -31,10 +31,8 @@
|
||||
port = 9999
|
||||
# Port number
|
||||
# (change requires restart)
|
||||
-socket_dir = '/tmp'
|
||||
+socket_dir = '@PGSQL_SOCKETDIR@'
|
||||
# Unix domain socket path
|
||||
- # The Debian package defaults to
|
||||
- # /var/run/postgresql
|
||||
# (change requires restart)
|
||||
listen_backlog_multiplier = 2
|
||||
# Set the backlog parameter of listen(2) to
|
||||
@@ -53,10 +51,8 @@
|
||||
pcp_port = 9898
|
||||
# Port number for pcp
|
||||
# (change requires restart)
|
||||
-pcp_socket_dir = '/tmp'
|
||||
+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
|
||||
# Unix domain socket path for pcp
|
||||
- # The Debian package defaults to
|
||||
- # /var/run/postgresql
|
||||
# (change requires restart)
|
||||
|
||||
# - Backend Connection Settings -
|
||||
@@ -214,10 +210,10 @@
|
||||
# FILE LOCATIONS
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
-pid_file_name = '/var/run/pgpool/pgpool.pid'
|
||||
+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
|
||||
# PID file name
|
||||
# (change requires restart)
|
||||
-logdir = '/var/log/pgpool'
|
||||
+logdir = '/var/lib/pgpool'
|
||||
# Directory of pgPool status file
|
||||
# (change requires restart)
|
||||
|
||||
diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave
|
||||
--- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-master-slave 2016-02-10 03:53:31.000000000 -0500
|
||||
+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-master-slave 2016-03-12 08:55:45.284665542 -0500
|
||||
@@ -31,10 +31,8 @@
|
||||
port = 9999
|
||||
# Port number
|
||||
# (change requires restart)
|
||||
-socket_dir = '/tmp'
|
||||
+socket_dir = '@PGSQL_SOCKETDIR@'
|
||||
# Unix domain socket path
|
||||
- # The Debian package defaults to
|
||||
- # /var/run/postgresql
|
||||
# (change requires restart)
|
||||
listen_backlog_multiplier = 2
|
||||
# Set the backlog parameter of listen(2) to
|
||||
@@ -53,10 +51,8 @@
|
||||
pcp_port = 9898
|
||||
# Port number for pcp
|
||||
# (change requires restart)
|
||||
-pcp_socket_dir = '/tmp'
|
||||
+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
|
||||
# Unix domain socket path for pcp
|
||||
- # The Debian package defaults to
|
||||
- # /var/run/postgresql
|
||||
# (change requires restart)
|
||||
|
||||
# - Backend Connection Settings -
|
||||
@@ -214,10 +210,10 @@
|
||||
# FILE LOCATIONS
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
-pid_file_name = '/var/run/pgpool/pgpool.pid'
|
||||
+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
|
||||
# PID file name
|
||||
# (change requires restart)
|
||||
-logdir = '/tmp'
|
||||
+logdir = '/var/lib/pgpool'
|
||||
# Directory of pgPool status file
|
||||
# (change requires restart)
|
||||
|
||||
diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication
|
||||
--- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-replication 2016-02-10 03:53:31.000000000 -0500
|
||||
+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-replication 2016-03-12 08:56:55.004397999 -0500
|
||||
@@ -31,10 +31,8 @@
|
||||
port = 9999
|
||||
# Port number
|
||||
# (change requires restart)
|
||||
-socket_dir = '/tmp'
|
||||
+socket_dir = '@PGSQL_SOCKETDIR@'
|
||||
# Unix domain socket path
|
||||
- # The Debian package defaults to
|
||||
- # /var/run/postgresql
|
||||
# (change requires restart)
|
||||
listen_backlog_multiplier = 2
|
||||
# Set the backlog parameter of listen(2) to
|
||||
@@ -53,10 +51,8 @@
|
||||
pcp_port = 9898
|
||||
# Port number for pcp
|
||||
# (change requires restart)
|
||||
-pcp_socket_dir = '/tmp'
|
||||
+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
|
||||
# Unix domain socket path for pcp
|
||||
- # The Debian package defaults to
|
||||
- # /var/run/postgresql
|
||||
# (change requires restart)
|
||||
|
||||
# - Backend Connection Settings -
|
||||
@@ -214,10 +210,10 @@
|
||||
# FILE LOCATIONS
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
-pid_file_name = '/var/run/pgpool/pgpool.pid'
|
||||
+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
|
||||
# PID file name
|
||||
# (change requires restart)
|
||||
-logdir = '/tmp'
|
||||
+logdir = '/var/lib/pgpool'
|
||||
# Directory of pgPool status file
|
||||
# (change requires restart)
|
||||
|
||||
diff -aruw pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream
|
||||
--- pgpool-II-3.5.0.orig/src/sample/pgpool.conf.sample-stream 2016-02-10 03:53:31.000000000 -0500
|
||||
+++ pgpool-II-3.5.0/src/sample/pgpool.conf.sample-stream 2016-03-12 08:58:23.820723842 -0500
|
||||
@@ -31,10 +31,8 @@
|
||||
port = 9999
|
||||
# Port number
|
||||
# (change requires restart)
|
||||
-socket_dir = '/tmp'
|
||||
+socket_dir = '@PGSQL_SOCKETDIR@'
|
||||
# Unix domain socket path
|
||||
- # The Debian package defaults to
|
||||
- # /var/run/postgresql
|
||||
# (change requires restart)
|
||||
|
||||
|
||||
@@ -47,10 +45,8 @@
|
||||
pcp_port = 9898
|
||||
# Port number for pcp
|
||||
# (change requires restart)
|
||||
-pcp_socket_dir = '/tmp'
|
||||
+pcp_socket_dir = '@PGSQL_SOCKETDIR@'
|
||||
# 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
|
||||
@@ -215,10 +211,10 @@
|
||||
# FILE LOCATIONS
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
-pid_file_name = '/var/run/pgpool/pgpool.pid'
|
||||
+pid_file_name = '@PGPOOL_SOCKETDIR@/pgpool.pid'
|
||||
# PID file name
|
||||
# (change requires restart)
|
||||
-logdir = '/tmp'
|
||||
+logdir = '/var/lib/pgpool'
|
||||
# Directory of pgPool status file
|
||||
# (change requires restart)
|
||||
|
||||
@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MY_P="${PN/2/-II}-${PV}"
|
||||
|
||||
inherit base user
|
||||
|
||||
DESCRIPTION="Connection pool server for PostgreSQL"
|
||||
HOMEPAGE="http://www.pgpool.net/"
|
||||
SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="memcached pam ssl static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-db/postgresql
|
||||
memcached? ( dev-libs/libmemcached )
|
||||
pam? ( sys-auth/pambase )
|
||||
ssl? ( dev-libs/openssl )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/bison
|
||||
!!dev-db/pgpool
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup postgres 70
|
||||
enewuser pgpool -1 -1 -1 postgres
|
||||
|
||||
# We need the postgres user as well so we can set the proper
|
||||
# permissions on the sockets without getting into fights with
|
||||
# PostgreSQL's initialization scripts.
|
||||
enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/pgpool_run_paths.patch"
|
||||
|
||||
local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
|
||||
local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
|
||||
sed 's|.*\"\(.*\)\"|\1|g')
|
||||
local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
|
||||
|
||||
sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
|
||||
-i *.conf.sample* pool.h || die
|
||||
|
||||
sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
|
||||
-i *.conf.sample* pool.h || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
use memcached && \
|
||||
myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
|
||||
use pam && myconf+=' --with-pam'
|
||||
|
||||
econf \
|
||||
--disable-rpath \
|
||||
--sysconfdir="${EROOT%/}/etc/${PN}" \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable static-libs static) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
emake -C sql
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
emake DESTDIR="${D}" -C sql install
|
||||
cd "${S}"
|
||||
|
||||
# 3.3 appears to have removed this
|
||||
# `contrib' moved to `extension' with PostgreSQL 9.1
|
||||
#local pgslot=$(postgresql-config show)
|
||||
#if [[ ${pgslot//.} > 90 ]] ; then
|
||||
# cd "${ED%/}$(pg_config --sharedir)"
|
||||
# mv contrib extension || die
|
||||
# cd "${S}"
|
||||
#fi
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd" ${PN}
|
||||
newconfd "${FILESDIR}/${PN}.confd" ${PN}
|
||||
|
||||
# Documentation
|
||||
dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
|
||||
dohtml -r doc
|
||||
|
||||
# Examples and extras
|
||||
insinto "/usr/share/${PN}"
|
||||
doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
|
||||
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 {} +
|
||||
}
|
||||
@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MY_P="${PN/2/-II}-${PV}"
|
||||
|
||||
inherit base user
|
||||
|
||||
DESCRIPTION="Connection pool server for PostgreSQL"
|
||||
HOMEPAGE="http://www.pgpool.net/"
|
||||
SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="memcached pam ssl static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-db/postgresql
|
||||
memcached? ( dev-libs/libmemcached )
|
||||
pam? ( sys-auth/pambase )
|
||||
ssl? ( dev-libs/openssl )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/bison
|
||||
!!dev-db/pgpool
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup postgres 70
|
||||
enewuser pgpool -1 -1 -1 postgres
|
||||
|
||||
# We need the postgres user as well so we can set the proper
|
||||
# permissions on the sockets without getting into fights with
|
||||
# PostgreSQL's initialization scripts.
|
||||
enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/pgpool_run_paths.patch"
|
||||
|
||||
local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
|
||||
local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
|
||||
sed 's|.*\"\(.*\)\"|\1|g')
|
||||
local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
|
||||
|
||||
sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
|
||||
-i *.conf.sample* pool.h || die
|
||||
|
||||
sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
|
||||
-i *.conf.sample* pool.h || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
use memcached && \
|
||||
myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
|
||||
use pam && myconf+=' --with-pam'
|
||||
|
||||
econf \
|
||||
--disable-rpath \
|
||||
--sysconfdir="${EROOT%/}/etc/${PN}" \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable static-libs static) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
emake -C sql
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
emake DESTDIR="${D}" -C sql install
|
||||
cd "${S}"
|
||||
|
||||
# 3.3 appears to have removed this
|
||||
# `contrib' moved to `extension' with PostgreSQL 9.1
|
||||
#local pgslot=$(postgresql-config show)
|
||||
#if [[ ${pgslot//.} > 90 ]] ; then
|
||||
# cd "${ED%/}$(pg_config --sharedir)"
|
||||
# mv contrib extension || die
|
||||
# cd "${S}"
|
||||
#fi
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd" ${PN}
|
||||
newconfd "${FILESDIR}/${PN}.confd" ${PN}
|
||||
|
||||
# Documentation
|
||||
dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
|
||||
dohtml -r doc
|
||||
|
||||
# Examples and extras
|
||||
insinto "/usr/share/${PN}"
|
||||
doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
|
||||
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 {} +
|
||||
}
|
||||
@ -1,108 +0,0 @@
|
||||
# Copyright 1999-2015 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Id$
|
||||
|
||||
EAPI=5
|
||||
|
||||
MY_P="${PN/2/-II}-${PV}"
|
||||
|
||||
inherit base user
|
||||
|
||||
DESCRIPTION="Connection pool server for PostgreSQL"
|
||||
HOMEPAGE="http://www.pgpool.net/"
|
||||
SRC_URI="http://www.pgpool.net/download.php?f=${MY_P}.tar.gz -> ${MY_P}.tar.gz"
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="memcached pam ssl static-libs"
|
||||
|
||||
RDEPEND="
|
||||
dev-db/postgresql
|
||||
memcached? ( dev-libs/libmemcached )
|
||||
pam? ( sys-auth/pambase )
|
||||
ssl? ( dev-libs/openssl )
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/bison
|
||||
!!dev-db/pgpool
|
||||
"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup postgres 70
|
||||
enewuser pgpool -1 -1 -1 postgres
|
||||
|
||||
# We need the postgres user as well so we can set the proper
|
||||
# permissions on the sockets without getting into fights with
|
||||
# PostgreSQL's initialization scripts.
|
||||
enewuser postgres 70 /bin/bash /var/lib/postgresql postgres
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/pgpool_run_paths.patch"
|
||||
|
||||
local pg_config_manual="$(pg_config --includedir)/pg_config_manual.h"
|
||||
local pgsql_socket_dir=$(grep DEFAULT_PGSOCKET_DIR "${pg_config_manual}" | \
|
||||
sed 's|.*\"\(.*\)\"|\1|g')
|
||||
local pgpool_socket_dir="$(dirname $pgsql_socket_dir)/pgpool"
|
||||
|
||||
sed "s|@PGSQL_SOCKETDIR@|${pgsql_socket_dir}|g" \
|
||||
-i *.conf.sample* pool.h || die
|
||||
|
||||
sed "s|@PGPOOL_SOCKETDIR@|${pgpool_socket_dir}|g" \
|
||||
-i *.conf.sample* pool.h || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
use memcached && \
|
||||
myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\""
|
||||
use pam && myconf+=' --with-pam'
|
||||
|
||||
econf \
|
||||
--disable-rpath \
|
||||
--sysconfdir="${EROOT%/}/etc/${PN}" \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable static-libs static) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake
|
||||
|
||||
emake -C sql
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
emake DESTDIR="${D}" -C sql install
|
||||
cd "${S}"
|
||||
|
||||
# 3.3 appears to have removed this
|
||||
# `contrib' moved to `extension' with PostgreSQL 9.1
|
||||
#local pgslot=$(postgresql-config show)
|
||||
#if [[ ${pgslot//.} > 90 ]] ; then
|
||||
# cd "${ED%/}$(pg_config --sharedir)"
|
||||
# mv contrib extension || die
|
||||
# cd "${S}"
|
||||
#fi
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd" ${PN}
|
||||
newconfd "${FILESDIR}/${PN}.confd" ${PN}
|
||||
|
||||
# Documentation
|
||||
dodoc NEWS TODO doc/where_to_send_queries.{pdf,odg}
|
||||
dohtml -r doc
|
||||
|
||||
# Examples and extras
|
||||
insinto "/usr/share/${PN}"
|
||||
doins doc/{pgpool_remote_start,basebackup.sh,recovery.conf.sample}
|
||||
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 {} +
|
||||
}
|
||||
@ -0,0 +1,455 @@
|
||||
From 4db842b8215a904e434f0f6265204129d64387b1 Mon Sep 17 00:00:00 2001
|
||||
From: Robin Johnson <robbat2@gentoo.org>
|
||||
Date: Tue, 7 Jun 2016 13:52:22 +0200
|
||||
Subject: [PATCH] Makefile: Add NO_CVS define to disable all CVS interface
|
||||
utilities
|
||||
|
||||
Forward-ported from 1.7.12 to current git.git v1.8.4
|
||||
Forward-ported from v1.8.4 to v1.8.5.1
|
||||
Forward-ported from v1.8.5.3 to v1.9.0_rc3
|
||||
Forward-ported from 1.9.0_rc3 to current git.git v2.0.0_rc0
|
||||
Forward-ported from v2.0.0_rc0 to v2.0.0
|
||||
Forward-ported from v2.0.0 to v2.2.2
|
||||
Forward-ported from v2.2.2 to v2.8.4
|
||||
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
---
|
||||
Makefile | 51 ++++++++++++++++++++++++++++----------
|
||||
t/t9200-git-cvsexportcommit.sh | 5 ++++
|
||||
t/t9400-git-cvsserver-server.sh | 8 +++++-
|
||||
t/t9401-git-cvsserver-crlf.sh | 15 +++++++----
|
||||
t/t9600-cvsimport.sh | 41 +++++++++++++++++++-----------
|
||||
t/t9601-cvsimport-vendor-branch.sh | 11 ++++++++
|
||||
t/t9602-cvsimport-branches-tags.sh | 11 ++++++++
|
||||
t/t9603-cvsimport-patchsets.sh | 11 ++++++++
|
||||
t/test-lib.sh | 1 +
|
||||
9 files changed, 120 insertions(+), 34 deletions(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index de5a030..16ab4cd 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -267,6 +267,8 @@ all::
|
||||
# Define SANE_TEXT_GREP to "-a" if you use recent versions of GNU grep
|
||||
# and egrep that are pickier when their input contains non-ASCII data.
|
||||
#
|
||||
+# Define NO_CVS if you do not want any CVS interface utilities.
|
||||
+#
|
||||
# The TCL_PATH variable governs the location of the Tcl interpreter
|
||||
# used to optimize git-gui for your system. Only used if NO_TCLTK
|
||||
# is not set. Defaults to the bare 'tclsh'.
|
||||
@@ -473,6 +475,7 @@ LIB_OBJS =
|
||||
PROGRAM_OBJS =
|
||||
PROGRAMS =
|
||||
SCRIPT_PERL =
|
||||
+SCRIPT_PERL_CVS =
|
||||
SCRIPT_PYTHON =
|
||||
SCRIPT_SH =
|
||||
SCRIPT_LIB =
|
||||
@@ -510,13 +513,14 @@ SCRIPT_LIB += git-sh-i18n
|
||||
SCRIPT_PERL += git-add--interactive.perl
|
||||
SCRIPT_PERL += git-difftool.perl
|
||||
SCRIPT_PERL += git-archimport.perl
|
||||
-SCRIPT_PERL += git-cvsexportcommit.perl
|
||||
-SCRIPT_PERL += git-cvsimport.perl
|
||||
-SCRIPT_PERL += git-cvsserver.perl
|
||||
SCRIPT_PERL += git-relink.perl
|
||||
SCRIPT_PERL += git-send-email.perl
|
||||
SCRIPT_PERL += git-svn.perl
|
||||
|
||||
+SCRIPT_PERL_CVS += git-cvsexportcommit.perl
|
||||
+SCRIPT_PERL_CVS += git-cvsimport.perl
|
||||
+SCRIPT_PERL_CVS += git-cvsserver.perl
|
||||
+
|
||||
SCRIPT_PYTHON += git-p4.py
|
||||
|
||||
NO_INSTALL += git-remote-testgit
|
||||
@@ -524,24 +528,26 @@ NO_INSTALL += git-remote-testgit
|
||||
# Generated files for scripts
|
||||
SCRIPT_SH_GEN = $(patsubst %.sh,%,$(SCRIPT_SH))
|
||||
SCRIPT_PERL_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL))
|
||||
+SCRIPT_PERL_CVS_GEN = $(patsubst %.perl,%,$(SCRIPT_PERL_CVS))
|
||||
SCRIPT_PYTHON_GEN = $(patsubst %.py,%,$(SCRIPT_PYTHON))
|
||||
|
||||
SCRIPT_SH_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_SH_GEN))
|
||||
SCRIPT_PERL_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_GEN))
|
||||
+SCRIPT_PERL_CVS_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PERL_CVS_GEN))
|
||||
SCRIPT_PYTHON_INS = $(filter-out $(NO_INSTALL),$(SCRIPT_PYTHON_GEN))
|
||||
|
||||
# Individual rules to allow e.g.
|
||||
# "make -C ../.. SCRIPT_PERL=contrib/foo/bar.perl build-perl-script"
|
||||
# from subdirectories like contrib/*/
|
||||
.PHONY: build-perl-script build-sh-script build-python-script
|
||||
-build-perl-script: $(SCRIPT_PERL_GEN)
|
||||
+build-perl-script: $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
|
||||
build-sh-script: $(SCRIPT_SH_GEN)
|
||||
build-python-script: $(SCRIPT_PYTHON_GEN)
|
||||
|
||||
.PHONY: install-perl-script install-sh-script install-python-script
|
||||
install-sh-script: $(SCRIPT_SH_INS)
|
||||
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
||||
-install-perl-script: $(SCRIPT_PERL_INS)
|
||||
+install-perl-script: $(SCRIPT_PERL_INS) $(SCRIPT_PERL_CVS_INS)
|
||||
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
||||
install-python-script: $(SCRIPT_PYTHON_INS)
|
||||
$(INSTALL) $^ '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
|
||||
@@ -550,12 +556,13 @@ install-python-script: $(SCRIPT_PYTHON_INS)
|
||||
clean-sh-script:
|
||||
$(RM) $(SCRIPT_SH_GEN)
|
||||
clean-perl-script:
|
||||
- $(RM) $(SCRIPT_PERL_GEN)
|
||||
+ $(RM) $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN)
|
||||
clean-python-script:
|
||||
$(RM) $(SCRIPT_PYTHON_GEN)
|
||||
|
||||
SCRIPTS = $(SCRIPT_SH_INS) \
|
||||
$(SCRIPT_PERL_INS) \
|
||||
+ $(SCRIPT_PERL_CVS_INS) \
|
||||
$(SCRIPT_PYTHON_INS) \
|
||||
git-instaweb
|
||||
|
||||
@@ -1776,10 +1783,24 @@ git.res: git.rc GIT-VERSION-FILE
|
||||
-DGIT_VERSION="\\\"$(GIT_VERSION)\\\"" $< -o $@
|
||||
|
||||
# This makes sure we depend on the NO_PERL setting itself.
|
||||
-$(SCRIPT_PERL_GEN): GIT-BUILD-OPTIONS
|
||||
+$(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN): GIT-BUILD-OPTIONS
|
||||
+
|
||||
+_SCRIPT_PERL_GEN =
|
||||
+_SCRIPT_PERL_NOGEN =
|
||||
|
||||
ifndef NO_PERL
|
||||
-$(SCRIPT_PERL_GEN): perl/perl.mak
|
||||
+
|
||||
+_SCRIPT_PERL_GEN = $(SCRIPT_PERL_GEN)
|
||||
+
|
||||
+ifndef NO_CVS
|
||||
+_SCRIPT_PERL_GEN += $(SCRIPT_PERL_CVS_GEN)
|
||||
+else
|
||||
+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_CVS_GEN)
|
||||
+_REASON = NO_CVS
|
||||
+_REASON_CONTENT = $(NO_CVS)
|
||||
+endif # NO_CVS
|
||||
+
|
||||
+$(_SCRIPT_PERL_GEN): perl/perl.mak
|
||||
|
||||
perl/perl.mak: perl/PM.stamp
|
||||
|
||||
@@ -1792,7 +1813,7 @@ perl/perl.mak: GIT-CFLAGS GIT-PREFIX perl/Makefile perl/Makefile.PL
|
||||
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
|
||||
|
||||
PERL_DEFINES = $(PERL_PATH_SQ):$(PERLLIB_EXTRA_SQ)
|
||||
-$(SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
|
||||
+$(_SCRIPT_PERL_GEN): % : %.perl perl/perl.mak GIT-PERL-DEFINES GIT-VERSION-FILE
|
||||
$(QUIET_GEN)$(RM) $@ $@+ && \
|
||||
INSTLIBDIR=`MAKEFLAGS= $(MAKE) -C perl -s --no-print-directory instlibdir` && \
|
||||
INSTLIBDIR_EXTRA='$(PERLLIB_EXTRA_SQ)' && \
|
||||
@@ -1826,14 +1847,18 @@ git-instaweb: git-instaweb.sh GIT-SCRIPT-DEFINES
|
||||
chmod +x $@+ && \
|
||||
mv $@+ $@
|
||||
else # NO_PERL
|
||||
-$(SCRIPT_PERL_GEN) git-instaweb: % : unimplemented.sh
|
||||
+_SCRIPT_PERL_NOGEN += $(SCRIPT_PERL_GEN) $(SCRIPT_PERL_CVS_GEN) git-instaweb
|
||||
+_REASON = NO_PERL
|
||||
+_REASON_CONTENT = $(NO_PERL)
|
||||
+endif # NO_PERL
|
||||
+
|
||||
+$(_SCRIPT_PERL_NOGEN): % : unimplemented.sh
|
||||
$(QUIET_GEN)$(RM) $@ $@+ && \
|
||||
sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
|
||||
- -e 's|@@REASON@@|NO_PERL=$(NO_PERL)|g' \
|
||||
+ -e 's|@@REASON@@|$(_REASON)=$(_REASON_CONTENT)|g' \
|
||||
unimplemented.sh >$@+ && \
|
||||
chmod +x $@+ && \
|
||||
mv $@+ $@
|
||||
-endif # NO_PERL
|
||||
|
||||
# This makes sure we depend on the NO_PYTHON setting itself.
|
||||
$(SCRIPT_PYTHON_GEN): GIT-BUILD-OPTIONS
|
||||
@@ -2064,7 +2089,7 @@ XGETTEXT_FLAGS_SH = $(XGETTEXT_FLAGS) --language=Shell \
|
||||
XGETTEXT_FLAGS_PERL = $(XGETTEXT_FLAGS) --keyword=__ --language=Perl
|
||||
LOCALIZED_C = $(C_OBJ:o=c) $(LIB_H) $(GENERATED_H)
|
||||
LOCALIZED_SH = $(SCRIPT_SH) git-parse-remote.sh
|
||||
-LOCALIZED_PERL = $(SCRIPT_PERL)
|
||||
+LOCALIZED_PERL = $(SCRIPT_PERL) $(SCRIPT_PERL_CVS)
|
||||
|
||||
ifdef XGETTEXT_INCLUDE_TESTS
|
||||
LOCALIZED_C += t/t0200/test.c
|
||||
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
|
||||
index bb879a5..17be197 100755
|
||||
--- a/t/t9200-git-cvsexportcommit.sh
|
||||
+++ b/t/t9200-git-cvsexportcommit.sh
|
||||
@@ -11,6 +11,11 @@ if ! test_have_prereq PERL; then
|
||||
test_done
|
||||
fi
|
||||
|
||||
+if ! test_have_prereq CVS; then
|
||||
+ skip_all='skipping git cvsexportcommit tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
cvs >/dev/null 2>&1
|
||||
if test $? -ne 1
|
||||
then
|
||||
diff --git a/t/t9400-git-cvsserver-server.sh b/t/t9400-git-cvsserver-server.sh
|
||||
index 432c61d..6907b3f 100755
|
||||
--- a/t/t9400-git-cvsserver-server.sh
|
||||
+++ b/t/t9400-git-cvsserver-server.sh
|
||||
@@ -11,9 +11,15 @@ cvs CLI client via git-cvsserver server'
|
||||
. ./test-lib.sh
|
||||
|
||||
if ! test_have_prereq PERL; then
|
||||
- skip_all='skipping git cvsserver tests, perl not available'
|
||||
+ skip_all='skipping git-cvsserver tests, perl not available'
|
||||
test_done
|
||||
fi
|
||||
+
|
||||
+if ! test_have_prereq CVS; then
|
||||
+ skip_all='skipping git-cvsserver tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
cvs >/dev/null 2>&1
|
||||
if test $? -ne 1
|
||||
then
|
||||
diff --git a/t/t9401-git-cvsserver-crlf.sh b/t/t9401-git-cvsserver-crlf.sh
|
||||
index f324b9f..e1eed50 100755
|
||||
--- a/t/t9401-git-cvsserver-crlf.sh
|
||||
+++ b/t/t9401-git-cvsserver-crlf.sh
|
||||
@@ -57,15 +57,20 @@ check_status_options() {
|
||||
return $stat
|
||||
}
|
||||
|
||||
-cvs >/dev/null 2>&1
|
||||
-if test $? -ne 1
|
||||
+if ! test_have_prereq PERL
|
||||
then
|
||||
- skip_all='skipping git-cvsserver tests, cvs not found'
|
||||
+ skip_all='skipping git-cvsserver tests, perl not available'
|
||||
test_done
|
||||
fi
|
||||
-if ! test_have_prereq PERL
|
||||
+if ! test_have_prereq CVS
|
||||
then
|
||||
- skip_all='skipping git-cvsserver tests, perl not available'
|
||||
+ skip_all='skipping git-cvsserver tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+cvs >/dev/null 2>&1
|
||||
+if test $? -ne 1
|
||||
+then
|
||||
+ skip_all='skipping git-cvsserver tests, cvs not found'
|
||||
test_done
|
||||
fi
|
||||
perl -e 'use DBI; use DBD::SQLite' >/dev/null 2>&1 || {
|
||||
diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
|
||||
index 4c384ff..d601f32 100755
|
||||
--- a/t/t9600-cvsimport.sh
|
||||
+++ b/t/t9600-cvsimport.sh
|
||||
@@ -3,14 +3,25 @@
|
||||
test_description='git cvsimport basic tests'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
-test_expect_success PERL 'setup cvsroot environment' '
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
+test_expect_success 'setup cvsroot environment' '
|
||||
CVSROOT=$(pwd)/cvsroot &&
|
||||
export CVSROOT
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'setup cvsroot' '$CVS init'
|
||||
+test_expect_success 'setup cvsroot' '$CVS init'
|
||||
|
||||
-test_expect_success PERL 'setup a cvs module' '
|
||||
+test_expect_success 'setup a cvs module' '
|
||||
|
||||
mkdir "$CVSROOT/module" &&
|
||||
$CVS co -d module-cvs module &&
|
||||
@@ -42,23 +53,23 @@ EOF
|
||||
)
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'import a trivial module' '
|
||||
+test_expect_success 'import a trivial module' '
|
||||
|
||||
git cvsimport -a -R -z 0 -C module-git module &&
|
||||
test_cmp module-cvs/o_fortuna module-git/o_fortuna
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'pack refs' '(cd module-git && git gc)'
|
||||
+test_expect_success 'pack refs' '(cd module-git && git gc)'
|
||||
|
||||
-test_expect_success PERL 'initial import has correct .git/cvs-revisions' '
|
||||
+test_expect_success 'initial import has correct .git/cvs-revisions' '
|
||||
|
||||
(cd module-git &&
|
||||
git log --format="o_fortuna 1.1 %H" -1) > expected &&
|
||||
test_cmp expected module-git/.git/cvs-revisions
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update cvs module' '
|
||||
+test_expect_success 'update cvs module' '
|
||||
(cd module-cvs &&
|
||||
cat <<EOF >o_fortuna &&
|
||||
O Fortune,
|
||||
@@ -86,7 +97,7 @@ EOF
|
||||
)
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update git module' '
|
||||
+test_expect_success 'update git module' '
|
||||
|
||||
(cd module-git &&
|
||||
git config cvsimport.trackRevisions true &&
|
||||
@@ -97,7 +108,7 @@ test_expect_success PERL 'update git module' '
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update has correct .git/cvs-revisions' '
|
||||
+test_expect_success 'update has correct .git/cvs-revisions' '
|
||||
|
||||
(cd module-git &&
|
||||
git log --format="o_fortuna 1.1 %H" -1 HEAD^ &&
|
||||
@@ -105,7 +116,7 @@ test_expect_success PERL 'update has correct .git/cvs-revisions' '
|
||||
test_cmp expected module-git/.git/cvs-revisions
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'update cvs module' '
|
||||
+test_expect_success 'update cvs module' '
|
||||
|
||||
(cd module-cvs &&
|
||||
echo 1 >tick &&
|
||||
@@ -114,7 +125,7 @@ test_expect_success PERL 'update cvs module' '
|
||||
)
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'cvsimport.module config works' '
|
||||
+test_expect_success 'cvsimport.module config works' '
|
||||
|
||||
(cd module-git &&
|
||||
git config cvsimport.module module &&
|
||||
@@ -126,7 +137,7 @@ test_expect_success PERL 'cvsimport.module config works' '
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'second update has correct .git/cvs-revisions' '
|
||||
+test_expect_success 'second update has correct .git/cvs-revisions' '
|
||||
|
||||
(cd module-git &&
|
||||
git log --format="o_fortuna 1.1 %H" -1 HEAD^^ &&
|
||||
@@ -135,7 +146,7 @@ test_expect_success PERL 'second update has correct .git/cvs-revisions' '
|
||||
test_cmp expected module-git/.git/cvs-revisions
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'import from a CVS working tree' '
|
||||
+test_expect_success 'import from a CVS working tree' '
|
||||
|
||||
$CVS co -d import-from-wt module &&
|
||||
(cd import-from-wt &&
|
||||
@@ -148,12 +159,12 @@ test_expect_success PERL 'import from a CVS working tree' '
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'no .git/cvs-revisions created by default' '
|
||||
+test_expect_success 'no .git/cvs-revisions created by default' '
|
||||
|
||||
! test -e import-from-wt/.git/cvs-revisions
|
||||
|
||||
'
|
||||
|
||||
-test_expect_success PERL 'test entire HEAD' 'test_cmp_branch_tree master'
|
||||
+test_expect_success 'test entire HEAD' 'test_cmp_branch_tree master'
|
||||
|
||||
test_done
|
||||
diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh
|
||||
index 827d39f..d730a41 100755
|
||||
--- a/t/t9601-cvsimport-vendor-branch.sh
|
||||
+++ b/t/t9601-cvsimport-vendor-branch.sh
|
||||
@@ -34,6 +34,17 @@
|
||||
test_description='git cvsimport handling of vendor branches'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
setup_cvs_test_repository t9601
|
||||
|
||||
test_expect_success PERL 'import a module with a vendor branch' '
|
||||
diff --git a/t/t9602-cvsimport-branches-tags.sh b/t/t9602-cvsimport-branches-tags.sh
|
||||
index e1db323..68f0974 100755
|
||||
--- a/t/t9602-cvsimport-branches-tags.sh
|
||||
+++ b/t/t9602-cvsimport-branches-tags.sh
|
||||
@@ -6,6 +6,17 @@
|
||||
test_description='git cvsimport handling of branches and tags'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
setup_cvs_test_repository t9602
|
||||
|
||||
test_expect_success PERL 'import module' '
|
||||
diff --git a/t/t9603-cvsimport-patchsets.sh b/t/t9603-cvsimport-patchsets.sh
|
||||
index c4c3c49..9b2957d 100755
|
||||
--- a/t/t9603-cvsimport-patchsets.sh
|
||||
+++ b/t/t9603-cvsimport-patchsets.sh
|
||||
@@ -14,6 +14,17 @@
|
||||
test_description='git cvsimport testing for correct patchset estimation'
|
||||
. ./lib-cvs.sh
|
||||
|
||||
+if ! test_have_prereq PERL
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, perl not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+if ! test_have_prereq CVS
|
||||
+then
|
||||
+ skip_all='skipping git cvsimport tests, cvs not available'
|
||||
+ test_done
|
||||
+fi
|
||||
+
|
||||
setup_cvs_test_repository t9603
|
||||
|
||||
test_expect_failure PERL 'import with criss cross times on revisions' '
|
||||
diff --git a/t/test-lib.sh b/t/test-lib.sh
|
||||
index 0055ebb..5b9bd2e 100644
|
||||
--- a/t/test-lib.sh
|
||||
+++ b/t/test-lib.sh
|
||||
@@ -969,6 +969,7 @@ case $(uname -s) in
|
||||
esac
|
||||
|
||||
( COLUMNS=1 && test $COLUMNS = 1 ) && test_set_prereq COLUMNS_CAN_BE_1
|
||||
+test -z "$NO_CVS" && test_set_prereq CVS
|
||||
test -z "$NO_PERL" && test_set_prereq PERL
|
||||
test -z "$NO_PYTHON" && test_set_prereq PYTHON
|
||||
test -n "$USE_LIBPCRE" && test_set_prereq LIBPCRE
|
||||
--
|
||||
2.8.3
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue, 07 Jun 2016 11:11:28 +0000
|
||||
Tue, 07 Jun 2016 12:44:08 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue, 07 Jun 2016 11:11:28 +0000
|
||||
Tue, 07 Jun 2016 12:44:08 +0000
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=install postinst postrm
|
||||
DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
DESCRIPTION=vim plugin: runs the currently open file through flake8
|
||||
EAPI=6
|
||||
HOMEPAGE=https://github.com/nvie/vim-flake8
|
||||
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-python/flake8 || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/nvie/vim-flake8/archive/1.6.zip -> vim-flake8-1.6.zip
|
||||
_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin 1bbfc3364a7588372fb4c21734f0cd96
|
||||
_md5_=b00b309890f31a721c1352b7c04a0be4
|
||||
@ -0,0 +1,12 @@
|
||||
DEFINED_PHASES=install postinst postrm
|
||||
DEPEND=app-arch/unzip || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
DESCRIPTION=Low-contrast color scheme for Vim
|
||||
EAPI=6
|
||||
HOMEPAGE=https://github.com/jnurmine/Zenburn
|
||||
KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
|
||||
LICENSE=GPL-1
|
||||
RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
|
||||
SLOT=0
|
||||
SRC_URI=https://github.com/jnurmine/Zenburn/archive/v2.25.zip -> zenburn-2.25.zip
|
||||
_eclasses_=vim-doc 1b0813c9dadf2431c96854a8d46f5eaf vim-plugin 1bbfc3364a7588372fb4c21734f0cd96
|
||||
_md5_=66c32c4975496a949ecf35bf558e0dc3
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup unpack
|
||||
DEPEND=dev-db/postgresql memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl ) sys-devel/bison !!dev-db/pgpool
|
||||
DESCRIPTION=Connection pool server for PostgreSQL
|
||||
EAPI=4
|
||||
HOMEPAGE=http://www.pgpool.net/
|
||||
IUSE=memcached pam ssl static-libs
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-db/postgresql memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl )
|
||||
SLOT=0
|
||||
SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.2.5.tar.gz -> pgpool-II-3.2.5.tar.gz
|
||||
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
|
||||
_md5_=8a8cecda63201bbbbe2126a73fe8e247
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup unpack
|
||||
DEPEND=dev-db/postgresql memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl ) sys-devel/bison !!dev-db/pgpool
|
||||
DESCRIPTION=Connection pool server for PostgreSQL
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.pgpool.net/
|
||||
IUSE=memcached pam ssl static-libs
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-db/postgresql memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl )
|
||||
SLOT=0
|
||||
SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.3.6.tar.gz -> pgpool-II-3.3.6.tar.gz
|
||||
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
|
||||
_md5_=cb001a0528f5ae4e509ea2468b6318e8
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup unpack
|
||||
DEPEND=dev-db/postgresql memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl ) sys-devel/bison !!dev-db/pgpool
|
||||
DESCRIPTION=Connection pool server for PostgreSQL
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.pgpool.net/
|
||||
IUSE=memcached pam ssl static-libs
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-db/postgresql memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl )
|
||||
SLOT=0
|
||||
SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.3.7.tar.gz -> pgpool-II-3.3.7.tar.gz
|
||||
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
|
||||
_md5_=cb001a0528f5ae4e509ea2468b6318e8
|
||||
@ -1,13 +0,0 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup unpack
|
||||
DEPEND=dev-db/postgresql memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl ) sys-devel/bison !!dev-db/pgpool
|
||||
DESCRIPTION=Connection pool server for PostgreSQL
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.pgpool.net/
|
||||
IUSE=memcached pam ssl static-libs
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-db/postgresql memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl )
|
||||
SLOT=0
|
||||
SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.3.8.tar.gz -> pgpool-II-3.3.8.tar.gz
|
||||
_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
|
||||
_md5_=cb001a0528f5ae4e509ea2468b6318e8
|
||||
@ -0,0 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare setup
|
||||
DEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= ) sys-devel/bison !!dev-db/pgpool
|
||||
DESCRIPTION=Connection pool server for PostgreSQL
|
||||
EAPI=5
|
||||
HOMEPAGE=http://www.pgpool.net/
|
||||
IUSE=doc memcached pam ssl static-libs
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=BSD
|
||||
RDEPEND=dev-db/postgresql:= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) ssl? ( dev-libs/openssl:= )
|
||||
SLOT=0
|
||||
SRC_URI=http://www.pgpool.net/download.php?f=pgpool-II-3.5.2.tar.gz -> pgpool-II-3.5.2.tar.gz
|
||||
_eclasses_=eutils 792f83d5ec9536cb5ccef375469d8bde multilib d062ae4ba2fc40a19c11de2ad89b6616 toolchain-funcs d513d423d449877e49d99af3f7af7acb user 906f3c8eb3a2350a4f1191a89baa3e46
|
||||
_md5_=90e8760d7900411c1bea22cbda6e1894
|
||||
@ -1 +1 @@
|
||||
Tue, 07 Jun 2016 11:11:28 +0000
|
||||
Tue, 07 Jun 2016 12:44:08 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue Jun 7 11:10:33 UTC 2016
|
||||
Tue Jun 7 12:43:12 UTC 2016
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue, 07 Jun 2016 11:30:01 +0000
|
||||
Tue, 07 Jun 2016 13:00:01 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
1465297801 Tue 07 Jun 2016 11:10:01 AM UTC
|
||||
1465303501 Tue 07 Jun 2016 12:45:01 PM UTC
|
||||
|
||||
@ -1 +1 @@
|
||||
Tue, 07 Jun 2016 11:11:28 +0000
|
||||
Tue, 07 Jun 2016 12:44:08 +0000
|
||||
|
||||
Loading…
Reference in new issue