Attachment #513542 for bug #579086




KEYWORDS="amd64 x86"

CDEPEND="
	dev-java/ant-core:0
	dev-java/ant-junit:0
	dev-java/ant-nodeps:0
	dev-java/hamcrest-core:0
	dev-java/jflex:0
	contrib? (
	          dev-java/junit:4
	          dev-java/jakarta-regexp:1.4
			  dev-java/commons-compress:0
	          dev-java/commons-collections:0
	          dev-java/commons-digester:0
	          dev-java/commons-logging:0
			  dev-java/commons-beanutils:1.7
			  dev-java/commons-codec:0
			  dev-java/icu4j:56
	)"

DEPEND="
	${CDEPEND}
	>=virtual/jdk-1.6"
	test? (
		dev-java/junit:4
	)"

RDEPEND="
	${CDEPEND}

	JRE_VERSION_MIGRATION.txt
)

# [0]: Patch so that we can compile the package against ICU 50 and above
PATCHES=(
	"${FILESDIR}"/lucene_contrib_icu4j_v50.patch
)

EANT_GENTOO_CLASSPATH="
	ant-core
	ant-junit
	junit-4
	hamcrest-core
	jflex
	"
EANT_EXTRA_ARGS="-Dversion=${PV} -Dfailonjavadocwarning=false"
EANT_DOC_TARGET="javadocs-core"

EANT_TEST_TARGET="test-core"
EANT_TEST_EXTRA_ARGS="-Dheadless=true -Djava.io.tmpdir=${T}"
EANT_TEST_GENTOO_CLASSPATH="
	ant-core
	ant-junit
	junit-4
	"
EANT_TEST_ANT_TASKS="ant-junit"

JAVA_ANT_REWRITE_CLASSPATH="yes"
	#java-pkg_jar-from --build-only --into lib \
	#	junit-4 junit.jar junit-4.7.jar
	java-pkg_jar-from --build-only --into lib \
		ant-core ant.jar ant-1.7.1.jar
	java-pkg_jar-from --build-only --into lib \
		ant-junit ant-junit.jar ant-junit-1.7.1.jar

# All tests in contrib/icu/test fail.
RESTRICT="test"
	  java-pkg_jar-from --build-only --into queries/lib \
	  	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
	  java-pkg_jar-from --build-only --into benchmark/lib \
	  	commons-compress commons-compress.jar commons-compress-1.1.jar
	  java-pkg_jar-from --build-only --into benchmark/lib \
	  	commons-collections commons-collections.jar commons-collections-3.1.jar
	  java-pkg_jar-from --build-only --into benchmark/lib \
	  	commons-digester commons-digester.jar commons-digester-1.7.jar
	  java-pkg_jar-from --build-only --into benchmark/lib \
	  	commons-logging commons-logging.jar commons-logging-1.0.4.jar
	  java-pkg_jar-from --build-only --into benchmark/lib \
	  	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
	fi
}

src_prepare() {
	default
	
	sed -i \
		-e '/-Xmax/ d' \
		-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
		-e '/<ivy:retrieve/d' \
		common-build.xml || die
	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
	java-pkg_jar-from --build-only --into lib \
		ant-core ant.jar ant-1.7.1.jar
	java-pkg_jar-from --build-only --into lib \
		ant-junit ant-junit.jar ant-junit-1.7.1.jar
	java-pkg_jar-from --build-only --into lib \
		ant-ivy:2
	java-pkg_jar-from --build-only --into lib \
		junit-4 junit.jar junit-4.10.jar
	java-pkg_jar-from --build-only --into lib \
		hamcrest-core

	# Always needed anyway
	cd "${S}"/test-framework/ || die
	java-pkg_jar-from --build-only --into lib \
		ant-core ant.jar ant-1.7.1.jar
	java-pkg_jar-from --build-only --into lib \
		ant-junit ant-junit.jar ant-junit-1.7.1.jar
	java-pkg_jar-from --build-only --into lib \
		junit-4 junit.jar junit-4.10.jar
	java-pkg_jar-from --build-only --into lib \
		hamcrest-core

	if use contrib; then
	    cd "${S}"/contrib/ || die
		# queries
	    java-pkg_jar-from --build-only --into queries/lib \
	    	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
		# benchmark
	    java-pkg_jar-from --build-only --into benchmark/lib \
	    	commons-compress commons-compress.jar commons-compress-1.1.jar
	    java-pkg_jar-from --build-only --into benchmark/lib \
	    	commons-collections commons-collections.jar commons-collections-3.1.jar
	    java-pkg_jar-from --build-only --into benchmark/lib \
	    	commons-digester commons-digester.jar commons-digester-1.7.jar
	    java-pkg_jar-from --build-only --into benchmark/lib \
	    	commons-logging commons-logging.jar commons-logging-1.0.4.jar
	    java-pkg_jar-from --build-only --into benchmark/lib \
	    	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
		# analyzers/phonetic
	    java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
	    	commons-codec commons-codec.jar commons-codec-1.6.jar
	fi
}

