commit: 2bdc881ec05388651c01f079d6959c3784a3dea1
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 20 21:22:42 2015 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Oct 20 21:22:42 2015 +0000
URL: https://gitweb.gentoo.org/dev/fordfrog.git/commit/?id=2bdc881e
dev-java/lucene-core: some improvements
Package-Manager: portage-2.2.23
dev-java/lucene-core/Manifest | 6 +--
dev-java/lucene-core/files/build.patch | 66 ---------------------------
dev-java/lucene-core/lucene-core-5.3.1.ebuild | 18 ++++----
3 files changed, 12 insertions(+), 78 deletions(-)
diff --git a/dev-java/lucene-core/Manifest b/dev-java/lucene-core/Manifest
index 24e78c9..de30fc5 100644
--- a/dev-java/lucene-core/Manifest
+++ b/dev-java/lucene-core/Manifest
@@ -1,5 +1,5 @@
-AUX build.patch 3261 SHA256
ab5ea542599b54e617c20c33000ec45e268f9e6d13e8476264dfebf3f9a0fe89 SHA512
8d5151c80660dba0d962e8b1e6c08bb6d724a0dbcd813bb6d651b1f349f9be948966d8316ce7778c9b12c44f7b4cd812813f65254e2f93aa68189add3d25ae1c
WHIRLPOOL
606f4e213bc2cc40d520c74c244396269c4eb3bcc0ae2f4425b98aa7a712f0e94395f62dd641b46cc6cad29ee128ac98e8d580503f1fe1e971cf480a664be497
-DIST java7-package-list 4234 SHA256
7854b5ee7c938ef8e981d4c4197cae70a35f2692e8615a229f178c9bf8e426ca SHA512
a3d602eadc19e3354e42b2b7561ca57cf0a5708e09db5b3337770e7c3392164182c097b99b38dd9dec8e20982ad8b199da1c73f3542240309ff6a4f2ced9ccc8
WHIRLPOOL
adb28a80b526f7ff65b2f488abd1e8faf513c4eedcfd9adbfcc52854d42cff0e643c14fda138312fe2d3b41ee313eff063902eebaa0b62415317f0d30c68f138
+DIST lucene-5-build.patch.bz2 1278 SHA256
aee91e7eed4ba11c16776c0f5c3feb0733523aa269785da6fc633742a70760ff SHA512
05c5a9eb30675c8c8084559d351f345c31a614d275259fd54026b51acd208ca06b1f007a7329210ef8107777c10f526f464d6b07030b55ab15f3520d32c244e3
WHIRLPOOL
63d8c30542d393946c545991d4cf5c3509089ee514f50f452262603f3d18a02ca86160a8beabeb717be267e4ea8c394c6a26ce6fd42cb32eda4e11dadae18567
DIST lucene-5.3.1-src.tgz 29864128 SHA256
1c1945c4419d11c2dcf585bfaa7319ed970e84417df45b45f450a71b5275ead8 SHA512
72ef64c2df03eac02625d6a1220e312461f7eeec9c8060c6bfcbcf07138f534764801fa53c036f3993d983ec6d47316a292aefebffe0d4f37a9c777a0f5b919d
WHIRLPOOL
1f19975337df927ec9ed6c2e16d67cdf8c5e821d9d0480871f856507fd00b499338f90f7ce758a104d47b90019c618cab6426dabcea455e84bf16b4431aee5c4
-EBUILD lucene-core-5.3.1.ebuild 1253 SHA256
2afa4ab6bcba96997445647dcefde2c1eb601a15d3418ad8d46b409b88de46f0 SHA512
84de19a320a8baced4cf3092563d67d79246415583254acd752fa5240f134732b1b88a015a68b36a4f56222350f9665019b8a6df3cb2f344dadd6fe588b894a5
WHIRLPOOL
bb6488f8e8b2e0b795639419d779da6265bbbdae8c2c0dcecde842ece2f820cb866353a0cd9454cd35e160e025cc810a4f10db29d9e928225605ef16d5ac84df
+DIST lucene-java7-package-list.bz2 1206 SHA256
7b5224aa777c493739a8ee71f621bcf7297e0ef83598555933af9b33e2ef1257 SHA512
2af6727e57304e819c839f266d95bb13c0463ed78f048475e061e0c7dcf6f6b44fc1342a796c81a81de79468cb6663d42b9dbbafaf1a166379f68a00d466fde6
WHIRLPOOL
d7337ed214e6062dbb37532d18e8947f8d2466233711b21fa53d06fa8e17f03a5571f480d27ca6cf9f5fd4ff81ac8d01fb3fc9ac4de31b87f97edf5bc68ae680
+EBUILD lucene-core-5.3.1.ebuild 1342 SHA256
9a180ff56e5525efb6faae7afa3a94990aaffaf86613ab6cacba4b38298f5c3e SHA512
76f0f377e759e9d2c4711d451f70770d6424f5439ab5f87042035f157dc92da808d919e05b8825d21c2ac62572297ccad99d35238761f0358bc097c86168fc18
WHIRLPOOL
80241408d81a9df0e419c63d75a1ac495d44f25cb553f65d0c50ad03317408cddee312ebf63e0291843695055f4475ce17f4eead6fb7532f4c9955131be8a9eb
MISC metadata.xml 157 SHA256
295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512
bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece
WHIRLPOOL
887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448
diff --git a/dev-java/lucene-core/files/build.patch
b/dev-java/lucene-core/files/build.patch
deleted file mode 100644
index 29313ad..0000000
--- a/dev-java/lucene-core/files/build.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff --git a/analysis/kuromoji/build.xml b/analysis/kuromoji/build.xml
-index 0bce4b4..1781dc9 100644
---- a/analysis/kuromoji/build.xml
-+++ b/analysis/kuromoji/build.xml
-@@ -58,7 +58,7 @@
-
- <target name="compile-core" depends="jar-analyzers-common,
common.compile-core" />
- <target name="download-dict"
depends="ivy-availability-check,ivy-fail,ivy-configure" unless="dict.available">
-- <ivy:retrieve pattern="${build.dir}/${dict.src.file}"
conf="${ipadic.type}" symlink="${ivy.symlink}"/>
-+ <!-- <ivy:retrieve pattern="${build.dir}/${dict.src.file}"
conf="${ipadic.type}" symlink="${ivy.symlink}"/> -->
- <!-- TODO: we should checksum too -->
- <gunzip src="${build.dir}/${dict.src.file}"/>
- <untar src="${build.dir}/${ipadic.version}.tar" dest="${build.dir}"/>
-diff --git a/common-build.xml b/common-build.xml
-index 581a42d..f593715 100644
---- a/common-build.xml
-+++ b/common-build.xml
-@@ -49,6 +49,8 @@
-
- <property name="Name" value="Lucene"/>
- <property name="name" value="${ant.project.name}"/>
-+
-+ <property name="ivy.available" value="true"/>
-
- <!-- include version number from property file (includes "version.*"
properties) -->
- <loadproperties srcFile="${common.dir}/version.properties"/>
-@@ -427,8 +429,8 @@
- <target name="resolve" depends="ivy-availability-check,ivy-configure">
- <!-- todo, make this a property or something.
- only special cases need bundles -->
-- <ivy:retrieve type="jar,bundle,test,test-jar,tests" log="download-only"
symlink="${ivy.symlink}"
-- conf="${ivy.default.configuration}" sync="${ivy.sync}"/>
-+ <!-- <ivy:retrieve type="jar,bundle,test,test-jar,tests"
log="download-only" symlink="${ivy.symlink}"
-+ conf="${ivy.default.configuration}" sync="${ivy.sync}"/> -->
- </target>
-
- <property name="ivy_install_path" location="${user.home}/.ant/lib" />
-diff --git a/queryparser/build.xml b/queryparser/build.xml
-index 671e344..8f15c39 100644
---- a/queryparser/build.xml
-+++ b/queryparser/build.xml
-@@ -142,9 +142,9 @@ import
org.apache.lucene.queryparser.flexible.core.messages.*;"
-
- <target name="resolve-javacc" xmlns:ivy="antlib:org.apache.ivy.ant">
- <!-- setup a "fake" JavaCC distribution folder in ${build.dir} to make
JavaCC ANT task happy: -->
-- <ivy:retrieve organisation="net.java.dev.javacc" module="javacc"
revision="5.0" symlink="${ivy.symlink}"
-+ <!-- <ivy:retrieve organisation="net.java.dev.javacc" module="javacc"
revision="5.0" symlink="${ivy.symlink}"
- inline="true" conf="default" transitive="false" type="jar" sync="true"
-- pattern="${build.dir}/javacc/bin/lib/[artifact].[ext]"/>
-+ pattern="${build.dir}/javacc/bin/lib/[artifact].[ext]"/> -->
- </target>
-
- <macrodef name="invoke-javacc">
-diff --git a/replicator/build.xml b/replicator/build.xml
-index 32f281e..4a1a036 100644
---- a/replicator/build.xml
-+++ b/replicator/build.xml
-@@ -35,7 +35,7 @@
- <target name="resolve" depends="common.resolve">
- <sequential>
- <!-- javax.servlet jar -->
-- <ivy:retrieve conf="servlet" log="download-only" type="orbit"
symlink="${ivy.symlink}"/>
-+ <!-- <ivy:retrieve conf="servlet" log="download-only" type="orbit"
symlink="${ivy.symlink}"/> -->
- </sequential>
- </target>
-
diff --git a/dev-java/lucene-core/lucene-core-5.3.1.ebuild
b/dev-java/lucene-core/lucene-core-5.3.1.ebuild
index a5eb25b..c164d24 100644
--- a/dev-java/lucene-core/lucene-core-5.3.1.ebuild
+++ b/dev-java/lucene-core/lucene-core-5.3.1.ebuild
@@ -10,7 +10,8 @@ inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="Apache Lucene Core"
HOMEPAGE="http://lucene.apache.org/core/";
SRC_URI="mirror://apache/lucene/java/${PV}/lucene-${PV}-src.tgz
- doc? ( http://docs.oracle.com/javase/7/docs/api/package-list ->
java7-package-list )"
+ http://dev.gentoo.org/~fordfrog/distfiles/lucene-5-build.patch.bz2
+ doc? (
http://dev.gentoo.org/~fordfrog/distfiles/lucene-java7-package-list.bz2 )"
LICENSE="Apache-2.0"
SLOT="5"
KEYWORDS="~amd64 ~x86"
@@ -22,17 +23,16 @@ RDEPEND=">=virtual/jre-1.7"
S=${WORKDIR}/lucene-${PV}
-java_prepare() {
- epatch "${FILESDIR}/build.patch"
-}
+EANT_BUILD_XML="core/build.xml"
+EANT_BUILD_TARGET="jar-core"
+EANT_DOC_TARGET="javadocs"
-src_compile() {
- eant jar-core
+java_prepare() {
+ epatch "${WORKDIR}/lucene-5-build.patch"
if use doc ; then
- mkdir -p tools/javadoc/java7 || die "failed to create dir"
- ln -s "${DISTDIR}/java7-package-list"
tools/javadoc/java7/package-list || die "failed to create symlink"
- eant -f core/build.xml javadocs
+ mkdir tools/javadoc/java7 || die "failed to create dir"
+ mv "${WORKDIR}/lucene-java7-package-list"
tools/javadoc/java7/package-list || die "failed to move file"
fi
}
