From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Nov 2020 22:39:15 +0000
Subject: gentoo resync : 25.11.2020

---
 dev-libs/serdisplib/Manifest                       |   6 +-
 .../serdisplib/files/disable-static-build.patch    |  84 ----------------
 .../serdisplib-2.02-disable-static-build.patch     |  84 ++++++++++++++++
 .../files/serdisplib-2.02-use-destdir.patch        |  84 ++++++++++++++++
 dev-libs/serdisplib/files/use-destdir.patch        |  84 ----------------
 dev-libs/serdisplib/serdisplib-2.02-r1.ebuild      | 107 +++++++++++++++++++++
 dev-libs/serdisplib/serdisplib-2.02.ebuild         | 100 -------------------
 7 files changed, 278 insertions(+), 271 deletions(-)
 delete mode 100644 dev-libs/serdisplib/files/disable-static-build.patch
 create mode 100644 dev-libs/serdisplib/files/serdisplib-2.02-disable-static-build.patch
 create mode 100644 dev-libs/serdisplib/files/serdisplib-2.02-use-destdir.patch
 delete mode 100644 dev-libs/serdisplib/files/use-destdir.patch
 create mode 100644 dev-libs/serdisplib/serdisplib-2.02-r1.ebuild
 delete mode 100644 dev-libs/serdisplib/serdisplib-2.02.ebuild

(limited to 'dev-libs/serdisplib')

diff --git a/dev-libs/serdisplib/Manifest b/dev-libs/serdisplib/Manifest
index f9fcc1fcd431..c167e454fe84 100644
--- a/dev-libs/serdisplib/Manifest
+++ b/dev-libs/serdisplib/Manifest
@@ -1,5 +1,5 @@
-AUX disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa
-AUX use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
+AUX serdisplib-2.02-disable-static-build.patch 3327 BLAKE2B 677d3dcc121cbc42345e987055aa202ea8118c74bbb5edd0f5d50dc7408ec77e6f439e38d1277fcba87e31932be4794021c45fe55115d7e1325cafe506abc750 SHA512 ca19a3f05fbc70693892d201efb938c9fd1c298d9e4551a51e802d99999b91568607fa73696c4be991a833432969ae0981fe3daa1e2cd5d18bbc0406bd925faa
+AUX serdisplib-2.02-use-destdir.patch 3400 BLAKE2B 77d9adc8c9a44586cbe352c6273677704d7335fc75c82d50a681c361a10a45484ae0dfb3241bf9d99ba242f6548df9cb036992b46e157f9c4ec3ca098397be7e SHA512 370ace46b39ba5e67d7f728a3cb3980b75a2c7e6e5fb25273f9c3bfbe10f33479bfcff92e3074a2cb80985c114d161b78115410dd88330810f654875e57d7575
 DIST serdisplib-2.02.tar.gz 497028 BLAKE2B f35b6df60303a288b2a279d821a510089802019f33b7ee36b9c2fd1d1d6bef0b3118793e6d965076c1665e1e2555a553186ef1a9210712ef9d2bc1e090ec0a98 SHA512 d9936c25dc14e24eb02876f203476752340e621d8ee5c87ee99862575e45199bf46ff8487dfdd80b16a89543958fdf5a16a2aaf78d5cade06811cfb1592c45eb
