gentoo auto-resync : 24:12:2022 - 14:02:21

2 files changed, 70 insertions, 3 deletions

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index cf0ab6a555d6..ce989ff5b5ec 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,6 +1,6 @@
 AUX tuxpaint-0.9.27-Makefile.patch 7328 BLAKE2B 87a63107058b61387c9e9e9555e106eeb927e962b72529518e43e34ee73b1b1d245599a1e7746e9372181e7e961fda780d671f19cc9a469b4aa9a4399e030dcd SHA512 15e37d4ed966e5e1b226690c3866bce4889395e8828aba8114c039b0896f6cfb7ad15847b427e26eb75c40aea6a65c1f9ca898f7f261e9efbc5b7897fba509cb
 AUX tuxpaint-0.9.28-Makefile.patch 7110 BLAKE2B be54cba57161735ce79a29a566b774bdaeca4d3c6fb22f431e70071ec0068391bc800f468c93560d75d63387c6e6cce53b47a1afea2597be07ef9f7770d8ae5c SHA512 dc6d3cdff179b98ad22725323df038fb4d12c795c6c4e1a993c5189da3830e7f1743f255cba8b579a508e4b012b806e1df47d882ac20e1e153ba05f041faa005
-AUX tuxpaint-0.9.28-r2-Makefile.patch 7346 BLAKE2B 9db16429a253f4c02861a7f4baa8afa2cb35c87c90fa85376506aefc243a4710bec36d52c3678ae3718f43daa8a28d89b28dc9fdaa67e88bf8c98f1a9b51ff94 SHA512 50b8a8deef04ec079364f1810540b0cfacb7e0a2b09c6b30f6900c5f3c4e62907ae14abf0dbfe85902c4efe049571eea5150bcaf70849cd6982bd199164db20c
+AUX tuxpaint-0.9.28-r2-Makefile.patch 9935 BLAKE2B e8fc056769a2e188aacab9dd8b8d9c88c1a54543b9f8908830e56aa476ba0c3aec880b2d4b10500595e712f895f530723bebae19c9c9bee76d45ada7a1431375 SHA512 e6ec2057ffad2500074c6ead47d8e6abdf29cca8898280bac7573e86a0a45148c594ea8b3655a633a88fbfdcc557ff8af2310e7aa073fb6f74a7d373d498c7a4
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
 DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
 DIST tuxpaint-0.9.28.tar.gz 14802638 BLAKE2B 7f7a8f3d61faf052d9872b5af775a6becdefae7cee1207ebcbb5db108fc381b0fa5ba8b7a8facd55ba6dcfca59886125cba7837d2de432fd5c75d2c40b509c41 SHA512 038f92f8d7ee8d85b1c9b18f7781e814ee55067e090fbfa597028e2d13218911157d00f312de2be9db29754a07c5706fc3c3e0e6ea3c71a15f80c37bb2eceb34
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
index 1b513f714c05..6ea373620e3e 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
@@ -68,6 +68,24 @@
  
  .SUFFIXES:
  
