adapt clucene for UnpackedTarball

Change-Id: I52d78c396511ee44c18ba9473b9602fc4e6f947f

5 files changed, 240 insertions, 278 deletions

diff --git a/clucene/CustomTarget_source.mk b/clucene/CustomTarget_source.mk
deleted file mode 100644
index 8ce11b2eed7b..000000000000
--- a/clucene/CustomTarget_source.mk
+++ /dev/null
@@ -1,85 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 Red Hat, Inc., Caolán McNamara <caolanm@redhat.com>
-#  (initial developer)
-# Copyright (C) 2012 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_CustomTarget_CustomTarget,clucene/source))
-
-clucene_DIR := $(call gb_CustomTarget_get_workdir,clucene/source)
-
-$(call gb_CustomTarget_get_target,clucene/source) : $(clucene_DIR)/done
-
-# FIXME: do not hardcode the path here
-ifeq ($(OS_FOR_BUILD),WNT)
-clucene_FIXED_TARFILE_LOCATION := $(shell cygpath -u $(TARFILE_LOCATION))/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
-else
-clucene_FIXED_TARFILE_LOCATION := $(TARFILE_LOCATION)/48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz
-endif
-
-ifeq ($(OS),WNT)
-_CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/_clucene-config-MSVC.h
-ifeq ($(COM),MSC)
-CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/clucene-config-MSVC.h
-else
-CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/clucene-config-MINGW.h
-endif
-else
-CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/clucene-config-generic.h
-ifeq ($(OS),LINUX)
-_CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/_clucene-config-LINUX.h
-else
-_CLUCENE_CONFIG_H := $(SRCDIR)/clucene/configs/_clucene-config-generic.h
-endif
-endif
-
-# clucene-multimap-put.patch was proposed upstream, see
-# <http://sourceforge.net/mailarchive/message.php?msg_id=29143260>:
-$(clucene_DIR)/done : $(clucene_FIXED_TARFILE_LOCATION) \
-		$(_CLUCENE_CONFIG_H) $(CLUCENE_CONFIG_H)
-	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),TAR,1)
-	$(call gb_Helper_abbreviate_dirs, \
-	mkdir -p $(dir $@) && cd $(dir $@) && \
-	$(GNUTAR) -x -z $(STRIP_COMPONENTS)=1 -f $< && \
-	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-internal-zlib.patch && \
-	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-warnings.patch && \
-	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-gcc-atomics.patch && \
-	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-debug.patch && \
-	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-narrowing-conversions.patch && \
-	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-multimap-put.patch && \
-	$(GNUPATCH) -p0 < $(SRCDIR)/clucene/patches/clucene-nullptr.patch && \
-	for i in `find $(clucene_DIR)/ -name "*.cpp"`; do mv $$i $${i%%cpp}cxx; done)
-	#FIXME ?, our rules expect .cxx
-ifneq ($(OS),WNT)
-	#dirent.h is a problem, move it around
-	mkdir -p $(clucene_DIR)/inc/internal/CLucene/util
-	mv $(clucene_DIR)/src/shared/CLucene/util/dirent.h $(clucene_DIR)/inc/internal/CLucene/util
-endif
-	#To generate these, run cmake for each sufficiently different platform, customize and stick into configs
-	cp $(CLUCENE_CONFIG_H) $(clucene_DIR)/src/shared/CLucene/clucene-config.h
-	cp $(_CLUCENE_CONFIG_H) $(clucene_DIR)/src/shared/CLucene/_clucene-config.h
-	touch $@
-
-# vim: set noet sw=4 ts=4:
diff --git a/clucene/Library_clucene.mk b/clucene/Library_clucene.mk
index 8ac4dc731bb5..b3d6c72cbc22 100644
--- a/clucene/Library_clucene.mk
+++ b/clucene/Library_clucene.mk
@@ -31,13 +31,15 @@ $(eval $(call gb_Library_use_external,clucene,zlib))
 
 $(eval $(call gb_Library_use_package,clucene,clucene_source))
 
