fix bugs #152227 and #111669

(Portage version: 2.1.2_rc4-r5)

6 files changed, 122 insertions, 1 deletions

diff --git a/app-crypt/gringotts/ChangeLog b/app-crypt/gringotts/ChangeLog
index 5fca42686aae..91c3e1a2af6e 100644
--- a/app-crypt/gringotts/ChangeLog
+++ b/app-crypt/gringotts/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-crypt/gringotts
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/ChangeLog,v 1.25 2007/01/05 07:53:53 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/ChangeLog,v 1.26 2007/01/05 07:56:49 compnerd Exp $
+
+*gringotts-1.2.8-r2 (05 Jan 2007)
+
+  05 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org>
+  +files/gringotts-1.2.8-desktop.patch,
+  +files/gringotts-1.2.8-desktop-entry.patch,
+  +files/gringotts-1.2.8-no-strip.patch, +gringotts-1.2.8-r2.ebuild:
+  Add patches to fix desktop entry, ensure that the entry shows up in the menu
+  (bug #111669), and to prevent stripping (bug #152227)
 
   05 Jan 2007; Saleem Abdulrasool <compnerd@gentoo.org>
   -gringotts-1.2.8.ebuild:
diff --git a/app-crypt/gringotts/files/digest-gringotts-1.2.8-r2 b/app-crypt/gringotts/files/digest-gringotts-1.2.8-r2
new file mode 100644
index 000000000000..1682c0cc1f92
--- /dev/null
+++ b/app-crypt/gringotts/files/digest-gringotts-1.2.8-r2
@@ -0,0 +1,3 @@
+MD5 f84add2aadca642a354105f63c117dec gringotts-1.2.8.tar.bz2 174175
+RMD160 6675a952ff6101beee3bfefbc0e1e0f543998c65 gringotts-1.2.8.tar.bz2 174175
+SHA256 cc4640cf57f0dc31799a6a4db44b9d9a06ee08be14f1c565512db28d3ae8d6f0 gringotts-1.2.8.tar.bz2 174175
diff --git a/app-crypt/gringotts/files/gringotts-1.2.8-desktop-entry.patch b/app-crypt/gringotts/files/gringotts-1.2.8-desktop-entry.patch
new file mode 100644
index 000000000000..e6f44222dd79
--- /dev/null
+++ b/app-crypt/gringotts/files/gringotts-1.2.8-desktop-entry.patch
@@ -0,0 +1,18 @@
+--- gringotts.desktop.in	2007-01-05 01:52:16.000000000 -0600
++++ gringotts.desktop.in	2007-01-05 01:51:25.000000000 -0600
+@@ -4,12 +4,12 @@
+ Comment=An electronic strongbox
+ Version=1.0
+ Encoding=UTF-8
+-Icon=/usr/share/pixmaps/gringotts.xpm
++Icon=gringotts.xpm
+ Exec=gringotts
+ Terminal=false
+ Type=Application
+-TryExec=
+-X-GNOME-DocPath=
++TryExec=gringotts
++Categories=Application;Cryptography;
+ Name[it_IT]=@GRG_CAP_NAME@
+ GenericName[it_IT]="Cassaforte" elettronica
+ Comment[it_IT]=Una cassaforte elettronica
diff --git a/app-crypt/gringotts/files/gringotts-1.2.8-desktop.patch b/app-crypt/gringotts/files/gringotts-1.2.8-desktop.patch
new file mode 100644
index 000000000000..0c3e73ff462f
--- /dev/null
+++ b/app-crypt/gringotts/files/gringotts-1.2.8-desktop.patch
@@ -0,0 +1,11 @@
+--- Makefile.am	2007-01-05 00:44:17.000000000 -0600
++++ Makefile.am	2007-01-05 00:51:30.000000000 -0600
+@@ -6,7 +6,7 @@
+ 
+ EXTRA_DIST = gringotts.spec.in gringotts.desktop.in $(gringottsdoc_DATA)
+ 
+-Dsktpdir = $(datadir)/gnome/apps/Utilities
++Dsktpdir = $(datadir)/applications
+ Dsktp_in_files = gringotts.desktop.in
+ Dsktp_DATA = $(Dsktp_in_files:.desktop.in=.desktop)
+ 
diff --git a/app-crypt/gringotts/files/gringotts-1.2.8-no-strip.patch b/app-crypt/gringotts/files/gringotts-1.2.8-no-strip.patch
new file mode 100644
index 000000000000..be375fd3af98
--- /dev/null
+++ b/app-crypt/gringotts/files/gringotts-1.2.8-no-strip.patch
@@ -0,0 +1,9 @@
+--- src/Makefile.am	2007-01-05 01:35:49.000000000 -0600
++++ src/Makefile.am	2007-01-05 01:35:58.000000000 -0600
+@@ -31,6 +31,5 @@
+ gringotts_LDADD = @POPT@ @GTK2_LIBS@ @GDKPIX_LIBS@ @LIBGRG_LIBS@
+ 
+ install-exec-local:
+-	strip $(DESTDIR)$(bindir)/gringotts
+ 	chmod u+s $(DESTDIR)$(bindir)/gringotts
+ 	
diff --git a/app-crypt/gringotts/gringotts-1.2.8-r2.ebuild b/app-crypt/gringotts/gringotts-1.2.8-r2.ebuild
new file mode 100644
index 000000000000..168bce5a0e7a
--- /dev/null
+++ b/app-crypt/gringotts/gringotts-1.2.8-r2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-1.2.8-r2.ebuild,v 1.1 2007/01/05 07:56:49 compnerd Exp $
+
+WANT_AUTOCONF="latest"
+WANT_AUTOMAKE="latest"
+
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="Utility that allows you to jot down sensitive data"
+HOMEPAGE="http://devel.pluto.linux.it/projects/Gringotts/"
+SRC_URI="http://devel.pluto.linux.it/projects/Gringotts/current/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="suid"
+
+RDEPEND=">=dev-libs/libgringotts-1.2
+		 >=x11-libs/gtk+-2
+		 dev-libs/popt"
+
+DEPEND="${RDEPEND}
+		sys-devel/gettext
+		dev-util/pkgconfig"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Remove deprecation flag, soit compiles with >=GTK+-2.4
+	sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' src/Makefile.am
+
+	# Patch up to install desktop entry correctly
+	epatch ${FILESDIR}/${PN}-1.2.8-desktop.patch
+	epatch ${FILESDIR}/${PN}-1.2.8-desktop-entry.patch
+
+	# Prevent prestripping
+	epatch ${FILESDIR}/${PN}-1.2.8-no-strip.patch
+
+	eautoreconf
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+
+	econf || die "configure failed"
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+
+	# The FAQ and README documents shouldn't be gzip'd, as they need to be
+	# available in plain format when they are called from the `Help' menu.
+	#
+	# dodoc FAQ README
+	dodoc AUTHORS BUGS ChangeLog TODO
+}
+
+pkg_postinst() {
+	if use suid; then
+		ewarn "You have installed a suid binary for the \`gringotts' program."
+		ewarn "Be aware that this setup may break with some glibc installations"
+		ewarn "For more information, see bug #69458 in Gentoo's bugzilla at:"
+		ewarn "  http://bugs.gentoo.org/"
+	else
+		einfo "Changing permissions for the gringotts binary."
+		chmod u-s ${ROOT}/usr/bin/gringotts
+	fi
+}