Version bump, bug #275619.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

5 files changed, 80 insertions, 74 deletions

diff --git a/app-crypt/gringotts/ChangeLog b/app-crypt/gringotts/ChangeLog
index c96f3d75c263..718b2bf43169 100644
--- a/app-crypt/gringotts/ChangeLog
+++ b/app-crypt/gringotts/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-crypt/gringotts
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/ChangeLog,v 1.32 2008/11/04 01:27:16 jmbsvicetto Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/ChangeLog,v 1.33 2009/09/12 09:52:58 eva Exp $
+
+*gringotts-1.2.10 (12 Sep 2009)
+
+  12 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -gringotts-1.2.8-r1.ebuild, -gringotts-1.2.8-r2.ebuild,
+  +gringotts-1.2.10.ebuild, +files/gringotts-1.2.10-desktop.patch,
+  +files/gringotts-1.2.10-no-strip.patch:
+  Version bump, bug #275619.
 
   04 Nov 2008; Jorge Manuel B. S. Vicetto <jmbsvicetto@gentoo.org>
   metadata.xml, gringotts-1.2.8-r1.ebuild, gringotts-1.2.8-r2.ebuild:
diff --git a/app-crypt/gringotts/files/gringotts-1.2.10-desktop.patch b/app-crypt/gringotts/files/gringotts-1.2.10-desktop.patch
new file mode 100644
index 000000000000..3cd9a2d8a9c8
--- /dev/null
+++ b/app-crypt/gringotts/files/gringotts-1.2.10-desktop.patch
@@ -0,0 +1,22 @@
+--- a/Makefile.am	2007-01-05 00:44:17.000000000 -0600
++++ b/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)
+ 
+--- a/Makefile.in	2009-09-12 11:00:48.000000000 +0200
++++ b/Makefile.in	2009-09-12 11:01:07.000000000 +0200
+@@ -204,7 +204,7 @@
+ doc_DATA = BUGS FAQ README AUTHORS ChangeLog TODO NEWS COPYING
+ EXTRA_DIST = gringotts.spec.in gringotts.desktop.in $(doc_DATA) \
+ 	autogen.sh
+-Dsktpdir = $(datadir)/gnome/apps/Utilities
++Dsktpdir = $(datadir)/applications
+ Dsktp_in_files = gringotts.desktop.in
+ Dsktp_DATA = $(Dsktp_in_files:.desktop.in=.desktop)
+ all: config.h
diff --git a/app-crypt/gringotts/files/gringotts-1.2.10-no-strip.patch b/app-crypt/gringotts/files/gringotts-1.2.10-no-strip.patch
new file mode 100644
index 000000000000..a417595137a8
--- /dev/null
+++ b/app-crypt/gringotts/files/gringotts-1.2.10-no-strip.patch
@@ -0,0 +1,19 @@
+--- a/src/Makefile.am	2007-01-05 01:35:49.000000000 -0600
++++ b/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
+ 	
+--- a/src/Makefile.in	2009-09-12 11:03:53.000000000 +0200
++++ b/src/Makefile.in	2009-09-12 11:04:05.000000000 +0200
+@@ -486,7 +486,6 @@
+ 
+ 
+ install-exec-local:
+-	strip $(DESTDIR)$(bindir)/gringotts
+ 	chmod u+s $(DESTDIR)$(bindir)/gringotts
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
diff --git a/app-crypt/gringotts/gringotts-1.2.8-r2.ebuild b/app-crypt/gringotts/gringotts-1.2.10.ebuild
index da51e126d559..71ada92d23c7 100644
--- a/app-crypt/gringotts/gringotts-1.2.8-r2.ebuild
+++ b/app-crypt/gringotts/gringotts-1.2.10.ebuild
@@ -1,15 +1,14 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 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.3 2008/11/04 01:27:16 jmbsvicetto Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gringotts/gringotts-1.2.10.ebuild,v 1.1 2009/09/12 09:52:58 eva Exp $
 
-WANT_AUTOCONF="latest"
-WANT_AUTOMAKE="latest"
+EAPI="2"
 
-inherit autotools eutils
+inherit eutils fdo-mime
 
 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"
+HOMEPAGE="http://gringotts.berlios.de/"
+SRC_URI="mirror://berlios/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,41 +16,45 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="suid"
 
 RDEPEND=">=dev-libs/libgringotts-1.2
-		 >=x11-libs/gtk+-2
-		 dev-libs/popt"
+	>=x11-libs/gtk+-2.12
+	dev-libs/popt"
 
 DEPEND="${RDEPEND}
-		sys-devel/gettext
-		dev-util/pkgconfig"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
+	sys-devel/gettext
+	dev-util/pkgconfig"
 
+src_prepare() {
 	# Remove deprecation flag, soit compiles with >=GTK+-2.4
-	sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' src/Makefile.am
+	sed -e 's:-DGTK_DISABLE_DEPRECATED::g' \
+		-i src/Makefile.am src/Makefile.in || die "sed failed"
 
 	# Patch up to install desktop entry correctly
-	epatch "${FILESDIR}/${PN}-1.2.8-desktop.patch"
+	epatch "${FILESDIR}/${PN}-1.2.10-desktop.patch"
 	epatch "${FILESDIR}/${PN}-1.2.8-desktop-entry.patch"
 
 	# Prevent prestripping
-	epatch "${FILESDIR}/${PN}-1.2.8-no-strip.patch"
+	epatch "${FILESDIR}/${PN}-1.2.10-no-strip.patch"
+}
 
-	eautoreconf
+src_configure() {
+	econf --docdir=/usr/share/doc/${PF}
 }
 
 src_install() {
-	make DESTDIR="${D}" install || die
+	emake -j1 DESTDIR="${D}" install || die "emake install failed"
 
 	# 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
+	rm "${D}"/usr/share/doc/${PF}/{AUTHORS,COPYING,BUGS,ChangeLog,TODO,NEWS} \
+		|| die "rm failed"
+	dodoc AUTHORS BUGS ChangeLog NEWS TODO || die "dodoc failed"
 }
 
 pkg_postinst() {
+	fdo-mime_desktop_database_update
+
 	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"
@@ -59,6 +62,10 @@ pkg_postinst() {
 		ewarn "  http://bugs.gentoo.org/"
 	else
 		einfo "Changing permissions for the gringotts binary."
-		chmod u-s "${ROOT}/usr/bin/gringotts"
+		chmod u-s "${ROOT}"/usr/bin/gringotts
 	fi
 }
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}
diff --git a/app-crypt/gringotts/gringotts-1.2.8-r1.ebuild b/app-crypt/gringotts/gringotts-1.2.8-r1.ebuild
deleted file mode 100644
index 436e82df37d3..000000000000
--- a/app-crypt/gringotts/gringotts-1.2.8-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2008 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-r1.ebuild,v 1.7 2008/11/04 01:27:16 jmbsvicetto Exp $
-
-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, so it compiles using Gtk+ 2.4.
-	sed -i -e 's:-DGTK_DISABLE_DEPRECATED::g' src/Makefile.in
-}
-
-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
-}