gentoo resync : 29.06.2020

2 files changed, 46 insertions, 24 deletions

diff --git a/dev-libs/pigpio/Manifest b/dev-libs/pigpio/Manifest
index 228efdfd82e2..d806a90d1f3a 100644
--- a/dev-libs/pigpio/Manifest
+++ b/dev-libs/pigpio/Manifest
@@ -1,4 +1,4 @@
-AUX pigpio-70-makefile.patch 3244 BLAKE2B 3a8155c52ec15227c815a5bac7b42a1fddf9682fbc10dd4513d6c5d7da8b2e1ea9189bc4b28560650b69a857e65c3db00b7af1de30970e23d1bcd988bbba0255 SHA512 096af62d64e61fa6d6394484c58e55dcbe4aa22551c5b3448209e6dcd707688dc3033d219eba954c0e78635d2480b7c7de044aeb18a80d0ac0d701b4d4cc4fa8
+AUX pigpio-70-makefile.patch 4856 BLAKE2B ec3010a687ae8104ca09f3df6313e74aecf2d9583932b1c17a72a58ff043a3d1e22ef43ba4e7ce1b4bd8c21824bae929b8533d5adb9ecef49614b8db94bd095d SHA512 b355ddfde0e3771f023c651ca5f7cbe6dc99a9720f0d2ab23715ad7185aad6f7e1c05b494415247838b371968756fbabec9f5539b172f623048757fad72339cc
 AUX pigpiod.confd 201 BLAKE2B 6707d0f0f8772110b6e1167abcfcdcdfdb22936024f3c1234f05c198853cde3b55c5474922fdb64dcdf49440e9ad163216c0b11ffb80ebea2fd413cc17fdc685 SHA512 96431969640fef1b5ce317f0f9ce93fae081f186dfa89c00b4f469e3657a7792c5d157ccff7d019ea4bb4848a6657c8bb8f111f5a208440cc8a0723772e7c708
 AUX pigpiod.initd 215 BLAKE2B d7797cc0d1d388fd21831e33cbadd031e2cb974e26367596dd4c9ba054fbdd4b04200d0ff61dfe797520d2e0745420a5d973b44a41e15713800a7828f097cec1 SHA512 e1db38677a248c3dbc33aae6809eb8df1dd6253f60ca852d98d8d6d428d23d7a8a31a031da3b786b7105d90f0cc52687bfbfe320e5c6cbf0fbf02b5ad5c6e606
 DIST pigpio-76.tar.gz 2905839 BLAKE2B 7828a94fad9f110392dc114534a3b242f1f135d352885f3c4332a1d4a16f49d2fa58b57e9e3d64c2bf9b5f3bdd7e84a74775b518fc409daf75a55a87c5f3af57 SHA512 8cc1dc64ae32a07f4b6e200638065ba5fb26a94c1a730d81b64fa5f2bb9356b2b9910decb41def6932fc76f7ebd1df99a7966516ba3df9a09108de0afcd119d3
diff --git a/dev-libs/pigpio/files/pigpio-70-makefile.patch b/dev-libs/pigpio/files/pigpio-70-makefile.patch
index 10df7e872c6c..1102fa5b6253 100644
--- a/dev-libs/pigpio/files/pigpio-70-makefile.patch
+++ b/dev-libs/pigpio/files/pigpio-70-makefile.patch
@@ -1,6 +1,6 @@
---- a/Makefile	2019-08-10 10:10:22.834043361 +0200
-+++ b/Makefile	2019-08-10 10:43:15.797503591 +0200
-@@ -9,6 +9,9 @@
+--- a/Makefile	2020-06-05 20:28:12.691759233 +0200
++++ b/Makefile	2020-06-05 21:23:46.334235268 +0200
+@@ -9,8 +9,12 @@
  STRIP        = $(CROSS_PREFIX)strip
  SHLIB        = $(CC) -shared
  STRIPLIB     = $(STRIP) --strip-unneeded
@@ -9,8 +9,11 @@
 +PYTHON3      = $(shell type -P python3 || echo ':' 2> /dev/null)
  
  SOVERSION    = 1
++LIBVERSION   = 1.0
  
-@@ -25,7 +28,7 @@
+ CFLAGS	+= -O3 -Wall -pthread
+ 
+@@ -25,7 +29,7 @@
  
  LIB      = $(LIB1) $(LIB2) $(LIB3)
  
@@ -19,23 +22,23 @@
  
  LL1      = -L. -lpigpio -pthread -lrt
  
-@@ -66,28 +69,21 @@
+@@ -66,52 +70,43 @@
  	$(CC) -o x_pigpiod_if2 x_pigpiod_if2.o $(LL3)
  
  pigpiod:	pigpiod.o $(LIB1)
 -	$(CC) -o pigpiod pigpiod.o $(LL1)
+-	$(STRIP) pigpiod
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o pigpiod pigpiod.o $(LL1)
- 	$(STRIP) pigpiod
  
  pigs:		pigs.o command.o
 -	$(CC) -o pigs pigs.o command.o
