gentoo resync : 28.04.2021

4 files changed, 4 insertions, 210 deletions

diff --git a/app-misc/wcd/files/wcd-5.2.5-gentoo.patch b/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
deleted file mode 100644
index c838e131aa5f..000000000000
--- a/app-misc/wcd/files/wcd-5.2.5-gentoo.patch
+++ /dev/null
@@ -1,72 +0,0 @@
- src/Makefile | 20 ++++++++++----------
- 1 file changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/src/Makefile b/src/Makefile
-index d4120cc..4505b8d 100644
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -46,12 +46,12 @@ include version.mk
- 
- CC		?= gcc
- STATIC		=
--STRIP		= strip
-+STRIP		=
- 
- ENABLE_NLS = 1
- 
- PACKAGE		= wcd
--EXT		= .exe
-+EXT		=
- PROGRAM         = $(PACKAGE)$(EXT)
- BIN		= $(PROGRAM)
- 
-@@ -188,9 +188,9 @@ endif
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
- 
- ifdef UCS
--	CURSES = ncursesw
-+	CURSES = $(shell pkg-config --libs ncursesw)
- else
--	CURSES = ncurses
-+	CURSES = $(shell pkg-config --libs ncurses)
- endif
- 
- ifdef CURSES
-@@ -201,7 +201,7 @@ endif
- 
- ifneq (,$(CURSES))
- 	DEFS_CURSES = -DWCD_USECURSES
--	LIB_CURSES  = -l$(CURSES)
-+	LIB_CURSES  = $(CURSES)
- endif
- 
- 
-@@ -406,15 +406,15 @@ ifdef ASCII_TREE
- endif
- 
- LDFLAGS_USER   =
--LDFLAGS		= $(RPM_OPT_FLAGS) \
-+LIBS		= $(RPM_OPT_FLAGS) \
- 	          $(LDFLAGS_EXTRA) \
- 		  $(NLFLAG) \
- 		  $(LDFLAG_STATIC) \
- 		  $(LDFLAGS_USER)
- 
--LIBS = $(LIB_CURSES) \
--       $(LIB_UNISTRING) \
--       $(LIBS_EXTRA)
-+LIBS += $(LIB_CURSES) \
-+	$(LIB_UNISTRING) \
-+	$(LIBS_EXTRA)
- 
- DEFS_USER   =
- DEFS		= $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
-@@ -470,7 +470,7 @@ status:
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-5.3.4-gentoo.patch b/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
deleted file mode 100644
index 0839bdb069d9..000000000000
--- a/app-misc/wcd/files/wcd-5.3.4-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- wcd-5.3.4/src/Makefile
-+++ wcd-5.3.4/src/Makefile
-@@ -46,12 +46,12 @@
- 
- CC		?= gcc
- STATIC		=
--STRIP		= strip
-+STRIP		=
- 
- ENABLE_NLS = 1
- 
- PACKAGE		= wcd
--EXT		= .exe
-+EXT		=
- PROGRAM         = $(PACKAGE)$(EXT)
- BIN		= $(PROGRAM)
- 
-@@ -334,9 +334,9 @@
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
- 
- ifdef UCS
--	CURSES = ncursesw
-+	CURSES = $(shell pkg-config --libs ncursesw)
- else
--	CURSES = ncurses
-+	CURSES = $(shell pkg-config --libs ncurses)
- endif
- 
- 
-@@ -366,7 +366,7 @@
- 
- ifneq (,$(CURSES))
- 	DEFS_CURSES = -DWCD_USECURSES
--	LIB_CURSES  = -l$(CURSES)
-+	LIB_CURSES  = $(CURSES)
- ifeq (os/2,$(OS))
- 	LIB_CURSES  += -ltinfo
- endif
-@@ -456,15 +456,15 @@
- endif
- 
- LDFLAGS_USER   =
--LDFLAGS		= $(RPM_OPT_FLAGS) \
-+LIBS		= $(RPM_OPT_FLAGS) \
- 	          $(LDFLAGS_EXTRA) \
- 		  $(NLFLAG) \
- 		  $(LDFLAG_STATIC) \
- 		  $(LDFLAGS_USER)
- 
--LIBS = $(LIB_CURSES) \
--       $(LIB_UNISTRING) \
--       $(LIBS_EXTRA)
-+LIBS += $(LIB_CURSES) \
-+	$(LIB_UNISTRING) \
-+	$(LIBS_EXTRA)
- 
- DEFS_USER   =
- DEFS		= $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
-@@ -521,7 +521,7 @@
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-6.0.1-gentoo.patch b/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
deleted file mode 100644
index eca95856ca33..000000000000
--- a/app-misc/wcd/files/wcd-6.0.1-gentoo.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- wcd-6.0.1/src/Makefile
-+++ wcd-6.0.1/src/Makefile
-@@ -45,12 +45,12 @@
- 
- CC              ?= gcc
- STATIC          =
--STRIP           = strip
-+STRIP           =
- 
- ENABLE_NLS = 1
- 
- PACKAGE         = wcd
--EXT             = .exe
-+EXT             =
- PROGRAM         = $(PACKAGE)$(EXT)
- BIN             = $(PROGRAM)
- 
-@@ -329,9 +329,9 @@
- # possible values: ncurses, curses, pdcurses, pdcursesw or <empty>
- 
- ifdef UCS
--        CURSES = ncursesw
-+        CURSES = $(shell pkg-config --libs ncursesw)
- else
--        CURSES = ncurses
-+        CURSES = $(shell pkg-config --libs ncurses)
- endif
- 
- 
-@@ -361,7 +361,7 @@
- 
- ifneq (,$(CURSES))
-         DEFS_CURSES = -DWCD_USECURSES
--        LIB_CURSES  = -l$(CURSES)
-+        LIB_CURSES  = $(CURSES)
- ifeq (os/2,$(OS))
-         LIB_CURSES  += -ltinfo
- endif
-@@ -455,15 +455,15 @@
- endif
- 
- LDFLAGS_USER   =
--LDFLAGS         = $(RPM_OPT_FLAGS) \
-+LIBS            = $(RPM_OPT_FLAGS) \
-                   $(LDFLAGS_EXTRA) \
-                   $(NLFLAG) \
-                   $(LDFLAG_STATIC) \
-                   $(LDFLAGS_USER)
- 
--LIBS = $(LIB_CURSES) \
--       $(LIB_UNISTRING) \
--       $(LIBS_EXTRA)
-+LIBS += $(LIB_CURSES) \
-+	$(LIB_UNISTRING) \
-+	$(LIBS_EXTRA)
- 
- DEFS_USER   =
- DEFS            = $(DEF_UNIX) $(DEFS_CURSES) $(EXTRA_DEFS) $(DEFS_USER)
-@@ -520,7 +520,7 @@
- 
- $(BIN): $(OBJS1)
- 	$(MAKE) status
--	$(CC) $(OBJS1) $(LDFLAGS) $(LIBS) -o $@
-+	$(CC) $(LDFLAGS) $(OBJS1) -o $@ $(LIBS)
- 
- %.o: %.c
- 	$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(DEFS) -c $< -o $@
diff --git a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
index ecd7c530f156..eddeee89e046 100644
--- a/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
+++ b/app-misc/wcd/files/wcd-6.0.2-gentoo.patch
@@ -1,5 +1,5 @@
---- wcd-6.0.2/src/Makefile
-+++ wcd-6.0.2/src/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -45,12 +45,12 @@
  
  CC              ?= gcc
@@ -20,10 +20,10 @@
  
  ifdef UCS
 -        CURSES = ncursesw
-+        CURSES = $(shell pkg-config --libs ncursesw)
++        CURSES = $(shell ${PKG_CONFIG} --libs ncursesw)
  else
 -        CURSES = ncurses
-+        CURSES = $(shell pkg-config --libs ncurses)
++        CURSES = $(shell ${PKG_CONFIG} --libs ncurses)
  endif