add patch to install icon correctly (bug #145280)

Package-Manager: portage-2.1.2_rc4-r5

4 files changed, 51 insertions, 13 deletions

diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog
index 7d0c74bfe3ed..3cd48713d439 100644
--- a/app-misc/gramps/ChangeLog
+++ b/app-misc/gramps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/gramps
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.38 2007/01/05 19:06:20 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.39 2007/01/05 19:12:36 compnerd Exp $
+
+  05 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gramps-2.2.2-desktop-entry-icon.patch, gramps-2.2.2.ebuild:
+  add patch to install icon (bug #145280)
 
   05 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org>
   -gramps-1.0.8.ebuild, -gramps-1.0.10.ebuild, -gramps-1.0.11.ebuild,
diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest
index 19e46d9b1b10..c82b29f96f35 100644
--- a/app-misc/gramps/Manifest
+++ b/app-misc/gramps/Manifest
@@ -1,17 +1,21 @@
+AUX gramps-2.2.2-desktop-entry-icon.patch 539 RMD160 97f0f80304d61fbb452c2d10e7ec9ca4a3aa0f89 SHA1 1afb03d25fe0249e8998924d975cc98cccf8c1c1 SHA256 5f85c23bb7817017fc26c3d90dac1346b1eb011d1b4dac358e8e8ecd12e89d90
+MD5 759e7a9f78c7c0d8337da4af15505371 files/gramps-2.2.2-desktop-entry-icon.patch 539
+RMD160 97f0f80304d61fbb452c2d10e7ec9ca4a3aa0f89 files/gramps-2.2.2-desktop-entry-icon.patch 539
+SHA256 5f85c23bb7817017fc26c3d90dac1346b1eb011d1b4dac358e8e8ecd12e89d90 files/gramps-2.2.2-desktop-entry-icon.patch 539
 DIST gramps-2.0.9.tar.gz 4140133 RMD160 4c6f6c29f881bfdb5a11f1a61dfcdf9089df46d8 SHA256 67f991a25ad471124b347b280febcd0565af4833873578f2439a9ebf580311da
 DIST gramps-2.2.2.tar.gz 7609350 RMD160 3719c50d6e2db1a6e6b38929ecac9536050443ed SHA1 bdad65048545d5a06cebff65409a4172b5e717c3 SHA256 a35744bacc832ae47e9d51c88ce118a7d7cd9c0129833b3baa84f3498318e886
 EBUILD gramps-2.0.9.ebuild 1637 RMD160 4440795c3ce2323a347cb904c6fe0819aa06ddbf SHA1 8bd897603145f71012d5a682797d05b3b07be055 SHA256 3977b15cc13051e2d90843b22103d734f52a676058ae4d94bd60cedb58d415aa
 MD5 7ea89632c2f3aa6ce760bc4b231f6b6e gramps-2.0.9.ebuild 1637
 RMD160 4440795c3ce2323a347cb904c6fe0819aa06ddbf gramps-2.0.9.ebuild 1637
 SHA256 3977b15cc13051e2d90843b22103d734f52a676058ae4d94bd60cedb58d415aa gramps-2.0.9.ebuild 1637
-EBUILD gramps-2.2.2.ebuild 1680 RMD160 9378be5b1f27a4916cd5b9318b6b0cada1af6727 SHA1 31eeab4c593c71db2f3d440bf6bec8cd9bf21dba SHA256 7c32802d3f6a18a059f8a9ee12069b7d5d78d5264a50b5efb593a556e8457b61
-MD5 6f7102c17f7cf951a3a59843d8ab13ce gramps-2.2.2.ebuild 1680
-RMD160 9378be5b1f27a4916cd5b9318b6b0cada1af6727 gramps-2.2.2.ebuild 1680
-SHA256 7c32802d3f6a18a059f8a9ee12069b7d5d78d5264a50b5efb593a556e8457b61 gramps-2.2.2.ebuild 1680
-MISC ChangeLog 5099 RMD160 4528440f4eaf400a99d3afd3f4948d23ff7a1eef SHA1 10dd62e490445fa63e2ccde791c34b205ea0b2a6 SHA256 af9c223d97b6ab8b5312e1cc63393c1ecc5fdc04a3a6a3c179fbec3188caeeaa
-MD5 578ab04e253d3b44b4e3f890da832f70 ChangeLog 5099
-RMD160 4528440f4eaf400a99d3afd3f4948d23ff7a1eef ChangeLog 5099
-SHA256 af9c223d97b6ab8b5312e1cc63393c1ecc5fdc04a3a6a3c179fbec3188caeeaa ChangeLog 5099
+EBUILD gramps-2.2.2.ebuild 1836 RMD160 fdc5e3c0daa7086d887e684508bfd90110227e31 SHA1 c7c4e4b0e90c7af254d789100497f7344a7d70e7 SHA256 b5571ec9c870c6e2df93844d6de37d859276dfe8394f42c5c09b97b2f553b08d
+MD5 39165a12270d192a35132cf061e765d7 gramps-2.2.2.ebuild 1836
+RMD160 fdc5e3c0daa7086d887e684508bfd90110227e31 gramps-2.2.2.ebuild 1836
+SHA256 b5571ec9c870c6e2df93844d6de37d859276dfe8394f42c5c09b97b2f553b08d gramps-2.2.2.ebuild 1836
+MISC ChangeLog 5267 RMD160 ecbebfe2f89fe9e151745e27375a00eae01b89fa SHA1 c0b9d353f48891dbf2cd95cf4651f5d59e7cdadd SHA256 f479d774678194c95453870f44978b71003ec89aa7694e3c127926a7e0c25f43
+MD5 23c76c761d6d7f3c4b3ebc55377714cf ChangeLog 5267
+RMD160 ecbebfe2f89fe9e151745e27375a00eae01b89fa ChangeLog 5267
+SHA256 f479d774678194c95453870f44978b71003ec89aa7694e3c127926a7e0c25f43 ChangeLog 5267
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
diff --git a/app-misc/gramps/files/gramps-2.2.2-desktop-entry-icon.patch b/app-misc/gramps/files/gramps-2.2.2-desktop-entry-icon.patch
new file mode 100644
index 000000000000..e4cfcd2f7e8b
--- /dev/null
+++ b/app-misc/gramps/files/gramps-2.2.2-desktop-entry-icon.patch
@@ -0,0 +1,20 @@
+--- src/images/Makefile.am	2007-01-05 12:59:36.000000000 -0600
++++ src/images/Makefile.am	2007-01-05 13:01:07.000000000 -0600
+@@ -2,6 +2,7 @@
+ # $Id: gramps-2.2.2-desktop-entry-icon.patch,v 1.1 2007/01/05 19:12:36 compnerd Exp $
+ 
+ SUBDIRS = 
++pixmapsdir = $(datadir)/pixmaps
+ pkgdatadir = $(datadir)/@PACKAGE@/images
+ 
+ map_tile_images = \
+@@ -49,6 +50,9 @@
+ 	world.topo.200407.3x3200x1600_tile_3_6.jpg\
+ 	world.topo.200407.3x3200x1600_tile_3_7.jpg
+ 
++dist_pixmaps_DATA = \
++	gramps.png
++
+ dist_pkgdata_DATA = \
+ 	bad.png\
+ 	caution.png\
diff --git a/app-misc/gramps/gramps-2.2.2.ebuild b/app-misc/gramps/gramps-2.2.2.ebuild
index c94b173b347b..35994bba7d5d 100644
--- a/app-misc/gramps/gramps-2.2.2.ebuild
+++ b/app-misc/gramps/gramps-2.2.2.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-2.2.2.ebuild,v 1.2 2006/11/05 17:28:02 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-2.2.2.ebuild,v 1.3 2007/01/05 19:12:36 compnerd Exp $
 
-inherit gnome2 eutils
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit autotools eutils gnome2
 
 DESCRIPTION="Genealogical Research and Analysis Management Programming System"
 HOMEPAGE="http://gramps.sourceforge.net/"
@@ -30,7 +33,6 @@ DEPEND="${RDEPEND}
 MAKEOPTS="${MAKEOPTS} -j1"
 
 DOCS="NEWS README TODO"
-USE_DESTDIR="1"
 
 pkg_setup() {
 	if has_version '<dev-python/pygtk-2.8' ; then
@@ -51,6 +53,14 @@ pkg_setup() {
 	G2CONF="${G2CONF} --disable-mime-install"
 }
 
+src_unpack() {
+	gnome2_src_unpack
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-2.2.2-desktop-entry-icon.patch
+	eautomake
+}
+
 src_install() {
 	gnome2_src_install scrollkeeper_localstate_dir=${D}/var/lib/scrollkeeper/
 	mv ${D}/usr/share/gramps.desktop ${D}/usr/share/applications/gramps.desktop