fix bugs #152227 and #111669

Package-Manager: portage-2.1.2_rc4-r5

7 files changed, 145 insertions, 5 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/Manifest b/app-crypt/gringotts/Manifest
index ee7a5a610c53..b189d3251ffe 100644
--- a/app-crypt/gringotts/Manifest
+++ b/app-crypt/gringotts/Manifest
@@ -1,12 +1,28 @@
+AUX gringotts-1.2.8-desktop-entry.patch 512 RMD160 82d5a5ffed9f4496fab9670dede562281ab01304 SHA1 4f6d5523ce1acd5ef36a2bd01162910b30f58294 SHA256 f1682326f93cfff6d970fbd69391e9b84d9ff827bf6525b1f06e4e275bfd91e3
+MD5 86d01b7dc92424ffc407e8011b4dbd64 files/gringotts-1.2.8-desktop-entry.patch 512
+RMD160 82d5a5ffed9f4496fab9670dede562281ab01304 files/gringotts-1.2.8-desktop-entry.patch 512
+SHA256 f1682326f93cfff6d970fbd69391e9b84d9ff827bf6525b1f06e4e275bfd91e3 files/gringotts-1.2.8-desktop-entry.patch 512
+AUX gringotts-1.2.8-desktop.patch 372 RMD160 45846070b6cee6c308ea30663ee29ecc8238c53e SHA1 84f9a4a68c2f74e9fb41a2e364394734afee3c04 SHA256 836eda164efcc6cbff63e37287b21d153c6025d3b30fd46b4ba1e8f16702dda8
+MD5 4efc0be65c14c63e4ce3c83f61a661e9 files/gringotts-1.2.8-desktop.patch 372
+RMD160 45846070b6cee6c308ea30663ee29ecc8238c53e files/gringotts-1.2.8-desktop.patch 372
+SHA256 836eda164efcc6cbff63e37287b21d153c6025d3b30fd46b4ba1e8f16702dda8 files/gringotts-1.2.8-desktop.patch 372
+AUX gringotts-1.2.8-no-strip.patch 302 RMD160 c9341313e9764570490b44563a8bda146df1eb50 SHA1 cb6926f88d1e65332c87042f1ea0448d0eaa898e SHA256 06aefb027d86892a794a003f01b69d25f26206f8aad3297fbec75dee233e81ea
+MD5 1003cdbbb68faa60019b11a274475bf9 files/gringotts-1.2.8-no-strip.patch 302
+RMD160 c9341313e9764570490b44563a8bda146df1eb50 files/gringotts-1.2.8-no-strip.patch 302
+SHA256 06aefb027d86892a794a003f01b69d25f26206f8aad3297fbec75dee233e81ea files/gringotts-1.2.8-no-strip.patch 302
 DIST gringotts-1.2.8.tar.bz2 174175 RMD160 6675a952ff6101beee3bfefbc0e1e0f543998c65 SHA1 a3c2e8b2ce885d37a84e236f4b31936ea2bd4f14 SHA256 cc4640cf57f0dc31799a6a4db44b9d9a06ee08be14f1c565512db28d3ae8d6f0
 EBUILD gringotts-1.2.8-r1.ebuild 1441 RMD160 8e946cf084a131584c102f52403ff1515310b969 SHA1 0b4ba483033aa49df272014db56efcb534a4bdbc SHA256 7536c7adb9dca9fd6261237b1b659f6dd44caf4ad7f108385d82498729929978
 MD5 2d66fd33a9c03332c26ecaba0727f78e gringotts-1.2.8-r1.ebuild 1441
 RMD160 8e946cf084a131584c102f52403ff1515310b969 gringotts-1.2.8-r1.ebuild 1441
 SHA256 7536c7adb9dca9fd6261237b1b659f6dd44caf4ad7f108385d82498729929978 gringotts-1.2.8-r1.ebuild 1441
-MISC ChangeLog 3624 RMD160 7de928577ee7dd9c5481190cf0813d4614d557da SHA1 6ef6f4db35612136c76ece47729791922737c069 SHA256 3798c2498daa94b4a7757e0825f8732218cbf906c9ac88396d519e0f4155c3dd
-MD5 cf561be734db18298d82573322e1237d ChangeLog 3624
-RMD160 7de928577ee7dd9c5481190cf0813d4614d557da ChangeLog 3624
-SHA256 3798c2498daa94b4a7757e0825f8732218cbf906c9ac88396d519e0f4155c3dd ChangeLog 3624
+EBUILD gringotts-1.2.8-r2.ebuild 1883 RMD160 836ff2620010d8af36f6508c307c4dc1f3997539 SHA1 5adcc2657019c6fa339d58ce523b3f48a32ac744 SHA256 a01680375e59d4dbd6f1f221ad32a19ac43d06c646596920d7b51f4cc46f7392
+MD5 033f12f795e0370315269bd421276fe7 gringotts-1.2.8-r2.ebuild 1883
+RMD160 836ff2620010d8af36f6508c307c4dc1f3997539 gringotts-1.2.8-r2.ebuild 1883
+SHA256 a01680375e59d4dbd6f1f221ad32a19ac43d06c646596920d7b51f4cc46f7392 gringotts-1.2.8-r2.ebuild 1883
+MISC ChangeLog 4006 RMD160 569c0aa8b2c0bb636eb445899f1a27bf7ae9dc18 SHA1 9ae0b8058fa682cf5999d304b6388c430ef73d93 SHA256 2ae6455359eb255b2d33010a406290e024c976a1f6e04a211671ed6ee0303f4d
+MD5 12940e04a154673a3fab099950135e5d ChangeLog 4006
+RMD160 569c0aa8b2c0bb636eb445899f1a27bf7ae9dc18 ChangeLog 4006
+SHA256 2ae6455359eb255b2d33010a406290e024c976a1f6e04a211671ed6ee0303f4d ChangeLog 4006
 MISC metadata.xml 550 RMD160 bdc3561918a743eb3f60a97305ef493c582ae1a5 SHA1 bc65e221fc7f0fc2d685fb343a16db7322c68984 SHA256 7309af5086dd3deeefc85f0e3d23ed4657135f7789ce765d32e4b3d2e1c3ec17
 MD5 aca7535e091e24a4fb74038919e3e2a0 metadata.xml 550
 RMD160 bdc3561918a743eb3f60a97305ef493c582ae1a5 metadata.xml 550
@@ -14,3 +30,6 @@ SHA256 7309af5086dd3deeefc85f0e3d23ed4657135f7789ce765d32e4b3d2e1c3ec17 metadata
 MD5 9be9d88985205c74ecbd06baceae88f9 files/digest-gringotts-1.2.8-r1 250
 RMD160 3951791a16ffef9bb44047b17779ca865c92c37f files/digest-gringotts-1.2.8-r1 250
 SHA256 95b3b12a254c3d149b3387942fd84e7e9559dc676e86fa56706f243faf9e8b33 files/digest-gringotts-1.2.8-r1 250
+MD5 9be9d88985205c74ecbd06baceae88f9 files/digest-gringotts-1.2.8-r2 250
+RMD160 3951791a16ffef9bb44047b17779ca865c92c37f files/digest-gringotts-1.2.8-r2 250
+SHA256 95b3b12a254c3d149b3387942fd84e7e9559dc676e86fa56706f243faf9e8b33 files/digest-gringotts-1.2.8-r2 250
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
+}