diff options
Diffstat (limited to 'sys-devel/autoconf-vanilla/files')
15 files changed, 0 insertions, 471 deletions
diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch deleted file mode 100644 index 47605af5f59c..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.13-destdir.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -41,18 +41,18 @@ - - transform=@program_transform_name@ - --prefix = @prefix@ -+prefix = $(DESTDIR)@prefix@ --exec_prefix = @exec_prefix@ -+exec_prefix = $(DESTDIR)@exec_prefix@ - - # Directory in which to install scripts. --bindir = @bindir@ -+bindir = $(DESTDIR)@bindir@ - - # Directory in which to install library files. --datadir = @datadir@ -+datadir = $(DESTDIR)@datadir@ - acdatadir = $(datadir)/autoconf - - # Directory in which to install documentation info files. --infodir = @infodir@ -+infodir = $(DESTDIR)@infodir@ - - #### End of system configuration section. #### - diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch deleted file mode 100644 index 44f09cba92f0..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.13-gentoo.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- a/configure -+++ b/configure -@@ -654,12 +654,10 @@ - echo "$ac_t""no" 1>&6 - fi - --if test "$PERL" != no; then -- SCRIPTS=autoscan --else -- echo "configure: warning: autoscan will not be built since perl is not found" 1>&2 -+if test "$PERL" = no; then -+ PERL=/usr/bin/perl - fi -- -+SCRIPTS=autoscan - ac_aux_dir= - for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then ---- a/configure.in -+++ b/configure.in -@@ -14,12 +14,10 @@ - AC_PATH_PROG(PERL, perl, no) - AC_SUBST(PERL)dnl - AC_SUBST(SCRIPTS)dnl --if test "$PERL" != no; then -- SCRIPTS=autoscan --else -- AC_MSG_WARN(autoscan will not be built since perl is not found) -+if test "$PERL" = no; then -+ PERL=/usr/bin/perl - fi -- -+SCRIPTS=autoscan - AC_PROG_INSTALL - - # Work with the GNU or Cygnus source tree layout. diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch deleted file mode 100644 index 6fbc0cd1bc89..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.13-perl-5.26.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN autoconf-2.13.orig/autoscan.pl autoconf-2.13/autoscan.pl ---- autoconf-2.13.orig/autoscan.pl 1999-01-05 14:28:42.000000000 +0100 -+++ autoconf-2.13/autoscan.pl 2018-12-22 19:55:10.986732296 +0100 -@@ -232,7 +232,7 @@ - # Strip out comments and variable references. - s/#.*//; - s/\$\([^\)]*\)//g; -- s/\${[^\}]*}//g; -+ s/\$\{[^\}]*}//g; - s/@[^@]*@//g; - - # Variable assignments. diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch deleted file mode 100644 index b8a7e3b8ce99..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.13-test-fixes.patch +++ /dev/null @@ -1,18 +0,0 @@ -newer gcc versions don't provide g77, so if it doesn't exist, -don't bother trying to test it (and failing) - -http://bugs.gentoo.org/146592 - ---- autoconf-2.13/testsuite/autoconf.s/syntax.exp -+++ autoconf-2.13/testsuite/autoconf.s/syntax.exp -@@ -5,6 +5,10 @@ - set macros [exec sed -n $script $srcdir/../acspecific.m4] - - foreach mac $macros { -+ if { [string match "*F77*" "$mac"] && [catch {exec which g77} ignore_output] } then { -+ send_user "XFAIL: $mac\n" -+ continue -+ } - send_user "$mac\n" - autoconf_test $mac $mac - } diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch deleted file mode 100644 index 83f450e6f5af..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.61-darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bin/autoreconf.in -+++ b/bin/autoreconf.in -@@ -110,7 +110,7 @@ - my $autoheader = $ENV{'AUTOHEADER'} || '@bindir@/@autoheader-name@'; - my $automake = $ENV{'AUTOMAKE'} || 'automake'; - my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; --my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; -+my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize'; - my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; - - # --install -- as --add-missing in other tools. diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch deleted file mode 100644 index e75eba621606..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.69-fix-libtool-test.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 247b02e5a5bb79ca6666e91de02ae2d3cb0cd325 Mon Sep 17 00:00:00 2001 -From: "Gary V. Vaughan" <gary@gnu.org> -Date: Mon, 3 Nov 2014 07:25:03 +0100 -Subject: tests: avoid spurious test failure with libtool 2.4.3 - -Based on a report by Bruce Dubbs. - -* tests/foreign.at (Libtool): Be tolerant of 'quote' replacing the -older `quote'. - -Signed-off-by: Eric Blake <eblake@redhat.com> ---- - tests/foreign.at | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tests/foreign.at b/tests/foreign.at -index a9dc33c..d4702cd 100644 ---- a/tests/foreign.at -+++ b/tests/foreign.at -@@ -57,7 +57,7 @@ AT_CHECK([./config.guess || exit 77], [], [ignore], [ignore]) - # Make sure at-path contains something valid, and let the test suite - # display it when verbose. And fail, skipping would too easily hide - # problems. --AT_CHECK([sed -n ["s,^.*\`\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout]) -+AT_CHECK([sed -n ["s,^[^']*[\`']\\(/[^']*\\)'.*,\\1,p"] stdout], [0], [stdout]) - AT_CHECK([test -f "`sed -n 1p stdout`"]) - - # Older libtoolize installed everything but install-sh... --- -cgit v1.0-41-gc330 - diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch deleted file mode 100644 index 1afcec15bb4f..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.69-make-tests-bash5-compatible.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 5b9db67786a428164abafe626ab11a2754aad528 Mon Sep 17 00:00:00 2001 -From: Ondrej Dubaj <odubaj@redhat.com> -Date: Wed, 28 Aug 2019 07:39:50 +0200 -Subject: Port tests to Bash 5 - -* tests/local.at (AT_CHECK_ENV, AT_CONFIG_CMP): -Add BASH_ARGC, BASH_ARGV to list of variables to be ignored when -comparing variable space dumps. -(AT_CONFIG_CMP): Also ignore LINENO. -* tests/m4sh.at: Also unset LINENO in 'reference' and 'test/test-1'. ---- - tests/local.at | 5 ++++- - tests/m4sh.at | 4 ++-- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/tests/local.at b/tests/local.at -index a22958c0..852be285 100644 ---- a/tests/local.at -+++ b/tests/local.at -@@ -325,7 +325,7 @@ if test -f state-env.before && test -f state-env.after; then - [AWK|LEX|LEXLIB|LEX_OUTPUT_ROOT|LN_S|M4|MKDIR_P|RANLIB|SET_MAKE|YACC], - [GREP|[EF]GREP|SED], - [[_@]|.[*#?$].], -- [argv|ARGC|LINENO|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ -+ [argv|ARGC|LINENO|BASH_ARGC|BASH_ARGV|OLDPWD|PIPESTATUS|RANDOM|SECONDS]))=' \ - $act_file || - test $? -eq 1 || echo failed >&2 - ) 2>stderr-$act_file | -@@ -382,6 +382,9 @@ do - /'\'\\\$\''=/ d - /^argv=/ d - /^ARGC=/ d -+ /^BASH_ARGC=/ d -+ /^BASH_ARGV=/ d -+ /^LINENO=/ d - ' $act_file >at_config_vars-$act_file - done - AT_CMP([at_config_vars-$1], [at_config_vars-$2])[]dnl -diff --git a/tests/m4sh.at b/tests/m4sh.at -index e9d70b02..cbdfcb62 100644 ---- a/tests/m4sh.at -+++ b/tests/m4sh.at -@@ -254,7 +254,7 @@ AT_CHECK([autom4te -l m4sh $1.as -o $1]) - # `_oline_', once processed and ran, produces our reference. - # We check that we find ourselves by looking at a string which is - # available only in the original script: `_oline_'. --AT_DATA_LINENO([reference], [false], [__OLINE__], [_oline__]) -+AT_DATA_LINENO([reference], [true], [__OLINE__], [_oline__]) - AT_CHECK([./reference], 0, [stdout]) - - # The reference: -@@ -264,7 +264,7 @@ mv stdout expout - # Be sure to be out of the PATH. - AT_CHECK([mkdir test || exit 77]) - --AT_DATA_LINENO([test/test-1], [false], [__LINENO__], [LINENO]) -+AT_DATA_LINENO([test/test-1], [true], [__LINENO__], [LINENO]) - AT_CHECK([./test/test-1], 0, [expout]) - AT_CHECK([(PATH=test$PATH_SEPARATOR$PATH; export PATH; exec test-1)], - 0, [expout]) --- -cgit v1.2.1 - diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch deleted file mode 100644 index 6becf807c43e..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26-2.patch +++ /dev/null @@ -1,30 +0,0 @@ -https://bugs.gentoo.org/625576 - ---- autoconf-2.69/bin/autoheader.in -+++ autoconf-2.69/bin/autoheader.in -@@ -173,6 +173,12 @@ - # Source what the traces are trying to tell us. - verb "$me: running $autoconf to trace from $ARGV[0]"; - my $quoted_tmp = shell_quote ($tmp); -+my $perl_tmp; -+if ( $tmp =~ /^\// ) { -+ $perl_tmp=$tmp; -+} else { -+ $perl_tmp="./".$tmp; -+} - xsystem ("$autoconf" - # If you change this list, update the - # `Autoheader-preselections' section of autom4te.in. -@@ -182,9 +188,9 @@ - . " " . shell_quote ($ARGV[0]) . " >$quoted_tmp/traces.pl"); - - local (%verbatim, %symbol); --debug "$me: \`do'ing $tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; --do "$tmp/traces.pl"; --warn "couldn't parse $tmp/traces.pl: $@" if $@; -+debug "$me: \`do'ing $perl_tmp/traces.pl:\n" . `sed 's/^/| /' $quoted_tmp/traces.pl`; -+do "$perl_tmp/traces.pl"; -+warn "couldn't parse $perl_tmp/traces.pl: $@" if $@; - unless ($config_h) - { - error "error: AC_CONFIG_HEADERS not found in $ARGV[0]"; diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch deleted file mode 100644 index b3d7888ca722..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.69-perl-5.26.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e5654a5591884b92633c7785f325626711e7f7aa Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Tue, 29 Jan 2013 13:46:48 -0800 -Subject: [PATCH] autoscan: port to perl 5.17 - -* bin/autoscan.in (scan_sh_file): Escape '{'. This avoids a -feature that is deprecated in Perl 5.17. Reported by Ray Lauff in -<http://lists.gnu.org/archive/html/bug-autoconf/2013-01/msg00059.html>. ---- - bin/autoscan.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/autoscan.in b/bin/autoscan.in -index 993a750..db1df79 100644 ---- a/bin/autoscan.in -+++ b/bin/autoscan.in -@@ -358,7 +358,7 @@ sub scan_sh_file ($) - { - # Strip out comments and variable references. - s/#.*//; -- s/\${[^\}]*}//g; -+ s/\$\{[^\}]*}//g; - s/@[^@]*@//g; - - # Tokens in the code. --- -1.9.1 - diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch deleted file mode 100644 index 5b53d17135bc..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.71-AC_LANG_CALL_C_cxx.patch +++ /dev/null @@ -1,35 +0,0 @@ -https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc - -Note: we drop the comma from the comment because some packages -have bad quoting, and while that will need to be sorted when/if -autoconf 2.72 is released, we've got our hands full with the -Clang situation right now (bug #871753). - -From b27bc3e230bb12fdd9a813e38e82bc4c3e22b4cc Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Tue, 31 Aug 2021 16:30:46 -0700 -Subject: Port AC_LANG_CALL(C) to C++ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -* lib/autoconf/c.m4 (AC_LANG_CALL(C)): Add an extern "C" if C++. -Problem reported by Vincent Lefèvre (sr #110532). ---- a/lib/autoconf/c.m4 -+++ b/lib/autoconf/c.m4 -@@ -126,7 +126,13 @@ m4_define([AC_LANG_CALL(C)], - m4_if([$2], [main], , - [/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC -- builtin and then its argument prototype would still apply. */ -+ builtin and then its argument prototype would still apply. -+ The 'extern "C"' is for builds by C++ compilers; -+ although this is not generally supported in C code supporting it here -+ has little cost and some practical benefit (sr 110532). */ -+#ifdef __cplusplus -+extern "C" -+#endif - char $2 ();])], [return $2 ();])]) - - -cgit v1.1 diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-conflicts.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-conflicts.patch deleted file mode 100644 index d9829d1ae213..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.71-conflicts.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 0d784a60bb65eb730a1b5f2b24887192d058629b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org> -Date: Sat, 4 Nov 2023 00:32:48 +0100 -Subject: [PATCH] Append '-vanilla' to pkgdatadir - ---- - Makefile.am | 3 +++ - Makefile.in | 2 +- - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 17e1f8f..73d2ea7 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,6 +18,9 @@ - - ACLOCAL_AMFLAGS = -I m4 - -+# Work around file conflicts against sys-devel/autoconf -- Arsen -+pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@ -+ - ## All of these will be incrementally updated later, here or in included - ## makefile fragments. - ETAGS_ARGS = -diff --git a/Makefile.in b/Makefile.in -index dcd27f7..704248f 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -195,7 +195,6 @@ am__make_running_with_option = \ - test $$has_opt = yes - am__make_dryrun = (target_option=n; $(am__make_running_with_option)) - am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) --pkgdatadir = $(datadir)/@PACKAGE@-@VERSION@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ -@@ -401,6 +400,7 @@ distuninstallcheck_listfiles = find . -type f -print - am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' - distcleancheck_listfiles = find . -type f -print -+pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@ - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ - AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ --- -2.42.0 - diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch deleted file mode 100644 index c122aee4b22d..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.71-darwin.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/bin/autoreconf.in -+++ b/bin/autoreconf.in -@@ -122,7 +122,7 @@ - my $autom4te = $ENV{'AUTOM4TE'} || '@bindir@/@autom4te-name@'; - my $automake = $ENV{'AUTOMAKE'} || 'automake'; - my $aclocal = $ENV{'ACLOCAL'} || 'aclocal'; --my $libtoolize = $ENV{'LIBTOOLIZE'} || 'libtoolize'; -+my $libtoolize = $ENV{'LIBTOOLIZE'} || 'glibtoolize'; - my $intltoolize = $ENV{'INTLTOOLIZE'} || 'intltoolize'; - my $gtkdocize = $ENV{'GTKDOCIZE'} || 'gtkdocize'; - my $autopoint = $ENV{'AUTOPOINT'} || 'autopoint'; diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch deleted file mode 100644 index 4dcf05996180..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.71-make-4.4.patch +++ /dev/null @@ -1,25 +0,0 @@ -https://git.savannah.gnu.org/cgit/autoconf.git/commit/?id=31f673434ee402258b45e958c88acc8725d82b1a -https://savannah.gnu.org/bugs/?63040 -https://bugs.gentoo.org/869257 - -From 31f673434ee402258b45e958c88acc8725d82b1a Mon Sep 17 00:00:00 2001 -From: Paul Eggert <eggert@cs.ucla.edu> -Date: Fri, 9 Sep 2022 16:54:11 -0500 -Subject: Port to GNU make 4.4 - -* cfg.mk (PATH): Assign eagerly, and simplify shell use, avoiding -use of the shell entirely if PWD is set, as it should be. -Problem reported by Sergei Trofimovich in: -https://lists.gnu.org/r/autoconf-patches/2022-09/msg00007.html ---- a/cfg.mk -+++ b/cfg.mk -@@ -18,7 +18,7 @@ - # This file is '-include'd into GNUmakefile. - - # Build with our own versions of these tools, when possible. --export PATH = $(shell echo "`pwd`/tests:$$PATH") -+export PATH := $(or $(PWD),$(shell pwd))/tests:$(PATH) - - # Remove the autoreconf-provided INSTALL, so that we regenerate it. - _autoreconf = autoreconf -i -v && rm -f INSTALL -cgit v1.1 diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch deleted file mode 100644 index 8ecfe10f40a3..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.71-time.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e194b3c7e00429612a9d40e78ea571687fd25b91 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= <dilfridge@gentoo.org> -Date: Sun, 1 Aug 2021 19:07:48 +0200 -Subject: [PATCH] Use stat from Time::HiRes (instead of File::stat) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org> ---- - lib/Autom4te/FileUtils.pm | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - -diff --git a/lib/Autom4te/FileUtils.pm b/lib/Autom4te/FileUtils.pm -index a182031b..27a5fd91 100644 ---- a/lib/Autom4te/FileUtils.pm -+++ b/lib/Autom4te/FileUtils.pm -@@ -34,12 +34,12 @@ This perl module provides various general purpose file handling functions. - - =cut - --use 5.006; -+use 5.008; - use strict; - use warnings FATAL => 'all'; - - use Exporter; --use File::stat; -+use Time::HiRes qw(stat); - use IO::File; - - use Autom4te::Channels; -@@ -115,10 +115,11 @@ sub mtime ($) - return 0 - if $file eq '-' || ! -f $file; - -- my $stat = stat ($file) -+ my ($dev,$ino,$mode,$nlink,$uid,$gid,$rdev,$size, -+ $atime,$mtime,$ctime,$blksize,$blocks) = stat ($file) - or fatal "cannot stat $file: $!"; - -- return $stat->mtime; -+ return $mtime; - } - - --- -2.31.1 - diff --git a/sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch b/sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch deleted file mode 100644 index b90864eacecb..000000000000 --- a/sys-devel/autoconf-vanilla/files/autoconf-2.72-conflicts.patch +++ /dev/null @@ -1,49 +0,0 @@ -From ca78a8d7d653ac8199fa0346a814289ed7aef960 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@gentoo.org> -Date: Sat, 4 Nov 2023 00:32:48 +0100 -Subject: [PATCH] Append '-vanilla' to pkgdatadir - ---- - Makefile.am | 3 +++ - Makefile.in | 4 +++- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/Makefile.am b/Makefile.am -index 1db714b..cb0650a 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -18,6 +18,9 @@ - - ACLOCAL_AMFLAGS = -I m4 - -+# Work around file conflicts against sys-devel/autoconf -- Arsen -+pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@ -+ - ## All of these will be incrementally updated later, here or in included - ## makefile fragments. - ETAGS_ARGS = -diff --git a/Makefile.in b/Makefile.in -index e5b3da5..04a3732 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -195,7 +195,6 @@ am__make_running_with_option = \ - test $$has_opt = yes - am__make_dryrun = (target_option=n; $(am__make_running_with_option)) - am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) --pkgdatadir = $(datadir)/@PACKAGE@-@VERSION@ - pkgincludedir = $(includedir)/@PACKAGE@ - pkglibdir = $(libdir)/@PACKAGE@ - pkglibexecdir = $(libexecdir)/@PACKAGE@ -@@ -398,6 +397,9 @@ distuninstallcheck_listfiles = find . -type f -print - am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ - | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' - distcleancheck_listfiles = find . -type f -print -+ -+# Work around file conflicts against sys-devel/autoconf -- Arsen -+pkgdatadir = $(datadir)/@PACKAGE@-vanilla-@VERSION@ - ACLOCAL = @ACLOCAL@ - AMTAR = @AMTAR@ - AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ --- -2.43.0 - |