Version bump

Package-Manager: portage-2.2.8-r1/cvs/Linux i686
Manifest-Sign-Key: 0x1F6F0683

4 files changed, 123 insertions, 3 deletions

diff --git a/net-proxy/nutcracker/ChangeLog b/net-proxy/nutcracker/ChangeLog
index d7c3e9e9f596..c2d2255bdda9 100644
--- a/net-proxy/nutcracker/ChangeLog
+++ b/net-proxy/nutcracker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-proxy/nutcracker
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-proxy/nutcracker/ChangeLog,v 1.1 2013/10/31 20:04:54 neurogeek Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/nutcracker/ChangeLog,v 1.2 2014/03/18 14:49:55 neurogeek Exp $
+
+*nutcracker-0.3.0 (18 Mar 2014)
+
+  18 Mar 2014; Jesus Rivero <neurogeek@gentoo.org> +nutcracker-0.3.0.ebuild,
+  +files/nutcracker-0.3.0-use-system-libyaml.patch:
+  Version bump
 
 *nutcracker-0.2.4 (31 Oct 2013)
 
diff --git a/net-proxy/nutcracker/Manifest b/net-proxy/nutcracker/Manifest
index 8cf0fd7d37cf..fde03f8347cc 100644
--- a/net-proxy/nutcracker/Manifest
+++ b/net-proxy/nutcracker/Manifest
@@ -1,7 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX nutcracker-0.2.4-use-system-libyaml.patch 2570 SHA256 bd04d38c12d336b952a4b33aa969d11e4b0797ee6996d45814e5d33da0bf0c65 SHA512 a529872829318788d54b876800d940fdbb2d710bd092fe4b930bce3cfaf23116579d1a6f7ead8a181113713a654b34686ec7470d8198e7263aeb85e8b0f51d1d WHIRLPOOL 8f628ad6e018aee04d29e9bd48ba04d2e69581273d172ac22b315a73639b192cf3976dee96c557cf63528f716080661b04be2e925034be9eb1614054049989ba
+AUX nutcracker-0.3.0-use-system-libyaml.patch 2183 SHA256 f0fc84b8b0417ed3c411280eff9ad7c59caff12143531b95f70744a578ee3c84 SHA512 b37037f9089f0bc3eec53916e204986674e14d806028672fa723a453e274fe64a6290c14aaaebcaabaf1237069a6563fb736af5919421573050fe1b006472937 WHIRLPOOL 10275badffcff493ff174c86c34fc92eb54b53320c9a8e0a471a1ff27d733a38ba6bb8877ab655ec5fe31d7c54762eb451e96da6f2968312e069ebfe20d620a1
 AUX nutcracker.confd 392 SHA256 818299c6a15d4fba0ff7f1e30a4eeb72f73ba718e51a26dbb208780a9bfc86f9 SHA512 3cb599ad80612a9640506c232eb300f75eae113689bd13c2bbd429c213408cdf7f964a09f57c064a690a69e2dae0484a3db79f46c7e47c9f0e601eb0042f1be6 WHIRLPOOL ec072bbb0eced56100ec49fa5511f532765ec555242ebe1a41004c33288ba33f144dce0643cdd2987f2600f3cbc868577c90d591c3a586622860b99b11a483c3
 AUX nutcracker.initd 1010 SHA256 990569897d8d1ed31055f8f82eed0d2573c55ca843371188d94c39dbb7b06758 SHA512 ba7a6bc4c18c2602452935558ed433e3211bf0166c11250bb7df2c74f8640195bc21648b8bb8769f18c4f3d8706762b218effb2e583129b4da62eed10cbfde26 WHIRLPOOL b888823bb18fdad9669353d931c125d798b37b9c3f02cbcd736c928f418e423af3fe102798de5a5ae223bfe8a0d4af309b505ec6a4c7242c9d3d4beb89a40b07
 DIST nutcracker-0.2.4.tar.gz 1723439 SHA256 132f524541c6cf4dd1d570ec5da29312ed6150e8a369df703116498b65703b4e SHA512 13d7d2a778a5d85a1d73eaa220f2e95eb7765eff0c8af390ab916f099b12d6c1a99cb61ff418b9a909ff7e2b416b271ba034eb9f50cd7df1ee53600d8b681409 WHIRLPOOL a9e09376f70ade19ef6f80f769edef26b86f3af1d529f68fd6fc42575d4521603da230ee236f8b53c275c9695602e21a586d38fc33a68960b8c11359271af902
