reorder R/DEPENDS (bug #217278) and change syntax here and there.

(Portage version: 2.1.5)

4 files changed, 28 insertions, 97 deletions

diff --git a/app-office/grisbi/ChangeLog b/app-office/grisbi/ChangeLog
index 196a22ec485c..0a6e674e0590 100644
--- a/app-office/grisbi/ChangeLog
+++ b/app-office/grisbi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/grisbi
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.27 2007/05/26 17:36:20 philantrop Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/ChangeLog,v 1.28 2008/05/18 14:06:11 eva Exp $
+
+  18 May 2008; Gilles Dartiguelongue <eva@gentoo.org> -grisbi-0.5.7.ebuild,
+  grisbi-0.5.8.ebuild, grisbi-0.5.9.ebuild:
+  reorder R/DEPENDS (bug #217278) and change syntax here and there.
 
   26 May 2007; Wulf C. Krueger <philantrop@gentoo.org> grisbi-0.5.9.ebuild:
   Stable on amd64, bug 179782.
diff --git a/app-office/grisbi/grisbi-0.5.7.ebuild b/app-office/grisbi/grisbi-0.5.7.ebuild
deleted file mode 100644
index 686b53a91c05..000000000000
--- a/app-office/grisbi/grisbi-0.5.7.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.7.ebuild,v 1.6 2007/01/25 05:16:25 genone Exp $
-
-inherit eutils
-
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~sparc x86"
-
-DEPEND="dev-libs/libxml2
-	>=dev-util/pkgconfig-0.20
-	>=x11-libs/gtk+-2.2.0
-	ofx? ( >=dev-libs/libofx-0.7.0 )
-	print? ( virtual/tetex
-	>=dev-tex/latex-unicode-20041017 )"
-
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	if ! use print; then
-		elog
-		elog "NOTE: The USE variable 'print' is not in your USE flags."
-		elog "For printing support in grisbi, you will need to restart"
-		elog "the build with USE=\"print\""
-		elog
-		ebeep 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}; cd ${S}
-
-	# Apply location patchs
-	ebegin "Applying Gentoo documentation location patch"
-	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
-	epatch ${FILESDIR}/${PN}-0.5.6-latex-unicode.patch
-}
-
-src_compile() {
-
-	econf \
-		$(use_with ofx) \
-		$(use_enable nls) || die
-
-	emake || die
-}
-
-src_install() {
-	einstall || die
-	dodoc AUTHORS COPYING ChangeLog NEWS README
-	insinto /usr/share/applications
-	doins ${FILESDIR}/grisbi.desktop
-}
-
-pkg_postinst() {
-	pkg_setup
-
-	elog "The first thing you should do is set up the browser command in"
-	elog "preferences after you start up grisbi.  Otherwise you will not"
-	elog "be able to see the help and manuals"
-}
diff --git a/app-office/grisbi/grisbi-0.5.8.ebuild b/app-office/grisbi/grisbi-0.5.8.ebuild
index cf8af25bcefc..01e5e951695d 100644
--- a/app-office/grisbi/grisbi-0.5.8.ebuild
+++ b/app-office/grisbi/grisbi-0.5.8.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.8.ebuild,v 1.4 2007/01/25 05:16:25 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.8.ebuild,v 1.5 2008/05/18 14:06:11 eva Exp $
 
 inherit eutils
 
@@ -14,14 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ppc sparc x86"
 
-DEPEND="dev-libs/libxml2
-	>=dev-util/pkgconfig-0.20
+RDEPEND="dev-libs/libxml2
 	>=x11-libs/gtk+-2.2.0
 	ofx? ( >=dev-libs/libofx-0.7.0 )
 	print? ( virtual/tetex
 	>=dev-tex/latex-unicode-20041017 )"
-
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.20"
 
 pkg_setup() {
 	if ! use print; then
@@ -35,18 +34,20 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}; cd ${S}
+	unpack ${A}
+	cd "${S}"
 
 	# Apply location patchs
 	ebegin "Applying Gentoo documentation location patch"
 	for i in \
-		`find ./ -name 'Makefile.*'` \
-		`find ./ -name 'grisbi-manuel/html'`
+		$(find ./ -name 'Makefile.*') \
+		$(find ./ -name 'grisbi-manuel/html')
 			do
-				sed -i "s;doc/grisbi/help;doc/${PF}/help;g" ${i}
+				sed -i "s;doc/grisbi/help;doc/${PF}/help;g" "${i}"
 			done
 	eend 0
-	epatch ${FILESDIR}/${PN}-0.5.6-latex-unicode.patch
+
+	epatch "${FILESDIR}/${PN}-0.5.6-latex-unicode.patch"
 }
 
 src_compile() {
diff --git a/app-office/grisbi/grisbi-0.5.9.ebuild b/app-office/grisbi/grisbi-0.5.9.ebuild
index 2f2462472342..903dafd420ea 100644
--- a/app-office/grisbi/grisbi-0.5.9.ebuild
+++ b/app-office/grisbi/grisbi-0.5.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.9.ebuild,v 1.5 2007/05/26 17:36:20 philantrop Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/grisbi/grisbi-0.5.9.ebuild,v 1.6 2008/05/18 14:06:11 eva Exp $
 
 inherit eutils
 
@@ -14,14 +14,13 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc ~x86"
 
-DEPEND="dev-libs/libxml2
-	>=dev-util/pkgconfig-0.20
+RDEPEND="dev-libs/libxml2
 	>=x11-libs/gtk+-2.2.0
 	ofx? ( >=dev-libs/libofx-0.7.0 )
 	print? ( virtual/tetex
 	>=dev-tex/latex-unicode-20041017 )"
-
-RDEPEND="${DEPEND}"
+DEPEND="${RDEPEND}
+	>=dev-util/pkgconfig-0.20"
 
 pkg_setup() {
 	if ! use print; then
@@ -35,15 +34,16 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}; cd ${S}
+	unpack ${A}
+	cd "${S}"
 
 	# Apply location patchs
 	ebegin "Applying Gentoo documentation location patch"
 	for i in \
-		`find ./ -name 'Makefile.*'` \
-		`find ./ -name 'grisbi-manuel/html'`
+		$(find ./ -name 'Makefile.*') \
+		$(find ./ -name 'grisbi-manuel/html')
 			do
-				sed -i "s;doc/grisbi/help;doc/${PF}/help;g" ${i}
+				sed -i "s;doc/grisbi/help;doc/${PF}/help;g" "${i}"
 			done
 	eend 0
 }