Updated patch to include installation of icon and bumped revision

(Portage version: 2.1.9.35/cvs/Linux x86_64)

3 files changed, 129 insertions, 14 deletions

diff --git a/gnome-extra/gdesklets-core/ChangeLog b/gnome-extra/gdesklets-core/ChangeLog
index e364cd825870..dfea5de8d1e3 100644
--- a/gnome-extra/gdesklets-core/ChangeLog
+++ b/gnome-extra/gdesklets-core/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/gdesklets-core
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.139 2011/01/30 21:00:25 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/ChangeLog,v 1.140 2011/02/03 02:40:46 nixphoeni Exp $
+
+*gdesklets-core-0.36.3-r2 (03 Feb 2011)
+
+  03 Feb 2011; Joe Sapp <nixphoeni@gentoo.org>
+  -gdesklets-core-0.36.3-r1.ebuild, +gdesklets-core-0.36.3-r2.ebuild,
+  files/gdesklets-core-0.36.3-.in-files.patch:
+  Updated patch to include installation of icon
 
   30 Jan 2011; Joe Sapp <nixphoeni@gentoo.org> gdesklets-core-0.36.3-r1.ebuild,
   +files/gdesklets-core-0.36.3-.in-files.patch:
diff --git a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch
index adda7bd12820..fc8753e46c85 100644
--- a/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch
+++ b/gnome-extra/gdesklets-core/files/gdesklets-core-0.36.3-.in-files.patch
@@ -1,26 +1,89 @@
+=== modified file 'Makefile.am'
+--- Makefile.am	2010-12-14 10:24:59 +0000
++++ Makefile.am	2011-01-31 01:20:58 +0000
+@@ -11,8 +11,12 @@
+ autostartdir = $(sysconfdir)/xdg/autostart
+ sharedmimepackagedir = $(datadir)/mime/packages
+ mimeicondir = $(datadir)/icons/gnome/48x48/mimetypes
++pixmapdir = $(datadir)/pixmaps
+ basicdeskletsdir = ${installdir}
+ 
++# initialize this so we can add to it later
++nobase_dist_install_DATA =
++
+ include Makefile_gdesklets.am
+ include Makefile_python.am
+ 
+
 === modified file 'Makefile_gdesklets.am'
 --- Makefile_gdesklets.am	2011-01-06 11:01:06 +0000
-+++ Makefile_gdesklets.am	2011-01-30 20:12:07 +0000
-@@ -20,28 +20,31 @@
++++ Makefile_gdesklets.am	2011-01-31 01:20:58 +0000
+@@ -1,12 +1,14 @@
+ # Set the LDFLAGS for this section
+ AM_LDFLAGS = -module -avoid-version -as-needed
  
++# Libraries that get installed in these exact subdirectories
+ nobase_install_LTLIBRARIES = \
+   libdesklets/system/gtop.la \
+   utils/svg.la               \
+   utils/tiling.la            \
+   utils/x11.la
+ 
++# Scripts that get distributed and installed
+ dist_install_SCRIPTS =             \
+   ctrlinfo                         \
+   gdesklets                        \
+@@ -16,38 +18,62 @@
+   gdesklets-shell                  \
+   test-control.py
+ 
++# "System" scripts that get distributed but not installed
+ dist_noinst_SCRIPTS = autogen.sh
+ 
++# Man page
  dist_man_MANS = doc/man/gdesklets.1
  
+-EXTRA_DIST =             \
+-  AUTHORS                \
+-  COPYING                \
+-  README                 \
+-  TODO                   \
+-  NEWS                   \
+-  contrib/bash/gdesklets
+-
 +# The .desktop file
 +desktop_in_files = data/gdesklets.desktop.in
 +# The shared mime XML file
 +sharedmimepackage_in_files = data/gdesklets.xml.in
 +
