8 files changed, 224 insertions, 73 deletions
diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 80a03384d535..8b0ef1f6685a 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,7 +1,16 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.11 2005/02/12 17:15:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.12 2005/03/20 21:26:00 leonardop Exp $
 
+*tuxpaint-0.9.14 (20 Mar 2005)
+
+  20 Mar 2005; Leonardo Boshell <leonardop@gentoo.org> tuxpaint-0.9.14.ebuild:
+  New release. Uses a modified patch to fix a few small problems.
+
+  20 Mar 2005; Leonardo Boshell <leonardop@gentoo.org>
+  tuxpaint-0.9.13-r1.ebuild:
+  Marked stable on x86.
+  
   12 Feb 2005; Gregorio Guidi <greg_g@gentoo.org> tuxpaint-0.9.13-r1.ebuild:
   Install kde files in /usr (#63863).
 
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 9cace7132bd3..ffcd62efcdf5 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,6 +1,7 @@
+MD5 080677e9222822a72ed9c2416cb5f79a ChangeLog 1817
 MD5 60d69ee439da76dbf4d88951ef86236a metadata.xml 648
-MD5 bcc11cbb4eee84c2e74971900afca44d tuxpaint-0.9.13-r1.ebuild 1315
-MD5 9c5b9aee781f55dd334125d30de9805f ChangeLog 1525
-MD5 a63e8fdd74bd98798239d8266cb5bf93 tuxpaint-0.9.13.ebuild 1856
-MD5 9f0ca98deef70db6f3e6878392434cae files/digest-tuxpaint-0.9.13 68
+MD5 6a7ad58d4291efcadf8478d4122535e6 tuxpaint-0.9.13-r1.ebuild 1317
+MD5 83d4ae8d732ae19d3323855a234c0e1e tuxpaint-0.9.14.ebuild 1476
+MD5 6c694aa3e9399a07cdaa7f82a162b222 files/digest-tuxpaint-0.9.14 68
 MD5 ac7dc281a67f1db989d39470aa12ea8e files/digest-tuxpaint-0.9.13-r1 142
+MD5 b12d971848124691a60da9265ecb86ba files/tuxpaint-0.9.14-gentoo.patch 4511
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.13 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.13
deleted file mode 100644
index 72e101efa274..000000000000
--- a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.13
+++ /dev/null
@@ -1 +0,0 @@
-MD5 580ed290af35c34a33f2206f7f36e489 tuxpaint-0.9.13.tar.gz 2495193
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.14 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.14
new file mode 100644
index 000000000000..bd4be67f9f3a
--- /dev/null
+++ b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.14
@@ -0,0 +1 @@
+MD5 0b7522c1b3672d5c233f7bbc772c8dec tuxpaint-0.9.14.tar.gz 3208894
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.14-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.14-gentoo.patch
new file mode 100644
index 000000000000..2f6062254cf6
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.14-gentoo.patch
@@ -0,0 +1,137 @@
+diff -NurdB tuxpaint-0.9.14-orig/Makefile tuxpaint-0.9.14/Makefile
+--- tuxpaint-0.9.14-orig/Makefile	2005-03-20 04:35:07.000000000 -0500
++++ tuxpaint-0.9.14/Makefile	2005-03-20 06:16:28.000000000 -0500
+@@ -11,7 +11,7 @@
+ 
+ # Where to install things:
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ 
+ # Program:
+@@ -35,7 +35,7 @@
+ ifeq ($(PREFIX),/usr)
+   CONFDIR=/etc/tuxpaint
+ else
+-  CONFDIR=$(PREFIX)/etc/tuxpaint
++  CONFDIR=$(PREFIX)/../etc/tuxpaint
+ endif
+ 
+ 
+@@ -49,13 +49,14 @@
+ 
+ ICON_PREFIX=$(PREFIX)/share/pixmaps/
+ X11_ICON_PREFIX=$(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=$(PREFIX)/share/locale/
+ # LOCALE_PREFIX=/usr/share/locale/
+ 
+@@ -88,7 +89,7 @@
+ 
+ # The entire set of CFLAGS:
+ 
+-CFLAGS=-O2 -Wall -Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES
++CFLAGS += -Wall -Isrc/$(MOUSEDIR) -D$(CURSOR_SHAPES)_CURSOR_SHAPES
+ DEFS=-DDATA_PREFIX=\"$(DATA_PREFIX)\" \
+ 	-D$(NOSOUNDFLAG) -DDOC_PREFIX=\"$(DOC_PREFIX)\" \
+ 	-DLOCALEDIR=\"$(LOCALE_PREFIX)\" -DCONFDIR=\"$(CONFDIR)\"
+@@ -96,7 +97,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
+@@ -143,10 +147,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
+@@ -322,11 +329,9 @@
+ 	 install -d $(GNOME_PREFIX)/share/pixmaps; \
+ 	 cp data/images/icon.png $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+ 	 chmod 644 $(GNOME_PREFIX)/share/pixmaps/tuxpaint.png; \
+-	 install -d $(GNOME_PREFIX)/share/gnome/apps/Graphics; \
+-	 cp src/tuxpaint.desktop $(GNOME_PREFIX)/share/gnome/apps/Graphics/; \
+-	 chmod 644 $(GNOME_PREFIX)/share/gnome/apps/Graphics/tuxpaint.desktop; \
+-	else \
+-	 make install-gnome GNOME_PREFIX=/usr; \
++	 install -d $(GNOME_PREFIX)/share/applications; \
++	 cp src/tuxpaint.desktop $(GNOME_PREFIX)/share/applications/; \
++	 chmod 644 $(GNOME_PREFIX)/share/applications/tuxpaint.desktop; \
+ 	fi
+ 
+ 
+diff -NurdB tuxpaint-0.9.14-orig/src/tuxpaint.c tuxpaint-0.9.14/src/tuxpaint.c
+--- tuxpaint-0.9.14-orig/src/tuxpaint.c	2005-03-20 04:35:07.000000000 -0500
++++ tuxpaint-0.9.14/src/tuxpaint.c	2005-03-20 06:08:21.000000000 -0500
+@@ -172,32 +172,11 @@
+ #endif
+ 
+ #include "SDL_image.h"
+-#ifndef _IMG_h
+-#error "---------------------------------------------------"
+-#error "If you installed SDL_image from a package, be sure"
+-#error "to get the development package, as well!"
+-#error "(e.g., 'libsdl-image1.2-devel.rpm')"
+-#error "---------------------------------------------------"
+-#endif
+ 
+ #include "SDL_ttf.h"
+-#ifndef _SDLttf_h
+-#error "---------------------------------------------------"
+-#error "If you installed SDL_ttf from a package, be sure"
+-#error "to get the development package, as well!"
+-#error "(e.g., 'libsdl-ttf1.2-devel.rpm')"
+-#error "---------------------------------------------------"
+-#endif
+ 
+ #ifndef NOSOUND
+ #include "SDL_mixer.h"
+-#ifndef _MIXER_H_
+-#error "---------------------------------------------------"
+-#error "If you installed SDL_mixer from a package, be sure"
+-#error "to get the development package, as well!"
+-#error "(e.g., 'libsdl-mixer1.2-devel.rpm')"
+-#error "---------------------------------------------------"
+-#endif
+ #endif
+ 
+ #ifndef SAVE_AS_BMP
+diff -NurdB tuxpaint-0.9.14-orig/src/tuxpaint.desktop tuxpaint-0.9.14/src/tuxpaint.desktop
+--- tuxpaint-0.9.14-orig/src/tuxpaint.desktop	2005-03-20 04:35:07.000000000 -0500
++++ tuxpaint-0.9.14/src/tuxpaint.desktop	2005-03-20 04:58:45.000000000 -0500
+@@ -30,6 +30,7 @@
+ Exec=tuxpaint
+ Icon=tuxpaint
+ Terminal=false
++Categories=Application;Graphics;
+ GenericName=Drawing program
+ GenericName[af]=Tekenprogram
+ GenericName[be]=Праграма для маляваньня
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild
index d3c09733f8b5..7dc8f4938592 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild,v 1.2 2005/02/12 17:15:20 greg_g Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild,v 1.3 2005/03/20 21:26:00 leonardop Exp $
 
 inherit eutils
 
@@ -22,7 +22,7 @@ mirror://gentoo/${P}-makefile.patch"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc"
+KEYWORDS="x86 ~ppc"
 
 src_unpack() {
 	unpack ${P}.tar.gz
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.13.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.13.ebuild
deleted file mode 100644
index 8a2744e4324e..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.13.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.13.ebuild,v 1.5 2004/08/30 23:41:12 dholm Exp $
-
-DESCRIPTION="Drawing program designed for young children (kids ages 3 and up)"
-HOMEPAGE="http://www.newbreedsoftware.com/tuxpaint/"
-
-DEPEND="media-libs/libpng
-	media-libs/sdl-ttf
-	media-libs/sdl-mixer
-	media-libs/sdl-image
-	media-libs/libsdl
-	>=media-libs/freetype-2
-	media-libs/netpbm
-	sys-devel/gettext"
-
-IUSE="gnome kde"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc"
-
-src_compile() {
-	sed -i "s:^PREFIX=.*:PREFIX=/usr:" Makefile
-	sed -i "s:^  CONFDIR=.*:  CONFDIR=/etc/tuxpaint:" Makefile
-	sed -i "s/^CFLAGS=.*/CFLAGS=${CFLAGS}/" Makefile
-	sed -i "s/^SDL_LIBS=/SDL_LIBS:=-lSDL_mixer /" Makefile
-	sed -i "s/^SDL_CFLAGS=/SDL_CFLAGS:=/" Makefile
-
-	if use gnome
-	then
-		sed -i "s:^GNOME_PREFIX=:GNOME_PREFIX=${D}:" Makefile
-	else
-		sed -i "s:^GNOME_PREFIX=.*:GNOME_PREFIX=:" Makefile
-	fi
-
-	if use kde
-	then
-		sed -i "s:^KDE_PREFIX=:KDE_PREFIX=${D}:" Makefile
-		sed -i "s:^KDE_ICON_PREFIX=:KDE_ICON_PREFIX=${D}:" Makefile
-	else
-		sed -i "s:^KDE_PREFIX=.*:KDE_PREFIX=:" Makefile
-		sed -i "s:^KDE_ICON_PREFIX=.*:KDE_ICON_PREFIX=:" Makefile
-	fi
-
-	# emake can cause some grief at this point..
-	make || die
-}
-
-src_install () {
-	sed -i "s:^PREFIX=.*:PREFIX=${D}usr:" Makefile
-	sed -i "s:^  CONFDIR=.*:  CONFDIR=${D}etc/tuxpaint:" Makefile
-	sed -i 's:make install-gnome.*:echo "   Nothing to install"; \\:' Makefile
-
-	dodir /usr/bin
-	use kde && dodir /usr/kde/3.1/share/applnk/Graphics \
-		/usr/kde/3.1/share/icons/hicolor/48x48/apps \
-		/usr/kde/3.1/share/icons/hicolor/32x32/apps \
-		/usr/kde/3.1/share/icons/hicolor/16x16/apps
-
-	make install || die
-
-	rm docs/INSTALL.txt
-	dodoc docs/*.txt
-}
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild
new file mode 100644
index 000000000000..dcde43cc2f1b
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild,v 1.1 2005/03/20 21:26:01 leonardop Exp $
+
+inherit eutils
+
+DESCRIPTION="Drawing program designed for young children"
+HOMEPAGE="http://www.newbreedsoftware.com/tuxpaint/"
+
+DEPEND="media-libs/libpng
+	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 )"
+
+IUSE="gnome kde nls"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	find . -name CVS | xargs rm -rf
+	# 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
+}
+
+src_install () {
+	local myopts=""
+
+	use gnome && myopts="${myopts} GNOME_PREFIX=${D}/usr"
+
+	if use kde; then
+		myopts="${myopts} \
+			KDE_PREFIX=${D}/usr/share/applnk \
+			KDE_ICON_PREFIX=${D}/usr/share/icons"
+	fi
+
+	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
+
+	make PREFIX="${D}/usr" ${myopts} install || die
+
+	rm docs/COPYING.txt docs/INSTALL.txt
+	dodoc docs/*.txt
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "For additional graphic stamps, you can emerge the"
+	einfo "media-gfx/tuxpaint-stamps package."
+	einfo ""
+}
+