gentoo resync : 28.04.2021

4 files changed, 6 insertions, 15 deletions

diff --git a/dev-util/dropwatch/Manifest b/dev-util/dropwatch/Manifest
index 3fc5d0a3b735..300fdd06de5c 100644
--- a/dev-util/dropwatch/Manifest
+++ b/dev-util/dropwatch/Manifest
@@ -1,5 +1,5 @@
-AUX dropwatch-1.4-binutils-2.23.patch 1767 BLAKE2B 2d5a39985393e61daa1a197edae420391d6d56b2a9cda8a46b2bdb6d5d0289933961837489fa7da66b2920a984bc0f36d4c33764ee5c2f3f60258d4907e1d87a SHA512 678749e2f37c9e8c5613a884919e0ebf9039850f5fa9a62829d66783e703f6aa3c69a2d040b37f4657d2c43edf46d4792d9d87270a4fe4b590bcc36114470b45
-AUX dropwatch-1.4_p20150706-makefile.patch 563 BLAKE2B db75ff88089272f9f0603b4e6ffdbe669e312188c03eba712fcd01152f1cb00bf2b17a720c0dc7137d95158db83b10c7a8f1bb2ba3a647cfd469abb778b1445c SHA512 763781d0a3718978c2fb98ad42183633f6e93c122739bd4b3020698674b4c3c35592337be5f7a3c839ab3bc4599cd10a85a19f1d19bd9635961fcc08c78f0b01
+AUX dropwatch-1.4-binutils-2.23.patch 1467 BLAKE2B 39ad7b6b42252b6fb2e8f6803ed190e0e6f23b92b7a6a90f85c58b9b86ad5324753e2a1639191d3eb795015c4264c5a62ecdaff31a0e60a66a193c03a4a11f0e SHA512 933ce0de5582ee28141ebe53e1320f430b856af379fee0b8822fdc23d8b7b937a9c7b1fc89629583e7f5faedea87fc56f4c9cf6e48aa81f9e54e6aa532ca23fa
+AUX dropwatch-1.4_p20150706-makefile.patch 492 BLAKE2B c4d1a5d458a450679c106972af579e8cf861aecb2008f580670f9d57ef1813f8b1aa4d26a8ec3eecb1958cf00837b320cc1b00f52de575d4b724d1ad7ebfb21e SHA512 b221abe751c3c2c9b82f2c8d75632295ff54e43af2f13f319d5b7be571cfa5e8912d7dd0e1eba13572486d66c58e0cab46362e8fb69e09e08e6e4c876c2fc627
 DIST dropwatch-1.4_p20150706.tar.xz 14880 BLAKE2B 4df44a517447a7e99fe5d84a79421c9810c3b67524eb1d208c36ebb503dd43c715e57c678c33a90689707680d1f42b9d30d00080894f22889553e551a23adfa6 SHA512 f78f19f063408cb655869e662e92709b1cec820ab35b11272b87a990c380e0799c6e9067dcf53edab795916347dfe3fd04932f9699c3f5649f96d62567957fbd
-EBUILD dropwatch-1.4_p20150706.ebuild 867 BLAKE2B 86dd6191da4827c62a18db05a01f3163bf6c6af8df1574ee0783d3969e87bfedda4376450e6a465181cc0afd3b547c302f5596259b1ea81585dd93d3167fd969 SHA512 466bef588bc88d7b02439386b3d4e6659922369f05eb1cba5eada751b1271b813723ba5382ddcc6903c9fa3491f1d1d33a74568a7dd087808d0ec81a489c4e81
+EBUILD dropwatch-1.4_p20150706.ebuild 886 BLAKE2B 62f83a6b6153807e8a3b15f4149e5d6779e2a10955d69d3bcce5128e928f86385be415d420ce996308e421a8cbc481a69532ebbab8c53d1b6438b7fe4b6042de SHA512 0782d81d1fb447dbfa3f194ab46aef4067c62b2b98c913d29bb4bb8ad0efaff30f7182e12079f0aeb3304b0beed30b5e792dda6b29f5bd3ede7cb52f429483e3
 MISC metadata.xml 250 BLAKE2B 2ea879960a826fa9be35ec3a0988634da4268c54a8f4a484936356f1fac9e100b779dd43d7a3a684f121e5de5bae7195991e4d378d36b18f97155208fae728d0 SHA512 a5334e41fb3acb7a8cce473ca9616ecea8fe484e870173f0a26042cd8aca0bc7fa4fe52e9cf10b7495c44608e15f1c71564b3f92a44611ba830b08785666b2ac
diff --git a/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild b/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
index f4d2002b7f7b..2ed2cddf6d88 100644
--- a/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
+++ b/dev-util/dropwatch/dropwatch-1.4_p20150706.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,6 +27,7 @@ PATCHES=(
 )
 
 src_compile() {
+	tc-export PKG_CONFIG
 	emake CC="$(tc-getCC)" -C src
 }
 
diff --git a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
index 1a7fa7913e42..94770ab3dc91 100644
--- a/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
+++ b/dev-util/dropwatch/files/dropwatch-1.4-binutils-2.23.patch
@@ -7,8 +7,6 @@ Date:   Thu Nov 17 00:04:47 2016 +0300
     Gentoo-Bug:         457980
     Upstream Ticket:    5
 
-diff --git a/src/lookup.c b/src/lookup.c
-index ba54991..809981b 100644
 --- a/src/lookup.c
 +++ b/src/lookup.c
 @@ -27,13 +27,13 @@
@@ -26,8 +24,6 @@ index ba54991..809981b 100644
  
  extern struct lookup_methods bfd_methods;
  extern struct lookup_methods kallsym_methods;
-diff --git a/src/lookup.h b/src/lookup.h
-index e6568d8..47a7b56 100644
 --- a/src/lookup.h
 +++ b/src/lookup.h
 @@ -28,6 +28,9 @@
@@ -40,8 +36,6 @@ index e6568d8..47a7b56 100644
  
  /*
   * Initalization routine
-diff --git a/src/lookup_bfd.c b/src/lookup_bfd.c
-index cc7010b..271d426 100644
 --- a/src/lookup_bfd.c
 +++ b/src/lookup_bfd.c
 @@ -25,13 +25,13 @@
@@ -59,8 +53,6 @@ index cc7010b..271d426 100644
  
  
  static int lookup_bfd_init(void)
-diff --git a/src/lookup_kas.c b/src/lookup_kas.c
-index 16e639f..556cb62 100644
 --- a/src/lookup_kas.c
 +++ b/src/lookup_kas.c
 @@ -25,7 +25,6 @@
diff --git a/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch b/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
index d2a9a6b761b6..42ff8f9e8365 100644
--- a/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
+++ b/dev-util/dropwatch/files/dropwatch-1.4_p20150706-makefile.patch
@@ -1,5 +1,3 @@
-diff --git a/src/Makefile b/src/Makefile
-index 5bc6aaa..4eab2e8 100644
 --- a/src/Makefile
 +++ b/src/Makefile
 @@ -1,14 +1,14 @@
@@ -7,7 +5,7 @@ index 5bc6aaa..4eab2e8 100644
  
  CPPFLAGS += -D_GNU_SOURCE
 -CFLAGS += -g -Wall -Werror $(shell pkg-config --cflags libnl-3.0)
-+CFLAGS += -g -Wall $(shell pkg-config --cflags libnl-3.0)
++CFLAGS += -Wall $(shell ${PKG_CONFIG} --cflags libnl-3.0)
  LDLIBS += -lbfd -lreadline -lnl-3 -lnl-genl-3
  
  OBJFILES := main.o lookup.o\