Version bump as per Ferenc Erci in bug #535748.

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

diff --git a/app-misc/elasticsearch/ChangeLog b/app-misc/elasticsearch/ChangeLog
index b3ca9b199bf8046b52be18d3da0d9b2998a90ef8..4f0b3b955a354f0716233f98afe2dc89b28a3e85 100644 (file)
--- a/app-misc/elasticsearch/ChangeLog
+++ b/app-misc/elasticsearch/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-misc/elasticsearch
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.8 2015/01/05 11:12:33 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.9 2015/01/06 10:47:22 chainsaw Exp $
+
+*elasticsearch-1.4.2 (06 Jan 2015)
+
+  06 Jan 2015; Tony Vroon <chainsaw@gentoo.org> +elasticsearch-1.4.2.ebuild:
+  Version bump as per Ferenc Erci in bug #535748.
 
 *elasticsearch-1.4.0 (05 Jan 2015)
 *elasticsearch-1.3.2-r2 (05 Jan 2015)

diff --git a/app-misc/elasticsearch/Manifest b/app-misc/elasticsearch/Manifest
index 6f64d2abafc321f0ad6cbca6d02214d97621fe4e..f11c9f6b00d6f6c0fb821ea3efccdd67dc7c8b47 100644 (file)
--- a/app-misc/elasticsearch/Manifest
+++ b/app-misc/elasticsearch/Manifest
@@ -10,14 +10,16 @@ AUX elasticsearch.service 274 SHA256 d8581135cb5f6b73245e571f0cd3cfa85c90d964743
 AUX elasticsearch.service2 279 SHA256 2a827cfa6331652e5a34bb975da52fec6d12ce0a80eacf810f62e22c5272349b SHA512 17994b7a5b0ef883034765d2b0e5c29daccb1e122b956f598d0c2b24085a0e66450fa143e3c656d75bf149a53ca497bc8c747b62ba47743aad17ae1a446d6d7d WHIRLPOOL 0c97253da7f75586c135568036f149f2465a1d73f5cb6e67b45a36832c2f54b61b0bcfd60db122c7e1ea6e7595e379dfe49a7e7bbad596840da6158a7d56dc46
 DIST elasticsearch-1.3.2.tar.gz 27949096 SHA256 7525d0a4db4f7eb791a1f8da97b081a5d8b44a2b232d8324877177bdee992ea4 SHA512 4a67531cf9927db466f70b4c572c472913533352de586f7e2c5f84ec9c7337002a0de0ee2bdb809e99b954bb8bd7d207baf723f1b53b2949702f838c85d6380a WHIRLPOOL 3b3edfefa6e49b2271ed107ecc8d2a84ab3db6834f85eb90c33fc8f9dfff4a815cbd2f3d7af2e6f6a9edfd2186508f6308bdee3846405cebf4ab89e8d13f0ffd
 DIST elasticsearch-1.4.0.tar.gz 27730896 SHA256 b317966befa50c22595477f9bad8ce67932e4d33e08ee8fb1c6e9690afa5064a SHA512 763307f9dc65c408190b1620907573c949755fc2fb3652c8de1068a566f567fb56ace4058762d1243c64391ac25f495ccf92ebfad0af470a83d3154d3ccaec8d WHIRLPOOL 13e596fba51d5b7b5ec2950534d6655238cee56b414e4265eb463ce0de287b9155ac7c7112c9f4222b6e11589f2606f35779df9b40de13032c4c6ee2d43ed85b
+DIST elasticsearch-1.4.2.tar.gz 27734207 SHA256 31dd6c049745f7dac201f94852b778b0841d6869d358fd80d4c897d0bf73b53c SHA512 b82e644b0b81489ce0d4fc72ca0efa3545c55c4d947faec2537035d440be83bac0f794f1a2863d87649e36f87d250c1f4e46ae57053b50948f47f9ff2a3bf6b6 WHIRLPOOL ac40778a999bc92230547b1405f259b7d348983767a87c71e18ed9ef45367ebf0b5b0517ef57bd423fa47ce4387e982aa7ee4a4ec9b2be75a4771e8d737f0cc5
 EBUILD elasticsearch-1.3.2-r2.ebuild 2250 SHA256 927dfdb53ad925abd252ae540920b2a5b5cd651e3c5523a773466756624cbd60 SHA512 cf6ad8da8d9e085d7c4ad810c34e1933f35fe6339b13dd04f0b905392668995f6d5977e20cdf886f1bab9b07f82d36c419804ae3223f035ecb700a8a7d16d87f WHIRLPOOL b6da7e2cddc723c06354625e5a54cdc6908e16352e676554f36ac076854609729d561f83737ed98c2fb002495a97c3896f998f7acec9c86d7255627abeb5ffa0
 EBUILD elasticsearch-1.4.0.ebuild 2194 SHA256 0b5df04b1b75198283321070d2f48ecd22a56481e9e66c17e122e744428de0ee SHA512 fa1ae4718fa38978c2d5970528fceae78d2d37c12a4b922e9dffd9d55deb718f84f44d7379b7a57af478bcb1db1a2e8968fc5da3253136eabcf0419b281c6860 WHIRLPOOL a4d93829f40fd82d4ed5e03574a2c4be3d860da152fa291c2695213887c6b0ac2122e4b0aaa74171549a74195089aead02a58c1941996235fd7b7a098e208819
