Bug #392953: bump; contrib is still a little flakey.

Package-Manager: portage-2.2.7/cvs/Linux x86_64

3 files changed, 141 insertions, 2 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index 6f4dcddd0106..d2686316c01e 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/lucene
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.94 2013/12/28 19:09:57 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.95 2013/12/28 21:09:15 robbat2 Exp $
+
+*lucene-3.6.2 (28 Dec 2013)
+
+  28 Dec 2013; Robin H. Johnson <robbat2@gentoo.org> +lucene-3.6.2.ebuild:
+  Bug #392953: bump; contrib is still a little flakey.
 
   28 Dec 2013; Robin H. Johnson <robbat2@gentoo.org> lucene-1.4.3-r3.ebuild,
   lucene-1.9.1.ebuild, lucene-2.1.0-r1.ebuild, lucene-2.1.0-r2.ebuild,
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 9e4b5597c6c5..6ac83766cbd7 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -15,6 +15,7 @@ DIST lucene-3.0.0-src.tar.gz 12421467 SHA256 661fc4eec33c2c509c1a53896da469304a5
 DIST lucene-3.0.3-src.tar.gz 12446839 SHA256 91365fe5af0279b7b6300f17033580746c90272417665d9572db1c1a9d1ba37e SHA512 b9a09a3efc63450c8d4fab840185b21aab288a7fb02a7f8f63af08ac3f3ebee18a255d9ecfdd3d7301e8c9e93bee90abe2ae10e2b91ed6770c1d7075848b5869 WHIRLPOOL 72f2f5ad089b790dd0eefe7a1b6cf3d1e8a2aa85ea42bb0cfc754498feb00a2ec2a4ad80e1f2228d7a873048c1b8057e32d19d17bfffb044ae23180605a21fcb
 DIST lucene-3.4.0-src.tgz 39329123 SHA256 e0471a61085b4aac8db831b5c981262d972a611e4fea491c4e188a9ee730ff2a SHA512 c5cc4394af12e72c47c246f59bd2e352ff9d5b5749bed5b68c3a0925ae85fc595cb316f1a15e9074597e9c347b4193aa9d7c039a06c4bf9a603362ce4c3f0b39 WHIRLPOOL e217842d77c7875e85442551b1748ae18c89dfeb71d3c24809fc625890fe2c8ce57de242d9a61f95474b8d12d20b2405ff2692286957cf686bca292b2cae0aea
 DIST lucene-3.5.0-src.tgz 39564076 SHA256 814dbfcd91b76522ae350817c306be8c4a72dfe8c809540be4b20209acfb9a27 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275 WHIRLPOOL ca2994a3de615d4f80f30f26f852ed6919830b81de666034997bdc65defdde2e0777f924d08f67ee7ca6467624a036305eb86c31fb0d7e59e0ffb57f3f69404f
+DIST lucene-3.6.2-src.tgz 32139784 SHA256 984bf1e82e32ecdc6c4ff7f582b5bd0a4c2bf68acd1d48bf6df74ad86c97ca8c SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965 WHIRLPOOL bfec9e7f937c75337b3582b7d5c4de5b954eb4d256f0218cbf36ea67bcb9fae8dc1e298c0e69e8168865ba21b75c271c29dd6b0adf40cae5f725f0b777b66f20
 EBUILD lucene-1.4.3-r3.ebuild 1188 SHA256 be1b75847fcbac0042ac68bd7e0d6fd3e6335565c0bc77a93b3e0b292b92eebf SHA512 c775357999815e8b3dbfe8685c0137374c94a7482274781e7c29ecf4362dfab283e312dbba5bf2a9b23ac465915d533eb5824b8acbb104ebbeb387de69c2c02f WHIRLPOOL 35596a27898e44b1f3057fc60f3941388c81882c495c3deb9f145fb2b751c4e714e6692099cd547066b9841d57d8089f11b99e4c91fc7870cd7beb93b8811c7b
 EBUILD lucene-1.9.1.ebuild 1466 SHA256 bff0843892cc94b83b0ab64eb76db1bc93f64ccbf6c724c0bf1b7c82adad44d5 SHA512 cb5abea3b772ac4ac14ce0a1f7efc638bda998032e1be9ae249e44864bf224fce07c53c0cca508901b339ae1d01e3c978f3f22c5f0d102443b707e2dda9acf6f WHIRLPOOL c04a59c648c6de7bca9002d81ceaaf05cb9d271b92d70a044330b4c3b02968722056d8265ef1dd5fe72c825c54e96a7519d8632e0b74138c2822828a04c2985a
 EBUILD lucene-2.1.0-r1.ebuild 1637 SHA256 46f128b88c77ac393b7b786bde29b9a140b2f3ac6c2a02c12c8b72c7103e466f SHA512 ad86c95c38c711630456fb416463261100ade9f36be4b4e487d26535c7072d2a4bc722a980b7de008e6d760ec42fecebae0082c28b2626b2513a5f19ed825bfc WHIRLPOOL 2d46010dd58774b0209082ef787f80517f9ada4cc6a47d32359876d301a54ab196db676fb3e3b6e145ab6cdd2c861642113e42757470c092822f7b32fbb8e6d4
