From ccbb103895caba4b098d41b2fc1db74b8051d8a8 Mon Sep 17 00:00:00 2001
From: Fabian Groffen <grobian@gentoo.org>
Date: Sat, 21 Oct 2017 16:58:21 +0200
Subject: app-misc/carbon-c-relay: version bump to v3.2

Package-Manager: Portage-2.3.11-prefix, Repoman-2.3.3
---
 app-misc/carbon-c-relay/Manifest                  |  2 +-
 app-misc/carbon-c-relay/carbon-c-relay-2.5.ebuild | 36 ---------------------
 app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild | 39 +++++++++++++++++++++++
 app-misc/carbon-c-relay/metadata.xml              |  3 ++
 4 files changed, 43 insertions(+), 37 deletions(-)
 delete mode 100644 app-misc/carbon-c-relay/carbon-c-relay-2.5.ebuild
 create mode 100644 app-misc/carbon-c-relay/carbon-c-relay-3.2.ebuild

(limited to 'app-misc/carbon-c-relay')

diff --git a/app-misc/carbon-c-relay/Manifest b/app-misc/carbon-c-relay/Manifest
index f99336178c85..9b1e5feabe4c 100644
--- a/app-misc/carbon-c-relay/Manifest
+++ b/app-misc/carbon-c-relay/Manifest
@@ -1,3 +1,3 @@
-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
+DIST carbon-c-relay-3.2.tar.gz 291396 SHA256 c169255f5d1c2403947b03bc3b541b923121a4d78d9d2c62ddd719b75768b19e SHA512 11065303e18e9e2660150a7ba2137abe48b514abcdba93632a5fa46c8412bfb3472bfebb93584c629e5978be210237fad77f975eb1abb1e07b9cdba119c7eef4 WHIRLPOOL 633c6bda63310e0e68fb60ed3f93d0845bb74e9725f8bba842fbb320255fd0c73a5892596403f54c1d54aa06930dedb6698c7b0a9ceabb03f41a38c4a5038b13
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>
-- 
cgit v1.2.3-65-gdbad