gbuild: remove gb_ExternalProject_use_unpacked

It must always be used exactly once, so replace it with constructor
parameter.

Change-Id: Ifbe87065c19a5185a5705dc461656179002ece5d

apache-commons/ExternalProject_apache_commons_codec.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec))
-
-$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_codec,apache_commons_codec))
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec,apache_commons_codec))
 
 $(eval $(call gb_ExternalProject_register_targets,apache_commons_codec,\
 	build \

apache-commons/ExternalProject_apache_commons_httpclient.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient))
-
-$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_httpclient,apache_commons_httpclient))
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient,apache_commons_httpclient))
 
 $(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-codec))
 $(eval $(call gb_ExternalProject_use_external,apache_commons_httpclient,commons-logging))

apache-commons/ExternalProject_apache_commons_lang.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang))
-
-$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_lang,apache_commons_lang))
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang,apache_commons_lang))
 
 $(eval $(call gb_ExternalProject_register_targets,apache_commons_lang,\
 	build \

apache-commons/ExternalProject_apache_commons_logging.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging))
-
-$(eval $(call gb_ExternalProject_use_unpacked,apache_commons_logging,apache_commons_logging))
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging,apache_commons_logging))
 
 # TODO: this should go into RepositoryExternal.mk
 ifneq ($(SYSTEM_TOMCAT),YES)

beanshell/ExternalProject_beanshell.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,beanshell))
-
-$(eval $(call gb_ExternalProject_use_unpacked,beanshell,beanshell))
+$(eval $(call gb_ExternalProject_ExternalProject,beanshell,beanshell))
 
 $(eval $(call gb_ExternalProject_register_targets,beanshell,\
 	build \

cairo/ExternalProject_cairo.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,cairo))
-
-$(eval $(call gb_ExternalProject_use_unpacked,cairo,cairo))
+$(eval $(call gb_ExternalProject_ExternalProject,cairo,cairo))
 
 $(eval $(call gb_ExternalProject_use_external_project,cairo,pixman))
 

cairo/ExternalProject_pixman.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,pixman))
-
-$(eval $(call gb_ExternalProject_use_unpacked,pixman,pixman))
+$(eval $(call gb_ExternalProject_ExternalProject,pixman,pixman))
 
 $(eval $(call gb_ExternalProject_register_targets,pixman,\
 	build \

cppunit/ExternalProject_cppunit.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,cppunit))
-
-$(eval $(call gb_ExternalProject_use_unpacked,cppunit,cppunit))
+$(eval $(call gb_ExternalProject_ExternalProject,cppunit,cppunit))
 
 $(eval $(call gb_ExternalProject_register_targets,cppunit,\
 	build \

curl/ExternalProject_curl.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,curl))
-
-$(eval $(call gb_ExternalProject_use_unpacked,curl,curl))
+$(eval $(call gb_ExternalProject_ExternalProject,curl,curl))
 
 $(eval $(call gb_ExternalProject_use_externals,curl,\
 	nss3 \

epm/ExternalProject_epm.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,epm))
-
-$(eval $(call gb_ExternalProject_use_unpacked,epm,epm))
+$(eval $(call gb_ExternalProject_ExternalProject,epm,epm))
 
 $(eval $(call gb_ExternalProject_register_targets,epm,\
 	build \

expat/ExternalProject_expat.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,expat))
-
-$(eval $(call gb_ExternalProject_use_unpacked,expat,expat))
+$(eval $(call gb_ExternalProject_ExternalProject,expat,expat))
 
 $(eval $(call gb_ExternalProject_register_targets,expat,\
 	configure \

fontconfig/ExternalProject_fontconfig.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,fontconfig))
-
-$(eval $(call gb_ExternalProject_use_unpacked,fontconfig,fontconfig))
+$(eval $(call gb_ExternalProject_ExternalProject,fontconfig,fontconfig))
 
 $(eval $(call gb_ExternalProject_use_packages,fontconfig,\
 	freetype \

freetype/ExternalProject_freetype.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,freetype))
-
-$(eval $(call gb_ExternalProject_use_unpacked,freetype,freetype))
+$(eval $(call gb_ExternalProject_ExternalProject,freetype,freetype))
 
 $(eval $(call gb_ExternalProject_register_targets,freetype,\
 	build \

harfbuzz/ExternalProject_harfbuzz.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,harfbuzz))
-
-$(eval $(call gb_ExternalProject_use_unpacked,harfbuzz,harfbuzz))
+$(eval $(call gb_ExternalProject_ExternalProject,harfbuzz,harfbuzz))
 
 $(eval $(call gb_ExternalProject_use_autoconf,harfbuzz,build))
 