-EBUILD serdisplib-2.02.ebuild 2556 BLAKE2B abbbf9c3e17ce00f2208664e62427d4fb91361ae16a7bc9b76e7f0917c7bd17518d95bf8eff374f5548276eaa5d49c0f152b16b877b16528920b356997499713 SHA512 80627f7f272a80678374611457131de45e6e80ed48b4e5cd0851b4aee3f41627ece004686dc939eb6ece718724f505b2e8423c42e6307886fddf62dabcd8d0df
+EBUILD serdisplib-2.02-r1.ebuild 2817 BLAKE2B 5b8a3bb31704f99a64523d6e5654162a0bb08457f22cbc2e450ec4bcb161679a664f34a3b17463c4839806546769d85be24af8cde68ca3f5f307e6615b53f7f7 SHA512 3c82e14965dc5e595039314cab3d89f84317216aea0edf25b8c7b0161abc8608df0ce74a54d8eb17df6eb6449068c4e2c7d3f939d4cc4d74aa3122b5fad33cda
 MISC metadata.xml 662 BLAKE2B 08a9e0f6642a8e77f31b102b1874b32e43728451e92ad3db770c06b93a3653c575844fdb1b92d4969640327b94ea56aec3caffe3afd48540709fde7c541644ac SHA512 5f67e02b44a93b45ac7f08be8e569d2974a761f54c4ddc90cc541459adc3e41b5702405d971f29c094e4b7755975d9f5cd4ba4ad0f6d9ee116e5fd6f4a2c2b91
