From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 13F27138334 for ; Fri, 3 Aug 2018 13:36:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CBD0CE07FE; Fri, 3 Aug 2018 13:36:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86A16E07FE for ; Fri, 3 Aug 2018 13:36:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31437335C32 for ; Fri, 3 Aug 2018 13:36:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4682037B for ; Fri, 3 Aug 2018 13:36:44 +0000 (UTC) From: "Aaron Swenson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Swenson" Message-ID: <1533303244.f0bf9e33b1b43f9e93200cc8b3cdc4733728ca2a.titanofold@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/pgpool2/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/pgpool2/pgpool2-9999.ebuild.orig X-VCS-Directories: dev-db/pgpool2/ X-VCS-Committer: titanofold X-VCS-Committer-Name: Aaron Swenson X-VCS-Revision: f0bf9e33b1b43f9e93200cc8b3cdc4733728ca2a X-VCS-Branch: master Date: Fri, 3 Aug 2018 13:36:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3e5960ee-06a7-4c96-8160-fe1f08489667 X-Archives-Hash: 71220f3eb200926187d31b430d968ee3 commit: f0bf9e33b1b43f9e93200cc8b3cdc4733728ca2a Author: Aaron W. Swenson gentoo org> AuthorDate: Fri Aug 3 13:29:25 2018 +0000 Commit: Aaron Swenson gentoo org> CommitDate: Fri Aug 3 13:34:04 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0bf9e33 dev-db/pgpool2: Remove litter from patch Package-Manager: Portage-2.3.40, Repoman-2.3.9 dev-db/pgpool2/pgpool2-9999.ebuild.orig | 104 -------------------------------- 1 file changed, 104 deletions(-) diff --git a/dev-db/pgpool2/pgpool2-9999.ebuild.orig b/dev-db/pgpool2/pgpool2-9999.ebuild.orig deleted file mode 100644 index 5881c059c51..00000000000 --- a/dev-db/pgpool2/pgpool2-9999.ebuild.orig +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://git.postgresql.org/git/pgpool2.git" - -POSTGRES_COMPAT=( 9.{3..6} {10..11} ) - -inherit autotools git-r3 postgres-multi - -DESCRIPTION="Connection pool server for PostgreSQL" -HOMEPAGE="http://www.pgpool.net/" -SRC_URI="" -LICENSE="BSD" -SLOT="0" - -KEYWORDS="" - -IUSE="doc memcached pam ssl static-libs" - -RDEPEND=" - ${POSTGRES_DEP} - net-libs/libnsl:0= - memcached? ( dev-libs/libmemcached ) - pam? ( sys-auth/pambase ) - ssl? ( dev-libs/openssl:* ) -" -DEPEND="${RDEPEND} - !!dev-db/pgpool - sys-devel/bison - virtual/pkgconfig - doc? ( - app-text/openjade - dev-libs/libxml2 - dev-libs/libxslt - ) -" - -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-9999.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 - use doc && postgres-multi_forbest emake DESTDIR="${D}" -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 - - # 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 {} + -}