gbuild: ExternalProject: remove second parameter again...

... now that everything is consistent.

Change-Id: I96c15159648815554280202eb1b6d274ead4e7b8

59 files changed, 63 insertions, 64 deletions

diff --git a/apache-commons/ExternalProject_apache_commons_codec.mk b/apache-commons/ExternalProject_apache_commons_codec.mk
index 753041cc9284..2135cb4c70d2 100644
--- a/apache-commons/ExternalProject_apache_commons_codec.mk
+++ b/apache-commons/ExternalProject_apache_commons_codec.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec,apache_commons_codec))
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_codec))
 
 $(eval $(call gb_ExternalProject_register_targets,apache_commons_codec,\
 	build \
diff --git a/apache-commons/ExternalProject_apache_commons_httpclient.mk b/apache-commons/ExternalProject_apache_commons_httpclient.mk
index 314cdf293ce1..4c02459c207d 100644
--- a/apache-commons/ExternalProject_apache_commons_httpclient.mk
+++ b/apache-commons/ExternalProject_apache_commons_httpclient.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_httpclient,apache_commons_httpclient))
+$(eval $(call gb_ExternalProject_ExternalProject,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))
diff --git a/apache-commons/ExternalProject_apache_commons_lang.mk b/apache-commons/ExternalProject_apache_commons_lang.mk
index 5b5b10326808..aadd73312bfb 100644
--- a/apache-commons/ExternalProject_apache_commons_lang.mk
+++ b/apache-commons/ExternalProject_apache_commons_lang.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang,apache_commons_lang))
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_lang))
 
 $(eval $(call gb_ExternalProject_register_targets,apache_commons_lang,\
 	build \
diff --git a/apache-commons/ExternalProject_apache_commons_logging.mk b/apache-commons/ExternalProject_apache_commons_logging.mk
index 11bf6bc7793f..98a77eb7ab45 100644
--- a/apache-commons/ExternalProject_apache_commons_logging.mk
+++ b/apache-commons/ExternalProject_apache_commons_logging.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging,apache_commons_logging))
+$(eval $(call gb_ExternalProject_ExternalProject,apache_commons_logging))
 
 # TODO: this should go into RepositoryExternal.mk
 ifneq ($(SYSTEM_TOMCAT),YES)
diff --git a/beanshell/ExternalProject_beanshell.mk b/beanshell/ExternalProject_beanshell.mk
index 2985ddded594..889b79b153d2 100644
--- a/beanshell/ExternalProject_beanshell.mk
+++ b/beanshell/ExternalProject_beanshell.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,beanshell,beanshell))
+$(eval $(call gb_ExternalProject_ExternalProject,beanshell))
 
 $(eval $(call gb_ExternalProject_register_targets,beanshell,\
 	build \
diff --git a/cairo/ExternalProject_cairo.mk b/cairo/ExternalProject_cairo.mk
index 875a4bf2d99f..e27bf37d3518 100644
--- a/cairo/ExternalProject_cairo.mk
+++ b/cairo/ExternalProject_cairo.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,cairo,cairo))
+$(eval $(call gb_ExternalProject_ExternalProject,cairo))
 
 $(eval $(call gb_ExternalProject_use_external_project,cairo,pixman))
 
