[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2024-06-24 Thread Sam James
commit: 61c60f951b964e0726d111d74c8ef38c604681bb
Author: Sam James  gentoo  org>
AuthorDate: Tue Jun 25 00:11:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jun 25 00:11:07 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61c60f95

media-gfx/tuxpaint: Stabilize 0.9.31-r1 amd64, #934811

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
index 33f527fd82ac..1be1e1d0fdb1 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/

2024-06-17 Thread Conrad Kostecki
commit: 96de139c8e07f70a37ac7e89fab4876ddbfb6593
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun May 26 10:25:33 2024 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Jun 17 22:33:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96de139c

media-gfx/tuxpaint: drop old

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/36825
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-gfx/tuxpaint/Manifest|   2 -
 .../files/tuxpaint-0.9.28-r2-Makefile.patch| 231 -
 .../files/tuxpaint-0.9.29-Makefile-trans.patch |  30 ---
 .../tuxpaint/files/tuxpaint-0.9.29-Makefile.patch  | 164 ---
 media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild   |  65 --
 media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild   |  66 --
 6 files changed, 558 deletions(-)

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 50d41b326b2a..5a7935a9caa0 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,3 +1 @@
-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.28-r2-Makefile.patch 
b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
deleted file mode 100644
index 6ea373620e3e..
--- 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
- #  is the directory containing support files for building for 
:
- #   /includeHeader files.
- #   /libLibrary files.
--#   /lib/pkgconfig  *.pc files.
-+#   /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$(CURS

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2024-05-19 Thread Sam James
commit: fbb19901a35c40c8225bca4ae1051b3b58f8fd29
Author: Sam James  gentoo  org>
AuthorDate: Sun May 19 17:05:04 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 19 17:08:22 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fbb19901

media-gfx/tuxpaint: backport removal of USE=svg on GM dep

Signed-off-by: Sam James  gentoo.org>

 .../tuxpaint/{tuxpaint-0.9.28-r2.ebuild => tuxpaint-0.9.28-r3.ebuild}   | 2 +-
 .../tuxpaint/{tuxpaint-0.9.29.ebuild => tuxpaint-0.9.29-r1.ebuild}  | 2 +-
 media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild
similarity index 97%
rename from media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
rename to media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild
index 4b95e1fa770a..460469ada58d 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.28-r3.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
dev-util/gperf
-   media-gfx/graphicsmagick[jpeg,png,svg]
+   media-gfx/graphicsmagick[jpeg,png]
sys-devel/gettext
 "
 

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild
similarity index 97%
rename from media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
rename to media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild
index 1b97b9dcf009..3b3a59f7cfb6 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.29-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
dev-util/gperf
-   media-gfx/graphicsmagick[jpeg,png,svg]
+   media-gfx/graphicsmagick[jpeg,png]
sys-devel/gettext
 "
 

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
index 153456642965..ff77b85852e0 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
dev-util/gperf
-   media-gfx/graphicsmagick[jpeg,png,svg]
+   media-gfx/graphicsmagick[jpeg,png]
sys-devel/gettext
 "
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2024-05-19 Thread Sam James
commit: 90f3e3da8d161d45c9cdb1e532c4c3121f5d063f
Author: Holger Hoffstätte  applied-asynchrony  com>
AuthorDate: Sun May 19 14:01:48 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun May 19 17:01:37 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90f3e3da

media-gfx/tuxpaint: remove USE=svg from graphicsmagick

Closes: https://github.com/gentoo/gentoo/pull/36742
Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild | 65 
 1 file changed, 65 insertions(+)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
new file mode 100644
index ..33f527fd82ac
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2024 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="https://www.tuxpaint.org/";
+SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz";
+S="${WORKDIR}"/${P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="
+   app-text/libpaper:=
+   dev-libs/fribidi
+   gnome-base/librsvg:2
+   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]
+   sys-devel/gettext
+"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-Makefile.patch
+)
+
+src_compile() {
+   emake CC="$(tc-getCC)" GENTOO_LIBDIR="$(get_libdir)"
+}
+
+src_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}
+   size=${size%%x*}
+   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
+}
+
+pkg_postinst() {
+   xdg_pkg_postinst
+   optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2024-03-22 Thread Arthur Zamarin
commit: bbfa22545e758bb59655328ab9a29ae39cf968bf
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 22 13:16:18 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 22 13:16:18 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfa2254

media-gfx/tuxpaint-stamps: Stabilize 20230402 ppc, #926851

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
index df5d9a69f12b..86ec92677d83 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2024-03-22 Thread Arthur Zamarin
commit: 6748fae3adee029c4e2407f7d37b2c2457e9430f
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 22 13:14:23 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 22 13:14:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6748fae3

media-gfx/tuxpaint: Stabilize 0.9.31 ppc, #926850

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
index a19876f504c7..2f22fa74dacd 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2024-03-13 Thread Joonas Niilola
commit: 9997112b02c8a828f8d08bce90e7262fa7fc0536
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Mar 13 08:56:23 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Mar 13 08:56:23 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9997112b

media-gfx/tuxpaint-stamps: Stabilize 20230402 x86, #926851

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
index cc07fb0e3fc7..df5d9a69f12b 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2024-03-12 Thread Arthur Zamarin
commit: 66473d712d2f7f8437d899d7d57b40fe60f8d98a
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Wed Mar 13 06:26:33 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Wed Mar 13 06:26:33 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66473d71

media-gfx/tuxpaint: Stabilize 0.9.31 amd64, #926850

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
index 895224b19164..a19876f504c7 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2024-03-12 Thread Sam James
commit: 91e30318d8257f692cea88bd73265b272a44946d
Author: Sam James  gentoo  org>
AuthorDate: Wed Mar 13 00:53:26 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Mar 13 00:53:26 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91e30318

media-gfx/tuxpaint: Stabilize 0.9.31 x86, #926850

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
index 24afdcf2e995..895224b19164 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2024-03-12 Thread Arthur Zamarin
commit: 8de7dee5c2af1c775416e475c6f3d5630d0ca2f8
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Tue Mar 12 19:29:31 2024 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Tue Mar 12 19:29:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8de7dee5

media-gfx/tuxpaint-stamps: Stabilize 20230402 amd64, #926851

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
index f3bf7e03560c..cc07fb0e3fc7 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.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
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/

2024-01-11 Thread Joonas Niilola
commit: 3b16a6f7c845933de1f78dad6c3db854600664db
Author: Philipp Rösner  protonmail  com>
AuthorDate: Tue Oct 31 21:47:06 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 11 13:32:56 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b16a6f7

media-gfx/tuxpaint: add 0.9.31

Adjust Makefile patch to upstream changes to Makefile.
Respect EPREFIX in Makefile patch.

Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/33615
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/Manifest|   1 +
 .../tuxpaint/files/tuxpaint-0.9.31-Makefile.patch  | 159 +
 media-gfx/tuxpaint/tuxpaint-0.9.31.ebuild  |  65 +
 3 files changed, 225 insertions(+)

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index eb4fb24e1775..50d41b326b2a 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,2 +1,3 @@
 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.31-Makefile.patch 
b/media-gfx/tuxpaint/files/tuxpaint-0.9.31-Makefile.patch
new file mode 100644
index ..fc35fb9b0212
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.31-Makefile.patch
@@ -0,0 +1,159 @@
+# Replace "lib" with GENTOO_LIBDIR, remove .gz suffixes and 
+# replace ImageMagick calls by GraphicsMagick calls.
+--- a/Makefile
 b/Makefile
+@@ -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)/$(GENTOO_LIBDIR)/pkgconfig
+   endif
+ endif
+ 
+@@ -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}
+ 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)
+ 
+@@ -213,7 +213,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
+ windows_PREFIX:=/usr/local
+ macos_PREFIX:=Resources
+ ios_PREFIX:=.
+-linux_PREFIX:=/usr/local
++linux_PREFIX:=${EPREFIX}/usr
+ PREFIX:=$($(OS)_PREFIX)
+ 
+ # Root directory to place files when creating packages.
+@@ -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)
++DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}
+ MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ 
+@@ -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:=-resize 264x160 -background white -extent 0x0

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/

2024-01-11 Thread Joonas Niilola
commit: 0d2576134095973eef22132d7456133e82dd8c1b
Author: Philipp Rösner  protonmail  com>
AuthorDate: Tue Oct 31 21:42:46 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jan 11 13:31:16 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0d257613

media-gfx/tuxpaint: drop 0.9.27-r1

Signed-off-by: Philipp Rösner  protonmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/Manifest|   1 -
 .../tuxpaint/files/tuxpaint-0.9.27-Makefile.patch  | 159 -
 media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild   |  63 
 3 files changed, 223 deletions(-)

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index fdf65c4da48d..eb4fb24e1775 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,3 +1,2 @@
-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

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..
--- 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
- #  is the directory containing support files for building for 
:
- #   /includeHeader files.
- #   /libLibrary files.
--#   /lib/pkgconfig  *.pc files.
-+#   /$(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

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2023-11-02 Thread Arthur Zamarin
commit: b150a74acb54ed953ed82ba9395b7815b51f16ac
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Thu Nov  2 18:15:57 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Thu Nov  2 18:15:57 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b150a74a

media-gfx/tuxpaint: Stabilize 0.9.29 ppc, #914853

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
index 8b4c5f47f626..2c871dc42c61 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2023-10-13 Thread Joonas Niilola
commit: 9ad0d7234eda4dc221774845753ac13b4da90388
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Oct 14 05:54:06 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Oct 14 05:54:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad0d723

media-gfx/tuxpaint-stamps: Keyword 20230402 ppc, #914854

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
index 00d2eba29bd0..f3bf7e03560c 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2023-10-13 Thread Arthur Zamarin
commit: 7ea9e1ebd8c0055ccf581a57f394dfb46d962f72
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Oct 13 20:18:40 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Oct 13 20:18:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ea9e1eb

media-gfx/tuxpaint-stamps: Keyword 20230402 x86, #914854

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
index babfc8731419..00d2eba29bd0 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2023-08-01 Thread Joonas Niilola
commit: 1a598dbac5db1acc749a11ee7b1e1565caa9bb4f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Aug  2 06:53:05 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Aug  2 06:53:05 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a598dba

media-gfx/tuxpaint: Keyword 0.9.29 ppc, #908286

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
index 04b1dc216b23..c7a1876112aa 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2023-07-26 Thread Joonas Niilola
commit: 85010269e759e25c1c8bf3c7ca98022c5e0d51e3
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jul 27 06:39:52 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 27 06:39:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85010269

media-gfx/tuxpaint: Keyword 0.9.29 x86, #908286

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
index 731349814034..04b1dc216b23 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2023-06-02 Thread Joonas Niilola
commit: d16481972388d9f7fa44dca0070e5588cc2bcf90
Author: Philipp Rösner  protonmail  com>
AuthorDate: Thu Apr  6 06:55:08 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun  2 15:34:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1648197

media-gfx/tuxpaint-stamps: add 20230402

Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30499
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint-stamps/Manifest |  1 +
 .../tuxpaint-stamps-20230402.ebuild| 29 ++
 2 files changed, 30 insertions(+)

diff --git a/media-gfx/tuxpaint-stamps/Manifest 
b/media-gfx/tuxpaint-stamps/Manifest
index e8971a6a867f..0b8f42a84756 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1,3 +1,4 @@
 DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 BLAKE2B 
a9c11b846d60bb4de5bfaa721a24254fb6510bfddeca54f398ebf941f2fd74f546eaf3cdf7cd65932835e2e72993d6627f6247c7dc4a4488d2d2b2174c04455a
 SHA512 
ca059275484bec045c4f2bad414ea5359d2a8812cc1c8d1e11ad8f3b7e63e107c1fccc347291ffe95d81a5192b39198c56d319ef6a0f475fb128d9a2d0e5e027
 DIST tuxpaint-stamps-2021.11.25.tar.gz 193603076 BLAKE2B 
16cf8e9792261608bb77fdb97ba9828671a44b6ba939c5644e9d1c256bc2f9055becf70a336a8acd8b5b8f5e07d1f51a3a39eb7aeb267450ac6d848a500cbb0e
 SHA512 
db353ad0635a0f06960d0ec0c1eabda26bffa4672e5c56099ed02c2db9e109b4dbdd17327eadce8a1779b5d0fe51503988b56dafd4e47e9ad4f978e2a7ba2c10
 DIST tuxpaint-stamps-2022.06.04.tar.gz 215615180 BLAKE2B 
a01428a1bbb0acc623f533bd2ae36527740e7a8032d5576109c36d4f8c8d3d7d1e9ed8ceaa8f9a3e15f7f932634033bee7c6336184727a3afdafb6bb8eb93731
 SHA512 
a02b4265b436fb48dd1e06e57c238c78f90a4894691795772a93ffb2287ee6c608e1fb75ff93527d29c73aea1a10ecb3c8acf9e1325ff01aecc443bd01fa6bb8
+DIST tuxpaint-stamps-2023.04.02.tar.gz 221833740 BLAKE2B 
cf7e2976e2906d1598edf311d7353ae8856a308041d0353d5c35aa391f365bb823db2685af2d84057eb19b40e2a395788a60c02e5c96ce4b89669403439d30b1
 SHA512 
