gentoo auto-resync : 11:01:2024 - 19:06:52

3 files changed, 59 insertions, 57 deletions

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index e616c740c31f..eb2e6fcf3d11 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,11 +1,11 @@
-AUX tuxpaint-0.9.27-Makefile.patch 7328 BLAKE2B 87a63107058b61387c9e9e9555e106eeb927e962b72529518e43e34ee73b1b1d245599a1e7746e9372181e7e961fda780d671f19cc9a469b4aa9a4399e030dcd SHA512 15e37d4ed966e5e1b226690c3866bce4889395e8828aba8114c039b0896f6cfb7ad15847b427e26eb75c40aea6a65c1f9ca898f7f261e9efbc5b7897fba509cb
 AUX tuxpaint-0.9.28-r2-Makefile.patch 9935 BLAKE2B e8fc056769a2e188aacab9dd8b8d9c88c1a54543b9f8908830e56aa476ba0c3aec880b2d4b10500595e712f895f530723bebae19c9c9bee76d45ada7a1431375 SHA512 e6ec2057ffad2500074c6ead47d8e6abdf29cca8898280bac7573e86a0a45148c594ea8b3655a633a88fbfdcc557ff8af2310e7aa073fb6f74a7d373d498c7a4
 AUX tuxpaint-0.9.29-Makefile-trans.patch 907 BLAKE2B 995a08fe64cd71b8f7bdbbf81df09bf3ff3a8082979b14c390ea52945b55524371a83715e0026cce99a5dc2fb0d44e5ed31c2abff321d3493dfe9183654e99f3 SHA512 8d8199d55167446e1d30e6765f3ca320ef085ec1cbbc92c9e60cdb68238507e828f5b143f4a15069a55a807fa0c948474f6ff2cb78f4460644980153c57711c1
 AUX tuxpaint-0.9.29-Makefile.patch 7299 BLAKE2B 25b93ca9659dca9bffadd78cd8dd49b8f3c1d28fac6ee5ea7f4825144beca70db7eb47b3b1950f7d1acf4f92f9078e471e016555317b831998dff04dee0b47b5 SHA512 f3a7d7df26a1bf45024906ac7f661b0517822175439444d1072701bac7d806c70031e689792eea9d29c6b4ba4c519b58918a6df6ba8f3553eb1f7da2010956e1
-DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
+AUX tuxpaint-0.9.31-Makefile.patch 7209 BLAKE2B 373c4ecd0f5bea700a630b61a4f3068477fbe02f146774631fa726dbd72ba2091b1206ede50be246fb4d10ed517c62f56fd029367955cc9ebbcea8dacf71001b SHA512 31d5891fa33f7c6c39c5cb1225d46be9c425cf284c1a31dd8b62d3250d35e93912f7b91803cb32d64fa0d1ec3ea59997ecfc5d6270601acaf2f9e7d4ff804a7f
 DIST tuxpaint-0.9.28.tar.gz 14802638 BLAKE2B 7f7a8f3d61faf052d9872b5af775a6becdefae7cee1207ebcbb5db108fc381b0fa5ba8b7a8facd55ba6dcfca59886125cba7837d2de432fd5c75d2c40b509c41 SHA512 038f92f8d7ee8d85b1c9b18f7781e814ee55067e090fbfa597028e2d13218911157d00f312de2be9db29754a07c5706fc3c3e0e6ea3c71a15f80c37bb2eceb34
 DIST tuxpaint-0.9.29.tar.gz 17144658 BLAKE2B db00b14862ca139b0ee2851b7f57bda0df12d09ae516649dab25eb260bfc65fef35c968ab39593a71c173f196dc24426c5d4be79eee230c7139a7832d5508171 SHA512 9642c7145d32848e663b69428d7ff046e6109b292f3c3104dc40f8fcbf4152ab39815cf7dd3a217b0a6bd26ea50c57e0b14b186a23157fbac091ee10436646b3
-EBUILD tuxpaint-0.9.27-r1.ebuild 1348 BLAKE2B 9db179e1f369c9ead66893072239f66a5623346ff4e9acf5f066559ccd6839baa8cde7ffa7f36397c8158832670d794d6bcf13e40298339139344500c792e0c5 SHA512 f125e4f0c65b6f0fe991785a5e54298f84ff2aeb8fb20873913e12cf891e0599ab24f0437ed195775ae11dd81f97d7b45acea8b62954467abb388ae7c3fd11b3
+DIST tuxpaint-0.9.31.tar.gz 21733142 BLAKE2B 00041eacd062ac4e535451d4b4a6ac6d92fb7a0b6328dad4c7424b1bf0b95f0d3d2915e5ed7392cbf2f36174e56ceff5fadcf795c3368b3f2a958d794ce0b66a SHA512 7a3df8dce3e354cc22af34d55546de6e033e8ed4f44530b89986c3e1a07961e5e1a132f12f2d3fc5b699c500e7b9e7ab3503d2bafc5041d9fb2dbc8d1479b79f
 EBUILD tuxpaint-0.9.28-r2.ebuild 1438 BLAKE2B 2c9297386a6cea69de2643367c79d1635f122474b1385a40ff1a119286ee648153e3227cb011effdf1aecd163cd3d8e1e03352b11d15fdebf0c414e8abb2a54a SHA512 fe4347b8e89b477e8e12fa590dd772bc38e7cc497ea2f28d01c02be3544510704fbb68c2c08d2d5dda938558a83ff455df06e9feb82c84248157155c49d17cb1
 EBUILD tuxpaint-0.9.29.ebuild 1459 BLAKE2B 3754f2b0e80f51e4c8c329ecd5c231f234cc4b37664d8c6093e0f06e999089aa3c1a8536b6a73a8b236627f1a46c9e9b0acda699d52a3d2518a79b0d68157b93 SHA512 5216f59ba4704b945de341c65c2304c725d3fc4042c3d8bd7515ca9514ecf8fcd417926b3fc5d77e0e69a10f0fedd5bb340ad5c1d5ef4287688013d8297fd8d8
+EBUILD tuxpaint-0.9.31.ebuild 1419 BLAKE2B c057712f80c51bb2163ec7a9941f5743a8069589fea01a9b69d79f9343264b8009329c4b3d58fe5ed49f0d429b2a570cfb82d6a829ac56917aeb524246d9ee80 SHA512 48e25d4c7c92ab744edc344e5900e6c9737f9df3546b41f948eb77236a1107dc8380d8901426f363ef4f0e1f313c12c1a4dd6d5c557ad7acee4227928c451f58
 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.31-Makefile.patch
index 05b37e1e4812..fc35fb9b0212 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.31-Makefile.patch
@@ -1,33 +1,25 @@
+# Replace "lib" with GENTOO_LIBDIR, remove .gz suffixes and 
+# replace ImageMagick calls by GraphicsMagick calls.
 --- a/Makefile
 +++ b/Makefile
-@@ -72,7 +72,7 @@ endif
- # <HOSTROOT> is the directory containing support files for building for <HOST>:
- #   <HOSTROOT>/include        Header files.
- #   <HOSTROOT>/lib            Library files.
--#   <HOSTROOT>/lib/pkgconfig  *.pc files.
-+#   <HOSTROOT>/$(LIBDIR)/pkgconfig  *.pc files.
- #
- ifdef HOST
-   ifdef HOSTROOT
-@@ -103,7 +103,7 @@ ifdef HOST
+@@ -111,7 +111,7 @@ ifdef HOST
      # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
      # *change* where pkg-config looks for .pc files instead of adding to the
      # default path which may have libraries that aren't for HOST.
 -    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
-+    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(LIBDIR)/pkgconfig
++    export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(GENTOO_LIBDIR)/pkgconfig
    endif
  endif
  
-@@ -169,7 +169,7 @@ windows_ARCH_CFLAGS:=
+@@ -177,14 +177,14 @@ windows_ARCH_CFLAGS:=
  macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
  ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include -I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w -fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
  beos_ARCH_CFLAGS:=
 -linux_ARCH_CFLAGS:=
-+linux_ARCH_CFLAGS:= ${CFLAGS}
++linux_ARCH_CFLAGS:=${CFLAGS}
  ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
  
  windows_ARCH_LDFLAGS:=
-@@ -176,7 +176,7 @@ windows_ARCH_LDFLAGS:=
  macos_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib -mmacosx-version-min=$(MINVER) -arch $(subst $() $(), -arch ,$(ARCHS))
  ios_ARCH_LDFLAGS:=-isysroot $(SDKROOT) -L$(HOSTROOT)/lib $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS))
  beos_ARCH_LDFLAGS:=
@@ -36,43 +28,51 @@
  ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
  LDFLAGS:=$(ARCH_LDFLAGS)
  
-@@ -205,7 +205,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
+@@ -213,7 +213,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
  windows_PREFIX:=/usr/local
  macos_PREFIX:=Resources
  ios_PREFIX:=.
 -linux_PREFIX:=/usr/local
-+linux_PREFIX:=/usr
++linux_PREFIX:=${EPREFIX}/usr
  PREFIX:=$($(OS)_PREFIX)
  
  # Root directory to place files when creating packages.
-@@ -243,7 +243,7 @@ MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
+@@ -247,10 +247,10 @@ LIBDIR=$(PREFIX)
+ 
+ # Magic Tool plug-ins
+ INCLUDE_PREFIX:=$(DESTDIR)$(PREFIX)/include
+-MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
++MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/$(GENTOO_LIBDIR)/tuxpaint/plugins
  
  # Docs and man page:
- DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
--DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
-+DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
+-DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
++DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
  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
+@@ -381,7 +381,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:=-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
- ios_ARCH_INSTALL:=install-iosbundle install-man install-importscript install-bash-completion
--linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
-+linux_ARCH_INSTALL:= install-man install-importscript install-bash-completion
+@@ -575,11 +575,7 @@ endif
+ windows_ARCH_INSTALL:=
+ macos_ARCH_INSTALL:=install-macbundle
+ ios_ARCH_INSTALL:=install-iosbundle
+-ifeq ($(PACKAGE_ONLY),yes)
+-	linux_ARCH_INSTALL:=install-pkgxdg install-man install-importscript install-bash-completion
+-else
+-	linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
+-endif
++linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
  ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
  
  # "make install" installs all of the various parts
-@@ -693,12 +693,12 @@ uninstall:	uninstall-i18n
+@@ -763,12 +759,12 @@ uninstall:	uninstall-i18n
  	-rm $(BIN_PREFIX)/tuxpaint-import
  	-rm -r $(DATA_PREFIX)
  	-rm -r $(DOC_PREFIX)
@@ -91,44 +91,44 @@
  	-rm -f -r $(CONFDIR)
  	-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
  	-rm -r $(MAGIC_PREFIX)
-@@ -791,11 +791,11 @@ $(THUMB_STARTERS):
+@@ -869,11 +865,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 ; \
+-		$(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 $@ ) ; \
+-		$(CONVERT) $(CONVERT_OPTS) $(STARTER_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm -f $@ ) ; \
 +		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
+ $(INSTALLED_THUMB_STARTERS): $(DATA_PREFIX)/%: % install-example-starters-dirs
+@@ -928,7 +924,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 $@ ) ; \
+-	@$(CONVERT) $(CONVERT_OPTS) $(TEMPLATE_NAME) $@ 2> /dev/null || ( echo "($@ failed)" ; rm -f $@ ) ; \
 +	@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:
+@@ -1072,9 +1068,9 @@ install-dlls:
  	@cp -R win32/etc/ $(BIN_PREFIX)
  	@echo
  	@echo "...Installing Library Modules..."
 -	@mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
 -	@cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
 -	@strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
-+	@mkdir -p $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
-+	@cp $(MINGW_DIR)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
-+	@strip -s $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
++	@mkdir -p $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++	@cp $(MINGW_DIR)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++	@strip -s $(BIN_PREFIX)/$(GENTOO_LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
  
  # Install symlink:
  .PHONY: install-haiku
-@@ -1039,24 +1039,20 @@ install-man:
+@@ -1149,24 +1145,20 @@ install-man:
  	@install -d $(MAN_PREFIX)/man1
  	@# tuxpaint.1
  	@cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
index 7cca8f0ed211..24afdcf2e995 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,26 +6,28 @@ EAPI=8
 inherit desktop optfeature toolchain-funcs xdg
 
 DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="http://www.tuxpaint.org/"
+HOMEPAGE="https://www.tuxpaint.org/"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
 	app-text/libpaper:=
 	dev-libs/fribidi
 	gnome-base/librsvg:2
-	>=media-libs/libpng-1.2:0=
-	>=media-libs/freetype-2:2
-	media-libs/libsdl[joystick]
-	media-libs/sdl-image[png]
-	media-libs/sdl-mixer
-	media-libs/sdl-pango
-	media-libs/sdl-ttf
-	media-libs/sdl-gfx
 	media-gfx/libimagequant
+	>=media-libs/freetype-2:2
+	>=media-libs/libpng-1.2:0=
+	media-libs/libsdl2[X,joystick]
+	media-libs/sdl2-gfx
+	media-libs/sdl2-image[png]
+	media-libs/sdl2-mixer
+	media-libs/sdl2-pango
+	media-libs/sdl2-ttf
+	sys-libs/zlib
 	x11-libs/cairo
 "
 DEPEND="${RDEPEND}"
@@ -40,12 +42,11 @@ PATCHES=(
 )
 
 src_compile() {
-	# parallel build may break things
-	emake -j1 CC="$(tc-getCC)" LIBDIR="$(get_libdir)"
+	emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
 }
 
 src_install() {
-	emake -j1 DESTDIR="${D}" install
+	emake DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" install
 	local file size
 	for file in data/images/icon[0-9]*x[0-9]*.png; do
 		size=${file##*/icon}
@@ -53,6 +54,7 @@ src_install() {
 		newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
 	done
 	newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
+	docinto /usr/share/doc/${PF}
 	dodoc docs/*.txt
 	dodoc docs/en/*.txt
 }