gentoo resync : 02.02.2022

4 files changed, 57 insertions, 17 deletions

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 68dbc86438f2..3d9233da1290 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,6 +1,6 @@
-AUX tuxpaint-0.9.27-Makefile.patch 5112 BLAKE2B fd6ddb8249373189bf577171d188af5b7f6afd662097f10a814ede17d9d39466d7919814935900cdcb96379f8a9a5f65def60a0ab12eae94b1d7d70c804d1c9e SHA512 5e543962d059c3825987f8c786888313f95e8f7b4a0910ef36b2e329055b0dff4acd06792665a3bacf27b2007080a84cb31901c4f659d72ec043f66962d3ac98
+AUX tuxpaint-0.9.27-Makefile.patch 6903 BLAKE2B dddb1788115b730648dbfdf87e78a70662b908322e773336feddb49044acf0f7019a5e06b80795fd3e7db66e861984b78995760d1f1257de279c94b9bb682f06 SHA512 a18bb8408163aee59aba9e70ffdb7f65a9db93ca3ea7516bbdea3b92b814477aed8c23ab4649669232aef3aba2ae21d8c8c32d6c11d647e3d5768509b1c55259
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4 SHA512 a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
 DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
 EBUILD tuxpaint-0.9.24-r1.ebuild 1646 BLAKE2B 9c716616a56836e366dde79a3a944387a3dea15f54a20e95623234dbc9c75873166fcca9df3293cc5b3106618abbc09bb5ad8170433cceaaa5cdcf8babe05520 SHA512 aae79850b1e031edad079010423963491c4b2eacc0fa0a5e734a9ccdd318c667b8f5102ae626f994d7c9c1ce4c63680806690a5a77c31c1a87dae4163618f235
-EBUILD tuxpaint-0.9.27.ebuild 1336 BLAKE2B 5288f5eb8c4084406d830a9c4c8aae37cb47bbe8068a453f03678d1af44485103a2399b69dbabb423ddbf3cc07ebc960d7c0d44dd29d8c61acce6750225f87a1 SHA512 96e42f2b031bea036a354bfad7a9ed2648f06e6e0248b7500e384b943d8567a115a00b2466d0c82749acb14bb83bcbc41bb67288c72880e92c538617866b4c63
-MISC metadata.xml 619 BLAKE2B 4e629db78effd65e82d1098d85a9faed8f36f008ff84f0b9e74dad49534f919e2247f1a58971fda9b4e4446c9447c49cf18b37df63eda6ffad756daec85e393f SHA512 350ca34e3a685c774bddd67663bb7e1c73505a86780ee556e8d7b8223bf4735ad356f947a26f642a7e504266e19e164b490a4bb5979007a4a026d2a49c10b3f2
+EBUILD tuxpaint-0.9.27.ebuild 1349 BLAKE2B 804d9d407cb6a128ca41f9bc1475aec72ad54d1df0a2cac4ec4fb82fd5ac17cd7ccbd1876e87733125706d55f72d95b85923fb343a29869d7d7fb8259d8ec586 SHA512 207b5d08297ea342c8b99b68720f45d1fb52e5c012fea3f0b4bacecac6f5e3f8501c55f3829a31096b767ca5eac448b82750dba2cfac81494ec3a1d903f5c13e
+MISC metadata.xml 846 BLAKE2B 41e02607ee8987a7663ba72e7459a1845b73d9992e4939322db2b4ce654d06efb0d5acc935decb776aa50a20990244d0e422e4c32532fa0f17a76a9a637ac734 SHA512 59465c99f8f91e4def6ffd37f7bcfd22cb208c1f9dcbdd11c764e4f55d1e9db75169254b9ca3ed7642f57d45d4d10e9f97c80d5139cb0b80ccd20dc540185ade
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
index 7fd2e3ded8ec..fdbd5136f322 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
@@ -1,5 +1,5 @@
---- a./Makefile
-+++ b./Makefile
+--- a/Makefile
++++ b/Makefile
 @@ -72,7 +72,7 @@ endif
  # <HOSTROOT> is the directory containing support files for building for <HOST>:
  #   <HOSTROOT>/include        Header files.
