gentoo resync : 28.04.2021

3 files changed, 22 insertions, 21 deletions

diff --git a/net-proxy/nutcracker/Manifest b/net-proxy/nutcracker/Manifest
index 5d741d3edd0c..2356fe1328bb 100644
--- a/net-proxy/nutcracker/Manifest
+++ b/net-proxy/nutcracker/Manifest
@@ -1,8 +1,8 @@
-AUX nutcracker-0.3.0-use-system-libyaml.patch 2183 BLAKE2B ad2cdffe2f038bf6715714f02d66d4610abb0abed2b5664e501a00e0340c2f20d7a06835322fab0369fc4747cd08ff010f028ab705181f881eda0c5c7b1c0145 SHA512 b37037f9089f0bc3eec53916e204986674e14d806028672fa723a453e274fe64a6290c14aaaebcaabaf1237069a6563fb736af5919421573050fe1b006472937
+AUX nutcracker-0.3.0-use-system-libyaml.patch 1633 BLAKE2B 07fa4384987fdefae8ea6dd53cec0774434791a55ff873bd4921dbad314b745052dcfbcc29e18221cca0a4a6845d99b774f86949924a1e8d2bb5083c216288b4 SHA512 ed818b96c4c4c9e149eda91a7daca242b144496b00421c286d9f9e88863e3df8382835d2556bb988ff019d7cffee791ed35d4fefeef486bd6972c4bbbc1319f5
 AUX nutcracker.confd 271 BLAKE2B 5f8a19edd4841cbc8b86f14ec48b72a46be95f34050619a6e1d75b12a348c11dab9890f1bbfaceff262256977888c378d2eee2ffb8c7b5c97e75bcc9c6e61502 SHA512 491b0330fda3994bedc15a77e7b4f601a2a0c234298ff04ee088f0e4a9676864e0eb01e1532f2cb6fdf95cefe0b0b0cf39d84b0993cadff774e7721f22d8c752
 AUX nutcracker.confd.2 272 BLAKE2B dfcfdfb4134ce0acfb126b1c7cb32062e47906dd68ed109a4e9edbae9c56f4b1ae17b20f593ef5af904bbe85837f5bb9ff91e0e068acfdff82e949b623abb55a SHA512 d208654b1e1fd20f456f340fabe25836c8ba948c96db8034d41710f9e0362936a24f0faec89e51c04d478c60de5255c9d238ab00d7d7b778a0619061a8cbce4c
 AUX nutcracker.initd 890 BLAKE2B a06886319400baa7b38fc32fb2961c80def5298e733977317edc158eef265d913b1437427b47e383f4c8ce0e65cf3d2d5117865ed542fc1ecc0a1f964356b7b8 SHA512 f40d692daa3cad7d7bce85ac0ecb01ca93f28f79e74b8a5bbea38930f78b24578b47fd7c44e36217ce60fee1ac3faefd8cd6d923046b339ec00c8fcc0f05f4fb
 AUX nutcracker.initd.2 891 BLAKE2B c643a511d2e402477c0862b67cdebb244fc2205466d78bc3cdb74b1f63b1659fef6bc0480d6950b5e00c0d9e84e072050f3bedb5d7931ee904c233313290e20b SHA512 ab06f875dca4ae27b4536d84c9342ec362e6f45f20efd370da0cb6073b306eeb0a1166737f6bdba3e1d5fe836d6b708729b7eadbab62cf66151649d2f56414eb
 DIST nutcracker-0.4.1.tar.gz 1163442 BLAKE2B 6838fbb5623ad49ef564176ba4c7d4e61cedb9693851cacc06d8ed09e3045b8cff9df1af8e21790cfa0e3f988b81a9c9cfa852449d532a432c05f3f4c3eace56 SHA512 581fae1d12feb983ed25b22cd6f597fd28b7070906ac29d3990669ae5c626a468914021cee152a6a2299a2838c838ad907e4c911b911ef04166ac7bbb2982da1
