[gentoo-commits] repo/gentoo:master commit in: net-misc/kafka-bin/files/, net-misc/kafka-bin/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-misc/kafka-bin/files/, net-misc/kafka-bin/
@ 2016-09-26 12:15 Patrick Lauer
  0 siblings, 0 replies; 3+ messages in thread
From: Patrick Lauer @ 2016-09-26 12:15 UTC (permalink / raw
  To: gentoo-commits

commit:     2a2d1d4feca8c3732151697caf947e42a1c6223f
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 26 12:12:24 2016 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Mon Sep 26 12:14:49 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a2d1d4f

net-misc/kafka-bin: Initial commit

Based on ebuilds from lmiphay overlay, updated and tested in adjust overlay

Package-Manager: portage-2.3.0

 net-misc/kafka-bin/Manifest                     |  1 +
 net-misc/kafka-bin/files/kafka-zookeeper.init.d | 20 ++++++++
 net-misc/kafka-bin/files/kafka.init.d           | 19 ++++++++
 net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild    | 62 +++++++++++++++++++++++++
 net-misc/kafka-bin/metadata.xml                 | 10 ++++
 5 files changed, 112 insertions(+)

diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
new file mode 100644
index 00000000..1e0d2a4
--- /dev/null
+++ b/net-misc/kafka-bin/Manifest
@@ -0,0 +1 @@
+DIST kafka_2.11-0.10.0.1.tgz 31831257 SHA256 2d73625aeddd827c9e92eefb3c727a78455725fbca4361c221eaa05ae1fab02d SHA512 ab89c1d0cf4e05e823f45629e7bc5778173fd7420ebfa259f566071c6b474b08abf808508c7fd6fcca2233b20e76cbf6a235563709bfa019455386f80f0b5d71 WHIRLPOOL 5928d39afdaa4b7cc3839b2555229d42ecc9b3ccd6c76cb2dfd1a7fd4f2fcb2ac9abd055b7c698b5d82232df10e10d4c2f2fd525e880a9c0ed78550e2cf2d28e

diff --git a/net-misc/kafka-bin/files/kafka-zookeeper.init.d b/net-misc/kafka-bin/files/kafka-zookeeper.init.d
new file mode 100644
index 00000000..b5c87fa
--- /dev/null
+++ b/net-misc/kafka-bin/files/kafka-zookeeper.init.d
@@ -0,0 +1,20 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+description="Zookeeper for Kafka distributed messaging system"
+
+logfile="/var/log/kafka-zookeeper.log"
+
+command="/opt/kafka/bin/zookeeper-server-start.sh"
+command_args="/etc/kafka/zookeeper.properties"
+start_stop_daemon_args="--chdir /opt/kafka --stdout $logfile --stderr $logfile"
+
+command_background=yes
+pidfile=/run/kafka-zookeeper.pid
+
+depend() {
+	need net
+	after bootmisc
+}

diff --git a/net-misc/kafka-bin/files/kafka.init.d b/net-misc/kafka-bin/files/kafka.init.d
new file mode 100644
index 00000000..38943b6
--- /dev/null
+++ b/net-misc/kafka-bin/files/kafka.init.d
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+description="Kafka distributed messaging system"
+
+logfile="/var/log/kafka/kafka.log"
+
+command="/opt/kafka/bin/kafka-server-start.sh"
+command_args="/etc/kafka/server.properties"
+start_stop_daemon_args="--user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile"
+
+command_background=yes
+pidfile=/run/kafka.pid
+
+depend() {
+       after zookeeper kafka-zookeeper
+}

diff --git a/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
new file mode 100644
index 00000000..7dcdb9e
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.11
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties"
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties"
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}

diff --git a/net-misc/kafka-bin/metadata.xml b/net-misc/kafka-bin/metadata.xml
new file mode 100644
index 00000000..0cd4216
--- /dev/null
+++ b/net-misc/kafka-bin/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+        <maintainer type="person">
+                <email>patrick@gentoo.org</email>
+        </maintainer>
+	<use>
+		<flag name="internal-zookeeper">Use bundled local zookeeper instance</flag>
+	</use>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/kafka-bin/files/, net-misc/kafka-bin/
@ 2017-09-16  6:03 Patrick Lauer
  0 siblings, 0 replies; 3+ messages in thread