hsqldb/ExternalProject_hsqldb.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,hsqldb))
-
-$(eval $(call gb_ExternalProject_use_unpacked,hsqldb,hsqldb))
+$(eval $(call gb_ExternalProject_ExternalProject,hsqldb,hsqldb))
 
 $(eval $(call gb_ExternalProject_register_targets,hsqldb,\
 	build \

hunspell/ExternalProject_hunspell.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,hunspell))
-
-$(eval $(call gb_ExternalProject_use_unpacked,hunspell,hunspell))
+$(eval $(call gb_ExternalProject_ExternalProject,hunspell,hunspell))
 
 $(eval $(call gb_ExternalProject_register_targets,hunspell,\
 	build \

hyphen/ExternalProject_hyphen.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,hyphen))
-
-$(eval $(call gb_ExternalProject_use_unpacked,hyphen,hyphen))
+$(eval $(call gb_ExternalProject_ExternalProject,hyphen,hyphen))
 
 $(eval $(call gb_ExternalProject_use_package,hyphen,hunspell))
 

icu/ExternalProject_icu.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,icu))
-
-$(eval $(call gb_ExternalProject_use_unpacked,icu,icu))
+$(eval $(call gb_ExternalProject_ExternalProject,icu,icu))
 
 $(eval $(call gb_ExternalProject_register_targets,icu,\
 	build \

jfreereport/ExternalProject_jfreereport_flow_engine.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flow_engine,jfreereport_flow_engine))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine,jfreereport_flow_engine))
 
 $(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\
 	jfreereport_liblayout \

jfreereport/ExternalProject_jfreereport_flute.mk

@@ -10,9 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_flute,jfreereport_flute))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute,jfreereport_flute))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\
 	build \

jfreereport/ExternalProject_jfreereport_libbase.mk

@@ -10,9 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libbase,jfreereport_libbase))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase,jfreereport_libbase))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\
 	build \

jfreereport/ExternalProject_jfreereport_libfonts.mk

@@ -10,9 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libfonts,jfreereport_libfonts))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts,jfreereport_libfonts))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\
 	build \

jfreereport/ExternalProject_jfreereport_libformula.mk

@@ -10,9 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libformula,jfreereport_libformula))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula,jfreereport_libformula))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\
 	build \

jfreereport/ExternalProject_jfreereport_liblayout.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_liblayout,jfreereport_liblayout))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout,jfreereport_liblayout))
 
 ifneq ($(SYSTEM_APACHE_COMMONS),YES)
 $(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\

jfreereport/ExternalProject_jfreereport_libloader.mk

@@ -10,9 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libloader,jfreereport_libloader))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader,jfreereport_libloader))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\
 	build \

jfreereport/ExternalProject_jfreereport_librepository.mk

@@ -10,9 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_librepository,jfreereport_librepository))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository,jfreereport_librepository))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\
 	build \

jfreereport/ExternalProject_jfreereport_libserializer.mk

@@ -10,9 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libserializer,jfreereport_libserializer))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer,jfreereport_libserializer))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\
 	build \

jfreereport/ExternalProject_jfreereport_libxml.mk

@@ -10,9 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_libxml,jfreereport_libxml))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml,jfreereport_libxml))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\
 	build \

jfreereport/ExternalProject_jfreereport_sac.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac))
-
-$(eval $(call gb_ExternalProject_use_unpacked,jfreereport_sac,jfreereport_sac))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac,jfreereport_sac))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\
 	build \

languagetool/ExternalProject_languagetool.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,languagetool))
-
-$(eval $(call gb_ExternalProject_use_unpacked,languagetool,languagetool))
+$(eval $(call gb_ExternalProject_ExternalProject,languagetool,languagetool))
 
 $(eval $(call gb_ExternalProject_register_targets,languagetool,\
 	build \

lcms2/ExternalProject_lcms2.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,lcms2))
-
-$(eval $(call gb_ExternalProject_use_unpacked,lcms2,lcms2))
+$(eval $(call gb_ExternalProject_ExternalProject,lcms2,lcms2))
 
 $(eval $(call gb_ExternalProject_register_targets,lcms2,\
 	build \

libcdr/ExternalProject_libcdr.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libcdr))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libcdr,cdr))
+$(eval $(call gb_ExternalProject_ExternalProject,libcdr,cdr))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libcdr,build))
 

