summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@gentoo.org>2007-01-05 19:12:36 +0000
committerSaleem Abdulrasool <compnerd@gentoo.org>2007-01-05 19:12:36 +0000
commit717b06d864fe383a148699e0525e2ddfd6a97301 (patch)
tree34ef457ca9e326ff09512bc8d638c2c09c97de28 /app-misc
parentSet WANT_AUTOCONF and WANT_AUTOMAKE (diff)
downloadgentoo-2-717b06d864fe383a148699e0525e2ddfd6a97301.tar.gz
gentoo-2-717b06d864fe383a148699e0525e2ddfd6a97301.tar.bz2
gentoo-2-717b06d864fe383a148699e0525e2ddfd6a97301.zip
add patch to install icon correctly (bug #145280)
(Portage version: 2.1.2_rc4-r5)
Diffstat (limited to 'app-misc')
-rw-r--r--app-misc/gramps/ChangeLog6
-rw-r--r--app-misc/gramps/files/gramps-2.2.2-desktop-entry-icon.patch20
-rw-r--r--app-misc/gramps/gramps-2.2.2.ebuild18
3 files changed, 39 insertions, 5 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/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