Version bump, bug #275619.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

6 files changed, 95 insertions, 78 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/Manifest b/app-crypt/gringotts/Manifest
index da0017c26689..622e7e862cd9 100644
--- a/app-crypt/gringotts/Manifest
+++ b/app-crypt/gringotts/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX gringotts-1.2.10-desktop.patch 835 RMD160 282bd57e69ba3ce398753bc483f6ad49c33585c6 SHA1 91de6e2eaa093f090b7db01522cd99dab9be3f43 SHA256 447dd6d57980c572bf428dcd2f001e31d9b48b090953d84f55e1b0a9726eb938
+AUX gringotts-1.2.10-no-strip.patch 682 RMD160 0c3a874d631f0f392d7923003c7dd5c18824757c SHA1 ebc4ce049ca38c306c94f9a32ed39bcd74834d6d SHA256 d923deef0a471c83232ffe72c619c5c7066880153a95a0e440387b5243f23164
 AUX gringotts-1.2.8-desktop-entry.patch 512 RMD160 82d5a5ffed9f4496fab9670dede562281ab01304 SHA1 4f6d5523ce1acd5ef36a2bd01162910b30f58294 SHA256 f1682326f93cfff6d970fbd69391e9b84d9ff827bf6525b1f06e4e275bfd91e3
 AUX gringotts-1.2.8-desktop.patch 372 RMD160 45846070b6cee6c308ea30663ee29ecc8238c53e SHA1 84f9a4a68c2f74e9fb41a2e364394734afee3c04 SHA256 836eda164efcc6cbff63e37287b21d153c6025d3b30fd46b4ba1e8f16702dda8
 AUX gringotts-1.2.8-no-strip.patch 302 RMD160 c9341313e9764570490b44563a8bda146df1eb50 SHA1 cb6926f88d1e65332c87042f1ea0448d0eaa898e SHA256 06aefb027d86892a794a003f01b69d25f26206f8aad3297fbec75dee233e81ea
-DIST gringotts-1.2.8.tar.bz2 174175 RMD160 6675a952ff6101beee3bfefbc0e1e0f543998c65 SHA1 a3c2e8b2ce885d37a84e236f4b31936ea2bd4f14 SHA256 cc4640cf57f0dc31799a6a4db44b9d9a06ee08be14f1c565512db28d3ae8d6f0
+DIST gringotts-1.2.10.tar.gz 251963 RMD160 6076b08010fe32166bbb6a0399feef8319ed7442 SHA1 326510496bbcc4974bec91882633d50198994a35 SHA256 19784f68f76b211d076124c74d2f5ca5a156e4af7ed32d72a1ba45547782179d
 DIST gringotts-1.2.9.tar.gz 249213 RMD160 7284586075511533566be87d52497bcad8fdf2de SHA1 72ffaa6a86b6ea419f0aa7642f816133bac376a4 SHA256 f7fcd3f9fa54fb6372136fa5bdde0740ed03b736cf0fc06626303ea9727e9965
-EBUILD gringotts-1.2.8-r1.ebuild 1452 RMD160 7f578aa4e81006340be8acd34924cbde2c26a7a6 SHA1 07802f991d82575f1c7c212c9b2f69f5c89db2fa SHA256 ab5799f0e528fa032c3c5fe5b7ea2ae242ee90080942df83c9aeb9ac7f9f04ae
-EBUILD gringotts-1.2.8-r2.ebuild 1771 RMD160 40c2d7bd45180f73a7d213b01993961bd1f13486 SHA1 7223865aefb98fd2ec7e86ca8db47d4c8b9517bf SHA256 062f63432b3c4ba432235f13c49cdcb2c03cf1757e005550f02f59474e03bea7
+EBUILD gringotts-1.2.10.ebuild 1971 RMD160 28d9a7cecfa215fc88a1a072d74c1490fb02c4de SHA1 6c45d74a123ae528c46c87a7658402401c4a6aae SHA256 198e3178e3b1b0a23a0678676fee6d0c6fcc8b2be84faf3ac88cc4e437833378
 EBUILD gringotts-1.2.9.ebuild 1810 RMD160 5c5bfe38313c800fd94471df491192b73b18d4b0 SHA1 f189982ffacf5fda7f08a6fdd10e235f9011d13d SHA256 bacc688e2c60c886b4990aaefd87d394d150f2b2feaa6d405ff5b2b2fffe7851
-MISC ChangeLog 4843 RMD160 2324b6540d245e62049b9511a492bd3889d5ab13 SHA1 ae5fa2c6bb68f1f6be2bb2673bf6ac2dd85fde26 SHA256 31e058f545e2d7e51522d77a89db1e4ff0e46a0f0b0d74f4a8ce0cd67f4caf6a
+MISC ChangeLog 5119 RMD160 8eed1e2f45662d14ccfad4b73773a890ee38f929 SHA1 0ab9a45bab14f270576a5f75739eb5e8818a939d SHA256 0aca8c83ba096281d4840065e5f5ecd8e034257cce3e97d855e70f67f82ff8c9
 MISC metadata.xml 431 RMD160 7f8004f76ba2bc5e3e9c8f2f54101eb025822f3b SHA1 3304771bba8ef2a6cbfe6d5575fc57fa41143873 SHA256 395ac4003b0361b36467da529ada678cde96aa427767124d7b65ff9abab8507b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqrb38ACgkQ1fmVwcYIWAZb+QCggdLg1+0qc8WBH1DE5l/buHLZ
+DikAn1Vcr3oCg9Uyw66NTjMpViEDTB+w
+=gnbP
+-----END PGP SIGNATURE-----
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
-}