summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/tuxpaint')
-rw-r--r--media-gfx/tuxpaint/Manifest4
-rw-r--r--media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch159
-rw-r--r--media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch231
-rw-r--r--media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch30
-rw-r--r--media-gfx/tuxpaint/files/tuxpaint-0.9.31-Makefile.patch (renamed from media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch)57
-rw-r--r--media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild63
-rw-r--r--media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild (renamed from media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild)28
-rw-r--r--media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild (renamed from media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild)9
8 files changed, 45 insertions, 536 deletions
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index fdf65c4da48d..5a7935a9caa0 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,3 +1 @@
-DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00 SHA512 197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9
-DIST tuxpaint-0.9.28.tar.gz 14802638 BLAKE2B 7f7a8f3d61faf052d9872b5af775a6becdefae7cee1207ebcbb5db108fc381b0fa5ba8b7a8facd55ba6dcfca59886125cba7837d2de432fd5c75d2c40b509c41 SHA512 038f92f8d7ee8d85b1c9b18f7781e814ee55067e090fbfa597028e2d13218911157d00f312de2be9db29754a07c5706fc3c3e0e6ea3c71a15f80c37bb2eceb34
-DIST tuxpaint-0.9.29.tar.gz 17144658 BLAKE2B db00b14862ca139b0ee2851b7f57bda0df12d09ae516649dab25eb260bfc65fef35c968ab39593a71c173f196dc24426c5d4be79eee230c7139a7832d5508171 SHA512 9642c7145d32848e663b69428d7ff046e6109b292f3c3104dc40f8fcbf4152ab39815cf7dd3a217b0a6bd26ea50c57e0b14b186a23157fbac091ee10436646b3
+DIST tuxpaint-0.9.31.tar.gz 21733142 BLAKE2B 00041eacd062ac4e535451d4b4a6ac6d92fb7a0b6328dad4c7424b1bf0b95f0d3d2915e5ed7392cbf2f36174e56ceff5fadcf795c3368b3f2a958d794ce0b66a SHA512 7a3df8dce3e354cc22af34d55546de6e033e8ed4f44530b89986c3e1a07961e5e1a132f12f2d3fc5b699c500e7b9e7ab3503d2bafc5041d9fb2dbc8d1479b79f
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
deleted file mode 100644
index 05b37e1e4812..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
+++ /dev/null
@@ -1,159 +0,0 @@
---- 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
- # 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
- endif
- endif
-
-@@ -169,7 +169,7 @@ 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}
- 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:=
--linux_ARCH_LDFLAGS:=
-+linux_ARCH_LDFLAGS:=${LDFLAGS}
- ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
- LDFLAGS:=$(ARCH_LDFLAGS)
-
-@@ -205,7 +205,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
- windows_PREFIX:=/usr/local
- macos_PREFIX:=Resources
- ios_PREFIX:=.
--linux_PREFIX:=/usr/local
-+linux_PREFIX:=/usr
- PREFIX:=$($(OS)_PREFIX)
-
- # Root directory to place files when creating packages.
-@@ -243,7 +243,7 @@ MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/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
- 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
- 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
- ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
-
- # "make install" installs all of the various parts
-@@ -693,12 +693,12 @@ uninstall: uninstall-i18n
- -rm $(BIN_PREFIX)/tuxpaint-import
- -rm -r $(DATA_PREFIX)
- -rm -r $(DOC_PREFIX)
-- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
-+ -rm $(MAN_PREFIX)/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
-+ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
- -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
- @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
-
- # Install symlink:
- .PHONY: install-haiku
-@@ -1039,24 +1039,20 @@ install-man:
- @install -d $(MAN_PREFIX)/man1
- @# tuxpaint.1
- @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
- @# tuxpaint-import.1
- @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
- @# tp-magic-config.1
- @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
- @echo
- for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
- DEST=$(MAN_PREFIX)/$$l/man1 ; \
- echo "...Installing $$l man pages into $$DEST..." ; \
- install -d $$DEST ; \
- cp man/$$l/tuxpaint.1 $$DEST ; \
-- gzip -f $$DEST/tuxpaint.1 ; \
-- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
-+ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
- done
- @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
-
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
deleted file mode 100644
index 6ea373620e3e..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
+++ /dev/null
@@ -1,231 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -73,7 +73,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>/pkgconfig *.pc files.
- #
- ifdef HOST
- ifdef HOSTROOT
-@@ -104,7 +104,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)/$(GENTOO_LIBDIR)/pkgconfig
- endif
- endif
-
-@@ -170,14 +170,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}
- ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
-
- 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:=
--linux_ARCH_LDFLAGS:=
-+linux_ARCH_LDFLAGS:=${LDFLAGS}
- ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
- LDFLAGS:=$(ARCH_LDFLAGS)
-
-@@ -206,7 +206,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
- windows_PREFIX:=/usr/local
- macos_PREFIX:=Resources
- ios_PREFIX:=.
--linux_PREFIX:=/usr/local
-+linux_PREFIX:=/usr
- PREFIX:=$($(OS)_PREFIX)
-
- # Root directory to place files when creating packages.
-@@ -240,11 +240,11 @@ 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
-+DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
-+DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
- MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
- DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
-
-@@ -359,7 +359,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:
-
-@@ -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
- ios_ARCH_INSTALL:=install-iosbundle
--linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
-+linux_ARCH_INSTALL:=install-man install-importscript install-bash-completion
- 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)
- -rm -r $(DOC_PREFIX)
-- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
-- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
-- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
-+ -rm $(MAN_PREFIX)/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
-+ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
-+ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
-+ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
- -rm -f -r $(CONFDIR)
- -rm $(COMPLETIONDIR)/tuxpaint-completion.bash
- -rm -r $(MAGIC_PREFIX)
-@@ -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 \
-- 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)/%: %
-+$(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 "."
- @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 $<" )
-@@ -988,9 +988,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)/$(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)/lib/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
-@@ -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
- @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
- @# tuxpaint-import.1
- @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
- @# tp-magic-config.1
- @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
-- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
-- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
-+ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
- @echo
- for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
- DEST=$(MAN_PREFIX)/$$l/man1 ; \
- echo "...Installing $$l man pages into $$DEST..." ; \
- install -d $$DEST ; \
- cp man/$$l/tuxpaint.1 $$DEST ; \
-- gzip -f $$DEST/tuxpaint.1 ; \
-- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
-+ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
- 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)
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch
deleted file mode 100644
index 20868602f65b..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-# Sometimes the trans directory isn't created before
-# accessing it.
-# Upstream commit b452d84d2544a38eca1d2e4e9686a8eaef197d0f
-# fixes this.
---- a/Makefile
-+++ b/Makefile
-@@ -535,6 +535,7 @@ endif
- # Build the translation files for gettext
-
- $(MOFILES): trans/%.mo: src/po/%.po
-+ @-mkdir -p trans
- msgfmt -o $@ $<
-
- %.desktop: %.desktop.in $(POTFILES)
-@@ -552,14 +553,9 @@ translations: trans
- @echo "Install gettext to run Tux Paint in non-U.S. English modes."
- @echo "--------------------------------------------------------------"
- else
--translations: trans $(MOFILES) src/tuxpaint.desktop src/tuxpaint-fullscreen.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
-+translations: $(MOFILES) src/tuxpaint.desktop src/tuxpaint-fullscreen.desktop src/org.tuxpaint.Tuxpaint.appdata.xml
- endif
-
--trans:
-- @echo
-- @echo "...Preparing translation files..."
-- @mkdir trans
--
- ######
-
- windows_ARCH_INSTALL:=
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.31-Makefile.patch
index e0b1c43a03bb..fc35fb9b0212 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.31-Makefile.patch
@@ -1,17 +1,8 @@
-diff --git a/Makefile.old b/Makefile
-index 88d0d02..ab71f97 100644
---- a/Makefile.old
+# Replace "lib" with GENTOO_LIBDIR, remove .gz suffixes and
+# replace ImageMagick calls by GraphicsMagick calls.
+--- a/Makefile
+++ b/Makefile
-@@ -74,7 +74,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>/pkgconfig *.pc files.
- #
- ifdef HOST
- ifdef HOSTROOT
-@@ -105,7 +105,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.
@@ -20,7 +11,7 @@ index 88d0d02..ab71f97 100644
endif
endif
-@@ -171,14 +171,14 @@ 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:=
@@ -37,21 +28,21 @@ index 88d0d02..ab71f97 100644
ARCH_LDFLAGS:=$($(OS)_ARCH_LDFLAGS)
LDFLAGS:=$(ARCH_LDFLAGS)
-@@ -207,7 +207,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.
-@@ -241,10 +241,10 @@ LIBDIR=$(PREFIX)
+@@ -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
++MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/$(GENTOO_LIBDIR)/tuxpaint/plugins
# Docs and man page:
-DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
@@ -59,25 +50,29 @@ index 88d0d02..ab71f97 100644
MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
-@@ -367,7 +367,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:
-@@ -551,7 +551,7 @@ trans:
+@@ -575,11 +575,7 @@ endif
windows_ARCH_INSTALL:=
macos_ARCH_INSTALL:=install-macbundle
ios_ARCH_INSTALL:=install-iosbundle
--linux_ARCH_INSTALL:=install-xdg install-man install-importscript install-bash-completion
+-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
-@@ -719,12 +719,12 @@ uninstall: uninstall-i18n
+@@ -763,12 +759,12 @@ uninstall: uninstall-i18n
-rm $(BIN_PREFIX)/tuxpaint-import
-rm -r $(DATA_PREFIX)
-rm -r $(DOC_PREFIX)
@@ -96,31 +91,31 @@ index 88d0d02..ab71f97 100644
-rm -f -r $(CONFDIR)
-rm $(COMPLETIONDIR)/tuxpaint-completion.bash
-rm -r $(MAGIC_PREFIX)
-@@ -855,11 +855,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)/%: % install-example-starters-dirs
-@@ -876,7 +876,7 @@ TEMPLATE_NAME=$(or $(wildcard $(subst templates/.thumbs,templates,$(@:-t.png=.sv
+@@ -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 $<" )
-@@ -988,9 +988,9 @@ install-dlls:
+@@ -1072,9 +1068,9 @@ install-dlls:
@cp -R win32/etc/ $(BIN_PREFIX)
@echo
@echo "...Installing Library Modules..."
@@ -128,12 +123,12 @@ index 88d0d02..ab71f97 100644
- @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)/$(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)/lib/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
-@@ -1065,24 +1065,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.27-r1.ebuild
deleted file mode 100644
index 7cca8f0ed211..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop optfeature toolchain-funcs xdg
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="http://www.tuxpaint.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-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
- x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- dev-util/gperf
- media-gfx/graphicsmagick[jpeg,png,svg]
- sys-devel/gettext
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-Makefile.patch
-)
-
-src_compile() {
- # parallel build may break things
- emake -j1 CC="$(tc-getCC)" LIBDIR="$(get_libdir)"
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" install
- local file size
- for file in data/images/icon[0-9]*x[0-9]*.png; do
- size=${file##*/icon}
- size=${size%%x*}
- newicon -s "${size}" "${file}" tux4kids-tuxpaint.png
- done
- newmenu src/tuxpaint.desktop tux4kids-tuxpaint.desktop
- dodoc docs/*.txt
- dodoc docs/en/*.txt
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
- optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
-}
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
index 4f052a0122e2..1be1e1d0fdb1 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,38 +7,38 @@ inherit desktop optfeature toolchain-funcs xdg
DESCRIPTION="Drawing program designed for young children"
HOMEPAGE="https://www.tuxpaint.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}-sdl1.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P}-sdl1
+SRC_URI="https://downloads.sourceforge.net/${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[X,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}"
BDEPEND="
dev-util/gperf
- media-gfx/graphicsmagick[jpeg,png,svg]
+ media-gfx/graphicsmagick[jpeg,png]
sys-devel/gettext
"
PATCHES=(
- "${FILESDIR}"/${PF}-Makefile.patch
+ "${FILESDIR}"/${P}-Makefile.patch
)
src_compile() {
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
index 2c871dc42c61..ff77b85852e0 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -7,7 +7,7 @@ inherit desktop optfeature toolchain-funcs xdg
DESCRIPTION="Drawing program designed for young children"
HOMEPAGE="https://www.tuxpaint.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz"
S="${WORKDIR}"/${P}
LICENSE="GPL-2"
@@ -33,13 +33,12 @@ RDEPEND="
DEPEND="${RDEPEND}"
BDEPEND="
dev-util/gperf
- media-gfx/graphicsmagick[jpeg,png,svg]
+ media-gfx/graphicsmagick[jpeg,png]
sys-devel/gettext
"
PATCHES=(
- "${FILESDIR}"/${PF}-Makefile.patch
- "${FILESDIR}"/${PF}-Makefile-trans.patch
+ "${FILESDIR}"/${P}-Makefile.patch
)
src_compile() {