- EXTRA_DIST =             \
-   AUTHORS                \
-   COPYING                \
-   README                 \
-   TODO                   \
-   NEWS                   \
--  contrib/bash/gdesklets
-+  contrib/bash/gdesklets \
-+  $(desktop_in_files)    \
++# Other odds and ends that get distributed, but not installed
++# It's up to distro package maintainers to install these
++EXTRA_DIST =                                          \
++  AUTHORS                                             \
++  COPYING                                             \
++  README                                              \
++  TODO                                                \
++  NEWS                                                \
++  contrib/bash/gdesklets                              \
++  $(desktop_in_files)                                 \
 +  $(sharedmimepackage_in_files)
- 
++
++# Docs and images that get distributed and installed to these specific
++# directories
++nobase_dist_install_DATA +=                 \
++  doc/basic/gdesklets-doc.xml               \
++  doc/basic/Images/desklet-context-menu.png \
++  doc/basic/Images/desklet-start-shell.png  \
++  doc/basic/Images/gdesklets.png            \
++  doc/basic/Images/open-command.png         \
++  doc/basic/Images/preferences.png          \
++  doc/basic/Images/profile.png              \
++  doc/basic/Images/remote.png               \
++  doc/basic/Images/shell.png                \
++  data/about.png                            \
++  data/gdesklets.png
++
++# Additional files that get cleaned by distclean
  # See http://www.gnu.org/software/hello/manual/automake/Clean.html
  CLEANFILES =   \
    po/.intltool-merge-cache
@@ -38,4 +101,49 @@
  sharedmimepackage_DATA = $(sharedmimepackage_in_files:.xml.in=.xml)
  @INTLTOOL_XML_RULE@
  
+ # And the mime icon
+-mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
++dist_mimeicon_DATA = data/gnome-mime-application-x-gdesklets-display.png
+ 
++# Note, this gets installed in both $(pixmapdir) and $(installdir)
+ pixmap_DATA = data/gdesklets.png
+ 
+ libdesklets_system_gtop_la_CFLAGS = $(GLIBTOP_CFLAGS) \
+
+=== modified file 'Makefile_python.am'
+--- Makefile_python.am	2010-12-14 10:24:59 +0000
++++ Makefile_python.am	2011-01-31 01:20:58 +0000
+@@ -1,4 +1,4 @@
+-nobase_dist_install_DATA =              \
++nobase_dist_install_DATA +=             \
+ 	Controls/__init__.py	\
+ 	Controls/ArrayBuffer/__init__.py \
+ 	Controls/ArrayBuffer/IArrayBuffer.py \
+@@ -48,21 +48,6 @@
+ 	config/DisplayConfigger.py \
+ 	config/StateSaver.py     \
+ 	config/settings.py \
+-	data/about.png                               \
+-	data/calendar.png                            \
+-	data/gdesklets.desktop                       \
+-	data/gdesklets.png                           \
+-	data/gdesklets.xml                           \
+-	data/gnome-mime-application-x-gdesklets-display.png \
+-	doc/basic/gdesklets-doc.xml \
+-	doc/basic/Images/desklet-context-menu.png	\
+-	doc/basic/Images/desklet-start-shell.png		\
+-	doc/basic/Images/gdesklets.png	        	\
+-	doc/basic/Images/open-command.png		\
+-	doc/basic/Images/preferences.png			\
+-	doc/basic/Images/profile.png			\
+-	doc/basic/Images/remote.png			\
+-	doc/basic/Images/shell.png \
+ 	display/__init__.py            \
+ 	display/ContainerTarget.py     \
+ 	display/DataTarget.py          \
+@@ -212,4 +197,3 @@
+ 	utils/typeconverter.py    \
+ 	utils/vfs.py              \
+ 	utils/xdr.py
+-
 
diff --git a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r1.ebuild b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r2.ebuild
index 614fb3d5a8ce..0f0fffd40c10 100644
--- a/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r1.ebuild
+++ b/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r1.ebuild,v 1.2 2011/01/30 21:00:25 nixphoeni Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gdesklets-core/gdesklets-core-0.36.3-r2.ebuild,v 1.1 2011/02/03 02:40:46 nixphoeni Exp $
 
 EAPI=2
 # desklets don't run with USE=debug