old

Package-Manager: portage-2.2_rc26/cvs/Linux i686

7 files changed, 11 insertions, 290 deletions

diff --git a/media-gfx/tuxpaint-stamps/ChangeLog b/media-gfx/tuxpaint-stamps/ChangeLog
index e0ba6464d2a9..0780d71c654c 100644
--- a/media-gfx/tuxpaint-stamps/ChangeLog
+++ b/media-gfx/tuxpaint-stamps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/tuxpaint-stamps
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint-stamps/ChangeLog,v 1.23 2009/03/19 14:17:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint-stamps/ChangeLog,v 1.24 2009/03/19 19:03:41 maekke Exp $
+
+  19 Mar 2009; Markus Meier <maekke@gentoo.org>
+  -tuxpaint-stamps-20071121.ebuild:
+  old
 
   19 Mar 2009; Brent Baude <ranger@gentoo.org>
   tuxpaint-stamps-20080630.ebuild:
diff --git a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20071121.ebuild b/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20071121.ebuild
deleted file mode 100644
index 46a2240841c0..000000000000
--- a/media-gfx/tuxpaint-stamps/tuxpaint-stamps-20071121.ebuild
+++ /dev/null
@@ -1,24 +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-stamps/tuxpaint-stamps-20071121.ebuild,v 1.3 2008/10/26 19:23:15 maekke Exp $
-
-MY_P="${PN}-2007.11.21"
-DESCRIPTION="Set of 'Rubber Stamp' images which can be used within Tux Paint"
-HOMEPAGE="http://www.tuxpaint.org/"
-
-DEPEND="media-gfx/tuxpaint"
-
-IUSE=""
-SRC_URI="mirror://sourceforge/tuxpaint/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-
-src_install () {
-	make PREFIX="${D}/usr" install-all || die "Installation failed"
-
-	rm -f docs/COPYING.txt
-	dodoc docs/*.txt
-}
diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 374dcd5e9951..781242151d42 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.52 2009/03/19 14:10:45 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.53 2009/03/19 19:01:01 maekke Exp $
+
+  19 Mar 2009; Markus Meier <maekke@gentoo.org>
+  -files/tuxpaint-0.9.19-gentoo.patch, -files/tuxpaint-0.9.19-libpng.patch,
+  -files/tuxpaint-0.9.19-strip.patch, -tuxpaint-0.9.19.ebuild:
+  old
 
   19 Mar 2009; Brent Baude <ranger@gentoo.org> tuxpaint-0.9.20.ebuild:
   Marking tuxpaint-0.9.20 ppc for bug 256179
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch
deleted file mode 100644
index cf702a8e58b7..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.19-gentoo.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-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/files/tuxpaint-0.9.19-libpng.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-libpng.patch
deleted file mode 100644
index 4ec56d4ec811..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.19-libpng.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru tuxpaint-0.9.19.orig/Makefile tuxpaint-0.9.19/Makefile
---- tuxpaint-0.9.19.orig/Makefile	2008-10-20 00:06:22.000000000 +0200
-+++ tuxpaint-0.9.19/Makefile	2008-10-20 00:07:24.000000000 +0200
-@@ -130,6 +130,7 @@
- 	-I/usr/include/cairo
- 
- PAPER_LIB=-lpaper
-+PNG_LIB=-lpng12
- ARCH_LIBS=obj/postscript_print.o
- 
- 
-@@ -925,6 +926,7 @@
- 		$(SDL_LIBS) \
- 		$(SVG_LIB) \
- 		$(PAPER_LIB) \
-+		$(PNG_LIB) \
- 		$(ARCH_LINKS)
- 	@$(RSRC_CMD)
- 	@$(MIMESET_CMD)
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.19-strip.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.19-strip.patch
deleted file mode 100644
index 8e031c537add..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.19-strip.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ru tuxpaint-0.9.19.orig/magic/Makefile tuxpaint-0.9.19/magic/Makefile
---- tuxpaint-0.9.19.orig/magic/Makefile	2008-10-25 14:58:57.000000000 +0200
-+++ tuxpaint-0.9.19/magic/Makefile	2008-10-25 14:59:13.000000000 +0200
-@@ -50,7 +50,6 @@
- 	shift.$(SO_TYPE) \
- 	calligraphy.$(SO_TYPE) \
- 	distortion.$(SO_TYPE)
--	@strip *.$(SO_TYPE)
- 
- install:
- 	cd .. ; make install-magic-plugins
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
deleted file mode 100644
index 138c575fa775..000000000000
--- a/media-gfx/tuxpaint/tuxpaint-0.9.19.ebuild
+++ /dev/null
@@ -1,71 +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.19.ebuild,v 1.6 2008/10/26 19:19:02 maekke Exp $
-
-inherit eutils gnome2-utils multilib toolchain-funcs
-
-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"
-	epatch "${FILESDIR}/${P}-libpng.patch"
-	epatch "${FILESDIR}/${P}-strip.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 CC="$(tc-getCC)" ${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 ""
-}