Gentoo Archives: gentoo-commits

From: Alexys Jacob <ultrabug@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] dev/ultrabug:master commit in: dev-db/apache-solr/files/, dev-db/apache-solr/, www-servers/solr/files/, ...
Date: Fri, 06 Apr 2012 15:54:36
Message-Id: 1333727659.b7667e70935dd6c6b83b363462a55f202bb25b98.ultrabug@gentoo
1 commit: b7667e70935dd6c6b83b363462a55f202bb25b98
2 Author: Ultrabug <ultrabug <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 6 15:54:19 2012 +0000
4 Commit: Alexys Jacob <ultrabug <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 6 15:54:19 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ultrabug.git;a=commit;h=b7667e70
7
8 rename www-servers/solr to dev-db/apache-solr
9
10 ---
11 {www-servers/solr => dev-db/apache-solr}/Manifest | 2 +-
12 .../apache-solr/apache-solr-3.5.0.ebuild | 10 +++++-----
13 .../apache-solr}/files/jetty-solr.xml | 0
14 .../solr => dev-db/apache-solr}/files/solr.xml | 0
15 4 files changed, 6 insertions(+), 6 deletions(-)
16
17 diff --git a/www-servers/solr/Manifest b/dev-db/apache-solr/Manifest
18 similarity index 73%
19 rename from www-servers/solr/Manifest
20 rename to dev-db/apache-solr/Manifest
21 index 525d149..fb94f8f 100644
22 --- a/www-servers/solr/Manifest
23 +++ b/dev-db/apache-solr/Manifest
24 @@ -1,4 +1,4 @@
25 AUX jetty-solr.xml 431 RMD160 52b20e7cbb74c70ebd8650007313a15c423eff3b SHA1 c17d71e161cbebb466c42b1d6266967128d29f81 SHA256 e3f5a4499db74586d56df7fabfaeeaef14e83caa7c1e003a004087604468660a
26 AUX solr.xml 1320 RMD160 206cf52b217afec7ab83b16599d72f33e128753d SHA1 c5b1512c5c153c760063a38db085bdb73187b4d8 SHA256 45f7ea56648a651389e95ad9f653591331dcf47a3dae11aadbd8e806ec736dca
27 DIST apache-solr-3.5.0.tgz 78673382 RMD160 365d4b27753375ea3a39b9d42c06b80dce474731 SHA1 020fc86dfd2405212c0f706111d8576dbb8e54b4 SHA256 804f3ba9d1296f81388605a79538b7362355693fbdd03b7b2dbf9a706bf1d1d0
28 -EBUILD solr-3.5.0.ebuild 1160 RMD160 834a7cc1b42e29e3823d226a6045ca9b6012f7dc SHA1 b2e23e54d651ee0aa70e433c8b5b9273b4b29cfb SHA256 564e01b26e83ac6ee49ebd5c3952681218fddc7e5b95f42846316af7f4059f3f
29 +EBUILD apache-solr-3.5.0.ebuild 1140 RMD160 edad6f5908610501a5f8e6ed1927d43eee6ca993 SHA1 4719989ecfc87997aef56f7519e5451d4e6f6658 SHA256 3dda7ecc864f60a44cb744e1d6749cf507e2e0c2c878bbdbd0940f63aeafc3f0
30
31 diff --git a/www-servers/solr/solr-3.5.0.ebuild b/dev-db/apache-solr/apache-solr-3.5.0.ebuild
32 similarity index 85%
33 rename from www-servers/solr/solr-3.5.0.ebuild
34 rename to dev-db/apache-solr/apache-solr-3.5.0.ebuild
35 index 8642162..b7b938f 100644
36 --- a/www-servers/solr/solr-3.5.0.ebuild
37 +++ b/dev-db/apache-solr/apache-solr-3.5.0.ebuild
38 @@ -2,11 +2,13 @@
39 # Distributed under the terms of the GNU General Public License v2
40 # $Header: $
41
42 -EAPI="4"
43 +EAPI=4
44 +
45 +MY_PN=${PN/apache-}
46
47 DESCRIPTION="Popular, blazing fast open source enterprise search platform from the Apache Lucene project"
48 HOMEPAGE="http://lucene.apache.org/solr/"
49 -SRC_URI="http://www.apache.org/dist/lucene/${PN}/${PV}/apache-${P}.tgz"
50 +SRC_URI="http://www.apache.org/dist/lucene/${MY_PN}/${PV}/${P}.tgz"
51
52 LICENSE="Apache"
53 SLOT="0"
54 @@ -17,15 +19,13 @@ DEPEND="app-arch/unzip"
55 RDEPEND="${DEPEND}
56 www-servers/jetty-bin"
57
58 -S="${WORKDIR}/apache-${P}"
59 -
60 SOLR_HOME="/usr/share/solr"
61
62 src_install() {
63 dodir "${SOLR_HOME}"
64 dodir /etc/solr
65
66 - unzip dist/apache-"${P}.war" -d "${D}/${SOLR_HOME}" || die
67 + unzip dist/"${P}.war" -d "${D}/${SOLR_HOME}" || die
68 sed -i -e 's@\.\./\.\./@\./@g' example/solr/conf/solrconfig.xml || die
69 rm -rf "${D}/${SOLR_HOME}"/META-INF || die
70
71
72 diff --git a/www-servers/solr/files/jetty-solr.xml b/dev-db/apache-solr/files/jetty-solr.xml
73 similarity index 100%
74 rename from www-servers/solr/files/jetty-solr.xml
75 rename to dev-db/apache-solr/files/jetty-solr.xml
76
77 diff --git a/www-servers/solr/files/solr.xml b/dev-db/apache-solr/files/solr.xml
78 similarity index 100%
79 rename from www-servers/solr/files/solr.xml
80 rename to dev-db/apache-solr/files/solr.xml