-r1: drop 'gnome' and 'kde' USE flags. Always install the .desktop file and icons...

Package-Manager: portage-2.1.2_rc3

diff --git a/media-gfx/tuxpaint/ChangeLog b/media-gfx/tuxpaint/ChangeLog
index 065957b3b1284e491f6666f6feeede150fe0fb3b..4f05c8796cea8ea7aea99c5be3ffda22197cc40d 100644 (file)
--- a/media-gfx/tuxpaint/ChangeLog
+++ b/media-gfx/tuxpaint/ChangeLog
@@ -1,6 +1,14 @@
 # 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.28 2006/11/01 02:51:16 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/tuxpaint/ChangeLog,v 1.29 2006/12/13 02:41:03 leonardop Exp $
+
+*tuxpaint-0.9.16-r1 (13 Dec 2006)
+
+  13 Dec 2006; Leonardo Boshell <leonardop@gentoo.org>
+  +files/tuxpaint-0.9.16-gentoo-r1.patch, +tuxpaint-0.9.16-r1.ebuild:
+  Drop 'gnome' and 'kde' USE flags. Always install the .desktop file and icons
+  in standard places recognized by both desktops (related to bug #157619).
+  Call gnome2_icon_cache_update() from pkg_postinst().
 
 *tuxpaint-0.9.16 (01 Nov 2006)
 

diff --git a/media-gfx/tuxpaint/Manifest b/media-gfx/tuxpaint/Manifest
index 9a035cb840235ebf4f1bbef52c2825ab90c195fe..fbcbd0c9cf430f21d5a1e6ef48c114768069f739 100644 (file)
--- a/media-gfx/tuxpaint/Manifest
+++ b/media-gfx/tuxpaint/Manifest
@@ -2,6 +2,10 @@ AUX tuxpaint-0.9.15b-gentoo.patch 3160 RMD160 372bb64fab77dc5d7545484ff498ec7d17
 MD5 d997df13508ddf7bba6227a28656253e files/tuxpaint-0.9.15b-gentoo.patch 3160
 RMD160 372bb64fab77dc5d7545484ff498ec7d17b61cb9 files/tuxpaint-0.9.15b-gentoo.patch 3160
 SHA256 6bc3efe7a2113ca81cbacde6253929953f3c200fe9cc39715f4ab2283f26e55e files/tuxpaint-0.9.15b-gentoo.patch 3160
+AUX tuxpaint-0.9.16-gentoo-r1.patch 6283 RMD160 334c641b29f3ec181eb4bbd2f73a58040a1d910b SHA1 0e119d3aadc1f18741ff7ff282b06db35265a0ba SHA256 847254bec0d8d07e6f3fb1ba51f76e98965bc9df8e983e49a3c053a2bdaa5caf
+MD5 e1f8201420ff03c66441f60ee0985032 files/tuxpaint-0.9.16-gentoo-r1.patch 6283
+RMD160 334c641b29f3ec181eb4bbd2f73a58040a1d910b files/tuxpaint-0.9.16-gentoo-r1.patch 6283
+SHA256 847254bec0d8d07e6f3fb1ba51f76e98965bc9df8e983e49a3c053a2bdaa5caf files/tuxpaint-0.9.16-gentoo-r1.patch 6283
 AUX tuxpaint-0.9.16-gentoo.patch 3582 RMD160 f37603f909907ff97451b38862d8a123c6ec7117 SHA1 f8f01b3c616258a98d28faab0cf7f6bf06f38d65 SHA256 a62bd7a5f0f6ad4987dcad1b4d47c4c3362bc857125e7538fb3df6c1eeebf3b6
 MD5 7fb011621a6cda65164fa56b644c1f4a files/tuxpaint-0.9.16-gentoo.patch 3582
 RMD160 f37603f909907ff97451b38862d8a123c6ec7117 files/tuxpaint-0.9.16-gentoo.patch 3582
@@ -12,14 +16,18 @@ EBUILD tuxpaint-0.9.15b-r1.ebuild 1493 RMD160 269a3343814ed3c3370e88f150c75e78d9
 MD5 53c96d652e62081ce5dd7484d90a06e8 tuxpaint-0.9.15b-r1.ebuild 1493
 RMD160 269a3343814ed3c3370e88f150c75e78d9c99442 tuxpaint-0.9.15b-r1.ebuild 1493
 SHA256 4c1bfc664a9ce4011f76ab8c378802edc312c1eb61bf1b16f60689b049cf8b54 tuxpaint-0.9.15b-r1.ebuild 1493
+EBUILD tuxpaint-0.9.16-r1.ebuild 1345 RMD160 836f569acdddcee227091c11cce53c2e9d8b8b2b SHA1 d398c899b61845a43bb1da63b5a433b9bd868361 SHA256 235fe3ba9c9c66dbc831b4ea7853e8469a69e3d42228e6e6b9a4f44a6a791407
+MD5 7a5f0b3f88417184284464472c4501dc tuxpaint-0.9.16-r1.ebuild 1345
+RMD160 836f569acdddcee227091c11cce53c2e9d8b8b2b tuxpaint-0.9.16-r1.ebuild 1345
+SHA256 235fe3ba9c9c66dbc831b4ea7853e8469a69e3d42228e6e6b9a4f44a6a791407 tuxpaint-0.9.16-r1.ebuild 1345
 EBUILD tuxpaint-0.9.16.ebuild 1478 RMD160 bdfd91079babc40930e8c893056f919c123db87f SHA1 6b6bbb397c9766af16d86190b0fa519d8a95a84b SHA256 e1e3aee977e03c391b96f7857cd04e1673b2323111cb0b0e2ec1863c2b998eea
 MD5 66330cbe3f1aab9c3a8707fcdca0ed4e tuxpaint-0.9.16.ebuild 1478
 RMD160 bdfd91079babc40930e8c893056f919c123db87f tuxpaint-0.9.16.ebuild 1478
 SHA256 e1e3aee977e03c391b96f7857cd04e1673b2323111cb0b0e2ec1863c2b998eea tuxpaint-0.9.16.ebuild 1478
-MISC ChangeLog 4207 RMD160 855758d0d5d8844d9395327c02675118c75a99e4 SHA1 906efcffbfc895264cf49dfdbdbff0e37dd9a417 SHA256 9161b18ff679e73ffb12b09224891f3260e59d1674e10c9fdc7dd4ca9a291074
-MD5 b22a8cf0725c1328b4dc227a3f9f5d52 ChangeLog 4207
-RMD160 855758d0d5d8844d9395327c02675118c75a99e4 ChangeLog 4207
-SHA256 9161b18ff679e73ffb12b09224891f3260e59d1674e10c9fdc7dd4ca9a291074 ChangeLog 4207
+MISC ChangeLog 4577 RMD160 131b90557fba9b7f431dfd79d873d10afc689393 SHA1 958034e51d40041f310c378647a75f913e2c182c SHA256 50a71f4ad6d97c9886edc16e2626cfc6f983bdf9f41cd8c04c3768ff7f48a344
+MD5 8703504ca0edcd093ba91f0271895191 ChangeLog 4577
+RMD160 131b90557fba9b7f431dfd79d873d10afc689393 ChangeLog 4577
+SHA256 50a71f4ad6d97c9886edc16e2626cfc6f983bdf9f41cd8c04c3768ff7f48a344 ChangeLog 4577
 MISC metadata.xml 648 RMD160 9637df32ab38d7c4e98c32194c34393eae4786fb SHA1 710e2dfd4045a91e222ac33769adf2d74512ac86 SHA256 5f951324251b981f6dd24414b0b34a590a8ff051f29f2f24a6e1d08c71c82025
 MD5 60d69ee439da76dbf4d88951ef86236a metadata.xml 648
 RMD160 9637df32ab38d7c4e98c32194c34393eae4786fb metadata.xml 648
@@ -30,3 +38,6 @@ SHA256 d0751dcb8d4a9dc08347a8770649495c1a746ef546f324b3066f3adbf14f0b6b files/di
 MD5 6935829fe34cf1322b23c506b6d57b5f files/digest-tuxpaint-0.9.16 250
 RMD160 022d5c0ff4becbcf64ab9776c7fbe9422f0f0df2 files/digest-tuxpaint-0.9.16 250
 SHA256 3f8153732e3be38b013c8f45b54a01fa488fb8dacedbfbc27b282e9566f9c641 files/digest-tuxpaint-0.9.16 250
+MD5 6935829fe34cf1322b23c506b6d57b5f files/digest-tuxpaint-0.9.16-r1 250
+RMD160 022d5c0ff4becbcf64ab9776c7fbe9422f0f0df2 files/digest-tuxpaint-0.9.16-r1 250
+SHA256 3f8153732e3be38b013c8f45b54a01fa488fb8dacedbfbc27b282e9566f9c641 files/digest-tuxpaint-0.9.16-r1 250

diff --git a/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.16-r1 b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.16-r1
new file mode 100644 (file)
index 0000000..0aa1a60
--- /dev/null
+++ b/media-gfx/tuxpaint/files/digest-tuxpaint-0.9.16-r1
@@ -0,0 +1,3 @@
+MD5 467ef64c7f81f9f3755ae2ceebe97f48 tuxpaint-0.9.16.tar.gz 6785134
+RMD160 f263455fa3bd4d51e7280a5451d7cc021b2c9639 tuxpaint-0.9.16.tar.gz 6785134
+SHA256 af2dd9dcac7c7377e344bb964b8a523402aeffde877522c844f98c9e1e5881e0 tuxpaint-0.9.16.tar.gz 6785134

diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.16-gentoo-r1.patch b/media-gfx/tuxpaint/files/tuxpaint-0.9.16-gentoo-r1.patch
new file mode 100644 (file)
index 0000000..785c9d4
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.16-gentoo-r1.patch
@@ -0,0 +1,155 @@
+diff -NurdB tuxpaint-0.9.16/Makefile tuxpaint-0.9.16-patched/Makefile
+--- tuxpaint-0.9.16/Makefile   2006-10-19 02:41:49.000000000 -0500
++++ tuxpaint-0.9.16-patched/Makefile   2006-12-11 23:22:55.000000000 -0500
+@@ -18,7 +18,7 @@
+ 
+ # Where to install things:
+ 
+-PREFIX=/usr/local
++PREFIX=/usr
+ 
+ 
+ # Root directory to place files when creating packages.
+@@ -62,13 +62,15 @@
+ 
+ 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
+ 
+ 
+ # Locale files
+ 
++ENABLE_GETTEXT=0
+ LOCALE_PREFIX=$(PKG_ROOT)$(PREFIX)/share/locale
+ # LOCALE_PREFIX=/usr/share/locale
+ 
+@@ -97,7 +99,7 @@
+ # The entire set of CFLAGS:
+ 
+ #-ffast-math
+-CFLAGS=-O2 -W -Wall -fno-common -ffloat-store \
++CFLAGS += -W -Wall -fno-common -ffloat-store \
+       -Wcast-align -Wredundant-decls \
+       -Wbad-function-cast -Wwrite-strings \
+       -Waggregate-return \
+@@ -118,7 +120,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
+@@ -220,10 +225,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
++              install-desktop-data
++      @if [ -n "$(ENABLE_GETTEXT)" ] && [ $(ENABLE_GETTEXT) -eq 1 ]; then \
++              make install-gettext; \
++      fi
+       @echo
+       @echo "--------------------------------------------------------------"
+       @echo
+@@ -497,16 +505,49 @@
+ 
+ # 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
+ 
+ 
+@@ -590,9 +631,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:
+@@ -1034,7 +1072,7 @@
+               $^ \
+               $(HQXX_O) \
+               $(SDL_LIBS) \
+-              -lm $(ARCH_LINKS)
++              -lm -lpng12 $(ARCH_LINKS)
+       @$(RSRC_CMD)
+       @$(MIMESET_CMD)
+ 
+diff -NurdB tuxpaint-0.9.16/src/tuxpaint.desktop tuxpaint-0.9.16-patched/src/tuxpaint.desktop
+--- tuxpaint-0.9.16/src/tuxpaint.desktop       2006-09-10 13:18:49.000000000 -0500
++++ tuxpaint-0.9.16-patched/src/tuxpaint.desktop       2006-12-10 19:53:51.000000000 -0500
+@@ -158,3 +158,5 @@
+ Comment[wa]=Programe di dessinaedje po ls efants
+ Comment[zh_cn]=孩子的绘图程序。
+ Comment[zh_tw]=適合兒童的畫圖程式
++Categories=Application;Graphics;
++

diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.16-r1.ebuild b/media-gfx/tuxpaint/tuxpaint-0.9.16-r1.ebuild
new file mode 100644 (file)
index 0000000..8bdfedb
--- /dev/null
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.16-r1.ebuild
@@ -0,0 +1,62 @@
+# 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.16-r1.ebuild,v 1.1 2006/12/13 02:41:03 leonardop Exp $
+
+inherit eutils gnome2-utils
+
+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"
+
+DEPEND="media-libs/libsdl
+       media-libs/sdl-image
+       media-libs/sdl-ttf
+       media-libs/sdl-mixer
+       >=media-libs/libpng-1.2
+       >=media-libs/freetype-2
+       media-libs/netpbm
+       nls? ( sys-devel/gettext )"
+
+
+src_unpack() {
+       unpack "${A}"
+       cd "${S}"
+
+       # Sanitize the Makefile and correct a few other issues.
+       epatch "${FILESDIR}"/${P}-gentoo-r1.patch
+}
+
+src_compile() {
+       local myopts=""
+
+       use nls && myopts="${myopts} ENABLE_GETTEXT=1"
+
+       # 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
+
+       einfo ""
+       einfo "For additional graphic stamps, you can emerge the"
+       einfo "media-gfx/tuxpaint-stamps package."
+       einfo ""
+}