diff --git a/cairo/ExternalProject_pixman.mk b/cairo/ExternalProject_pixman.mk
index 2bae7464ea38..80e62fa89190 100644
--- a/cairo/ExternalProject_pixman.mk
+++ b/cairo/ExternalProject_pixman.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,pixman,pixman))
+$(eval $(call gb_ExternalProject_ExternalProject,pixman))
 
 $(eval $(call gb_ExternalProject_register_targets,pixman,\
 	build \
diff --git a/cppunit/ExternalProject_cppunit.mk b/cppunit/ExternalProject_cppunit.mk
index 8a94249da341..e4a3cb1338a9 100644
--- a/cppunit/ExternalProject_cppunit.mk
+++ b/cppunit/ExternalProject_cppunit.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,cppunit,cppunit))
+$(eval $(call gb_ExternalProject_ExternalProject,cppunit))
 
 $(eval $(call gb_ExternalProject_register_targets,cppunit,\
 	build \
diff --git a/curl/ExternalProject_curl.mk b/curl/ExternalProject_curl.mk
index c5aa3fa2f11b..23dce1170044 100644
--- a/curl/ExternalProject_curl.mk
+++ b/curl/ExternalProject_curl.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,curl,curl))
+$(eval $(call gb_ExternalProject_ExternalProject,curl))
 
 $(eval $(call gb_ExternalProject_use_externals,curl,\
 	nss3 \
diff --git a/epm/ExternalProject_epm.mk b/epm/ExternalProject_epm.mk
index 826a5998f275..ca0c298509c6 100644
--- a/epm/ExternalProject_epm.mk
+++ b/epm/ExternalProject_epm.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,epm,epm))
+$(eval $(call gb_ExternalProject_ExternalProject,epm))
 
 $(eval $(call gb_ExternalProject_register_targets,epm,\
 	build \
diff --git a/expat/ExternalProject_expat.mk b/expat/ExternalProject_expat.mk
index 47ea6ac52775..2fdaf5e1a4cb 100644
--- a/expat/ExternalProject_expat.mk
+++ b/expat/ExternalProject_expat.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,expat,expat))
+$(eval $(call gb_ExternalProject_ExternalProject,expat))
 
 $(eval $(call gb_ExternalProject_register_targets,expat,\
 	configure \
diff --git a/fontconfig/ExternalProject_fontconfig.mk b/fontconfig/ExternalProject_fontconfig.mk
index 783fb4979a53..f4584f02e1b1 100644
--- a/fontconfig/ExternalProject_fontconfig.mk
+++ b/fontconfig/ExternalProject_fontconfig.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,fontconfig,fontconfig))
+$(eval $(call gb_ExternalProject_ExternalProject,fontconfig))
 
 $(eval $(call gb_ExternalProject_use_packages,fontconfig,\
 	freetype \
diff --git a/freetype/ExternalProject_freetype.mk b/freetype/ExternalProject_freetype.mk
index ad8dc2e438c2..8e2108ca279b 100644
--- a/freetype/ExternalProject_freetype.mk
+++ b/freetype/ExternalProject_freetype.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,freetype,freetype))
+$(eval $(call gb_ExternalProject_ExternalProject,freetype))
 
 $(eval $(call gb_ExternalProject_register_targets,freetype,\
 	build \
diff --git a/harfbuzz/ExternalProject_harfbuzz.mk b/harfbuzz/ExternalProject_harfbuzz.mk
index 9185c44cae06..d0a405fbc35c 100644
--- a/harfbuzz/ExternalProject_harfbuzz.mk
+++ b/harfbuzz/ExternalProject_harfbuzz.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,harfbuzz,harfbuzz))
+$(eval $(call gb_ExternalProject_ExternalProject,harfbuzz))
 
 $(eval $(call gb_ExternalProject_use_autoconf,harfbuzz,build))
 
diff --git a/hsqldb/ExternalProject_hsqldb.mk b/hsqldb/ExternalProject_hsqldb.mk
index 1fff88103a53..c32a2bfc6129 100644
--- a/hsqldb/ExternalProject_hsqldb.mk
+++ b/hsqldb/ExternalProject_hsqldb.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,hsqldb,hsqldb))
+$(eval $(call gb_ExternalProject_ExternalProject,hsqldb))
 
 $(eval $(call gb_ExternalProject_register_targets,hsqldb,\
 	build \
diff --git a/hunspell/ExternalProject_hunspell.mk b/hunspell/ExternalProject_hunspell.mk
index d1b297fb322b..6bbb6183cf01 100644
--- a/hunspell/ExternalProject_hunspell.mk
+++ b/hunspell/ExternalProject_hunspell.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,hunspell,hunspell))
+$(eval $(call gb_ExternalProject_ExternalProject,hunspell))
 
 $(eval $(call gb_ExternalProject_register_targets,hunspell,\
 	build \
diff --git a/hyphen/ExternalProject_hyphen.mk b/hyphen/ExternalProject_hyphen.mk
index b3a5272db0f8..1afb444eb82e 100644
--- a/hyphen/ExternalProject_hyphen.mk
+++ b/hyphen/ExternalProject_hyphen.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,hyphen,hyphen))
+$(eval $(call gb_ExternalProject_ExternalProject,hyphen))
 
 $(eval $(call gb_ExternalProject_use_package,hyphen,hunspell))
 
