gentoo resync : 10.02.2020

3 files changed, 49 insertions, 47 deletions

diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest
index 35071f9c6cfe..9af9f423dea0 100644
--- a/net-libs/canlock/Manifest
+++ b/net-libs/canlock/Manifest
@@ -1,5 +1,5 @@
-AUX canlock-2b-make.patch 2986 BLAKE2B edaa828eedc85e6e4568403e107bbf42076b5b0a098dcb41e4352d5fd54f7bb631110164e53bc38aac27a4651431b7a7eee5fde392baa1fd13fe43732188a3e4 SHA512 4c41aedb6b26e9205726ad992354f57daef192d6c6ceaa9b1fe961839725a5b831f5c16dcd2bf2e451499539e22f1f1ed7b0ec113844d0c1306afa5e69dc4db5
+AUX canlock-2b-make.patch 3370 BLAKE2B be7d14d664284886b2f798e8a46df4b4d9fdd2e2f098487391b51291c87dcd7055b7b31f59fb5a62ff1ca7bf09acc5cc3b1c90834bf309e3f6c4b9779b49fd93 SHA512 3040988dde4d7a79d1a73ebd90f8c7eadcb01489129ce47641e49c08ee38ff94d055f3da936c6ef1bf19fbff4f6be5ea41dc80356cec141b278c502dcabdc7ba
 DIST canlock_2b-6.diff.gz 7946 BLAKE2B 489161a24f832d978fae49f7349e9ddd3518cfc0b3c02a8e614bffbefafd2fd3ff9f5720b2df0dead30e6d70dcd510380fee8cc2b535268266408719ca030e35 SHA512 fa89d638d87e5cb18bd6c270200cd5d962c5a263855e5cbbd8e944dea633a61d6f0c271da04d56096ef23e0a9f252e3bdead496e9aa9afe31d3f8e7ef679020f
 DIST canlock_2b.orig.tar.gz 14099 BLAKE2B 93c991298ed7bf7ab57b290edf6e6b7bcd86ab452002cd61acbff17ec60eed2e15983b3f1cbe8d54acf4f0cfa11480822c7d7ed474e4c51dea018f73933308f2 SHA512 3ceeac6a17fc3bb3330626d22145371ed5f53ad2a33c6a60b639dab0dbc8ff85623839a9d1e1d4cb78580a9060b0ec9fd3489d1374feecf587b2ec5c7963f58e
-EBUILD canlock-2b.ebuild 1109 BLAKE2B 2f398ca68b15bf49f52d60fa51215b7ff5d6c7b94009216730890ada940bd3bb4491d2c3bec4585da82552d6a2ac72eac4999da494442745a0795ce9344d8839 SHA512 41368cbc1d21ca9eafa48a1c38fa1dbc892543b508c4549fb5a4b4b8c30bcfd6e246a4f09082bf8d26a03692d789a3043bf1b4e76c658d62deb23f761d290455
+EBUILD canlock-2b.ebuild 848 BLAKE2B 68ee1efa0605d19ef8ad449bb8e57113b27d2b17c7e11cbf85789e6c9bf2de4a984143b3872737a76193d8463e90a592f2fa84948e24ed3f2f14c236ed205b65 SHA512 e7348d495c1b7bef6f786b82e71b8097300125cb45c0061a0d9a63f3657abc763f54856fe55de051a6d38dd40306ab9580c4c16d7a2cd2414e1cad6300eb93cc
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-libs/canlock/canlock-2b.ebuild b/net-libs/canlock/canlock-2b.ebuild
index 9d58b0a2dc63..d54ed58f3701 100644
--- a/net-libs/canlock/canlock-2b.ebuild
+++ b/net-libs/canlock/canlock-2b.ebuild
@@ -1,43 +1,39 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
-inherit eutils multilib toolchain-funcs
+inherit toolchain-funcs
 
 MY_P="${P/-/_}"
+
 DESCRIPTION="A library for creating and verifying Usenet cancel locks"
 HOMEPAGE="https://packages.qa.debian.org/c/canlock.html"
-SRC_URI="mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
+SRC_URI="
+	mirror://debian/pool/main/c/${PN}/${MY_P}.orig.tar.gz
 	mirror://debian/pool/main/c/${PN}/${MY_P}-6.diff.gz"
 
 LICENSE="BSD MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux"
-IUSE="static-libs"
-
-S=${WORKDIR}/${P/-/}
 
-src_prepare() {
-	epatch "${WORKDIR}"/${MY_P}-6.diff \
-		"${FILESDIR}"/${P}-make.patch
-}
+S="${WORKDIR}/${P/-/}"
 
