Version bump to cvs snapshot which fixes segfault on edit->preferences issue, as reported in bug #87468 by Will Wilson <wilson.william@gmail.com>. The snapshot was taken and ebuilt by: Guillaume Castagnino <guilc@fr.st> in the same bug. He also added a nice .desktop file for this.

(Portage version: 1.585-cvs)

9 files changed, 68 insertions, 46 deletions

diff --git a/app-office/grisbi/ChangeLog b/app-office/grisbi/ChangeLog
index e8051f7a9754..4b19027609ae 100644
--- a/app-office/grisbi/ChangeLog
+++ b/app-office/grisbi/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for app-office/grisbi
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.12 2005/02/25 20:30:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.13 2005/04/11 20:15:01 seemant Exp $
+
+*grisbi-0.5.5.20050410 (11 Apr 2005)
+
+  11 Apr 2005; Seemant Kulleen <seemant@gentoo.org> +files/grisbi.desktop,
+  -grisbi-0.5.2.ebuild, grisbi-0.5.4-r1.ebuild, grisbi-0.5.5.ebuild,
+  +grisbi-0.5.5.20050410.ebuild:
+  Version bump to cvs snapshot which fixes segfault on edit->preferences
+  issue, as reported in bug #87468 by Will Wilson <wilson.william@gmail.com>.
+  The snapshot was taken and ebuilt by: Guillaume Castagnino <guilc@fr.st> in
+  the same bug. He also added a nice .desktop file for this.
 
 *grisbi-0.5.5 (25 Feb 2005)
 
diff --git a/app-office/grisbi/Manifest b/app-office/grisbi/Manifest
index db27433093ce..b8e64be1e3c8 100644
--- a/app-office/grisbi/Manifest
+++ b/app-office/grisbi/Manifest
@@ -1,9 +1,12 @@
-MD5 5387e76e6294c5f60159aab38850fee9 metadata.xml 443
-MD5 b5a4d88aa1f795b3e3c3aee84930ea2a grisbi-0.5.5.ebuild 1889
-MD5 a360c5612552d43806f8fde4a70e45e0 grisbi-0.5.4-r1.ebuild 1785
 MD5 dac6992acc378855cd4726d89ae1ac2f ChangeLog 2217
 MD5 acfd68c7f14be7c0596641cb5f920f78 grisbi-0.5.2.ebuild 1695
+MD5 a360c5612552d43806f8fde4a70e45e0 grisbi-0.5.4-r1.ebuild 1785
+MD5 5387e76e6294c5f60159aab38850fee9 metadata.xml 443
+MD5 32b0f2cd7f4d1f339928387befeceabb grisbi-0.5.5.20050410.ebuild 1751
+MD5 0b44a96466383f679edb51b040cd5cda grisbi-0.5.5.ebuild 1958
 MD5 b38a711add9e8987686540cd0647b5be files/digest-grisbi-0.5.2 64
-MD5 4b586e8dc048875af95711c52e2f7ab3 files/grisbi-0.5.5-latex-unicode.patch 461
 MD5 58e8ff01068060377466bc24728d7556 files/digest-grisbi-0.5.4-r1 65
-MD5 931d001ea8ec747a68c981a60747d1c5 files/digest-grisbi-0.5.5 65
+MD5 c1b9be399d1a96e85b03cbe959819564 files/digest-grisbi-0.5.5 121
+MD5 4b586e8dc048875af95711c52e2f7ab3 files/grisbi-0.5.5-latex-unicode.patch 461
+MD5 34efdef1d5896910c218177e358bb019 files/grisbi.desktop 207
+MD5 e54adfbb890a91cda8d841215e6272b6 files/digest-grisbi-0.5.5.20050410 74
diff --git a/app-office/grisbi/files/digest-grisbi-0.5.2 b/app-office/grisbi/files/digest-grisbi-0.5.2
deleted file mode 100644
index 5ae083ce397a..000000000000
--- a/app-office/grisbi/files/digest-grisbi-0.5.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 fc32d48605867cbaf04051b33bc62ff2 grisbi-0.5.2.tar.gz 968756
diff --git a/app-office/grisbi/files/digest-grisbi-0.5.5 b/app-office/grisbi/files/digest-grisbi-0.5.5
index c19587800257..a31c98f5f1da 100644
--- a/app-office/grisbi/files/digest-grisbi-0.5.5
+++ b/app-office/grisbi/files/digest-grisbi-0.5.5
@@ -1 +1,2 @@
 MD5 09b06382f9bb5a4124c40296c5eba6d5 grisbi-0.5.5.tar.bz2 785824
