Modified patch to avoid installing stuff under /usr/X11R6. Pruning old ebuild/patch.

Package-Manager: portage-2.1_pre4-r1

7 files changed, 55 insertions, 170 deletions

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 27ed386037b8..46119f4207e2 100644
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-gfx/tuxpaint
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.22 2006/01/18 20:04:48 blubb Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.23 2006/02/14 13:09:21 leonardop Exp $
+
+*tuxpaint-0.9.15b-r1 (14 Feb 2006)
+
+  14 Feb 2006; Leonardo Boshell <leonardop@gentoo.org>
+  files/tuxpaint-0.9.15b-gentoo.patch, +tuxpaint-0.9.15b-r1.ebuild:
+  Modified patch to avoid installing stuff under /usr/X11R6. Rev-bumped to
+  propagate change.
 
   18 Jan 2006; Simon Stelling <blubb@gentoo.org> tuxpaint-0.9.15b.ebuild:
   stable on amd64 wrt bug 119316
diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 235e5e2e6bee..2cee681220d6 100644
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -1,18 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 afdb39101e7b8ca94049c9ab703b97bf ChangeLog 3196
-MD5 6c694aa3e9399a07cdaa7f82a162b222 files/digest-tuxpaint-0.9.14 68
+MD5 a2699f3af312b878f84355b35cfc4bcb ChangeLog 3455
+RMD160 31f32cb7600c270714ecbe87865e9afb19d508da ChangeLog 3455
+SHA256 82135447357198c2b5580ff575e5693604af63d010ade4ac4082a10639fbc191 ChangeLog 3455
 MD5 9eb8991803ae628164f5991cec59e1a7 files/digest-tuxpaint-0.9.15b 69
-MD5 b12d971848124691a60da9265ecb86ba files/tuxpaint-0.9.14-gentoo.patch 4511
-MD5 69275845131d9a3f02af3ca631418360 files/tuxpaint-0.9.15b-gentoo.patch 2610
+RMD160 dbb624e734f640d26d563fb0683fdc2df88d2188 files/digest-tuxpaint-0.9.15b 69
+SHA256 8fcc64e43451ee060fd7e453c9d76b8b04ab80d6cf68231a5604f8e567755875 files/digest-tuxpaint-0.9.15b 69
+MD5 f71d13a385a4f0b46f33455cdb399840 files/digest-tuxpaint-0.9.15b-r1 253
+RMD160 96e4695051af131278392095d3f21ad859413ca1 files/digest-tuxpaint-0.9.15b-r1 253
+SHA256 d0751dcb8d4a9dc08347a8770649495c1a746ef546f324b3066f3adbf14f0b6b files/digest-tuxpaint-0.9.15b-r1 253
+MD5 6c755b41db6d9b766cf91bf2b6675019 files/tuxpaint-0.9.15b-gentoo.patch 2919
+RMD160 a24f84652ea84eda3261cec1232ba033efb76af8 files/tuxpaint-0.9.15b-gentoo.patch 2919
+SHA256 fffc7378fd5cabec383e0fa405da47483efa0c1056478c0be99a64771f99d70d files/tuxpaint-0.9.15b-gentoo.patch 2919
 MD5 60d69ee439da76dbf4d88951ef86236a metadata.xml 648