From: Patrick Lauer @ 2017-09-16  6:03 UTC (permalink / raw
  To: gentoo-commits

commit:     a230e14647d7cd048a955ae27d1c1b397073db57
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 06:03:37 2017 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 06:03:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a230e146

net-misc/kafka-bin: Bump

Fix pidfile creation in init script

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-misc/kafka-bin/Manifest                  |  1 +
 net-misc/kafka-bin/files/kafka.init.d.3      | 22 ++++++++++
 net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild | 62 ++++++++++++++++++++++++++++
 3 files changed, 85 insertions(+)

diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index e731d8b9c72..9adbaaaa6f5 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -4,3 +4,4 @@ DIST kafka_2.11-0.10.1.1.tgz 34424602 SHA256 1540800779429d8f0a08be7b300e4cb6500
 DIST kafka_2.11-0.10.2.0.tgz 37630750 SHA256 4c9e73059dea2dcb5022135f8e7eff5f187ffcc27a27b365b326ee61040214cd SHA512 3d972cdccdbe889b73b8d5ec68e8a0bc5daabed29ec8f1f217e22887534eba8f3127886c07950a673c55d289a9dbd077763141eb883b5f9e2fe8b56b4524941c WHIRLPOOL 75ecf95f80ed2295eebb910fdd50e6cb44aba0fe79cee724bbace6f024a34d2d2fc1fd84f987877476e8f1c46a7f61000b833c0422be6d5daa8ce175e8a9a28a
 DIST kafka_2.12-0.10.2.1.tgz 34046244 SHA256 e523b448b24a908202c35f12fd0caaa49ce70070305c360f7ed2270bb2c95f47 SHA512 48884838980ff182fe1bb089b5f8db91aaa190dad9f9cbf24d762ba8afb897546f66d66ce110eef87ad1541e06564e5ea455e4698a23fbd296d971e033953bbc WHIRLPOOL f6fa89a778828d84824e867db84bd3e7d40ceb389beb29bef079ef9220ab8010a2d39e51a42a12abb3446bb96bcee560bfa6966c1681185532eabfc75f065a0f
 DIST kafka_2.12-0.11.0.0.tgz 36644420 SHA256 ab6310dd0d9fce1e6e8045b51b471fb35c3e197714e6e6b03bc5864898785f2d SHA512 60b44930700ab42e4a0e3945b6eb32db422d2e62388b4fee68aef97aea939fd252ebd0be39b36a4e6149aff9dcbd5b0578095d8a8812bd75111a65299aa5af55 WHIRLPOOL 33485fab4501501b608d8709ed59e9a0531b0adaaf1cdbd54c5f5cfb1e36b6a00cb8e0cc0d1f5eb6068b00bd5ebe1d26d3aa39d5096a52cf71c498f7912fa6ae
+DIST kafka_2.12-0.11.0.1.tgz 37227486 SHA256 c776f2dbb7f4e1af6b61e32d482b513a1788bf5f39602746b005ab92601a46f2 SHA512 e85b152a0865e068309d3117b874010895389761da43ec62c87e2e4cffa5c8ea0eed6ea6beceae87d437ffabb143d6bc36408b1387985f2b90fe8b9c8201f29e WHIRLPOOL 9e06a4a9e0d2aea98b12f4fa20f7a8c9a58c7e845283ea0508ecbbe81d7f91eb7ffba054a40da47fa35fec1da777c6c6934c6ec9fbeb6cee8a0e3a05bac8872b

diff --git a/net-misc/kafka-bin/files/kafka.init.d.3 b/net-misc/kafka-bin/files/kafka.init.d.3
new file mode 100644
index 00000000000..c355f21612c
--- /dev/null
+++ b/net-misc/kafka-bin/files/kafka.init.d.3
@@ -0,0 +1,22 @@
+#!/sbin/openrc-run
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+description="Kafka distributed messaging system"
+
+logfile="/var/log/kafka/kafka.log"
+
+command="/opt/kafka/bin/kafka-server-start.sh"
+command_args="/etc/kafka/server.properties"
+
+command_background=yes
+pidfile=/run/kafka.pid
+
+start() {
+	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
+	-m --env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
+	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
+}
+depend() {
+       after zookeeper kafka-zookeeper
+}

diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
new file mode 100644
index 00000000000..a3d76ba672c
--- /dev/null
+++ b/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils user
+
+DESCRIPTION="A high-throughput distributed messaging system"
+HOMEPAGE="http://kafka.apache.org/"
+
+# pick recommended scala version
+SCALA_VERSION=2.12
+MY_PN="kafka"
+MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
+SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
+
+RESTRICT="mirror"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="internal-zookeeper"
+
+RDEPEND="
+	|| ( virtual/jre:1.8 virtual/jre:1.7 )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+INSTALL_DIR="/opt/${MY_PN}"
+
+pkg_setup() {
+	enewgroup kafka
+	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
+}
+
+src_prepare() {
+	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
+	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
+}
+
+src_install() {
+	insinto /etc/kafka
+	doins config/zookeeper.properties config/server.properties
+	if use "internal-zookeeper"; then
+		keepdir /var/lib/kafka/zookeeper
+		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
+	fi
+
+	keepdir /var/lib/kafka
+	fowners -R kafka:kafka /var/lib/kafka
+
+	keepdir /var/log/kafka
+	fowners -R kafka:kafka /var/log/kafka
+
+	newinitd "${FILESDIR}/${MY_PN}.init.d.3" "${MY_PN}"
+
+	dodir "${INSTALL_DIR}"
+	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
+	keepdir "${INSTALL_DIR}/logs"
+	fowners -R kafka:kafka "${INSTALL_DIR}"
+}


^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-misc/kafka-bin/files/, net-misc/kafka-bin/
@ 2018-03-10 16:06 Patrick Lauer
  0 siblings, 0 replies; 3+ messages in thread
From: Patrick Lauer @ 2018-03-10 16:06 UTC (permalink / raw
  To: gentoo-commits

commit:     1916c7bcce8deb2116560d10c1404ddf12cfc0e1
Author:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 10 16:03:12 2018 +0000
Commit:     Patrick Lauer <patrick <AT> gentoo <DOT> org>
CommitDate: Sat Mar 10 16:06:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1916c7bc

net-misc/kafka-bin: Bump, fix init script, remove old

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-misc/kafka-bin/Manifest                        |  7 +--
 net-misc/kafka-bin/files/kafka.init.d              | 18 -------
 net-misc/kafka-bin/files/kafka.init.d.2            | 22 --------
 .../files/{kafka.init.d.3 => kafka.init.d.4}       |  4 +-
 net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild       | 61 ---------------------
 net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild    | 62 ----------------------
 net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild       | 61 ---------------------
 net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild       | 62 ----------------------
 net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild       | 62 ----------------------
 ....10.2.1.ebuild => kafka-bin-0.10.2.1-r2.ebuild} |  4 +-
 net-misc/kafka-bin/kafka-bin-0.11.0.0.ebuild       | 62 ----------------------
 ....11.0.1.ebuild => kafka-bin-0.11.0.2-r1.ebuild} |  4 +-
 net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild       | 62 ----------------------
 ....11.0.0-r1.ebuild => kafka-bin-1.0.0-r1.ebuild} |  4 +-
 net-misc/kafka-bin/kafka-bin-1.0.0.ebuild          | 62 ----------------------
 ...n-0.10.2.1-r1.ebuild => kafka-bin-1.0.1.ebuild} |  4 +-
 16 files changed, 12 insertions(+), 549 deletions(-)

