Removed old ebuild. New revision, should fix bug #42971.

7 files changed, 86 insertions, 73 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 057df3eebf2d..849fcb90b31b 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.9 2004/08/30 23:41:12 dholm Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.10 2004/11/24 01:48:43 leonardop Exp $
+
+*tuxpaint-0.9.13-r1 (23 Nov 2004)
+
+  23 Nov 2004; L. Boshell <leonardop@gentoo.org> tuxpaint-0.9.13-r1.ebuild:
+  New revision with some style changes, a new patch for its Makefile which
+  should resolve bug #42971, and support for the `nls' USE flag.
 
   31 Aug 2004; David Holm <dholm@gentoo.org> tuxpaint-0.9.13.ebuild:
   Added to ~ppc.
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 4771be77bd8f..8521ed8b4030 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,6 +1,6 @@
-MD5 262621725d86e661ff280274678e9154 ChangeLog 1155
-MD5 978ca7de1eb30365afc7555b471468a6 metadata.xml 219
-MD5 e59f7edc227ae58e843778977f459912 tuxpaint-0.9.12.ebuild 1854
+MD5 8c0f021b51f85cd1bdbd19a8508ccc30 ChangeLog 1412
+MD5 60d69ee439da76dbf4d88951ef86236a metadata.xml 648
 MD5 a63e8fdd74bd98798239d8266cb5bf93 tuxpaint-0.9.13.ebuild 1856
-MD5 60d68c719ff0eec4ce2849662bbce97e files/digest-tuxpaint-0.9.12 68
+MD5 a49e2d72e22618023ad03872d7f9f67f tuxpaint-0.9.13-r1.ebuild 1361
+MD5 ac7dc281a67f1db989d39470aa12ea8e files/digest-tuxpaint-0.9.13-r1 142
 MD5 9f0ca98deef70db6f3e6878392434cae files/digest-tuxpaint-0.9.13 68
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.12 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.12
deleted file mode 100644
index 460ea229d02b..000000000000
--- a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 62948b25f244e99bd306c08c2fbd6445 tuxpaint-0.9.12.tar.gz 2334772
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.13-r1 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.13-r1
new file mode 100644
index 000000000000..62bd829aea23
--- /dev/null
+++ b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.13-r1
@@ -0,0 +1,2 @@
+MD5 580ed290af35c34a33f2206f7f36e489 tuxpaint-0.9.13.tar.gz 2495193
+MD5 b61f93abe4add6a75145bddecf5e5239 tuxpaint-0.9.13-makefile.patch 21771
diff --git a/media-gfx/tuxpaint/metadata.xml b/media-gfx/tuxpaint/metadata.xml
index 9ee05a43f8e1..84b3e31fceff 100644
--- a/media-gfx/tuxpaint/metadata.xml
+++ b/media-gfx/tuxpaint/metadata.xml
@@ -1,6 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>gnome</herd>
-<maintainer><email>leonardop@gentoo.org</email></maintainer>
+  <herd>graphics</herd>
+  <maintainer>
+    <email>leonardop@gentoo.org</email>
+    <name>Leonardo Boshell</name>
+  </maintainer>
+  <longdescription>
+    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.
+  </longdescription>
 </pkgmetadata>
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.12.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.12.ebuild
deleted file mode 100644
index 1ea841186539..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.12.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.12.ebuild,v 1.7 2004/06/24 22:51:12 agriffis 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"
-
-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.13-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild
new file mode 100644
index 000000000000..c862f75c442e
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.13-r1.ebuild
@@ -0,0 +1,61 @@
+# 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-r1.ebuild,v 1.1 2004/11/24 01:48:43 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
+mirror://gentoo/${P}-makefile.patch"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc"
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${S}
+
+	# Sanitize the hack that is its Makefile
+	epatch ${DISTDIR}/${P}-makefile.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=/usr"
+
+	if use kde && which kde-config ; then
+		myopts="${myopts} KDE_PREFIX=\
+$(kde-config --install apps --expandvars) KDE_ICON_PREFIX=\
+$(kde-config --install icon --expandvars)"
+	fi
+
+	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
+
+	make DESTDIR=${D} ${myopts} install || die
+
+	rm docs/INSTALL.txt
+	dodoc docs/*.txt
+}