+MD5 89518469f726f292dbf5738f45922d2c doc.patch.bz2 1724
diff --git a/app-office/grisbi/files/digest-grisbi-0.5.5.20050410 b/app-office/grisbi/files/digest-grisbi-0.5.5.20050410
new file mode 100644
index 000000000000..f7a85fa320fe
--- /dev/null
+++ b/app-office/grisbi/files/digest-grisbi-0.5.5.20050410
@@ -0,0 +1 @@
+MD5 c7230b038967c6197a69c43e535c9f4a grisbi-0.5.5.20050410.tar.bz2 959496
diff --git a/app-office/grisbi/files/grisbi.desktop b/app-office/grisbi/files/grisbi.desktop
new file mode 100644
index 000000000000..e8a9e16f6126
--- /dev/null
+++ b/app-office/grisbi/files/grisbi.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Grisbi
+Comment=A personnal account manager
+Exec=grisbi
+Icon=grisbi/grisbi.png
+Terminal=false
+Type=Application
+MimeType=application/x-grisbi
+Categories=Application;Office;
diff --git a/app-office/grisbi/grisbi-0.5.4-r1.ebuild b/app-office/grisbi/grisbi-0.5.4-r1.ebuild
index 3d817aad19a2..5e4011b6672e 100644
--- a/app-office/grisbi/grisbi-0.5.4-r1.ebuild
+++ b/app-office/grisbi/grisbi-0.5.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.4-r1.ebuild,v 1.2 2005/01/01 14:32:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.4-r1.ebuild,v 1.3 2005/04/11 20:15:01 seemant Exp $
 inherit eutils
 
 IUSE="print nls ofx"
@@ -41,13 +41,12 @@ src_unpack() {
 	# Apply location patchs
 	ebegin "Applying Gentoo documentation location patch"
 		cd ${S}
-		for i in src/Makefile.am src/Makefile.in \
-			help/C/Makefile.am help/C/Makefile.in help/C/grisbi-manuel.html \
-			help/fr/Makefile.am help/fr/Makefile.in help/fr/grisbi-manuel.html \
-			help/de/Makefile.am help/de/Makefile.in help/de/grisbi-manuel.html
-		do
-			sed -i "s;doc/grisbi/help;doc/${PF}/help;g" ${i}
-		done
+		for i in \
+			`find ./ -name 'Makefile.*'` \
+			`find ./ -name 'grisbi-manuel.html'`
+				do
+					sed -i "s;doc/grisbi/help;doc/${PF}/help;g" ${i}
+				done
 	eend 0
 }
 
diff --git a/app-office/grisbi/grisbi-0.5.2.ebuild b/app-office/grisbi/grisbi-0.5.5.20050410.ebuild
index abe7c949ec67..f3d201d23cbc 100644
--- a/app-office/grisbi/grisbi-0.5.2.ebuild
+++ b/app-office/grisbi/grisbi-0.5.5.20050410.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.2.ebuild,v 1.4 2005/01/01 14:32:25 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.5.20050410.ebuild,v 1.1 2005/04/11 20:15:01 seemant Exp $
 
 inherit eutils
 
@@ -8,19 +8,20 @@ IUSE="print nls ofx"
 
 DESCRIPTION="Grisbi is a personal accounting application for Linux"
 HOMEPAGE="http://www.grisbi.org"
-SRC_URI="mirror://sourceforge/grisbi/${P}.tar.gz"
+#SRC_URI="mirror://sourceforge/grisbi/${P}.tar.bz2"
+SRC_URI="http://casta.nerim.net/${P}.tar.bz2"
 
-SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
 
 DEPEND="dev-libs/libxml2
-	>=x11-libs/gtk+-2
-	ofx? ( dev-libs/libofx )"
+	>=x11-libs/gtk+-2.2.0
+	ofx? ( >=dev-libs/libofx-0.7.0 )"
 
 RDEPEND="${DEPEND}
 	print? ( virtual/tetex
-	dev-tex/latex-unicode )"
+	>=dev-tex/latex-unicode-20041017 )"
 
 pkg_setup() {
 	if ! use print; then
@@ -37,33 +38,33 @@ pkg_setup() {
 
 src_unpack() {
 
-	unpack ${A}
+	unpack ${A}; cd ${S}
 
 	# Apply location patchs
 	ebegin "Applying Gentoo documentation location patch"
-		cd ${S}
-		for i in src/Makefile.am src/Makefile.in \
-			help/C/Makefile.am help/C/Makefile.in help/C/grisbi-manuel.html \
-			help/fr/Makefile.am help/fr/Makefile.in help/fr/grisbi-manuel.html
-		do
-			sed -i "s;doc/grisbi/help;doc/${PF}/help;g" ${i}
-		done
+	for i in \
+		`find ./ -name 'Makefile.*'` \
+		`find ./ -name 'grisbi-manuel/html'`
+			do
+				sed -i "s;doc/grisbi/help;doc/${PF}/help;g" ${i}
+			done
 	eend 0
 }
 
 src_compile() {
 
-	local myconf
-	myconf="`use_enable nls`"
-	myconf="${myconf} `use_with ofx`"
+	econf \
+		$(use_with ofx) \
+		$(use_enable nls) || die
 
-	econf ${myconf} || die "configure failed"
 	emake || die
 }
 
 src_install() {
 	einstall || die
 	dodoc AUTHORS COPYING ChangeLog NEWS README
+	insinto /usr/share/applications
+	doins ${FILESDIR}/grisbi.desktop
 }
 
 pkg_postinst() {
diff --git a/app-office/grisbi/grisbi-0.5.5.ebuild b/app-office/grisbi/grisbi-0.5.5.ebuild
index f1b86d19239b..d9263c5b7bf4 100644
--- a/app-office/grisbi/grisbi-0.5.5.ebuild
+++ b/app-office/grisbi/grisbi-0.5.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.5.ebuild,v 1.1 2005/02/25 20:30:50 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.5.ebuild,v 1.2 2005/04/11 20:15:01 seemant Exp $
 
 inherit eutils
 
@@ -8,7 +8,8 @@ IUSE="print nls ofx"
 
 DESCRIPTION="Grisbi is a personal accounting application for Linux"
 HOMEPAGE="http://www.grisbi.org"
-SRC_URI="mirror://sourceforge/grisbi/${P}.tar.bz2"
+SRC_URI="mirror://sourceforge/grisbi/${P}.tar.bz2
+	mirror://gentoo/doc.patch.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -37,20 +38,17 @@ pkg_setup() {
 
 src_unpack() {
 
-	unpack ${A}
+	unpack ${A}; cd ${S}
 
 	# Apply location patchs
 	ebegin "Applying Gentoo documentation location patch"
-		cd ${S}
-		for i in src/Makefile.am src/Makefile.in \
-			help/C/Makefile.am help/C/Makefile.in help/C/grisbi-manuel.html \
-			help/fr/Makefile.am help/fr/Makefile.in help/fr/grisbi-manuel.html \
-			help/de/Makefile.am help/de/Makefile.in help/de/grisbi-manuel.html
-		do
-			sed -i "s;doc/grisbi/help;doc/${PF}/help;g" ${i}
-		done
+	for i in \
+		`find ./ -name 'Makefile.*'` \
+		`find ./ -name 'grisbi-manuel.html'`
+			do
+				sed -i "s;doc/grisbi/help;doc/${PF}/help;g" ${i}
+			done
 	eend 0
-
 	# Patch for new unicode package (utf8 -> utf8x)
 	epatch ${FILESDIR}/${P}-latex-unicode.patch
 }