Removed 0.9.8-r1 , supersceeded by -r2 and sorta broken in dependencies. Added 0.9.9-r1 (gtk2 stuff) only because of gtk2. disabled all KEYWORDS that I couldn't test. This app really needs a push to stable.

5 files changed, 40 insertions, 29 deletions

diff --git a/net-mail/sylpheed/ChangeLog b/net-mail/sylpheed/ChangeLog
index ff40ce092ca5..dbb932e6a923 100644
--- a/net-mail/sylpheed/ChangeLog
+++ b/net-mail/sylpheed/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/sylpheed
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/ChangeLog,v 1.52 2004/04/05 15:17:07 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/ChangeLog,v 1.53 2004/04/05 23:06:44 spider Exp $
+
+*sylpheed-0.9.9-r1 (06 Apr 2004)
+
+  06 Apr 2004; <spider@gentoo.org> sylpheed-0.9.9-r1.ebuild:
+  updated to 0.9.9 only cause thats the last version with gtk2 support. Removed
+  all arches I can't test for. tested the non-gtk2 only superficially. it
+  starts, it reads mail. it checks mail.
 
 *sylpheed-0.9.10 (06 Apr 2004)
 
diff --git a/net-mail/sylpheed/Manifest b/net-mail/sylpheed/Manifest
index 79b4d9bf98fd..8dc24b1f9264 100644
--- a/net-mail/sylpheed/Manifest
+++ b/net-mail/sylpheed/Manifest
@@ -1,20 +1,20 @@
-MD5 f8e14be822738e1fd6f22abb297b775e ChangeLog 8408
+MD5 e2f3e36ad0fd6ff35fd53f0ddcc471e2 ChangeLog 8699
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
-MD5 9fbe8bc973bf741afe4ba66ac0f5d5ac sylpheed-0.9.10.ebuild 1412
+MD5 628bd6ba70494e6eff5175e3aee8e643 sylpheed-0.9.7.ebuild 1706
+MD5 76e4c29b8faab09de3cb8fb57a654e85 sylpheed-0.9.8-r2.ebuild 2240
 MD5 0a8ac451cb32c6352fa98bb8cc686933 sylpheed-0.9.4-r1.ebuild 2318
 MD5 15a1f4bab81867909347b8a69cb267a0 sylpheed-0.9.4.ebuild 1686
 MD5 4ed4b91fb73d2e42d13a07cc4f22cb50 sylpheed-0.9.5-r1.ebuild 2311
-MD5 628bd6ba70494e6eff5175e3aee8e643 sylpheed-0.9.7.ebuild 1706
-MD5 89c67092429db2681416c6e2d43a5007 sylpheed-0.9.8-r1.ebuild 2213
-MD5 76e4c29b8faab09de3cb8fb57a654e85 sylpheed-0.9.8-r2.ebuild 2240
 MD5 21c76bfde04a2ae5eeb4bdefadd1ed0a sylpheed-0.9.8.ebuild 1572
-MD5 ce1c3d8a2d9d18309762912c51486210 files/digest-sylpheed-0.9.10 69
+MD5 4dadecd6f56f749c87b46dafa0256e8e sylpheed-0.9.9-r1.ebuild 2154
+MD5 9fbe8bc973bf741afe4ba66ac0f5d5ac sylpheed-0.9.10.ebuild 1412
 MD5 cae6de9566012ff2a026e2fdc0124c53 files/digest-sylpheed-0.9.4 68
 MD5 418deb7215c86a6f07b378e3821bec4b files/digest-sylpheed-0.9.4-r1 149
-MD5 d02828752d567534c4fa0b6c7f757a39 files/digest-sylpheed-0.9.5-r1 149
 MD5 cd6d093a0935b35694616063e91a2bc1 files/digest-sylpheed-0.9.7 68
-MD5 dbd68b329d6860317fc8326b3dc9999e files/digest-sylpheed-0.9.8 68
-MD5 8c5d5f9d415edacfe53122ead5c7badf files/digest-sylpheed-0.9.8-r1 149
-MD5 aa4acbd6ca9721ed8ef8e1235ce5ec1a files/digest-sylpheed-0.9.8-r2 150
+MD5 d02828752d567534c4fa0b6c7f757a39 files/digest-sylpheed-0.9.5-r1 149
 MD5 073edf4bf5c6725126ecd551cb6a8949 files/gtk2-patch-fix.patch 320
 MD5 f847bb1651a5b85decf13e2d8d01afe2 files/shared-mime.patch 649