diff --git a/net-misc/kafka-bin/Manifest b/net-misc/kafka-bin/Manifest
index e192331531f..9975fe990bc 100644
--- a/net-misc/kafka-bin/Manifest
+++ b/net-misc/kafka-bin/Manifest
@@ -1,9 +1,4 @@
-DIST kafka_2.11-0.10.0.1.tgz 31831257 BLAKE2B fefff1b30e3cb1ff9abe84c6e4fd05c96d216e97326dc552bd611b914307206dfc8214f6ab2cf7dd8e9f395494e2b44163784cee6c4845486783498b5247f7ae SHA512 ab89c1d0cf4e05e823f45629e7bc5778173fd7420ebfa259f566071c6b474b08abf808508c7fd6fcca2233b20e76cbf6a235563709bfa019455386f80f0b5d71
-DIST kafka_2.11-0.10.1.0.tgz 34373824 BLAKE2B 88b911227052abd572966e9d1c4429d4d6010df43d90a51de5f3c17ba73b4f5fb1144697c893f0a0e7ce723eeb0c451519e9041e61663e2e6f4bbb8e6e8b0442 SHA512 b47a26813395b5bed5bb3f874727d4a1cae13480732aee3014d66afdbe1ec8ed6ed8c9de4feff67d18492088b5e927516a8ce13f355ce985ec0144608509d30b
-DIST kafka_2.11-0.10.1.1.tgz 34424602 BLAKE2B ab49c0721c903d937d5e3d1c83f0f25960f0e246fda21cfd154bb061401d64d4b0c16932af45c3924579a71f49da3d0c3bee6a99def21d7f0640fcdc793a1cec SHA512 6d996946ee5d798f0af8ffa2bddc1dc23632761488556e765ba731acae28e2d65f4ca3f0648caa7bbb14947daf3e1862d9959f271eff5e0625c780a7169c6f72
-DIST kafka_2.11-0.10.2.0.tgz 37630750 BLAKE2B 3ad017c19e9c1c0aaafd902d200fb6d1855549935268f394354444b7ce73f1bfe8dfbdc68bf6c0ba56945107ab44bd2f3cd8806cc31127bcb578ae1d2102f282 SHA512 3d972cdccdbe889b73b8d5ec68e8a0bc5daabed29ec8f1f217e22887534eba8f3127886c07950a673c55d289a9dbd077763141eb883b5f9e2fe8b56b4524941c
 DIST kafka_2.12-0.10.2.1.tgz 34046244 BLAKE2B 210ebb9a2994d453e10e7c2f7a789ac33f65adced96032c2cfaff8ec2fceb2c4e4a35d71421a2b9c965c8c6e8b85b6a4e5cabd7cb0b5af0474b5a1c598c3e2f1 SHA512 48884838980ff182fe1bb089b5f8db91aaa190dad9f9cbf24d762ba8afb897546f66d66ce110eef87ad1541e06564e5ea455e4698a23fbd296d971e033953bbc