-EBUILD nutcracker-0.4.1-r1.ebuild 945 BLAKE2B 035e4388a33b31aca64ff31265b2ca9b7009bed0c63b621cf5d6002f08643ef0e44d3870755c66ec416e1bff3ed2dc4acd928b470ae9dab7e52a7308bb87d412 SHA512 5253d7d16427ad5f25650a741aa835b8130f632df98be16b92a9ae52f5d81da620cf578752e39ef42ff080188ba203b57dd922de9ddf53332d7e3ffca85ce3f8
+EBUILD nutcracker-0.4.1-r1.ebuild 967 BLAKE2B fdbb5f9bb2994b464ee5747f1c1d6eee86cf16fb9564cb7f342f6ca2be275f9bdafb0b9c48476266cab173eac951d1cb3d770e4701ea2bfb21285f1919593066 SHA512 3141ebbaa5868aef9858ed910a630e0767eb849979470bc23b65114b4266c311e93868efd2054b6279764b4522d11c91681788e83578d945582efd11e020ec2f
 MISC metadata.xml 329 BLAKE2B c3b117fab3b6d2d5f01572e797c946d89bfead4d46853df0aa03da840fde527fbaec9d070446872aabd632a3a27f2a0ad82a4164df0c58fa132a8b51e38828ea SHA512 26a39f6d3e84b5ec4f59c9f7167593f3f340be020401213a0339d027ddcbbcebbb512313c39ed1a3e61007b16f85737dc23e2f091413a4ef91d3675fd2ea2034
diff --git a/net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch b/net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch
index 8a30fae46fc1..a3cccd3cc5c0 100644
--- a/net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch
+++ b/net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch
@@ -1,6 +1,5 @@
-diff -uNr nutcracker-0.3.0.orig/configure.ac nutcracker-0.3.0/configure.ac
---- nutcracker-0.3.0.orig/configure.ac	2014-03-17 17:55:54.500000001 -0400
-+++ nutcracker-0.3.0/configure.ac	2014-03-17 17:58:50.290000001 -0400
+--- a/configure.ac
++++ b/configure.ac
 @@ -195,11 +195,8 @@
    [AC_DEFINE([HAVE_STATS], [1], [Define to 1 if stats is not disabled])])
  AC_MSG_RESULT($disable_stats)
@@ -15,9 +14,8 @@ diff -uNr nutcracker-0.3.0.orig/configure.ac nutcracker-0.3.0/configure.ac
  
  # Define Makefiles
  AC_CONFIG_FILES([Makefile
-diff -uNr nutcracker-0.3.0.orig/Makefile.am nutcracker-0.3.0/Makefile.am
---- nutcracker-0.3.0.orig/Makefile.am	2014-03-17 17:55:54.500000001 -0400
-+++ nutcracker-0.3.0/Makefile.am	2014-03-17 17:56:38.920000001 -0400
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -2,7 +2,7 @@
  
  ACLOCAL_AMFLAGS = -I m4
@@ -27,9 +25,8 @@ diff -uNr nutcracker-0.3.0.orig/Makefile.am nutcracker-0.3.0/Makefile.am
  
  dist_man_MANS = man/nutcracker.8
  
-diff -uNr nutcracker-0.3.0.orig/src/Makefile.am nutcracker-0.3.0/src/Makefile.am
---- nutcracker-0.3.0.orig/src/Makefile.am	2014-03-17 17:55:54.500000001 -0400
-+++ nutcracker-0.3.0/src/Makefile.am	2014-03-17 18:00:08.480000001 -0400
+--- a/src/Makefile.am
++++ b/src/Makefile.am
 @@ -7,7 +7,6 @@
  AM_CPPFLAGS += -I $(top_srcdir)/src/hashkit
  AM_CPPFLAGS += -I $(top_srcdir)/src/proto
diff --git a/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild b/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
index 7fa901b297c4..3203b919e775 100644
--- a/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
+++ b/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=7
 
-inherit autotools eutils
+inherit autotools
 
-DESCRIPTION="A fast, light-weight proxy for Memcached and Redis.
-(Twitter's Twemproxy)"
+DESCRIPTION="A fast, light-weight proxy for Memcached and Redis. (Twitter's Twemproxy)"
 HOMEPAGE="https://github.com/twitter/twemproxy"
-SRC_URI="https://github.com/twitter/twemproxy/archive/v0.4.1.tar.gz -> ${P}.tar.gz"
+SRC_URI="https://github.com/twitter/twemproxy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/twemproxy-${PV}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -17,12 +17,16 @@ IUSE="debug doc"
 
 DEPEND=">=dev-libs/libyaml-0.1.4"
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-S="${WORKDIR}/twemproxy-${PV}"
+PATCHES=(
+	# Let's use system libyaml
+	"${FILESDIR}"/${PN}-0.3.0-use-system-libyaml.patch
+)
 
 src_prepare() {
-	# Lets use system libyaml
-	epatch "${FILESDIR}/${PN}-0.3.0-use-system-libyaml.patch"
+	default
+
 	eautoreconf
 }
 
@@ -31,7 +35,7 @@ src_configure() {
 }
 
 src_install() {
-	default_src_install
+	default
 
 	insinto /etc/nutcracker
 	newins conf/nutcracker.yml nutcracker.yml.example