diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-08-04 08:53:53 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-08-04 08:53:53 +0100 |
commit | e3872864be25f7421015bef2732fa57c0c9fb726 (patch) | |
tree | 9cb29a544215119b5c5538e37211b994ce1c87ae /dev-db/pgpool2 | |
parent | 480486b52ea64765faf696c88b2c6a26a5a454d4 (diff) |
gentoo resync : 04.08.2018
Diffstat (limited to 'dev-db/pgpool2')
-rw-r--r-- | dev-db/pgpool2/Manifest | 9 | ||||
-rw-r--r-- | dev-db/pgpool2/files/pgpool-configure-memcached.patch | 64 | ||||
-rw-r--r-- | dev-db/pgpool2/files/pgpool-configure-pam.patch | 25 | ||||
-rw-r--r-- | dev-db/pgpool2/files/pgpool-configure-pthread.patch | 13 | ||||
-rw-r--r-- | dev-db/pgpool2/files/pgpool2.initd | 14 | ||||
-rw-r--r-- | dev-db/pgpool2/pgpool2-3.7.5.ebuild | 104 | ||||
-rw-r--r-- | dev-db/pgpool2/pgpool2-9999.ebuild | 42 |
7 files changed, 245 insertions, 26 deletions
diff --git a/dev-db/pgpool2/Manifest b/dev-db/pgpool2/Manifest index c5b930da7a98..8ccb547184ab 100644 --- a/dev-db/pgpool2/Manifest +++ b/dev-db/pgpool2/Manifest @@ -1,12 +1,17 @@ +AUX pgpool-configure-memcached.patch 2137 BLAKE2B c557fe1f00dfca7b3927bfe43175f4c26823ac95da79f75ad197be955211530f3823a860a4b6fc7a9b68db6b2d49ba7c1a5e90aecfc7fb8a614a04d061916c9e SHA512 e8f53dadd71117878a18d3e2237d3777abc5bb648977a1aca7cf78d629745539a062cea69de4771b07bb8e0f534ddcb47baff987f9fdc6fefa69c2cc3c4e6d13 +AUX pgpool-configure-pam.patch 1077 BLAKE2B 4dad8c20faf2ecb1c65e95b87d394d1c17c363d0337e830ea25efb88b1cb07d1a19fc1169ed9fbf69807347eba59296c276b33e0f786d32300e6c518b7a8c4ea SHA512 7c3b3f02977c7d9b1dbf7fb8905cca3a405ab856b8884bb9016dccb70650ed074af76ee81ee6cf2c1d4c366283af07ddb5c473960d81f7528d9d7afe762f9d4e +AUX pgpool-configure-pthread.patch 251 BLAKE2B 69ae31095583e4615117fbeb08ceff520b9462955c3986a675971215a6ac109e6b5bebee9b5b9c49f8005a8c68c144a741307fbe3c0aab318ae324b2d8527261 SHA512 b6cae4159919d22cd63aa13efae31d1270b07da203c0abc3ea96387570543134397873668484db205a0221dbd9f87d74dcf19f3f6d103d586b3c8f21e7f4000c AUX pgpool2.confd 649 BLAKE2B 1c520c4fa954c7411c1b700c03bf4e39196c599eb239cf86412fcf491759ca6f46b1264e7647a8d278ac45da3e20702f6f077dfbcccf83cb3f45575dd3571308 SHA512 5f9a4fa1e68161049ad767d64c764fbf70e84a4239e58119455a45a7e45d86ea2d19b617147cf891053e0dad4420c84704d67015334c7d41bad05b260d70e910 -AUX pgpool2.initd 2174 BLAKE2B 153fa1d756067fd381e599447fb71d780b90bc4c187d0146b1e2806fcc1c19a85d215b59b1931373a3a95fa7e719b9cebd93756276fbeeab087f2a5ba5a1f27b SHA512 3123d2c5e7178fc4b970592fe6908df2860ca3cd5ec54d4609c28145ffc934edf6ddb11f9d2208d89d43bc4252e326b3bc0eed36a28fd2fadbaeb2d635935e40 +AUX pgpool2.initd 2162 BLAKE2B b04f6b952507b8e4815c7b27f09b59ffe64f6262719c5490377fdbc5f8490cdead18fdbeb0ce8379d9cbd4bbb1aa21221d61853ff49a456a5ef6a8d78f3f5129 SHA512 05dd358d20bae60cfdefd7116b1111288b5a2be6d68a9dc40eaf6ba641524d422f2faac79bd3c629cee4f8b1ca601a9b6e303d4228e538d742ea407b6190ee53 AUX pgpool_run_paths-3.6.5.patch 11626 BLAKE2B 5d0b7a49b3c8bf2f2d69d369894e9976037025b289b0ec0f2cf11ed9862347dc4cb166af2cbd65637de40fdae09809a9232b0638cf69339901d6f3f67e9ddcd5 SHA512 ea718378d0ea14fa48975a899df26bc8aafa1e61b0d3f264ead81031a21d68284f4af5ce065c5534d113faf36724c880ce280665e148ec623e9fea9c8f91c77c AUX pgpool_run_paths-9999.patch 11759 BLAKE2B 35df553f704846cc4ff8d67e5e6b54ca8ed0a5817a148c359b47cae7ff388fe2bb57600113d7f8ac9afe760ea75e3ddd410d111c2ef87aea3c3fb38671d59260 SHA512 109be0f3bcda49db14ebb86d6e9347aa0a47d582ac1a1438b07719f9fa503045cc5b65a27964c3c0b1690ef489f752a497e3b050b816569d0ce01193dc007259 DIST pgpool-II-3.7.0.tar.gz 3269076 BLAKE2B f7a396e82022a35e5f46fb644ca4a9007db3abaf97f8249d88bca00abf5d33abe7d47f705e959f7fb910885bf49f68bd5f965aae3085d12076d3100cca2f25f8 SHA512 cf8eef3a2ec761b51f9e6a72b5211810de57ad9b40b1738067616478b6486a813782588bfc92f6f351334d9514b1394551230c486fa0ac2f6c18a0490f22bbe2 DIST pgpool-II-3.7.1.tar.gz 3237755 BLAKE2B ec196e384c9c4c03a28081fbb74b820c7480e2a98427441572142bd80bff6d2adbbda9bc19df1c70f4699af28fcac5f09161a5938df633bb9eba52c0d9dc24ac SHA512 2a83f573ca2a720ee7beb75d8d1380747e29b2bb3c809f51bd0f8e4423d67f882ce2acb7d9ea118c55313e969aba3bf94a0d5b190eb905123d43c09df25e00ef DIST pgpool-II-3.7.3.tar.gz 3259752 BLAKE2B 398257b2a647039a634d52b0e23ab1584aaa67f58d6f234f03bf2e99380b346b4ff51647f876d0789c484e88fc149a2af5a5b1b8fd3aa48323aada064ea3421d SHA512 c7fea570f11dfc348b0099fde074f61a15e6979b6f16526d24d73b26d723edfdbadbcf10e90c2111aeb72599970718d3cda4abed3e99e8a711cf03b715c29624 +DIST pgpool-II-3.7.5.tar.gz 3276279 BLAKE2B d9c52684985e0a74ef115792f79a71305fbcc5f44663971e5fee41d543c7c290999091c387f5da6c73c88466880a24b21d469046de7981983d9984a606ae357e SHA512 4840047f11b5e176803c03073d1ef6ef54f9d0be3d9bd622fedc9fd0ad4f835090fbf671bfd71cda0d994af6ea9a1658b0d5e5d09ec317b345c41fb0fa4b7b70 EBUILD pgpool2-3.7.0.ebuild 2489 BLAKE2B 79706764ecb54cd2e682bb200640f6635f9a2f6ff8d26f9129a290ea68cb43adef5ba6f6622c591bd9cd5e996456f396d2f936ed8d4d303367fef0032bf2cd56 SHA512 7f74ded58782b8657b3c3f1de92a7a268a806019978e73ed3f4ed93c160d75d9e251acc2bbc39ee266dbc23f662fad8678b98f31b9a476d1b9f0c6b6719377c6 EBUILD pgpool2-3.7.1.ebuild 2491 BLAKE2B f31a347236dacc779b0c019663205b5472a994da5be4136919a4fc3c86cf730a48abbb2741224855a3fd284a937ad97b1b1a7f0b8e6741ea6570974841d5d6e6 SHA512 42026cf2f0d76578b8324b14af12b0fb53c21a75b33d04ef997589878943fb29887488219f175d4481833854dfdf3f6d91c804b54f73157b72d6f786173d6950 EBUILD pgpool2-3.7.3.ebuild 2491 BLAKE2B f31a347236dacc779b0c019663205b5472a994da5be4136919a4fc3c86cf730a48abbb2741224855a3fd284a937ad97b1b1a7f0b8e6741ea6570974841d5d6e6 SHA512 42026cf2f0d76578b8324b14af12b0fb53c21a75b33d04ef997589878943fb29887488219f175d4481833854dfdf3f6d91c804b54f73157b72d6f786173d6950 -EBUILD pgpool2-9999.ebuild 2443 BLAKE2B f6c59d5334c199bff687e8dfa494d26593ebe5b60fb86b5b052a9e9003393ec1116ee39f8a66bf45c01bf986064390ed675320e818c66e8058c0f117cac4d325 SHA512 cc484a69fa7b25330b9bf5a64017bf2df6cc0b11e44c6f0f347ddbfca7ec6046cc5115a678ab691951734e4c6c463ac4307e8efc7908b1d0646d5ce6c839226e +EBUILD pgpool2-3.7.5.ebuild 2647 BLAKE2B c5e5d0e755b61ea989c13667a533725d35aa8aeac8243cf8f375837af7d658ce293a4dd71e4de71d91fa28037cfbc9cbe49c1d5447effa057bfe0b42d527bf5c SHA512 d6d298a0b1035f4bacfdd19c02bec54ee48e181d9ea9c35670158efa948c50208e7d2b75f534fa12ac9036140294c538e987ea218de6c436916d2c3dd4ea781c +EBUILD pgpool2-9999.ebuild 2722 BLAKE2B a9589fdfa37dc5650bce8cc5c7758b6956fba3670e5629308bc34d1b9e9642bb92fdc7e069231cd7fad1d2185afe8b763de6093b0e97446ddb4a7186915149e5 SHA512 ea19202c508243bb2801266cae49d7e8939a6d7ee51fc4d9a02fe7ba3c7464cf440dd712c098ddb183c56839b9e8093f9222f8348bb52bac921003f601a8514b MISC metadata.xml 390 BLAKE2B d6a0560051449e95bb43e81589eee966a477a75d7ec8211ae96b15f2d51ce9555181b8640d9d830f2b42f8159989e9126423c6ccbbc2bf2dd8121f4920a87a16 SHA512 ce26ee116c3c7ff77a771294ed07f38d8f940dc380915c339eb4c543d86fa5bde025ba83e70af2b7bf4a1bef1e51957f151131836855e0dae2e1daed73ffae8d diff --git a/dev-db/pgpool2/files/pgpool-configure-memcached.patch b/dev-db/pgpool2/files/pgpool-configure-memcached.patch new file mode 100644 index 000000000000..7b983dba02e2 --- /dev/null +++ b/dev-db/pgpool2/files/pgpool-configure-memcached.patch @@ -0,0 +1,64 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -338,37 +338,24 @@ + [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])]) + fi + +-AC_ARG_WITH(memcached, +- [ --with-memcached=DIR site header files for libmemcached in DIR], +- [ +- case "$withval" in +- "" | y | ye | yes | n | no) +- AC_MSG_ERROR([*** You must supply an argument to the --with-memcached option.]) +- ;; +- *) +- +- MEMCACHED_INCLUDE_DIR="$withval"/include +- MEMCACHED_LIB_DIR="$withval"/lib +- OLD_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -I$MEMCACHED_INCLUDE_DIR" +- AC_CHECK_HEADERS( +- [libmemcached/memcached.h], +- [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])], +- [AC_MSG_ERROR([header file <libmemcached/memcached.h> is required for memcached support])]) +- CFLAGS=$OLD_CFLAGS +- AC_CHECK_LIB(memcached, memcached_create, [], [AC_MSG_ERROR(libmemcached is not installed)]) +- MEMCACHED_INCLUDE_OPT="-I $MEMCACHED_INCLUDE_DIR" +- MEMCACHED_LINK_OPT="-L$MEMCACHED_LIB_DIR" +- MEMCACHED_RPATH_OPT="-rpath $MEMCACHED_LIB_DIR" +- ;; +- esac +- ]) ++AC_ARG_WITH([memcached], ++ AS_HELP_STRING([--with-memcached], [Build with memcached support])) + +-CFLAGS="$CFLAGS -fno-strict-aliasing" ++AS_IF([test "x$with_memcached" = "xyes"], [ ++ PKG_CHECK_MODULES([MEMCACHED], [libmemcached]) ++ CFLAGS="$CFLAGS $MEMCACHED_CFLAGS" ++ LIBS="$LIBS $MEMCACHED_LIBS" ++ ++ AC_CHECK_HEADERS( ++ [libmemcached/memcached.h], ++ [AC_DEFINE([USE_MEMCACHED], 1, [Define to 1 to build with memcached support])], ++ [AC_MSG_ERROR([Couldn't find <libmemcached/memcached.h>])]) ++ ++ AC_SEARCH_LIBS(memcached_create, [], [], ++ [AC_MSG_ERROR(libmemcached is not installed)]) ++]) + +-AC_SUBST(MEMCACHED_INCLUDE_OPT) +-AC_SUBST(MEMCACHED_LINK_OPT) +-AC_SUBST(MEMCACHED_RPATH_OPT) ++CFLAGS="$CFLAGS -fno-strict-aliasing" + + OLD_LDFLAGS="$LDFLAGS" + LDFLAGS="-L$PGSQL_LIB_DIR" +@@ -380,7 +367,6 @@ + + AC_SUBST(PGSQL_INCLUDE_DIR) + AC_SUBST(PGSQL_LIB_DIR) +-AC_SUBST(MEMCACHED_DIR) + + # --enable(disable)-rpath option + AC_ARG_ENABLE(rpath, diff --git a/dev-db/pgpool2/files/pgpool-configure-pam.patch b/dev-db/pgpool2/files/pgpool-configure-pam.patch new file mode 100644 index 000000000000..3a8e89dde307 --- /dev/null +++ b/dev-db/pgpool2/files/pgpool-configure-pam.patch @@ -0,0 +1,25 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -330,11 +330,13 @@ + +-AC_ARG_WITH(pam, +- [ --with-pam build with PAM support], +- [AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support. (--with-pam)])]) +-if test "$with_pam" = yes ; then +- AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])]) +- AC_CHECK_HEADERS(security/pam_appl.h, [], +- [AC_CHECK_HEADERS(pam/pam_appl.h, [], +- [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])]) +-fi ++AC_ARG_WITH([pam], AS_HELP_STRING([--with-pam], [Build with PAM support])) ++ ++AS_IF([test "x$with_pam" = "xyes"], [ ++ AC_DEFINE([USE_PAM], 1, [Define to 1 to build with PAM support]) ++ AC_CHECK_LIB(pam, pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])]) ++ AC_CHECK_HEADERS(security/pam_appl.h, ++ [], ++ [AC_CHECK_HEADERS(pam/pam_appl.h, [], ++ [AC_MSG_ERROR([header file <security/pam_appl.h> or <pam/pam_appl.h> is required for PAM.])])]) ++ ++]) + diff --git a/dev-db/pgpool2/files/pgpool-configure-pthread.patch b/dev-db/pgpool2/files/pgpool-configure-pthread.patch new file mode 100644 index 000000000000..50b18fab6fc4 --- /dev/null +++ b/dev-db/pgpool2/files/pgpool-configure-pthread.patch @@ -0,0 +1,13 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -3,6 +3,10 @@ + + dnl Checks for programs. + AC_PROG_CC ++AX_PTHREAD ++LIBS="$PTHREAD_LIBS $LIBS" ++CFLAGS="$CFLAGS $PTHREAD_CFLAGS" ++CC="$PTHREAD_CC" + + AM_INIT_AUTOMAKE([foreign no-dependencies subdir-objects]) + diff --git a/dev-db/pgpool2/files/pgpool2.initd b/dev-db/pgpool2/files/pgpool2.initd index c9ffb0cf1611..73db4dd8b3c8 100644 --- a/dev-db/pgpool2/files/pgpool2.initd +++ b/dev-db/pgpool2/files/pgpool2.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 extra_started_commands="reload" @@ -23,24 +23,22 @@ get_config() { PIDFILE="$(get_config pid_file_name)" : ${PIDFILE:='/run/pgpool/pgpool.pid'} -prep() { +start_pre() { # $logdir contains status file(s), not log files. local logdir=$(get_config logdir) local socket_dir=$(get_config socket_dir) local pcp_socket_dir=$(get_config pcp_socket_dir) checkpath -o pgpool:postgres -m 0770 -d $(dirname ${PIDFILE}) || return 1 - checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/run/pgpool'} || return 1 + checkpath -o pgpool:postgres -m 0770 -d ${logdir:-'/var/lib/pgpool'} || return 1 checkpath -o pgpool:postgres -m 0660 -f ${LOGFILE} || return 1 - checkpath -o postgres:postgres -m 0770 \ + checkpath -o root:postgres -m 1775 \ -d ${socket_dir:-'/run/postgresql'} || return 1 - checkpath -o postgres:postgres -m 0770 \ - -d ${pcp_socket_dir:-'/run/postgresql'} || return 1 + checkpath -o pgpool:postgres -m 0770 \ + -d ${pcp_socket_dir:-'/run/postgresql/pgpool'} || return 1 } start() { - prep || return 1 - ebegin "Starting pgpool2" start-stop-daemon --start \ diff --git a/dev-db/pgpool2/pgpool2-3.7.5.ebuild b/dev-db/pgpool2/pgpool2-3.7.5.ebuild new file mode 100644 index 000000000000..adab103e02fd --- /dev/null +++ b/dev-db/pgpool2/pgpool2-3.7.5.ebuild @@ -0,0 +1,104 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +POSTGRES_COMPAT=( 9.{3..6} {10..11} ) + +inherit autotools postgres-multi + +MY_P="${PN/2/-II}-${PV}" + +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="doc libressl memcached pam ssl static-libs" + +RDEPEND=" + ${POSTGRES_DEP} + net-libs/libnsl:0= + memcached? ( dev-libs/libmemcached ) + pam? ( sys-auth/pambase ) + ssl? ( + !libressl? ( dev-libs/openssl:* ) + libressl? ( dev-libs/libressl:= ) + ) +" +DEPEND="${RDEPEND} + !!dev-db/pgpool + sys-devel/bison + virtual/pkgconfig +" + +S=${WORKDIR}/${MY_P} + +pkg_setup() { + postgres_new_user pgpool + + postgres-multi_pkg_setup +} + +src_prepare() { + eapply \ + "${FILESDIR}/pgpool-configure-memcached.patch" \ + "${FILESDIR}/pgpool-configure-pam.patch" \ + "${FILESDIR}/pgpool-configure-pthread.patch" \ + "${FILESDIR}/pgpool_run_paths-3.6.5.patch" + + eautoreconf + + postgres-multi_src_prepare +} + +src_configure() { + postgres-multi_foreach econf \ + --disable-rpath \ + --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) \ + $(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 +} + +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 + doman doc/src/sgml/man{1,8}/* + use doc && dodoc -r doc/src/sgml/html + + # 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} + + # One more thing: Evil la files! + find "${ED}" -name '*.la' -exec rm -f {} + +} diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild b/dev-db/pgpool2/pgpool2-9999.ebuild index b0b43a07e37c..b565c24cfbee 100644 --- a/dev-db/pgpool2/pgpool2-9999.ebuild +++ b/dev-db/pgpool2/pgpool2-9999.ebuild @@ -5,9 +5,9 @@ EAPI=6 EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git" -POSTGRES_COMPAT=( 9.{3..6} 10 ) +POSTGRES_COMPAT=( 9.{3..6} {10..11} ) -inherit git-r3 postgres-multi +inherit autotools git-r3 postgres-multi DESCRIPTION="Connection pool server for PostgreSQL" HOMEPAGE="http://www.pgpool.net/" @@ -17,18 +17,27 @@ SLOT="0" KEYWORDS="" -IUSE="doc memcached pam ssl static-libs" +IUSE="doc libressl memcached pam ssl static-libs" RDEPEND=" ${POSTGRES_DEP} net-libs/libnsl:0= memcached? ( dev-libs/libmemcached ) pam? ( sys-auth/pambase ) - ssl? ( dev-libs/openssl:* ) + ssl? ( + !libressl? ( dev-libs/openssl:* ) + libressl? ( dev-libs/libressl:= ) + ) " DEPEND="${RDEPEND} - sys-devel/bison !!dev-db/pgpool + sys-devel/bison + virtual/pkgconfig + doc? ( + app-text/openjade + dev-libs/libxml2 + dev-libs/libxslt + ) " pkg_setup() { @@ -38,25 +47,27 @@ pkg_setup() { } src_prepare() { - eapply "${FILESDIR}/pgpool_run_paths-9999.patch" + eapply \ + "${FILESDIR}/pgpool-configure-memcached.patch" \ + "${FILESDIR}/pgpool-configure-pam.patch" \ + "${FILESDIR}/pgpool-configure-pthread.patch" \ + "${FILESDIR}/pgpool_run_paths-9999.patch" + + eautoreconf postgres-multi_src_prepare } src_configure() { - local myconf - use memcached && \ - myconf="--with-memcached=\"${EROOT%/}/usr/include/libmemcached\"" - use pam && myconf+=' --with-pam' - postgres-multi_foreach econf \ --disable-rpath \ --sysconfdir="${EROOT%/}/etc/${PN}" \ --with-pgsql-includedir='/usr/include/postgresql-@PG_SLOT@' \ --with-pgsql-libdir="/usr/$(get_libdir)/postgresql-@PG_SLOT@/$(get_libdir)" \ - $(use_with ssl openssl) \ $(use_enable static-libs static) \ - ${myconf} + $(use_with memcached) \ + $(use_with pam) \ + $(use_with ssl openssl) } src_compile() { @@ -65,6 +76,7 @@ src_compile() { # of that directory built, too. postgres-multi_foreach emake postgres-multi_foreach emake -C src/sql + use doc && postgres-multi_forbest emake DESTDIR="${D}" -C doc } src_install() { @@ -79,9 +91,7 @@ src_install() { # Documentation! dodoc NEWS TODO - if use doc ; then - postgres-multi_forbest emake DESTDIR="${D}" -C doc install - fi + 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 |