diff --git a/icu/ExternalProject_icu.mk b/icu/ExternalProject_icu.mk
index 3a20cd73aa19..5ec09337f650 100644
--- a/icu/ExternalProject_icu.mk
+++ b/icu/ExternalProject_icu.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,icu,icu))
+$(eval $(call gb_ExternalProject_ExternalProject,icu))
 
 $(eval $(call gb_ExternalProject_register_targets,icu,\
 	build \
diff --git a/jfreereport/ExternalProject_jfreereport_flow_engine.mk b/jfreereport/ExternalProject_jfreereport_flow_engine.mk
index 641497b65a99..08b86134cedc 100644
--- a/jfreereport/ExternalProject_jfreereport_flow_engine.mk
+++ b/jfreereport/ExternalProject_jfreereport_flow_engine.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine,jfreereport_flow_engine))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flow_engine))
 
 $(eval $(call gb_ExternalProject_use_packages,jfreereport_flow_engine,\
 	jfreereport_liblayout \
diff --git a/jfreereport/ExternalProject_jfreereport_flute.mk b/jfreereport/ExternalProject_jfreereport_flute.mk
index 6332ec24c13a..90e59d650ea7 100644
--- a/jfreereport/ExternalProject_jfreereport_flute.mk
+++ b/jfreereport/ExternalProject_jfreereport_flute.mk
@@ -10,7 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute,jfreereport_flute))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_flute))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_flute,\
 	build \
diff --git a/jfreereport/ExternalProject_jfreereport_libbase.mk b/jfreereport/ExternalProject_jfreereport_libbase.mk
index f03ffc761133..0f1c2acabbef 100644
--- a/jfreereport/ExternalProject_jfreereport_libbase.mk
+++ b/jfreereport/ExternalProject_jfreereport_libbase.mk
@@ -10,7 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase,jfreereport_libbase))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libbase))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libbase,\
 	build \
diff --git a/jfreereport/ExternalProject_jfreereport_libfonts.mk b/jfreereport/ExternalProject_jfreereport_libfonts.mk
index 3c7474fbbe46..0982ed766c66 100644
--- a/jfreereport/ExternalProject_jfreereport_libfonts.mk
+++ b/jfreereport/ExternalProject_jfreereport_libfonts.mk
@@ -10,7 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts,jfreereport_libfonts))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libfonts))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libfonts,\
 	build \
diff --git a/jfreereport/ExternalProject_jfreereport_libformula.mk b/jfreereport/ExternalProject_jfreereport_libformula.mk
index 5938cf45cdde..9523a0f04177 100644
--- a/jfreereport/ExternalProject_jfreereport_libformula.mk
+++ b/jfreereport/ExternalProject_jfreereport_libformula.mk
@@ -10,7 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula,jfreereport_libformula))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libformula))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libformula,\
 	build \
diff --git a/jfreereport/ExternalProject_jfreereport_liblayout.mk b/jfreereport/ExternalProject_jfreereport_liblayout.mk
index 3c612e58b451..cddbef1d32ed 100644
--- a/jfreereport/ExternalProject_jfreereport_liblayout.mk
+++ b/jfreereport/ExternalProject_jfreereport_liblayout.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout,jfreereport_liblayout))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_liblayout))
 
 ifneq ($(SYSTEM_APACHE_COMMONS),YES)
 $(eval $(call gb_ExternalProject_use_packages,jfreereport_liblayout,\
diff --git a/jfreereport/ExternalProject_jfreereport_libloader.mk b/jfreereport/ExternalProject_jfreereport_libloader.mk
index ffcf2d90a627..6b3c01b0a24e 100644
--- a/jfreereport/ExternalProject_jfreereport_libloader.mk
+++ b/jfreereport/ExternalProject_jfreereport_libloader.mk
@@ -10,7 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader,jfreereport_libloader))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libloader))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libloader,\
 	build \