@@ -45,6 +45,15 @@
  MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
  DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
  
+@@ -358,7 +358,7 @@ MOUSE_CFLAGS:=-Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES
+ # are 132x80.  On larger screens, they will be bigger (since the New dialog
+ # is always 4x4 thumbnails); therefore, generating larger thumbs, which can
+ # be still be scaled down fairly quickly (esp. complicated SVG ones).
+-CONVERT_OPTS:=-alpha Background -alpha Off +depth -resize !264x160 -background white -interlace none
++CONVERT_OPTS:=-resize 264x160 -background white -extent 0x0 -interlace none
+ 
+ .SUFFIXES:
+ 
 @@ -545,7 +545,7 @@ trans:
  windows_ARCH_INSTALL:=install-dlls install-tpconf-i18n
  macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg install-man install-importscript install-bash-completion
@@ -73,6 +82,30 @@
  	-rm -f -r $(CONFDIR)
  	-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
  	-rm -r $(MAGIC_PREFIX)
+@@ -791,11 +791,11 @@ $(THUMB_STARTERS):
+ 	@mkdir -p starters/.thumbs
+ 	@if [ "x" != "x"$(STARTER_BACK_NAME) ] ; \
+ 	then \
+-		composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png ; \
+-		convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ 2> /dev/null ; \
++		gm composite $(STARTER_NAME) $(STARTER_BACK_NAME) obj/tmp_$(notdir $(STARTER_NAME)).png 2> /dev/null ; \
++		gm convert $(CONVERT_OPTS) obj/tmp_$(notdir $(STARTER_NAME)).png $@ || echo "($@ failed)" ; \
+ 		rm obj/tmp_$(notdir $(STARTER_NAME)).png ; \
+ 	else \
+-		convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
++		gm convert $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
+ 	fi
+ 
+ $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: %
+@@ -850,7 +850,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
+ $(THUMB_TEMPLATES):
+ 	@printf "."
+ 	@mkdir -p templates/.thumbs
+-	@convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
++	@gm convert $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm $@ ) ; \
+ 
+ $(INSTALLED_THUMB_TEMPLATES): $(DATA_PREFIX)/%: %
+ 	@install -D -m 644 $< $@ || ( echo "NO THUMB $<" )
 @@ -962,9 +962,9 @@ install-dlls:
  	@cp -R win32/etc/ $(BIN_PREFIX)
  	@echo
diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index b325571bdc70..ac2c835af229 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/metadata.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <!-- maintainer-needed -->
-  <longdescription>
-  Tux Paint is a free drawing program designed for young children
-  (kids ages 3 and up). It has a simple, easy-to-use interface, fun
-  sound effects, and an encouraging cartoon mascot who helps guide
-  children as they use the program. It provides a blank canvas and a
-  variety of drawing tools to help your child be creative.
-</longdescription>
-  <upstream>
-    <remote-id type="sourceforge">tuxpaint</remote-id>
-  </upstream>
+	<maintainer type="person" proxied="yes">
+		<email>rndxelement@protonmail.com</email>
+		<name>Philipp Rösner</name>
+	</maintainer>
+	<maintainer type="project" proxied="proxy">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
+	<longdescription>
+	Tux Paint is a free drawing program designed for young children
+	(kids ages 3 and up). It has a simple, easy-to-use interface, fun
+	sound effects, and an encouraging cartoon mascot who helps guide
+	children as they use the program. It provides a blank canvas and a
+	variety of drawing tools to help your child be creative.
+	</longdescription>
+	<upstream>
+		<remote-id type="sourceforge">tuxpaint</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index 7a1dffc5100d..393cf77443e4 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	dev-util/gperf
-	virtual/imagemagick-tools
+	media-gfx/graphicsmagick[jpeg,png,svg]
 	sys-devel/gettext
 "