+$(eval $(call gb_Library_use_unpacked,clucene,clucene))
+
 $(eval $(call gb_Library_set_warnings_not_errors,clucene))
 
 $(eval $(call gb_Library_set_include,clucene,\
-	-I$(WORKDIR)/CustomTarget/clucene/source/inc/internal \
-	-I$(WORKDIR)/CustomTarget/clucene/source/src/core \
-	-I$(WORKDIR)/CustomTarget/clucene/source/src/contribs-lib \
-	-I$(WORKDIR)/CustomTarget/clucene/source/src/shared \
+	-I$(WORKDIR)/UnpackedTarball/clucene/inc/internal \
+	-I$(WORKDIR)/UnpackedTarball/clucene/src/core \
+	-I$(WORKDIR)/UnpackedTarball/clucene/src/contribs-lib \
+	-I$(WORKDIR)/UnpackedTarball/clucene/src/shared \
 	$$(INCLUDE) \
 ))
 
@@ -62,195 +64,187 @@ $(eval $(call gb_Library_use_libraries,clucene,\
 endif
 
 $(eval $(call gb_Library_add_generated_exception_objects,clucene,\
-    CustomTarget/clucene/source/src/shared/CLucene/SharedHeader \
-    CustomTarget/clucene/source/src/shared/CLucene/config/gunichartables \
-    CustomTarget/clucene/source/src/shared/CLucene/config/repl_tcslwr \
-    CustomTarget/clucene/source/src/shared/CLucene/config/repl_tcstoll \
-    CustomTarget/clucene/source/src/shared/CLucene/config/repl_tcscasecmp \
-    CustomTarget/clucene/source/src/shared/CLucene/config/repl_tprintf \
-    CustomTarget/clucene/source/src/shared/CLucene/config/repl_lltot \
-    CustomTarget/clucene/source/src/shared/CLucene/config/repl_tcstod \
-    CustomTarget/clucene/source/src/shared/CLucene/config/utf8 \
-    CustomTarget/clucene/source/src/shared/CLucene/config/threads \
-    CustomTarget/clucene/source/src/shared/CLucene/debug/condition \
-    CustomTarget/clucene/source/src/shared/CLucene/util/StringBuffer \
-    CustomTarget/clucene/source/src/shared/CLucene/util/Misc \
-    CustomTarget/clucene/source/src/shared/CLucene/util/dirent \
-	CustomTarget/clucene/source/src/core/CLucene/StdHeader \
-	CustomTarget/clucene/source/src/core/CLucene/debug/error \
-	CustomTarget/clucene/source/src/core/CLucene/util/ThreadLocal \
-	CustomTarget/clucene/source/src/core/CLucene/util/Reader \
-	CustomTarget/clucene/source/src/core/CLucene/util/Equators \
-	CustomTarget/clucene/source/src/core/CLucene/util/FastCharStream \
-	CustomTarget/clucene/source/src/core/CLucene/util/MD5Digester \
-	CustomTarget/clucene/source/src/core/CLucene/util/StringIntern \
-	CustomTarget/clucene/source/src/core/CLucene/util/BitSet \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/FastCharStream \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/MultiFieldQueryParser \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/QueryParser \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/QueryParserTokenManager \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/QueryToken \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/Lexer \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/MultiFieldQueryParser \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/QueryParser \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/QueryParserBase \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/QueryToken \
-	CustomTarget/clucene/source/src/core/CLucene/queryParser/legacy/TokenList \
-	CustomTarget/clucene/source/src/core/CLucene/analysis/standard/StandardAnalyzer \
-	CustomTarget/clucene/source/src/core/CLucene/analysis/standard/StandardFilter \
-	CustomTarget/clucene/source/src/core/CLucene/analysis/standard/StandardTokenizer \
-	CustomTarget/clucene/source/src/core/CLucene/analysis/Analyzers \
-	CustomTarget/clucene/source/src/core/CLucene/analysis/AnalysisHeader \
-	CustomTarget/clucene/source/src/core/CLucene/store/MMapInput \
-	CustomTarget/clucene/source/src/core/CLucene/store/IndexInput \
-	CustomTarget/clucene/source/src/core/CLucene/store/Lock \
-	CustomTarget/clucene/source/src/core/CLucene/store/LockFactory \
-	CustomTarget/clucene/source/src/core/CLucene/store/IndexOutput \
-	CustomTarget/clucene/source/src/core/CLucene/store/Directory \
-    CustomTarget/clucene/source/src/core/CLucene/store/FSDirectory \
-    CustomTarget/clucene/source/src/core/CLucene/store/RAMDirectory \
-    CustomTarget/clucene/source/src/core/CLucene/document/Document \
-    CustomTarget/clucene/source/src/core/CLucene/document/DateField \
-    CustomTarget/clucene/source/src/core/CLucene/document/DateTools \
-    CustomTarget/clucene/source/src/core/CLucene/document/Field \
-    CustomTarget/clucene/source/src/core/CLucene/document/FieldSelector \
-    CustomTarget/clucene/source/src/core/CLucene/document/NumberTools \
-    CustomTarget/clucene/source/src/core/CLucene/index/IndexFileNames \
-    CustomTarget/clucene/source/src/core/CLucene/index/IndexFileNameFilter \
-    CustomTarget/clucene/source/src/core/CLucene/index/IndexDeletionPolicy \
-    CustomTarget/clucene/source/src/core/CLucene/index/SegmentMergeInfo \
-    CustomTarget/clucene/source/src/core/CLucene/index/SegmentInfos \
-    CustomTarget/clucene/source/src/core/CLucene/index/MergeScheduler \
-    CustomTarget/clucene/source/src/core/CLucene/index/SegmentTermDocs \
-    CustomTarget/clucene/source/src/core/CLucene/index/FieldsWriter \
-    CustomTarget/clucene/source/src/core/CLucene/index/TermInfosWriter \
-    CustomTarget/clucene/source/src/core/CLucene/index/Term \
-    CustomTarget/clucene/source/src/core/CLucene/index/Terms \
-    CustomTarget/clucene/source/src/core/CLucene/index/MergePolicy \
-    CustomTarget/clucene/source/src/core/CLucene/index/DocumentsWriter \
-    CustomTarget/clucene/source/src/core/CLucene/index/DocumentsWriterThreadState \
-    CustomTarget/clucene/source/src/core/CLucene/index/SegmentTermVector \
-    CustomTarget/clucene/source/src/core/CLucene/index/TermVectorReader \
-    CustomTarget/clucene/source/src/core/CLucene/index/FieldInfos \
-    CustomTarget/clucene/source/src/core/CLucene/index/CompoundFile \
-    CustomTarget/clucene/source/src/core/CLucene/index/SkipListReader \
-    CustomTarget/clucene/source/src/core/CLucene/index/SkipListWriter \
-    CustomTarget/clucene/source/src/core/CLucene/index/IndexFileDeleter \
-    CustomTarget/clucene/source/src/core/CLucene/index/SegmentReader \
-    CustomTarget/clucene/source/src/core/CLucene/index/DirectoryIndexReader \
-    CustomTarget/clucene/source/src/core/CLucene/index/TermVectorWriter \
-    CustomTarget/clucene/source/src/core/CLucene/index/IndexReader \
-    CustomTarget/clucene/source/src/core/CLucene/index/SegmentTermPositions \
-    CustomTarget/clucene/source/src/core/CLucene/index/SegmentMerger \
-    CustomTarget/clucene/source/src/core/CLucene/index/IndexWriter \
-    CustomTarget/clucene/source/src/core/CLucene/index/MultiReader \
-    CustomTarget/clucene/source/src/core/CLucene/index/MultiSegmentReader \
-    CustomTarget/clucene/source/src/core/CLucene/index/Payload \
-    CustomTarget/clucene/source/src/core/CLucene/index/SegmentTermEnum \
-    CustomTarget/clucene/source/src/core/CLucene/index/TermInfo \
-    CustomTarget/clucene/source/src/core/CLucene/index/IndexModifier \
-    CustomTarget/clucene/source/src/core/CLucene/index/SegmentMergeQueue \
-    CustomTarget/clucene/source/src/core/CLucene/index/FieldsReader \
-    CustomTarget/clucene/source/src/core/CLucene/index/TermInfosReader \
-    CustomTarget/clucene/source/src/core/CLucene/index/MultipleTermPositions \
-    CustomTarget/clucene/source/src/core/CLucene/search/Compare \
-    CustomTarget/clucene/source/src/core/CLucene/search/Scorer \
-    CustomTarget/clucene/source/src/core/CLucene/search/ScorerDocQueue \
-    CustomTarget/clucene/source/src/core/CLucene/search/PhraseScorer \
-    CustomTarget/clucene/source/src/core/CLucene/search/SloppyPhraseScorer \
-    CustomTarget/clucene/source/src/core/CLucene/search/DisjunctionSumScorer \
-    CustomTarget/clucene/source/src/core/CLucene/search/ConjunctionScorer \
-    CustomTarget/clucene/source/src/core/CLucene/search/PhraseQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/PrefixQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/ExactPhraseScorer \
-    CustomTarget/clucene/source/src/core/CLucene/search/TermScorer \
-    CustomTarget/clucene/source/src/core/CLucene/search/Similarity \
-    CustomTarget/clucene/source/src/core/CLucene/search/BooleanScorer \
-    CustomTarget/clucene/source/src/core/CLucene/search/BooleanScorer2 \
-    CustomTarget/clucene/source/src/core/CLucene/search/HitQueue \
-    CustomTarget/clucene/source/src/core/CLucene/search/FieldCacheImpl \
-    CustomTarget/clucene/source/src/core/CLucene/search/ChainedFilter \
-    CustomTarget/clucene/source/src/core/CLucene/search/RangeFilter \
-    CustomTarget/clucene/source/src/core/CLucene/search/CachingWrapperFilter \
-    CustomTarget/clucene/source/src/core/CLucene/search/QueryFilter \
-    CustomTarget/clucene/source/src/core/CLucene/search/TermQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/FuzzyQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/SearchHeader \
-    CustomTarget/clucene/source/src/core/CLucene/search/RangeQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/IndexSearcher \
-    CustomTarget/clucene/source/src/core/CLucene/search/Sort \
-    CustomTarget/clucene/source/src/core/CLucene/search/PhrasePositions \
-    CustomTarget/clucene/source/src/core/CLucene/search/FieldDocSortedHitQueue \
-    CustomTarget/clucene/source/src/core/CLucene/search/WildcardTermEnum \
-    CustomTarget/clucene/source/src/core/CLucene/search/MultiSearcher \
-    CustomTarget/clucene/source/src/core/CLucene/search/Hits \
-    CustomTarget/clucene/source/src/core/CLucene/search/MultiTermQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/FilteredTermEnum \
-    CustomTarget/clucene/source/src/core/CLucene/search/FieldSortedHitQueue \
-    CustomTarget/clucene/source/src/core/CLucene/search/WildcardQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/Explanation \
-    CustomTarget/clucene/source/src/core/CLucene/search/BooleanQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/FieldCache \
-    CustomTarget/clucene/source/src/core/CLucene/search/DateFilter \
-    CustomTarget/clucene/source/src/core/CLucene/search/MatchAllDocsQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/MultiPhraseQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/ConstantScoreQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/CachingSpanFilter \
-    CustomTarget/clucene/source/src/core/CLucene/search/SpanQueryFilter \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/NearSpansOrdered \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/NearSpansUnordered \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanFirstQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanNearQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanNotQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanOrQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanScorer \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanTermQuery \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/SpanWeight \
-    CustomTarget/clucene/source/src/core/CLucene/search/spans/TermSpans \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/analysis/PorterStemmer \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/Snowball \
-	,$(if $(filter TRUE,$(EXTERNAL_WARNINGS_NOT_ERRORS)),\
-		$(filter-out $(gb_CXXFLAGS_WERROR),$(CXXFLAGS)),\
-		$(CXXFLAGS)) \
-	 $(gb_COMPILEROPTFLAGS) \
+    UnpackedTarball/clucene/src/shared/CLucene/SharedHeader \
+    UnpackedTarball/clucene/src/shared/CLucene/config/gunichartables \
+    UnpackedTarball/clucene/src/shared/CLucene/config/repl_tcslwr \
+    UnpackedTarball/clucene/src/shared/CLucene/config/repl_tcstoll \
+    UnpackedTarball/clucene/src/shared/CLucene/config/repl_tcscasecmp \
+    UnpackedTarball/clucene/src/shared/CLucene/config/repl_tprintf \
+    UnpackedTarball/clucene/src/shared/CLucene/config/repl_lltot \
+    UnpackedTarball/clucene/src/shared/CLucene/config/repl_tcstod \
+    UnpackedTarball/clucene/src/shared/CLucene/config/utf8 \
+    UnpackedTarball/clucene/src/shared/CLucene/config/threads \
+    UnpackedTarball/clucene/src/shared/CLucene/debug/condition \
+    UnpackedTarball/clucene/src/shared/CLucene/util/StringBuffer \
+    UnpackedTarball/clucene/src/shared/CLucene/util/Misc \
+    UnpackedTarball/clucene/src/shared/CLucene/util/dirent \
+	UnpackedTarball/clucene/src/core/CLucene/StdHeader \
+	UnpackedTarball/clucene/src/core/CLucene/debug/error \
+	UnpackedTarball/clucene/src/core/CLucene/util/ThreadLocal \
+	UnpackedTarball/clucene/src/core/CLucene/util/Reader \
+	UnpackedTarball/clucene/src/core/CLucene/util/Equators \
+	UnpackedTarball/clucene/src/core/CLucene/util/FastCharStream \
+	UnpackedTarball/clucene/src/core/CLucene/util/MD5Digester \
+	UnpackedTarball/clucene/src/core/CLucene/util/StringIntern \
+	UnpackedTarball/clucene/src/core/CLucene/util/BitSet \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/FastCharStream \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/MultiFieldQueryParser \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/QueryParser \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/QueryParserTokenManager \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/QueryToken \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/Lexer \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/MultiFieldQueryParser \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/QueryParser \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/QueryParserBase \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/QueryToken \
+	UnpackedTarball/clucene/src/core/CLucene/queryParser/legacy/TokenList \
+	UnpackedTarball/clucene/src/core/CLucene/analysis/standard/StandardAnalyzer \
+	UnpackedTarball/clucene/src/core/CLucene/analysis/standard/StandardFilter \
+	UnpackedTarball/clucene/src/core/CLucene/analysis/standard/StandardTokenizer \
+	UnpackedTarball/clucene/src/core/CLucene/analysis/Analyzers \
+	UnpackedTarball/clucene/src/core/CLucene/analysis/AnalysisHeader \
+	UnpackedTarball/clucene/src/core/CLucene/store/MMapInput \
+	UnpackedTarball/clucene/src/core/CLucene/store/IndexInput \
+	UnpackedTarball/clucene/src/core/CLucene/store/Lock \
+	UnpackedTarball/clucene/src/core/CLucene/store/LockFactory \
+	UnpackedTarball/clucene/src/core/CLucene/store/IndexOutput \
+	UnpackedTarball/clucene/src/core/CLucene/store/Directory \
+    UnpackedTarball/clucene/src/core/CLucene/store/FSDirectory \
+    UnpackedTarball/clucene/src/core/CLucene/store/RAMDirectory \
+    UnpackedTarball/clucene/src/core/CLucene/document/Document \
+    UnpackedTarball/clucene/src/core/CLucene/document/DateField \
+    UnpackedTarball/clucene/src/core/CLucene/document/DateTools \
+    UnpackedTarball/clucene/src/core/CLucene/document/Field \
+    UnpackedTarball/clucene/src/core/CLucene/document/FieldSelector \
+    UnpackedTarball/clucene/src/core/CLucene/document/NumberTools \
+    UnpackedTarball/clucene/src/core/CLucene/index/IndexFileNames \
+    UnpackedTarball/clucene/src/core/CLucene/index/IndexFileNameFilter \
+    UnpackedTarball/clucene/src/core/CLucene/index/IndexDeletionPolicy \
+    UnpackedTarball/clucene/src/core/CLucene/index/SegmentMergeInfo \
+    UnpackedTarball/clucene/src/core/CLucene/index/SegmentInfos \
+    UnpackedTarball/clucene/src/core/CLucene/index/MergeScheduler \
+    UnpackedTarball/clucene/src/core/CLucene/index/SegmentTermDocs \
+    UnpackedTarball/clucene/src/core/CLucene/index/FieldsWriter \
+    UnpackedTarball/clucene/src/core/CLucene/index/TermInfosWriter \
+    UnpackedTarball/clucene/src/core/CLucene/index/Term \
+    UnpackedTarball/clucene/src/core/CLucene/index/Terms \
+    UnpackedTarball/clucene/src/core/CLucene/index/MergePolicy \
+    UnpackedTarball/clucene/src/core/CLucene/index/DocumentsWriter \
+    UnpackedTarball/clucene/src/core/CLucene/index/DocumentsWriterThreadState \
+    UnpackedTarball/clucene/src/core/CLucene/index/SegmentTermVector \
+    UnpackedTarball/clucene/src/core/CLucene/index/TermVectorReader \
+    UnpackedTarball/clucene/src/core/CLucene/index/FieldInfos \
+    UnpackedTarball/clucene/src/core/CLucene/index/CompoundFile \
+    UnpackedTarball/clucene/src/core/CLucene/index/SkipListReader \
+    UnpackedTarball/clucene/src/core/CLucene/index/SkipListWriter \
+    UnpackedTarball/clucene/src/core/CLucene/index/IndexFileDeleter \
+    UnpackedTarball/clucene/src/core/CLucene/index/SegmentReader \
+    UnpackedTarball/clucene/src/core/CLucene/index/DirectoryIndexReader \
+    UnpackedTarball/clucene/src/core/CLucene/index/TermVectorWriter \
+    UnpackedTarball/clucene/src/core/CLucene/index/IndexReader \
+    UnpackedTarball/clucene/src/core/CLucene/index/SegmentTermPositions \
+    UnpackedTarball/clucene/src/core/CLucene/index/SegmentMerger \
+    UnpackedTarball/clucene/src/core/CLucene/index/IndexWriter \
+    UnpackedTarball/clucene/src/core/CLucene/index/MultiReader \
+    UnpackedTarball/clucene/src/core/CLucene/index/MultiSegmentReader \
+    UnpackedTarball/clucene/src/core/CLucene/index/Payload \
+    UnpackedTarball/clucene/src/core/CLucene/index/SegmentTermEnum \
+    UnpackedTarball/clucene/src/core/CLucene/index/TermInfo \
+    UnpackedTarball/clucene/src/core/CLucene/index/IndexModifier \
+    UnpackedTarball/clucene/src/core/CLucene/index/SegmentMergeQueue \
+    UnpackedTarball/clucene/src/core/CLucene/index/FieldsReader \
+    UnpackedTarball/clucene/src/core/CLucene/index/TermInfosReader \
+    UnpackedTarball/clucene/src/core/CLucene/index/MultipleTermPositions \
+    UnpackedTarball/clucene/src/core/CLucene/search/Compare \
+    UnpackedTarball/clucene/src/core/CLucene/search/Scorer \
+    UnpackedTarball/clucene/src/core/CLucene/search/ScorerDocQueue \
+    UnpackedTarball/clucene/src/core/CLucene/search/PhraseScorer \
+    UnpackedTarball/clucene/src/core/CLucene/search/SloppyPhraseScorer \
+    UnpackedTarball/clucene/src/core/CLucene/search/DisjunctionSumScorer \
+    UnpackedTarball/clucene/src/core/CLucene/search/ConjunctionScorer \
+    UnpackedTarball/clucene/src/core/CLucene/search/PhraseQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/PrefixQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/ExactPhraseScorer \
+    UnpackedTarball/clucene/src/core/CLucene/search/TermScorer \
+    UnpackedTarball/clucene/src/core/CLucene/search/Similarity \
+    UnpackedTarball/clucene/src/core/CLucene/search/BooleanScorer \
+    UnpackedTarball/clucene/src/core/CLucene/search/BooleanScorer2 \
+    UnpackedTarball/clucene/src/core/CLucene/search/HitQueue \
+    UnpackedTarball/clucene/src/core/CLucene/search/FieldCacheImpl \
+    UnpackedTarball/clucene/src/core/CLucene/search/ChainedFilter \
+    UnpackedTarball/clucene/src/core/CLucene/search/RangeFilter \
+    UnpackedTarball/clucene/src/core/CLucene/search/CachingWrapperFilter \
+    UnpackedTarball/clucene/src/core/CLucene/search/QueryFilter \
+    UnpackedTarball/clucene/src/core/CLucene/search/TermQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/FuzzyQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/SearchHeader \
+    UnpackedTarball/clucene/src/core/CLucene/search/RangeQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/IndexSearcher \
+    UnpackedTarball/clucene/src/core/CLucene/search/Sort \
+    UnpackedTarball/clucene/src/core/CLucene/search/PhrasePositions \
+    UnpackedTarball/clucene/src/core/CLucene/search/FieldDocSortedHitQueue \
+    UnpackedTarball/clucene/src/core/CLucene/search/WildcardTermEnum \
+    UnpackedTarball/clucene/src/core/CLucene/search/MultiSearcher \
+    UnpackedTarball/clucene/src/core/CLucene/search/Hits \
+    UnpackedTarball/clucene/src/core/CLucene/search/MultiTermQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/FilteredTermEnum \
+    UnpackedTarball/clucene/src/core/CLucene/search/FieldSortedHitQueue \
+    UnpackedTarball/clucene/src/core/CLucene/search/WildcardQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/Explanation \
+    UnpackedTarball/clucene/src/core/CLucene/search/BooleanQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/FieldCache \
+    UnpackedTarball/clucene/src/core/CLucene/search/DateFilter \
+    UnpackedTarball/clucene/src/core/CLucene/search/MatchAllDocsQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/MultiPhraseQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/ConstantScoreQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/CachingSpanFilter \
+    UnpackedTarball/clucene/src/core/CLucene/search/SpanQueryFilter \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/NearSpansOrdered \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/NearSpansUnordered \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanFirstQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanNearQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanNotQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanOrQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanScorer \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanTermQuery \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/SpanWeight \
+    UnpackedTarball/clucene/src/core/CLucene/search/spans/TermSpans \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/analysis/cjk/CJKAnalyzer \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/analysis/LanguageBasedAnalyzer \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/analysis/PorterStemmer \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/Snowball \
 ))
 
 $(eval $(call gb_Library_add_generated_cobjects,clucene,\
-	CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/libstemmer/libstemmer \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish \
-    CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish \
-	CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/runtime/utilities \
-	CustomTarget/clucene/source/src/contribs-lib/CLucene/snowball/runtime/api \
-	,$(if $(filter TRUE,$(EXTERNAL_WARNINGS_NOT_ERRORS)),\
-		$(filter-out $(gb_CFLAGS_WERROR),$(CFLAGS)),\
-		$(CFLAGS)) \
-	 $(gb_COMPILEROPTFLAGS) \
+	UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/libstemmer/libstemmer \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_danish \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_dutch \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_english \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_finnish \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_french \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_german \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_italian \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_norwegian \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_porter \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_portuguese \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_spanish \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_ISO_8859_1_swedish \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_KOI8_R_russian \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_danish \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_dutch \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_english \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_finnish \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_french \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_german \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_italian \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_norwegian \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_porter \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_portuguese \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_russian \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_spanish \
+    UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/src_c/stem_UTF_8_swedish \
+	UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/runtime/utilities \
+	UnpackedTarball/clucene/src/contribs-lib/CLucene/snowball/runtime/api \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/clucene/Module_clucene.mk b/clucene/Module_clucene.mk
index 564e838ae249..284627b122a7 100644
--- a/clucene/Module_clucene.mk
+++ b/clucene/Module_clucene.mk
@@ -30,9 +30,9 @@ $(eval $(call gb_Module_Module,clucene))
 ifeq ($(SYSTEM_CLUCENE),NO)
 
 $(eval $(call gb_Module_add_targets,clucene,\
-    CustomTarget_source \
     Library_clucene \
     Package_source \
+	UnpackedTarball_clucene \
 ))
 
 endif
diff --git a/clucene/Package_source.mk b/clucene/Package_source.mk
index 486dd0d3597a..331c9e3b7153 100644
--- a/clucene/Package_source.mk
+++ b/clucene/Package_source.mk
@@ -26,9 +26,9 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_Package_Package,clucene_source,$(call gb_CustomTarget_get_workdir,clucene/source)))
+$(eval $(call gb_Package_Package,clucene_source,$(call gb_UnpackedTarball_get_dir,clucene)))
 
-$(call gb_Package_get_preparation_target,clucene_source) : $(call gb_CustomTarget_get_target,clucene/source)
+$(eval $(call gb_Package_use_unpacked,clucene_source,clucene))
 
 $(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene.h,src/core/CLucene.h))
 $(eval $(call gb_Package_add_file,clucene_source,inc/external/CLucene/clucene-config.h,src/shared/CLucene/clucene-config.h))
diff --git a/clucene/UnpackedTarball_clucene.mk b/clucene/UnpackedTarball_clucene.mk
new file mode 100644
index 000000000000..0d446fe98fd8
--- /dev/null
+++ b/clucene/UnpackedTarball_clucene.mk
@@ -0,0 +1,53 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,clucene))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,clucene,48d647fbd8ef8889e5a7f422c1bfda94-clucene-core-2.3.3.4.tar.gz))
+
+$(eval $(call gb_UnpackedTarball_fix_cxx_suffix,clucene,cpp))
+
+ifneq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_set_post_action,clucene,\
+	mkdir -p inc/internal/CLucene/util && \
+	mv src/shared/CLucene/util/dirent.h inc/internal/CLucene/util \
+))
+endif
+
+$(eval $(call gb_UnpackedTarball_set_patchlevel,clucene,0))
+
+# clucene-multimap-put.patch was proposed upstream, see
+# http://sourceforge.net/mailarchive/message.php?msg_id=29143260
+$(eval $(call gb_UnpackedTarball_add_patches,clucene,\
+	clucene/patches/clucene-debug.patch \
+	clucene/patches/clucene-gcc-atomics.patch \
+	clucene/patches/clucene-internal-zlib.patch \
+	clucene/patches/clucene-multimap-put.patch \
+	clucene/patches/clucene-narrowing-conversions.patch \
+	clucene/patches/clucene-nullptr.patch \
+	clucene/patches/clucene-warnings.patch \
+))
+
+ifeq ($(OS),WNT)
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-MSVC.h))
+ifeq ($(COM),MSC)
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MSVC.h))
+else
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-MINGW.h))
+endif
+else # ! $(OS),WNT
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/clucene-config.h,clucene/configs/clucene-config-generic.h))
+ifeq ($(OS),LINUX)
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-LINUX.h))
+else
+$(eval $(call gb_UnpackedTarball_add_file,clucene,src/shared/CLucene/_clucene-config.h,clucene/configs/_clucene-config-generic.h))
+endif
+endif # $(OS),WNT
+
+# vim: set noet sw=4 ts=4: