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 42ADC138334 for ; Thu, 24 Oct 2019 10:22:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 186CAE082B; Thu, 24 Oct 2019 10:22:35 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 03EC3E082B for ; Thu, 24 Oct 2019 10:22:34 +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 6E0DF34C368 for ; Thu, 24 Oct 2019 10:22:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5C37E744 for ; Thu, 24 Oct 2019 10:22:31 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1571912546.8b60a6f50fa4274c9887e6c13506f10ae034e49c.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/man-db/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/man-db/man-db-9999.ebuild X-VCS-Directories: sys-apps/man-db/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 8b60a6f50fa4274c9887e6c13506f10ae034e49c X-VCS-Branch: master Date: Thu, 24 Oct 2019 10:22:31 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6bf9c988-8b44-4a15-9215-daadd8ad80f8 X-Archives-Hash: 50766f9f33bf1ecfcd428f3646f5a990 commit: 8b60a6f50fa4274c9887e6c13506f10ae034e49c Author: Lars Wendler gentoo org> AuthorDate: Thu Oct 24 09:37:25 2019 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Oct 24 10:22:26 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b60a6f5 sys-apps/man-db: live ebuild requires gnulib sources Package-Manager: Portage-2.3.78, Repoman-2.3.17 Signed-off-by: Lars Wendler gentoo.org> sys-apps/man-db/man-db-9999.ebuild | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/sys-apps/man-db/man-db-9999.ebuild b/sys-apps/man-db/man-db-9999.ebuild index 4d2bfc884fe..0d01ad57258 100644 --- a/sys-apps/man-db/man-db-9999.ebuild +++ b/sys-apps/man-db/man-db-9999.ebuild @@ -8,7 +8,7 @@ inherit systemd DESCRIPTION="a man replacement that utilizes berkdb instead of flat files" HOMEPAGE="http://www.nongnu.org/man-db/" if [[ "${PV}" = 9999* ]] ; then - inherit git-r3 + inherit autotools git-r3 EGIT_REPO_URI="https://git.savannah.gnu.org/git/man-db.git" else SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz" @@ -52,6 +52,36 @@ pkg_setup() { fi } +src_unpack() { + if [[ "${PV}" == *9999 ]] ; then + git-r3_src_unpack + + # We need to mess with gnulib :-/ + EGIT_REPO_URI="https://git.savannah.gnu.org/r/gnulib.git" \ + EGIT_CHECKOUT_DIR="${WORKDIR}/gnulib" \ + git-r3_src_unpack + else + default + fi +} + +src_prepare() { + default + if [[ "${PV}" == *9999 ]] ; then + local bootstrap_opts=( + --gnulib-srcdir=../gnulib + --no-bootstrap-sync + --copy + --no-git + ) + AUTORECONF="/bin/true" \ + LIBTOOLIZE="/bin/true" \ + sh ./bootstrap "${bootstrap_opts[@]}" || die + + eautoreconf + fi +} + src_configure() { export ac_cv_lib_z_gzopen=$(usex zlib) local myeconfargs=(