-MD5 a8ba0e922db9574f510b60932e1e56e3 tuxpaint-0.9.14.ebuild 1480
+RMD160 9637df32ab38d7c4e98c32194c34393eae4786fb metadata.xml 648
+SHA256 5f951324251b981f6dd24414b0b34a590a8ff051f29f2f24a6e1d08c71c82025 metadata.xml 648
+MD5 b5944ac2b0807e3dce5cac7244c38d44 tuxpaint-0.9.15b-r1.ebuild 1493
+RMD160 47a5659f36b1f7c53dcfacf4e6d0affbf4895e75 tuxpaint-0.9.15b-r1.ebuild 1493
+SHA256 8c939e7ce43eebf0e9a2fe262679e8d8fa03880353dc6a73144e56689d15363e tuxpaint-0.9.15b-r1.ebuild 1493
 MD5 1c87eb2f925c21504a3f5f4eb001157c tuxpaint-0.9.15b.ebuild 1483
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDzp9uH6mNYUtVdIARAozXAJ0bKGFPK5qedvEvofWKLnPqPvUPFQCeJBj/
-Q6675741lqIcCtIu12/OTLI=
-=NSB7
------END PGP SIGNATURE-----
+RMD160 6eb8155f6358b8462f84c849e1585c70d3ba16ae tuxpaint-0.9.15b.ebuild 1483
+SHA256 869f80e4fadd6cf3aa526b5481f588dc6a9756222884528489f7691f4b21c1a2 tuxpaint-0.9.15b.ebuild 1483
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.14 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.14
deleted file mode 100644
index bd4be67f9f3a..000000000000
--- a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.14
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0b7522c1b3672d5c233f7bbc772c8dec tuxpaint-0.9.14.tar.gz 3208894
diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.15b-r1 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.15b-r1
new file mode 100644
index 000000000000..8b384a659871
--- /dev/null
+++ b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.15b-r1
@@ -0,0 +1,3 @@
+MD5 04995631e0922570a0d5c2216d943941 tuxpaint-0.9.15b.tar.gz 5681511
+RMD160 2b8bbfa13572572b0bc3860c3ca5142d9e1584ed tuxpaint-0.9.15b.tar.gz 5681511
+SHA256 16eddd271e26e9a9cb0366504aa4706b9ebfb686035e6c40b6c3065247f6d862 tuxpaint-0.9.15b.tar.gz 5681511
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.14-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.14-gentoo.patch
deleted file mode 100644
index 2f6062254cf6..000000000000
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.14-gentoo.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-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/files/tuxpaint-0.9.15b-gentoo.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.15b-gentoo.patch
index ad1e58c1038c..5a3b0b509383 100644
--- a/media-gfx/tuxpaint/files/tuxpaint-0.9.15b-gentoo.patch
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.15b-gentoo.patch
@@ -1,6 +1,6 @@
-diff -NurdB tuxpaint-0.9.15b/Makefile tuxpaint-0.9.15b-patched/Makefile
---- tuxpaint-0.9.15b/Makefile	2005-11-27 01:44:15.000000000 -0500
-+++ tuxpaint-0.9.15b-patched/Makefile	2005-12-21 23:09:19.000000000 -0500
+diff -NurdB tuxpaint-0.9.15b-orig/Makefile tuxpaint-0.9.15b/Makefile
+--- tuxpaint-0.9.15b-orig/Makefile	2005-11-27 01:44:15.000000000 -0500
++++ tuxpaint-0.9.15b/Makefile	2006-02-14 08:00:18.000000000 -0500
 @@ -17,7 +17,7 @@
  
  # Where to install things:
@@ -77,3 +77,13 @@ diff -NurdB tuxpaint-0.9.15b/Makefile tuxpaint-0.9.15b-patched/Makefile
  	fi
  
  
+@@ -552,9 +559,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:
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.15b-r1.ebuild
index 32d1ce07c52c..1fcc2aab9ff9 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.14.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.15b-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 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.5 2005/05/26 18:49:39 luckyduck Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/tuxpaint-0.9.15b-r1.ebuild,v 1.1 2006/02/14 13:09:21 leonardop Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc amd64"
+KEYWORDS="~amd64 ~ppc ~x86"
 
 IUSE="gnome kde nls"
 
@@ -23,13 +23,13 @@ DEPEND="media-libs/libpng
 	media-libs/netpbm
 	nls? ( sys-devel/gettext )"
 
+
 src_unpack() {
-	unpack ${A}
-	cd ${S}
+	unpack "${A}"
+	cd "${S}"
 
-	find . -name CVS | xargs rm -rf
 	# Sanitize the Makefile and correct a few other issues.
-	epatch ${FILESDIR}/${P}-gentoo.patch
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 }
 
 src_compile() {
@@ -38,25 +38,25 @@ src_compile() {
 	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
 
 	# emake may break things
-	make ${myopts} || die
+	make ${myopts} || die "Compilation failed"
 }
 
 src_install () {
 	local myopts=""
 
-	use gnome && myopts="${myopts} GNOME_PREFIX=${D}/usr"
+	use gnome && myopts="${myopts} GNOME_PREFIX=/usr"
 
 	if use kde; then
 		myopts="${myopts} \
-			KDE_PREFIX=${D}/usr/share/applnk \
-			KDE_ICON_PREFIX=${D}/usr/share/icons"
+			KDE_PREFIX=/usr/share/applnk \
+			KDE_ICON_PREFIX=/usr/share/icons"
 	fi
 
 	use nls && myopts="${myopts} ENABLE_GETTEXT=1"
 
-	make PREFIX="${D}/usr" ${myopts} install || die
+	make PKG_ROOT="${D}" ${myopts} install || die "Installation failed"
 
-	rm docs/COPYING.txt docs/INSTALL.txt
+	rm -f docs/COPYING.txt docs/INSTALL.txt
 	dodoc docs/*.txt
 }