[gentoo-commits] repo/gentoo:master commit in: app-admin/socklog/, app-admin/socklog/files/

[gentoo-commits] repo/gentoo:master commit in: app-admin/socklog/, app-admin/socklog/files/

[David Seifert]

commit:     892d87363aec7204a63be794507633bb07098e33
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun May  9 19:18:11 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> 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 <soap <AT> 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/*
 }