Version bump, as requested by Thomas Stein in bug #503038.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB5058F9A

3 files changed, 98 insertions, 15 deletions

diff --git a/app-misc/elasticsearch/ChangeLog b/app-misc/elasticsearch/ChangeLog
index 40dbb8e102f5..d4d495a0b7c8 100644
--- a/app-misc/elasticsearch/ChangeLog
+++ b/app-misc/elasticsearch/ChangeLog
@@ -1,6 +1,11 @@
 # 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.3 2014/01/08 06:44:18 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.4 2014/03/04 10:42:27 chainsaw Exp $
+
+*elasticsearch-1.0.1 (04 Mar 2014)
+
+  04 Mar 2014; Tony Vroon <chainsaw@gentoo.org> +elasticsearch-1.0.1.ebuild:
+  Version bump, as requested by Thomas Stein in bug #503038.
 
   08 Jan 2014; Mike Frysinger <vapier@gentoo.org>
   elasticsearch-0.90.6-r1.ebuild, elasticsearch-0.90.6.ebuild:
diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 4e00f6336b79..66c7fed7c3d5 100644
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -6,24 +6,16 @@ AUX elasticsearch.init 2276 SHA256 bc3941c26bd98f148b757200fad3bdd68776ebf0bdb48
 AUX elasticsearch.init2 2296 SHA256 a2abd2f6423ebc382a130b6264114d2e4b28d1ec705939f6ccc818bb7a86b491 SHA512 2439482409908774e02726f81bcf8c9d80d0c3e00c468e4ae95dbb7ae9035fd27ae47aa08b1a705ba808a5222b95b37189b1e9ab7ec89797b9f90db572b5f89f WHIRLPOOL 37a1866079dbc0ec6624b2da2da2914752d76d02ebb4764d209a716ac90f1b29014be9930ba6b5999f513b6357c9088d24db3c2b14c763e792dc1c63d2f9fe34
 AUX elasticsearch.service 274 SHA256 d8581135cb5f6b73245e571f0cd3cfa85c90d96474304214324958b9ee952f7e SHA512 14c0696ab1244e4afde34c0f6aaececbb5a80a75dc9ad23841adefde815c8c9a604858902bd87609d8191dfca7c4eb24f1ad2d041d50d22a789296bf43366a76 WHIRLPOOL 8df4eb48efac8353c21685bc17bd30ce8835f9f5f91f19acd3f69a42a780c69fc118f74d003429e1da9558ffad1a1e649c57521ba8219fcb262a2ffdb2e24e9c
 DIST elasticsearch-0.90.6.tar.gz 17854568 SHA256 2ff87847e993d52723b4e789db3cbba887f414b85bf04fd897032bc52fe0ad3a SHA512 8c1d3003ac1e75389d8fec78bd281f21738f18e4f2dd5518c7568173eb527c1d0cbb21344012bd4806c51027717ed8de0b2275703e876c7bd0028369507c9838 WHIRLPOOL 652b563edb80c3126cd230cd3b78f38b65af9ddfe966ab940f8d0850672156e17378ba8a75c6a0e2d9a7b154165bb47cfac1f619fd3092b40372e89125ccabd9
+DIST elasticsearch-1.0.1.tar.gz 19244140 SHA256 6acdf3528b40d8aea93f1b8cfd9e3bdcc2e529f0bd5fe6a82269bec3293d9b5b SHA512 1e0fa5f51bcef40390da2741443ac0815a818067cab236e4341a04f3628f9fed5bd4f296777d4ad1be264a2b369455d74c12242c2076c6f6d120808512bb4d45 WHIRLPOOL e62cd344f9356b358b2458c819cea61fc089af35bde6afe032d2ea39b47d7ac51f7543059ac3e56975f63abc36e9b6c5a4d1d4794ad74628f3246d7110987838
 EBUILD elasticsearch-0.90.6-r1.ebuild 2233 SHA256 e95f04c1e8b4d5390de8daf201283b0c4feba6f0f9b1fd641e25da4178ddc004 SHA512 6c4cfe5c7a4e42c47d6973416765c52724d1733301abab3b0d76a47548240e3ad55681ceb0f35d1489720079de91a972bb6d4ca950bee6f7d5cd79426a63a1e9 WHIRLPOOL 84a17d8dd8cfa55b3cbb5dc22014f13867675f136ac2865b6b65ec04c126284a5724ba43e3a57c805038fdbdba01e63ffcaef7cc2c4030918831b8f63e1102d2
 EBUILD elasticsearch-0.90.6.ebuild 2229 SHA256 db2375e4d255801d2485cebd9a10ad8d7568c6418302bc88aafbfa4fc067f34f SHA512 96275033ce5da07c4f1d1758b45c9121ed925909bb1278f064b53bb96b4962a4c102793dd1c81cf6d96a23bf8d5f9961eb2ae5aab1db1dd6e342dcb8f6a7bebc WHIRLPOOL 9ada3dd17fc599948e1394a5ca98bc9f49fd55cdc45e1b0e9e387852958531e8146c2ba6215b7c5cadc82bdc5f6aec9e78867b9cf242ca8020e0fa87ed0be529
