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 0DE91138335 for ; Sun, 20 Oct 2019 12:21:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 268ADE0A98; Sun, 20 Oct 2019 12:21:26 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 10E9EE0A98 for ; Sun, 20 Oct 2019 12:21:26 +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 D4E1A34C0A3 for ; Sun, 20 Oct 2019 12:21:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A30AE828 for ; Sun, 20 Oct 2019 12:21:22 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1571574062.ca84438ae88deef4af1054a66f222e3935bf43b2.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-misc/htdig/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild X-VCS-Directories: www-misc/htdig/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: ca84438ae88deef4af1054a66f222e3935bf43b2 X-VCS-Branch: master Date: Sun, 20 Oct 2019 12:21:22 +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: e28626d7-b3c0-4428-ae0d-2b32cf87038c X-Archives-Hash: 0373314dfd8020388329b1e0c2baaa43 commit: ca84438ae88deef4af1054a66f222e3935bf43b2 Author: David Seifert gentoo org> AuthorDate: Sun Oct 20 12:18:53 2019 +0000 Commit: David Seifert gentoo org> CommitDate: Sun Oct 20 12:21:02 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca84438a www-misc/htdig: [QA] Multiple fixes * HTML_DOCS too nested * .la files not removed * Missing sub-slot operators * Metadata var order Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: David Seifert gentoo.org> www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild index 2a56281d446..97a63976bca 100644 --- a/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild +++ b/www-misc/htdig/htdig-3.2.0_beta6-r5.ebuild @@ -5,8 +5,7 @@ EAPI=7 inherit autotools -MY_PV=${PV/_beta/b} -S=${WORKDIR}/${PN}-${MY_PV} +MY_PV="${PV/_beta/b}" DESCRIPTION="HTTP/HTML indexing and searching system" HOMEPAGE="http://www.htdig.org" @@ -18,12 +17,15 @@ KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-lin IUSE="libressl ssl" DEPEND=" - >=sys-libs/zlib-1.1.3 + sys-libs/zlib app-arch/unzip ssl? ( - !libressl? ( dev-libs/openssl:0 ) - libressl? ( dev-libs/libressl ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) )" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}-${MY_PV}" PATCHES=( "${FILESDIR}"/${P}-gcc4.patch @@ -33,8 +35,7 @@ PATCHES=( "${FILESDIR}"/${P}-musl.patch "${FILESDIR}"/${P}-drop-bogus-assignment.patch #638720 ) - -HTML_DOCS=( htdoc ) +HTML_DOCS=( htdoc/. ) src_prepare() { default @@ -62,6 +63,10 @@ src_install () { "${ED}"/etc/${PN}/${PN}.conf \ "${ED}"/usr/bin/rundig \ || die "sed failed (removing \${D} from installed files)" + # symlink htsearch so it can be easily found. see bug #62087 dosym ../../var/www/localhost/cgi-bin/htsearch /usr/bin/htsearch + + # no static archives + find "${D}" -name '*.la' -delete || die }