57ebc9ffbbd087ec191bfcdbb09fdecc9b2f7167393aeeecae85ca90ca9b14de44c0a1677bcd57945cf00a8dc413ed908c80f933e151ffb6acd1a849ed7dc222

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
new file mode 100644
index ..babfc8731419
--- /dev/null
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20230402.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
+
+DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
+HOMEPAGE="https://www.tuxpaint.org/stamps";
+SRC_URI="mirror://sourceforge/tuxpaint/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="media-gfx/tuxpaint"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-20211125-make-382.patch
+)
+
+src_install() {
+   emake PREFIX="${D}/usr" install-all
+
+   rm docs/COPYING.txt || die
+   dodoc docs/*.txt
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/

2023-06-02 Thread Joonas Niilola
commit: 945cc3e557cf8a35f8677a2b447886c8178119df
Author: Philipp Rösner  protonmail  com>
AuthorDate: Thu Apr  6 06:52:50 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun  2 15:34:02 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=945cc3e5

media-gfx/tuxpaint: add 0.9.29

Tuxpaint version 0.9.29 and further only supports
sdl2. Therefore, switched to sdl2 in this ebuild.
Also include an upstream patch for fixing the problem
of the trans directory not being created before it is
used.

Signed-off-by: Philipp Rösner  protonmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/Manifest|   1 +
 .../files/tuxpaint-0.9.29-Makefile-trans.patch |  30 
 .../tuxpaint/files/tuxpaint-0.9.29-Makefile.patch  | 164 +
 media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild  |  66 +
 4 files changed, 261 insertions(+)

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 602f0fbbc91e..fdf65c4da48d 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,2 +1,3 @@
 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

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
new file mode 100644
index ..20868602f65b
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile-trans.patch
@@ -0,0 +1,30 @@
+# 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.29-Makefile.patch
new file mode 100644
index ..e0b1c43a03bb
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.29-Makefile.patch
@@ -0,0 +1,164 @@
+diff --git a/Makefile.old b/Makefile
+index 88d0d02..ab71f97 100644
+--- a/Makefile.old
 b/Makefile
+@@ -74,7 +74,7 @@ endif
+ #  is the directory containing support files for building for 
:
+ #   /includeHeader files.
+ #   /libLibrary files.
+-#   /lib/pkgconfig  *.pc files.
++#   /pkgconfig  *.pc files.
+ #
+ ifdef HOST
+   ifdef HOSTROOT
+@@ -105,7 +105,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
+ 
+@@ -171,14 +171,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_LD

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2023-06-02 Thread Joonas Niilola
commit: 21d29472ea4f9c871a44dc995af24721c5c94213
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Jun  2 15:34:26 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jun  2 15:34:26 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21d29472

media-gfx/tuxpaint: remove subslot binder from media-libs/sdl2-gfx

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
index 84464c6a3d04..731349814034 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.29.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
>=media-libs/freetype-2:2
>=media-libs/libpng-1.2:0=
media-libs/libsdl2[X,joystick]
-   media-libs/sdl2-gfx:=
+   media-libs/sdl2-gfx
media-libs/sdl2-image[png]
media-libs/sdl2-mixer
media-libs/sdl2-pango



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2023-03-14 Thread Joonas Niilola
commit: e918a426119c912adc2a6d300903470771df020e
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Mar 14 06:59:12 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar 14 08:05:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e918a426

media-gfx/tuxpaint: Stabilize 0.9.28-r2 ppc, #891417

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
index 1ee910e78064..4f052a0122e2 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}-sdl1
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2023-03-14 Thread Joonas Niilola
commit: 909f7edfb43e1e7915dc9893f74f993ff769c2d2
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Mar 14 06:58:34 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Mar 14 08:05:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=909f7edf

media-gfx/tuxpaint-stamps: Stabilize 20220604 ppc, #891419

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
index ec244599c313..58b34931ec63 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/

2023-01-31 Thread Conrad Kostecki
commit: 3a61a87fb0377487cae6802751ec18e0629fdc40
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Jan 21 11:36:35 2023 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Wed Feb  1 01:13:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a61a87f

media-gfx/tuxpaint: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29203
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../tuxpaint/files/tuxpaint-0.9.28-Makefile.patch  | 158 -
 1 file changed, 158 deletions(-)

diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch 
b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch
deleted file mode 100644
index f5a0ac3b76bb..
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch
+++ /dev/null
@@ -1,158 +0,0 @@
 a/Makefile
-+++ b/Makefile
-@@ -73,7 +73,7 @@ endif
- #  is the directory containing support files for building for 
:
- #   /includeHeader files.
- #   /libLibrary files.
--#   /lib/pkgconfig  *.pc files.
-+#   /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)/$(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.
-@@ -244,7 +244,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
- 
-@@ -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:
- 
-@@ -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
-@@ -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
- 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2023-01-20 Thread Joonas Niilola
commit: e3f15e05ffd494b9691fc41e69639721861acc50
Author: Philipp Rösner  protonmail  com>
AuthorDate: Mon Jan  9 16:38:52 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jan 20 13:50:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3f15e05

media-gfx/tuxpaint: 0.9.28-r2: fix parallel build

The fix for https://bugs.gentoo.org/887391
resolved the parallel build issues, thus remove
-j1 from emake.

Bug: https://bugs.gentoo.org/887391
Closes: https://bugs.gentoo.org/859169
Signed-off-by: Philipp Rösner  protonmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
index e8221ae4e7d1..1ee910e78064 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
@@ -46,9 +46,7 @@ src_compile() {
 }
 
 src_install() {
-   # Parallel install may break the building process
-   # See: https://bugs.gentoo.org/859169
-   emake -j1 DESTDIR="${D}" GENTOO_LIBDIR="$(get_libdir)" 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}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2023-01-20 Thread Joonas Niilola
commit: 60158f76bf7deef59ac31ba39126076151944d33
Author: Philipp Rösner  protonmail  com>
AuthorDate: Mon Jan  9 16:43:42 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Jan 20 13:50:36 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60158f76

media-gfx/tuxpaint: drop 0.9.24-r2, 0.9.28-r1

Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/29036
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/Manifest  |  1 -
 media-gfx/tuxpaint/tuxpaint-0.9.24-r2.ebuild | 71 
 media-gfx/tuxpaint/tuxpaint-0.9.28-r1.ebuild | 67 --
 3 files changed, 139 deletions(-)

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index af5f57e33be0..602f0fbbc91e 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,3 +1,2 @@
-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/tuxpaint-0.9.24-r2.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24-r2.ebuild
deleted file mode 100644
index 324da8c01842..
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-   x11-libs/cairo
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-   dev-util/gperf
-   media-gfx/imagemagick[jpeg,png,svg]
-   sys-devel/gettext
-"
-
-src_prepare() {
-   xdg_src_prepare
-
-   sed -i \
-   -e 's|linux_ARCH_INSTALL:=install-xdg|linux_ARCH_INSTALL:=|' \
-   -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
-   -e "s:/lib/:/$(get_libdir)/:g" \
-   -e 
's:/share/doc/tuxpaint-$(VER_VERSION)/:'"/share/doc/${PF}/:g" \
-   -e '/@gzip -f/d' \
-   -e '/@chmod a+rx,g-w,o-w $(MAN_PREFIX)/d' \
-   -e "s|linux_ARCH_CFLAGS:=|linux_ARCH_CFLAGS:= ${CFLAGS}|" \
-   Makefile || die
-}
-
-src_compile() {
-   # parallel build may break things
-   emake -j1 CC="$(tc-getCC)"
-}
-
-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-r1.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.28-r1.ebuild
deleted file mode 100644
index 22513e2bb481..
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28-r1.ebuild
+++ /dev/null
@@ -1,67 +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="https://www.tuxpaint.org/";
-SRC_URI="mirror://sourceforge/${PN}/${P}-sdl1.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P}-sdl1
-
-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/li

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2023-01-19 Thread Sam James
commit: 935c3f95acb38c14c15e45a65868ee178c768da3
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 20 01:34:17 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 20 01:34:17 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=935c3f95

media-gfx/tuxpaint-stamps: Stabilize 20220604 x86, #891419

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
index 208c745bd51f..7487f13bbe7f 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="~amd64 ~ppc x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2023-01-19 Thread Sam James
commit: d175654967cc9410b6dbc7a6ff0da55bff1a7896
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 20 01:34:18 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 20 01:34:18 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1756549

media-gfx/tuxpaint-stamps: Stabilize 20220604 amd64, #891419

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
index 7487f13bbe7f..ec244599c313 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2023-01-19 Thread Sam James
commit: bdbb8d5441fcdc6d869e5d26c82acd30530e1691
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 20 01:23:11 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 20 01:23:11 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bdbb8d54

media-gfx/tuxpaint: Stabilize 0.9.28-r2 x86, #891417

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
index 97c11f8d2d8a..e8221ae4e7d1 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}-sdl1
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2023-01-19 Thread Sam James
commit: 9b5ef49028636d5a51164a27a8ece9066e0141cd
Author: Sam James  gentoo  org>
AuthorDate: Fri Jan 20 01:23:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jan 20 01:23:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b5ef490

media-gfx/tuxpaint: Stabilize 0.9.28-r2 amd64, #891417

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
index df038424e67a..97c11f8d2d8a 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${P}-sdl1
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
app-text/libpaper:=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/

2022-12-23 Thread Sam James
commit: e22b3e79e2712c8374fe435b0fb68c481270117e
Author: Philipp Rösner  protonmail  com>
AuthorDate: Wed Dec 21 22:22:35 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec 24 07:16:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e22b3e79

media-gfx/tuxpaint: fix parallel build (--shuffle) issues in -0.9.28-r2

Building media-gfx/tuxpaint-0.9.28-r2 with MAKEOPTS="--shuffle"
resulted in multiple build failures due to missing
dependencies.
Add missing dependencies to the Makefile.

Closes: https://bugs.gentoo.org/883621
Closes: https://bugs.gentoo.org/887391
Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28750
Signed-off-by: Sam James  gentoo.org>

 .../files/tuxpaint-0.9.28-r2-Makefile.patch| 71 +-
 1 file changed, 69 insertions(+), 2 deletions(-)

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): ma

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/

2022-10-12 Thread Joonas Niilola
commit: 1527c6c77dba4b0616131396eac4f328504dbabd
Author: Philipp Rösner  protonmail  com>
AuthorDate: Wed Sep 28 17:13:22 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Oct 12 16:23:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1527c6c7

media-gfx/tuxpaint: fix LIBDIR, fix doc on 0.9.28

The LIBDIR variable defined while calling emake
collides with the LIBDIR variable defined in the tuxpaint
Makefile, resulting in magic tools not getting linked
properly.
Renaming LIBDIR to GENTOO_LIBDIR resolves this issue.

Furthermore, a patch for the DOC_PREFIX variable in the
Makefile was missing, resulting in installation of files
into unexpected paths.

Bug: https://bugs.gentoo.org/873286
Bug: https://bugs.gentoo.org/870232
Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/27518
Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/tuxpaint-0.9.28-r2-Makefile.patch| 164 +
 media-gfx/tuxpaint/tuxpaint-0.9.28-r2.ebuild   |  67 +
 2 files changed, 231 insertions(+)

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
new file mode 100644
index ..1b513f714c05
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-r2-Makefile.patch
@@ -0,0 +1,164 @@
+--- a/Makefile
 b/Makefile
+@@ -73,7 +73,7 @@ endif
+ #  is the directory containing support files for building for 
:
+ #   /includeHeader files.
+ #   /libLibrary files.
+-#   /lib/pkgconfig  *.pc files.
++#   /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:
+ 
+@@ -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
+@@ -719,12 +719,12 @@ uninstall:   uninstall-i18n
+   -rm $(BIN_PREFIX)/tuxpaint-import
+   -rm

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-09-15 Thread Sam James
commit: 68fe2e0cfc10d12afd4a961af4257b86ac54790c
Author: Sam James  gentoo  org>
AuthorDate: Thu Sep 15 13:16:30 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep 15 13:16:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68fe2e0c

media-gfx/tuxpaint: add libpaper slot dep

ABI broke.

Signed-off-by: Sam James  gentoo.org>

 .../tuxpaint/{tuxpaint-0.9.24-r1.ebuild => tuxpaint-0.9.24-r2.ebuild} | 4 ++--
 .../tuxpaint/{tuxpaint-0.9.27.ebuild => tuxpaint-0.9.27-r1.ebuild}| 2 +-
 .../tuxpaint/{tuxpaint-0.9.28.ebuild => tuxpaint-0.9.28-r1.ebuild}| 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24-r1.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24-r2.ebuild
similarity index 96%
rename from media-gfx/tuxpaint/tuxpaint-0.9.24-r1.ebuild
rename to media-gfx/tuxpaint/tuxpaint-0.9.24-r2.ebuild
index 95da9599811f..324da8c01842 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24-r1.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
-   app-text/libpaper
+   app-text/libpaper:=
dev-libs/fribidi
gnome-base/librsvg:2
>=media-libs/libpng-1.2:0=

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild
similarity index 98%
rename from media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
rename to media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild
index b9d1e8f71b96..7cca8f0ed211 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27-r1.ebuild
@@ -14,7 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
-   app-text/libpaper
+   app-text/libpaper:=
dev-libs/fribidi
gnome-base/librsvg:2
>=media-libs/libpng-1.2:0=

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.28-r1.ebuild
similarity index 98%
rename from media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild
rename to media-gfx/tuxpaint/tuxpaint-0.9.28-r1.ebuild
index 2ea3a43d5863..22513e2bb481 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.28-r1.ebuild
@@ -15,7 +15,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
-   app-text/libpaper
+   app-text/libpaper:=
dev-libs/fribidi
gnome-base/librsvg:2
>=media-libs/libpng-1.2:0=



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2022-08-18 Thread Joonas Niilola
commit: abfb1cc02ec07d958b398a2d2f9f3d30c29a32eb
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Aug 18 20:30:11 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Aug 18 20:30:29 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abfb1cc0

media-gfx/tuxpaint-stamps: Stabilize 20211125 ppc, #865313

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
index 37bcb6e5a89e..1120a4741b3c 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2022-08-15 Thread Joonas Niilola
commit: 88a1a2af7b1600d40806a2a6a4943a074c595135
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 16 05:31:02 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 05:32:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88a1a2af

media-gfx/tuxpaint-stamps: Stabilize 20211125 amd64, #865313

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
index 5bbc7d186e65..091ff4d4af0a 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2022-08-15 Thread Joonas Niilola
commit: a56add27ed9c7fa7529897e9cd4b9b7a0e23aea9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Aug 16 05:31:53 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Aug 16 05:32:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a56add27

media-gfx/tuxpaint-stamps: Stabilize 20211125 x86, #865313

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
index 091ff4d4af0a..37bcb6e5a89e 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="media-gfx/tuxpaint"
 DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2022-07-21 Thread Joonas Niilola
commit: 53b9804152d7e2edc8ee093a0a3a4ea42b14afea
Author: Philipp Rösner  protonmail  com>
AuthorDate: Mon Jun 20 22:07:04 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 21 08:37:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b98041

media-gfx/tuxpaint-stamps: add 20220604

Added an ebuild for tuxpaint-stamps-2022.06.04.

Signed-off-by: Philipp Rösner  protonmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint-stamps/Manifest |  1 +
 .../tuxpaint-stamps-20220604.ebuild| 29 ++
 2 files changed, 30 insertions(+)

diff --git a/media-gfx/tuxpaint-stamps/Manifest 
b/media-gfx/tuxpaint-stamps/Manifest
index d0f79ab344c6..e8971a6a867f 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1,2 +1,3 @@
 DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 BLAKE2B 
a9c11b846d60bb4de5bfaa721a24254fb6510bfddeca54f398ebf941f2fd74f546eaf3cdf7cd65932835e2e72993d6627f6247c7dc4a4488d2d2b2174c04455a
 SHA512 
ca059275484bec045c4f2bad414ea5359d2a8812cc1c8d1e11ad8f3b7e63e107c1fccc347291ffe95d81a5192b39198c56d319ef6a0f475fb128d9a2d0e5e027
 DIST tuxpaint-stamps-2021.11.25.tar.gz 193603076 BLAKE2B 
16cf8e9792261608bb77fdb97ba9828671a44b6ba939c5644e9d1c256bc2f9055becf70a336a8acd8b5b8f5e07d1f51a3a39eb7aeb267450ac6d848a500cbb0e
 SHA512 
db353ad0635a0f06960d0ec0c1eabda26bffa4672e5c56099ed02c2db9e109b4dbdd17327eadce8a1779b5d0fe51503988b56dafd4e47e9ad4f978e2a7ba2c10
+DIST tuxpaint-stamps-2022.06.04.tar.gz 215615180 BLAKE2B 
a01428a1bbb0acc623f533bd2ae36527740e7a8032d5576109c36d4f8c8d3d7d1e9ed8ceaa8f9a3e15f7f932634033bee7c6336184727a3afdafb6bb8eb93731
 SHA512 
a02b4265b436fb48dd1e06e57c238c78f90a4894691795772a93ffb2287ee6c608e1fb75ff93527d29c73aea1a10ecb3c8acf9e1325ff01aecc443bd01fa6bb8

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
new file mode 100644
index ..208c745bd51f
--- /dev/null
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20220604.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
+
+DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
+HOMEPAGE="https://www.tuxpaint.org/stamps";
+SRC_URI="mirror://sourceforge/tuxpaint/${MY_P}.tar.gz"
+S="${WORKDIR}"/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="media-gfx/tuxpaint"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-20211125-make-382.patch
+)
+
+src_install() {
+   emake PREFIX="${D}/usr" install-all
+
+   rm docs/COPYING.txt || die
+   dodoc docs/*.txt
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2022-07-21 Thread Joonas Niilola
commit: cb158ffb297983c533aa5e19b90c8bb5189255cf
Author: Philipp Rösner  protonmail  com>
AuthorDate: Mon Jun 20 22:10:04 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 21 08:37:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb158ffb

media-gfx/tuxpaint-stamps: add myself as a maintainer

Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26011
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint-stamps/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint-stamps/metadata.xml 
b/media-gfx/tuxpaint-stamps/metadata.xml
index d96cbc60d720..56049e397756 100644
--- a/media-gfx/tuxpaint-stamps/metadata.xml
+++ b/media-gfx/tuxpaint-stamps/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-  
+  
+rndxelem...@protonmail.com
+Philipp Rösner
+  
+  
+proxy-ma...@gentoo.org
+Proxy Maintainers
+  
   
 tuxpaint
   



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-07-21 Thread Joonas Niilola
commit: a96a17f067b702910a829f495283b93a042045ea
Author: Joonas Niilola  gentoo  org>
AuthorDate: Thu Jul 21 08:36:35 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 21 08:37:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a96a17f0

media-gfx/tuxpaint: add missing RDEPEND for libsdl[X]

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild
index ea4f39c18847..2ea3a43d5863 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild
@@ -8,7 +8,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}-sdl1.tar.gz -> ${P}.tar.gz"
-S=${WORKDIR}/${P}-sdl1
+S="${WORKDIR}"/${P}-sdl1
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -20,7 +20,7 @@ RDEPEND="
gnome-base/librsvg:2
>=media-libs/libpng-1.2:0=
>=media-libs/freetype-2:2
-   media-libs/libsdl[joystick]
+   media-libs/libsdl[X,joystick]
media-libs/sdl-image[png]
media-libs/sdl-mixer
media-libs/sdl-pango



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/

2022-07-21 Thread Joonas Niilola
commit: f595bc4a618c8e880688c5b3000fcaaadf6c8691
Author: Philipp Rösner  protonmail  com>
AuthorDate: Mon Jun 20 22:03:45 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Jul 21 08:37:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f595bc4a

media-gfx/tuxpaint: add 0.9.28

Add an ebuild for tuxpaint-0.9.28, celebrating 20 years of tuxpaint.

Signed-off-by: Philipp Rösner  protonmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/Manifest|   1 +
 .../tuxpaint/files/tuxpaint-0.9.28-Makefile.patch  | 158 +
 media-gfx/tuxpaint/tuxpaint-0.9.28.ebuild  |  67 +
 3 files changed, 226 insertions(+)

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 9670ea86fc54..af5f57e33be0 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,2 +1,3 @@
 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-Makefile.patch 
b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch
new file mode 100644
index ..f5a0ac3b76bb
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.28-Makefile.patch
@@ -0,0 +1,158 @@
+--- a/Makefile
 b/Makefile
+@@ -73,7 +73,7 @@ endif
+ #  is the directory containing support files for building for 
:
+ #   /includeHeader files.
+ #   /libLibrary files.
+-#   /lib/pkgconfig  *.pc files.
++#   /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)/$(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.
+@@ -244,7 +244,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
+ 
+@@ -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 -inte

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-06-16 Thread Sam James
commit: b7e948de20d74bd90b0a8d34875b0d4eb39843fb
Author: Thomas Bracht Laumann Jespersen  laumann  xyz>
AuthorDate: Wed Jun  8 20:04:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 16 16:30:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7e948de

media-gfx/tuxpaint: fix unquoted variable FILESDIR

Signed-off-by: Thomas Bracht Laumann Jespersen  laumann.xyz>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index e66114bec40f..b9d1e8f71b96 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -36,7 +36,7 @@ BDEPEND="
 "
 
 PATCHES=(
-   ${FILESDIR}"/${P}-Makefile.patch"
+   "${FILESDIR}"/${P}-Makefile.patch
 )
 
 src_compile() {



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/

2022-05-17 Thread Sam James
commit: cdf568b226e12d72bce5c93366cef2450c0da4a6
Author: Philipp Rösner  protonmail  com>
AuthorDate: Tue May 17 20:10:15 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 17 20:20:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdf568b2

media-gfx/tuxpaint: fix missing LDFLAGS

The patch for the Makefile missed the ${LDFLAGS}.

Closes: https://bugs.gentoo.org/831451
Signed-off-by: Philipp Rösner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/25541
Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch | 9 +
 1 file changed, 9 insertions(+)

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 fdbd5136f322..05b37e1e4812 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
@@ -27,6 +27,15 @@
  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



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-03-18 Thread Arthur Zamarin
commit: 6b645b81875672818fba97c68c58a50219047ee5
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Mar 18 08:11:27 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Mar 18 08:11:27 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6b645b81

media-gfx/tuxpaint: Stabilize 0.9.27 ppc, #835091

Signed-off-by: Arthur Zamarin  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index 025d13c02c2f..e66114bec40f 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
app-text/libpaper



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-03-14 Thread Agostino Sarubbo
commit: 56b58511a50f3fed652d593db02e02b89781b83f
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 14 18:35:26 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 14 18:35:26 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b58511

media-gfx/tuxpaint: x86 stable wrt bug #835091

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index 0154e309cf93..025d13c02c2f 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
app-text/libpaper



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-03-14 Thread Agostino Sarubbo
commit: 4f45adf73e80d8928adb6a7513685c3bba325446
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Mon Mar 14 18:32:46 2022 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Mon Mar 14 18:32:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f45adf7

media-gfx/tuxpaint: amd64 stable wrt bug #835091

Package-Manager: Portage-3.0.30, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index 393cf77443e4..0154e309cf93 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
app-text/libpaper



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-01-18 Thread Sam James
commit: 7af15637212d496880984733769f52f0296633e5
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 19 01:14:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 19 01:14:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7af15637

media-gfx/tuxpaint: fix PkgMetadataXmlIndentation

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/metadata.xml | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index 673c02bcf819..ac2c835af229 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/metadata.xml
@@ -9,14 +9,14 @@
proxy-ma...@gentoo.org
Proxy Maintainers

-  
-  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.
-
-  
-tuxpaint
-  
+   
+   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.
+   
+   
+   tuxpaint
+   
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/

2022-01-18 Thread Sam James
commit: 38298eaad5e5fbd13aeab71e5753e1e79987b845
Author: Philipp Rösner  protonmail  com>
AuthorDate: Sun Jan 16 21:44:27 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 19 00:48:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38298eaa

media-gfx/tuxpaint: switched to graphicsmagick

We switched from virtual/imagemagic-tools to media-gfx/graphicsmagic and
added required use flags to the media-gfx/graphicsmagic build dependency.

Bug: https://bugs.gentoo.org/831292
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Philipp Roesner  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../tuxpaint/files/tuxpaint-0.9.27-Makefile.patch  | 37 --
 media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild  |  2 +-
 2 files changed, 36 insertions(+), 3 deletions(-)

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
  #  is the directory containing support files for building for 
:
  #   /includeHeader 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/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
 "
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-01-18 Thread Sam James
commit: 8e7f53a88ad89a5bb4452cb8c527e0dc5af3836d
Author: Philipp Rösner  protonmail  com>
AuthorDate: Tue Jan 18 23:15:46 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 19 00:48:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7f53a8

media-gfx/tuxpaint: take over maintainership

Added Philipp Rösner as proxied maintainer for media-gfx/tuxpaint.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Philipp Roesner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23835
Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/metadata.xml | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index b325571bdc70..673c02bcf819 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/metadata.xml
@@ -1,7 +1,14 @@
 
 https://www.gentoo.org/dtd/metadata.dtd";>
 
-  
+   
+   rndxelem...@protonmail.com
+   Philipp Rösner
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
   
   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



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2022-01-15 Thread Sam James
commit: 7fa310e710a2b2a8e09ee64d8817d13bef9e548c
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 16 01:36:45 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:36:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7fa310e7

media-gfx/tuxpaint-stamps: drop unnecessary src_prepare

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
index be6dba848c30..5bbc7d186e65 100644
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
@@ -8,7 +8,7 @@ MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
 DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
 HOMEPAGE="http://www.tuxpaint.org/";
 SRC_URI="mirror://sourceforge/tuxpaint/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -21,10 +21,6 @@ PATCHES=(
"${FILESDIR}"/${P}-make-382.patch
 )
 
-src_prepare() {
-   default
-}
-
 src_install() {
emake PREFIX="${D}/usr" install-all
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-01-15 Thread Sam James
commit: 26f3467ffeca80422dc2b68a7d2d32a1de518974
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan 16 01:34:53 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:34:58 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26f3467f

media-gfx/tuxpaint: destabilize 0.9.27 for ~amd64, ~ppc, ~x86

Accidentally pushed as stable.

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index 43abb09a491e..7a1dffc5100d 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ppc x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 RDEPEND="
app-text/libpaper



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/files/, media-gfx/tuxpaint/

2022-01-15 Thread Sam James
commit: cf9acaa5689862e0d346cef31ea735bd9215f711
Author: Philipp Rösner  protonmail  com>
AuthorDate: Sat Jan  8 00:04:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:33:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9acaa5

media-gfx/tuxpaint: cleaned up src_prepare

We fixed the QA issue that man pages were stored as .gz.
Also we moved the sed call in src_prepare to a patch file.

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Philipp Roesner  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../tuxpaint/files/tuxpaint-0.9.27-Makefile.patch  | 117 +
 media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild  |  25 ++---
 2 files changed, 124 insertions(+), 18 deletions(-)

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 ..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
+ #  is the directory containing support files for building for 
:
+ #   /includeHeader files.
+ #   /libLibrary files.
+-#   /lib/pkgconfig  *.pc files.
++#   /$(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 
$(B

[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2022-01-15 Thread Sam James
commit: c8ebeb61ccd1041ea4f0a5ba5d74c2693efa2c7b
Author: Philipp Rösner  protonmail  com>
AuthorDate: Fri Jan  7 23:17:24 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:33:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8ebeb61

media-gfx/tuxpaint: version bump to 0.9.27

We added an ebuild for tuxpaint-0.9.27.
We also added support for EAPI 8, added necessary dependencies
and did minor cleanup.

Closes: https://bugs.gentoo.org/767223
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Philipp Roesner  protonmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/Manifest   |  1 +
 media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 74 +++
 2 files changed, 75 insertions(+)

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 9a3f246ba0d6..9670ea86fc54 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1 +1,2 @@
 DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 
971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4
 SHA512 
a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723
+DIST tuxpaint-0.9.27.tar.gz 14292992 BLAKE2B 
f1337b828604bac968325437eba21046f871a0e07e049f2d3568f44adac400e729f4c6d46bcba9eddf9078089aaf55aab7d0774fb5ab126b96d317b59e37ee00
 SHA512 
197c6e23fb772edd57614e34dec23e160ece528b58e4a17d67fe4100c58cbcd6c4b5efccfbb24ca760b3a20755230b47f4e3e49969e75ba04ce722102a7f2dd9

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 ..9fbfe4c29e7b
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -0,0 +1,74 @@
+# 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-gfx/libimagequant
+   >=media-libs/libpng-1.2:0=
+   >=media-libs/freetype-2:2
+   media-libs/libsdl[joystick]
+   media-libs/sdl-gfx
+   media-libs/sdl-image[png]
+   media-libs/sdl-mixer
+   media-libs/sdl-pango
+   media-libs/sdl-ttf
+   x11-libs/cairo
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/gperf
+   virtual/imagemagick-tools
+   sys-devel/gettext
+"
+
+src_prepare() {
+
+   sed -i \
+   -e 's|linux_ARCH_INSTALL:=install-xdg|linux_ARCH_INSTALL:=|' \
+   -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
+   -e "s:/lib/:/$(get_libdir)/:g" \
+   -e 
's:/share/doc/tuxpaint-$(VER_VERSION)/:'"/share/doc/${PF}/:g" \
+   -e '/@gzip -f/d' \
+   -e '/@chmod a+rx,g-w,o-w $(MAN_PREFIX)/d' \
+   -e "s|linux_ARCH_CFLAGS:=|linux_ARCH_CFLAGS:= ${CFLAGS}|" \
+   Makefile || die
+
+   eapply_user
+}
+
+src_compile() {
+   # parallel build may break things
+   emake -j1 CC="$(tc-getCC)"
+}
+
+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
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/, media-gfx/tuxpaint-stamps/files/

2022-01-15 Thread Sam James
commit: 30ff3b07f72d0eb8563b0f41f817196b6ec7164e
Author: Philipp Rösner  protonmail  com>
AuthorDate: Sat Jan  8 00:26:02 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 16 01:33:25 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30ff3b07

media-gfx/tuxpaint-stamps: version bump to 2021.11.25

We added an ebuild for tuxpaint-stamps-2021.11.25 with support for EAPI
8.

Closes: https://bugs.gentoo.org/767226
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Philipp Roesner  protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/23691
Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint-stamps/Manifest |  1 +
 .../files/tuxpaint-stamps-20211125-make-382.patch  | 15 ++
 .../tuxpaint-stamps-20211125.ebuild| 33 ++
 3 files changed, 49 insertions(+)

diff --git a/media-gfx/tuxpaint-stamps/Manifest 
b/media-gfx/tuxpaint-stamps/Manifest
index 9de65ec72903..d0f79ab344c6 100644
--- a/media-gfx/tuxpaint-stamps/Manifest
+++ b/media-gfx/tuxpaint-stamps/Manifest
@@ -1 +1,2 @@
 DIST tuxpaint-stamps-2009.06.28.tar.gz 48273629 BLAKE2B 
a9c11b846d60bb4de5bfaa721a24254fb6510bfddeca54f398ebf941f2fd74f546eaf3cdf7cd65932835e2e72993d6627f6247c7dc4a4488d2d2b2174c04455a
 SHA512 
ca059275484bec045c4f2bad414ea5359d2a8812cc1c8d1e11ad8f3b7e63e107c1fccc347291ffe95d81a5192b39198c56d319ef6a0f475fb128d9a2d0e5e027
+DIST tuxpaint-stamps-2021.11.25.tar.gz 193603076 BLAKE2B 
16cf8e9792261608bb77fdb97ba9828671a44b6ba939c5644e9d1c256bc2f9055becf70a336a8acd8b5b8f5e07d1f51a3a39eb7aeb267450ac6d848a500cbb0e
 SHA512 
db353ad0635a0f06960d0ec0c1eabda26bffa4672e5c56099ed02c2db9e109b4dbdd17327eadce8a1779b5d0fe51503988b56dafd4e47e9ad4f978e2a7ba2c10

diff --git 
a/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20211125-make-382.patch 
b/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20211125-make-382.patch
new file mode 100644
index ..313b7bab67aa
--- /dev/null
+++ b/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20211125-make-382.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/334569
+
+--- a/Makefile
 b/Makefile
+@@ -79,9 +79,7 @@
+   @rm -rf "build/tuxpaint-stamps-$(VER_DATE)" 
"build/tuxpaint-stamps-$(VER_DATE).tar.gz"
+   @-if [ -d build ] ; then rmdir build ; fi
+ 
+-releasedir: build/tuxpaint-stamps
+-
+-build/tuxpaint-stamps:
++releasedir:
+   @echo
+   @echo "Creating release directory"
+   @echo

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
new file mode 100644
index ..be6dba848c30
--- /dev/null
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20211125.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
+
+DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
+HOMEPAGE="http://www.tuxpaint.org/";
+SRC_URI="mirror://sourceforge/tuxpaint/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND="media-gfx/tuxpaint"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${P}-make-382.patch
+)
+
+src_prepare() {
+   default
+}
+
+src_install() {
+   emake PREFIX="${D}/usr" install-all
+
+   rm -f docs/COPYING.txt || die
+   dodoc docs/*.txt
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2021-08-18 Thread Sam James
commit: 8800e2e1f492de9ce1fd42cda0407cb9c80d9655
Author: Sam James  gentoo  org>
AuthorDate: Thu Aug 19 00:31:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Aug 19 00:39:06 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8800e2e1

media-gfx/tuxpaint: fix libsdl[joystick] dependency

Closes: https://bugs.gentoo.org/808168
Signed-off-by: Sam James  gentoo.org>

 .../tuxpaint/{tuxpaint-0.9.24.ebuild => tuxpaint-0.9.24-r1.ebuild} | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24-r1.ebuild
similarity index 98%
rename from media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
rename to media-gfx/tuxpaint/tuxpaint-0.9.24-r1.ebuild
index b17d98b9288..95da9599811 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24-r1.ebuild
@@ -19,7 +19,7 @@ RDEPEND="
gnome-base/librsvg:2
>=media-libs/libpng-1.2:0=
>=media-libs/freetype-2:2
-   media-libs/libsdl
+   media-libs/libsdl[joystick]
media-libs/sdl-image[png]
media-libs/sdl-mixer
media-libs/sdl-pango
@@ -35,6 +35,7 @@ BDEPEND="
 
 src_prepare() {
xdg_src_prepare
+
sed -i \
-e 's|linux_ARCH_INSTALL:=install-xdg|linux_ARCH_INSTALL:=|' \
-e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2021-02-09 Thread Sam James
commit: 720172bd4ca9f96ad7a7db61195f149e6e95a7a9
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  9 23:57:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  9 23:57:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=720172bd

media-gfx/tuxpaint: Stabilize 0.9.24 ppc, #767220

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index bf1b76662c8..a7658280461 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
+KEYWORDS="amd64 ppc x86"
 
 RDEPEND="
app-text/libpaper



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2021-02-02 Thread Sam James
commit: 6e702ca56845ab1f2f6e4a4ebb642b772e69c3f8
Author: Sam James  gentoo  org>
AuthorDate: Tue Feb  2 23:44:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb  2 23:44:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e702ca5

media-gfx/tuxpaint: Stabilize 0.9.24 x86, #767220

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index f36eec6c698..bf1b76662c8 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 
 RDEPEND="
app-text/libpaper



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2021-01-26 Thread Sam James
commit: 815ce7ce2556149474773659ebc6ae6c51395ccc
Author: Sam James  gentoo  org>
AuthorDate: Wed Jan 27 04:05:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 27 04:05:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=815ce7ce

media-gfx/tuxpaint: Stabilize 0.9.24 amd64, #767220

Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index b7dc34d6693..f36eec6c698 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc ~x86"
 
 RDEPEND="
app-text/libpaper



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2021-01-04 Thread Joonas Niilola
commit: ca5869cb34b1a88968a96ce07a7420c2283ff27d
Author: Joonas Niilola  gentoo  org>
AuthorDate: Tue Jan  5 07:34:38 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Jan  5 07:34:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca5869cb

media-gfx/tuxpaint: use optfeature in 0.9.24

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index f86c03ebacc..b7dc34d6693 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit desktop toolchain-funcs xdg
+inherit desktop optfeature toolchain-funcs xdg
 
 DESCRIPTION="Drawing program designed for young children"
 HOMEPAGE="http://www.tuxpaint.org/";
@@ -66,8 +66,6 @@ src_install() {
 
 pkg_postinst() {
xdg_pkg_postinst
-   if ! has_version "media-gfx/tuxpaint-stamps"; then
-   elog "For additional graphic stamps, you can emerge the"
-   elog "media-gfx/tuxpaint-stamps package."
-   fi
+   elog "Optional uninstalled features:"
+   optfeature "additional graphic stamps" media-gfx/tuxpaint-stamps
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2021-01-02 Thread Joonas Niilola
commit: 74e5017f2821413aec2fb925d4a2f29d013f6a7f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jan  2 15:06:33 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan  2 15:35:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e5017f

media-gfx/tuxpaint: add imagemagick[jpeg] as build-dep

 - "composite: no decode delegate for this image format `JPEG'"

Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index 731a8e2d338..c5c2d8e0320 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
dev-util/gperf
-   media-gfx/imagemagick[png]
+   media-gfx/imagemagick[jpeg,png]
sys-devel/gettext
 "
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2021-01-02 Thread Joonas Niilola
commit: cef5582dfd2cc811ca50817c1938ff41007bed77
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sat Jan  2 15:35:02 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Jan  2 15:35:40 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef5582d

media-gfx/tuxpaint: add imagemagick[svg] as build-dep

Bug: https://bugs.gentoo.org/761915
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index c5c2d8e0320..f86c03ebacc 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
dev-util/gperf
-   media-gfx/imagemagick[jpeg,png]
+   media-gfx/imagemagick[jpeg,png,svg]
sys-devel/gettext
 "
 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2020-12-26 Thread Sam James
commit: 5db3f40851da9d3a4473d5a889603c8b959959c6
Author: Sam James  gentoo  org>
AuthorDate: Sun Dec 27 05:29:34 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 27 05:29:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5db3f408

media-gfx/tuxpaint: minor style changes

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
index 21f61535665..731a8e2d338 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -8,9 +8,11 @@ inherit desktop 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
@@ -23,13 +25,13 @@ RDEPEND="
media-libs/sdl-pango
media-libs/sdl-ttf
x11-libs/cairo
-   "
+"
 DEPEND="${RDEPEND}"
 BDEPEND="
dev-util/gperf
media-gfx/imagemagick[png]
sys-devel/gettext
-   "
+"
 
 src_prepare() {
xdg_src_prepare



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2020-12-26 Thread Sam James
commit: 1a58e7e9afe752003c8b6fa860565bb306c919a0
Author: Peter Alfredsen  icloud  com>
AuthorDate: Thu Dec 17 18:46:23 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Dec 27 05:13:05 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a58e7e9

media-gfx/tuxpaint: version bump to 0.9.24

Closes: https://bugs.gentoo.org/385951
Closes: https://bugs.gentoo.org/581036
Closes: https://bugs.gentoo.org/671528
Closes: https://bugs.gentoo.org/734048
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Peter Alfredsen  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/18669
Signed-off-by: Sam James  gentoo.org>

 media-gfx/tuxpaint/Manifest   |  1 +
 media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild | 71 +++
 2 files changed, 72 insertions(+)

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index d655340a80e..97bc4b03c54 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1 +1,2 @@
 DIST tuxpaint-0.9.21.tar.gz 9543034 BLAKE2B 
196a743542d72e3dc5cea69b9e66a3baecdde7e3b288cb6759632d2b472f69db8d70ad404737416afe7f2ef4d0c0d21c7b2caadb64ca8d21a909e275ee6fcc46
 SHA512 
fafd80fe7a5a4d65236c8b5a4f15c644c76180e0e4ed7e774795572b70cc38ddb3273be2a93f041d74a1e536a5a9386c18e51987425ea1a3ff910661e4b0afb3
+DIST tuxpaint-0.9.24.tar.gz 15561675 BLAKE2B 
971baec8b7728cbb54a2a45b604c152a9620d0f6a1856cca99482ad0fd76f2a4493aab81f54e10e5da4d81800b0e3506cb73dda0e00510ef966b0c98f8aa5cb4
 SHA512 
a4ee9eea833f9a6313701a4686f9f276570df84436c68d9a3d04e9448a8ea00833207e1034965e15145be744194c7b9a7d3c91bdfa3489d06a61de84b64cc723

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
new file mode 100644
index 000..21f61535665
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.24.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop 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
+   media-libs/sdl-image[png]
+   media-libs/sdl-mixer
+   media-libs/sdl-pango
+   media-libs/sdl-ttf
+   x11-libs/cairo
+   "
+DEPEND="${RDEPEND}"
+BDEPEND="
+   dev-util/gperf
+   media-gfx/imagemagick[png]
+   sys-devel/gettext
+   "
+
+src_prepare() {
+   xdg_src_prepare
+   sed -i \
+   -e 's|linux_ARCH_INSTALL:=install-xdg|linux_ARCH_INSTALL:=|' \
+   -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
+   -e "s:/lib/:/$(get_libdir)/:g" \
+   -e 
's:/share/doc/tuxpaint-$(VER_VERSION)/:'"/share/doc/${PF}/:g" \
+   -e '/@gzip -f/d' \
+   -e '/@chmod a+rx,g-w,o-w $(MAN_PREFIX)/d' \
+   -e "s|linux_ARCH_CFLAGS:=|linux_ARCH_CFLAGS:= ${CFLAGS}|" \
+   Makefile || die
+}
+
+src_compile() {
+   # parallel build may break things
+   emake -j1 CC="$(tc-getCC)"
+}
+
+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
+   if ! has_version "media-gfx/tuxpaint-stamps"; then
+   elog "For additional graphic stamps, you can emerge the"
+   elog "media-gfx/tuxpaint-stamps package."
+   fi
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2020-07-26 Thread Andreas Sturmlechner
commit: c267178e19fba9e88ff62e8d8981896875cb7cb5
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jul 26 21:40:49 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Jul 26 21:42:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c267178e

media-gfx/tuxpaint: EAPI-7 bump, use xdg-utils, drop unused multilib

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild | 29 ++--
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
index fd4b7f65c00..6c845813834 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
@@ -1,8 +1,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit gnome2-utils multilib toolchain-funcs
+EAPI=7
+
+inherit toolchain-funcs xdg-utils
 
 DESCRIPTION="Drawing program designed for young children"
 HOMEPAGE="http://www.tuxpaint.org/";
@@ -11,7 +12,6 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-
 IUSE="nls"
 
 RDEPEND="
@@ -27,10 +27,16 @@ RDEPEND="
media-libs/sdl-ttf
x11-libs/cairo
 "
-DEPEND="${RDEPEND}
+DEPEND="${RDEPEND}"
+BDEPEND="
nls? ( sys-devel/gettext )
 "
 
+DOCS=(
+   docs/{ADVANCED-STAMPS-HOWTO,AUTHORS,CHANGES,default_colors,dejavu}.txt
+   docs/{EXTENDING,FAQ,OPTIONS,PNG,README,SVG}.txt
+)
+
 PATCHES=(
# Sanitize the Makefile and correct a few other issues
"${FILESDIR}/${PN}-0.9.20-gentoo.patch"
@@ -56,27 +62,20 @@ src_compile() {
 
 src_install() {
emake -j1 PKG_ROOT="${D}" \
-   $(use nls && echo ENABLE_GETTEXT=1) install
-
-   rm -f docs/COPYING.txt docs/INSTALL.txt
-   dodoc docs/*.txt
-}
+   $(usex nls ENABLE_GETTEXT=1 '') install
 
-pkg_preinst() {
-   gnome2_icon_savelist
+   einstalldocs
 }
 
 pkg_postinst() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 
if ! has_version "${CATEGORY}/${PN}"; then
-   elog ""
elog "For additional graphic stamps, you can emerge the"
elog "media-gfx/tuxpaint-stamps package."
-   elog ""
fi
 }
 
 pkg_postrm() {
-   gnome2_icon_cache_update
+   xdg_icon_cache_update
 }



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/, media-gfx/tuxpaint-stamps/files/

2018-09-15 Thread Mikle Kolyada
commit: 8fc754f2aefd58b69aee72f792b2d7edb2bf9777
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Sep 15 20:06:54 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Sep 15 20:07:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fc754f2

media-gfx/tuxpaint-stamps: revbump (EAPI=7)

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/tuxpaint-stamps-20090628-make-382.patch  |  4 +--
 .../tuxpaint-stamps-20090628-r1.ebuild | 31 ++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git 
a/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch 
b/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch
index 9a92ae11245..e3a595df5f4 100644
--- a/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch
+++ b/media-gfx/tuxpaint-stamps/files/tuxpaint-stamps-20090628-make-382.patch
@@ -1,7 +1,7 @@
 http://bugs.gentoo.org/334569
 
 Makefile
-+++ Makefile
+--- a/Makefile
 b/Makefile
 @@ -79,9 +79,7 @@
@rm -rf "build/tuxpaint-stamps-$(VER_DATE)" 
"build/tuxpaint-stamps-$(VER_DATE).tar.gz"
@-if [ -d build ] ; then rmdir build ; fi

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
new file mode 100644
index 000..d07338e4201
--- /dev/null
+++ b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
+
+DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
+HOMEPAGE="http://www.tuxpaint.org/";
+SRC_URI="mirror://sourceforge/tuxpaint/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ppc x86"
+
+RDEPEND="media-gfx/tuxpaint"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+   default
+   eapply "${FILESDIR}"/${P}-make-382.patch
+}
+
+src_install() {
+   emake PREFIX="${D}/usr" install-all || die
+
+   rm -f docs/COPYING.txt || die
+   dodoc docs/*.txt
+}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint-stamps/

2018-09-15 Thread Mikle Kolyada
commit: 54561e9da42a034a40cfe73d5d68c412498bd1db
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat Sep 15 20:07:24 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat Sep 15 20:07:40 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54561e9d

media-gfx/tuxpaint-stamps: Drop old

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../tuxpaint-stamps-20090628.ebuild| 32 --
 1 file changed, 32 deletions(-)

diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628.ebuild 
b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628.ebuild
deleted file mode 100644
index 9860d5ab8f3..000
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20090628.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils
-
-MY_P=${PN}-${PV:0:4}.${PV:4:2}.${PV:6:2}
-
-DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
-HOMEPAGE="http://www.tuxpaint.org/";
-SRC_URI="mirror://sourceforge/tuxpaint/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-RDEPEND="media-gfx/tuxpaint"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-   epatch "${FILESDIR}"/${P}-make-382.patch
-}
-
-src_install() {
-   emake PREFIX="${D}/usr" install-all || die
-
-   rm -f docs/COPYING.txt
-   dodoc docs/*.txt
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/

2016-09-18 Thread Pacho Ramos
commit: 51c7e4e68ebec4da73e03c6c34336c400157765b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Sep 18 09:03:17 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Sep 18 09:21:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51c7e4e6

media-gfx/tuxpaint: Drop old

Package-Manager: portage-2.3.0

 media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild | 71 
 1 file changed, 71 deletions(-)

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild
deleted file mode 100644
index 72014f9..
--- a/media-gfx/tuxpaint/tuxpaint-0.9.21-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="2"
-
-inherit eutils gnome2-utils multilib toolchain-funcs
-
-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"
-
-IUSE="nls"
-
-RDEPEND="
-   app-text/libpaper
-   dev-libs/fribidi
-   gnome-base/librsvg
-   >=media-libs/libpng-1.2
-   >=media-libs/freetype-2
-   media-libs/libsdl
-   media-libs/sdl-image[png]
-   media-libs/sdl-mixer
-   media-libs/sdl-pango
-   media-libs/sdl-ttf
-   x11-libs/cairo"
-
-DEPEND="
-   ${RDEPEND}
-   nls? ( sys-devel/gettext )"
-
-src_prepare() {
-   # Sanitize the Makefile and correct a few other issues.
-   epatch "${FILESDIR}/${PN}-0.9.20-gentoo.patch"
-   epatch "${FILESDIR}/${P}-libpng1.5.patch" #378199
-   epatch "${FILESDIR}/${P}-LDFLAGS.patch" #334571
-   epatch "${FILESDIR}/${P}-underlinking.patch" #484434
-
-   sed -i \
-   -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
-   -e "s:/lib/:/$(get_libdir)/:" \
-   -e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \
-   Makefile || die
-}
-
-src_compile() {
-   # emake may break things
-   make CC="$(tc-getCC)" \
-   $(use nls && echo ENABLE_GETTEXT=1) || die "Compilation failed"
-}
-
-src_install () {
-   make PKG_ROOT="${D}" \
-   $(use nls && echo ENABLE_GETTEXT=1) install || die 
"Installation failed"
-
-   rm -f docs/COPYING.txt docs/INSTALL.txt
-   dodoc docs/*.txt
-}
-
-pkg_postinst() {
-   gnome2_icon_cache_update
-
-   elog ""
-   elog "For additional graphic stamps, you can emerge the"
-   elog "media-gfx/tuxpaint-stamps package."
-   elog ""
-}



[gentoo-commits] repo/gentoo:master commit in: media-gfx/tuxpaint/, media-gfx/tuxpaint/files/

2016-04-24 Thread Pacho Ramos
commit: 684ef5bfe738933598f61b853be0a47a6aed2cba
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Apr 24 11:18:15 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Apr 24 12:06:44 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684ef5bf

media-gfx/tuxpaint: Bump EAPI, set proper slot information in RDEPEND

Package-Manager: portage-2.2.28

 .../tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch   |  4 +-
 .../tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch |  4 +-
 media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild   | 83 ++
 3 files changed, 87 insertions(+), 4 deletions(-)

diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch 
b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
index 3370d67..f864a83 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-LDFLAGS.patch
@@ -1,6 +1,6 @@
 === modified file 'Makefile'
 Makefile   2011-08-09 15:19:01 +
-+++ Makefile   2011-08-09 15:19:43 +
+--- a/Makefile 2011-08-09 15:19:01 +
 b/Makefile 2011-08-09 15:19:43 +
 @@ -871,7 +871,7 @@
$(ARCH_LIBS)
@echo

diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch 
b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
index 25e80cd..2970eac 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.21-libpng1.5.patch
@@ -1,8 +1,8 @@
 
http://tuxpaint.cvs.sourceforge.net/viewvc/tuxpaint/tuxpaint/src/tuxpaint.c?r1=1.828&r2=1.829
 No longer directly accessing PNG structure members directly, now using 
png_set_IHDR(). (Patch from SF.net Bug #3386433)
 
 src/tuxpaint.c 2011/07/29 21:27:39 1.828
-+++ src/tuxpaint.c 2011/08/08 17:59:12 1.829
+--- a/src/tuxpaint.c   2011/07/29 21:27:39 1.828
 b/src/tuxpaint.c   2011/08/08 17:59:12 1.829
 @@ -13425,12 +13425,7 @@
{
png_init_io(png_ptr, fi);

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild 
b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
new file mode 100644
index 000..7942616
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.21-r2.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit gnome2-utils multilib toolchain-funcs
+
+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"
+
+IUSE="nls"
+
+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
+   media-libs/sdl-image[png]
+   media-libs/sdl-mixer
+   media-libs/sdl-pango
+   media-libs/sdl-ttf
+   x11-libs/cairo
+"
+DEPEND="${RDEPEND}
+   nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+   # Sanitize the Makefile and correct a few other issues
+   "${FILESDIR}/${PN}-0.9.20-gentoo.patch"
+   "${FILESDIR}/${P}-libpng1.5.patch" #378199
+   "${FILESDIR}/${P}-LDFLAGS.patch" #334571
+   "${FILESDIR}/${P}-underlinking.patch" #484434
+)
+
+src_prepare() {
+   default
+   sed -i \
+   -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
+   -e "s:/lib/:/$(get_libdir)/:" \
+   -e "s:/share/doc/tuxpaint.*:/share/doc/${PF}:g" \
+   Makefile || die
+}
+
+src_compile() {
+   # parallel build may break things
+   emake -j1 CC="$(tc-getCC)" \
+   $(use nls && echo ENABLE_GETTEXT=1)
+}
+
+src_install () {
+   emake -j1 PKG_ROOT="${D}" \
+   $(use nls && echo ENABLE_GETTEXT=1) install
+
+   rm -f docs/COPYING.txt docs/INSTALL.txt
+   dodoc docs/*.txt
+}
+
+pkg_preinst() {
+   gnome2_icon_savelist
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+
+   if ! has_version "${CATEGORY}/${PN}"; then
+   elog ""
+   elog "For additional graphic stamps, you can emerge the"
+   elog "media-gfx/tuxpaint-stamps package."
+   elog ""
+   fi
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}