-DIST kafka_2.12-0.11.0.0.tgz 36644420 BLAKE2B 78355e84348bb4e8c09958dddc96023bab7e17dd26a5ae988b50fc82254096f23d5059287aa2e9c0ab4738fcde300e99e5dc093a6613bdb906cbfbc0162cd36b SHA512 60b44930700ab42e4a0e3945b6eb32db422d2e62388b4fee68aef97aea939fd252ebd0be39b36a4e6149aff9dcbd5b0578095d8a8812bd75111a65299aa5af55
-DIST kafka_2.12-0.11.0.1.tgz 37227486 BLAKE2B c4d18aa324f051f7bfd4ac9d967670445dbf96530fa8f896b7377ed8c6cdde06e155a0f4b79281d3d528b89e03ff06cfd1b9766f526b42523d74dea979bba9f7 SHA512 e85b152a0865e068309d3117b874010895389761da43ec62c87e2e4cffa5c8ea0eed6ea6beceae87d437ffabb143d6bc36408b1387985f2b90fe8b9c8201f29e
 DIST kafka_2.12-0.11.0.2.tgz 37282246 BLAKE2B 55485ff6b319b35626e8c93967357eda7099e427b5f1d87ab29bd7c8edd0ded8e271b3973b5d3ee025f09e17d319a0e9f1a9fffcf75c663052ce3b656f2e9b66 SHA512 b1652b53558886a1d407fd82d6ea1c3af5b580752303dcf836c43d76c0fc0773790df4af2d9364f937fac96d197974282e57add488bd592e87cf4c3f52592bb8
 DIST kafka_2.12-1.0.0.tgz 44352403 BLAKE2B 14c536224c2d75ccaa471dfa7dc806f99e17e70663670bbc09fc6150d2ef76f6e31b1a3567b32fdc7caa8a2b440f83734102b1bafebd1df067bad1ab8dcbe9d7 SHA512 1b647b7f392148aa2b9d47550a1502e50be4b005c70c82dae03065b89484e66400528be40ca2d54f35eb2c0e70f35c88a04777c2b625daa5d5546caab4ed6818
+DIST kafka_2.12-1.0.1.tgz 44474706 BLAKE2B 59aaa2bb2f1940b4d581882eaedbba091149cecadca970762b7ba83aff41da165526e5d69a65212de2f25c28ad5c2327befa4d9d01bd04e7fa8b9d882e832dd8 SHA512 935c0df1cf742405c40d9248cfdd1578038b595b59ec5a350543a7fe67b6be26ff6c4426f7c0c072ff4aa006b701502a55fcf7e2ced1fdc64330e3383035078c