diff --git a/jfreereport/ExternalProject_jfreereport_librepository.mk b/jfreereport/ExternalProject_jfreereport_librepository.mk
index e1c8b1923201..4f1a50e56ad2 100644
--- a/jfreereport/ExternalProject_jfreereport_librepository.mk
+++ b/jfreereport/ExternalProject_jfreereport_librepository.mk
@@ -10,7 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository,jfreereport_librepository))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_librepository))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_librepository,\
 	build \
diff --git a/jfreereport/ExternalProject_jfreereport_libserializer.mk b/jfreereport/ExternalProject_jfreereport_libserializer.mk
index bc865bf2884d..6bc29f7359ac 100644
--- a/jfreereport/ExternalProject_jfreereport_libserializer.mk
+++ b/jfreereport/ExternalProject_jfreereport_libserializer.mk
@@ -10,7 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer,jfreereport_libserializer))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libserializer))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libserializer,\
 	build \
diff --git a/jfreereport/ExternalProject_jfreereport_libxml.mk b/jfreereport/ExternalProject_jfreereport_libxml.mk
index 068f08d8810f..c7340d51a233 100644
--- a/jfreereport/ExternalProject_jfreereport_libxml.mk
+++ b/jfreereport/ExternalProject_jfreereport_libxml.mk
@@ -10,7 +10,7 @@
 # for VERSION
 include $(SRCDIR)/jfreereport/version.mk
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml,jfreereport_libxml))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_libxml))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_libxml,\
 	build \
diff --git a/jfreereport/ExternalProject_jfreereport_sac.mk b/jfreereport/ExternalProject_jfreereport_sac.mk
index 2f0b8d102000..72783a175317 100644
--- a/jfreereport/ExternalProject_jfreereport_sac.mk
+++ b/jfreereport/ExternalProject_jfreereport_sac.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac,jfreereport_sac))
+$(eval $(call gb_ExternalProject_ExternalProject,jfreereport_sac))
 
 $(eval $(call gb_ExternalProject_register_targets,jfreereport_sac,\
 	build \
diff --git a/languagetool/ExternalProject_languagetool.mk b/languagetool/ExternalProject_languagetool.mk
index 07ca3fa13219..fdee1adb1453 100644
--- a/languagetool/ExternalProject_languagetool.mk
+++ b/languagetool/ExternalProject_languagetool.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,languagetool,languagetool))
+$(eval $(call gb_ExternalProject_ExternalProject,languagetool))
 
 $(eval $(call gb_ExternalProject_register_targets,languagetool,\
 	build \
diff --git a/lcms2/ExternalProject_lcms2.mk b/lcms2/ExternalProject_lcms2.mk
index 825a2b361703..1689482441be 100644
--- a/lcms2/ExternalProject_lcms2.mk
+++ b/lcms2/ExternalProject_lcms2.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,lcms2,lcms2))
+$(eval $(call gb_ExternalProject_ExternalProject,lcms2))
 
 $(eval $(call gb_ExternalProject_register_targets,lcms2,\
 	build \
diff --git a/libcdr/ExternalProject_libcdr.mk b/libcdr/ExternalProject_libcdr.mk
index f71408e4b48c..f877cba7fd37 100644
--- a/libcdr/ExternalProject_libcdr.mk
+++ b/libcdr/ExternalProject_libcdr.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libcdr,libcdr))
+$(eval $(call gb_ExternalProject_ExternalProject,libcdr))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libcdr,build))
 
diff --git a/libexttextcat/ExternalProject_exttextcat.mk b/libexttextcat/ExternalProject_exttextcat.mk
index 833cf1a9af29..67f70fcc6919 100644
--- a/libexttextcat/ExternalProject_exttextcat.mk
+++ b/libexttextcat/ExternalProject_exttextcat.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,exttextcat,exttextcat))
+$(eval $(call gb_ExternalProject_ExternalProject,exttextcat))
 
 $(eval $(call gb_ExternalProject_register_targets,exttextcat,\
 	build \
diff --git a/liblangtag/ExternalProject_langtag.mk b/liblangtag/ExternalProject_langtag.mk
index 12e1a8dac0a1..9b83a1b70e4c 100644
--- a/liblangtag/ExternalProject_langtag.mk
+++ b/liblangtag/ExternalProject_langtag.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,langtag,langtag))
+$(eval $(call gb_ExternalProject_ExternalProject,langtag))
 
 $(eval $(call gb_ExternalProject_use_external,langtag,libxml2))
 
