Fixes wrong dep for gettext and a few DEPEND/RDEPEND mismatches

4 files changed, 26 insertions, 20 deletions

diff --git a/net-mail/sylpheed-claws/ChangeLog b/net-mail/sylpheed-claws/ChangeLog
index 68f3ba369f45..0c2eeb0de30c 100644
--- a/net-mail/sylpheed-claws/ChangeLog
+++ b/net-mail/sylpheed-claws/ChangeLog
@@ -1,11 +1,20 @@
 # ChangeLog for net-mail/sylpheed-claws
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.47 2003/09/06 15:45:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/ChangeLog,v 1.48 2003/09/06 16:19:25 karltk Exp $
 
   06 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
   sylpheed-claws-0.9.4-r1.ebuild, sylpheed-claws-0.9.4.ebuild:
   gettext-0.12 is required
 
+  06 Sep 2003; Karl Trygve Kalleberg <karltk@gentoo.org>
+  sylpheed-claws-0.9.4-r1.ebuild:
+  Won't compile without gettext-0.12 or newer, added proper dep. Also, DEPEND
+  and RDEPEND were slightly off, so I merged them all.
+
+  06 Sep 2003; Karl Trygve Kalleberg <karltk@gentoo.org>
+  sylpheed-claws-0.9.4.ebuild:
+  Won't compile without gettext-0.12 or newer, added proper dep.
+
 *sylpheed-claws-0.9.4-r1 (06 Sep 2003)
 
   06 Sep 2003; Seemant Kulleen <seemant@gentoo.org>
diff --git a/net-mail/sylpheed-claws/Manifest b/net-mail/sylpheed-claws/Manifest
index d88fc3c7df03..a87a896f009f 100644
--- a/net-mail/sylpheed-claws/Manifest
+++ b/net-mail/sylpheed-claws/Manifest
@@ -1,16 +1,16 @@
-MD5 2d300e00b36e5182a09df6cd89609396 sylpheed-claws-0.9.0.ebuild 3039
-MD5 563711ac0f64719fcd9c020caa4b0155 sylpheed-claws-0.9.4.ebuild 3482
-MD5 e022ace5bd4ce7a3e18d511b7c0c0462 sylpheed-claws-0.9.4-r1.ebuild 3900
-MD5 4ac17c6bbfde751ffa7111f86e2bf306 sylpheed-claws-0.9.0-r1.ebuild 3336
+MD5 f0d1854a5154d8ad5df5d436a6dd4c00 ChangeLog 8966
 MD5 03f89b288f02fedd5fb19703bfabc9c7 sylpheed-claws-0.8.11.ebuild 2944
-MD5 fcf892c933ce26cc3b433edd17e3ebbc ChangeLog 8588
+MD5 4ac17c6bbfde751ffa7111f86e2bf306 sylpheed-claws-0.9.0-r1.ebuild 3336
+MD5 2d300e00b36e5182a09df6cd89609396 sylpheed-claws-0.9.0.ebuild 3039
 MD5 6969798bba9c8660991790c2cb77fe46 sylpheed-claws-0.9.3.ebuild 3345
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 d9e778ef490a8e07e7b931d13052fca2 files/digest-sylpheed-claws-0.9.0 73
-MD5 07b639d20c786fdd9426a268d9c08a70 files/digest-sylpheed-claws-0.9.3 73
-MD5 bc2cbfb7afd5f4264ea57fbdc55874f8 files/digest-sylpheed-claws-0.9.4 73
+MD5 245b65d30944dc96574a75ce92891656 sylpheed-claws-0.9.4.ebuild 3471
+MD5 60f0c479b2892ac83ba289ac2a3ee85f sylpheed-claws-0.9.4-r1.ebuild 3878
 MD5 8b029fc7176a8bad264d1676bd83984b files/digest-sylpheed-claws-0.8.11 74
+MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
 MD5 debd84fa61847ff672e179bcb7845e2b files/sylpheed-0.8.3claws32-dillo.patch 9123
+MD5 d9e778ef490a8e07e7b931d13052fca2 files/digest-sylpheed-claws-0.9.0 73
 MD5 d9e778ef490a8e07e7b931d13052fca2 files/digest-sylpheed-claws-0.9.0-r1 73
+MD5 07b639d20c786fdd9426a268d9c08a70 files/digest-sylpheed-claws-0.9.3 73
+MD5 bc2cbfb7afd5f4264ea57fbdc55874f8 files/digest-sylpheed-claws-0.9.4 73
 MD5 d4c201b38daa6314bb9eb8c337633312 files/digest-sylpheed-claws-0.9.4-r1 148
-MD5 bf4c9cd9cb7cdc6ece7d4d327910f0cf files/procmime.patch 977
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.4-r1.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.4-r1.ebuild
index 2b0c92c5d567..08ae9b74a78c 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.4-r1.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.4-r1.ebuild,v 1.2 2003/09/06 15:45:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.4-r1.ebuild,v 1.3 2003/09/06 16:19:25 karltk Exp $
 
 IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda clamav pdflib"
 
@@ -21,9 +21,8 @@ SLOT="0"
 LICENSE="GPL-2"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
 
-DEPEND=">=sys-apps/sed-4"
-
-RDEPEND="=x11-libs/gtk+-1.2*
+DEPEND=">=sys-apps/sed-4
+	=x11-libs/gtk+-1.2*
 	app-misc/mime-types
 	pda? ( >=app-pda/jpilot-0.99 )
 	ssl? ( >=dev-libs/openssl-0.9.6b )
@@ -36,10 +35,9 @@ RDEPEND="=x11-libs/gtk+-1.2*
 	clamav? ( net-mail/clamav )
 	gtkhtml? ( net-www/dillo )
 	pdflib? ( app-text/ghostscript )
+	nls? ( >=sys-devel/gettext-0.12 )
 	x11-misc/shared-mime-info"
 
-RDEPEND="nls? ( >=sys-devel/gettext-0.12 )"
-
 PROVIDE="virtual/sylpheed"
 
 src_unpack() {
@@ -97,7 +95,7 @@ src_compile() {
 		--enable-spamassassin-plugin \
 		${myconf} || die "./configure failed"
 
-	emake || die
+	make || die
 
 	# build the extra tools
 	cd ${S}/tools
diff --git a/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild b/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild
index 9bcbb25215a6..47274563b9b4 100644
--- a/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild
+++ b/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild,v 1.8 2003/09/06 15:45:12 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed-claws/sylpheed-claws-0.9.4.ebuild,v 1.9 2003/09/06 16:19:25 karltk Exp $
 
 IUSE="nls gnome xface gtkhtml crypt spell imlib ssl ldap ipv6 pda clamav"
 
@@ -28,11 +28,10 @@ DEPEND="=x11-libs/gtk+-1.2*
 	xface? ( >=media-libs/compface-1.4 )
 	clamav? ( net-mail/clamav )
 	gtkhtml? ( net-www/dillo )
+	nls? ( >=sys-devel/gettext-0.12 )
 	x11-misc/shared-mime-info"
 	#xml? ( >=x11-libs/gtkmathview-0.4.2 )
 
-RDEPEND="nls? ( =sys-devel/gettext-0.12* )"
-
 PROVIDE="virtual/sylpheed"
 
 src_unpack() {