+DIST nutcracker-0.3.0.tar.gz 1825106 SHA256 e9993d6827b2e93ee2b865e827acbf9efadbbfc81ccd9103a85948ee2580942a SHA512 81ba21c54b9a15fbb1d0a42b426643b65bcd20b7bb4b35cf3427235703a01a44188b762edff412afe20c193a4e75bf618f69d8c77bae9d66cd2c4e619416f565 WHIRLPOOL 073d411619d14ff57ef9ec72975db99791d29b4b606b6a3af99a2e64b19983a0200b797e753626e7b21aeaae02a28a02402646aeb20919d0910441e5981f8da4
 EBUILD nutcracker-0.2.4.ebuild 1022 SHA256 682a326fca82d3c782d374b98694711f86daba8d26b136c81a7624e3d64ab157 SHA512 1d0aaee55978d377381594e18fde75910a49743a342c3cc0a2eb64d37e8539c5d8afb963a5fdcfa778ccdb076b86fbf7a63f3cf1d151d2133ac3c8f204bd5fd8 WHIRLPOOL 02f3b5b8be7f5b61be9bbba576004ebfd160247cb09acf2f8756ae53f9314ed865d48ab4281d8bc01343847365f4a7a1d562dd16ebec67e702280fb2346e5792
-MISC ChangeLog 448 SHA256 1df63972a63698cea480b3cedb3ad2b37884df022a1d07dee3e3379aa9b26a9b SHA512 631e4e32c6e8279dea4abef03ade0767d1235a7b39759f464a680c2afd3dd7e8a492a9210d0c2915032c014c0ac499af2607eeefcd7637cc3773be793202ed75 WHIRLPOOL 5680a38923cbc9ec0d7ffdbcaed0cc117e9e2ea78acaeb4a407539ed6c3db865e53e9118e482cd0053755dd74c1d0e07f0fe376cbe34cad5ca010f44d5afa2e1
+EBUILD nutcracker-0.3.0.ebuild 1022 SHA256 064144ce3ec076f8139f1c35638df046d5506c083f694de109637060101776d9 SHA512 b4fdcaf87941643977bc946873c0606b5a600c917fd441aa0ee20d4ee40071c0fb248bb34082283010eefe0dbebf433e8cff18216c5999568fbffc7307c8788d WHIRLPOOL 9cec0b1daa5c68b87cec2ef17861e655b22091daaaabed8e5d8dec2a91a5daa1e4239e3a97f59f0bc96abc7057690c1a638c6d392123a8572c84e487795a9b99
+MISC ChangeLog 626 SHA256 2c27a3254b4265be568a3cae3904b59ea8f1ced8ce988dd366956be2f5ff811a SHA512 3f9a86e897cdb5c467bc76fbdee8d12f48eae30028657ea2a726525925cc19de96446596e5cf619d63b58eea231d30536e131965e353c51eae34b2ad7533fbc9 WHIRLPOOL a07d912b8e1ce70f09f7d6f636f8b23b39ce2ffaa289cbcc70daa98affdc6899bc50cd490827661973470a8515ca6893a86b4ad83ebb9f42cdde0d627c86e2fa
 MISC metadata.xml 278 SHA256 639e9c8fcbe80deada7c22051a9090bc6e56ba9edbd891a4485fe4b4687f36ee SHA512 75711c25dc1a5743bf356d24d3760fb6373714640302b7a16b4d38f21977e7cb9cbd62383e32a20718696ab241b9d77601bed04d507590f2e802a2481ed30a91 WHIRLPOOL f0af486b285336c8a208ed2928e55548aebf949ca25b7880b1ee2a0bee41cfa4fd3960a4e887f5cde3e941ae7818eb315f8c81479b6b114b060bbb45537338bf
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.22 (GNU/Linux)
+
+iEYEAREIAAYFAlMoINUACgkQdIssYB9vBoOD0ACfQUoQTNzF03ho0Jj8myzBTIlj
+9PwAoIfcqViMV4TYFoxh2FyaEZC+AmA9
+=pT0W
+-----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..8a30fae46fc1
--- /dev/null
+++ b/net-proxy/nutcracker/files/nutcracker-0.3.0-use-system-libyaml.patch
@@ -0,0 +1,57 @@
+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
+@@ -195,11 +195,8 @@
+   [AC_DEFINE([HAVE_STATS], [1], [Define to 1 if stats is not disabled])])
+ AC_MSG_RESULT($disable_stats)
+ 
+-# Untar the yaml-0.1.4 in contrib/ before config.status is rerun
+-AC_CONFIG_COMMANDS_PRE([tar xvfz contrib/yaml-0.1.4.tar.gz -C contrib])
+-
+-# Call yaml-0.1.4 ./configure recursively
+-AC_CONFIG_SUBDIRS([contrib/yaml-0.1.4])
++# Use systems libyaml.
++PKG_CHECK_MODULES([YAML], [yaml-0.1 >= 0.1])
+ 
+ # 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
+@@ -2,7 +2,7 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-SUBDIRS = contrib src
++SUBDIRS = src
+ 
+ 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
+@@ -7,7 +7,6 @@
+ AM_CPPFLAGS += -I $(top_srcdir)/src/hashkit
+ AM_CPPFLAGS += -I $(top_srcdir)/src/proto
+ AM_CPPFLAGS += -I $(top_srcdir)/src/event
+-AM_CPPFLAGS += -I $(top_srcdir)/contrib/yaml-0.1.4/include
+ 
+ AM_CFLAGS =
+ AM_CFLAGS += -Wall -Wshadow
+@@ -17,9 +16,10 @@
+ AM_CFLAGS += -Wno-unused-parameter -Wno-unused-value
+ AM_CFLAGS += -Wconversion -Wsign-compare
+ AM_CFLAGS += -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations
++AM_CFLAGS += $(YAML_CFLAGS)
+ 
+ AM_LDFLAGS =
+-AM_LDFLAGS += -lm -lpthread -rdynamic
++AM_LDFLAGS += -lm -lpthread -rdynamic $(YAML_LIBS)
+ if OS_SOLARIS
+ AM_LDFLAGS += -lnsl -lsocket
+ endif
+@@ -52,4 +52,3 @@
+ nutcracker_LDADD = $(top_builddir)/src/hashkit/libhashkit.a
+ nutcracker_LDADD += $(top_builddir)/src/proto/libproto.a
+ nutcracker_LDADD += $(top_builddir)/src/event/libevent.a
+-nutcracker_LDADD += $(top_builddir)/contrib/yaml-0.1.4/src/.libs/libyaml.a
diff --git a/net-proxy/nutcracker/nutcracker-0.3.0.ebuild b/net-proxy/nutcracker/nutcracker-0.3.0.ebuild
new file mode 100644
index 000000000000..f545a4a35706
--- /dev/null
+++ b/net-proxy/nutcracker/nutcracker-0.3.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-proxy/nutcracker/nutcracker-0.3.0.ebuild,v 1.1 2014/03/18 14:49:55 neurogeek Exp $
+
+EAPI=5
+
+inherit autotools eutils
+
+DESCRIPTION="A fast, light-weight proxy for Memcached and Redis.
+(Twitter's Twemproxy)"
+HOMEPAGE="https://github.com/twitter/twemproxy"
+SRC_URI="http://twemproxy.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc"
+
+DEPEND=">=dev-libs/libyaml-0.1.4"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Lets use system libyaml
+	epatch "${FILESDIR}/${P}-use-system-libyaml.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use debug) || die "Econf failed"
+}
+
+src_install() {
+	default_src_install
+
+	insinto /etc/nutcracker
+	newins conf/nutcracker.yml nutcracker.yml.example
+
+	newconfd "${FILESDIR}/nutcracker.confd" nutcracker
+	newinitd "${FILESDIR}/nutcracker.initd" nutcracker
+
+	if use doc; then
+		dodoc -r notes
+	fi
+}