diff --git a/libmspub/ExternalProject_libmspub.mk b/libmspub/ExternalProject_libmspub.mk
index 3e28ba27d1f7..3a0ab0a53713 100644
--- a/libmspub/ExternalProject_libmspub.mk
+++ b/libmspub/ExternalProject_libmspub.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libmspub,libmspub))
+$(eval $(call gb_ExternalProject_ExternalProject,libmspub))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libmspub,build))
 
diff --git a/libmwaw/ExternalProject_libmwaw.mk b/libmwaw/ExternalProject_libmwaw.mk
index 52e23ceb5252..82b4a3dbe56e 100644
--- a/libmwaw/ExternalProject_libmwaw.mk
+++ b/libmwaw/ExternalProject_libmwaw.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libmwaw,libmwaw))
+$(eval $(call gb_ExternalProject_ExternalProject,libmwaw))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libmwaw,build))
 
diff --git a/libodfgen/ExternalProject_libodfgen.mk b/libodfgen/ExternalProject_libodfgen.mk
index 9d34e06d40d9..3b0ce214b54d 100644
--- a/libodfgen/ExternalProject_libodfgen.mk
+++ b/libodfgen/ExternalProject_libodfgen.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libodfgen,libodfgen))
+$(eval $(call gb_ExternalProject_ExternalProject,libodfgen))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libodfgen,build))
 
diff --git a/liborcus/ExternalProject_liborcus.mk b/liborcus/ExternalProject_liborcus.mk
index df8b49447e9e..5d1123707213 100644
--- a/liborcus/ExternalProject_liborcus.mk
+++ b/liborcus/ExternalProject_liborcus.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,liborcus,liborcus))
+$(eval $(call gb_ExternalProject_ExternalProject,liborcus))
 
 $(eval $(call gb_ExternalProject_use_autoconf,liborcus,build))
 
diff --git a/libvisio/ExternalProject_libvisio.mk b/libvisio/ExternalProject_libvisio.mk
index 9ef2a84f3923..3a5ce50cfa5d 100644
--- a/libvisio/ExternalProject_libvisio.mk
+++ b/libvisio/ExternalProject_libvisio.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libvisio,libvisio))
+$(eval $(call gb_ExternalProject_ExternalProject,libvisio))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libvisio,build))
 
diff --git a/libwpd/ExternalProject_libwpd.mk b/libwpd/ExternalProject_libwpd.mk
index 9759fc4b1ed7..8fb4a8c127f2 100644
--- a/libwpd/ExternalProject_libwpd.mk
+++ b/libwpd/ExternalProject_libwpd.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libwpd,libwpd))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpd))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libwpd,build))
 
diff --git a/libwpg/ExternalProject_libwpg.mk b/libwpg/ExternalProject_libwpg.mk
index 0a0b6bcb05de..226474cd4281 100644
--- a/libwpg/ExternalProject_libwpg.mk
+++ b/libwpg/ExternalProject_libwpg.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libwpg,libwpg))
+$(eval $(call gb_ExternalProject_ExternalProject,libwpg))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libwpg,build))
 
diff --git a/libwps/ExternalProject_libwps.mk b/libwps/ExternalProject_libwps.mk
index 0cccf2cc536b..ba1bdb029de3 100644
--- a/libwps/ExternalProject_libwps.mk
+++ b/libwps/ExternalProject_libwps.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,libwps,libwps))
+$(eval $(call gb_ExternalProject_ExternalProject,libwps))
 
 $(eval $(call gb_ExternalProject_use_autoconf,libwps,build))
 
