commit: 573d8bcc00510bb6fe6d688343043f966f3e591d
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 17 02:12:50 2020 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Tue Mar 17 02:12:50 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=573d8bcc
net-misc/rsync: fix runstatedir introduced with autoconf-2.69-r5
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
net-misc/rsync/files/rsync-3.1.3-runstatedir.patch | 65 ++++++++++++++++++++++
net-misc/rsync/rsync-3.1.3.ebuild | 8 ++-
2 files changed, 72 insertions(+), 1 deletion(-)
diff --git a/net-misc/rsync/files/rsync-3.1.3-runstatedir.patch
b/net-misc/rsync/files/rsync-3.1.3-runstatedir.patch
new file mode 100644
index 0000000..60609cb
--- /dev/null
+++ b/net-misc/rsync/files/rsync-3.1.3-runstatedir.patch
@@ -0,0 +1,65 @@
+From e14d42421cb96feb4d88ed01ca26026c5b5fa6cc Mon Sep 17 00:00:00 2001
+From: Jory Pratt <anar...@gentoo.org>
+Date: Mon, 16 Mar 2020 20:50:22 -0500
+Subject: [PATCH] Fix autoconf-2.68-runstatedir.patch
+
+---
+ configure.sh | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/configure.sh b/configure.sh
+index 981203b..f950f4a 100755
+--- a/configure.sh
++++ b/configure.sh
+@@ -682,6 +682,7 @@ infodir
+ docdir
+ oldincludedir
+ includedir
++runstatedir
+ localstatedir
+ sharedstatedir
+ sysconfdir
+@@ -769,6 +770,7 @@ datadir='${datarootdir}'
+ sysconfdir='${prefix}/etc'
+ sharedstatedir='${prefix}/com'
+ localstatedir='${prefix}/var'
++runstatedir='${localstatedir}/run'
+ includedir='${prefix}/include'
+ oldincludedir='/usr/include'
+ docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
+@@ -1021,6 +1023,15 @@ do
+ | -silent | --silent | --silen | --sile | --sil)
+ silent=yes ;;
+
++ -runstatedir | --runstatedir | --runstatedi | --runstated \
++ | --runstate | --runstat | --runsta | --runst | --runs \
++ | --run | --ru | --r)
++ ac_prev=runstatedir ;;
++ -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
++ | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
++ | --run=* | --ru=* | --r=*)
++ runstatedir=$ac_optarg ;;
++
+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
+ ac_prev=sbindir ;;
+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
+@@ -1158,7 +1169,7 @@ fi
+ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
+ datadir sysconfdir sharedstatedir localstatedir includedir \
+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
+- libdir localedir mandir
++ libdir localedir mandir runstatedir
+ do
+ eval ac_val=\$$ac_var
+ # Remove trailing slashes.
+@@ -1311,6 +1322,7 @@ Fine tuning of the installation directories:
+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
+ --sharedstatedir=DIR modifiable architecture-independent data
[PREFIX/com]
+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
++ --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run]
+ --libdir=DIR object code libraries [EPREFIX/lib]
+ --includedir=DIR C header files [PREFIX/include]
+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
+--
+2.25.1
+
diff --git a/net-misc/rsync/rsync-3.1.3.ebuild
b/net-misc/rsync/rsync-3.1.3.ebuild
index af6dfbd..1eddf87 100644
--- a/net-misc/rsync/rsync-3.1.3.ebuild
+++ b/net-misc/rsync/rsync-3.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -30,6 +30,12 @@ PATCHES=(
S="${WORKDIR}/${P/_/}"
+src_prepare() {
+ has_version '>=sys-devel/autoconf-2.69-r5' && PATCHES+=(
"${FILESDIR}/${PN}-3.1.3-runstatedir.patch" )
+
+ default
+}
+
src_configure() {
use static && append-ldflags -static
local myeconfargs=(