+MD5 dbd68b329d6860317fc8326b3dc9999e files/digest-sylpheed-0.9.8 68
+MD5 aa4acbd6ca9721ed8ef8e1235ce5ec1a files/digest-sylpheed-0.9.8-r2 150
+MD5 ce1c3d8a2d9d18309762912c51486210 files/digest-sylpheed-0.9.10 69
+MD5 097215ef01246e64be0a004a4eafcd63 files/digest-sylpheed-0.9.9-r1 149
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.9.8-r1 b/net-mail/sylpheed/files/digest-sylpheed-0.9.8-r1
deleted file mode 100644
index 9f232dda0953..000000000000
--- a/net-mail/sylpheed/files/digest-sylpheed-0.9.8-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 39f04649afdf371a79c3fc30b0f16b18 sylpheed-0.9.8.tar.bz2 2209820
-MD5 bc2a829c8e77cf7d2436bb0be2618e90 sylpheed-0.9.8-gtk2-20031212.diff.bz2 86168
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.9.9-r1 b/net-mail/sylpheed/files/digest-sylpheed-0.9.9-r1
new file mode 100644
index 000000000000..78376d5bad2d
--- /dev/null
+++ b/net-mail/sylpheed/files/digest-sylpheed-0.9.9-r1
@@ -0,0 +1,2 @@
+MD5 caa37c344c7d7849c5fb98835a38b725 sylpheed-0.9.9.tar.bz2 2255925
+MD5 902288ffea1cd18b2af4a044881c4120 sylpheed-0.9.9-gtk2-20040229.tar.gz 3275909
diff --git a/net-mail/sylpheed/sylpheed-0.9.8-r1.ebuild b/net-mail/sylpheed/sylpheed-0.9.9-r1.ebuild
index c82abe50aef5..26a3d7d48b10 100644
--- a/net-mail/sylpheed/sylpheed-0.9.8-r1.ebuild
+++ b/net-mail/sylpheed/sylpheed-0.9.9-r1.ebuild
@@ -1,43 +1,48 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.9.8-r1.ebuild,v 1.4 2004/03/25 10:07:19 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/sylpheed-0.9.9-r1.ebuild,v 1.1 2004/04/05 23:06:44 spider Exp $
 
 IUSE="ssl xface ipv6 nls gnome ldap crypt pda gtk2"
 
-inherit eutils
+inherit eutils debug
 
-PATCHVER=20031212
+PATCHVER=20040229
 
 S=${WORKDIR}/${P}
 DESCRIPTION="A lightweight email client and newsreader"
 HOMEPAGE="http://sylpheed.good-day.net/
 	http://sylpheed-gtk2.sourceforge.net/"
 SRC_URI="http://sylpheed.good-day.net/${PN}/${P}.tar.bz2
-	gtk2? ( mirror://sourceforge/${PN}-gtk2/${P}-gtk2-${PATCHVER}.diff.bz2
-		http://dev.gentoo.org/~seemant/extras/${P}-gtk2-${PATCHVER}.diff.bz2 )"
+	gtk2? ( mirror://sourceforge/${PN}-gtk2/${P}-gtk2-${PATCHVER}.tar.gz )"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~amd64 ~ia64"
+KEYWORDS="~x86"
 
 PROVIDE="virtual/sylpheed"
 
-DEPEND="
-	gtk2? ( >=x11-libs/gtk+-2.0  )
-	!gtk2? ( =x11-libs/gtk+-1.2* )
+DEPEND="gtk2? ( >=x11-libs/gtk+-2.0  )
+	!gtk2? ( =x11-libs/gtk+-1.2*
+		gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
+	)
 	xface? ( >=media-libs/compface-1.4 )
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	crypt? ( >=app-crypt/gnupg-1.0.6 =app-crypt/gpgme-0.3.14 )
 	ldap? ( >=net-nds/openldap-2.0.11 )
-	gnome? ( >=media-libs/gdk-pixbuf-0.11.0-r1 )
 	x11-misc/shared-mime-info"
 
+S=${WORKDIR}/${P}
+use gtk2 && S=${WORKDIR}/${P}-gtk2-${PATCHVER}
+
+
 src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/shared-mime.patch
-	use gtk2 && epatch  ${WORKDIR}/${P}-gtk2-${PATCHVER}.diff
+	if [ `use gtk2` ];
+	then
+		unpack ${P}-gtk2-${PATCHVER}.tar.gz
+	else
+		unpack ${P}.tar.bz2
+	fi
 }
 
 src_compile() {
@@ -50,7 +55,6 @@ src_compile() {
 		use nls || myconf="${myconf} --disable-nls"
 	fi
 
-
 	use ssl && myconf="${myconf} --enable-ssl"
 
 	use crypt && myconf="${myconf} --enable-gpgme"
@@ -64,7 +68,7 @@ src_compile() {
 	use xface || myconf="${myconf} --disable-compface"
 
 	# build fails if this is done normally. dunno why and didn't bother to find out. : )
-	use gtk2 && ./autogen.sh
+# 	use gtk2 && ./autogen.sh
 
 	econf ${myconf}