@@ -35,5 +36,6 @@ EBUILD lucene-3.0.0.ebuild 1858 SHA256 41b1f6e836f5285020e38dbff3c7f7bb6876cbd74
 EBUILD lucene-3.0.3.ebuild 2142 SHA256 f2c1d06385fd6b4698dfeb21588feceb2f7a0ed8feacebc5f96914da7567ed3b SHA512 81588ca525d72c387a13f28aaaa46d7af52dc7d96dcbc9fe09ff72bfe0da6bdb6d24dd745141c37246a4a2fe5fdabf1a211d86cdb168893f9772f9217658a1e3 WHIRLPOOL 6e393465257d837b5fd8e7b44f7693b71a2b0c3c2086099e772613f46ad92bc0972e10230807f57ed1ddf412e7805dbb6243811f23d19268e9f0e3f1e120a78b
 EBUILD lucene-3.4.0.ebuild 3390 SHA256 40902b14f6acc7ef3409533a08c34db708a90efb3e6dbcb855f22373cb982a36 SHA512 b8390cba13277421454d0e255c4be3dbed57035bf062125ec08e5df68a573c5f3f621f1824c80c44aca02dbbd2afa1a1e9cbf9630c54ee1daf4f741632e75e4c WHIRLPOOL 1e525ed5af0f34e4a718f0e90596d11163d806db0ed7eda71f0dee1beb012828ed53bf36851b610fbebc08d6f65d15f95fccd10a9f650e50f55b6aacbb6129e1
 EBUILD lucene-3.5.0.ebuild 3388 SHA256 9865f75281cecf183e4cdb0ed739c4810e50e5a6e122dc3686ad8e75ba1385ca SHA512 04352adc6f364d0d6656f8f5d96e83fc3fc30178c00707778bd46886e0ad4c9e1d55c6de922a3a798764d302a81d96e0d7a0f96e6222b1bbcf64cc8215019dea WHIRLPOOL f8b34f12ceb84cfb63493ee0ad82aa6d048f88b3fedae265de4b50bedda3e5a96f82cccaa85d820ad8d100f0b245eeb8f3aa21b051b8fc13063fcfad6ea1d434
