update

5 files changed, 137 insertions, 68 deletions

diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 73daff5236dd..84e93e1e6f6d 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,12 @@
 # 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.27 2004/08/27 14:11:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.28 2004/08/28 07:07:55 hattya Exp $
+
+*sylpheed-0.9.12-r4 (28 Aug 2004)
+
+  28 Aug 2004; Akinori Hattori <hattya@gentoo.org> sylpheed-0.9.12-r3.ebuild,
+  +sylpheed-0.9.12-r4.ebuild:
+  -r3 is vanilla, -r4 includes gtk2 patch. 1 day late...
 
 *sylpheed-0.9.12-r3 (27 Aug 2004)
 
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 5a564ecf6013..82e1418a1386 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,24 +1,26 @@
-MD5 6bea19c40f6e21c542aa9c6c9da77eaa ChangeLog 12564
+MD5 3030c62127a82115d032e92eb4ffe288 ChangeLog 12765
 MD5 126ca8f672f0296d2f1e6830e6729a91 metadata.xml 231
 MD5 0175cbb0bd00750d183f105ceba9a0b2 sylpheed-0.9.10-r1.ebuild 1650
 MD5 d55c6e4b70661b478ef4b8cda0504703 sylpheed-0.9.11.ebuild 1654
+MD5 d3723ef63dbb1f62c76606f4dd227cf3 sylpheed-0.9.12-r1.ebuild 2050
+MD5 c70b69c5fe45404c60b020523c7f3a21 sylpheed-0.9.12-r2.ebuild 2089
+MD5 ec2b4f4ebeb9bdac1fcd7d81c32e6cdf sylpheed-0.9.12-r3.ebuild 1521
+MD5 9142a510ea551f39064b9b3728a436dc sylpheed-0.9.12-r4.ebuild 1985
+MD5 451e7cc54f144f095c6031434982717c sylpheed-0.9.12.ebuild 1774
 MD5 70802173c256dec3b56f72c8ad6d0357 sylpheed-0.9.4.ebuild 1683
 MD5 c9da44749ebbd133a0783ae3fab1111b sylpheed-0.9.7.ebuild 1706
 MD5 801db9e7913f7a30a30b28ae5f80ea11 sylpheed-0.9.8.ebuild 1550
-MD5 d3723ef63dbb1f62c76606f4dd227cf3 sylpheed-0.9.12-r1.ebuild 2050
-MD5 451e7cc54f144f095c6031434982717c sylpheed-0.9.12.ebuild 1774
-MD5 c70b69c5fe45404c60b020523c7f3a21 sylpheed-0.9.12-r2.ebuild 2089
-MD5 7dd4a375cde25028b7e4122be536d6ed sylpheed-0.9.12-r3.ebuild 2726
-MD5 54b7f8281a74665ddcd19c166763dda2 files/digest-sylpheed-0.9.12 69
 MD5 ce1c3d8a2d9d18309762912c51486210 files/digest-sylpheed-0.9.10-r1 69
 MD5 cc155b38424780b974f40b662322b2dc files/digest-sylpheed-0.9.11 69
-MD5 cae6de9566012ff2a026e2fdc0124c53 files/digest-sylpheed-0.9.4 68
+MD5 54b7f8281a74665ddcd19c166763dda2 files/digest-sylpheed-0.9.12 69
+MD5 f6ea50485775c52818d8a704b476951c files/digest-sylpheed-0.9.12-r1 151
 MD5 58115ec502c767d6e20d4bf471ede6b6 files/digest-sylpheed-0.9.12-r2 151
+MD5 dddf6be97ba2549701baf595fb5d1925 files/digest-sylpheed-0.9.12-r3 151
+MD5 dddf6be97ba2549701baf595fb5d1925 files/digest-sylpheed-0.9.12-r4 151
+MD5 cae6de9566012ff2a026e2fdc0124c53 files/digest-sylpheed-0.9.4 68
 MD5 cd6d093a0935b35694616063e91a2bc1 files/digest-sylpheed-0.9.7 68
 MD5 dbd68b329d6860317fc8326b3dc9999e files/digest-sylpheed-0.9.8 68
-MD5 675221f844926806e120435f82df5fad files/sylpheed-0.9.12-64bit.patch 401
 MD5 f847bb1651a5b85decf13e2d8d01afe2 files/shared-mime.patch 649
+MD5 675221f844926806e120435f82df5fad files/sylpheed-0.9.12-64bit.patch 401
 MD5 4cbec71671b7349c904f860a12fee5d9 files/sylpheed-namespace.diff 550
 MD5 f4242298cfab21456442bfe52505d2b8 files/sylpheed-procmime.diff 1119