libexttextcat/ExternalProject_exttextcat.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,exttextcat))
-
-$(eval $(call gb_ExternalProject_use_unpacked,exttextcat,exttextcat))
+$(eval $(call gb_ExternalProject_ExternalProject,exttextcat,exttextcat))
 
 $(eval $(call gb_ExternalProject_register_targets,exttextcat,\
 	build \

liblangtag/ExternalProject_langtag.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,langtag))
-
-$(eval $(call gb_ExternalProject_use_unpacked,langtag,langtag))
+$(eval $(call gb_ExternalProject_ExternalProject,langtag,langtag))
 
 $(eval $(call gb_ExternalProject_use_external,langtag,libxml2))
 

libmspub/ExternalProject_libmspub.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libmspub))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libmspub,mspub))
+$(eval $(call gb_ExternalProject_ExternalProject,libmspub,mspub))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libmspub,build))
 

libmwaw/ExternalProject_libmwaw.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libmwaw))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libmwaw,mwaw))
+$(eval $(call gb_ExternalProject_ExternalProject,libmwaw,mwaw))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libmwaw,build))
 

libodfgen/ExternalProject_libodfgen.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libodfgen))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libodfgen,odfgen))
+$(eval $(call gb_ExternalProject_ExternalProject,libodfgen,odfgen))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libodfgen,build))
 

liborcus/ExternalProject_liborcus.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,liborcus))
-
-$(eval $(call gb_ExternalProject_use_unpacked,liborcus,orcus))
+$(eval $(call gb_ExternalProject_ExternalProject,liborcus,orcus))
 
 $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
 

libvisio/ExternalProject_libvisio.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libvisio))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libvisio,visio))
+$(eval $(call gb_ExternalProject_ExternalProject,libvisio,visio))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libvisio,build))
 

libwpd/ExternalProject_libwpd.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libwpd))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libwpd,wpd))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpd,wpd))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libwpd,build))
 

libwpg/ExternalProject_libwpg.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libwpg))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libwpg,wpg))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpg,wpg))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libwpg,build))
 

libwps/ExternalProject_libwps.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libwps))
-
-$(eval $(call gb_ExternalProject_use_unpacked,libwps,wps))
+$(eval $(call gb_ExternalProject_ExternalProject,libwps,wps))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libwps,build))
 

libxml2/ExternalProject_xml2.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,xml2))
-
-$(eval $(call gb_ExternalProject_use_unpacked,xml2,xml2))
+$(eval $(call gb_ExternalProject_ExternalProject,xml2,xml2))
 
 $(eval $(call gb_ExternalProject_register_targets,xml2,\
 	build \

libxmlsec/ExternalProject_xmlsec.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,xmlsec))
-
-$(eval $(call gb_ExternalProject_use_unpacked,xmlsec,xmlsec))
+$(eval $(call gb_ExternalProject_ExternalProject,xmlsec,xmlsec))
 
 $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
 

libxslt/ExternalProject_xslt.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,xslt))
-
-$(eval $(call gb_ExternalProject_use_unpacked,xslt,xslt))
+$(eval $(call gb_ExternalProject_ExternalProject,xslt,xslt))
 
 $(eval $(call gb_ExternalProject_use_external,xslt,libxml2))
 

lpsolve/ExternalProject_lpsolve.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,lpsolve))
-
-$(eval $(call gb_ExternalProject_use_unpacked,lpsolve,lpsolve))
+$(eval $(call gb_ExternalProject_ExternalProject,lpsolve,lpsolve))
 
 $(eval $(call gb_ExternalProject_register_targets,lpsolve,\
 	build \

mythes/ExternalProject_mythes.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,mythes))
-
-$(eval $(call gb_ExternalProject_use_unpacked,mythes,mythes))
+$(eval $(call gb_ExternalProject_ExternalProject,mythes,mythes))
 
 $(eval $(call gb_ExternalProject_use_package,mythes,hunspell))
 

nss/ExternalProject_nss.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,nss))
-
-$(eval $(call gb_ExternalProject_use_unpacked,nss,nss))
+$(eval $(call gb_ExternalProject_ExternalProject,nss,nss))
 
 $(eval $(call gb_ExternalProject_use_externals,nss,\
 	unistd_headers \

openldap/ExternalProject_openldap.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,openldap))
-
-$(eval $(call gb_ExternalProject_use_unpacked,openldap,openldap))
+$(eval $(call gb_ExternalProject_ExternalProject,openldap,openldap))
 
 $(eval $(call gb_ExternalProject_use_package,openldap,nss))
 

openssl/ExternalProject_openssl.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,openssl))
-
-$(eval $(call gb_ExternalProject_use_unpacked,openssl,openssl))
+$(eval $(call gb_ExternalProject_ExternalProject,openssl,openssl))
 
 $(eval $(call gb_ExternalProject_register_targets,openssl,\
 	build \

postgresql/ExternalProject_postgresql.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,postgresql))
-
-$(eval $(call gb_ExternalProject_use_unpacked,postgresql,postgresql))
+$(eval $(call gb_ExternalProject_ExternalProject,postgresql,postgresql))
 
 $(eval $(call gb_ExternalProject_use_package,postgresql,openldap))
 

