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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F26B9158093 for ; Sat, 2 Jul 2022 22:04:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2E770E0D55; Sat, 2 Jul 2022 22:04:44 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 09481E0D55 for ; Sat, 2 Jul 2022 22:04:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31691341CEE for ; Sat, 2 Jul 2022 22:04:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7B61E516 for ; Sat, 2 Jul 2022 22:04:41 +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: <1656799475.8efc873bc49df07e5313f063c0ed9c1192e78be7.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-apache/libapreq2/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-apache/libapreq2/libapreq2-2.16-r1.ebuild www-apache/libapreq2/libapreq2-2.16.ebuild X-VCS-Directories: www-apache/libapreq2/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 8efc873bc49df07e5313f063c0ed9c1192e78be7 X-VCS-Branch: master Date: Sat, 2 Jul 2022 22:04:41 +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: 399f1037-9f4f-4bb3-a51b-d16c3d890255 X-Archives-Hash: d19fead6bd498de5535587f6cd9ce709 commit: 8efc873bc49df07e5313f063c0ed9c1192e78be7 Author: David Seifert gentoo org> AuthorDate: Sat Jul 2 22:04:35 2022 +0000 Commit: David Seifert gentoo org> CommitDate: Sat Jul 2 22:04:35 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8efc873b www-apache/libapreq2: update EAPI 6 -> 7 Closes: https://bugs.gentoo.org/811084 Signed-off-by: David Seifert gentoo.org> ...apreq2-2.16.ebuild => libapreq2-2.16-r1.ebuild} | 40 +++++++++++----------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/www-apache/libapreq2/libapreq2-2.16.ebuild b/www-apache/libapreq2/libapreq2-2.16-r1.ebuild similarity index 63% rename from www-apache/libapreq2/libapreq2-2.16.ebuild rename to www-apache/libapreq2/libapreq2-2.16-r1.ebuild index 1b153b066441..4d50482c8c95 100644 --- a/www-apache/libapreq2/libapreq2-2.16.ebuild +++ b/www-apache/libapreq2/libapreq2-2.16-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit apache-module perl-module DESCRIPTION="A library for manipulating client request data via the Apache API" -SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz" HOMEPAGE="https://httpd.apache.org/apreq/" +SRC_URI="mirror://apache/httpd/libapreq/${P}.tar.gz" LICENSE="Apache-2.0" SLOT="2" @@ -25,23 +25,17 @@ RDEPEND=" virtual/perl-version >=www-apache/mod_perl-2 ) -" -# sys-apps/file should be BDEPEND when we can use EAPI 7 -# bug #778173 + virtual/libcrypt:=" DEPEND=" ${RDEPEND} - sys-apps/file - test? ( dev-perl/Apache-Test ) -" + test? ( dev-perl/Apache-Test )" +BDEPEND="sys-apps/file" -PATCHES=( - "${FILESDIR}"/libapreq2-2.08-doc.patch -) +PATCHES=( "${FILESDIR}"/libapreq2-2.08-doc.patch ) APACHE2_MOD_FILE="module/apache2/.libs/mod_apreq2.so" APACHE2_MOD_CONF="76_mod_apreq" APACHE2_MOD_DEFINE="APREQ" -DOCFILES="docs/html/*.html CHANGES README INSTALL MANIFEST" need_apache2 @@ -52,13 +46,12 @@ pkg_setup() { src_prepare() { default - sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/acinclude.m4 || die - sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/aclocal.m4 || die - sed -i -e "s/PERL \$PERL_OPTS/PERL/" "${S}"/configure || die + sed -i -e "s/PERL \$PERL_OPTS/PERL/" acinclude.m4 aclocal.m4 configure || die } src_configure() { econf \ + --disable-static \ --with-apache2-apxs=${APXS} \ $(use_enable perl perl-glue) } @@ -72,9 +65,16 @@ src_install() { perl_delete_localpod - for i in $(find "${D}" -type f -not -name '*.so'); do - if file ${i} | grep -i " text"; then - sed -i -e "s:${D}:/:g" ${i} || die + HTML_DOCS=( docs/html/. ) + einstalldocs + dodoc INSTALL MANIFEST + + local f + while IFS="" read -d $'\0' -r f ; do + if file "${f}" | grep -i " text"; then + sed -i -e "s:${ED}:/:g" "${f}" || die fi - done + done < <(find "${ED}" -type f -not -name '*.so' -print0) + + find "${ED}" -name '*.la' -delete || die }