src_compile() {
	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
	java-ant_xml-rewrite -f common-build.xml \
		-c -e javadoc \
		-a failonerror \
		-v "false" \
		-a additionalparam \
		-v "-Xdoclint:none"

	# There are some JS in the javadocs's bootom and in VM >= 1.8 the --allow-script-in-comments
	# is needed so docs could be built
	if java-pkg_is-vm-version-ge "1.8" ; then
		java-ant_xml-rewrite -f common-build.xml \
			-c -e javadoc \
			-a additionalparam \
			-v "-Xdoclint:none --allow-script-in-comments"
	fi
	
	java-pkg-2_src_prepare
}

src_compile() {
	EANT_BUILD_TARGET="jar-core"
		-Dfailonjavadocwarning=false \
		jar-core \
		$(use_doc javadocs-core)

	if use contrib; then
	    EANT_GENTOO_CLASSPATH+="
			jakarta-regexp-1.4
			commons-compress
			commons-collections
			commons-digester
			commons-logging
			commons-beanutils-1.7 
			commons-codec
			icu4j-56
			"
		EANT_BUILD_TARGET+=" build-contrib"
		EANT_DOC_TARGET+=" javadocs-all"
	fi
	
	java-ant_rewrite-classpath common-build.xml
	
	default
	java-pkg-2_src_compile
}

src_test() {
	if use contrib; then
	    EANT_TEST_GENTOO_CLASSPATH+=" commons-codec ${EANT_GENTOO_CLASSPATH}"
	    EANT_TEST_TARGET+=" test-contrib"
	fi
	
	java-pkg-2_src_test
}

src_install() {

Return to bug 579086

Lines 18-42 Link Here

(-)/usr/portage/dev-java/lucene/lucene-3.6.2-r1.ebuild (-99 / +72 lines)
18	KEYWORDS="amd64 x86"	18	KEYWORDS="amd64 x86"
19		19
20	CDEPEND="	20	CDEPEND="
21	dev-java/ant-ivy:2	21	dev-java/ant-core:0
22	dev-java/ant-junit:0	22	dev-java/ant-junit:0
23	dev-java/ant-nodeps:0	23	dev-java/ant-nodeps:0
24	dev-java/hamcrest-core:0	24	dev-java/hamcrest-core:0
		25	dev-java/jflex:0
25	contrib? (	26	contrib? (
		27	dev-java/junit:4
26	dev-java/jakarta-regexp:1.4	28	dev-java/jakarta-regexp:1.4
27	dev-java/commons-compress:0	29	dev-java/commons-compress:0
28	dev-java/commons-collections:0	30	dev-java/commons-collections:0
29	dev-java/commons-digester:0	31	dev-java/commons-digester:0
30	dev-java/commons-logging:0	32	dev-java/commons-logging:0
31	dev-java/commons-beanutils:1.7	33	dev-java/commons-beanutils:1.7
		34	dev-java/commons-codec:0
		35	dev-java/icu4j:56
32	)"	36	)"
33		37
34	DEPEND="	38	DEPEND="
35	${CDEPEND}	39	${CDEPEND}
36	>=virtual/jdk-1.6	40	>=virtual/jdk-1.6"
37	test? (
38	dev-java/junit:4
39	)"
40		41
41	RDEPEND="	42	RDEPEND="
42	${CDEPEND}	43	${CDEPEND}
Lines 48-170 Link Here
48	JRE_VERSION_MIGRATION.txt	49	JRE_VERSION_MIGRATION.txt
49	)	50	)
50		51
51	# All tests fail with the following error:	52	# [0]: Patch so that we can compile the package against ICU 50 and above
52	# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!	53	PATCHES=(
53	RESTRICT="test"	54	"${FILESDIR}"/lucene_contrib_icu4j_v50.patch
		55	)
