gentoo resync : 21.10.2017

4 files changed, 45 insertions, 39 deletions

diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index f76a6b36ce96..b0dad5b12571 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -2,12 +2,12 @@ AUX carbon-c-relay.confd 362 SHA256 59585da9b3c72eb569bb5a736350e8fd7c397955682c
 AUX carbon-c-relay.confd-r1 365 SHA256 9d75f37ce665f68eac89d8475b8063905a399707bea3867137a0c9578ea340f8 SHA512 a432cf28c86ec45c807eeb5a7b506e7dcc6155c138aea5dc60eb8bcf5036ac0efc3a81fbc044af34dab5f05f250635892c5e706dfd69cc1087f0c283c3aa9393 WHIRLPOOL fd5e5302f62dcabfe13134577fc21de304c22114e018e5ae798f00c1dbb80161915f2904f1be02171f08e52b08a22e2d262e1375bbbaeb4e0fc2073b3e9613af
 AUX carbon-c-relay.initd 1678 SHA256 c3296fc3944080e88059967646f4d88a1bbd8b3e2c4fa9a0b2e9224c73ec4613 SHA512 5a3415395affe6c4e315c650733d8e335d5fa8e490ffeba8dc7c944976f3b68ca14e801175a2136499b00fa6adf403428ae509cb9c3596b6a3188ef20d09c575 WHIRLPOOL dc413e1b2fb77919e688bf5ec91e4afa434ca6fdb466f432621bc7455f7dac7ad5b45753a11bcf5a64e06941569fce26c611d541bf91910b72d58c8b096e0bcc
 AUX carbon-c-relay.initd-r1 1801 SHA256 43e6fb5e6c83490c190db1cf6ef46423d7ad29f9d46cc3820927e21480ec8371 SHA512 5cf3c424a8be6bb55a80b58ce590838fec8ed26f8f407e8561c1e3ea094e80ad4021d153b3d816ab6d4e6589494d9ce621fe14196e223ef3a092d0aa26a63399 WHIRLPOOL 27aa131bf56d8dfef83fb6d4b0d7f8c87563ba40e5ab808d96edb8e921ede6da8f2a580990e5f024f7e2cd4af3faaee910dcd34f11d1521d97735bc852630a80
-DIST carbon-c-relay-2.5.tar.gz 102119 SHA256 6d3c538aacd08e9798e294d56b98854fdafe1b3a1d0d8118a406a2d8fe6aad5b SHA512 0b3b04003cda761816ea4bbe9d441366438c8507702f157504b21b66c9ef9b1e135239e6627d3dd3d371c023d71f2cd97ba45bc2ff6296a4998e06bdda219ea3 WHIRLPOOL dc73f9e001217ebbc84bc603fe94bdbf34a8039c65f3d1612c31a2e5de0fe8cb6a5c9db5bb7e79681daf567033b5ee2534a844f9e6d3315ca50f2ab0f1d5befa
 DIST carbon-c-relay-3.0.tar.gz 153479 SHA256 5ae673ed0091a814bc8d6081ff14cfbbda7582fa0c8ccf1a5cf438ba84c2b585 SHA512 046dd19be1791eaf2b50bd7029f0bbe8ad0805113faf9a80b37571c42d76c0f7661a9273876de8cd5bf1d13fdc8133a8eaf9def28dd8077bf667225726797fdc WHIRLPOOL f349475179f762a226c87c87fe12e5b43be4fbff36ed12292c5461e65cbf1a814108daa4e0bd6946b077c230656372e6190fc657136cf6e4fa541e4636dc9b8d
 DIST carbon-c-relay-3.1.tar.gz 271011 SHA256 d21203a63fefa7c226f8170da204832d8e519001004f0f6fb44546c5eb147389 SHA512 8c8062e4fa9ec22281b1848923dc73b39c4617b0c6297f57f69080a7aedf07ef8d5c6e0bebbd5ef0faf3a1255ab155475bc40aeee582838d604da1cc2e43ca4e WHIRLPOOL bdc4d238398ac6b981e432bef3c1f4c9d181d1540a0af1e573bb6e8bb0a42deb0e4b504b6b727019e4667aa8188d476e261e0bdbe5b469345f7b17a39b966b6c
