New release: 0.9.18. (Bug #200404)

(Portage version: 2.1.3.19)

5 files changed, 167 insertions, 7 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 6b09d49113f3..85d29962d08b 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.36 2007/09/11 20:30:37 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.37 2007/11/28 00:41:44 leonardop Exp $
+
+*tuxpaint-0.9.18 (28 Nov 2007)
+
+  28 Nov 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +files/tuxpaint-0.9.18-gentoo.patch, +tuxpaint-0.9.18.ebuild:
+  New version. Updated gentoo's patch. Added sdl-pango dependency.
 
 *tuxpaint-0.9.17-r1 (11 Sep 2007)
 
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.17 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.17
deleted file mode 100644
index e1777f0d1869..000000000000
--- a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.17
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 e98e4f1b3421ffcb0e1a1cbbf7c93dc4 tuxpaint-0.9.17.tar.gz 7570223
-RMD160 c7cf3636875cad87646cda4df978f9adbbf18630 tuxpaint-0.9.17.tar.gz 7570223
-SHA256 d01159625fa475739f79f6a5cb2a7dd65e486d165c52d6d8d56cf5222a6fe1ad tuxpaint-0.9.17.tar.gz 7570223
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.18 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.18
new file mode 100644
index 000000000000..a34f208ef4a0
--- /dev/null
+++ b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.18
@@ -0,0 +1,3 @@
+MD5 5d1ee8aabfef787702f8ddef257fc1a7 tuxpaint-0.9.18.tar.gz 8243665
+RMD160 2d6f7063c65aa073b9af1553a9b5914373e847ee tuxpaint-0.9.18.tar.gz 8243665
+SHA256 7fe48a8c2fd39bc4485eeb5e6c55567f48f50960b3132c091a06e0067d91b9b9 tuxpaint-0.9.18.tar.gz 8243665
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.18-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.18-gentoo.patch
new file mode 100644
index 000000000000..44c8de0d3fa7
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.18-gentoo.patch
@@ -0,0 +1,153 @@
+diff -NurdpB tuxpaint-0.9.18/Makefile tuxpaint-0.9.18-patched/Makefile
+--- tuxpaint-0.9.18/Makefile	2007-11-21 17:16:33.000000000 -0500
++++ tuxpaint-0.9.18-patched/Makefile	2007-11-27 18:45:15.000000000 -0500
+@@ -20,7 +20,7 @@ SO_TYPE=so
+ 
+ # Where to install things:
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ 
+ # Root directory to place files when creating packages.
+@@ -72,11 +72,14 @@ MIMESET_CMD=echo -n
+ 
+ ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/share/pixmaps
+ X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps
+-GNOME_PREFIX=`gnome-config --prefix 2> /dev/null`
+-KDE_PREFIX=`kde-config --install apps --expandvars 2> /dev/null`
+-KDE_ICON_PREFIX=`kde-config --install icon --expandvars 2> /dev/null`
++GNOME_PREFIX=
++KDE_PREFIX=
++KDE_ICON_PREFIX=
++DESKTOP_ICON_PREFIX=$(PREFIX)/share/icons
+ 
+ 
++ENABLE_GETTEXT=0
++
+ # Built with sound by default  (override with "make nosound")
+ 
+ NOSOUNDFLAG=__SOUND
+@@ -134,7 +137,7 @@ ARCH_LIBS=obj/postscript_print.o
+ 
+ #-ffast-math
+ OPTFLAGS=-O2
+-CFLAGS=$(OPTFLAGS) -W -Wall -fno-common -ffloat-store \
++CFLAGS += -W -Wall -fno-common -ffloat-store \
+ 	-Wcast-align -Wredundant-decls \
+ 	-Wbad-function-cast -Wwrite-strings \
+ 	-Waggregate-return \
+@@ -160,7 +163,10 @@ MOUSE_CFLAGS=-Isrc/$(MOUSEDIR) -D$(CURSO
+ 
+ # "make" with no arguments builds the program and man page from sources:
+ 
+-all:	tuxpaint translations magic-plugins tp-magic-config
++all:	tuxpaint magic-plugins tp-magic-config
++	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
++		make translations; \
++	fi
+ 	@echo
+ 	@echo "--------------------------------------------------------------"
+ 	@echo
+@@ -350,10 +356,13 @@ include Makefile-i18n
+ install:	install-bin install-data install-man install-doc \
+ 		install-magic-plugins \
+ 		install-magic-plugin-dev \
+-		install-icon install-gettext install-im install-importscript \
++		install-icon install-im install-importscript \
+ 		install-default-config install-example-stamps \
+ 		install-example-starters \
+-		install-gnome install-kde install-kde-icons
++		install-desktop-data
++	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
++		make install-gettext; \
++	fi
+ 	@echo
+ 	@echo "--------------------------------------------------------------"
+ 	@echo
+@@ -622,16 +631,49 @@ install-example-starters:
+ 
+ # Install a launcher icon in the Gnome menu, under "Graphics"
+ 
+-install-gnome:
++install-desktop-data:
+ 	@echo
+-	@echo "...Installing launcher icon into GNOME..."
+-	@if [ "x$(GNOME_PREFIX)" != "x" ]; then \
+-	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps; \
+-	 cp data/images/icon.png $(PKG_ROOT)/$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+-	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+-	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics; \
+-	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
+-	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
++	@echo "...Installing launcher entry..."
++	@if [ "x$(PREFIX)" != "x" ]; then \
++	 install -d $(PKG_ROOT)$(PREFIX)/share/applications; \
++	 cp src/tuxpaint.desktop $(PKG_ROOT)$(PREFIX)/share/applications/; \
++	 chmod 644 $(PKG_ROOT)$(PREFIX)/share/applications/tuxpaint.desktop; \
++	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/; \
++	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/; \
++	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/; \
++	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/; \
++	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/; \
++	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/; \
++	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/; \
++	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/; \
++	 install -d $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/; \
++	 cp data/images/tuxpaint-icon.svg \
++		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
++	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/scalable/apps/tuxpaint.svg; \
++	 cp data/images/icon192x192.png \
++		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
++	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/192x192/apps/tuxpaint.png; \
++	 cp data/images/icon128x128.png \
++		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
++	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/128x128/apps/tuxpaint.png; \
++	 cp data/images/icon96x96.png \
++		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
++	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/96x96/apps/tuxpaint.png; \
++	 cp data/images/icon64x64.png \
++		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
++	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/64x64/apps/tuxpaint.png; \
++	 cp data/images/icon48x48.png \
++		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
++	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/48x48/apps/tuxpaint.png; \
++	 cp data/images/icon32x32.png \
++		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
++	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/32x32/apps/tuxpaint.png; \
++	 cp data/images/icon22x22.png \
++		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
++	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/22x22/apps/tuxpaint.png; \
++	 cp data/images/icon16x16.png \
++		$(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
++	 chmod 644 $(PKG_ROOT)$(DESKTOP_ICON_PREFIX)/hicolor/16x16/apps/tuxpaint.png; \
+ 	fi
+ 
+ 
+@@ -725,9 +767,6 @@ install-icon:
+ 	@install -d $(ICON_PREFIX)
+ 	@cp data/images/icon.png $(ICON_PREFIX)/tuxpaint.png
+ 	@chmod 644 $(ICON_PREFIX)/tuxpaint.png
+-	@install -d $(X11_ICON_PREFIX)
+-	@cp data/images/icon32x32.xpm $(X11_ICON_PREFIX)/tuxpaint.xpm
+-	@chmod 644 $(X11_ICON_PREFIX)/tuxpaint.xpm
+ 
+ 
+ # Install the program:
+@@ -873,7 +912,7 @@ tuxpaint:	obj/tuxpaint.o obj/i18n.o obj/
+ 		$(SDL_LIBS) \
+ 		$(SVG_LIB) \
+ 		$(PAPER_LIB) \
+-		-lm $(ARCH_LINKS)
++		-lm -lpng12 $(ARCH_LINKS)
+ 	@$(RSRC_CMD)
+ 	@$(MIMESET_CMD)
+ 
+diff -NurdpB tuxpaint-0.9.18/src/tuxpaint.desktop tuxpaint-0.9.18-patched/src/tuxpaint.desktop
+--- tuxpaint-0.9.18/src/tuxpaint.desktop	2007-10-29 11:15:48.000000000 -0500
++++ tuxpaint-0.9.18-patched/src/tuxpaint.desktop	2007-11-27 18:35:49.000000000 -0500
+@@ -191,3 +191,4 @@ Comment[wo]=Lël lu natal yu ñu jagglel
+ Comment[xh]=Inkqubo yokuzoba yabantwana.
+ Comment[zh_cn]=孩子的绘图程序。
+ Comment[zh_tw]=適合兒童的畫圖程式
++Categories=Application;Graphics;
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.17.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.18.ebuild
index dbc2c12709ec..50ba5bd5b92a 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.17.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.18.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.17.ebuild,v 1.2 2007/08/16 03:48:00 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.18.ebuild,v 1.1 2007/11/28 00:41:44 leonardop Exp $
 
 inherit eutils gnome2-utils
 
@@ -18,6 +18,7 @@ DEPEND="media-libs/libsdl
 	media-libs/sdl-image
 	media-libs/sdl-ttf
 	media-libs/sdl-mixer
+	media-libs/sdl-pango
 	>=media-libs/libpng-1.2
 	>=media-libs/freetype-2
 	app-text/libpaper
@@ -27,11 +28,11 @@ DEPEND="media-libs/libsdl
 		x11-libs/cairo )"
 
 src_unpack() {
-	unpack "${A}"
+	unpack ${A}
 	cd "${S}"
 
 	# Sanitize the Makefile and correct a few other issues.
-	epatch "${FILESDIR}"/${P}-gentoo.patch
+	epatch "${FILESDIR}/${P}-gentoo.patch"
 }
 
 src_compile() {