chainsaw 14/10/06 14:36:26 Modified: ChangeLog Added: elasticsearch-1.3.2-r1.ebuild Log: Much improved init script, systemd service file and user configuration respect after a refactoring by Ferenc Erki. His work closes bug #523236 and #523238. (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key 0xB5058F9A)
Revision Changes Path 1.7 app-misc/elasticsearch/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/ChangeLog?rev=1.7&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/ChangeLog?rev=1.7&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/ChangeLog?r1=1.6&r2=1.7 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ChangeLog 18 Sep 2014 10:36:19 -0000 1.6 +++ ChangeLog 6 Oct 2014 14:36:26 -0000 1.7 @@ -1,6 +1,14 @@ # 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.6 2014/09/18 10:36:19 chainsaw Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/elasticsearch/ChangeLog,v 1.7 2014/10/06 14:36:26 chainsaw Exp $ + +*elasticsearch-1.3.2-r1 (06 Oct 2014) + + 06 Oct 2014; Tony Vroon <chain...@gentoo.org> +elasticsearch-1.3.2-r1.ebuild, + +files/elasticsearch.init3, +files/elasticsearch.service2: + Much improved init script, systemd service file and user configuration + respect after a refactoring by Ferenc Erki. His work closes bug #523236 and + #523238. 18 Sep 2014; Tony Vroon <chain...@gentoo.org> elasticsearch-1.3.2.ebuild: Version the JRE dependency as only Java 7 is acceptable. As suggested by 1.1 app-misc/elasticsearch/elasticsearch-1.3.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.3.2-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-misc/elasticsearch/elasticsearch-1.3.2-r1.ebuild?rev=1.1&content-type=text/plain Index: elasticsearch-1.3.2-r1.ebuild =================================================================== # 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.3.2-r1.ebuild,v 1.1 2014/10/06 14:36:26 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 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 }