-EBUILD carbon-c-relay-2.5.ebuild 763 SHA256 3b1788afdd5dab301b221b01cee8807a1f4e63742e0b0ad9b1680624ec58edaa SHA512 f8836f0b85480498ec316e1e356e2c06038f7cd98f80519d7734b3ec4d41113a6ba0f67a4740b2244ccbbf60a643c94dcd9be20d15efa44bfe60f362c9b8d770 WHIRLPOOL 40e0a34012176a16bab0a0f6c889e871ee2c42b8c5c3fa2b41e844a2d4f9dd58507878e5e6ae813b82fda8a3fffc8f0f6c26e575f23f6c002973b148665aeaac
+DIST carbon-c-relay-3.2.tar.gz 291396 SHA256 c169255f5d1c2403947b03bc3b541b923121a4d78d9d2c62ddd719b75768b19e SHA512 11065303e18e9e2660150a7ba2137abe48b514abcdba93632a5fa46c8412bfb3472bfebb93584c629e5978be210237fad77f975eb1abb1e07b9cdba119c7eef4 WHIRLPOOL 633c6bda63310e0e68fb60ed3f93d0845bb74e9725f8bba842fbb320255fd0c73a5892596403f54c1d54aa06930dedb6698c7b0a9ceabb03f41a38c4a5038b13
 EBUILD carbon-c-relay-3.0.ebuild 763 SHA256 3b1788afdd5dab301b221b01cee8807a1f4e63742e0b0ad9b1680624ec58edaa SHA512 f8836f0b85480498ec316e1e356e2c06038f7cd98f80519d7734b3ec4d41113a6ba0f67a4740b2244ccbbf60a643c94dcd9be20d15efa44bfe60f362c9b8d770 WHIRLPOOL 40e0a34012176a16bab0a0f6c889e871ee2c42b8c5c3fa2b41e844a2d4f9dd58507878e5e6ae813b82fda8a3fffc8f0f6c26e575f23f6c002973b148665aeaac
 EBUILD carbon-c-relay-3.1-r1.ebuild 765 SHA256 1b639164a894f48e08f93f0bdd0cfad22b3e832fa452933d7cc75af1511206ce SHA512 ab94696270aa31b1c4b48320aa211a4488f613a28497c6d08c502a9e14e642ea89d08233f6f128b7ddb5ef31e361bbe7053e91118d1fdbd4b40a9d1e12ce59fa WHIRLPOOL bfbbce605c246811000140600e9e3a8a818b040dd00d286555ef4f4e96be49bf99b1757b5b8417e0255f94c6fba7fa7c283a943cbf3c4bc36334b30775d2eee5
+EBUILD carbon-c-relay-3.2.ebuild 941 SHA256 4b0b514b2160c148128fdd79163ebd170ca9c9a21f9b20fdf6e4fd8fb966366e SHA512 41808fed0c890a1e335986e93ee3fb0ec764ba3e364f151080d477b8546707857f36a834b755d25caab9c393c5e12409b48a497aab292b49921697c8c5546a85 WHIRLPOOL df48261911d4e310dc841a697db2466d5d9c55d43103d841cd02787857cd7eb96c59bd9c7895843facfba908d083bf54fe5b58a3b2f8f35f14b042117a5fc096
 MISC ChangeLog 5651 SHA256 225cfa30da5b142e679f76ae622e5ebfe44d3c0e0f5c121e2e5f3770bcfa965d SHA512 4e64882411923e4f7e288988f590d4a3975413c2f1bb8baf16cc1146763eec60efc0cb28e05d8d9c9a23ec08f8a712aaefc537f66af3806106677e464281289b WHIRLPOOL 4324b314f2145d9177a844548bd8eb679d5ca9bba2d39e29cabb55a6b49217e633b41e2c899fc53386e1f41fe533b274d2f83e847c9081643a00200cc4e875fb
 MISC ChangeLog-2015 2171 SHA256 b82d3b5c6ce6bd8756f7d98dd2b905f5a341cdc744064db88cd72fff94f2f8f0 SHA512 4948557084548138e005af3a72428c07aec2dd7ee1535e834a3a30ac1ddf7c6f638181bc7074dd4544da22da4397f6ab434f50bf2aa0c494f3ab11b92dac3d76 WHIRLPOOL 5f7325c694d1fadc31d831f62c3413d289c7c092af61f5ca53944a759203badf7f2c9c5a35b36d47738dde31162508220c07304d2752b56ed7a07b2bb9002d28