-MISC ChangeLog 1025 SHA256 6fde6d476859ec64af49cd856b94af89cccd8c6c34712b923a7a1e3087255912 SHA512 c79d0369bc6675da1f823bb555be48118f1e7eedfdb4784dd50eefdec7c63c5dd058cf41f60123c16371ce44326793142deb6b63034c7a29fb2c10166ea94dd4 WHIRLPOOL 05b5b19afb7adb8d3070d3dfeb88e604579b58d07e683f716c5f4f14b17238eab8c031e9f469eec7facb1577c23179f1ffd0613d24c38077af5ce86f28a91c64
+EBUILD elasticsearch-1.0.1.ebuild 2231 SHA256 fa0e2b5dfdf0638c4d67107d38b4d22f098f8a6c00dd9cf532af40796b4d052c SHA512 1b14faff58b2668f83e32058a83e9ade32809d6e85be974dcfaebf4a8cdeecc47eea4903f28e01b6b9c59423de05f7cf9ef55cccac8a7729561cba65219de24d WHIRLPOOL dbaa5ffaabcb3bbf939e46d7cc40d64985cbc8fd4476cdeed0eb0a94300fd5a6aa228eb9d9ac8f8764a142020731d69ac09da6b066e6ced10dfb853e2505511a
+MISC ChangeLog 1202 SHA256 8f294813344d67284b0dd7cdf544865373315c5c85e737d3573a8ca09a1c261e SHA512 4169fa43d5f2e29a459be79dadad146852fb97165dcc71e3b1c4a01c52cc0e21a937e69763448f5002c08f9a73edf5cb830e6a3698209b2fd3b22d5199b96c1d WHIRLPOOL 25c5a8a4c92935f92956ed26388e4d53eb2984b05ab6b0b5c3258a5d8eba4cb496f79c15e47536d2175d115a15e51cb1d718ec7e13d5991345cc96110eb56e32
 MISC metadata.xml 237 SHA256 88d9092fd208599a8b524cca9633d9330223e45c34a44e54b2de05edb4738ac7 SHA512 11773ab2b5adaa81f3c8f73413d2f257ea1d1624df689154ee2697412ff14ea8f9851b805c4a474b486abb0a066cfc929f91eb852a208b9536885d467df36af1 WHIRLPOOL 324b778d3103d615af41fd6d1d978beeeeb08f4823a3c81fd453464b4df2ed59b56a481ddd65b4eb740dc75b4dc69133e761199abe6d27333b1fce97d5b5a1be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSzPPKAAoJEPGu1DbS6WIAz5gP/RcL7SrAt0pl0YRT4JNmnFDB
-EKSYJpvix36KRb5J6bFSpuEC9vyLPAGW+4PJVFcS68y9trvo+F/X8M51I1iPI2Pg
-OkABfx6IMblOfhjE73ZIGbva2Fn0i0o8WoRAUR+8keJ0fJXFFB3ueJiNRdojH61U
-9YUF7Xv/OFNvPjQFZ3BDDc9cb2JaqTiAY02Erqki3OUt3gvCSyWPqg5/ePyTLU/Z
-p2WsM0LBjWIGT2Ds6NtIxRru5JIUdZOLdHYoDcvHSod22R877zSp1BtWhXorJGq9
-IrVdrdTiaZlhTLoVi3KPC09M7t5ByCx9doa7uO58lkko+0NK3ialbIR3HoBttOxD
-KjeSiDMkAafFs6sE2yRIYFPTJV092/WLlOVOQQBOl5u3gJO4XDA+FlFk4//3A7fY
-EmuVPEs4SpADsPtAr654J5pCRu1wUHP3pE489jx3/etsDU9hMFEDKU66bzim8qY3
-CXHRx5m0Rpo33cUrnjlGnY8KB9sR2iUDEhFeqdVF9lmXowxIFcwPGIpXBej+OQu7
-kXIKVJxq2rPWkWuxMElgJdTCyJWOywI+NiIy2NM+ast4G/8HokVa82dFcDTaLFDc
-Vh+acZwvZ15/r0dsVnK3bJZDQ72fQ++2QcTiBD1FHm+cfboZxPznjcb1GtGVH2Pi
-CbBiI7fIbIw4lDLaetyc
-=8cNr
+iEYEAREIAAYFAlMVrf4ACgkQp5vW4rUFj5oDuwCfSPEYXZy41z7eno22EEotlp4i
+elkAoK4QDvHnsbiSDaVaBXAUtGLe9dPo
+=+Igs
 -----END PGP SIGNATURE-----
diff --git a/app-misc/elasticsearch/elasticsearch-1.0.1.ebuild b/app-misc/elasticsearch/elasticsearch-1.0.1.ebuild
new file mode 100644
index 000000000000..40e99ac78918
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-1.0.1.ebuild
@@ -0,0 +1,86 @@
+# 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 $
+
+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
+}