From 8f806f078a5373d5be0af5a6ad6be23b7a851745 Mon Sep 17 00:00:00 2001
From: Sam James <sam@gentoo.org>
Date: Thu, 13 Oct 2022 20:55:51 +0100
Subject: www-client/elinks: rename old parallel-make patch

Signed-off-by: Sam James <sam@gentoo.org>
---
 www-client/elinks/elinks-0.13.5-r100.ebuild        |  4 +-
 .../elinks/files/elinks-0.13.5-parallel-make.patch | 51 ++++++++++++++++++++++
 .../elinks/files/elinks-9999-parallel-make.patch   | 51 ----------------------
 3 files changed, 53 insertions(+), 53 deletions(-)
 create mode 100644 www-client/elinks/files/elinks-0.13.5-parallel-make.patch
 delete mode 100644 www-client/elinks/files/elinks-9999-parallel-make.patch

(limited to 'www-client')

diff --git a/www-client/elinks/elinks-0.13.5-r100.ebuild b/www-client/elinks/elinks-0.13.5-r100.ebuild
index b4dfb74b0dae..a3b49623550e 100644
--- a/www-client/elinks/elinks-0.13.5-r100.ebuild
+++ b/www-client/elinks/elinks-0.13.5-r100.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,7 +49,7 @@ DEPEND="${RDEPEND}
 	${PYTHON_DEPS}"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-9999-parallel-make.patch
+	"${FILESDIR}"/${P}-parallel-make.patch
 )
 
 src_prepare() {
diff --git a/www-client/elinks/files/elinks-0.13.5-parallel-make.patch b/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
new file mode 100644
index 000000000000..86aea5588a2f
--- /dev/null
+++ b/www-client/elinks/files/elinks-0.13.5-parallel-make.patch
@@ -0,0 +1,51 @@
+--- a/Makefile.lib	2014-05-30 13:45:11.756422117 -0400
++++ b/Makefile.lib	2014-05-30 13:47:22.626423230 -0400
+@@ -117,7 +117,7 @@
+  $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
+  $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
+ 
+-$(LIB_O_NAME): $(LIB_O_DEPS)
++$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS)
+ 	$(call cmd,ld_objs)
+ 
+ DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
+@@ -260,21 +260,36 @@
+ # remaining subdirectories, but return an error at the end.
+ $(RULES_REC):
+ ifneq (,$(findstring k,$(MAKEFLAGS)))
+-	@suberr=0; \
++	@+suberr=0; \
+ 	$(foreach subdir,$(sort $(SUBDIRS)), \
+ 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || suberr=1;) \
+ 	exit $$suberr
+ else
+-	@$(foreach subdir,$(sort $(SUBDIRS)), \
++	@+$(foreach subdir,$(sort $(SUBDIRS)), \
+ 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;)
+ endif
+ 
++all-recursive.built:
++ifneq (,$(findstring k,$(MAKEFLAGS)))
++	@+suberr=0; \
++	$(foreach subdir,$(sort $(SUBDIRS)), \
++		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || suberr=1;) \
++	[ $$suberr == 0 ] && touch $@; \
++	exit $$suberr
++else
++	@+$(foreach subdir,$(sort $(SUBDIRS)), \
++		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || exit 1;) \
++	touch $@
++endif
++
++CLEAN += all-recursive.built
++
+ # Dummy -local rules
+ $(RULES_LOCAL):
+ 
+ # Default deps
+ rule_deps = $(1)-recursive $(1)-default $(1)-local
+-all:	  $(call rule_deps,all)
++all:	  $(subst recursive,recursive.built,$(call rule_deps,all))
+ install:  $(call rule_deps,install)
+ clean:	  $(call rule_deps,clean)
+ cleanall: $(call rule_deps,cleanall)
diff --git a/www-client/elinks/files/elinks-9999-parallel-make.patch b/www-client/elinks/files/elinks-9999-parallel-make.patch
deleted file mode 100644
index 86aea5588a2f..000000000000
--- a/www-client/elinks/files/elinks-9999-parallel-make.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- a/Makefile.lib	2014-05-30 13:45:11.756422117 -0400
-+++ b/Makefile.lib	2014-05-30 13:47:22.626423230 -0400
-@@ -117,7 +117,7 @@
-  $(sort $(filter-out $(LIB_O_NAME),$(OBJS))) \
-  $(foreach subdir,$(sort $(SUBDIRS)),$(wildcard $(subdir)/$(LIB_O_NAME)))
- 
--$(LIB_O_NAME): $(LIB_O_DEPS)
-+$(LIB_O_NAME): all-recursive.built $(LIB_O_DEPS)
- 	$(call cmd,ld_objs)
- 
- DEP_FILES_1 = $(foreach src,$(OBJS),.deps/$(src))
-@@ -260,21 +260,36 @@
- # remaining subdirectories, but return an error at the end.
- $(RULES_REC):
- ifneq (,$(findstring k,$(MAKEFLAGS)))
--	@suberr=0; \
-+	@+suberr=0; \
- 	$(foreach subdir,$(sort $(SUBDIRS)), \
- 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || suberr=1;) \
- 	exit $$suberr
- else
--	@$(foreach subdir,$(sort $(SUBDIRS)), \
-+	@+$(foreach subdir,$(sort $(SUBDIRS)), \
- 		$(call ncmd,recmake,$(subdir),$(subst -recursive,,$@)) || exit 1;)
- endif
- 
-+all-recursive.built:
-+ifneq (,$(findstring k,$(MAKEFLAGS)))
-+	@+suberr=0; \
-+	$(foreach subdir,$(sort $(SUBDIRS)), \
-+		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || suberr=1;) \
-+	[ $$suberr == 0 ] && touch $@; \
-+	exit $$suberr
-+else
-+	@+$(foreach subdir,$(sort $(SUBDIRS)), \
-+		$(call ncmd,recmake,$(subdir),$(subst -recursive.built,,$@)) || exit 1;) \
-+	touch $@
-+endif
-+
-+CLEAN += all-recursive.built
-+
- # Dummy -local rules
- $(RULES_LOCAL):
- 
- # Default deps
- rule_deps = $(1)-recursive $(1)-default $(1)-local
--all:	  $(call rule_deps,all)
-+all:	  $(subst recursive,recursive.built,$(call rule_deps,all))
- install:  $(call rule_deps,install)
- clean:	  $(call rule_deps,clean)
- cleanall: $(call rule_deps,cleanall)
-- 
cgit v1.2.3-65-gdbad