more_fonts: convert to ExternalPackage for incremental builds

Change-Id: Id24975e0bc9a28f6c66599c4b58c01471dd2d8ef

6 files changed, 27 insertions, 30 deletions

diff --git a/more_fonts/Package_dejavu.mk b/more_fonts/ExternalPackage_dejavu.mk
index f7dc3b834229..c1209eca5697 100644
--- a/more_fonts/Package_dejavu.mk
+++ b/more_fonts/ExternalPackage_dejavu.mk
@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,font_dejavu_inc,$(call gb_UnpackedTarball_get_dir,font_dejavu)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_dejavu_inc,font_dejavu))
 
-$(eval $(call gb_Package_use_unpacked,font_dejavu_inc,font_dejavu))
-
-$(eval $(call gb_Package_add_files,font_dejavu_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_dejavu_inc,pck,\
 	ttf/DejaVuSans-Bold.ttf \
 	ttf/DejaVuSans-BoldOblique.ttf \
 	ttf/DejaVuSans-ExtraLight.ttf \
@@ -35,4 +33,6 @@ $(eval $(call gb_Package_add_files,font_dejavu_inc,pck,\
 	ttf/DejaVuSerifCondensed.ttf \
 ))
 
-$(eval $(call gb_Package_add_file,font_dejavu_lic,pck/License_dejavu.txt,LICENSE))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_dejavu_lic,pck/License_dejavu.txt,LICENSE))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_gentium.mk b/more_fonts/ExternalPackage_gentium.mk
index 2e9093a22db0..3992d2b98625 100644
--- a/more_fonts/Package_gentium.mk
+++ b/more_fonts/ExternalPackage_gentium.mk
@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,font_gentium_inc,$(call gb_UnpackedTarball_get_dir,font_gentium)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_gentium_inc,font_gentium))
 
-$(eval $(call gb_Package_use_unpacked,font_gentium_inc,font_gentium))
-
-$(eval $(call gb_Package_add_files,font_gentium_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_gentium_inc,pck,\
 	GenBasB.ttf \
 	GenBasBI.ttf \
 	GenBasI.ttf \
@@ -22,4 +20,6 @@ $(eval $(call gb_Package_add_files,font_gentium_inc,pck,\
 	GenBkBasR.ttf \
 ))
 
-$(eval $(call gb_Package_add_file,font_gentium_inc,pck/License_gentium.txt,OFL.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_gentium_inc,pck/License_gentium.txt,OFL.txt))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_liberation.mk b/more_fonts/ExternalPackage_liberation.mk
index 525736e2dfa7..a0aae9a8a041 100644
--- a/more_fonts/Package_liberation.mk
+++ b/more_fonts/ExternalPackage_liberation.mk
@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,font_liberation_inc,$(call gb_UnpackedTarball_get_dir,font_liberation)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_liberation_inc,font_liberation))
 
-$(eval $(call gb_Package_use_unpacked,font_liberation_inc,font_liberation))
-
-$(eval $(call gb_Package_add_files,font_liberation_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_inc,pck,\
 	LiberationMono-Bold.ttf \
 	LiberationMono-BoldItalic.ttf \
 	LiberationMono-Italic.ttf \
@@ -26,6 +24,6 @@ $(eval $(call gb_Package_add_files,font_liberation_inc,pck,\
 	LiberationSerif-Regular.ttf \
 ))
 
-$(eval $(call gb_Package_add_file,font_liberation_inc,pck/License_liberation.txt,LICENSE))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_inc,pck/License_liberation.txt,LICENSE))
 
 # vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_liberation_narrow.mk b/more_fonts/ExternalPackage_liberation_narrow.mk
index 7135589de67d..2672d75a84ad 100644
--- a/more_fonts/Package_liberation_narrow.mk
+++ b/more_fonts/ExternalPackage_liberation_narrow.mk
@@ -7,15 +7,15 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,font_liberation_narrow_inc,$(call gb_UnpackedTarball_get_dir,font_liberation_narrow)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_liberation_narrow_inc,font_liberation_narrow))
 
-$(eval $(call gb_Package_use_unpacked,font_liberation_narrow_inc,font_liberation_narrow))
-
-$(eval $(call gb_Package_add_files,font_liberation_narrow_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_liberation_narrow_inc,pck,\
 	LiberationSansNarrow-Bold.ttf \
 	LiberationSansNarrow-BoldItalic.ttf \
 	LiberationSansNarrow-Italic.ttf \
 	LiberationSansNarrow-Regular.ttf \
 ))
 
-$(eval $(call gb_Package_add_file,font_liberation_narrow_inc,pck/License_liberation_narrow.txt,License.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_liberation_narrow_inc,pck/License_liberation_narrow.txt,License.txt))
+
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Package_libertineg.mk b/more_fonts/ExternalPackage_libertineg.mk
index 644d29f86734..f0e8af2ef2c8 100644
--- a/more_fonts/Package_libertineg.mk
+++ b/more_fonts/ExternalPackage_libertineg.mk
@@ -7,11 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Package_Package,font_libertineg_inc,$(call gb_UnpackedTarball_get_dir,font_libertineg)))
+$(eval $(call gb_ExternalPackage_ExternalPackage,font_libertineg_inc,font_libertineg))
 
-$(eval $(call gb_Package_use_unpacked,font_libertineg_inc,font_libertineg))
-
-$(eval $(call gb_Package_add_files,font_libertineg_inc,pck,\
+$(eval $(call gb_ExternalPackage_add_unpacked_files,font_libertineg_inc,pck,\
 	LinBiolinum_RB_G.ttf \
 	LinBiolinum_RI_G.ttf \
 	LinBiolinum_R_G.ttf \
@@ -24,5 +22,6 @@ $(eval $(call gb_Package_add_files,font_libertineg_inc,pck,\
 	LinLibertine_R_G.ttf \
 ))
 
-$(eval $(call gb_Package_add_file,font_libertineg_inc,pck/License_libertineg.txt,OFL.txt))
+$(eval $(call gb_ExternalPackage_add_unpacked_file,font_libertineg_inc,pck/License_libertineg.txt,OFL.txt))
 
+# vim: set noet sw=4 ts=4:
diff --git a/more_fonts/Module_more_fonts.mk b/more_fonts/Module_more_fonts.mk
index 7beb2d5abaa5..f054b21bc87d 100644
--- a/more_fonts/Module_more_fonts.mk
+++ b/more_fonts/Module_more_fonts.mk
@@ -11,11 +11,11 @@ $(eval $(call gb_Module_Module,more_fonts))
 
 $(eval $(call gb_Module_add_targets,more_fonts,\
 	Package_conf \
-	Package_dejavu \
-	Package_gentium \
-	Package_liberation \
-	Package_liberation_narrow \
-	Package_libertineg \
+	ExternalPackage_dejavu \
+	ExternalPackage_gentium \
+	ExternalPackage_liberation \
+	ExternalPackage_liberation_narrow \
+	ExternalPackage_libertineg \
 	UnpackedTarball_dejavu \
 	UnpackedTarball_gentium \
 	UnpackedTarball_liberation \