Updated patch to include installation of icon and bumped revision

Package-Manager: portage-2.1.9.35/cvs/Linux x86_64

4 files changed, 132 insertions, 17 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/Manifest b/gnome-extra/gdesklets-core/Manifest
index eae9c2666aea..0a48f282c797 100644
--- a/gnome-extra/gdesklets-core/Manifest
+++ b/gnome-extra/gdesklets-core/Manifest
@@ -3,7 +3,7 @@ AUX gdesklets-core-0.36-python-2.6-fix.patch 531 RMD160 81940f4dfc1f8b21470eee36
 AUX gdesklets-core-0.36.1-bash-completion 1425 RMD160 87724e2766e3d9ece61051b146210cc2ccaf0e94 SHA1 4e82336bbd694ed73824a533e1933d357d4df9eb SHA256 640f242d3481c9465a25a704fdbf3e3b370b91cad353fcfa2025b591345ee757
 AUX gdesklets-core-0.36.1-test-control.py-install-fix.patch 483 RMD160 a3a0b625c92738bb99d19f1332ded97fe717d387 SHA1 b088909f190a39479515b9501918fb7e31a03903 SHA256 2d3ef43385c3e2eb506a714ece81768abe6500f58392514a4b1e327bf098625d
 AUX gdesklets-core-0.36.2-ConfigWidget-dupe-fix.patch 312 RMD160 f37835015fb90857ee53b4001c53ccf1efd3bb08 SHA1 d51901a750bf901d5428734b79280c30d6b6f201 SHA256 eec96d7fa8c17b4c9a6ec037bc8ac8c4165c5bc652a35cceddd4ad13e97c0dfa
-AUX gdesklets-core-0.36.3-.in-files.patch 1241 RMD160 f192cfb4f45d7eea60d732ca8e79520f24c7b040 SHA1 465f3dca1ef39b2e33c152f38b43042e30b77045 SHA256 a57c88337f82dd857f53ea45ad409fa6860709882754002417715232f5640a7d
+AUX gdesklets-core-0.36.3-.in-files.patch 5186 RMD160 9c5fac538853f625d103ef07d34e90419cb03e84 SHA1 f0176794ef4ba93ba7160464df9b813f71f0188e SHA256 eeb4f3caf962e1c454b2054d7390bfdec641111741a9915238d949e169ee5530
 AUX gdesklets-core-0.36_beta-linguas.patch 1208 RMD160 5b691f445e73316232e394b8dca91601ac57d706 SHA1 d9fe4ed5775921c772b00399f3479afbb4a184d9 SHA256 760a79c3df6c6680ea6b76d787f666a603c919f7fac6b22869a4cb6ab7023b4b
 AUX gdesklets-core-getid-fix.patch 580 RMD160 d2be1e31658768b9d34d7500f9b6b76d524cec87 SHA1 b54a6a7b06b8634f9d07c0d98662db0164814ca5 SHA256 2be4b77748dc3ac89ad9709ff5f1fd014b78a4468542fad93183df539d77016a
 AUX gdesklets.desktop 265 RMD160 a6a84a28abf1120cc8df2e52505c119cdb82cca7 SHA1 a8a544d457cf613f939c45e29681bab307b0fa36 SHA256 8b38972217e4a923fb988b7982eb1e6655f1f885686a4b9585810999588c11ee
@@ -12,6 +12,6 @@ DIST gdesklets-0.36.1.tar.gz 3537820 RMD160 ff658aa32ee562ed0563f01e6c5c7267c0e1
 DIST gdesklets-0.36.3.tar.bz2 3745626 RMD160 86da28930621071fca32d2bc9c0ebfe1a41d03f9 SHA1 0ad58885bf50f43aaa0cf186ba0678251f5de26a SHA256 805b0343635e5dcfd24d23ab10f0153ab5135dc971ba1712fbf4bddbeee26af5
 EBUILD gdesklets-core-0.36.1-r3.ebuild 3892 RMD160 d16f6037e98d2073b2ceef694fb232d71820112c SHA1 f1ddc5a5cf0a2dc5f08507b7c1b939e5b7fb252b SHA256 2f82efafe8e5caf32f00db20bea53f592a6d11897eecb8d10bb6c399c36b01de
 EBUILD gdesklets-core-0.36.2-r3.ebuild 3696 RMD160 bea9dac2a45b42e92828a0a5fbf92086657c6cb8 SHA1 f4d8435a870d5388f0f4364ba04a6a4b82e30b0e SHA256 047723c3966e006339c4e80a236cc4d28d88520f93dcf26c0b04a26b776caf52
-EBUILD gdesklets-core-0.36.3-r1.ebuild 3406 RMD160 9508c2a2533b66c3cce0d156e66080830c0156f0 SHA1 cf6caa9ae593d67d31dfc3a16662682d7abb1b9f SHA256 81622b826d4df46ab2663ce9876a04381b61b5a2407a192cb2551bcd3e430b59
-MISC ChangeLog 25979 RMD160 e0cd3771d6e39e3ffb0bb16344d43a9ab0d9cb4f SHA1 5bdad10b1ea5905c31cb1b716dcf28aa8e14dfaf SHA256 5a8e300e87e2ee26f56e83dca352697aab0f9cd9ceba0dfcf0acf70ed613aa30
+EBUILD gdesklets-core-0.36.3-r2.ebuild 3406 RMD160 62610835a2dc4e445cdfaa277a61ad75393ce415 SHA1 864ef976b2c59dd1e03c21b9c284722f69e8ec83 SHA256 d5027ab742540b6dc61dbb429085b16e5da84f9b1a79b7dfb7815d44c4cf726a
+MISC ChangeLog 26233 RMD160 28ffad851b3317ab7dbee51f169fa2b5464d4b91 SHA1 b2f47b46c8ab3e979a6139e931887be8e76df3a5 SHA256 2e9712fa4d0b7b40a0d6db0411cb0a2d43aff6a68ba79f4e789d4086de5c456b
 MISC metadata.xml 313 RMD160 a292cb05998c995298fead8eda4d51d81832fd97 SHA1 ec75a2fe8a0668f263858cf395321641d839e968 SHA256 d913b0c409eb9c0725471cd13f4ed893899f5a09881dfef10dea6cd658a7aad9
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