diff --git a/libxml2/ExternalProject_xml2.mk b/libxml2/ExternalProject_xml2.mk
index cf7427ef9284..d518a7f9e327 100644
--- a/libxml2/ExternalProject_xml2.mk
+++ b/libxml2/ExternalProject_xml2.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,xml2,xml2))
+$(eval $(call gb_ExternalProject_ExternalProject,xml2))
 
 $(eval $(call gb_ExternalProject_register_targets,xml2,\
 	build \
diff --git a/libxmlsec/ExternalProject_xmlsec.mk b/libxmlsec/ExternalProject_xmlsec.mk
index 5dcc5abbf7a1..31b9fd95978c 100644
--- a/libxmlsec/ExternalProject_xmlsec.mk
+++ b/libxmlsec/ExternalProject_xmlsec.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,xmlsec,xmlsec))
+$(eval $(call gb_ExternalProject_ExternalProject,xmlsec))
 
 $(eval $(call gb_ExternalProject_use_external,xmlsec,libxml2))
 
diff --git a/libxslt/ExternalProject_xslt.mk b/libxslt/ExternalProject_xslt.mk
index 0c2009d1ad09..fa1377093770 100644
--- a/libxslt/ExternalProject_xslt.mk
+++ b/libxslt/ExternalProject_xslt.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,xslt,xslt))
+$(eval $(call gb_ExternalProject_ExternalProject,xslt))
 
 $(eval $(call gb_ExternalProject_use_external,xslt,libxml2))
 
diff --git a/lpsolve/ExternalProject_lpsolve.mk b/lpsolve/ExternalProject_lpsolve.mk
index 50ca2717c246..55da70457538 100644
--- a/lpsolve/ExternalProject_lpsolve.mk
+++ b/lpsolve/ExternalProject_lpsolve.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,lpsolve,lpsolve))
+$(eval $(call gb_ExternalProject_ExternalProject,lpsolve))
 
 $(eval $(call gb_ExternalProject_register_targets,lpsolve,\
 	build \
diff --git a/mythes/ExternalProject_mythes.mk b/mythes/ExternalProject_mythes.mk
index 8f2365c1c1a5..7eb367bdfd35 100644
--- a/mythes/ExternalProject_mythes.mk
+++ b/mythes/ExternalProject_mythes.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,mythes,mythes))
+$(eval $(call gb_ExternalProject_ExternalProject,mythes))
 
 $(eval $(call gb_ExternalProject_use_package,mythes,hunspell))
 
diff --git a/nss/ExternalProject_nss.mk b/nss/ExternalProject_nss.mk
index a0981bd1bf92..c62861aec131 100644
--- a/nss/ExternalProject_nss.mk
+++ b/nss/ExternalProject_nss.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,nss,nss))
+$(eval $(call gb_ExternalProject_ExternalProject,nss))
 
 $(eval $(call gb_ExternalProject_use_externals,nss,\
 	unistd_headers \
diff --git a/openldap/ExternalProject_openldap.mk b/openldap/ExternalProject_openldap.mk
index 943e91a542b8..85963543a13c 100644
--- a/openldap/ExternalProject_openldap.mk
+++ b/openldap/ExternalProject_openldap.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,openldap,openldap))
+$(eval $(call gb_ExternalProject_ExternalProject,openldap))
 
 $(eval $(call gb_ExternalProject_use_package,openldap,nss))
 
diff --git a/openssl/ExternalProject_openssl.mk b/openssl/ExternalProject_openssl.mk
index 206e6bb4d460..433d49402b3a 100644
--- a/openssl/ExternalProject_openssl.mk
+++ b/openssl/ExternalProject_openssl.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,openssl,openssl))
+$(eval $(call gb_ExternalProject_ExternalProject,openssl))
 
 $(eval $(call gb_ExternalProject_register_targets,openssl,\
 	build \
diff --git a/postgresql/ExternalProject_postgresql.mk b/postgresql/ExternalProject_postgresql.mk
index d455d72f70a0..76d5a01c112e 100644
--- a/postgresql/ExternalProject_postgresql.mk
+++ b/postgresql/ExternalProject_postgresql.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,postgresql,postgresql))
+$(eval $(call gb_ExternalProject_ExternalProject,postgresql))
 
 $(eval $(call gb_ExternalProject_use_package,postgresql,openldap))
 