diff --git a/net-misc/kafka-bin/files/kafka.init.d b/net-misc/kafka-bin/files/kafka.init.d
deleted file mode 100644
index 3b23a7fac7c..00000000000
--- a/net-misc/kafka-bin/files/kafka.init.d
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Kafka distributed messaging system"
-
-logfile="/var/log/kafka/kafka.log"
-
-command="/opt/kafka/bin/kafka-server-start.sh"
-command_args="/etc/kafka/server.properties"
-start_stop_daemon_args="--user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile"
-
-command_background=yes
-pidfile=/run/kafka.pid
-
-depend() {
-       after zookeeper kafka-zookeeper
-}

diff --git a/net-misc/kafka-bin/files/kafka.init.d.2 b/net-misc/kafka-bin/files/kafka.init.d.2
deleted file mode 100755
index 87b4b47a446..00000000000
--- a/net-misc/kafka-bin/files/kafka.init.d.2
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-description="Kafka distributed messaging system"
-
-logfile="/var/log/kafka/kafka.log"
-
-command="/opt/kafka/bin/kafka-server-start.sh"
-command_args="/etc/kafka/server.properties"
-
-command_background=yes
-pidfile=/run/kafka.pid
-
-start() {
-	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
-	--env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
-	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
-}
-depend() {
-       after zookeeper kafka-zookeeper
-}

diff --git a/net-misc/kafka-bin/files/kafka.init.d.3 b/net-misc/kafka-bin/files/kafka.init.d.4
similarity index 88%
rename from net-misc/kafka-bin/files/kafka.init.d.3
rename to net-misc/kafka-bin/files/kafka.init.d.4
index c355f21612c..064821f669d 100644
--- a/net-misc/kafka-bin/files/kafka.init.d.3
+++ b/net-misc/kafka-bin/files/kafka.init.d.4
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Kafka distributed messaging system"
@@ -13,9 +13,11 @@ command_background=yes
 pidfile=/run/kafka.pid
 
 start() {
+	ebegin "Starting kafka ..."
 	start-stop-daemon --start --background --user kafka --chdir /opt/kafka --stdout $logfile --stderr $logfile \
 	-m --env KAFKA_HEAP_OPTS="${KAFKA_HEAP_OPTS}" \
 	--pidfile $pidfile --exec /opt/kafka/bin/kafka-server-start.sh -- /etc/kafka/server.properties
+	eend $?
 }
 depend() {
        after zookeeper kafka-zookeeper

diff --git a/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
deleted file mode 100644
index f4a9a59a79e..00000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.0.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}

diff --git a/net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild
deleted file mode 100644
index 819491ebdd4..00000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.1.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}

diff --git a/net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild
deleted file mode 100644
index f4a9a59a79e..00000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.1.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}

diff --git a/net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild
deleted file mode 100644
index 819491ebdd4..00000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.1.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}

diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild
deleted file mode 100644
index e75d073295a..00000000000
--- a/net-misc/kafka-bin/kafka-bin-0.10.2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.11
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}

diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild
similarity index 93%
rename from net-misc/kafka-bin/kafka-bin-0.10.2.1.ebuild
rename to net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild
index e5705a4e540..ae63ac0018b 100644
--- a/net-misc/kafka-bin/kafka-bin-0.10.2.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-0.10.2.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,7 @@ src_install() {
 	keepdir /var/log/kafka
 	fowners -R kafka:kafka /var/log/kafka
 
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
 
 	dodir "${INSTALL_DIR}"
 	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die

diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.0.ebuild
deleted file mode 100644
index e5705a4e540..00000000000
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}

diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild
similarity index 93%
rename from net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
rename to net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild
index 1699e37e95f..e16e10cae84 100644
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-0.11.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,7 @@ src_install() {
 	keepdir /var/log/kafka
 	fowners -R kafka:kafka /var/log/kafka
 
-	newinitd "${FILESDIR}/${MY_PN}.init.d.3" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
 
 	dodir "${INSTALL_DIR}"
 	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die

diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild b/net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild
deleted file mode 100644
index 1699e37e95f..00000000000
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="https://archive.apache.org/dist/${MY_PN}/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.3" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}

