commit: 6b49ce0b8b7b4004f920eb26d0acf71abb665d90 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Tue Jan 12 17:32:21 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> CommitDate: Tue Jan 12 17:32:21 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b49ce0b
app-admin/conserver: Fixed build with sys-devel/autoconf:2.70 Bug: https://bugs.gentoo.org/750230 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> app-admin/conserver/conserver-8.2.6.ebuild | 6 +++- .../files/conserver-8.2.6-autoconf-2.70.patch | 32 ++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/app-admin/conserver/conserver-8.2.6.ebuild b/app-admin/conserver/conserver-8.2.6.ebuild index 8ecd6b02a53..aa64a2c5943 100644 --- a/app-admin/conserver/conserver-8.2.6.ebuild +++ b/app-admin/conserver/conserver-8.2.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -33,6 +33,10 @@ RDEPEND="${DEPEND} DOCS=( CHANGES FAQ PROTOCOL README.md conserver/Sun-serial contrib/maketestcerts) +PATCHES=( + "${FILESDIR}/${PN}-8.2.6-autoconf-2.70.patch" #750230 +) + src_prepare() { default sed -e '/^INSTALL_PROGRAM/s:-s::' \ diff --git a/app-admin/conserver/files/conserver-8.2.6-autoconf-2.70.patch b/app-admin/conserver/files/conserver-8.2.6-autoconf-2.70.patch new file mode 100644 index 00000000000..057809ffa44 --- /dev/null +++ b/app-admin/conserver/files/conserver-8.2.6-autoconf-2.70.patch @@ -0,0 +1,32 @@ +From ce3b4f1d000c75ace2be2be83a0cc0df84ff6983 Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomia...@gentoo.org> +Date: Tue, 12 Jan 2021 18:18:23 +0100 +Subject: [PATCH] configure.ac: autoconf-2.70 fix + +Gentoo-bug: https://bugs.gentoo.org/750230 +Signed-off-by: Lars Wendler <polynomia...@gentoo.org> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index ee2bc8a..26541f3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -30,11 +30,11 @@ AH_TEMPLATE([TRUST_UDS_CRED], [Defined if we trust credentials from UDS client]) + + dnl ### Normal initialization. ###################################### + AC_INIT([conserver],m4_esyscmd_s([./gen-version number])) +-AC_PREREQ(2.59) ++AC_PREREQ(2.69) + AC_CONFIG_SRCDIR([conserver/main.c]) + AC_CONFIG_HEADER(config.h) + +-AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $@") ++AC_DEFINE_UNQUOTED(CONFIGINVOCATION, "$0 $*") + + dnl ### Set some option defaults. ################################### + if test -z "$CFLAGS"; then +-- +2.30.0 +