From 4cbcc855382a06088e2f016f62cafdbcb7e40665 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 20 Mar 2022 00:40:44 +0000 Subject: gentoo resync : 20.03.2022 --- net-libs/canlock/Manifest | 3 +- net-libs/canlock/canlock-3.3.0.ebuild | 2 +- net-libs/canlock/files/canlock-2b-make.patch | 116 --------------------------- 3 files changed, 2 insertions(+), 119 deletions(-) delete mode 100644 net-libs/canlock/files/canlock-2b-make.patch (limited to 'net-libs/canlock') diff --git a/net-libs/canlock/Manifest b/net-libs/canlock/Manifest index a7f17c9405cd..19a78dfe13a5 100644 --- a/net-libs/canlock/Manifest +++ b/net-libs/canlock/Manifest @@ -1,6 +1,5 @@ -AUX canlock-2b-make.patch 3370 BLAKE2B be7d14d664284886b2f798e8a46df4b4d9fdd2e2f098487391b51291c87dcd7055b7b31f59fb5a62ff1ca7bf09acc5cc3b1c90834bf309e3f6c4b9779b49fd93 SHA512 3040988dde4d7a79d1a73ebd90f8c7eadcb01489129ce47641e49c08ee38ff94d055f3da936c6ef1bf19fbff4f6be5ea41dc80356cec141b278c502dcabdc7ba DIST libcanlock-3.2.2.tar.bz2 467561 BLAKE2B e332c379647c7ad3fbf5f0a8051b888be65674bcb2c9be1b689f009fd35eecbb29644d9f17aaa3812c9405283708207c6f220f630e0dd1c6a5508d41b85a6070 SHA512 3d194a37bdbdf640bb6996383ce988c9177573b6f84c29569d759308564c7636d98d5c267988bd034b33681f814400eb7fbecf78d90f54b126edb3bf384f928f DIST libcanlock-3.3.0.tar.bz2 625796 BLAKE2B 001512a6d2d226aed93882de8d8f4f02a066cc67e6f21b411b8e1ee2ff0d4580732c90a6fc2756a79f992629cd18fbc319510960c39f33284c86bebfed3d4216 SHA512 100d2b4bf3eadedb7da230317cd37b2c1b259bbd783099a74e0d75fdc6ecddb8a6fd854a2b272bda3629bcf1ac1ae2b3d5657fca9137c17e38aad88f30e4c81c EBUILD canlock-3.2.2.ebuild 1095 BLAKE2B 443bf0268fe3e64dc00ef605d2b0e79655fed89a51b8f3620606271f77b541195b69c8b3013356bcad09263af0fd39083df6f10d8355af00146ddc8f24be7694 SHA512 1507129d5a94ff1269e417e9cd4e7b83443b12cbfbdb14e9047be6d530e6341eea96b9603c6c34abf3e900deee5a0d11234ae27188a1a2b37db558eee3dc36c6 -EBUILD canlock-3.3.0.ebuild 1136 BLAKE2B 143814ccf631e0145c75762e68efc1c165d79e70d697750ed14a756bb611cd72ea1b477623b7cb2fbc3959cd908e39011d32b5deb7b54c9e4f48800e954ab438 SHA512 7cf58b4919e83fa6051b92388bbbabf6b34fa7ef3da38b2b9c42405eca1f070c129ae902563cd0c68b35135fad0ff0960c72095cafd5e4440182b2cd783e2e25 +EBUILD canlock-3.3.0.ebuild 1132 BLAKE2B 1d766c6dcdfc8581bb0a6361081b39207231258bce85a2b98e15f116688e708c42651078203df4e48611c508a236cc1878e7f205ffbb666d2e597f6281286cd6 SHA512 e723afaedc42f75c4a85b7ae1b4f9c148bcddca070551149191d5596673739ac0a174bfb26007e176c0232dd867a6e533fda7af3f11e7ceda911d4ee60561eb6 MISC metadata.xml 431 BLAKE2B 970ec8fdb542889d3df72c7520f3b9f1c1c46e75b9cecb85c383c1abaaff42bf5bba5eb3fd1601449355c248c88215420cd799a7c5d53f2f4c5cc22facf1b4e6 SHA512 b53c2d9d53d5b045018923898fe93c181e178f4184beec546919b5d9ce0ba9ae8807d11d26f6291457b75ac96793566a985ee1876c8900518f776ccdf6aa91ab diff --git a/net-libs/canlock/canlock-3.3.0.ebuild b/net-libs/canlock/canlock-3.3.0.ebuild index 5227e822e8c8..bd8ea08f1942 100644 --- a/net-libs/canlock/canlock-3.3.0.ebuild +++ b/net-libs/canlock/canlock-3.3.0.ebuild @@ -10,7 +10,7 @@ S="${WORKDIR}/lib${P}" LICENSE="BSD MIT" SLOT="0/3" -KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm ppc x86 ~amd64-linux ~x86-linux" IUSE="header-parser +legacy" BDEPEND=" diff --git a/net-libs/canlock/files/canlock-2b-make.patch b/net-libs/canlock/files/canlock-2b-make.patch deleted file mode 100644 index da90c738af69..000000000000 --- a/net-libs/canlock/files/canlock-2b-make.patch +++ /dev/null @@ -1,116 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,38 +1,39 @@ --CFLAGS = -Iinclude --LDFLAGS = -L. -lcanlock --CC = gcc --STATIC_LIB = libcanlock.a -+CPPFLAGS += -Iinclude -+LDLIBS = -L./src -lcanlock - --all: hmactest canlocktest $(STATIC_LIB) -+all: shared - --sha1test: t/sha1test.c $(STATIC_LIB) -- $(CC) $(CFLAGS) t/$@.c -o $@ $(LDFLAGS) -+sha1test: t/sha1test.c shared -+ $(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) $(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) $(LDFLAGS) $(CPPFLAGS) $(CFLAGS) t/$@.c -o $@ $(LDLIBS) - --$(STATIC_LIB): -- cd src && make -- ln -s src/libcanlock.a libcanlock.a -+static: -+ cd src && $(MAKE) libcanlock.a -+ ln -sf src/libcanlock.a libcanlock.a -+ -+shared: -+ cd src && $(MAKE) libcanlock.so.2.0.0 - - clean: - rm -f src/*.o t/*.o t/*.out *.gmon gmon.* -- cd src && make clean -+ cd src && $(MAKE) clean - rm -f *.a canlocktest hmactest sha1test *.exe *.h lib-stamp - - install: all -- cd src && make install DESTDIR=$(DESTDIR) -+ cd src && $(MAKE) install DESTDIR=$(DESTDIR) - install --mode=644 include/canlock.h $(DESTDIR)/usr/include -- --test: all -+ -+check: hmactest canlocktest - @echo "hmactest: " -- @./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) - @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 - LIBTOOL = libtool --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) -+LIBOBJS := $(SOURCES:.c=.lo) - SHARELINKFLAGS = -Wl,-soname -Wl,libcanlock.so.2 - SHAREDFLAGS = -fPIC -DPIC - LIBS = libcanlock.a libcanlock.so.2.0.0 - INSTALL = install - -+.SUFFIXES: .c .o .h .lo -+ - all: $(LIBS) - --libcanlock.a: -- $(CC) $(CFLAGS) -c $(SOURCES) -- ar cru libcanlock.a $(OBJS) -- ranlib libcanlock.a -- rm $(OBJS) -- --libcanlock.so.2.0.0: -- $(CC) $(CFLAGS) $(SHAREDFLAGS) -c $(SOURCES) -- $(CC) -shared $(OBJS) $(SHARELINKFLAGS) -o libcanlock.so.2.0.0 -+.c.lo: -+ $(CC) $(CFLAGS) $(CPPFLAGS) $(SHAREDFLAGS) -c -o $@ $< -+ -+libcanlock.a: $(OBJS) -+ $(AR) cru libcanlock.a $(OBJS) -+ $(RANLIB) libcanlock.a -+ -+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 - cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so.2 - cd $(DESTDIR)/usr/lib && ln -s libcanlock.so.2.0.0 libcanlock.so - $(INSTALL) libcanlock.a $(DESTDIR)/usr/lib/libcanlock.a -- ranlib $(DESTDIR)/usr/lib/libcanlock.a -- -+ $(RANLIB) $(DESTDIR)/usr/lib/libcanlock.a -+ - clean: -- rm -f $(OBJS) $(LIBS) -+ rm -f $(OBJS) $(LIBOBJS) $(LIBS) -- cgit v1.2.3