+@@ -447,7 +447,7 @@ INSTALLED_MODIRS:=$(patsubst trans/%.mo,$(LOCALE_PREFIX)/%/LC_MESSAGES,$(MOFILES
+ 
+ $(INSTALLED_MODIRS): $(LOCALE_PREFIX)/%/LC_MESSAGES: trans/%.mo
+ 	install -d -m 755 $@
+-$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo
++$(INSTALLED_MOFILES): $(LOCALE_PREFIX)/%/LC_MESSAGES/tuxpaint.mo: trans/%.mo $(INSTALLED_MODIRS)
+ 	install -m 644 $< $@
+ 
+ .PHONY: uninstall-i18n
+@@ -526,7 +526,7 @@ endif
+ 
+ # Build the translation files for gettext
+ 
+-$(MOFILES): trans/%.mo: src/po/%.po  
++$(MOFILES): trans/%.mo: src/po/%.po trans
+ 	msgfmt -o $@ $<
+ 
+ .PHONY: translations
 @@ -551,7 +551,7 @@ trans:
  windows_ARCH_INSTALL:=
  macos_ARCH_INSTALL:=install-macbundle
@@ -77,6 +95,15 @@
  ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
  
  # "make install" installs all of the various parts
+@@ -627,7 +627,7 @@ install-magic-plugins:
+ 			$(DATA_PREFIX)/sounds/magic/*.ogg
+ 
+ .PHONY: install-magic-plugins
+-install-magic-plugin-dev:	src/tp_magic_api.h
++install-magic-plugin-dev:	src/tp_magic_api.h install-bin
+ 	@echo
+ 	@echo "...Installing Magic Tool plug-in development files and docs..."
+ 	@cp tp-magic-config $(BIN_PREFIX)
 @@ -719,12 +719,12 @@ uninstall:	uninstall-i18n
  	-rm $(BIN_PREFIX)/tuxpaint-import
  	-rm -r $(DATA_PREFIX)
@@ -96,7 +123,16 @@
  	-rm -f -r $(CONFDIR)
  	-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
  	-rm -r $(MAGIC_PREFIX)
-@@ -817,11 +817,11 @@ $(THUMB_STARTERS):
+@@ -783,7 +783,7 @@ install-example-stamps:
+ STARTERS:=$(wildcard starters/*.*)
+ INSTALLED_STARTERS:=$(patsubst %,$(DATA_PREFIX)/%,$(STARTERS))
+ 
+-$(INSTALLED_STARTERS): $(DATA_PREFIX)/%: %
++$(INSTALLED_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
+ 	install -m 644 $< $@
+ 
+ install-example-starters-dirs:
+@@ -817,14 +817,14 @@ $(THUMB_STARTERS):
  	@mkdir -p starters/.thumbs
  	@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
  	then \
@@ -110,7 +146,20 @@
 +		gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
  	fi
  
- $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: %
+-$(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: %
++$(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
+ 	@install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
+ 
+ .PHONY: echo-thumb-starters
+@@ -849,7 +849,7 @@ install-thumb-starters: echo-install-thumb-starters $(INSTALLED_THUMB_STARTERS)
+ TEMPLATES:=$(wildcard templates/*.*)
+ INSTALLED_TEMPLATES:=$(patsubst %,$(DATA_PREFIX)/%,$(TEMPLATES))
+ 
+-$(INSTALLED_TEMPLATES): $(DATA_PREFIX)/%: %
++$(INSTALLED_TEMPLATES): $(DATA_PREFIX)/%: % install-example-template-dirs
+ 	install -m 644 $< $@
+ 
+ install-example-template-dirs:
 @@ -876,7 +876,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
  $(THUMB_TEMPLATES):
  	@printf "."
@@ -133,6 +182,15 @@
  
  # Install symlink:
  .PHONY: install-haiku
+@@ -1001,7 +1001,7 @@ install-haiku:
+ 
+ # Install the import script:
+ .PHONY: install-importscript
+-install-importscript:
++install-importscript: install-bin
+ 	@echo
+ 	@echo "...Installing 'tuxpaint-import' script..."
+ 	@cp src/tuxpaint-import.sh $(BIN_PREFIX)/tuxpaint-import
 @@ -1065,24 +1065,20 @@ install-man:
  	@install -d $(MAN_PREFIX)/man1
  	@# tuxpaint.1
@@ -162,3 +220,12 @@
  	done
  	@# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
  
+@@ -1382,7 +1378,7 @@ SHARED_FLAGS:=-shared -fpic -lm
+ MAGIC_C:=$(wildcard magic/src/*.c)
+ MAGIC_SO:=$(patsubst magic/src/%.c,magic/%.$(SO_TYPE),$(MAGIC_C))
+ 
+-$(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c  
++$(MAGIC_SO): magic/%.$(SO_TYPE): magic/src/%.c src/tp_magic_api.h 
+ 	$(CC) $(MAGIC_CFLAGS) $(LDFLAGS) $(SHARED_FLAGS) -o $@ $< $(PLUGIN_LIBS)
+ # Probably should separate the various flags like the following:
+ #	$(CC) $(PLUG_CPPFLAGS) $(PLUG_CFLAGS) $(PLUG_LDFLAGS) -o $@ $< $(PLUG_LIBS)