diff options
| -rw-r--r-- | net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch | 15 | ||||
| -rw-r--r-- | net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild | 17 |
2 files changed, 17 insertions, 15 deletions
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 120095057bd4..3203b919e775 100644 --- a/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild +++ b/net-proxy/nutcracker/nutcracker-0.4.1-r1.ebuild @@ -1,13 +1,14 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit autotools epatch +inherit autotools 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" @@ -16,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 } |