gentoo new year resync : 01.01.2021

3 files changed, 26 insertions, 41 deletions

diff --git a/dev-libs/shhopt/Manifest b/dev-libs/shhopt/Manifest
index 915d17006517..1b5a53c9c5fb 100644
--- a/dev-libs/shhopt/Manifest
+++ b/dev-libs/shhopt/Manifest
@@ -1,4 +1,4 @@
-AUX shhopt-1.1.7-build.patch 1884 BLAKE2B 1854a892ddc14d7202efbb4ebf20778a10ae1c490a40b28157e313c711fb946a925f61a71cc2f3919f6f55718636d05486e79e89f730575528bc3b0d2894fa34 SHA512 79eca8ada571f2f514d540a4c52fdf9503764f67422173bff160ed3ca04b0578c0a88a147234ffaad7a5ba94ab7d265785277062b25438abb888c92fab99d4a8
+AUX shhopt-1.1.7-build.patch 1751 BLAKE2B bb3fd0376bdf0da0c1a26b1472f9edd7dc21b628bc89577a3bb56fbabb3555667df70837cf47ce4361d369112972912c4388b55a4b28ae35100c82da3015bc60 SHA512 ba11cfd9ae4d75d676b15e2ab7a1d017f59193908e4e0b51ca2d5b2dc8fcdbce9e839d6835d5a05761464c7177ae20be5c3ef059e4d2a52f100f0b949811e089
 DIST shhopt-1.1.7.tar.gz 9923 BLAKE2B 4f9fb23a67c03caf6c56227729a681eac3ee9c78e16f56d6fedd2b1cdbe56471150d9e91ecf84945348078d03102aa7e7cc98b4cf11dda6f5da79d1edc48b96d SHA512 bd985d50e87808b5c6993496ba3e7c255d47895d90e108f03fd72bb273e786730898048af3b30ca29cb5dbd058f2ea178ca73b6362211c50aa0eb75f743b5ec8
-EBUILD shhopt-1.1.7-r3.ebuild 662 BLAKE2B 65f8672454fc417d5a421dd742b11e4fd1a45959456b1139dda9f0c0ba9fbc9669e5b02b09d89cdac5146768ae4f16d952b233094475423229426a5632ec1789 SHA512 f2833566926e3b1ff808f0b10785d900a83b44afc1f457a7204b0aa9308281ab62a15f906c4e57217029ddda1547330c71f4221203e17b451d830be21fe7cbe7
+EBUILD shhopt-1.1.7-r3.ebuild 641 BLAKE2B 4109e69faae2724e469d002de54d35270dfd3fd4f3cd6f79b640847d3b18d47ed80c5fc7aa97700865f8cc1e9f2b7e2401be4ec04fd64eb74b413430b29935a2 SHA512 6c8f5fe4f91dc898fbd576a81f6dc1177eb178ea57c58c1cb2bfb2a60ea7da27ff0abc2db8366b0ab695fedd83dcdca66287c413250cc189b198e53bab3e3df8
 MISC metadata.xml 341 BLAKE2B 738802ec66db2e5052eb57b90dd0076cca1afbdca62fa325f920f0ec6f4ff4b78f886402783ad6f97c7b10e4e2ec10bbaf1bf2bc8823bd48d048c35141a6cb77 SHA512 276ee6e17baeb1981c1c912b4f281d7eb71b171492d00d5ce522c3d6defbba4eef3dd87b43d4ec02eda21cfe148f2b0dcbe04d7dbd9a42918168844b563427f4
diff --git a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
index 3405511e2238..954011994bc9 100644
--- a/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
+++ b/dev-libs/shhopt/files/shhopt-1.1.7-build.patch
@@ -1,12 +1,12 @@
 --- a/Makefile
 +++ b/Makefile
-@@ -5,20 +5,15 @@
+@@ -5,17 +5,11 @@
  VERPAT		= 7
  VERSION		= $(VERMAJ).$(VERMIN).$(VERPAT)
  
 -# Define SHARED as 1 for Linux shared ELF library
 -#SHARED		= 1
