bump to 0.9.19 by Denis Dupeyron in bug #200740

(Portage version: 2.2_rc8/cvs/Linux 2.6.27-rc6 i686)

3 files changed, 240 insertions, 2 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 4109c1ad32a9..b33dda4a22a4 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.40 2007/12/01 12:10:11 nixnut Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.41 2008/09/18 19:59:20 maekke Exp $
+
+*tuxpaint-0.9.19 (18 Sep 2008)
+
+  18 Sep 2008; Markus Meier <maekke@gentoo.org>
+  +files/tuxpaint-0.9.19-gentoo.patch, +tuxpaint-0.9.19.ebuild:
+  bump to 0.9.19 by Denis Dupeyron in bug #200740
 
   01 Dec 2007; nixnut <nixnut@gentoo.org> tuxpaint-0.9.17-r1.ebuild:
   Stable on ppc wrt bug 200640
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch
new file mode 100644
index 000000000000..cf702a8e58b7
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch
@@ -0,0 +1,163 @@
+diff -NurdpB tuxpaint-0.9.19/Makefile tuxpaint-0.9.19-patched/Makefile
+--- tuxpaint-0.9.19/Makefile	2008-02-19 01:45:37.000000000 +0100
++++ tuxpaint-0.9.19-patched/Makefile	2008-03-16 16:53:28.000000000 +0100
+@@ -20,7 +20,7 @@ SO_TYPE=so
+ 
+ # Where to install things:
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ 
+ # Root directory to place files when creating packages.
+@@ -42,7 +42,7 @@ DATA_PREFIX=$(PKG_ROOT)$(PREFIX)/share/t
+ # Magic Tool plug-ins
+ 
+ INCLUDE_PREFIX=$(PKG_ROOT)$(PREFIX)/include
+-MAGIC_PREFIX=$(PKG_ROOT)$(PREFIX)/lib/tuxpaint/plugins
++MAGIC_PREFIX=$(PKG_ROOT)$(PREFIX)/GET_LIBDIR/tuxpaint/plugins
+ 
+ 
+ # Docs and man page:
+@@ -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
+@@ -123,7 +126,7 @@ SVG_LIB=-lrsvg-2 -lcairo
+ SVG_CFLAGS=-I/usr/include/librsvg-2/librsvg \
+ 	-I/usr/include/gtk-2.0 \
+ 	-I/usr/include/glib-2.0 \
+-	-I/usr/lib/glib-2.0/include \
++	-I/usr/GET_LIBDIR/glib-2.0/include \
+ 	-I/usr/include/cairo
+ 
+ PAPER_LIB=-lpaper
+@@ -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
+@@ -360,10 +366,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
+@@ -635,16 +644,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
+ 
+ 
+@@ -738,9 +780,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:
+diff -NurdpB tuxpaint-0.9.19/src/tuxpaint.desktop tuxpaint-0.9.19-patched/src/tuxpaint.desktop
+--- tuxpaint-0.9.19/src/tuxpaint.desktop	2008-02-14 16:44:17.000000000 +0100
++++ tuxpaint-0.9.19-patched/src/tuxpaint.desktop	2008-03-16 16:18:14.000000000 +0100
+@@ -205,3 +205,4 @@ Comment[xh]=Inkqubo yokuzoba yabantwana.
+ Comment[zh_cn]=孩子的绘图程序。
+ Comment[zh_tw]=適合兒童的畫圖程式
+ Comment[zw]=Diif program paar keé men Dibuj paar biét biss
++Categories=Application;Graphics;
+
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
new file mode 100644
index 000000000000..afd4585e99f1
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
@@ -0,0 +1,69 @@
+# 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.19.ebuild,v 1.1 2008/09/18 19:59:20 maekke Exp $
+
+inherit eutils gnome2-utils multilib
+
+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"
+
+	# Make multilib-strict compliant, see bug #200740
+	sed -i -e "s:/GET_LIBDIR/:/$(get_libdir)/:" Makefile || die "sed failed"
+}
+
+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 ""
+}