Version bump, as requested by Mark Nowiasz. With thanks to Tomas Mozes & Ivan Iraci for testing in bug #507116. Removing all vulnerable versions for security bug #518452.

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)

4 files changed, 11 insertions, 174 deletions

diff --git a/app-misc/elasticsearch/ChangeLog b/app-misc/elasticsearch/ChangeLog
index d4d495a0b7c8..abe9dedb3566 100644
--- a/app-misc/elasticsearch/ChangeLog
+++ b/app-misc/elasticsearch/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-misc/elasticsearch
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.4 2014/03/04 10:42:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.5 2014/09/16 14:19:05 chainsaw Exp $
+
+*elasticsearch-1.3.2 (16 Sep 2014)
+
+  16 Sep 2014; Tony Vroon <chainsaw@gentoo.org> -elasticsearch-0.90.6.ebuild,
+  -elasticsearch-0.90.6-r1.ebuild, -elasticsearch-1.0.1.ebuild,
+  +elasticsearch-1.3.2.ebuild:
+  Version bump, as requested by Mark Nowiasz. With thanks to Tomas Mozes & Ivan
+  Iraci for testing in bug #507116. Removing all vulnerable versions for
+  security bug #518452.
 
 *elasticsearch-1.0.1 (04 Mar 2014)
 
diff --git a/app-misc/elasticsearch/elasticsearch-0.90.6-r1.ebuild b/app-misc/elasticsearch/elasticsearch-0.90.6-r1.ebuild
deleted file mode 100644
index 8288ec732a10..000000000000
--- a/app-misc/elasticsearch/elasticsearch-0.90.6-r1.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-0.90.6-r1.ebuild,v 1.2 2014/01/08 06:44:18 vapier Exp $
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="http://www.elasticsearch.org/"
-SRC_URI="http://download.${MY_PN}.org/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
-
-RDEPEND="virtual/jre"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
-	rm lib/sigar/libsigar-ia64-linux.so
-	rm LICENSE.txt
-
-	mv bin/${MY_PN}.in.sh bin/${MY_PN}.in.sh.sample
-	for file in config/* ; do
-		mv ${file} ${file}.sample
-	done
-
-	use amd64 && {
-		rm lib/sigar/libsigar-x86-linux.so
-	}
-
-	use x86 && {
-		rm lib/sigar/libsigar-amd64-linux.so
-	}
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	insinto /etc/${MY_PN}
-	doins bin/${MY_PN}.in.sh.sample
-	doins config/*
-	rm bin/${MY_PN}.in.sh.sample
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-
-	local rcscript=elasticsearch.init2
-	local eshome="/usr/share/${MY_PN}"
-	local jarfile="${MY_PN}-${PV}.jar"
-	local esclasspath="${eshome}/lib/${jarfile}:${eshome}/lib/*:${eshome}/lib/sigar/*"
-
-	cp "${FILESDIR}/${rcscript}" "${T}" || die
-	sed -i \
-		-e "s|@ES_CLASS_PATH@|${esclasspath}|" \
-		"${T}/${rcscript}" \
-		|| die "failed to filter ${rcscript}"
-
-	newinitd "${T}/${rcscript}" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the *.sample files in /etc/${MY_PN} should be copied"
-	elog "to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-0.90.6.ebuild b/app-misc/elasticsearch/elasticsearch-0.90.6.ebuild
deleted file mode 100644
index 75aec7879346..000000000000
--- a/app-misc/elasticsearch/elasticsearch-0.90.6.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-0.90.6.ebuild,v 1.2 2014/01/08 06:44:18 vapier Exp $
-
-EAPI=5
-
-inherit eutils systemd user
-
-MY_PN="${PN%-bin}"
-DESCRIPTION="Open Source, Distributed, RESTful, Search Engine"
-HOMEPAGE="http://www.elasticsearch.org/"
-SRC_URI="http://download.${MY_PN}.org/${MY_PN}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RESTRICT="strip"
-QA_PREBUILT="usr/share/elasticsearch/lib/sigar/libsigar-*.so"
-
-RDEPEND="virtual/jre"
-
-pkg_setup() {
-	enewgroup ${MY_PN}
-	enewuser ${MY_PN} -1 /bin/bash /var/lib/${MY_PN} ${MY_PN}
-}
-
-src_prepare() {
-	rm -rf lib/sigar/*{solaris,winnt,freebsd,macosx}*
-	rm lib/sigar/libsigar-ia64-linux.so
-	rm LICENSE.txt
-
-	mv bin/${MY_PN}.in.sh bin/${MY_PN}.in.sh.sample
-	for file in config/* ; do
-		mv ${file} ${file}.sample
-	done
-
-	use amd64 && {
-		rm lib/sigar/libsigar-x86-linux.so
-	}
-
-	use x86 && {
-		rm lib/sigar/libsigar-amd64-linux.so
-	}
-}
-
-src_install() {
-	dodir /etc/${MY_PN}
-	insinto /etc/${MY_PN}
-	doins bin/${MY_PN}.in.sh.sample
-	doins config/*
-	rm bin/${MY_PN}.in.sh.sample
-	rm -rf config
-
-	insinto /usr/share/${MY_PN}
-	doins -r ./*
-	chmod +x "${D}"/usr/share/${MY_PN}/bin/*
-
-	keepdir /var/{lib,log}/${MY_PN}
-
-	local rcscript=elasticsearch.init
-	local eshome="/usr/share/${MY_PN}"
-	local jarfile="${MY_PN}-${PV}.jar"
-	local esclasspath="${eshome}/lib/${jarfile}:${eshome}/lib/*:${eshome}/lib/sigar/*"
-
-	cp "${FILESDIR}/${rcscript}" "${T}" || die
-	sed -i \
-		-e "s|@ES_CLASS_PATH@|${esclasspath}|" \
-		"${T}/${rcscript}" \
-		|| die "failed to filter ${rcscript}"
-
-	newinitd "${T}/${rcscript}" "${MY_PN}"
-	newconfd "${FILESDIR}/${MY_PN}.conf" "${MY_PN}"
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	elog
-	elog "You may create multiple instances of ${MY_PN} by"
-	elog "symlinking the init script ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
-	elog
-	elog "Each of the *.sample files in /etc/${MY_PN} should be copied"
-	elog "to the proper configuration directory:"
-	elog "/etc/${MY_PN} (for standard init)"
-	elog "/etc/${MY_PN}/instance (for symlinked init)"
-	elog
-}
diff --git a/app-misc/elasticsearch/elasticsearch-1.0.1.ebuild b/app-misc/elasticsearch/elasticsearch-1.3.2.ebuild
index 40e99ac78918..b03c299da2a3 100644
--- a/app-misc/elasticsearch/elasticsearch-1.0.1.ebuild
+++ b/app-misc/elasticsearch/elasticsearch-1.3.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.0.1.ebuild,v 1.1 2014/03/04 10:42:27 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.3.2.ebuild,v 1.1 2014/09/16 14:19:05 chainsaw Exp $
 
 EAPI=5