--
+ 
 -ifeq ($(SHARED),1)
  LIBTARGET	= lib$(DIST).so.$(VERSION)
  LIBTARGETSO	= lib$(DIST).so
@@ -15,69 +15,55 @@
 -else
 -LIBTARGET	= lib$(DIST).a
 -endif
-+
-+LIBTARGETA	= lib$(DIST).a
  
  LIBHEAD		= $(DIST).h
--TARGETS		= $(LIBTARGET)
-+TARGETS		= $(LIBTARGET) $(LIBTARGETA)
- 
- INSTBASEDIR	= /usr/local
- INSTLIBDIR	= $(INSTBASEDIR)/lib
-@@ -27,12 +22,12 @@
+ TARGETS		= $(LIBTARGET)
+@@ -27,12 +21,9 @@
  INSTALLPROG	= install -m 755
  MKDIRP		= install -d -m 755
  
 -CC		= gcc
 -OPTIM		= -O2
 -
--INCDIR		= -I.
--
+ INCDIR		= -I.
+ 
 -CCOPT		= -s -Wall $(OPTIM) $(INCDIR)
-+CC		?= gcc
-+AR		?= ar
-+ARFLAGS ?= rc
-+RANLIB	?= ranlib
-+CPPFLAGS += -I.
-+CFLAGS += -Wall
++CCOPT		= -Wall $(INCDIR)
  
  # Object files to store in the library
  LIBOBJS		= shhopt.o
-@@ -43,21 +38,19 @@
- # don't worry if you get ranlib not found errors.  This probably means
+@@ -44,12 +35,7 @@
  # that your ar does an implicit ranlib and you do not need to run ranlib
  # separately.  This error is harmless.
--$(LIBTARGET): $(LIBOBJS)
+ $(LIBTARGET): $(LIBOBJS)
 -ifeq ($(SHARED),1)
 -	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
 -else
 -	ar rc $(LIBTARGET) $(LIBOBJS)
 -	ranlib $(LIBTARGET) || true
 -endif
-+$(LIBTARGET): $(LIBOBJS:.o=.lo)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $@ $^
-+$(LIBTARGETA): $(LIBOBJS)
-+	$(AR) $(ARFLAGS) $@ $^
-+	$(RANLIB) $@
++	$(CC) $(LDFLAGS) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
  
  # Note that you may need GNU's -liberty if your libc lacks strtoul
  example: $(LIBTARGET) example.o
- 	$(CC) -o example example.c \
+@@ -57,7 +43,7 @@
  		-L. -I. -L$(INSTLIBDIR) -I$(INSTINCDIR) -lshhopt
  
--.c.o:
+ .c.o:
 -	$(CC) $(CCSHRD) -o $@ -c $(CCOPT) $<
-+%.lo: %.c
-+	$(COMPILE.c) $(CCSHRD) $^ -o $@
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(CCSHRD) -o $@ -c $(CCOPT) $<
  
  depend dep:
  	$(CC) $(INCDIR) -MM *.c >depend
-@@ -73,7 +66,7 @@
- endif
+@@ -66,11 +52,9 @@
+ 	$(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR)
+ 	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
+ 	$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
+-ifeq ($(SHARED),1)
+ 	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
+ 	ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
+ 	echo "Now run ldconfig if necessary."
+-endif
  
  clean:
--	rm -f *.o core *~ depend
-+	rm -f *.o *.lo *.so* *.a core *~ depend
- 
- chmod:
- 	chmod a+r *
+ 	rm -f *.o core *~ depend
diff --git a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
index 1d63a8b89ea7..3710e4d865d3 100644
--- a/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
+++ b/dev-libs/shhopt/shhopt-1.1.7-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,7 +20,6 @@ src_compile() {
 }
 
 src_install() {
-	dolib.a libshhopt.a
 	ln -s libshhopt.so.${PV} libshhopt.so || die
 	ln -s libshhopt.so.${PV} libshhopt.so.${PV:0:1} || die
 	dolib.so libshhopt.so*