gentoo resync : 20.06.2021

3 files changed, 8 insertions, 6 deletions

diff --git a/dev-ruby/hiredis/Manifest b/dev-ruby/hiredis/Manifest
index 29507f58c09d..2ab7b85a0a0c 100644
--- a/dev-ruby/hiredis/Manifest
+++ b/dev-ruby/hiredis/Manifest
@@ -1,4 +1,4 @@
-AUX hiredis-0.6.1-unvendor-hiredis.patch 668 BLAKE2B 028700bf24f26e0090fefde677c32c44de57558ce9e334c7d2396e8fd98112ad96fa9502a1aa363ff4843d3b7e9d80a07870a011482d0716b84d22414014d3eb SHA512 c58191682152d26c823c01c689a4cb9becc6dd870034e8ddb7f1aa64a345025f771beb1f72b3dcfebb6948412e1548c9f28fb65c11d60243acad232ecd5e5787
+AUX hiredis-0.6.1-unvendor-hiredis.patch 599 BLAKE2B 941d7f370c1dc85de07334b77e89180285fc57e604ffb904eb03fbb9c810d28c2c2e229f1589b98f58c80f68f3a21fa881ea78805361b67032a3006605428c1f SHA512 34d527c1182bd5bbc17e0a4e08b29bfeb15a55c02d1cfde75e5bb2b1589ee3dec622d87ed00cc3d7db390f4cb0ddc9c60e2344ef28c48b725eb37262cb349c55
 DIST hiredis-rb-0.6.3.tar.gz 19106 BLAKE2B 2892fd28bf7e7edfc3563a0c321fd781baeca9eb31a64dd559a6c828bb9c4fe37c995748782c5222db46b5b35a4d17f5b8b4d8e5306209a0e374ec7096d3cd4b SHA512 3e081d46aeb128789fa41fe9422186dd30e88c5a7a3c16dfcf1a92fe7faf99cced352ea39a885785fc12f0a974625be329d9ff2a5936a786febe8a2c81f5e139
-EBUILD hiredis-0.6.3.ebuild 1126 BLAKE2B 6660c27d5eb3a455cfe18772de74d063e295a57e144a0f5632ae7338d349e09fa7200bf858194eb8d55ae32eb08c52a4055e78a0ed237ad4c5de07b4042e0bf1 SHA512 be300037f287a32a8c99eb1e7a9b8e43f0b187a99591f8d7a162cf68cba3d45127a592a95b0643ff407072bb1867e5f0e077c511ba2c36ed55a5184ad31ad66c
+EBUILD hiredis-0.6.3.ebuild 1177 BLAKE2B 3fa66c7317abd22be66df5ffd3aa7169f9ac62e2f0688a56af77473d247d71787497aa150cffbd580ef89e6675e2e1174594a2f9f1dca25ab653eddf5d3ca010 SHA512 fb0d3dd060e9700696a3eb6e50a23de134134c0bfd3398c65dca871ed2dd73f1e15c4f15e7593bbc8b1ebb04c4cabe6a7a2c7697750e8679d5451becb2a9ef88
 MISC metadata.xml 342 BLAKE2B fd0bfbbf389a657ac98a4bd4da04180258197b8947e4fcff2d0495f99d74795e97c17d90e4f8cd3c37896fe438fb51f61b7c8bf524a546da12f1e1db949275cb SHA512 82e2c1eba3739857ef533105899b3fa50865136d9aa54709b97d46beb8791c3025b78fbd5173db3c5e0981c0d0873f88ceef9b4a1abdeee7d47c860ae6b25c92
diff --git a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch b/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
index e8fb1f9ffa62..885d6d15819e 100644
--- a/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
+++ b/dev-ruby/hiredis/files/hiredis-0.6.1-unvendor-hiredis.patch
@@ -1,5 +1,5 @@
---- a/ext/hiredis_ext/extconf.rb	2015-12-29 15:53:00.000000000 +0100
-+++ b/ext/hiredis_ext/extconf.rb	2018-04-21 07:40:15.973747727 +0200
+--- a/ext/hiredis_ext/extconf.rb
++++ b/ext/hiredis_ext/extconf.rb
 @@ -27,15 +27,8 @@
  end
  
@@ -13,7 +13,7 @@
 -  # Statically link to hiredis (mkmf can't do this for us)
 -  $CFLAGS << " -I#{hiredis_dir}"
 -  $LDFLAGS << " #{hiredis_dir}/libhiredis.a"
-+  $CFLAGS << ' ' << `pkg-config hiredis --cflags-only-I`.chomp
++  $CFLAGS << ' ' << `${PKG_CONFIG} hiredis --cflags-only-I`.chomp
 +  $LDFLAGS << ' -lhiredis'
  
    have_func("rb_thread_fd_select")
diff --git a/dev-ruby/hiredis/hiredis-0.6.3.ebuild b/dev-ruby/hiredis/hiredis-0.6.3.ebuild
index 79371e1ba364..7f495d631948 100644
--- a/dev-ruby/hiredis/hiredis-0.6.3.ebuild
+++ b/dev-ruby/hiredis/hiredis-0.6.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,6 +23,7 @@ IUSE=""
 
 RDEPEND+=" >=dev-libs/hiredis-0.14:="
 DEPEND+=" dev-libs/hiredis test? ( dev-ruby/test-unit:2 )"
+DEPEND+=" virtual/pkgconfig"
 
 RUBY_S="${MY_P}"
 
@@ -33,6 +34,7 @@ all_ruby_prepare() {
 }
 
 each_ruby_configure() {
+	tc-export PKG_CONFIG
 	CC=$(tc-getCC) ${RUBY} -Cext/hiredis_ext extconf.rb || die
 }