-src_compile() {
-	local targets="shared"
-	if use static-libs || use test ; then
-		targets+=" static"
-	fi
+PATCHES=(
+	"${WORKDIR}"/${MY_P}-6.diff
+	"${FILESDIR}"/${P}-make.patch
+)
 
-	emake CC="$(tc-getCC)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" ${targets}
+src_configure() {
+	tc-export CC
 }
 
 src_install() {
-	use static-libs && dolib.a src/libcanlock.a
 	dolib.so src/libcanlock.so.2.0.0
 	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so.2
 	dosym libcanlock.so.2.0.0 /usr/$(get_libdir)/libcanlock.so
-	insinto /usr/include
-	doins include/canlock.h
+
+	doheader include/canlock.h
+
 	dodoc CHANGES README doc/HOWTO
 }
diff --git a/net-libs/canlock/files/canlock-2b-make.patch b/net-libs/canlock/files/canlock-2b-make.patch
index 492b88bee143..da90c738af69 100644
--- a/net-libs/canlock/files/canlock-2b-make.patch
+++ b/net-libs/canlock/files/canlock-2b-make.patch
@@ -1,30 +1,30 @@
---- canlock2b/Makefile
-+++ canlock2b/Makefile
-@@ -1,33 +1,35 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1,38 +1,39 @@
 -CFLAGS = -Iinclude
 -LDFLAGS = -L. -lcanlock
-+CFLAGS += -Iinclude
-+LIBS = -L. -lcanlock
- CC = gcc
+-CC = gcc
 -STATIC_LIB = libcanlock.a
++CPPFLAGS += -Iinclude
++LDLIBS = -L./src -lcanlock
  
 -all: hmactest canlocktest $(STATIC_LIB)
-+all: shared static
++all: shared
  
 -sha1test: t/sha1test.c $(STATIC_LIB)
 -	$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
 +sha1test: t/sha1test.c shared
-+	$(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
  
 -hmactest: t/hmactest.c $(STATIC_LIB)
 -	$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
 +hmactest: t/hmactest.c shared
-+	$(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
  
 -canlocktest: t/canlocktest.c $(STATIC_LIB)
 -	$(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS)
 +canlocktest: t/canlocktest.c shared
-+	$(CC) $(CFLAGS) t/$@.c -o $@ $(LIBS) $(LDFLAGS)
++	$(CC) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS)
  
 -$(STATIC_LIB):
 -	cd src && make
@@ -49,20 +49,25 @@
 -	
 -test: all
 +
-+test: hmactest canlocktest
++check: hmactest canlocktest
  	@echo "hmactest: "
- 	@./hmactest > t/hmactest.out || echo hmm
+-	@./hmactest > t/hmactest.out || echo hmm
++	@LD_LIBRARY_PATH=src/ ./hmactest > t/hmactest.out || echo hmm
  	@diff t/hmactest.shouldbe t/hmactest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
---- canlock2b/src/Makefile
-+++ canlock2b/src/Makefile
-@@ -1,9 +1,11 @@
+ 	@echo "=-=-=-="
+ 	@echo "canlocktest: "
+-	@./canlocktest > t/canlocktest.out
++	@LD_LIBRARY_PATH=src/ ./canlocktest > t/canlocktest.out
+ 	@diff t/canlocktest.shouldbe t/canlocktest.out && echo " Pass." || (echo " **FAIL**" ; exit 1)
+ 	@echo "=-=-=-="
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -1,32 +1,35 @@
 -LIBOBJS = base64.lo canlock.lo hmac_sha1.lo sha1.lo
- CC = gcc
-+AR = ar
-+RANLIB = ranlib
+-CC = gcc
  LIBTOOL = libtool
 -CFLAGS = -I../include
-+CFLAGS += -I../include
++CPPFLAGS += -I../include
  SOURCES = base64.c canlock.c hmac_sha1.c sha1.c
 -OBJS = base64.o canlock.o hmac_sha1.o sha1.o
 +OBJS := $(SOURCES:.c=.o)
@@ -70,8 +75,10 @@
  SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2
  SHAREDFLAGS = -fPIC -DPIC
  LIBS = libcanlock.a libcanlock.so.2.0.0
-@@ -11,22 +13,25 @@
+ INSTALL = install
  
++.SUFFIXES: .c .o .h .lo
++
  all: $(LIBS)
  
 -libcanlock.a:
@@ -83,11 +90,8 @@
 -libcanlock.so.2.0.0:
 -	$(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES)
 -	$(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
-+%.o: %.c
-+	$(CC) $(CFLAGS) -c -o $@ $<
-+
-+%.lo: %.c
-+	$(CC) $(CFLAGS) $(SHAREDFLAGS) -c -o $@ $<
++.c.lo:
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(SHAREDFLAGS) -c -o $@ $<
 +
 +libcanlock.a: $(OBJS)
 +	$(AR) cru libcanlock.a $(OBJS)
@@ -95,6 +99,8 @@
 +
 +libcanlock.so.2.0.0: $(LIBOBJS)
 +	$(CC) -shared $(LIBOBJS) $(LDFLAGS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0
++	ln -s libcanlock.so.2.0.0 libcanlock.so
++	ln -s libcanlock.so.2.0.0 libcanlock.so.2
  
  install: all
  	$(INSTALL) libcanlock.so.2.0.0 $(DESTDIR)/usr/lib