From c51ce1ab7bcdffe271b2b82b472c78c46807dc3a Mon Sep 17 00:00:00 2001
From: Bertrand Jacquin <bertrand@jacquin.bzh>
Date: Wed, 31 Aug 2016 21:34:59 +0100
Subject: dev-db/apache-solr: Convert init scripts to openrc-run

Package-Manager: portage-2.2.28
---
 dev-db/apache-solr/Manifest                    |  4 +--
 dev-db/apache-solr/apache-solr-5.3.0-r1.ebuild | 45 ++++++++++++++++++++++++++
 dev-db/apache-solr/apache-solr-5.3.0.ebuild    | 45 --------------------------
 dev-db/apache-solr/files/apache-solr.initd     |  4 +--
 4 files changed, 49 insertions(+), 49 deletions(-)
 create mode 100644 dev-db/apache-solr/apache-solr-5.3.0-r1.ebuild
 delete mode 100644 dev-db/apache-solr/apache-solr-5.3.0.ebuild

(limited to 'dev-db')

diff --git a/dev-db/apache-solr/Manifest b/dev-db/apache-solr/Manifest
index ba0079ba..400fded7 100644
--- a/dev-db/apache-solr/Manifest
+++ b/dev-db/apache-solr/Manifest
@@ -1,5 +1,5 @@
 AUX apache-solr.confd 413 SHA256 ee3e1004a1815abbb8204415aedadbc6c1419dd44fac5cdec577bfdbf55f8a46 WHIRLPOOL 4683d11c081620686450488039642fa83a1d937c7a7bc9899ec61571056d20121c5c9b41d483278ee86009c952b71e46c0d6c22df6c9c53dd3940b7b7202b169
-AUX apache-solr.initd 3164 SHA256 3d0970c60e3429e4a278c4accfc5d71d97690b92a838d4cefdc2a896f0c5140c WHIRLPOOL 746e58b4863ac53506c9fd743091094b95442e33b272f2314e1a479c28db35579da803998bafcd008a2bc64c32858601371576dd1ecdaec675acace157a49082
+AUX apache-solr.initd 3165 SHA256 d15ed69aafed783c31cef986e9a693cae40850234bb76a8f3a31dea1b36ff20d WHIRLPOOL 5b8333a480888a4717ddfb01074e04d9b4e78ee71a91e75714ad83872c6404c2d0bf2b5563599bf79bf4c610008b39b318ff8a93797bceb17e25cdbef59db793
 DIST solr-5.3.0.tgz 134914712 SHA256 26aec63d81239a65f182f17bbf009b1070f7db0bb83657ac2a67a08b57227f7c WHIRLPOOL 6d738035fee541cd8e27d0052dbcbc0d7e44334fd24e6c601817b3196f633af36d18c3049742dc2c6e08cde432fdfa4da08bdb5c1adc362385fad152a518d6d5
-EBUILD apache-solr-5.3.0.ebuild 945 SHA256 7937e51770d4023286d8ab4f2d6878aebcb5a2ecd5c800543352ec6484aff8f4 WHIRLPOOL 41ddf20c7012ff313ff87ce5c4246081e9577c0809e5732f11023ed3018aba996b1284855c711b1f64a9ce19eb460999b10bb478a7e9a767a7fd10b3d9e525fa
+EBUILD apache-solr-5.3.0-r1.ebuild 934 SHA256 181d8e7e3fb777861d7853002f7a7f8a0721c80433361fa22dc4a2bbd6e8cde1 WHIRLPOOL 3f41f513b63055eb7fea15eb6eed7edc6bcbfa1bd943fc348ce87880f30fba7a0708cab35550ce049676f8c2b59f80260c3c204a036524a1d5770f5a0a2ca277
 MISC metadata.xml 256 SHA256 6ca43960767ca28661abf97c85263db77fe7643902be2ce777c61aa688d8ea2d WHIRLPOOL cef8582829111be09e651eb819e6d1ea59c9c4386b842169ccd46a14c8e3ccb090486fecd61c5fd4aa47998cacc69cdc1fb5ca6bb6325a4da1ebfd0b6eebda7b
diff --git a/dev-db/apache-solr/apache-solr-5.3.0-r1.ebuild b/dev-db/apache-solr/apache-solr-5.3.0-r1.ebuild
new file mode 100644
index 00000000..e79133f2
--- /dev/null
+++ b/dev-db/apache-solr/apache-solr-5.3.0-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+WEBAPP_NO_AUTO_INSTALL=yes
+WEBAPP_MANUAL_SLOT=yes
+inherit java-war webapp
+
+MY_PN="${PN/apache-}"
+
+DESCRIPTION="Popular, blazing fast open source search platform from the Apache Lucene project"
+HOMEPAGE="http://lucene.apache.org/solr"
+SRC_URI="http://www.apache.org/dist/lucene/${MY_PN}/${PV}/${MY_PN}-${PV}.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples doc"
+
+RDEPEND="virtual/jre:1.7"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+pkg_setup() {
+	webapp_pkg_setup
+}
+
+src_install() {
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+
+	insinto "/usr/share/${PN}"
+	use examples && doins -r example
+	use doc && doins -r docs
+
+	dodoc CHANGES.txt NOTICE.txt README.txt
+
+	webapp_src_preinst
+
+	insinto "${MY_HOSTROOTDIR}/${PN}"
+	doins -r server
+
+	webapp_src_install
+}
diff --git a/dev-db/apache-solr/apache-solr-5.3.0.ebuild b/dev-db/apache-solr/apache-solr-5.3.0.ebuild
deleted file mode 100644
index 0dc66cbc..00000000
--- a/dev-db/apache-solr/apache-solr-5.3.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-WEBAPP_NO_AUTO_INSTALL=yes
-WEBAPP_MANUAL_SLOT=yes
-inherit java-war webapp
-
-MY_PN="${PN/apache-}"
-
-DESCRIPTION="Popular, blazing fast open source enterprise search platform from the Apache Lucene project"
-HOMEPAGE="http://lucene.apache.org/solr"
-SRC_URI="http://www.apache.org/dist/lucene/${MY_PN}/${PV}/${MY_PN}-${PV}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="examples doc"
-
-RDEPEND="virtual/jre:1.7"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	insinto "/usr/share/${PN}"
-	use examples && doins -r example
-	use doc && doins -r docs
-
-	dodoc CHANGES.txt NOTICE.txt README.txt
-
-	webapp_src_preinst
-
-	insinto "${MY_HOSTROOTDIR}/${PN}"
-	doins -r server
-
-	webapp_src_install
-}
diff --git a/dev-db/apache-solr/files/apache-solr.initd b/dev-db/apache-solr/files/apache-solr.initd
index 41b6b79e..f72b660f 100644
--- a/dev-db/apache-solr/files/apache-solr.initd
+++ b/dev-db/apache-solr/files/apache-solr.initd
@@ -1,5 +1,5 @@
-#!/sbin/runscript
-# Copyright 1999-2015 Gentoo Foundation
+#!/sbin/openrc-run
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-- 
cgit v1.2.3