+-	$(STRIP) pigs
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o pigs pigs.o command.o
- 	$(STRIP) pigs
  
  pig2vcd:	pig2vcd.o
 -	$(CC) -o pig2vcd pig2vcd.o
+-	$(STRIP) pig2vcd
 +	$(CC) $(CFLAGS) $(LDFLAGS) -o pig2vcd pig2vcd.o
- 	$(STRIP) pig2vcd
  
  clean:
  	rm -f *.o *.i *.s *~ $(ALL) *.so.$(SOVERSION)
@@ -51,7 +54,24 @@
  	install -m 0755 -d                             $(DESTDIR)$(includedir)
  	install -m 0644 pigpio.h                       $(DESTDIR)$(includedir)
  	install -m 0644 pigpiod_if.h                   $(DESTDIR)$(includedir)
-@@ -103,15 +99,13 @@
+ 	install -m 0644 pigpiod_if2.h                  $(DESTDIR)$(includedir)
+ 	install -m 0755 -d                             $(DESTDIR)$(libdir)
+-	install -m 0755 libpigpio.so.$(SOVERSION)      $(DESTDIR)$(libdir)
+-	install -m 0755 libpigpiod_if.so.$(SOVERSION)  $(DESTDIR)$(libdir)
+-	install -m 0755 libpigpiod_if2.so.$(SOVERSION) $(DESTDIR)$(libdir)
+-	cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(SOVERSION)      libpigpio.so
+-	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(SOVERSION)  libpigpiod_if.so
+-	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(SOVERSION) libpigpiod_if2.so
++	install -m 0755 libpigpio.so.$(LIBVERSION)      $(DESTDIR)$(libdir)
++	install -m 0755 libpigpiod_if.so.$(LIBVERSION)  $(DESTDIR)$(libdir)
++	install -m 0755 libpigpiod_if2.so.$(LIBVERSION) $(DESTDIR)$(libdir)
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(LIBVERSION)      libpigpio.so
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(LIBVERSION)  libpigpiod_if.so
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(LIBVERSION) libpigpiod_if2.so
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpio.so.$(LIBVERSION)      libpigpio.so.$(SOVERSION)
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if.so.$(LIBVERSION)  libpigpiod_if.so.$(SOVERSION)
++	cd $(DESTDIR)$(libdir) && ln -fs libpigpiod_if2.so.$(LIBVERSION) libpigpiod_if2.so.$(SOVERSION)
+ 	install -m 0755 -d                             $(DESTDIR)$(bindir)
  	install -m 0755 pig2vcd                        $(DESTDIR)$(bindir)
  	install -m 0755 pigpiod                        $(DESTDIR)$(bindir)
  	install -m 0755 pigs                           $(DESTDIR)$(bindir)
@@ -72,27 +92,29 @@
  
  uninstall:
  	rm -f $(DESTDIR)$(includedir)/pigpio.h
-@@ -136,19 +130,19 @@
+@@ -136,22 +131,13 @@
  endif
  
  $(LIB1):	$(OBJ1)
 -	$(SHLIB) -pthread -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(SOVERSION) $(OBJ1)
-+	$(SHLIB) -o $(LIB1).$(SOVERSION) $(OBJ1)
- 	ln -fs $(LIB1).$(SOVERSION) $(LIB1)
- 	$(STRIPLIB) $(LIB1)
- 	$(SIZE)     $(LIB1)
+-	ln -fs $(LIB1).$(SOVERSION) $(LIB1)
+-	$(STRIPLIB) $(LIB1)
+-	$(SIZE)     $(LIB1)
++	$(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB1).$(SOVERSION) -o $(LIB1).$(LIBVERSION) $(OBJ1)
  
  $(LIB2):	$(OBJ2)
 -	$(SHLIB) -pthread -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(SOVERSION) $(OBJ2)
-+	$(SHLIB) -o $(LIB2).$(SOVERSION) $(OBJ2)
- 	ln -fs $(LIB2).$(SOVERSION) $(LIB2)
- 	$(STRIPLIB) $(LIB2)
- 	$(SIZE)     $(LIB2)
+-	ln -fs $(LIB2).$(SOVERSION) $(LIB2)
+-	$(STRIPLIB) $(LIB2)
+-	$(SIZE)     $(LIB2)
++	$(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB2).$(LIBVERSION) $(OBJ2)
  
  $(LIB3):	$(OBJ3)
 -	$(SHLIB) -pthread -Wl,-soname,$(LIB3).$(SOVERSION) -o $(LIB3).$(SOVERSION) $(OBJ3)
-+	$(SHLIB) -o $(LIB3).$(SOVERSION) $(OBJ3)
- 	ln -fs $(LIB3).$(SOVERSION) $(LIB3)
- 	$(STRIPLIB) $(LIB3)
- 	$(SIZE)     $(LIB3)
-
+-	ln -fs $(LIB3).$(SOVERSION) $(LIB3)
+-	$(STRIPLIB) $(LIB3)
+-	$(SIZE)     $(LIB3)
++	$(SHLIB) $(LDFLAGS) -Wl,-soname,$(LIB2).$(SOVERSION) -o $(LIB3).$(LIBVERSION) $(OBJ3)
+ 
+ # generated using gcc -MM *.c
+