New revision with experimental gtk2 support. should be kept hard masked for a while, but seems very promising

5 files changed, 115 insertions, 3 deletions

diff --git a/net-mail/sylpheed/ChangeLog b/net-mail/sylpheed/ChangeLog
index 1ab724cc4dbb..817223d7ac35 100644
--- a/net-mail/sylpheed/ChangeLog
+++ b/net-mail/sylpheed/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-mail/sylpheed
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/ChangeLog,v 1.38 2003/08/30 09:27:32 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/sylpheed/ChangeLog,v 1.39 2003/09/05 02:02:14 spider Exp $
+
+*sylpheed-0.9.4-r1 (05 Sep 2003)
+
+  05 Sep 2003; <spider@gentoo.org> sylpheed-0.9.4-r1.ebuild,
+  files/gtk2-patch-fix.patch:
+  New revision that has an experimental support patch for gtk+2. This has been
+  in place locally for a while and seems to work (With some minor issues) but
+  should be p.masked for a while.
 
   30 Aug 2003; Alastair Tse <liquidx@gentoo.org> sylpheed-0.8.11.ebuild,
   sylpheed-0.9.0.ebuild, sylpheed-0.9.2.ebuild, sylpheed-0.9.3.ebuild,
diff --git a/net-mail/sylpheed/Manifest b/net-mail/sylpheed/Manifest
index 0cd5dd9a4642..80410464dfce 100644
--- a/net-mail/sylpheed/Manifest
+++ b/net-mail/sylpheed/Manifest
@@ -2,10 +2,10 @@ MD5 3984b6de910789b92e4e47bb22ab7bd5 sylpheed-0.9.0.ebuild 1700
 MD5 8a718a60ba6328bfa80456c0a2db6ccc sylpheed-0.9.2.ebuild 1705
 MD5 774897c0b8987ab1bc2995af55fa3b08 sylpheed-0.8.11.ebuild 1679
 MD5 5aaeb411efd402ad0c1a274f8b1a20c0 sylpheed-0.9.3.ebuild 1706
-MD5 b8d9e56e42514ee854a25612492c8b36 ChangeLog 5886
+MD5 1d3991169a2f3070f26447f137d87e9d ChangeLog 6202
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 d400144021902165dbc0f84c9de87fd4 sylpheed-0.9.4.ebuild 1706
-MD5 8f0fc91ca5d230ccfbb3a039674493e7 sylpheed-0.9.4-r1.ebuild 2016
+MD5 387304348d49ad50c078a4a3217f2c30 sylpheed-0.9.4-r1.ebuild 2275
 MD5 bc3204c6446c76297a50f50aec648a3b files/digest-sylpheed-0.9.0 68
 MD5 a574f3216bc23fde958db7fa1463cba0 files/digest-sylpheed-0.9.2 68
 MD5 6c177a358dda1eea4f8eda9be033cd83 files/digest-sylpheed-0.9.3 68
@@ -13,3 +13,4 @@ MD5 a4f9898914c340cfc6c32168e73868c4 files/digest-sylpheed-0.8.11 69
 MD5 f847bb1651a5b85decf13e2d8d01afe2 files/shared-mime.patch 649
 MD5 cae6de9566012ff2a026e2fdc0124c53 files/digest-sylpheed-0.9.4 68
 MD5 418deb7215c86a6f07b378e3821bec4b files/digest-sylpheed-0.9.4-r1 149