diff --git a/net-misc/kafka-bin/kafka-bin-0.11.0.0-r1.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild
similarity index 93%
rename from net-misc/kafka-bin/kafka-bin-0.11.0.0-r1.ebuild
rename to net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild
index 36e9ed9e938..ae63ac0018b 100644
--- a/net-misc/kafka-bin/kafka-bin-0.11.0.0-r1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-1.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,7 @@ src_install() {
 	keepdir /var/log/kafka
 	fowners -R kafka:kafka /var/log/kafka
 
-	newinitd "${FILESDIR}/${MY_PN}.init.d.2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
 
 	dodir "${INSTALL_DIR}"
 	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die

diff --git a/net-misc/kafka-bin/kafka-bin-1.0.0.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.0.ebuild
deleted file mode 100644
index a3d76ba672c..00000000000
--- a/net-misc/kafka-bin/kafka-bin-1.0.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils user
-
-DESCRIPTION="A high-throughput distributed messaging system"
-HOMEPAGE="http://kafka.apache.org/"
-
-# pick recommended scala version
-SCALA_VERSION=2.12
-MY_PN="kafka"
-MY_P="${MY_PN}_${SCALA_VERSION}-${PV}"
-SRC_URI="mirror://apache/kafka/${PV}/${MY_P}.tgz"
-
-RESTRICT="mirror"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="internal-zookeeper"
-
-RDEPEND="
-	|| ( virtual/jre:1.8 virtual/jre:1.7 )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR="/opt/${MY_PN}"
-
-pkg_setup() {
-	enewgroup kafka
-	enewuser kafka -1 /bin/sh /var/lib/kafka kafka
-}
-
-src_prepare() {
-	sed -i -e 's:/tmp/zookeeper:/var/lib/kafka/zookeeper:' "config/zookeeper.properties" || die
-	sed -i -e 's:/tmp/kafka-logs:/var/lib/kafka/logs:' "config/server.properties" || die
-}
-
-src_install() {
-	insinto /etc/kafka
-	doins config/zookeeper.properties config/server.properties
-	if use "internal-zookeeper"; then
-		keepdir /var/lib/kafka/zookeeper
-		newinitd "${FILESDIR}/${MY_PN}-zookeeper.init.d" "${MY_PN}-zookeeper"
-	fi
-
-	keepdir /var/lib/kafka
-	fowners -R kafka:kafka /var/lib/kafka
-
-	keepdir /var/log/kafka
-	fowners -R kafka:kafka /var/log/kafka
-
-	newinitd "${FILESDIR}/${MY_PN}.init.d.3" "${MY_PN}"
-
-	dodir "${INSTALL_DIR}"
-	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die
-	keepdir "${INSTALL_DIR}/logs"
-	fowners -R kafka:kafka "${INSTALL_DIR}"
-}

diff --git a/net-misc/kafka-bin/kafka-bin-0.10.2.1-r1.ebuild b/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild
similarity index 93%
rename from net-misc/kafka-bin/kafka-bin-0.10.2.1-r1.ebuild
rename to net-misc/kafka-bin/kafka-bin-1.0.1.ebuild
index 36e9ed9e938..ae63ac0018b 100644
--- a/net-misc/kafka-bin/kafka-bin-0.10.2.1-r1.ebuild
+++ b/net-misc/kafka-bin/kafka-bin-1.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -53,7 +53,7 @@ src_install() {
 	keepdir /var/log/kafka
 	fowners -R kafka:kafka /var/log/kafka
 
-	newinitd "${FILESDIR}/${MY_PN}.init.d.2" "${MY_PN}"
+	newinitd "${FILESDIR}/${MY_PN}.init.d.4" "${MY_PN}"
 
 	dodir "${INSTALL_DIR}"
 	cp -pRP bin config libs "${ED}/${INSTALL_DIR}" || die


^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2018-03-10 16:06 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-10 16:06 [gentoo-commits] repo/gentoo:master commit in: net-misc/kafka-bin/files/, net-misc/kafka-bin/ Patrick Lauer
  -- strict thread matches above, loose matches on Subject: below --
2017-09-16  6:03 Patrick Lauer
2016-09-26 12:15 Patrick Lauer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox