New release: 0.9.17 (bug #187918)

(Portage version: 2.1.3_rc9)

9 files changed, 178 insertions, 291 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 093fd1f5d595..35130bfc89f4 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,17 @@
 # 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.33 2007/04/30 22:51:59 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.34 2007/08/07 03:15:54 leonardop Exp $
+
+*tuxpaint-0.9.17 (07 Aug 2007)
+
+  07 Aug 2007; Leonardo Boshell <leonardop@gentoo.org>
+  +files/tuxpaint-0.9.17-gentoo.patch, +tuxpaint-0.9.17.ebuild:
+  Version bump (bug #187918). Added the 'svg' USE flag.
+
+  07 Aug 2007; Leonardo Boshell <leonardop@gentoo.org>
+  -files/tuxpaint-0.9.15b-gentoo.patch, -files/tuxpaint-0.9.16-gentoo.patch,
+  -tuxpaint-0.9.15b-r1.ebuild, -tuxpaint-0.9.16.ebuild:
+  Dropping old ebuilds.
 
   30 Apr 2007; Marius Mauch <genone@gentoo.org> tuxpaint-0.9.15b-r1.ebuild,
   tuxpaint-0.9.16.ebuild, tuxpaint-0.9.16-r1.ebuild:
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.15b-r1 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.15b-r1
deleted file mode 100644
index 8b384a659871..000000000000
--- a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.15b-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 04995631e0922570a0d5c2216d943941 tuxpaint-0.9.15b.tar.gz 5681511
-RMD160 2b8bbfa13572572b0bc3860c3ca5142d9e1584ed tuxpaint-0.9.15b.tar.gz 5681511
-SHA256 16eddd271e26e9a9cb0366504aa4706b9ebfb686035e6c40b6c3065247f6d862 tuxpaint-0.9.15b.tar.gz 5681511
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.16 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.16
deleted file mode 100644
index 0aa1a60e6bc9..000000000000
--- a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.16
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 467ef64c7f81f9f3755ae2ceebe97f48 tuxpaint-0.9.16.tar.gz 6785134
-RMD160 f263455fa3bd4d51e7280a5451d7cc021b2c9639 tuxpaint-0.9.16.tar.gz 6785134
-SHA256 af2dd9dcac7c7377e344bb964b8a523402aeffde877522c844f98c9e1e5881e0 tuxpaint-0.9.16.tar.gz 6785134
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.17 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.17
new file mode 100644
index 000000000000..e1777f0d1869
--- /dev/null
+++ b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.17
@@ -0,0 +1,3 @@
+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/tuxpaint-0.9.15b-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.15b-gentoo.patch
deleted file mode 100644
index 5222d7714c01..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.15b-gentoo.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-diff -NurdB tuxpaint-0.9.15b/Makefile tuxpaint-0.9.15b-patched/Makefile
---- tuxpaint-0.9.15b/Makefile	2005-11-27 01:44:15.000000000 -0500
-+++ tuxpaint-0.9.15b-patched/Makefile	2006-08-09 07:13:53.000000000 -0500
-@@ -17,7 +17,7 @@
- 
- # Where to install things:
- 
--PREFIX=/usr/local
-+PREFIX=/usr
- 
- 
- # Root directory to place files when creating packages.
-@@ -61,13 +61,14 @@
- 
- ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/share/pixmaps
- X11_ICON_PREFIX=$(PKG_ROOT)$(PREFIX)/X11R6/include/X11/pixmaps
--GNOME_PREFIX=`gnome-config --prefix`
--KDE_PREFIX=`kde-config --install apps --expandvars`
--KDE_ICON_PREFIX=`kde-config --install icon --expandvars`
-+GNOME_PREFIX=
-+KDE_PREFIX=
-+KDE_ICON_PREFIX=
- 
- 
- # Locale files
- 
-+ENABLE_GETTEXT=0
- LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale
- # LOCALE_PREFIX=/usr/share/locale
- 
-@@ -95,7 +96,7 @@
- 
- # The entire set of CFLAGS:
- 
--CFLAGS=-O2 -W -Wall -fno-common -ffast-math \
-+CFLAGS += -W -Wall -fno-common \
- 	-Wcast-align -Wredundant-decls \
- 	-Wbad-function-cast -Wwrite-strings \
- 	-Waggregate-return \
-@@ -116,7 +117,10 @@
- 
- # "make" with no arguments builds the program and man page from sources:
- 
--all:	tuxpaint translations
-+all:	tuxpaint
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make translations; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -205,10 +209,13 @@
- # to do this as superuser ("root"))
- 
- install:	install-bin install-data install-man install-doc \
--		install-icon install-gettext install-importscript \
-+		install-icon install-importscript \
- 		install-default-config install-example-stamps \
- 		install-example-starters \
- 		install-gnome install-kde install-kde-icons
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make install-gettext; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -481,9 +488,9 @@
- 	 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; \
-+	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/applications; \
-+	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/; \
-+	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
- 	fi
- 
- 
-@@ -552,9 +559,6 @@
- 	@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:
-@@ -933,7 +937,7 @@
- 	@$(CC) $(CFLAGS) $(DEBUG_FLAGS) $(SDL_CFLAGS) $(DEFS) \
- 		-o tuxpaint obj/tuxpaint.o $(HQXX_O) \
- 		$(ARCH_LIBS) $(SDL_LIBS) \
--		-lm $(ARCH_LINKS)
-+		-lm -lpng12 $(ARCH_LINKS)
- 	@$(RSRC_CMD)
- 	@$(MIMESET_CMD)
- 
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.16-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.16-gentoo.patch
deleted file mode 100644
index c6df11f59aec..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.16-gentoo.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile
---- tuxpaint-0.9.16/Makefile	2006-10-19 02:41:49.000000000 -0500
-+++ tuxpaint-0.9.16-patched/Makefile	2006-10-31 21:25:07.000000000 -0500
-@@ -18,7 +18,7 @@
- 
- # Where to install things:
- 
--PREFIX=/usr/local
-+PREFIX=/usr
- 
- 
- # Root directory to place files when creating packages.
-@@ -62,13 +62,14 @@
- 
- 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=
- 
- 
- # Locale files
- 
-+ENABLE_GETTEXT=0
- LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale
- # LOCALE_PREFIX=/usr/share/locale
- 
-@@ -97,7 +98,7 @@
- # The entire set of CFLAGS:
- 
- #-ffast-math
--CFLAGS=-O2 -W -Wall -fno-common -ffloat-store \
-+CFLAGS += -W -Wall -fno-common -ffloat-store \
- 	-Wcast-align -Wredundant-decls \
- 	-Wbad-function-cast -Wwrite-strings \
- 	-Waggregate-return \
-@@ -118,7 +119,10 @@
- 
- # "make" with no arguments builds the program and man page from sources:
- 
--all:	tuxpaint translations
-+all:	tuxpaint
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make translations; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -220,10 +224,13 @@
- # to do this as superuser ("root"))
- 
- install:	install-bin install-data install-man install-doc \
--		install-icon install-gettext install-importscript \
-+		install-icon install-importscript \
- 		install-default-config install-example-stamps \
- 		install-example-starters \
- 		install-gnome install-kde install-kde-icons
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make install-gettext; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -504,9 +511,9 @@
- 	 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; \
-+	 install -d $(PKG_ROOT)$(GNOME_PREFIX)/share/applications; \
-+	 cp src/tuxpaint.desktop $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/; \
-+	 chmod 644 $(PKG_ROOT)$(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
- 	fi
- 
- 
-@@ -590,9 +597,6 @@
- 	@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:
-@@ -1034,7 +1038,7 @@
- 		$^ \
- 		$(HQXX_O) \
- 		$(SDL_LIBS) \
--		-lm $(ARCH_LINKS)
-+		-lm -lpng12 $(ARCH_LINKS)
- 	@$(RSRC_CMD)
- 	@$(MIMESET_CMD)
- 
-diff -NurdB tuxpaint-0.9.16/src/tuxpaint.desktop tuxpaint-0.9.16-patched/src/tuxpaint.desktop
---- tuxpaint-0.9.16/src/tuxpaint.desktop	2006-09-10 13:18:49.000000000 -0500
-+++ tuxpaint-0.9.16-patched/src/tuxpaint.desktop	2006-10-31 21:44:45.000000000 -0500
-@@ -158,3 +158,5 @@
- Comment[wa]=Programe di dessinaedje po ls efants
- Comment[zh_cn]=孩子的绘图程序。
- Comment[zh_tw]=適合兒童的畫圖程式
-+Categories=Application;Graphics;
-+
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.17-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.17-gentoo.patch
new file mode 100644
index 000000000000..d4aac193b924
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.17-gentoo.patch
@@ -0,0 +1,153 @@
+diff -NurdB tuxpaint-0.9.17/Makefile tuxpaint-0.9.17-patched/Makefile
+--- tuxpaint-0.9.17/Makefile	2007-07-01 10:05:57.000000000 -0500
++++ tuxpaint-0.9.17-patched/Makefile	2007-08-06 20:27:53.000000000 -0500
+@@ -18,7 +18,7 @@
+ 
+ # Where to install things:
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ 
+ # Root directory to place files when creating packages.
+@@ -62,11 +62,14 @@
+ 
+ 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
+@@ -117,7 +120,7 @@
+ 
+ #-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 \
+@@ -141,7 +144,10 @@
+ 
+ # "make" with no arguments builds the program and man page from sources:
+ 
+-all:	tuxpaint translations
++all:	tuxpaint
++	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
++		make translations; \
++	fi
+ 	@echo
+ 	@echo "--------------------------------------------------------------"
+ 	@echo
+@@ -284,10 +290,13 @@
+ # to do this as superuser ("root"))
+ 
+ install:	install-bin install-data install-man install-doc \
+-		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
+@@ -505,16 +514,49 @@
+ 
+ # 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
+ 
+ 
+@@ -608,9 +650,6 @@
+ 	@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:
+@@ -723,7 +762,7 @@
+ 		$(SDL_LIBS) \
+ 		$(SVG_LIB) \
+ 		$(PAPER_LIB) \
+-		-lm $(ARCH_LINKS)
++		-lm -lpng12 $(ARCH_LINKS)
+ 	@$(RSRC_CMD)
+ 	@$(MIMESET_CMD)
+ 
+diff -NurdB tuxpaint-0.9.17/src/tuxpaint.desktop tuxpaint-0.9.17-patched/src/tuxpaint.desktop
+--- tuxpaint-0.9.17/src/tuxpaint.desktop	2007-05-09 02:46:21.000000000 -0500
++++ tuxpaint-0.9.17-patched/src/tuxpaint.desktop	2007-08-06 20:23:04.000000000 -0500
+@@ -182,3 +182,4 @@
+ Comment[xh]=Inkqubo yokuzoba yabantwana.
+ Comment[zh_cn]=孩子的绘图程序。
+ Comment[zh_tw]=適合兒童的畫圖程式
++Categories=Application;Graphics;
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.15b-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.15b-r1.ebuild
deleted file mode 100644
index fd9072e8e429..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.15b-r1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# 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.15b-r1.ebuild,v 1.7 2007/07/12 04:08:47 mr_bones_ Exp $
-
-inherit eutils
-
-DESCRIPTION="Drawing program designed for young children"
-HOMEPAGE="http://www.newbreedsoftware.com/tuxpaint/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-
-IUSE="gnome kde nls"
-
-DEPEND=">=media-libs/libpng-1.2
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-	media-libs/libsdl
-	>=media-libs/freetype-2
-	media-libs/netpbm
-	nls? ( sys-devel/gettext )"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# Sanitize the Makefile and correct a few other issues.
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_compile() {
-	local myopts=""
-
-	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
-
-	# emake may break things
-	make ${myopts} || die "Compilation failed"
-}
-
-src_install () {
-	local myopts=""
-
-	use gnome && myopts="${myopts} GNOME_PREFIX=/usr"
-
-	if use kde; then
-		myopts="${myopts} \
-			KDE_PREFIX=/usr/share/applnk \
-			KDE_ICON_PREFIX=/usr/share/icons"
-	fi
-
-	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
-
-	make PKG_ROOT="${D}" ${myopts} install || die "Installation failed"
-
-	rm -f docs/COPYING.txt docs/INSTALL.txt
-	dodoc docs/*.txt
-}
-
-pkg_postinst() {
-	elog ""
-	elog "For additional graphic stamps, you can emerge the"
-	elog "media-gfx/tuxpaint-stamps package."
-	elog ""
-}
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.16.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.17.ebuild
index 45ad8c85d7f6..d402cc8f6bdd 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.16.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.17.ebuild
@@ -1,8 +1,8 @@
 # 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.16.ebuild,v 1.3 2007/07/12 04:08:47 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.17.ebuild,v 1.1 2007/08/07 03:15:54 leonardop Exp $
 
-inherit eutils
+inherit eutils gnome2-utils
 
 DESCRIPTION="Drawing program designed for young children"
 HOMEPAGE="http://www.tuxpaint.org/"
@@ -12,7 +12,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
 
-IUSE="gnome kde nls"
+IUSE="nls svg"
 
 DEPEND="media-libs/libsdl
 	media-libs/sdl-image
@@ -21,7 +21,10 @@ DEPEND="media-libs/libsdl
 	>=media-libs/libpng-1.2
 	>=media-libs/freetype-2
 	media-libs/netpbm
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo )"
 
 src_unpack() {
 	unpack "${A}"
@@ -35,6 +38,7 @@ src_compile() {
 	local myopts=""
 
 	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
+	use svg || myopts="${myopts} nosvg"
 
 	# emake may break things
 	make ${myopts} || die "Compilation failed"
@@ -43,14 +47,6 @@ src_compile() {
 src_install () {
 	local myopts=""
 
-	use gnome && myopts="${myopts} GNOME_PREFIX=/usr"
-
-	if use kde; then
-		myopts="${myopts} \
-			KDE_PREFIX=/usr/share/applnk \
-			KDE_ICON_PREFIX=/usr/share/icons"
-	fi
-
 	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
 
 	make PKG_ROOT="${D}" ${myopts} install || die "Installation failed"
@@ -60,6 +56,8 @@ src_install () {
 }
 
 pkg_postinst() {
+	gnome2_icon_cache_update
+
 	elog ""
 	elog "For additional graphic stamps, you can emerge the"
 	elog "media-gfx/tuxpaint-stamps package."