diff --git a/python3/ExternalProject_python3.mk b/python3/ExternalProject_python3.mk
index d7346877e8a3..b8953c7e052c 100644
--- a/python3/ExternalProject_python3.mk
+++ b/python3/ExternalProject_python3.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,python3,python3))
+$(eval $(call gb_ExternalProject_ExternalProject,python3))
 
 $(eval $(call gb_ExternalProject_use_externals,python3,\
 	expat \
diff --git a/redland/ExternalProject_raptor.mk b/redland/ExternalProject_raptor.mk
index 2bf01dbf4c7d..88b8a0e1530d 100644
--- a/redland/ExternalProject_raptor.mk
+++ b/redland/ExternalProject_raptor.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,raptor,raptor))
+$(eval $(call gb_ExternalProject_ExternalProject,raptor))
 
 $(eval $(call gb_ExternalProject_use_external,raptor,libxml2))
 
diff --git a/redland/ExternalProject_rasqal.mk b/redland/ExternalProject_rasqal.mk
index c136c13a1f41..9277d079dd0d 100644
--- a/redland/ExternalProject_rasqal.mk
+++ b/redland/ExternalProject_rasqal.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,rasqal,rasqal))
+$(eval $(call gb_ExternalProject_ExternalProject,rasqal))
 
 $(eval $(call gb_ExternalProject_use_external,rasqal,libxml2))
 
diff --git a/redland/ExternalProject_redland.mk b/redland/ExternalProject_redland.mk
index 4d6dcda2151c..6034534f38fa 100644
--- a/redland/ExternalProject_redland.mk
+++ b/redland/ExternalProject_redland.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,redland,redland))
+$(eval $(call gb_ExternalProject_ExternalProject,redland))
 
 $(eval $(call gb_ExternalProject_use_packages,redland, \
     raptor \
diff --git a/rhino/ExternalProject_rhino.mk b/rhino/ExternalProject_rhino.mk
index 8f74c20fe48f..3243ad93d538 100644
--- a/rhino/ExternalProject_rhino.mk
+++ b/rhino/ExternalProject_rhino.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,rhino,rhino))
+$(eval $(call gb_ExternalProject_ExternalProject,rhino))
 
 $(eval $(call gb_ExternalProject_register_targets,rhino,\
 	build \
diff --git a/solenv/gbuild/ExternalProject.mk b/solenv/gbuild/ExternalProject.mk
index e964610e6248..5031b52c5590 100644
--- a/solenv/gbuild/ExternalProject.mk
+++ b/solenv/gbuild/ExternalProject.mk
@@ -55,16 +55,15 @@ $(call gb_ExternalProject_get_clean_target,%) :
 			$(call gb_ExternalProject_get_statedir,$*) \
 	)
 
-# Define a new external project, using an unpacked tarball
+# Define a new external project, using an unpacked tarball of the same name
 #
-# gb_ExternalProject_ExternalProject project unpacked
+# gb_ExternalProject_ExternalProject project
 define gb_ExternalProject_ExternalProject
-$(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_target,$(1)) : EXTERNAL_WORKDIR := $(call gb_UnpackedTarball_get_dir,$(1))
 
 $(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_preparation_target,$(1)) : $(call gb_UnpackedTarball_get_target,$(1))
+$(call gb_ExternalProject_get_clean_target,$(1)) : $(call gb_UnpackedTarball_get_clean_target,$(1))
 $(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
 
diff --git a/tomcat/ExternalProject_tomcat.mk b/tomcat/ExternalProject_tomcat.mk
index ffe58e76d243..0640f4b6b2b5 100644
--- a/tomcat/ExternalProject_tomcat.mk
+++ b/tomcat/ExternalProject_tomcat.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,tomcat,tomcat))
+$(eval $(call gb_ExternalProject_ExternalProject,tomcat))
 
 $(eval $(call gb_ExternalProject_register_targets,tomcat,\
 	build \
diff --git a/xpdf/ExternalProject_xpdf.mk b/xpdf/ExternalProject_xpdf.mk
index a8b540347f9f..f7cb13c66f5c 100644
--- a/xpdf/ExternalProject_xpdf.mk
+++ b/xpdf/ExternalProject_xpdf.mk
@@ -7,7 +7,7 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_ExternalProject_ExternalProject,xpdf,xpdf))
+$(eval $(call gb_ExternalProject_ExternalProject,xpdf))
 
 $(eval $(call gb_ExternalProject_register_targets,xpdf,\
 	build \