-MISC ChangeLog 2564 SHA256 09bdb33224c9b1d7430315bf35449d1c8ba548740f06b81d3c8b62bbe3419eea SHA512 e6ee91e4eb8c9bb9114d723375e3f6b77051aa32a015a7629e762a5ac29c6ce73769046ef5f208e344cb35a46a38ff56ba41ae27e4657f3ba92d0f9997347ec3 WHIRLPOOL 1ae20e7cbbcc0749ebacfb293a3b0f2b0ee5fa2852b61e09122d0c3dd196b62f4aaba247902027a0bd23df454490d0e3f02cfe5305a35d04e84453631fac7c3b
+EBUILD elasticsearch-1.4.2.ebuild 2194 SHA256 2dc265e3694ce69c484d6f55d244a0f2fd47a9524d550b51ab26ea7f6f874c64 SHA512 ae76b3562101b3a501130e1d8c6151d89a7914c0eb83f7a04bee59a059d1825ab491f0cef6c25ce87da214a32d4d7ea5db2eb4c018697378c79c71661543d62d WHIRLPOOL 9d2e8aba5de1c89ccd6b10c20b22009ecc1423a7399eff9d106f500d0c7abf5eb7780d416d82b3cca2ae2bd77f14feeb387d48399622724ca808a743c0cb0bad
+MISC ChangeLog 2728 SHA256 58329603f4afb71bf86bde412c06fbe53e3cdec1b0b65edaf218f0783c587679 SHA512 9767ab54fa78f98f6a7fd167fbad41710215c6c150f3a20c9ac13b697b24ae9c36cb78c61079c37f175c4193b058b30813ef1ec2cf7f68648c07c49da19b1370 WHIRLPOOL bde1253bc3a66520d6137d504d07a97d64f227fe9c683bb526740a78b66d9c7190b330337c152892074f4d2dd3abb71e3b907cbd18d8c5985a057644381f0732
 MISC metadata.xml 237 SHA256 88d9092fd208599a8b524cca9633d9330223e45c34a44e54b2de05edb4738ac7 SHA512 11773ab2b5adaa81f3c8f73413d2f257ea1d1624df689154ee2697412ff14ea8f9851b805c4a474b486abb0a066cfc929f91eb852a208b9536885d467df36af1 WHIRLPOOL 324b778d3103d615af41fd6d1d978beeeeb08f4823a3c81fd453464b4df2ed59b56a481ddd65b4eb740dc75b4dc69133e761199abe6d27333b1fce97d5b5a1be
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlSqcbIACgkQp5vW4rUFj5plJgCeMv7uOKqB+iVo3d2nbzV3hTxO
-GtQAoLqflLhHutwjNg8+QUgBZJCW9/pK
-=Ak7W
+iEYEAREIAAYFAlSrvUsACgkQp5vW4rUFj5qvzgCgwnUCetFwToX1dgJwged54mXZ
+OOEAnAm+buBJkCeDo/fvpo9lSBINYjcU
+=KFlm
 -----END PGP SIGNATURE-----

diff --git a/app-misc/elasticsearch/elasticsearch-1.4.2.ebuild b/app-misc/elasticsearch/elasticsearch-1.4.2.ebuild
new file mode 100644 (file)
index 0000000..7915638
--- /dev/null
+++ b/app-misc/elasticsearch/elasticsearch-1.4.2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.4.2.ebuild,v 1.1 2015/01/06 10:47:22 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:1.7"
+
+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 -rf bin/*.{bat,exe}
+       rm lib/sigar/libsigar-ia64-linux.so
+       rm LICENSE.txt
+
+       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 /usr/share/doc/${P}/examples
+       doins bin/${MY_PN}.in.sh
+       doins config/*
+       rm bin/${MY_PN}.in.sh
+       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.init3
+       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_newunit "${FILESDIR}"/${PN}.service2 "${PN}.service"
+}
+
+pkg_postinst() {
+       elog
+       elog "You may create multiple instances of ${MY_PN} by"
+       elog "symlinking the init script:"
+       elog "ln -sf /etc/init.d/${MY_PN} /etc/init.d/${MY_PN}.instance"
+       elog
+       elog "Each of the example files in /usr/share/doc/${P}/examples"
+       elog "should be extracted to the proper configuration directory:"
+       elog "/etc/${MY_PN} (for standard init)"
+       elog "/etc/${MY_PN}/instance (for symlinked init)"
+       elog
+}