-MD5 f6ea50485775c52818d8a704b476951c files/digest-sylpheed-0.9.12-r1 151
-MD5 dddf6be97ba2549701baf595fb5d1925 files/digest-sylpheed-0.9.12-r3 151
diff --git a/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r4 b/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r4
new file mode 100644
index 000000000000..ba101577dc06
--- /dev/null
+++ b/mail-client/sylpheed/files/digest-sylpheed-0.9.12-r4
@@ -0,0 +1,2 @@
+MD5 5deab7d65f8e19444902be3d82610e6b sylpheed-0.9.12.tar.bz2 2304925
+MD5 3daab3ce6be21e5a776bdf85ec163825 sylpheed-0.9.12-gtk2-20040622.diff.gz 192859
diff --git a/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild b/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild
index a1c7481123e5..0f3760e67460 100644
--- a/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild
+++ b/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild
@@ -1,36 +1,31 @@
 # 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-r3.ebuild,v 1.1 2004/08/27 13:22:19 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-0.9.12-r3.ebuild,v 1.2 2004/08/28 07:07:55 hattya Exp $
 
 inherit eutils
 
-IUSE="ssl xface ipv6 imlib nls gnome ldap crypt pda gtk2"
-
-GTK2_PATCHVER="20040622"
+IUSE="crypt gnome imlib ipv6 ldap nls pda ssl"
 
 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/${P}-gtk2-${GTK2_PATCHVER}.diff.gz )"
+HOMEPAGE="http://sylpheed.good-day.net/"
+SRC_URI="http://sylpheed.good-day.net/${PN}/${P}.tar.bz2"
 
+RESTRICT="nomirror"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa ~ia64 ~amd64"
+KEYWORDS="~x86"
 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 )
-	)
+DEPEND="=x11-libs/gtk+-1.2*
 	!amd64? ( nls? ( =sys-devel/gettext-0.12.1* ) )
+	>=media-libs/compface-1.4
 	ssl? ( dev-libs/openssl )
 	pda? ( app-pda/jpilot )
 	ldap? ( >=net-nds/openldap-2.0.11 )
 	crypt? ( =app-crypt/gpgme-0.3.14-r1 )
-	xface? ( >=media-libs/compface-1.4 )"
+	gnome? ( media-libs/gdk-pixbuf )
+	imlib? ( media-libs/imlib )"
 RDEPEND="${DEPEND}
 	app-misc/mime-types
 	x11-misc/shared-mime-info"
@@ -42,51 +37,12 @@ src_unpack() {
 	cd ${S}
 	epatch ${FILESDIR}/${PN}-namespace.diff
 	epatch ${FILESDIR}/${PN}-procmime.diff
-	epatch ${FILESDIR}/${P}-64bit.patch
-
-	if use gtk2; then
-		epatch ${WORKDIR}/${P}-gtk2-${GTK2_PATCHVER}.diff
-	fi
-	! use crypt && cp ac/missing/gpgme.m4 ac
-	! use gnome && cp ac/missing/gdk-pixbuf.m4 ac
-	! use imlib && cp ac/missing/imlib.m4 ac
-
-	aclocal -I ac || die "aclocal failed"
-	libtoolize --force --copy || die "libtoolize died"
-	autoheader || die "autoheader died"
 
-	# had to do this to prevent failure.
-	if use gtk2;
-	then
-		aclocal -I ac || die "2nd aclocal failed"
-	fi
-	automake --add-missing --foreign --copy || die "automake failed"
-	autoconf || die "failed to autoconf"
 }
 
 src_compile() {
 
-	local myconf
-
-	# for gpgme support
-	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
-
-	# For gnupg-1.9
-	if [ -x ${ROOT}/usr/bin/gpg ];
-	then
-		export GPG_PATH=${ROOT}/usr/bin/gpg
-	elif [ -x ${ROOT}/usr/bin/gpg2 ];
-	then
-		export GPG_PATH=${ROOT}/usr/bin/gpg2
-	fi
-
-	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` \
@@ -95,8 +51,9 @@ src_compile() {
 		`use_enable pda jpilot` \
 		`use_enable ldap` \
 		`use_enable ipv6` \
-		`use_enable xface compface` \
-		${myconf} \
+		`use_enable imlib` \
+		`use_enable gnome gdk-pixbuf` \
+		--enable-compface \
 		|| die
 
 	emake || die
diff --git a/mail-client/sylpheed/sylpheed-0.9.12-r4.ebuild b/mail-client/sylpheed/sylpheed-0.9.12-r4.ebuild
new file mode 100644
index 000000000000..57cb57a71e59
--- /dev/null
+++ b/mail-client/sylpheed/sylpheed-0.9.12-r4.ebuild
@@ -0,0 +1,102 @@
+# 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-r4.ebuild,v 1.1 2004/08/28 07:07:55 hattya Exp $
+
+inherit eutils
+
+IUSE="crypt gnome gtk2 imlib ipv6 ldap nls pda ssl"
+
+GTK2_PV="20040622"
+
+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/${P}-gtk2-${GTK2_PV}.diff.gz )"
+
+RESTRICT="nomirror"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+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}/${P}-gtk2-${GTK2_PV}.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*
+
+}