-MISC metadata.xml 313 SHA256 24ccb0b4ebc32dcd26652eee575bd2834175813c338dbdb203b45e828676d0de SHA512 df24381507480f808a47e0b8477f9f407d85a113fd6a8f6a100fd96fc2011f3a6d7cfc7bcf520e3254f604878b5bdd1672d92fc4969da0becc5e96da520d2ad7 WHIRLPOOL a54cfdcec88940275365ae60407b6fdddc384755dc0cc5e000222f859bf14c33e7a7b59f9615ca75d68c6f91a43f1243ef529cdcda20c21a360a1dfb750e96b6
+MISC metadata.xml 399 SHA256 2b755b42e0596211a6f9627707316c2353a3491d1bb55fd1c41c437a3c508884 SHA512 95617c9e65ebec2caf7015ec6e4fdb7fbbdbeccca3375ad53ab5ba974e490ca111fb46b16dbf623648a0808cda4097c4cbb52aeea4c4a5f289d7b2f2ae126950 WHIRLPOOL f22ea45beac42a24968045effa849e7163fd58f8a5d65a000767239054f9447c79a6f870ae08ef23963bde6973726a70fa8f305df1588b70b1139086a0abdfad
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-2.5.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-2.5.ebuild
deleted file mode 100644
index 963456421ce6..000000000000
--- a/app-misc/carbon-c-relay/carbon-c-relay-2.5.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs user
-
-DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
-HOMEPAGE="https://github.com/grobian/carbon-c-relay"
-SRC_URI="https://github.com/grobian/carbon-c-relay/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=""
-DEPEND="${RDEPEND}"
-
-pkg_preinst() {
-	enewgroup carbon
-	enewuser carbon -1 -1 -1 carbon
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	newbin relay ${PN}
-	dodoc ChangeLog.md
-	doman ${PN}.1
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild b/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild
new file mode 100644
index 000000000000..b90690b8cff7
--- /dev/null
+++ b/app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user
+
+DESCRIPTION="Enhanced C version of Carbon relay, aggregator and rewriter"
+HOMEPAGE="https://github.com/grobian/carbon-c-relay"
+SRC_URI="https://github.com/grobian/carbon-c-relay/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="lz4 ssl zlib"
+
+RDEPEND="lz4? ( app-arch/lz4 )
+	ssl? ( dev-libs/openssl:0 )
+	zlib? ( app-arch/gzip )"
+DEPEND="${RDEPEND}"
+
+pkg_preinst() {
+	enewgroup carbon
+	enewuser carbon -1 -1 -1 carbon
+}
+
+src_configure() {
+	econf $(use_with lz4) $(use_with ssl) $(use_with zlib gzip)
+}
+
+src_install() {
+	default
+	# rename too generic name
+	mv "${ED}"/usr/bin/{relay,${PN}} || die
+	dodoc ChangeLog.md
+
+	newinitd "${FILESDIR}"/${PN}.initd-r1 ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd-r1 ${PN}
+}
diff --git a/app-misc/carbon-c-relay/metadata.xml b/app-misc/carbon-c-relay/metadata.xml
index 976dd3f22c14..a9d0c9cb929f 100644
--- a/app-misc/carbon-c-relay/metadata.xml
+++ b/app-misc/carbon-c-relay/metadata.xml
@@ -4,6 +4,9 @@
   <maintainer type="person">
     <email>grobian@gentoo.org</email>
   </maintainer>
+  <use>
+    <flag name="lz4">add support for LZ4 compressed transport</flag>
+  </use>
   <upstream>
     <remote-id type="github">grobian/carbon-c-relay</remote-id>
   </upstream>