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 543471382C5 for ; Sun, 9 May 2021 19:18:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 992A1E077C; Sun, 9 May 2021 19:18:48 +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 82976E077C for ; Sun, 9 May 2021 19:18:48 +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 748ED340FAD for ; Sun, 9 May 2021 19:18:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id DE9FD5C4 for ; Sun, 9 May 2021 19:18:44 +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: <1620587891.892d87363aec7204a63be794507633bb07098e33.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/socklog/, app-admin/socklog/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch app-admin/socklog/socklog-2.1.0.ebuild X-VCS-Directories: app-admin/socklog/ app-admin/socklog/files/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: 892d87363aec7204a63be794507633bb07098e33 X-VCS-Branch: master Date: Sun, 9 May 2021 19:18: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: cd35d55c-6a5f-4064-8db3-0af64ea07cdd X-Archives-Hash: 7999c763d71e58c9b663feaa285b4d28 commit: 892d87363aec7204a63be794507633bb07098e33 Author: David Seifert gentoo org> AuthorDate: Sun May 9 19:18:11 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Sun May 9 19:18:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=892d8736 app-admin/socklog: Respect AR/RANLIB Closes: https://bugs.gentoo.org/779925 Closes: https://bugs.gentoo.org/779928 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: David Seifert gentoo.org> .../files/socklog-2.1.0-respect-ar-ranlib.patch | 18 ++++++++++++++++++ app-admin/socklog/socklog-2.1.0.ebuild | 18 +++++++++++------- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch b/app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch new file mode 100644 index 00000000000..6aacbd9b80d --- /dev/null +++ b/app-admin/socklog/files/socklog-2.1.0-respect-ar-ranlib.patch @@ -0,0 +1,18 @@ +--- a/print-ar.sh ++++ b/print-ar.sh +@@ -1,7 +1,7 @@ + cat warn-auto.sh + echo 'main="$1"; shift' + echo 'rm -f "$main"' +-echo 'ar cr "$main" ${1+"$@"}' ++echo '${AR} cr "$main" ${1+"$@"}' + case "`cat systype`" in + sunos-5.*) ;; + unix_sv*) ;; +@@ -10,5 +10,5 @@ + dgux-*) ;; + hp-ux-*) ;; + sco*) ;; +- *) echo 'ranlib "$main"' ;; ++ *) echo '${RANLIB} "$main"' ;; + esac diff --git a/app-admin/socklog/socklog-2.1.0.ebuild b/app-admin/socklog/socklog-2.1.0.ebuild index 1e48d512573..367d62460e7 100644 --- a/app-admin/socklog/socklog-2.1.0.ebuild +++ b/app-admin/socklog/socklog-2.1.0.ebuild @@ -1,13 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit flag-o-matic toolchain-funcs DESCRIPTION="Small secure replacement for syslogd with automatic log rotation" HOMEPAGE="http://smarden.org/socklog/" SRC_URI="http://smarden.org/socklog/${P}.tar.gz" +S="${WORKDIR}/admin/${P}/src" LICENSE="BSD" SLOT="0" @@ -16,15 +17,16 @@ IUSE="static" RDEPEND=">=sys-process/runit-1.4.0" -PATCHES=( "${FILESDIR}"/${PN}-2.1.0-headers.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-headers.patch + "${FILESDIR}"/${PN}-2.1.0-respect-ar-ranlib.patch +) -S=${WORKDIR}/admin/${P}/src - -src_prepare() { - default +src_configure() { use static && append-ldflags -static echo "$(tc-getCC) ${CFLAGS} ${CPPFLAGS}" > conf-cc || die echo "$(tc-getCC) ${CFLAGS} ${LDFLAGS}" > conf-ld || die + tc-export AR RANLIB } src_install() { @@ -33,6 +35,8 @@ src_install() { cd .. || die dodoc package/CHANGES - dohtml doc/*.html + docinto html + dodoc doc/*.html + doman man/* }