move to sys-cluster/zookeeper

6 files changed, 104 insertions, 72 deletions

diff --git a/sys-cluster/apache-zookeeper/Manifest b/sys-cluster/apache-zookeeper/Manifest
deleted file mode 100644
index debed4d..0000000
--- a/sys-cluster/apache-zookeeper/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST zookeeper-3.4.5.tar.gz 16402010 SHA256 e92b634e99db0414c6642f6014506cc22eefbea42cc912b57d7d0527fb7db132 SHA512 525fbb2af52c06823b6bedaefeb718df6090a3775ead06f3ff1f54b1b3cb752286f568a91b3188444cbdfe26ad8b931e0663cb08b27f23b4e83e8a3cfb6e88a7 WHIRLPOOL 344ea06625f46ef216df93e29d653e8fb0100e83e977c50b59691e30803b0e2d632ba44a1e63f2d82689ddfadba3d6aafce37cd260559185416040bc80f903fa
-EBUILD apache-zookeeper-3.4.5.ebuild 1517 SHA256 c1cfa7f7fb894cfc5955dbf76023a834978e5833f567ac577ffd2a3885fef55b SHA512 2b58db0f96814829808e659b45d1da245bcc5b15b5d87d556db8d5e1d13c519e91a1d6890fa2cb3efb17fedd41ca00dbf95c133df83778b21d64105596a67171 WHIRLPOOL de01c2852298451854b74026599cca571f5ed8a4882d891343421c02500187e7c56ff77d4299aa5497dec13d48b55abdc6f8c01f175d69c259ec2511875afaab
diff --git a/sys-cluster/apache-zookeeper/apache-zookeeper-3.4.5.ebuild b/sys-cluster/apache-zookeeper/apache-zookeeper-3.4.5.ebuild
deleted file mode 100644
index 73c4456..0000000
--- a/sys-cluster/apache-zookeeper/apache-zookeeper-3.4.5.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-
-inherit eutils java-utils-2
-
-MY_PN="${PN/apache-/}"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="ZooKeeper is a high-performance coordination service for distributed applications."
-HOMEPAGE="http://hadoop.apache.org/"
-SRC_URI="mirror://apache/${MY_PN}/${MY_P}/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-RESTRICT="mirror binchecks"
-IUSE=""
-
-DEPEND=""
-RDEPEND=">=virtual/jre-1.6"
-
-S="${WORKDIR}/${MY_P}"
-INSTALL_DIR=/opt/"${PN}"
-DATA_DIR=/var/db/"${PN}"
-export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
-
-src_install() {
-	dodir "${DATA_DIR}"
-	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
-
-	dodir "${INSTALL_DIR}"
-	mv "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
-
-	# env file
-	cat > 99"${PN}" <<-EOF
-		PATH="${INSTALL_DIR}/bin"
-		CONFIG_PROTECT="${INSTALL_DIR}/conf"
-	EOF
-	doenvd 99"${PN}" || die "doenvd failed"
-
-	cat > "${PN}" <<-EOF
-		#!/sbin/runscript
-
-		extra_commands="restart status"
-
-		start() {
-			${INSTALL_DIR}/bin/zkServer.sh start > /dev/null
-		}
-
-		stop() {
-			${INSTALL_DIR}/bin/zkServer.sh stop
-		}
-
-		restart() {
-			${INSTALL_DIR}/bin/zkServer.sh restart > /dev/null
-		}
-
-		status() {
-			${INSTALL_DIR}/bin/zkServer.sh status
-		}
-	EOF
-	doinitd "${PN}" || die "doinitd failed"
-}
-
-pkg_postinst() {
-	elog "For info on configuration see http://hadoop.apache.org/${MY_PN}/docs/r${PV}"
-}
diff --git a/sys-cluster/zookeeper/Manifest b/sys-cluster/zookeeper/Manifest
new file mode 100644
index 0000000..de90671
--- /dev/null
+++ b/sys-cluster/zookeeper/Manifest
@@ -0,0 +1,4 @@
+AUX zookeeper.confd 390 SHA256 12c202a8891a44ac7c19e619320339345f5b2ec0033736601dd334adcd78b472 SHA512 c6b75ce741603e4c2df7dba93fb6207a5955e7bb231ca9098172c17753b8f87a0af2106d4676420d44e6099053f05086bc84c7966b6fe0f9da6e8a541fccf80e WHIRLPOOL 662648c34c14ad9b58c05c8d1264d3c7fc5b8124f923cdcd09b4c3f2825ad84652e1816d0ed320d894a1cdbba9e64e577a41179a107c7cff14fb440147f2e760
+AUX zookeeper.initd 385 SHA256 b654d3e19f72b72652523cecc46fdfecc0e209ee454bfe132fff114294bd453b SHA512 2b18a2f4bae64c2e6c80168c6f02036d9bc6115aba2a94c219fbb20f3808a6c64c493dac552f189d54e7c8b4006dd1c0964dcb1f2cdb7a78222a17400b3de153 WHIRLPOOL 129df8d2a0bc946f78d99e843f5c616395a25e1dbc7b4b4a05c987ddfb946ba083f15dbb547752a21d4cc3888ff65d3e90699f8626a5f46be4c6eaac31a18216
+DIST zookeeper-3.4.5.tar.gz 16402010 SHA256 e92b634e99db0414c6642f6014506cc22eefbea42cc912b57d7d0527fb7db132 SHA512 525fbb2af52c06823b6bedaefeb718df6090a3775ead06f3ff1f54b1b3cb752286f568a91b3188444cbdfe26ad8b931e0663cb08b27f23b4e83e8a3cfb6e88a7 WHIRLPOOL 344ea06625f46ef216df93e29d653e8fb0100e83e977c50b59691e30803b0e2d632ba44a1e63f2d82689ddfadba3d6aafce37cd260559185416040bc80f903fa
+EBUILD zookeeper-3.4.5.ebuild 1463 SHA256 15d15a9fb95ed60b8d0a9221926578674354ca9da84d5c793d7c08495a5d344b SHA512 ec0bb4e9933bbf86e4d84eede2eabfe4cbd7fab8e3280b10b540bcf86c474a284768d4acdaa1942691fbc1d08266b19758fb498df2464e23d25699c4c81fa47f WHIRLPOOL 81cd046b8683b4da0e9f5e9c855eba5b913cd0cf484eac44340c8e3a68fffd3dc412ff3d331b6d144d023cc72b2ae771f155c5b5797fb3031261416e2c5ea000
diff --git a/sys-cluster/zookeeper/files/zookeeper.confd b/sys-cluster/zookeeper/files/zookeeper.confd
new file mode 100644
index 0000000..ddbb6dc
--- /dev/null
+++ b/sys-cluster/zookeeper/files/zookeeper.confd
@@ -0,0 +1,18 @@
+# JVM options
+JVM_OPTS=""
+
+# zookeeper files
+MAIN="org.apache.zookeeper.server.quorum.QuorumPeerMain"
+CONFIG="/opt/zookeeper/conf/zoo.cfg"
+
+# build the classpath
+INSTALL_DIR=/opt/zookeeper
+CLASSPATH="${INSTALL_DIR}/conf:${CLASSPATH}"
+
+for i in ${INSTALL_DIR}/zookeeper-*.jar; do
+	CLASSPATH="${i}:${CLASSPATH}"
+done
+
+for i in ${INSTALL_DIR}/lib/*.jar; do
+	CLASSPATH="${i}:${CLASSPATH}"
+done
diff --git a/sys-cluster/zookeeper/files/zookeeper.initd b/sys-cluster/zookeeper/files/zookeeper.initd
new file mode 100644
index 0000000..25344e5
--- /dev/null
+++ b/sys-cluster/zookeeper/files/zookeeper.initd
@@ -0,0 +1,15 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+name="zookeeper"
+command="/usr/bin/java"
+command_args="${JVM_OPTS} -cp ${CLASSPATH} ${MAIN} ${CONFIG}"
+command_background="true"
+start_stop_daemon_args="--user zookeeper --group zookeeper"
+pidfile="/var/run/zookeeper.pid"
+
+depend() {
+	need net
+}
diff --git a/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild b/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild
new file mode 100644
index 0000000..567453c
--- /dev/null
+++ b/sys-cluster/zookeeper/zookeeper-3.4.5.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit eutils java-utils-2 user autotools
+
+DESCRIPTION="ZooKeeper is a high-performance coordination service for distributed applications."
+HOMEPAGE="http://zookeeper.apache.org/"
+SRC_URI="mirror://apache/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="mirror binchecks"
+IUSE=""
+
+DEPEND=""
+RDEPEND=">=virtual/jre-1.6"
+
+INSTALL_DIR=/opt/${PN}
+DATA_DIR=/var/lib/${PN}
+export CONFIG_PROTECT="${CONFIG_PROTECT} ${INSTALL_DIR}/conf"
+
+pkg_setup() {
+	enewgroup zookeeper
+	enewuser zookeeper -1 /bin/sh /var/lib/zookeeper zookeeper
+}
+
+src_configure() {
+	cd "${S}"/src/c || die
+	econf
+}
+
+src_compile() {
+	cd "${S}"/src/c || die
+	emake
+}
+
+src_install() {
+	cd "${S}"/src/c || die
+	emake DESTDIR="${D}" install
+	cd "${S}" || die
+	rm -rf src/ || die
+	rm bin/*.cmd || die
+
+	dodir "${DATA_DIR}"
+	sed "s:^dataDir=.*:dataDir=${DATA_DIR}:" conf/zoo_sample.cfg > conf/zoo.cfg || die "sed failed"
+
+	dodir "${INSTALL_DIR}"
+	mv "${S}"/* "${D}${INSTALL_DIR}" || die "install failed"
+
+	keepdir /var/lib/zookeeper
+	fowners zookeeper:zookeeper /var/lib/zookeeper
+
+	# init script
+	newinitd "${FILESDIR}"/zookeeper.initd ${PN}
+	newconfd "${FILESDIR}"/zookeeper.confd ${PN}
+
+	# env file
+	cat > 99"${PN}" <<-EOF
+		PATH=${INSTALL_DIR}/bin
+		CONFIG_PROTECT=${INSTALL_DIR}/conf
+	EOF
+	doenvd 99"${PN}" || die "doenvd failed"
+}