+MD5 073edf4bf5c6725126ecd551cb6a8949 files/gtk2-patch-fix.patch 320
diff --git a/net-mail/sylpheed/files/digest-sylpheed-0.9.4-r1 b/net-mail/sylpheed/files/digest-sylpheed-0.9.4-r1
new file mode 100644
index 000000000000..946e9190beac
--- /dev/null
+++ b/net-mail/sylpheed/files/digest-sylpheed-0.9.4-r1
@@ -0,0 +1,2 @@
+MD5 222af8fd1c1026babaa952398693fe01 sylpheed-0.9.4.tar.bz2 2100835
+MD5 8bbebd44d105985dfefe65f4ee014379 sylpheed-0.9.4-gtk2-20030802.diff.gz 124166
diff --git a/net-mail/sylpheed/files/gtk2-patch-fix.patch b/net-mail/sylpheed/files/gtk2-patch-fix.patch
new file mode 100644
index 000000000000..183a7d216421
--- /dev/null
+++ b/net-mail/sylpheed/files/gtk2-patch-fix.patch
@@ -0,0 +1,11 @@
+--- sylpheed-0.9.4-gtk2-20030802.diff.old	2003-09-05 02:32:08.000000000 +0200
++++ sylpheed-0.9.4-gtk2-20030802.diff	2003-09-05 02:32:31.000000000 +0200
+@@ -4708,7 +4708,7 @@
+  
+ -#undef STEXT_FREEZE
+  #undef GET_CHAR
+-+#undef CHAR_BUF_SIZR
+++#undef CHAR_BUF_SIZE
+  
+  static void compose_set_title(Compose *compose)
+  {
diff --git a/net-mail/sylpheed/sylpheed-0.9.4-r1.ebuild b/net-mail/sylpheed/sylpheed-0.9.4-r1.ebuild
new file mode 100644
index 000000000000..b0f0ed8b400d
--- /dev/null
+++ b/net-mail/sylpheed/sylpheed-0.9.4-r1.ebuild
@@ -0,0 +1,90 @@
+# 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/sylpheed-0.9.4-r1.ebuild,v 1.1 2003/09/05 02:02:14 spider Exp $
+
+IUSE="ssl xface ipv6 nls gnome ldap crypt pda gtk2"
+
+inherit eutils
+
+S=${WORKDIR}/${P}
+PATCHVER="20030802"
+DESCRIPTION="A lightweight email client and newsreader"
+SRC_URI="http://sylpheed.good-day.net/${PN}/${P}.tar.bz2
+	gtk2? ( http://www.homa.ne.jp/~ashie/linux/files/${P}-gtk2-${PATCHVER}.diff.gz )"
+
+HOMEPAGE="http://sylpheed.good-day.net"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc hppa"
+
+PROVIDE="virtual/sylpheed"
+
+DEPEND="
+	gtk2? ( >=x11-libs/gtk+-2.0  )
+	!gtk2? ( =x11-libs/gtk+-1.2* )
+	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"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/shared-mime.patch
+	use gtk2 && gunzip -dc ${DISTDIR}/sylpheed-${PV}-gtk2-${PATCHVER}.diff.gz >sylpheed-${PV}-gtk2-${PATCHVER}.diff
+	
+	use gtk2 && patch  <${FILESDIR}/gtk2-patch-fix.patch
+	use gtk2 && epatch  sylpheed-${PV}-gtk2-${PATCHVER}.diff
+}
+
+src_compile() {
+	local myconf
+	if [ `use gtk2` ];
+	then
+		myconf="${myconf} --enable-gdk-pixbuf"
+	else
+		use gnome || myconf="${myconf} --disable-gdk-pixbuf --disable-imlib"
+		use nls || myconf="${myconf} --disable-nls"
+	fi
+	
+	
+	use ssl && myconf="${myconf} --enable-ssl"
+	
+	use crypt && myconf="${myconf} --enable-gpgme"
+	
+	use pda && myconf="${myconf} --enable-jpilot"
+	
+	use ldap && myconf="${myconf} --enable-ldap"
+	
+	use ipv6 && myconf="${myconf} --enable-ipv6"
+	
+	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
+	
+	econf ${myconf} 
+
+	emake || die
+}
+
+src_install () {
+	einstall 	
+
+	dodir /usr/share/pixmaps 
+	insinto /usr/share/pixmaps
+	doins *.png
+	
+	if use gnome
+	then
+		dodir /usr/share/gnome/apps/Internet
+		insinto /usr/share/gnome/apps/Internet
+		doins sylpheed.desktop
+	fi
+	
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog* NEWS README* TODO*
+}