python3/ExternalProject_python3.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,python3))
-
-$(eval $(call gb_ExternalProject_use_unpacked,python3,python3))
+$(eval $(call gb_ExternalProject_ExternalProject,python3,python3))
 
 $(eval $(call gb_ExternalProject_use_externals,python3,\
 	expat \

redland/ExternalProject_raptor.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,raptor))
-
-$(eval $(call gb_ExternalProject_use_unpacked,raptor,raptor))
+$(eval $(call gb_ExternalProject_ExternalProject,raptor,raptor))
 
 $(eval $(call gb_ExternalProject_use_external,raptor,libxml2))
 

redland/ExternalProject_rasqal.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,rasqal))
-
-$(eval $(call gb_ExternalProject_use_unpacked,rasqal,rasqal))
+$(eval $(call gb_ExternalProject_ExternalProject,rasqal,rasqal))
 
 $(eval $(call gb_ExternalProject_use_external,rasqal,libxml2))
 

redland/ExternalProject_redland.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,redland))
-
-$(eval $(call gb_ExternalProject_use_unpacked,redland,redland))
+$(eval $(call gb_ExternalProject_ExternalProject,redland,redland))
 
 $(eval $(call gb_ExternalProject_use_packages,redland, \
     raptor \

rhino/ExternalProject_rhino.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,rhino))
-
-$(eval $(call gb_ExternalProject_use_unpacked,rhino,rhino))
+$(eval $(call gb_ExternalProject_ExternalProject,rhino,rhino))
 
 $(eval $(call gb_ExternalProject_register_targets,rhino,\
 	build \

solenv/gbuild/ExternalProject.mk

@@ -55,13 +55,16 @@ $(call gb_ExternalProject_get_clean_target,%) :
 			$(call gb_ExternalProject_get_statedir,$*) \
 	)
 
-# Define a new external project
+# Define a new external project, using an unpacked tarball
 #
-# gb_ExternalProject_ExternalProject project
+# gb_ExternalProject_ExternalProject project unpacked
 define gb_ExternalProject_ExternalProject
-$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR :=
+$(if $(2),,$(call gb_Output_error,gb_ExternalProject_ExternalProject: no unpacked parameter))
+$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := $(call gb_UnpackedTarball_get_dir,$(2))
 
 $(call gb_ExternalProject_get_preparation_target,$(1)) :| $(dir $(call gb_ExternalProject_get_target,$(1))).dir
+$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(2))
+$(call gb_ExternalProject_get_clean_target,$(1)) : $(call gb_UnpackedTarball_get_clean_target,$(2))
 $(call gb_ExternalProject_get_target,$(1)) : $(call gb_ExternalProject_get_preparation_target,$(1))
 $(call gb_ExternalProject_get_target,$(1)) :| $(dir $(call gb_ExternalProject_get_target,$(1))).dir
 
@@ -70,15 +73,9 @@ $(call gb_Helper_make_userfriendly_targets,$(1),ExternalProject)
 
 endef
 
-# Use unpacked tarball as source for build
-#
-# gb_ExternalProject_use_unpacked project unpacked
+# replaced by second parameter to ctor
 define gb_ExternalProject_use_unpacked
-$(call gb_ExternalProject_get_target,$(1)) : EXTERNAL_WORKDIR := $(call gb_UnpackedTarball_get_dir,$(2))
-
-$(call gb_ExternalProject_get_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(2))
-$(call gb_ExternalProject_get_clean_target,$(1)) : $(call gb_UnpackedTarball_get_clean_target,$(2))
-
+$(call gb_Output_error,gb_ExternalProject_use_unpacked was removed)
 endef
 
 # Register a target in state directory

tomcat/ExternalProject_tomcat.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,tomcat))
-
-$(eval $(call gb_ExternalProject_use_unpacked,tomcat,tomcat))
+$(eval $(call gb_ExternalProject_ExternalProject,tomcat,tomcat))
 
 $(eval $(call gb_ExternalProject_register_targets,tomcat,\
 	build \

xpdf/ExternalProject_xpdf.mk

@@ -7,9 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,xpdf))
-
-$(eval $(call gb_ExternalProject_use_unpacked,xpdf,xpdf))
+$(eval $(call gb_ExternalProject_ExternalProject,xpdf,xpdf))
 
 $(eval $(call gb_ExternalProject_register_targets,xpdf,\
 	build \