54		56
55	src_prepare() {	57	EANT_GENTOO_CLASSPATH="
56	default	58	ant-core
57	java-pkg_clean	59	ant-junit
58	sed -i \	60	junit-4
59	-e '/-Xmax/ d' \	61	hamcrest-core
60	common-build.xml \|\| die	62	jflex
		63	"
		64	EANT_EXTRA_ARGS="-Dversion=${PV} -Dfailonjavadocwarning=false"
		65	EANT_DOC_TARGET="javadocs-core"
		66
		67	EANT_TEST_TARGET="test-core"
		68	EANT_TEST_EXTRA_ARGS="-Dheadless=true -Djava.io.tmpdir=${T}"
		69	EANT_TEST_GENTOO_CLASSPATH="
		70	ant-core
		71	ant-junit
		72	junit-4
		73	"
		74	EANT_TEST_ANT_TASKS="ant-junit"
61		75
62	# FIXME: contrib builds do not work if junit not included	76	JAVA_ANT_REWRITE_CLASSPATH="yes"
63	#java-pkg_jar-from --build-only --into lib \
64	# junit-4 junit.jar junit-4.7.jar
65	java-pkg_jar-from --build-only --into lib \
66	ant-core ant.jar ant-1.7.1.jar
67	java-pkg_jar-from --build-only --into lib \
68	ant-junit ant-junit.jar ant-junit-1.7.1.jar
69		77
70	if use contrib; then	78	# All tests in contrib/icu/test fail.
71	cd contrib/ \|\| die	79	RESTRICT="test"
72	java-pkg_jar-from --build-only --into queries/lib \
73	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
74	java-pkg_jar-from --build-only --into benchmark/lib \
75	commons-compress commons-compress.jar commons-compress-1.1.jar
76	java-pkg_jar-from --build-only --into benchmark/lib \
77	commons-collections commons-collections.jar commons-collections-3.1.jar
78	java-pkg_jar-from --build-only --into benchmark/lib \
79	commons-digester commons-digester.jar commons-digester-1.7.jar
80	java-pkg_jar-from --build-only --into benchmark/lib \
81	commons-logging commons-logging.jar commons-logging-1.0.4.jar
82	java-pkg_jar-from --build-only --into benchmark/lib \
83	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
84	fi
85	}
86		80
87	src_prepare() {	81	src_prepare() {
88	default	82	default
89	java-pkg_clean	83
90	sed -i \	84	sed -i \
91	-e '/-Xmax/ d' \	85	-e '/-Xmax/ d' \
92	-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \	86	-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
93	-e '/<ivy:retrieve/d' \	87	-e '/<ivy:retrieve/d' \
94	common-build.xml \|\| die	88	common-build.xml \|\| die
95	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib \|\| die
96	java-pkg_jar-from --build-only --into lib \
97	ant-core ant.jar ant-1.7.1.jar
98	java-pkg_jar-from --build-only --into lib \
99	ant-junit ant-junit.jar ant-junit-1.7.1.jar
100	java-pkg_jar-from --build-only --into lib \
101	ant-ivy:2
102	java-pkg_jar-from --build-only --into lib \
103	junit-4 junit.jar junit-4.10.jar
104	java-pkg_jar-from --build-only --into lib \
105	hamcrest-core
106
107	# Always needed anyway
108	cd "${S}"/test-framework/ \|\| die
109	java-pkg_jar-from --build-only --into lib \
110	ant-core ant.jar ant-1.7.1.jar
111	java-pkg_jar-from --build-only --into lib \
112	ant-junit ant-junit.jar ant-junit-1.7.1.jar
113	java-pkg_jar-from --build-only --into lib \
114	junit-4 junit.jar junit-4.10.jar
115	java-pkg_jar-from --build-only --into lib \
116	hamcrest-core
117		89
118	if use contrib; then
119	cd "${S}"/contrib/ \|\| die
120	# queries
121	java-pkg_jar-from --build-only --into queries/lib \
122	jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
123	# benchmark
124	java-pkg_jar-from --build-only --into benchmark/lib \
125	commons-compress commons-compress.jar commons-compress-1.1.jar
126	java-pkg_jar-from --build-only --into benchmark/lib \
127	commons-collections commons-collections.jar commons-collections-3.1.jar
128	java-pkg_jar-from --build-only --into benchmark/lib \
129	commons-digester commons-digester.jar commons-digester-1.7.jar
130	java-pkg_jar-from --build-only --into benchmark/lib \
131	commons-logging commons-logging.jar commons-logging-1.0.4.jar
132	java-pkg_jar-from --build-only --into benchmark/lib \
133	commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
134	# analyzers/phonetic
135	java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
136	commons-codec commons-codec.jar commons-codec-1.6.jar
137	fi
138	}
139
140	src_compile() {
141	# FIXME: docs do not build if behind a proxy, -autoproxy does not work	90	# FIXME: docs do not build if behind a proxy, -autoproxy does not work
142	java-ant_xml-rewrite -f common-build.xml \	91	java-ant_xml-rewrite -f common-build.xml \
143	-c -e javadoc \	92	-c -e javadoc \
144	-a failonerror \	93	-a failonerror \
145	-v "false"	94	-v "false" \
		95	-a additionalparam \
		96	-v "-Xdoclint:none"
		97
		98	# There are some JS in the javadocs's bootom and in VM >= 1.8 the --allow-script-in-comments
		99	# is needed so docs could be built
		100	if java-pkg_is-vm-version-ge "1.8" ; then
		101	java-ant_xml-rewrite -f common-build.xml \
		102	-c -e javadoc \
		103	-a additionalparam \
		104	-v "-Xdoclint:none --allow-script-in-comments"
		105	fi
		106
		107	java-pkg-2_src_prepare
		108	}
146		109
147	ANT_TASKS="none" \	110	src_compile() {
148	eant -Dversion=${PV} \	111	EANT_BUILD_TARGET="jar-core"
149	-Dfailonjavadocwarning=false \
150	jar-core \
151	$(use_doc javadocs-core)
152		112
153	if use contrib; then	113	if use contrib; then
154	ANT_TASKS="none" \	114	EANT_GENTOO_CLASSPATH+="
155	eant -Dversion=${PV} \	115	jakarta-regexp-1.4
156	-Dfailonjavadocwarning=false \	116	commons-compress
157	build-contrib \	117	commons-collections
158	$(use_doc javadocs-all)	118	commons-digester
		119	commons-logging
		120	commons-beanutils-1.7
		121	commons-codec
		122	icu4j-56
		123	"
		124	EANT_BUILD_TARGET+=" build-contrib"
		125	EANT_DOC_TARGET+=" javadocs-all"
159	fi	126	fi
		127
		128	java-ant_rewrite-classpath common-build.xml
		129
		130	default
		131	java-pkg-2_src_compile
160	}	132	}
161		133
162	src_test() {	134	src_test() {
163	# FIXME: test does not get run, even when selected	135	if use contrib; then
164	java-ant_rewrite-classpath common-build.xml	136	EANT_TEST_GENTOO_CLASSPATH+=" commons-codec ${EANT_GENTOO_CLASSPATH}"
165	EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \	137	EANT_TEST_TARGET+=" test-contrib"
166	ANT_TASKS="ant-junit" \	138	fi
167	eant test-core	139
		140	java-pkg-2_src_test
168	}	141	}
169		142
170	src_install() {	143	src_install() {