-MISC ChangeLog 13840 SHA256 b82a7247ba75bdb770b6317aa0b77b125a6f39094ac3034a129085344743c9ed SHA512 edac10e5ea865cc6ffab17a912a87960fd575a3e50f8c1d33b6099f79305d5f553e532f5c598ad80567bfcbcb600983ea9f372c074eb8ae0a6008899c5804647 WHIRLPOOL 862ace56f429ca0dc939f3e6fa881d71f152ae6e3633d19447eea2179912b9ecaa3a311e63e7a062c1ffdbaa4532a9e2607a82905f6c8342eb51731e3e953ae3
+EBUILD lucene-3.6.2.ebuild 4353 SHA256 3ec4da2f784e4158a447718100ecb9c1f1d3c92bc54b68bc626418390ce65e00 SHA512 3d39d9687f69aa45ba840ca7f480b7671c345554e6c77b1b7c2d5d64982bcd14b0a214ac389fb7ed417c373a307cddab7a856b1bf63c1724933f4da62c39cc79 WHIRLPOOL 658680870c6a310769f884d30c444a189124388c6e828f215b2954f06db3ec15936670b398b88efb72c50c314ad720186448fdaf979521922cd46e83b52e0ad5
+MISC ChangeLog 14000 SHA256 45b9baeb92be21731d8630e8bcf3c77ef6b9185b3937330d1efc11ec1401ee85 SHA512 ab0daa24d1de705efe2a10a1109eaef3600d26f045f9a4bc12a366d060a2973a1734a2d806dc34ae7c35205c8c4b8fabf906814dd4d5113fb282153d84792858 WHIRLPOOL b89f36395c4de48fd75ef0f362a9211ecc68f73eba948e534bdcae301e1a5ed73adc985f49a0ee0003a6420b7ad3dcfbb90e016b954d24009f7c9476a1e7e3fc
 MISC metadata.xml 371 SHA256 30d6aa8ff474df00e447a1d5cbf29421d0da4aa6fb9029093a234580e97d333e SHA512 b3ee6d811b0d13a8947b46c387a5179ad918f04047f00eab46b60f1f8a957e1c052dab85e0d978c9715bdbf4f9132f6a090ea68234e2d1f92c55f8f3bb3786e4 WHIRLPOOL 3cb811b3cc81a16aad122a3ff5e13f46f5a8cc5dd1dc2a11ba0905a434f9dca909daf33312701a076088bdbbc140962a11f8a25fa3c7f9f49d695d5afb87a2a2
diff --git a/dev-java/lucene/lucene-3.6.2.ebuild b/dev-java/lucene/lucene-3.6.2.ebuild
new file mode 100644
index 000000000000..233035bc0d82
--- /dev/null
+++ b/dev-java/lucene/lucene-3.6.2.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-3.6.2.ebuild,v 1.1 2013/12/28 21:09:15 robbat2 Exp $
+
+EAPI="3"
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+#JAVA_PKG_DEBUG=1
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine library
+written entirely in Java"
+HOMEPAGE="http://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+LICENSE="Apache-2.0"
+SLOT="${PV:0:3}"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+RDEPEND=">=virtual/jdk-1.5
+	contrib? (
+			  dev-java/commons-beanutils:1.7
+			  >=dev-java/commons-codec-1.6:0
+	          dev-java/commons-collections:0
+			  dev-java/commons-compress:0
+	          dev-java/commons-digester:0
+	          dev-java/commons-logging:0
+	          dev-java/jakarta-regexp:1.4
+	)"
+DEPEND="${RDEPEND}
+	dev-java/ant-nodeps:0
+	test? ( =dev-java/junit-4.10*:4 
+			dev-java/hamcrest-core )
+	dev-java/ant-junit:0
+	>=dev-java/ant-ivy-2.2.0:2"
+
+#dev-java/javacc:0 - no longer needed, files are prebuilt
+
+java_prepare() {
+	#find -name "*.jar" -type f | xargs rm -v
+	sed -i \
+		-e '/-Xmax/ d' \
+		-e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
+		-e '/<ivy:retrieve/d' \
+		common-build.xml
+	mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib
+	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/
+	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/
+		# 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
+	einfo "Building main"
+	ANT_TASKS="none" eant -Dversion=${PV} \
+		-Dfailonjavadocwarning=false \
+		jar-core $(use_doc javadocs-core )
+	if use contrib ; then
+	  einfo "Building contrib"
+	 ANT_TASKS="none" eant -Dversion=${PV} \
+		-Dfailonjavadocwarning=false \
+		build-contrib $(use_doc javadocs-all )
+	fi
+}
+
+src_test() {
+	# FIXME: test does not get run, even when selected
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
+	    JRE_VERSION_MIGRATION.txt|| die
+	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
+	if use contrib; then
+		for i in `find  build/contrib -name \*-${PV}.jar`
+		do
+		    j=${i##*/}
+			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+		done
+	fi
+	if use doc; then
+		dohtml -r docs/* || die
+		java-pkg_dohtml -r build/docs/api
+	fi
+	if use source; then
+	     java-pkg_dosrc core/src/java/org || die
+	  	 if use contrib; then
+	    	java-pkg_dosrc  contrib  || die
+	  	 fi
+	fi
+}