old

(Portage version: 2.2_rc13/cvs/Linux 2.6.26.7 x86_64)

8 files changed, 9 insertions, 701 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 478e2333193b..1535b1854a8e 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.47 2008/11/04 01:36:57 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.48 2008/11/08 14:34:36 maekke Exp $
+
+  08 Nov 2008; Markus Meier <maekke@gentoo.org>
+  -files/tuxpaint-0.9.16-gentoo-r1.patch,
+  -files/tuxpaint-0.9.17-gentoo.patch,
+  -files/tuxpaint-0.9.17-printing.patch,
+  -files/tuxpaint-0.9.18-gentoo.patch, -tuxpaint-0.9.16-r1.ebuild,
+  -tuxpaint-0.9.17-r1.ebuild, -tuxpaint-0.9.18.ebuild:
+  old
 
   04 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml, tuxpaint-0.9.16-r1.ebuild, tuxpaint-0.9.17-r1.ebuild:
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.16-gentoo-r1.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.16-gentoo-r1.patch
deleted file mode 100644
index 785c9d48d4db..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.16-gentoo-r1.patch
+++ /dev/null
@@ -1,155 +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-12-11 23:22:55.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,15 @@
- 
- 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
- 
- 
- # Locale files
- 
-+ENABLE_GETTEXT=0
- LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale
- # LOCALE_PREFIX=/usr/share/locale
- 
-@@ -97,7 +99,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 +120,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 +225,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
-+		install-desktop-data
-+	@if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
-+		make install-gettext; \
-+	fi
- 	@echo
- 	@echo "--------------------------------------------------------------"
- 	@echo
-@@ -497,16 +505,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
- 
- 
-@@ -590,9 +631,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 +1072,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-12-10 19:53:51.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
deleted file mode 100644
index d4aac193b924..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.17-gentoo.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-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/files/tuxpaint-0.9.17-printing.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.17-printing.patch
deleted file mode 100644
index 63fc8912656f..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.17-printing.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -NurdpB tuxpaint-0.9.17/src/postscript_print.c tuxpaint-0.9.17-patched/src/postscript_print.c
---- tuxpaint-0.9.17/src/postscript_print.c	2007-06-25 13:00:50.000000000 -0500
-+++ tuxpaint-0.9.17-patched/src/postscript_print.c	2007-09-10 17:46:06.000000000 -0500
-@@ -63,6 +63,19 @@
- 
- #define my_min(x,y) ((x < y) ? (x) : (y))
- 
-+int f2int(float f);
-+int f2dec(float f);
-+
-+int f2int(float f)
-+{
-+  return ((int)f);
-+}
-+
-+int f2dec(float f)
-+{
-+  return (int)((f - f2int(f)) * 100);
-+}
-+
- /* Actually save the PostScript data to the file stream: */
- int do_ps_save(FILE * fi,
- 		// const char *restrict const fname,
-@@ -234,14 +247,16 @@ int do_ps_save(FILE * fi,
-   /* 'translate' moves the user space origin to a new position with
-   respect to the current page, leaving the orientation of the axes and
-   the unit lengths unchanged. */
--  fprintf(fi, "%.2f %.2f translate\n", tlate_x, tlate_y);
-+  fprintf(fi, "%d.%02d %d.%02d translate\n",
-+	  f2int(tlate_x), f2dec(tlate_x),
-+	  f2int(tlate_y), f2dec(tlate_y));
- 
-   /* 'scale' modifies the unit lengths independently along the current
-   x and y axes, leaving the origin location and the orientation of the
-   axes unchanged. */
--  fprintf(fi, "%.2f %.2f scale\n",
--	  (float) printed_img_w * scale,
--	  (float) printed_img_h * scale);
-+  fprintf(fi, "%d.%02d %d.%02d scale\n",
-+          f2int(printed_img_w * scale), f2dec(printed_img_w * scale),
-+          f2int(printed_img_h * scale), f2dec(printed_img_h * scale));
- 
-   /* Rotate the image */
-   if (rotate)
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.18-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.18-gentoo.patch
deleted file mode 100644
index 44c8de0d3fa7..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.18-gentoo.patch
+++ /dev/null
@@ -1,153 +0,0 @@
-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.16-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.16-r1.ebuild
deleted file mode 100644
index 77af4330c50b..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.16-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.7 2008/11/04 01:36:57 jmbsvicetto Exp $
-
-inherit eutils gnome2-utils
-
-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"
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer
-	>=media-libs/libpng-1.2
-	>=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-r1.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 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() {
-	gnome2_icon_cache_update
-
-	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.17-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.17-r1.ebuild
deleted file mode 100644
index e8048db5cc54..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.17-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.5 2008/11/04 01:36:57 jmbsvicetto Exp $
-
-inherit eutils gnome2-utils
-
-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 svg"
-
-DEPEND="media-libs/libsdl
-	media-libs/sdl-image
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer
-	>=media-libs/libpng-1.2
-	>=media-libs/freetype-2
-	app-text/libpaper
-	nls? ( sys-devel/gettext )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Sanitize the Makefile and correct a few other issues.
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-
-	# Fix printing on localised systems (bug #191987)
-	epatch "${FILESDIR}"/${P}-printing.patch
-}
-
-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"
-}
-
-src_install () {
-	local myopts=""
-
-	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() {
-	gnome2_icon_cache_update
-
-	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.18.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.18.ebuild
deleted file mode 100644
index 50ba5bd5b92a..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.18.ebuild
+++ /dev/null
@@ -1,66 +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.18.ebuild,v 1.1 2007/11/28 00:41:44 leonardop Exp $
-
-inherit eutils gnome2-utils
-
-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 svg"
-
-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
-	nls? ( sys-devel/gettext )
-	svg? (
-		gnome-base/librsvg
-		x11-libs/cairo )"
-
-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"
-	use svg || myopts="${myopts} nosvg"
-
-	# emake may break things
-	make ${myopts} || die "Compilation failed"
-}
-
-src_install () {
-	local myopts=""
-
-	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() {
-	gnome2_icon_cache_update
-
-	elog ""
-	elog "For additional graphic stamps, you can emerge the"
-	elog "media-gfx/tuxpaint-stamps package."
-	elog ""
-}