gentoo resync : 16.01.2021

3 files changed, 183 insertions, 0 deletions

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index ecc62cfc3536..68dbc86438f2 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,3 +1,6 @@
+AUX tuxpaint-0.9.27-Makefile.patch 5112 BLAKE2B fd6ddb8249373189bf577171d188af5b7f6afd662097f10a814ede17d9d39466d7919814935900cdcb96379f8a9a5f65def60a0ab12eae94b1d7d70c804d1c9e SHA512 5e543962d059c3825987f8c786888313f95e8f7b4a0910ef36b2e329055b0dff4acd06792665a3bacf27b2007080a84cb31901c4f659d72ec043f66962d3ac98
 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
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
new file mode 100644
index 000000000000..7fd2e3ded8ec
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
@@ -0,0 +1,117 @@
+--- 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:=
+@@ -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
+ 
+@@ -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)
+@@ -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/tuxpaint-0.9.27.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
new file mode 100644
index 000000000000..7a1dffc5100d
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -0,0 +1,63 @@
+# 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
+	virtual/imagemagick-tools
+	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
+}