add a patch

4 files changed, 117 insertions, 2 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 10aa3c8772a8..6ec803805b29 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.34 2004/09/22 12:57:13 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.35 2004/09/22 13:05:38 hattya Exp $
+
+*sylpheed-0.9.12-r6 (22 Sep 2004)
+
+  22 Sep 2004; Akinori Hattori <hattya@gentoo.org> +sylpheed-0.9.12-r6.ebuild:
+  sylpheed-0.9.12-gtk2-20040918-summary_search_fix.diff.
 
   22 Sep 2004; Akinori Hattori <hattya@gentoo.org> -sylpheed-0.9.12-r2.ebuild:
   cleaned out old ebuild.
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 1767c101df21..02886d844ada 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,9 +1,10 @@
-MD5 c17f2346f2edafcc645daccb03342b22 ChangeLog 13590
+MD5 d412be211a16723c68b513a759b90125 ChangeLog 13762
 MD5 126ca8f672f0296d2f1e6830e6729a91 metadata.xml 231
 MD5 8b70480a3c60124dfb18cee3ddd9a52f sylpheed-0.9.11.ebuild 1630
 MD5 a7c50e8a8f78008a8ed0f6ee078b0928 sylpheed-0.9.12-r3.ebuild 1667
 MD5 fbb293865e5d790d17491c26f2a58f62 sylpheed-0.9.12-r4.ebuild 2131
 MD5 a3b1819b1fc19b1db2305e8cbb6d1cf8 sylpheed-0.9.12-r5.ebuild 2131
+MD5 20f43521db56167e61f84dc6c7699694 sylpheed-0.9.12-r6.ebuild 2254
 MD5 553d1b2a0e84d3c2edef3a976edceec7 sylpheed-0.9.12.ebuild 1785
 MD5 c9ce9ff4d9bcd15955cee6414e129105 sylpheed-0.9.4.ebuild 1657
 MD5 2900b8d10269d808f7934195addc95b7 sylpheed-0.9.7.ebuild 1680
@@ -12,6 +13,7 @@ MD5 54b7f8281a74665ddcd19c166763dda2 files/digest-sylpheed-0.9.12 69
 MD5 dddf6be97ba2549701baf595fb5d1925 files/digest-sylpheed-0.9.12-r3 151
 MD5 dddf6be97ba2549701baf595fb5d1925 files/digest-sylpheed-0.9.12-r4 151
 MD5 81a2a22f19929ad10685703cde219075 files/digest-sylpheed-0.9.12-r5 151
+MD5 b3bc1919418bff7c0dcc3280e50fa851 files/digest-sylpheed-0.9.12-r6 249
 MD5 cae6de9566012ff2a026e2fdc0124c53 files/digest-sylpheed-0.9.4 68
 MD5 cd6d093a0935b35694616063e91a2bc1 files/digest-sylpheed-0.9.7 68
 MD5 f847bb1651a5b85decf13e2d8d01afe2 files/shared-mime.patch 649
diff --git a/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r6 b/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r6
new file mode 100644
index 000000000000..aa51e36ca82b
--- /dev/null
+++ b/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r6
@@ -0,0 +1,3 @@
+MD5 5deab7d65f8e19444902be3d82610e6b sylpheed-0.9.12.tar.bz2 2304925
+MD5 8c724a988eb833cc4436942d44a9ddf4 sylpheed-0.9.12-gtk2-20040918.diff.gz 159245
+MD5 f5b75703cb3f424c475e8a084c2addda sylpheed-0.9.12-gtk2-20040918-summary_search_fix.diff.gz 838
diff --git a/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild b/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild
new file mode 100644
index 000000000000..795384f4edfb
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r6.ebuild,v 1.1 2004/09/22 13:05:38 hattya Exp $
+
+inherit eutils
+
+IUSE="crypt gnome gtk2 imlib ipv6 ldap nls pda ssl"
+
+GTK2_PV="20040918"
+MY_P="${P}-gtk2-${GTK2_PV}"
+
+DESCRIPTION="A lightweight email client and newsreader"
+HOMEPAGE="http://sylpheed.good-day.net/
+	http://sylpheed-gtk2.sf.net/"
+SRC_URI="http://sylpheed.good-day.net/${PN}/${P}.tar.bz2
+	gtk2? ( mirror://sourceforge/${PN}-gtk2/${MY_P}.diff.gz
+		mirror://sourceforge/${PN}-gtk2/${MY_P}-summary_search_fix.diff.gz )"
+
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64"
+SLOT="0"
+
+PROVIDE="virtual/sylpheed"
+
+DEPEND="gtk2? ( >=x11-libs/gtk+-2.2 )
+	!gtk2? ( =x11-libs/gtk+-1.2*
+		gnome? ( media-libs/gdk-pixbuf )
+		imlib? ( media-libs/imlib )
+	)
+	>=media-libs/compface-1.4
+	!amd64? ( nls? ( =sys-devel/gettext-0.12.1* ) )
+	ssl? ( dev-libs/openssl )
+	pda? ( app-pda/jpilot )
+	ldap? ( >=net-nds/openldap-2.0.11 )
+	crypt? ( =app-crypt/gpgme-0.3.14-r1 )"
+RDEPEND="${DEPEND}
+	app-misc/mime-types
+	x11-misc/shared-mime-info"
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-namespace.diff
+	epatch ${FILESDIR}/${PN}-procmime.diff
+
+	if use gtk2; then
+		epatch ${WORKDIR}/${MY_P}.diff
+		epatch ${WORKDIR}/${MY_P}-summary_search_fix.diff
+		use amd64 && epatch ${FILESDIR}/${P}-64bit.patch
+		! use crypt && cp ac/missing/gpgme.m4 ac
+		WANT_AUTOMAKE=1.7 ./autogen.sh
+	fi
+
+}
+
+src_compile() {
+
+	local myconf
+
+	if use gtk2; then
+		myconf="--enable-gdk-pixbuf"
+
+	else
+		myconf="`use_enable imlib` `use_enable gnome gdk-pixbuf`"
+
+	fi
+
+	use crypt && export GPGME_CONFIG="${ROOT}usr/bin/gpgme3-config"
+
+	econf \
+		`use_enable nls` \
+		`use_enable ssl` \
+		`use_enable crypt gpgme` \
+		`use_enable pda jpilot` \
+		`use_enable ldap` \
+		`use_enable ipv6` \
+		--enable-compface \
+		${myconf} \
+		|| die
+
+	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 [A-Z][A-Z]* ChangeLog*
+
+}