diff --git a/dev-libs/serdisplib/files/disable-static-build.patch b/dev-libs/serdisplib/files/disable-static-build.patch
deleted file mode 100644
index 6364650a8207..000000000000
--- a/dev-libs/serdisplib/files/disable-static-build.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/server/Makefile.in	2018-05-15 21:52:38.966823295 +0200
-+++ b/server/Makefile.in	2018-05-15 21:58:27.137821967 +0200
-@@ -83,13 +83,13 @@
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFINES)  -c $(INCLUDES) $<
- 
--serdispd: $(LIB_DIR)/$(LIB_STATIC) $(SDISPDOBJECTS)
-+serdispd: $(LIB_DIR)/$(LIB_SHARED) $(SDISPDOBJECTS)
- 	$(CC) -o $@ $(SDISPDOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
- 
--serdisplearn: $(LIB_DIR)/$(LIB_STATIC) $(SLEARNOBJECTS)
-+serdisplearn: $(LIB_DIR)/$(LIB_SHARED) $(SLEARNOBJECTS)
- 	$(CC) -o $@ $(SLEARNOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
- 
--serdispproxy: $(LIB_DIR)/$(LIB_STATIC) $(SPROXYOBJECTS)
-+serdispproxy: $(LIB_DIR)/$(LIB_SHARED) $(SPROXYOBJECTS)
- 	$(CC) -o $@ $(SPROXYOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
- 
- 
---- a/src/Makefile.in	2018-05-15 22:09:10.087118208 +0200
-+++ b/src/Makefile.in	2018-05-15 22:11:22.224117704 +0200
-@@ -167,7 +167,7 @@
- 
- all: libraries programs
- 
--libraries: library.static library.shared
-+libraries: library.shared
- 
- library.static: $(LIB_DIR)/$(LIB_STATIC)
- 
-@@ -188,7 +188,7 @@
- 	cd $(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
- 	cd $(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
- 
--testserdisp: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
-+testserdisp: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
- 	$(CC) -o testserdisp $(OBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
- 
- clean:
-@@ -198,7 +198,7 @@
- distclean: clean
- 	/bin/rm -f Makefile
- 
--install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC)
-+install: $(LIB_DIR)/$(LIB_SHARED)
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
- 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
-@@ -206,7 +206,6 @@
- 	
- 	$(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/
- 	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/
--	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/
- 	list='$(LIB_HEADERFILES)'; \
- 	for headerfile in $$list; do \
- 	  $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \
---- a/tools/Makefile.in	2018-05-15 21:53:01.042823211 +0200
-+++ b/tools/Makefile.in	2018-05-15 21:59:45.142821669 +0200
-@@ -130,19 +130,19 @@
- .c.o:
- 	$(CC) $(CFLAGS) $(DEFINES)  -c $(INCLUDES) $<
- 
--multidisplay: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
-+multidisplay: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
- 	$(CC) -o multidisplay $(OBJ_MULTIDISPLAY) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) $(EXTRA_LIBS)
- 
--l4m132c_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
-+l4m132c_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
- 	$(CC) -o l4m132c_tool $(OBJ_L4M132C_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
- 
--sdcmegtron_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
-+sdcmegtron_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
- 	$(CC) -o sdcmegtron_tool $(OBJ_SDCMEGTRON_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
- 
--l4m320t_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
--	$(CC) -o l4m320t_tool $(OBJ_L4M320T_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
-+l4m320t_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
-+	$(CC) -o l4m320t_tool $(OBJ_L4M320T_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) $(EXTRA_LIBS)
- 
--touchscreen_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
-+touchscreen_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
- 	$(CC) -o touchscreen_tool $(OBJ_TOUCHSCREEN_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
- 
- clean:
diff --git a/dev-libs/serdisplib/files/serdisplib-2.02-disable-static-build.patch b/dev-libs/serdisplib/files/serdisplib-2.02-disable-static-build.patch
new file mode 100644
index 000000000000..6364650a8207
--- /dev/null
+++ b/dev-libs/serdisplib/files/serdisplib-2.02-disable-static-build.patch
@@ -0,0 +1,84 @@
+--- a/server/Makefile.in	2018-05-15 21:52:38.966823295 +0200
++++ b/server/Makefile.in	2018-05-15 21:58:27.137821967 +0200
+@@ -83,13 +83,13 @@
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES)  -c $(INCLUDES) $<
+ 
+-serdispd: $(LIB_DIR)/$(LIB_STATIC) $(SDISPDOBJECTS)
++serdispd: $(LIB_DIR)/$(LIB_SHARED) $(SDISPDOBJECTS)
+ 	$(CC) -o $@ $(SDISPDOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+-serdisplearn: $(LIB_DIR)/$(LIB_STATIC) $(SLEARNOBJECTS)
++serdisplearn: $(LIB_DIR)/$(LIB_SHARED) $(SLEARNOBJECTS)
+ 	$(CC) -o $@ $(SLEARNOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+-serdispproxy: $(LIB_DIR)/$(LIB_STATIC) $(SPROXYOBJECTS)
++serdispproxy: $(LIB_DIR)/$(LIB_SHARED) $(SPROXYOBJECTS)
+ 	$(CC) -o $@ $(SPROXYOBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+ 
+--- a/src/Makefile.in	2018-05-15 22:09:10.087118208 +0200
++++ b/src/Makefile.in	2018-05-15 22:11:22.224117704 +0200
+@@ -167,7 +167,7 @@
+ 
+ all: libraries programs
+ 
+-libraries: library.static library.shared
++libraries: library.shared
+ 
+ library.static: $(LIB_DIR)/$(LIB_STATIC)
+ 
+@@ -188,7 +188,7 @@
+ 	cd $(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
+ 	cd $(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
+ 
+-testserdisp: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++testserdisp: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o testserdisp $(OBJECTS) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+ clean:
+@@ -198,7 +198,7 @@
+ distclean: clean
+ 	/bin/rm -f Makefile
+ 
+-install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC)
++install: $(LIB_DIR)/$(LIB_SHARED)
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
+ 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
+@@ -206,7 +206,6 @@
+ 	
+ 	$(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/
+ 	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/
+-	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/
+ 	list='$(LIB_HEADERFILES)'; \
+ 	for headerfile in $$list; do \
+ 	  $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \
+--- a/tools/Makefile.in	2018-05-15 21:53:01.042823211 +0200
++++ b/tools/Makefile.in	2018-05-15 21:59:45.142821669 +0200
+@@ -130,19 +130,19 @@
+ .c.o:
+ 	$(CC) $(CFLAGS) $(DEFINES)  -c $(INCLUDES) $<
+ 
+-multidisplay: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++multidisplay: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o multidisplay $(OBJ_MULTIDISPLAY) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) $(EXTRA_LIBS)
+ 
+-l4m132c_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++l4m132c_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o l4m132c_tool $(OBJ_L4M132C_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+-sdcmegtron_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++sdcmegtron_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o sdcmegtron_tool $(OBJ_SDCMEGTRON_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+-l4m320t_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
+-	$(CC) -o l4m320t_tool $(OBJ_L4M320T_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
++l4m320t_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
++	$(CC) -o l4m320t_tool $(OBJ_L4M320T_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC) $(EXTRA_LIBS)
+ 
+-touchscreen_tool: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
++touchscreen_tool: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
+ 	$(CC) -o touchscreen_tool $(OBJ_TOUCHSCREEN_TOOL) $(LIB_SERDISP) $(EXTRA_LIBS_STATIC)
+ 
+ clean:
diff --git a/dev-libs/serdisplib/files/serdisplib-2.02-use-destdir.patch b/dev-libs/serdisplib/files/serdisplib-2.02-use-destdir.patch
new file mode 100644
index 000000000000..786d475cdd0f
--- /dev/null
+++ b/dev-libs/serdisplib/files/serdisplib-2.02-use-destdir.patch
@@ -0,0 +1,84 @@
+--- a/Makefile.in	2017-02-02 13:37:48.000000000 +0100
++++ b/Makefile.in	2018-05-15 21:52:25.900823345 +0200
+@@ -44,8 +44,8 @@
+ 	done && test -z "$$fail"
+ 
+ install:
+-	$(top_srcdir)/mkinstalldirs $(libdir)/pkgconfig
+-	$(INSTALL_DATA) serdisplib.pc $(libdir)/pkgconfig/
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
++	$(INSTALL_DATA) serdisplib.pc $(DESTDIR)$(libdir)/pkgconfig/
+ 	@for dir in ${subdirs}; do \
+ 	  (cd $(srcdir) && cd $$dir && $(MAKE) install) \
+ 	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
+--- a/server/Makefile.in	2013-05-25 12:58:14.000000000 +0200
++++ b/server/Makefile.in	2018-05-15 21:52:38.966823295 +0200
+@@ -104,18 +104,18 @@
+ 
+ 
+ install: $(PROGRAMS)
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(top_srcdir)/mkinstalldirs $(sbindir)
+-	$(top_srcdir)/mkinstalldirs $(sysconfdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
+ 	list='$(PROGRAMS_SBIN)'; \
+ 	for prog in $$list; do \
+-	  $(INSTALL_PROGRAM) $$prog $(sbindir)/ ; \
++	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(sbindir)/ ; \
+ 	done
+ 	list='$(PROGRAMS_BIN)'; \
+ 	for prog in $$list; do \
+-	  $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \
++	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \
+ 	done
+-	$(INSTALL_DATA) examples/serdispd.cfg $(sysconfdir)/
++	$(INSTALL_DATA) examples/serdispd.cfg $(DESTDIR)$(sysconfdir)/
+ 
+ 
+ uninstall:
+--- a/src/Makefile.in	2017-02-02 13:37:48.000000000 +0100
++++ b/src/Makefile.in	2018-05-15 21:52:56.268823229 +0200
+@@ -199,20 +199,20 @@
+ 	/bin/rm -f Makefile
+ 
+ install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC)
+-	$(top_srcdir)/mkinstalldirs $(bindir)
+-	$(top_srcdir)/mkinstalldirs $(libdir)
+-	$(top_srcdir)/mkinstalldirs $(includedir)
+-	$(top_srcdir)/mkinstalldirs $(includedir)/serdisplib
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
++	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/serdisplib
+ 	
+-	$(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)/
+-	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(libdir)/
+-	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(libdir)/
++	$(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/
++	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/
++	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/
+ 	list='$(LIB_HEADERFILES)'; \
+ 	for headerfile in $$list; do \
+-	  $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(includedir)/serdisplib/ ; \
++	  $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \
+ 	done
+-	cd $(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
+-	cd $(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
++	cd $(DESTDIR)$(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
++	cd $(DESTDIR)$(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
+ 
+ uninstall:
+ 	-/bin/rm -f $(libdir)/libserdisp*
+--- a/tools/Makefile.in	2014-03-30 09:13:59.000000000 +0200
++++ b/tools/Makefile.in	2018-05-15 21:53:01.042823211 +0200
+@@ -155,7 +155,7 @@
+ install: $(PROGRAMS)
+ 	list='$(PROGRAMS)'; \
+ 	for prog in $$list; do \
+-	  $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \
++	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \
+ 	done
+ 
+ uninstall: $(PROGRAMS)
diff --git a/dev-libs/serdisplib/files/use-destdir.patch b/dev-libs/serdisplib/files/use-destdir.patch
deleted file mode 100644
index 786d475cdd0f..000000000000
--- a/dev-libs/serdisplib/files/use-destdir.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- a/Makefile.in	2017-02-02 13:37:48.000000000 +0100
-+++ b/Makefile.in	2018-05-15 21:52:25.900823345 +0200
-@@ -44,8 +44,8 @@
- 	done && test -z "$$fail"
- 
- install:
--	$(top_srcdir)/mkinstalldirs $(libdir)/pkgconfig
--	$(INSTALL_DATA) serdisplib.pc $(libdir)/pkgconfig/
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)/pkgconfig
-+	$(INSTALL_DATA) serdisplib.pc $(DESTDIR)$(libdir)/pkgconfig/
- 	@for dir in ${subdirs}; do \
- 	  (cd $(srcdir) && cd $$dir && $(MAKE) install) \
- 	  || case "$(MFLAGS)" in *k*) fail=yes;; *) exit 1;; esac; \
---- a/server/Makefile.in	2013-05-25 12:58:14.000000000 +0200
-+++ b/server/Makefile.in	2018-05-15 21:52:38.966823295 +0200
-@@ -104,18 +104,18 @@
- 
- 
- install: $(PROGRAMS)
--	$(top_srcdir)/mkinstalldirs $(bindir)
--	$(top_srcdir)/mkinstalldirs $(sbindir)
--	$(top_srcdir)/mkinstalldirs $(sysconfdir)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sbindir)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(sysconfdir)
- 	list='$(PROGRAMS_SBIN)'; \
- 	for prog in $$list; do \
--	  $(INSTALL_PROGRAM) $$prog $(sbindir)/ ; \
-+	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(sbindir)/ ; \
- 	done
- 	list='$(PROGRAMS_BIN)'; \
- 	for prog in $$list; do \
--	  $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \
-+	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \
- 	done
--	$(INSTALL_DATA) examples/serdispd.cfg $(sysconfdir)/
-+	$(INSTALL_DATA) examples/serdispd.cfg $(DESTDIR)$(sysconfdir)/
- 
- 
- uninstall:
---- a/src/Makefile.in	2017-02-02 13:37:48.000000000 +0100
-+++ b/src/Makefile.in	2018-05-15 21:52:56.268823229 +0200
-@@ -199,20 +199,20 @@
- 	/bin/rm -f Makefile
- 
- install: $(LIB_DIR)/$(LIB_SHARED) $(LIB_DIR)/$(LIB_STATIC)
--	$(top_srcdir)/mkinstalldirs $(bindir)
--	$(top_srcdir)/mkinstalldirs $(libdir)
--	$(top_srcdir)/mkinstalldirs $(includedir)
--	$(top_srcdir)/mkinstalldirs $(includedir)/serdisplib
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)
-+	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(includedir)/serdisplib
- 	
--	$(INSTALL_PROGRAM) $(PROGRAMS) $(bindir)/
--	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(libdir)/
--	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(libdir)/
-+	$(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir)/
-+	$(INSTALL_PROGRAM) $(LIB_DIR)/$(LIB_SHARED) $(DESTDIR)$(libdir)/
-+	$(INSTALL_DATA) $(LIB_DIR)/$(LIB_STATIC) $(DESTDIR)$(libdir)/
- 	list='$(LIB_HEADERFILES)'; \
- 	for headerfile in $$list; do \
--	  $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(includedir)/serdisplib/ ; \
-+	  $(INSTALL_DATA) ../include/serdisplib/$$headerfile $(DESTDIR)$(includedir)/serdisplib/ ; \
- 	done
--	cd $(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
--	cd $(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
-+	cd $(DESTDIR)$(libdir) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
-+	cd $(DESTDIR)$(libdir) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
- 
- uninstall:
- 	-/bin/rm -f $(libdir)/libserdisp*
---- a/tools/Makefile.in	2014-03-30 09:13:59.000000000 +0200
-+++ b/tools/Makefile.in	2018-05-15 21:53:01.042823211 +0200
-@@ -155,7 +155,7 @@
- install: $(PROGRAMS)
- 	list='$(PROGRAMS)'; \
- 	for prog in $$list; do \
--	  $(INSTALL_PROGRAM) $$prog $(bindir)/ ; \
-+	  $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir)/ ; \
- 	done
- 
- uninstall: $(PROGRAMS)
diff --git a/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild b/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild
new file mode 100644
index 000000000000..7a1a31b7f338
--- /dev/null
+++ b/dev-libs/serdisplib/serdisplib-2.02-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit udev
+
+DESCRIPTION="Library to drive several displays with built-in controllers or display modules"
+HOMEPAGE="http://serdisplib.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="amd64 ppc ppc64 x86"
+IUSE="threads tools"
+
+# Define the list of valid lcd devices.
+IUSE_LCD_DEVICES=(
+	acoolsdcm ddusbt directgfx displaylink dpfax framebuffer glcd2usb
+	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544 remote
+	rs232 sed133x sed153x sed156x ssdoled stv8105 t6963 vssdcp
+)
+
+# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'.
+# Also enable 'lcd_devices_directgfx' as default.
+IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
+IUSE="${IUSE/lcd_devices_directgfx/+lcd_devices_directgfx}"
+REQUIRED_USE+="
+	|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) )
+	lcd_devices_framebuffer? ( threads )
+"
+
+# Specific drivers will need some features to be enabled
+RDEPEND="
+	media-libs/gd[jpeg,png,tiff]
+	lcd_devices_acoolsdcm? ( virtual/libusb:1 )
+	lcd_devices_directgfx? ( media-libs/libsdl )
+	lcd_devices_displaylink? ( x11-libs/libdlo )
+	lcd_devices_dpfax? ( virtual/libusb:1 )
+	lcd_devices_glcd2usb? ( virtual/libusb:1 )
+"
+
+DEPEND="${RDEPEND}"
+
+DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.02-use-destdir.patch"
+	"${FILESDIR}/${PN}-2.02-disable-static-build.patch"
+)
+
+src_prepare() {
+	default
+
+	# Fix Makefile, as it will fail, when USE="tools" is not set
+	if ! use tools; then
+		sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die
+	fi
+
+	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
+	sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die
+}
+
+src_configure() {
+	# Enable all users enabled lcd devices
+	local myeconfargs_lcd_devices
+	for lcd_device in ${IUSE_LCD_DEVICES[@]}; do
+		if use lcd_devices_${lcd_device}; then
+			myeconfargs_lcd_devices+=",${lcd_device}"
+		fi
+	done
+
+	local use_usb="--disable-libusb"
+	if use lcd_devices_acoolsdcm || use lcd_devices_dpfax || use lcd_devices_glcd2usb; then
+		use_usb="--enable-libusb"
+	fi
+
+	local myeconfargs=(
+		$(use_enable lcd_devices_directgfx libSDL)
+		$(use_enable lcd_devices_displaylink deprecated)
+		$(use_enable lcd_devices_displaylink libdlo)
+		$(use_enable lcd_devices_remote experimental)
+		$(use_enable lcd_devices_vssdcp experimental)
+		$(use_enable threads pthread)
+		$(use_enable tools)
+		${use_usb}
+		--disable-dynloading
+		--disable-statictools
+		--with-drivers="${myeconfargs_lcd_devices#,}"
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	udev_dorules 90-libserdisp.rules
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/dev-libs/serdisplib/serdisplib-2.02.ebuild b/dev-libs/serdisplib/serdisplib-2.02.ebuild
deleted file mode 100644
index 9fb47346044d..000000000000
--- a/dev-libs/serdisplib/serdisplib-2.02.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit udev
-
-DESCRIPTION="Library to drive several displays with built-in controllers or display modules"
-HOMEPAGE="http://serdisplib.sourceforge.net"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ppc ~ppc64 x86"
-IUSE="threads tools"
-
-# Define the list of valid lcd devices.
-IUSE_LCD_DEVICES=(
-	acoolsdcm ddusbt directgfx displaylink framebuffer glcd2usb
-	goldelox i2c ks0108 l4m lc7981 lh155 nokcol pcd8544
-	remote rs232 sed133x sed153x sed156x ssdoled stv8105 t6963
-)
-
-# Add supported drivers from 'IUSE_LCD_DEVICES' to 'IUSE' and 'REQUIRED_USE'
-IUSE+=" $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) "
-REQUIRED_USE+="
-	|| ( $(printf 'lcd_devices_%s ' ${IUSE_LCD_DEVICES[@]}) )
-	lcd_devices_framebuffer? ( threads )
-"
-
-# Specific drivers will need some features to be enabled
-RDEPEND="
-	media-libs/gd[jpeg,png,tiff]
-	lcd_devices_acoolsdcm? ( virtual/libusb:1 )
-	lcd_devices_directgfx? ( media-libs/libsdl )
-	lcd_devices_displaylink? ( x11-libs/libdlo )
-	lcd_devices_glcd2usb? ( virtual/libusb:1 )
-"
-
-DEPEND="${RDEPEND}"
-
-DOCS=( "AUTHORS" "BUGS" "DOCS" "HISTORY" "PINOUTS" "README" "TODO" )
-
-PATCHES=( "${FILESDIR}/use-destdir.patch" "${FILESDIR}/disable-static-build.patch" )
-
-src_prepare() {
-	default
-
-	# Fix Makefile, as it will fail, when USE="tools" is not set
-	if ! use tools; then
-		sed -i -e '/$(INSTALL_PROGRAM) $(PROGRAMS)/d' src/Makefile.in || die
-	fi
-
-	# Fix QA-Warning "QA Notice: pkg-config files with wrong LDFLAGS detected"
-	sed -i -e '/@LDFLAGS@/d' serdisplib.pc.in || die
-}
-
-src_configure() {
-	# Enable all users enabled lcd devices
-	local myeconfargs_lcd_devices
-	for lcd_device in ${IUSE_LCD_DEVICES[@]}; do
-		if use lcd_devices_${lcd_device}; then
-			myeconfargs_lcd_devices+=",${lcd_device}"
-		fi
-	done
-
-	local use_usb="--disable-libusb"
-	if use lcd_devices_acoolsdcm || use lcd_devices_glcd2usb; then
-		use_usb="--enable-libusb"
-	fi
-
-	local myeconfargs=(
-		$(use_enable lcd_devices_directgfx libSDL)
-		$(use_enable lcd_devices_displaylink deprecated)
-		$(use_enable lcd_devices_displaylink libdlo)
-		$(use_enable lcd_devices_remote experimental)
-		$(use_enable threads pthread)
-		$(use_enable tools)
-		${use_usb}
-		--disable-dynloading
-		--disable-statictools
-		--with-drivers="${myeconfargs_lcd_devices#,}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	udev_dorules 90-libserdisp.rules
-}
-
-pkg_postinst() {
-	udev_reload
-}
-
-pkg_postrm() {
-	udev_reload
-}
-- 
cgit v1.2.3